diff --git a/web3.js/module.d.ts b/web3.js/module.d.ts index 63e3eed9bf..7f3cbb6f30 100644 --- a/web3.js/module.d.ts +++ b/web3.js/module.d.ts @@ -196,7 +196,7 @@ declare module '@solana/web3.js' { signature: TransactionSignature, commitment?: Commitment, ): Promise>; - getSignatureStatusBatch( + getSignatureStatuses( signatures: Array, commitment?: Commitment, ): Promise>>; diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js index 9f1400eb43..cb7e83aed4 100644 --- a/web3.js/module.flow.js +++ b/web3.js/module.flow.js @@ -209,7 +209,7 @@ declare module '@solana/web3.js' { signature: TransactionSignature, commitment: ?Commitment, ): Promise>; - getSignatureStatusBatch( + getSignatureStatuses( signatures: Array, commitment: ?Commitment, ): Promise>>; diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js index 27d557f7a6..8dac8c64f9 100644 --- a/web3.js/src/connection.js +++ b/web3.js/src/connection.js @@ -477,9 +477,9 @@ const GetVoteAccounts = jsonRpcResult( ); /** - * Expected JSON RPC response for the "getSignatureStatus" message + * Expected JSON RPC response for the "getSignatureStatuses" message */ -const GetSignatureStatusRpcResult = jsonRpcResultAndContext( +const GetSignatureStatusesRpcResult = jsonRpcResultAndContext( struct.array([ struct.union([ 'null', @@ -1036,7 +1036,7 @@ export class Connection { signature: TransactionSignature, commitment: ?Commitment, ): Promise> { - const {context, value} = await this.getSignatureStatusBatch( + const {context, value} = await this.getSignatureStatuses( [signature], commitment, ); @@ -1047,13 +1047,13 @@ export class Connection { /** * Fetch the current status of a signature */ - async getSignatureStatusBatch( + async getSignatureStatuses( signatures: Array, commitment: ?Commitment, ): Promise>> { const args = this._argsWithCommitment([signatures], commitment); - const unsafeRes = await this._rpcRequest('getSignatureStatus', args); - const res = GetSignatureStatusRpcResult(unsafeRes); + const unsafeRes = await this._rpcRequest('getSignatureStatuses', args); + const res = GetSignatureStatusesRpcResult(unsafeRes); if (res.error) { throw new Error(res.error.message); } diff --git a/web3.js/test/connection.test.js b/web3.js/test/connection.test.js index a1c44d1710..2a7f8aeb5a 100644 --- a/web3.js/test/connection.test.js +++ b/web3.js/test/connection.test.js @@ -98,7 +98,7 @@ test('get program accounts', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', @@ -142,7 +142,7 @@ test('get program accounts', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', @@ -496,7 +496,7 @@ test('confirm transaction - error', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [[badTransactionSignature]], }, errorResponse, @@ -887,7 +887,7 @@ test('request airdrop - max commitment', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '1WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', @@ -1081,7 +1081,7 @@ test('transaction', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', @@ -1127,7 +1127,7 @@ test('transaction', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk', @@ -1155,7 +1155,7 @@ test('transaction', async () => { ]); const responses = ( - await connection.getSignatureStatusBatch([signature, unprocessedSignature]) + await connection.getSignatureStatuses([signature, unprocessedSignature]) ).value; expect(responses.length).toEqual(2); diff --git a/web3.js/test/transaction-payer.test.js b/web3.js/test/transaction-payer.test.js index 74520d469e..8bf5037d6d 100644 --- a/web3.js/test/transaction-payer.test.js +++ b/web3.js/test/transaction-payer.test.js @@ -146,7 +146,7 @@ test('transaction-payer', async () => { mockRpc.push([ url, { - method: 'getSignatureStatus', + method: 'getSignatureStatuses', params: [ [ '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',