Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Network Refactor #431

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/dashboard/CreateWallet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ref, watch, toRefs } from 'vue';
import { useWallet } from '../composables/use_wallet.js';
import newWalletIcon from '../../assets/icons/icon-new-wallet.svg';
import Password from '../Password.vue';
import { getNetwork } from '../network.js';
import { getNetwork } from '../network_manager.js';

const emit = defineEmits(['importWallet']);
const showModal = ref(false);
Expand Down
2 changes: 1 addition & 1 deletion scripts/dashboard/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
isColdAddress,
isStandardAddress,
} from '../misc.js';
import { getNetwork } from '../network.js';
import { getNetwork } from '../network_manager.js';
import { strHardwareName } from '../ledger';
import { guiAddContactPrompt } from '../contacts-book';
import { scanQRCode } from '../scanner';
Expand Down
4 changes: 2 additions & 2 deletions scripts/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Masternode from './masternode.js';
import { ALERTS, tr, start as i18nStart, translation } from './i18n.js';
import { wallet, hasEncryptedWallet, Wallet } from './wallet.js';
import { getNetwork } from './network.js';
import { getNetwork } from './network_manager.js';
import {
start as settingsStart,
strCurrency,
Expand Down Expand Up @@ -32,6 +32,7 @@
import pIconCheck from '../assets/icons/icon-check.svg';
import SideNavbar from './SideNavbar.vue';
import { AsyncInterval } from './async_interval.js';
import { networkManager } from './network_manager.js';

Check warning on line 35 in scripts/global.js

View workflow job for this annotation

GitHub Actions / Run linters

'networkManager' is defined but never used

/** A flag showing if base MPW is fully loaded or not */
export let fIsLoaded = false;
Expand Down Expand Up @@ -259,7 +260,6 @@
// Register native app service
registerWorker();
await settingsStart();

subscribeToNetworkEvents();
// Make sure we know the correct number of blocks
await refreshChainData();
Expand Down
2 changes: 1 addition & 1 deletion scripts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ import Masternode from './masternode.js';
export { renderChangelog } from './changelog.js';
export { Masternode };

export { getNetwork } from './network.js';
export { getNetwork } from './network_manager.js';

export { FlipDown } from './flipdown.js';
2 changes: 1 addition & 1 deletion scripts/ledger.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import createXpub from 'create-xpub';
import { ALERTS, tr } from './i18n.js';
import { confirmPopup } from './misc.js';
import { getNetwork } from './network.js';
import { getNetwork } from './network_manager.js';
import { Transaction } from './transaction.js';
import { COIN, cChainParams } from './chain_params.js';
import { hexToBytes, bytesToHex } from './utils.js';
Expand Down
2 changes: 1 addition & 1 deletion scripts/legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { wallet, getNewAddress } from './wallet.js';
import { cChainParams, COIN, COIN_DECIMALS } from './chain_params.js';
import { generateMasternodePrivkey, confirmPopup } from './misc.js';
import { Database } from './database.js';
import { getNetwork } from './network.js';
import { getNetwork } from './network_manager.js';
import { ledgerSignTransaction } from './ledger.js';
import { createAlert } from './alerts/alert.js';

Expand Down
2 changes: 1 addition & 1 deletion scripts/masternode.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { OP } from './script.js';
import bs58 from 'bs58';
import base32 from 'base32';
import { isStandardAddress } from './misc.js';
import { getNetwork } from './network.js';
import { getNetwork } from './network_manager.js';
import { debugError, DebugTopics } from './debug.js';

/**
Expand Down
Loading
Loading