diff --git a/web3.js/package-lock.json b/web3.js/package-lock.json index de9f26804c..9d21ed259a 100644 --- a/web3.js/package-lock.json +++ b/web3.js/package-lock.json @@ -72,7 +72,7 @@ "mz": "^2.7.0", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", - "prettier": "^2.0.0", + "prettier": "^2.3.0", "rimraf": "3.0.2", "rollup": "2.49.0", "rollup-plugin-dts": "^3.0.1", @@ -16471,9 +16471,9 @@ } }, "node_modules/prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -32662,9 +32662,9 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true }, "prettier-linter-helpers": { diff --git a/web3.js/package.json b/web3.js/package.json index 4f10c20530..cba3c16359 100644 --- a/web3.js/package.json +++ b/web3.js/package.json @@ -125,7 +125,7 @@ "mz": "^2.7.0", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", - "prettier": "^2.0.0", + "prettier": "^2.3.0", "rimraf": "3.0.2", "rollup": "2.49.0", "rollup-plugin-dts": "^3.0.1", diff --git a/web3.js/src/connection.ts b/web3.js/src/connection.ts index bb384e4e84..6f78d6890b 100644 --- a/web3.js/src/connection.ts +++ b/web3.js/src/connection.ts @@ -3020,9 +3020,8 @@ export class Connection { 'finalized', ); if (block.signatures.length > 0) { - options.until = block.signatures[ - block.signatures.length - 1 - ].toString(); + options.until = + block.signatures[block.signatures.length - 1].toString(); } } catch (err) { if (err.message.includes('skipped')) { @@ -3043,9 +3042,8 @@ export class Connection { try { const block = await this.getConfirmedBlockSignatures(endSlot); if (block.signatures.length > 0) { - options.before = block.signatures[ - block.signatures.length - 1 - ].toString(); + options.before = + block.signatures[block.signatures.length - 1].toString(); } } catch (err) { if (err.message.includes('skipped')) { diff --git a/web3.js/src/publickey.ts b/web3.js/src/publickey.ts index edbd6e516b..38d72bbc1d 100644 --- a/web3.js/src/publickey.ts +++ b/web3.js/src/publickey.ts @@ -247,22 +247,8 @@ function is_on_curve(p: any) { } let gf1 = naclLowLevel.gf([1]); let I = naclLowLevel.gf([ - 0xa0b0, - 0x4a0e, - 0x1b27, - 0xc4ee, - 0xe478, - 0xad2f, - 0x1806, - 0x2f43, - 0xd7a7, - 0x3dfb, - 0x0099, - 0x2b4d, - 0xdf0b, - 0x4fc1, - 0x2480, - 0x2b83, + 0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, + 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83, ]); function neq25519(a: any, b: any) { var c = new Uint8Array(32), diff --git a/web3.js/src/stake-program.ts b/web3.js/src/stake-program.ts index 7d7516f326..8d7f60d602 100644 --- a/web3.js/src/stake-program.ts +++ b/web3.js/src/stake-program.ts @@ -710,13 +710,8 @@ export class StakeProgram { * Generate a Transaction that withdraws deactivated Stake tokens. */ static withdraw(params: WithdrawStakeParams): Transaction { - const { - stakePubkey, - authorizedPubkey, - toPubkey, - lamports, - custodianPubkey, - } = params; + const {stakePubkey, authorizedPubkey, toPubkey, lamports, custodianPubkey} = + params; const type = STAKE_INSTRUCTION_LAYOUTS.Withdraw; const data = encodeData(type, {lamports}); diff --git a/web3.js/test/account.test.ts b/web3.js/test/account.test.ts index ce72c1c0ce..991c1ae9e7 100644 --- a/web3.js/test/account.test.ts +++ b/web3.js/test/account.test.ts @@ -11,70 +11,10 @@ describe('Account', () => { it('account from secret key', () => { const secretKey = Buffer.from([ - 153, - 218, - 149, - 89, - 225, - 94, - 145, - 62, - 233, - 171, - 46, - 83, - 227, - 223, - 173, - 87, - 93, - 163, - 59, - 73, - 190, - 17, - 37, - 187, - 146, - 46, - 51, - 73, - 79, - 73, - 136, - 40, - 27, - 47, - 73, - 9, - 110, - 62, - 93, - 189, - 15, - 207, - 169, - 192, - 192, - 205, - 146, - 217, - 171, - 59, - 33, - 84, - 75, - 52, - 213, - 221, - 74, - 101, - 217, - 139, - 135, - 139, - 153, - 34, + 153, 218, 149, 89, 225, 94, 145, 62, 233, 171, 46, 83, 227, 223, 173, 87, + 93, 163, 59, 73, 190, 17, 37, 187, 146, 46, 51, 73, 79, 73, 136, 40, 27, + 47, 73, 9, 110, 62, 93, 189, 15, 207, 169, 192, 192, 205, 146, 217, 171, + 59, 33, 84, 75, 52, 213, 221, 74, 101, 217, 139, 135, 139, 153, 34, ]); const account = new Account(secretKey); expect(account.publicKey.toBase58()).to.eq( diff --git a/web3.js/test/bpf-loader.test.ts b/web3.js/test/bpf-loader.test.ts index 02f3be0e6d..43c50e1b1c 100644 --- a/web3.js/test/bpf-loader.test.ts +++ b/web3.js/test/bpf-loader.test.ts @@ -37,9 +37,10 @@ if (process.env.TEST_LIVE) { const payerBalance = await connection.getMinimumBalanceForRentExemption( 0, ); - const executableBalance = await connection.getMinimumBalanceForRentExemption( - programData.length, - ); + const executableBalance = + await connection.getMinimumBalanceForRentExemption( + programData.length, + ); await helpers.airdrop({ connection, diff --git a/web3.js/test/connection.test.ts b/web3.js/test/connection.test.ts index ad4a00ced1..68bb54d292 100644 --- a/web3.js/test/connection.test.ts +++ b/web3.js/test/connection.test.ts @@ -383,9 +383,8 @@ describe('Connection', () => { value: [], }); - const programAccountsDontMatchFilter = await connection.getProgramAccounts( - programId.publicKey, - { + const programAccountsDontMatchFilter = + await connection.getProgramAccounts(programId.publicKey, { commitment: 'confirmed', filters: [ { @@ -395,8 +394,7 @@ describe('Connection', () => { }, }, ], - }, - ); + }); expect(programAccountsDontMatchFilter).to.have.length(0); } @@ -472,13 +470,11 @@ describe('Connection', () => { value: [], }); - const programAccountsDontMatchFilter = await connection.getParsedProgramAccounts( - programId.publicKey, - { + const programAccountsDontMatchFilter = + await connection.getParsedProgramAccounts(programId.publicKey, { commitment: 'confirmed', filters: [{dataSize: 2}], - }, - ); + }); expect(programAccountsDontMatchFilter).to.have.length(0); } @@ -525,9 +521,8 @@ describe('Connection', () => { ], }); - const programAccountsDoMatchFilter = await connection.getParsedProgramAccounts( - programId.publicKey, - { + const programAccountsDoMatchFilter = + await connection.getParsedProgramAccounts(programId.publicKey, { commitment: 'confirmed', filters: [ { @@ -537,8 +532,7 @@ describe('Connection', () => { }, }, ], - }, - ); + }); expect(programAccountsDoMatchFilter).to.have.length(2); } }); @@ -889,8 +883,7 @@ describe('Connection', () => { instructions: [ { accounts: [1, 2, 3], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programIdIndex: 4, }, ], @@ -914,10 +907,8 @@ describe('Connection', () => { slot++; const block = await connection.getConfirmedBlock(slot); if (block.transactions.length > 0) { - const { - signature, - publicKey, - } = block.transactions[0].transaction.signatures[0]; + const {signature, publicKey} = + block.transactions[0].transaction.signatures[0]; if (signature) { address = publicKey; expectedSignature = bs58.encode(signature); @@ -973,11 +964,12 @@ describe('Connection', () => { ], }); - const confirmedSignatures = await connection.getConfirmedSignaturesForAddress( - address, - slot, - slot + 1, - ); + const confirmedSignatures = + await connection.getConfirmedSignaturesForAddress( + address, + slot, + slot + 1, + ); expect(confirmedSignatures.includes(expectedSignature)).to.be.true; const badSlot = Number.MAX_SAFE_INTEGER - 1; @@ -1008,10 +1000,8 @@ describe('Connection', () => { ], }); - const confirmedSignatures2 = await connection.getConfirmedSignaturesForAddress2( - address, - {limit: 1}, - ); + const confirmedSignatures2 = + await connection.getConfirmedSignaturesForAddress2(address, {limit: 1}); expect(confirmedSignatures2).to.have.length(1); if (mockServer) { expect(confirmedSignatures2[0].signature).to.eq(expectedSignature); @@ -1066,8 +1056,7 @@ describe('Connection', () => { instructions: [ { accounts: [1, 2, 3], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programIdIndex: 4, }, ], @@ -1339,8 +1328,7 @@ describe('Connection', () => { instructions: [ { accounts: [1, 2, 3], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programIdIndex: 4, }, ], @@ -1391,8 +1379,7 @@ describe('Connection', () => { instructions: [ { accounts: [1, 2, 3], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programIdIndex: 4, }, ], @@ -1470,8 +1457,7 @@ describe('Connection', () => { instructions: [ { accounts: ['va12u4o9DipLEB2z4fuoHszroq1U9NcAB9aooFDPJSf'], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programId: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA', }, ], @@ -1614,8 +1600,7 @@ describe('Connection', () => { instructions: [ { accounts: [1, 2, 3], - data: - '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', + data: '37u9WtQpcm6ULa3VtWDFAWoQc1hUvybPrA3dtx99tgHvvcE7pKRZjuGmn7VX2tC3JmYDYGG7', programIdIndex: 4, }, ], diff --git a/web3.js/test/publickey.test.ts b/web3.js/test/publickey.test.ts index 7d524f0029..b58a48b726 100644 --- a/web3.js/test/publickey.test.ts +++ b/web3.js/test/publickey.test.ts @@ -12,39 +12,8 @@ describe('PublicKey', function () { it('invalid', () => { expect(() => { new PublicKey([ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, ]); }).to.throw(); @@ -73,38 +42,8 @@ describe('PublicKey', function () { it('equals', () => { const arrayKey = new PublicKey([ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, ]); const base58Key = new PublicKey( 'CiDwVBFgWV9E5MvXWoLgnEgn2hK7rJikbvfWavzAQz3', @@ -126,38 +65,8 @@ describe('PublicKey', function () { expect(key3.toBase58()).to.eq('11111111111111111111111111111111'); const key4 = new PublicKey([ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, ]); expect(key4.toBase58()).to.eq('11111111111111111111111111111111'); }); @@ -178,38 +87,8 @@ describe('PublicKey', function () { it('equals (II)', () => { const key1 = new PublicKey([ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, ]); const key2 = new PublicKey(key1.toBuffer()); diff --git a/web3.js/test/shortvec-encoding.test.ts b/web3.js/test/shortvec-encoding.test.ts index f807017ca0..b4262d081f 100644 --- a/web3.js/test/shortvec-encoding.test.ts +++ b/web3.js/test/shortvec-encoding.test.ts @@ -63,11 +63,12 @@ describe('shortvec', () => { checkEncodedArray(array, 0x7fff, (prevLength += 3), 3, [0xff, 0xff, 0x01]); - checkEncodedArray(array, 0x200000, (prevLength += 4), 4, [ - 0x80, - 0x80, - 0x80, - 0x01, - ]); + checkEncodedArray( + array, + 0x200000, + (prevLength += 4), + 4, + [0x80, 0x80, 0x80, 0x01], + ); }); });