Skip to content

Commit a99f167

Browse files
MicahMaphetMicahMaphet
committed
readded precommit to bitcore node and fixed eslint errors
1 parent 9fe73e0 commit a99f167

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+278
-239
lines changed

‎eslint.config.mjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ export default defineConfig([
101101
},
102102
rules: {
103103
'@typescript-eslint/no-unused-vars': 'off',
104+
'@typescript-eslint/no-this-alias': 'warn',
105+
'@typescript-eslint/no-unused-expressions': 'off',
104106
'sort-imports': 'off',
105107
'import/order': 'off'
106108
}

‎packages/bitcore-node/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
"api:cluster": "npm run tsc && node build/src/workers/api.js --CLUSTER true",
4343
"pruning": "npm run tsc && node build/src/workers/pruning.js --EXIT true",
4444
"p2p": "npm run tsc && node build/src/workers/p2p.js",
45-
"precommit": "echo 'TODO: npm run fix && npm run lint'",
4645
"lint": "eslint .",
47-
"fix:all": "eslint --fix .",
4846
"fix:errors": "eslint --fix --quiet .",
47+
"fix:all": "eslint --fix .",
48+
"precommit": "npm run lint; npm run fix:errors",
4949
"test:scripts": "npx mocha scripts/test"
5050
},
5151
"nyc": {

‎packages/bitcore-node/scripts/addBlockFees.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

3-
const { BitcoinBlockStorage } = require('../build/src/models/block');
4-
const { Storage } = require('../build/src/services/storage');
3+
import { BitcoinBlockStorage } from '../build/src/models/block';
4+
import { Storage } from '../build/src/services/storage';
55

66
function usage(errMsg) {
77
console.log('USAGE: ./addBlockFees [options]');

‎packages/bitcore-node/scripts/addGenesisBlock.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env node
22

3+
import * as readline from 'readline';
4+
import Config from '../build/src/config';
5+
import { BitcoinBlockStorage } from '../build/src/models/block';
6+
import { BitcoinP2PWorker } from '../build/src/modules/bitcoin/p2p';
7+
import { Storage } from '../build/src/services/storage';
38

4-
const rl = require('readline').createInterface({ input: process.stdin, output: process.stdout });
5-
const Config = require('../build/src/config');
6-
const { BitcoinBlockStorage } = require('../build/src/models/block');
7-
const { BitcoinP2PWorker } = require('../build/src/modules/bitcoin/p2p');
8-
const { Storage } = require('../build/src/services/storage');
9-
9+
const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
1010

1111
function usage(errMsg) {
1212
console.log('USAGE: ./addGenesisBlock.js [options]');
@@ -34,7 +34,7 @@ if (!['BTC', 'BCH', 'DOGE', 'LTC'].includes(chain) || !['mainnet', 'testnet', 'r
3434

3535
const real = !!args.find(a => a === '--real');
3636
console.log('Real:', real);
37-
real && console.log('~~~~ REAL RUN ~~~~');
37+
if (real) console.log('~~~~ REAL RUN ~~~~');
3838

3939
let p2pWorker;
4040

@@ -78,7 +78,8 @@ Storage.start()
7878
network
7979
});
8080
const cnt = await BitcoinBlockStorage.collection.countDocuments({ chain, network, height: 0 });
81-
cnt == 1 ? console.log('Genesis block added') : console.log(`Somethings wrong. There are ${cnt} genesis blocks in the db`);
81+
if (cnt == 1) console.log('Genesis block added');
82+
else console.log(`Somethings wrong. There are ${cnt} genesis blocks in the db`);
8283
} else {
8384
console.log('Dry run. Genesis block not added.');
8485
}

‎packages/bitcore-node/scripts/findReplacedTx.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

3-
const { TransactionStorage } = require('../build/src/models/transaction');
4-
const { Storage } = require('../build/src/services/storage');
3+
import { TransactionStorage } from '../build/src/models/transaction';
4+
import { Storage } from '../build/src/services/storage';
55

66
function usage(errMsg) {
77
console.log('USAGE: ./findReplacedTx.js <options>');

‎packages/bitcore-node/scripts/fixOldSpentTxid.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
*** select the chain and network to run against.
1313
*** You must have valid RPC connection specified in bitcore.config.json.
1414
********************************************/
15-
const fs = require('fs');
16-
const { CryptoRpc } = require('crypto-rpc');
17-
const { CoinStorage } = require('../build/src/models/coin');
18-
const { TransactionStorage } = require('../build/src/models/transaction');
15+
import fs from 'fs';
16+
import { CryptoRpc } from 'crypto-rpc';
17+
import Config from '../build/src/config';
18+
import { CoinStorage } from '../build/src/models/coin';
19+
import { TransactionStorage } from '../build/src/models/transaction';
20+
import { Storage } from '../build/src/services/storage';
21+
import { wait } from '../build/src/utils/wait';
1922

2023
const fsPromises = fs.promises;
21-
const { Storage } = require('../build/src/services/storage');
22-
const { wait } = require('../build/src/utils/wait');
23-
const Config = require('../build/src/config');
2424

2525
class Migration {
2626
constructor({ transactionModel = TransactionStorage, coinModel = CoinStorage } = {}) {
@@ -97,7 +97,7 @@ class Migration {
9797
// Get all unspent coins that have a spentTxid specified
9898
const stream = this.coinModel.collection
9999
.find(
100-
{ chain, network, mintHeight: { $gt: -1 }, spentHeight: -2, spentTxid: { $exists: true, $ne: null, $ne: '' } } // -2 is unspent status
100+
{ chain, network, mintHeight: { $gt: -1 }, spentHeight: -2, spentTxid: { $exists: true, $and: [{ $ne: null }, { $ne: '' }] } } // -2 is unspent status
101101
)
102102
.addCursorFlag('noCursorTimeout', true);
103103

@@ -171,7 +171,7 @@ class Migration {
171171
console.log(`Writing output to ${filename}`);
172172
try {
173173
await fsPromises.writeFile(filename, JSON.stringify(output));
174-
} catch (e) {
174+
} catch {
175175
// write to stdout
176176
console.log('Failed to write output to file. Writing to stdout instead.');
177177
console.log(output);
@@ -184,7 +184,7 @@ class Migration {
184184
console.log(`Writing them to ${filename}`);
185185
try {
186186
await fsPromises.writeFile(filename, JSON.stringify(actuallySpent));
187-
} catch (e) {
187+
} catch {
188188
// write to stdout
189189
console.log('Failed to write output to file. Writing to stdout instead.');
190190
console.log(output);

‎packages/bitcore-node/scripts/fixReplacedTree.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/usr/bin/env node
22

3-
const CWC = require('crypto-wallet-core');
4-
const { TransactionStorage } = require('../build/src/models/transaction');
5-
const { Storage } = require('../build/src/services/storage');
3+
import { TransactionStorage } from '../build/src/models/transaction';
4+
import { Storage } from '../build/src/services/storage';
65

76
function usage(errMsg) {
87
console.log('USAGE: ./fixReplacedTree.js <txid> <replacementTxid> [options]');
@@ -43,7 +42,7 @@ const real = !!args.find(a => a === '--real');
4342
const force = !!args.find(a => a === '--force');
4443

4544
console.log('Real:', real);
46-
real && console.log('~~~~ REAL RUN ~~~~');
45+
if (real) console.log('~~~~ REAL RUN ~~~~');
4746

4847
console.log('Connecting to storage...');
4948
Storage.start()

‎packages/bitcore-node/scripts/fixUnspentInputs.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
*** select the chain and network to run against.
1313
*** You must have valid RPC connection specified in bitcore.config.json.
1414
********************************************/
15-
const fs = require('fs');
16-
const { CryptoRpc } = require('crypto-rpc');
17-
const { CoinStorage } = require('../build/src/models/coin');
18-
const { TransactionStorage } = require('../build/src/models/transaction');
15+
import fs from 'fs';
16+
import { CryptoRpc } from 'crypto-rpc';
17+
import Config from '../build/src/config';
18+
import { CoinStorage } from '../build/src/models/coin';
19+
import { TransactionStorage } from '../build/src/models/transaction';
20+
import { Storage } from '../build/src/services/storage';
21+
import { wait } from '../build/src/utils/wait';
1922

2023
const fsPromises = fs.promises;
21-
const { Storage } = require('../build/src/services/storage');
22-
const { wait } = require('../build/src/utils/wait');
23-
const Config = require('../build/src/config');
2424

2525
class Migration {
2626
constructor({ transactionModel = TransactionStorage, coinModel = CoinStorage } = {}) {
@@ -164,7 +164,7 @@ class Migration {
164164
console.log(`Writing output to ${filename}`);
165165
try {
166166
await fsPromises.writeFile(filename, JSON.stringify(output));
167-
} catch (e) {
167+
} catch {
168168
// write to stdout
169169
console.log('Failed to write output to file. Writing to stdout instead.');
170170
console.log(output);

‎packages/bitcore-node/scripts/migrateTestnetWallets.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env node
22

3-
const { WalletStorage } = require('../build/src/models/wallet');
4-
const { WalletAddressStorage } = require('../build/src/models/walletAddress');
5-
const { Storage } = require('../build/src/services/storage');
6-
const { wait } = require('../build/src/utils');
3+
import { ObjectID } from 'mongodb';
4+
import { WalletStorage } from '../build/src/models/wallet';
5+
import { WalletAddressStorage } from '../build/src/models/walletAddress';
6+
import { Storage } from '../build/src/services/storage';
7+
import { wait } from '../build/src/utils';
78

89
function usage(errMsg) {
910
console.log('USAGE: ./migrateTestnetWallets.js [options]');
@@ -63,7 +64,7 @@ process.on('SIGINT', () => {
6364
});
6465

6566
async function deleteOldAddress(e) {
66-
let [_, c, n, w, a] = e.message.split('{')[1].split(':');
67+
let [, c, n, w, a] = e.message.split('{')[1].split(':');
6768
c = c.trim().replace(/"/g, '').replace(/,/g, '');
6869
n = n.trim().replace(/"/g, '').replace(/,/g, '');
6970
w = w.trim().replace('ObjectId(', '').replace(')', '').replace(/'/g, '').replace(/,/g, '');
@@ -95,7 +96,7 @@ Storage.start()
9596
console.log('----------------------------------------');
9697

9798
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} wallets in 10 seconds...`);
98-
!quit && await wait(10000);
99+
if (!quit) await wait(10000);
99100
console.log(`Updating ${chain} ${oldNetwork} wallets...`);
100101
let wallets = await WalletStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
101102
let walletsUpdated = 0;
@@ -108,7 +109,7 @@ Storage.start()
108109
}
109110

110111
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} walletAddresses in 10 seconds...`);
111-
!quit && await wait(10000);
112+
if (!quit) await wait(10000);
112113
console.log(`Updating ${chain} ${oldNetwork} walletAddresses...`);
113114
let walletAddresses = await WalletAddressStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
114115
let walletAddressesUpdated = 0;

‎packages/bitcore-node/scripts/migrateToNamedTestnets.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env node
22

3-
const { BitcoinBlockStorage } = require('../build/src/models/block');
4-
const { CoinStorage } = require('../build/src/models/coin');
5-
const { TransactionStorage } = require('../build/src/models/transaction');
6-
const { WalletStorage } = require('../build/src/models/wallet');
7-
const { WalletAddressStorage } = require('../build/src/models/walletAddress');
8-
const { Storage } = require('../build/src/services/storage');
9-
const { wait } = require('../build/src/utils');
3+
import { BitcoinBlockStorage } from '../build/src/models/block';
4+
import { CoinStorage } from '../build/src/models/coin';
5+
import { TransactionStorage } from '../build/src/models/transaction';
6+
import { WalletStorage } from '../build/src/models/wallet';
7+
import { WalletAddressStorage } from '../build/src/models/walletAddress';
8+
import { Storage } from '../build/src/services/storage';
9+
import { wait } from '../build/src/utils';
1010

1111
const chain = 'LTC';
1212
const oldNetwork = 'testnet';
@@ -45,7 +45,7 @@ Storage.start()
4545
console.log('----------------------------------------');
4646

4747
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} coins in 10 seconds...`);
48-
!quit && await wait(10000);
48+
if (!quit) await wait(10000);
4949
console.log(`Updating ${chain} ${oldNetwork} coins...`);
5050
let coins = await CoinStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
5151
let coinsUpdated = 0;
@@ -58,7 +58,7 @@ Storage.start()
5858
}
5959

6060
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} transactions in 10 seconds...`);
61-
!quit && await wait(10000);
61+
if (!quit) await wait(10000);
6262
console.log(`Updating ${chain} ${oldNetwork} transactions...`);
6363
let txs = await TransactionStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
6464
let txsUpdated = 0;
@@ -71,7 +71,7 @@ Storage.start()
7171
}
7272

7373
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} blocks in 10 seconds...`);
74-
!quit && await wait(10000);
74+
if (!quit) await wait(10000);
7575
console.log(`Updating ${chain} ${oldNetwork} blocks...`);
7676
let blocks = await BitcoinBlockStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
7777
let blocksUpdated = 0;
@@ -84,7 +84,7 @@ Storage.start()
8484
}
8585

8686
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} wallets in 10 seconds...`);
87-
!quit && await wait(10000);
87+
if (!quit) await wait(10000);
8888
console.log(`Updating ${chain} ${oldNetwork} wallets...`);
8989
let wallets = await WalletStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
9090
let walletsUpdated = 0;
@@ -97,7 +97,7 @@ Storage.start()
9797
}
9898

9999
console.log(`Updating ${chain} ${oldNetwork} => ${newNetwork} walletAddresses in 10 seconds...`);
100-
!quit && await wait(10000);
100+
if (!quit) await wait(10000);
101101
console.log(`Updating ${chain} ${oldNetwork} walletAddresses...`);
102102
let walletAddresses = await WalletAddressStorage.collection.find({ chain, network: oldNetwork }).project({ _id: 1 }).limit(batchSize).toArray();
103103
let walletAddressesUpdated = 0;

0 commit comments

Comments
 (0)