feat: add skipPreflight option

2020-06-03 19:55:42 +08:00
parent a6e07e44da
commit 8547ae43ce
12 changed files with 263 additions and 68 deletions
--- a/web3.js/test/bpf-loader.test.js
+++ b/web3.js/test/bpf-loader.test.js
@ -44,7 +44,10 @@ test('load BPF C program', async () => {
    keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}],
    programId: program.publicKey,
  });
-  await sendAndConfirmTransaction(connection, transaction, [from], 1);
+  await sendAndConfirmTransaction(connection, transaction, [from], {
+    confirmations: 1,
+    skipPreflight: true,
+  });
 });

 test('load BPF Rust program', async () => {
@ -73,5 +76,8 @@ test('load BPF Rust program', async () => {
    keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}],
    programId: program.publicKey,
  });
-  await sendAndConfirmTransaction(connection, transaction, [from], 1);
+  await sendAndConfirmTransaction(connection, transaction, [from], {
+    confirmations: 1,
+    skipPreflight: true,
+  });
 });
--- a/web3.js/test/connection.test.js
+++ b/web3.js/test/connection.test.js
@ -117,7 +117,7 @@ test('get program accounts', async () => {
  await connection.requestAirdrop(account0.publicKey, LAMPORTS_PER_SOL);
  await connection.requestAirdrop(account1.publicKey, 0.5 * LAMPORTS_PER_SOL);

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -160,7 +160,10 @@ test('get program accounts', async () => {
    accountPubkey: account0.publicKey,
    programId: programId.publicKey,
  });
-  await sendAndConfirmTransaction(connection, transaction, [account0], 1);
+  await sendAndConfirmTransaction(connection, transaction, [account0], {
+    confirmations: 1,
+    skipPreflight: true,
+  });

  mockRpc.push([
    url,
@ -205,7 +208,10 @@ test('get program accounts', async () => {
    programId: programId.publicKey,
  });

-  await sendAndConfirmTransaction(connection, transaction, [account1], 1);
+  await sendAndConfirmTransaction(connection, transaction, [account1], {
+    confirmations: 1,
+    skipPreflight: true,
+  });

  mockGetRecentBlockhash('recent');
  const {feeCalculator} = await connection.getRecentBlockhash();
@ -1056,7 +1062,13 @@ test('get confirmed block', async () => {

 test('get recent blockhash', async () => {
  const connection = new Connection(url);
-  for (const commitment of ['max', 'recent', 'root', 'single', 'singleGossip']) {
+  for (const commitment of [
+    'max',
+    'recent',
+    'root',
+    'single',
+    'singleGossip',
+  ]) {
    mockGetRecentBlockhash(commitment);

    const {blockhash, feeCalculator} = await connection.getRecentBlockhash(
@ -1471,7 +1483,7 @@ test('transaction failure', async () => {
    minimumAmount + 100010,
  );

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -1484,14 +1496,66 @@ test('transaction failure', async () => {
    },
  ]);

-  const transaction = SystemProgram.transfer({
-    fromPubkey: account.publicKey,
-    toPubkey: account.publicKey,
-    lamports: 10,
-  });
-  const signature = await connection.sendTransaction(transaction, [account]);
+  mockRpc.push([
+    url,
+    {
+      method: 'getSignatureStatuses',
+      params: [
+        [
+          '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
+        ],
+      ],
+    },
+    {
+      error: null,
+      result: {
+        context: {
+          slot: 11,
+        },
+        value: [
+          {
+            slot: 0,
+            confirmations: 1,
+            err: null,
+          },
+        ],
+      },
+    },
+  ]);

-  const expectedErr = {InstructionError: [0, 'AccountBorrowFailed']};
+  const newAccount = new Account();
+  let transaction = SystemProgram.createAccount({
+    fromPubkey: account.publicKey,
+    newAccountPubkey: newAccount.publicKey,
+    lamports: 1000,
+    space: 0,
+    programId: SystemProgram.programId
+  });
+  await sendAndConfirmTransaction(connection, transaction, [account, newAccount], {confirmations: 1, skipPreflight: true});
+
+  mockRpc.push([
+    url,
+    {
+      method: 'sendTransaction',
+    },
+    {
+      error: null,
+      result:
+        '3WE5w4B7v59x6qjyC4FbG2FEKYKQfvsJwqSxNVmtMjT8TQ31hsZieDHcSgqzxiAoTL56n2w5TncjqEKjLhtF4Vk',
+    },
+  ]);
+
+  // This should fail because the account is already created
+  transaction = SystemProgram.createAccount({
+    fromPubkey: account.publicKey,
+    newAccountPubkey: newAccount.publicKey,
+    lamports: 10,
+    space: 0,
+    programId: SystemProgram.programId
+  });
+  const signature = await connection.sendTransaction(transaction, [account, newAccount], {skipPreflight: true});
+
+  const expectedErr = {InstructionError: [0, {Custom: 0}]};
  mockRpc.push([
    url,
    {
@ -1656,7 +1720,7 @@ test('transaction', async () => {
    minimumAmount + 21,
  );

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -1676,7 +1740,7 @@ test('transaction', async () => {
  });
  const signature = await connection.sendTransaction(transaction, [
    accountFrom,
-  ]);
+  ], {skipPreflight: true});

  mockRpc.push([
    url,
@ -1881,7 +1945,7 @@ test('multi-instruction transaction', async () => {
  const signature = await connection.sendTransaction(transaction, [
    accountFrom,
    accountTo,
-  ]);
+  ], {skipPreflight: true});

  await connection.confirmTransaction(signature, 1);

@ -1934,7 +1998,10 @@ test('account change notification', async () => {
      toPubkey: programAccount.publicKey,
      lamports: balanceNeeded,
    });
-    await sendAndConfirmTransaction(connection, transaction, [owner], 1);
+    await sendAndConfirmTransaction(connection, transaction, [owner], {
+      confirmations: 1,
+      skipPreflight: true,
+    });
  } catch (err) {
    await connection.removeAccountChangeListener(subscriptionId);
    throw err;
@ -1998,7 +2065,10 @@ test('program account change notification', async () => {
      toPubkey: programAccount.publicKey,
      lamports: balanceNeeded,
    });
-    await sendAndConfirmTransaction(connection, transaction, [owner], 1);
+    await sendAndConfirmTransaction(connection, transaction, [owner], {
+      confirmations: 1,
+      skipPreflight: true,
+    });
  } catch (err) {
    await connection.removeProgramAccountChangeListener(subscriptionId);
    throw err;
--- a/web3.js/test/nonce.test.js
+++ b/web3.js/test/nonce.test.js
@ -84,7 +84,7 @@ test('create and query nonce account', async () => {
  const balance = await connection.getBalance(from.publicKey);
  expect(balance).toBe(minimumAmount * 2);

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -103,7 +103,7 @@ test('create and query nonce account', async () => {
    authorizedPubkey: from.publicKey,
    lamports: minimumAmount,
  });
-  await connection.sendTransaction(transaction, [from, nonceAccount]);
+  await connection.sendTransaction(transaction, [from, nonceAccount], {skipPreflight: true});

  mockRpc.push([
    url,
@ -201,7 +201,7 @@ test('create and query nonce account with seed', async () => {
  const balance = await connection.getBalance(from.publicKey);
  expect(balance).toBe(minimumAmount * 2);

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -222,7 +222,7 @@ test('create and query nonce account with seed', async () => {
    authorizedPubkey: from.publicKey,
    lamports: minimumAmount,
  });
-  await connection.sendTransaction(transaction, [from]);
+  await connection.sendTransaction(transaction, [from], {skipPreflight: true});

  mockRpc.push([
    url,
--- a/web3.js/test/stake-program.test.js
+++ b/web3.js/test/stake-program.test.js
@ -272,7 +272,7 @@ test('live staking actions', async () => {
      connection,
      createAndInitialize,
      [from, newStakeAccount],
-      0,
+      {confirmations: 0, skipPreflight: true},
    );
    expect(await connection.getBalance(newStakeAccount.publicKey)).toEqual(
      minimumAmount + 42,
@ -283,7 +283,10 @@ test('live staking actions', async () => {
      authorizedPubkey: authorized.publicKey,
      votePubkey,
    });
-    await sendAndConfirmTransaction(connection, delegation, [authorized], 0);
+    await sendAndConfirmTransaction(connection, delegation, [authorized], {
+      confirmations: 0,
+      skipPreflight: true,
+    });
  }

  // Create Stake account with seed
@ -308,7 +311,7 @@ test('live staking actions', async () => {
    connection,
    createAndInitializeWithSeed,
    [from],
-    0,
+    {confirmations: 0, skipPreflight: true},
  );
  let originalStakeBalance = await connection.getBalance(newAccountPubkey);
  expect(originalStakeBalance).toEqual(3 * minimumAmount + 42);
@ -318,7 +321,10 @@ test('live staking actions', async () => {
    authorizedPubkey: authorized.publicKey,
    votePubkey,
  });
-  await sendAndConfirmTransaction(connection, delegation, [authorized], 0);
+  await sendAndConfirmTransaction(connection, delegation, [authorized], {
+    confirmations: 0,
+    skipPreflight: true,
+  });

  // Test that withdraw fails before deactivation
  const recipient = new Account();
@ -329,7 +335,10 @@ test('live staking actions', async () => {
    lamports: 1000,
  });
  await expect(
-    sendAndConfirmTransaction(connection, withdraw, [authorized], 0),
+    sendAndConfirmTransaction(connection, withdraw, [authorized], {
+      confirmations: 0,
+      skipPreflight: true,
+    }),
  ).rejects.toThrow();

  // Split stake
@ -340,7 +349,10 @@ test('live staking actions', async () => {
    splitStakePubkey: newStake.publicKey,
    lamports: minimumAmount + 20,
  });
-  await sendAndConfirmTransaction(connection, split, [authorized, newStake], 0);
+  await sendAndConfirmTransaction(connection, split, [authorized, newStake], {
+    confirmations: 0,
+    skipPreflight: true,
+  });

  // Authorize to new account
  const newAuthorized = new Account();
@ -352,14 +364,20 @@ test('live staking actions', async () => {
    newAuthorizedPubkey: newAuthorized.publicKey,
    stakeAuthorizationType: StakeAuthorizationLayout.Withdrawer,
  });
-  await sendAndConfirmTransaction(connection, authorize, [authorized], 0);
+  await sendAndConfirmTransaction(connection, authorize, [authorized], {
+    confirmations: 0,
+    skipPreflight: true,
+  });
  authorize = StakeProgram.authorize({
    stakePubkey: newAccountPubkey,
    authorizedPubkey: authorized.publicKey,
    newAuthorizedPubkey: newAuthorized.publicKey,
    stakeAuthorizationType: StakeAuthorizationLayout.Staker,
  });
-  await sendAndConfirmTransaction(connection, authorize, [authorized], 0);
+  await sendAndConfirmTransaction(connection, authorize, [authorized], {
+    confirmations: 0,
+    skipPreflight: true,
+  });

  // Test old authorized can't deactivate
  let deactivateNotAuthorized = StakeProgram.deactivate({
@ -371,7 +389,7 @@ test('live staking actions', async () => {
      connection,
      deactivateNotAuthorized,
      [authorized],
-      0,
+      {confirmations: 0, skipPreflight: true},
    ),
  ).rejects.toThrow();

@ -380,7 +398,10 @@ test('live staking actions', async () => {
    stakePubkey: newAccountPubkey,
    authorizedPubkey: newAuthorized.publicKey,
  });
-  await sendAndConfirmTransaction(connection, deactivate, [newAuthorized], 0);
+  await sendAndConfirmTransaction(connection, deactivate, [newAuthorized], {
+    confirmations: 0,
+    skipPreflight: true,
+  });

  // Test that withdraw succeeds after deactivation
  withdraw = StakeProgram.withdraw({
@ -389,7 +410,10 @@ test('live staking actions', async () => {
    toPubkey: recipient.publicKey,
    lamports: minimumAmount + 20,
  });
-  await sendAndConfirmTransaction(connection, withdraw, [newAuthorized], 0);
+  await sendAndConfirmTransaction(connection, withdraw, [newAuthorized], {
+    confirmations: 0,
+    skipPreflight: true,
+  });
  const balance = await connection.getBalance(newAccountPubkey);
  expect(balance).toEqual(minimumAmount + 2);
  const recipientBalance = await connection.getBalance(recipient.publicKey);
--- a/web3.js/test/system-program.test.js
+++ b/web3.js/test/system-program.test.js
@ -297,7 +297,7 @@ test('live Nonce actions', async () => {
    connection,
    createNonceAccount,
    [from, nonceAccount],
-    0,
+    {confirmations: 0, skipPreflight: true},
  );
  const nonceBalance = await connection.getBalance(nonceAccount.publicKey);
  expect(nonceBalance).toEqual(minimumAmount);
@ -325,7 +325,10 @@ test('live Nonce actions', async () => {
      authorizedPubkey: from.publicKey,
    }),
  );
-  await sendAndConfirmTransaction(connection, advanceNonce, [from], 0);
+  await sendAndConfirmTransaction(connection, advanceNonce, [from], {
+    confirmations: 0,
+    skipPreflight: true,
+  });
  const nonceQuery3 = await connection.getNonce(nonceAccount.publicKey);
  if (nonceQuery3 === null) {
    expect(nonceQuery3).not.toBeNull();
@ -344,7 +347,10 @@ test('live Nonce actions', async () => {
      newAuthorizedPubkey: newAuthority.publicKey,
    }),
  );
-  await sendAndConfirmTransaction(connection, authorizeNonce, [from], 0);
+  await sendAndConfirmTransaction(connection, authorizeNonce, [from], {
+    confirmations: 0,
+    skipPreflight: true,
+  });

  let transfer = SystemProgram.transfer({
    fromPubkey: from.publicKey,
@ -359,12 +365,10 @@ test('live Nonce actions', async () => {
    }),
  };

-  await sendAndConfirmTransaction(
-    connection,
-    transfer,
-    [from, newAuthority],
-    0,
-  );
+  await sendAndConfirmTransaction(connection, transfer, [from, newAuthority], {
+    confirmations: 0,
+    skipPreflight: true,
+  });
  const toBalance = await connection.getBalance(to.publicKey);
  expect(toBalance).toEqual(minimumAmount);

@ -380,7 +384,10 @@ test('live Nonce actions', async () => {
      toPubkey: withdrawAccount.publicKey,
    }),
  );
-  await sendAndConfirmTransaction(connection, withdrawNonce, [newAuthority], 0);
+  await sendAndConfirmTransaction(connection, withdrawNonce, [newAuthority], {
+    confirmations: 0,
+    skipPreflight: true,
+  });
  expect(await connection.getBalance(nonceAccount.publicKey)).toEqual(0);
  const withdrawBalance = await connection.getBalance(
    withdrawAccount.publicKey,
--- a/web3.js/test/transaction-payer.test.js
+++ b/web3.js/test/transaction-payer.test.js
@ -86,7 +86,7 @@ test('transaction-payer', async () => {
  ]);
  await connection.requestAirdrop(accountTo.publicKey, minimumAmount + 21);

-  mockGetRecentBlockhash('recent');
+  mockGetRecentBlockhash('max');
  mockRpc.push([
    url,
    {
@ -108,7 +108,7 @@ test('transaction-payer', async () => {
  const signature = await connection.sendTransaction(transaction, [
    accountPayer,
    accountFrom,
-  ]);
+  ], {skipPreflight: true});

  mockRpc.push([
    url,