@solana/transactions 2.0.0-experimental.d554dd4 → 2.0.0-experimental.dc614af

package/dist/index.development.js

@@ -493,6 +493,20 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
 
+  // src/unsigned-transaction.ts
+  function getUnsignedTransaction(transaction) {
+    if ("signatures" in transaction) {
+      const {
+        signatures: _,
+        // eslint-disable-line @typescript-eslint/no-unused-vars
+        ...unsignedTransaction
+      } = transaction;
+      return unsignedTransaction;
+    } else {
+      return transaction;
+    }
+  }
+
   // src/blockhash.ts
   function assertIsBlockhash(putativeBlockhash) {
     try {
@@ -514,6 +528,17 @@ this.globalThis.solanaWeb3 = (function (exports) {
       });
     }
   }
+  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
+    if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
+      return transaction;
+    }
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      lifetimeConstraint: blockhashLifetimeConstraint
+    };
+    Object.freeze(out);
+    return out;
+  }
 
   // src/create-transaction.ts
   function createTransaction({
@@ -527,82 +552,120 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return out;
   }
 
+  // ../instructions/dist/index.browser.js
+  var AccountRole = /* @__PURE__ */ ((AccountRole2) => {
+    AccountRole2[AccountRole2["WRITABLE_SIGNER"] = /* 3 */
+    3] = "WRITABLE_SIGNER";
+    AccountRole2[AccountRole2["READONLY_SIGNER"] = /* 2 */
+    2] = "READONLY_SIGNER";
+    AccountRole2[AccountRole2["WRITABLE"] = /* 1 */
+    1] = "WRITABLE";
+    AccountRole2[AccountRole2["READONLY"] = /* 0 */
+    0] = "READONLY";
+    return AccountRole2;
+  })(AccountRole || {});
+  var IS_WRITABLE_BITMASK = 1;
+  function isSignerRole(role) {
+    return role >= 2;
+  }
+  function isWritableRole(role) {
+    return (role & IS_WRITABLE_BITMASK) !== 0;
+  }
+  function mergeRoles(roleA, roleB) {
+    return roleA | roleB;
+  }
+
+  // src/durable-nonce.ts
+  var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
+  var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
+  function assertIsDurableNonceTransaction(transaction) {
+    if (!isDurableNonceTransaction(transaction)) {
+      throw new Error("Transaction is not a durable nonce transaction");
+    }
+  }
+  function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
+    return {
+      accounts: [
+        { address: nonceAccountAddress, role: AccountRole.WRITABLE },
+        {
+          address: RECENT_BLOCKHASHES_SYSVAR_ADDRESS,
+          role: AccountRole.READONLY
+        },
+        { address: nonceAuthorityAddress, role: AccountRole.READONLY_SIGNER }
+      ],
+      data: new Uint8Array([4, 0, 0, 0]),
+      programAddress: SYSTEM_PROGRAM_ADDRESS
+    };
+  }
+  function isAdvanceNonceAccountInstruction(instruction) {
+    return instruction.programAddress === SYSTEM_PROGRAM_ADDRESS && // Test for `AdvanceNonceAccount` instruction data
+    instruction.data != null && isAdvanceNonceAccountInstructionData(instruction.data) && // Test for exactly 3 accounts
+    instruction.accounts?.length === 3 && // First account is nonce account address
+    instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
+    instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
+    instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole.READONLY_SIGNER;
+  }
+  function isAdvanceNonceAccountInstructionData(data) {
+    return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
+  }
+  function isDurableNonceTransaction(transaction) {
+    return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
+  }
+  function setTransactionLifetimeUsingDurableNonce({
+    nonce,
+    nonceAccountAddress,
+    nonceAuthorityAddress
+  }, transaction) {
+    const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
+    if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
+      return transaction;
+    }
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      instructions: [
+        createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+        ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
+      ],
+      lifetimeConstraint: {
+        nonce
+      }
+    };
+    Object.freeze(out);
+    return out;
+  }
+
   // src/fee-payer.ts
   function setTransactionFeePayer(feePayer, transaction) {
     if ("feePayer" in transaction && feePayer === transaction.feePayer) {
       return transaction;
     }
-    let out;
-    if ("signatures" in transaction) {
-      const {
-        signatures: _,
-        // eslint-disable-line @typescript-eslint/no-unused-vars
-        ...unsignedTransaction
-      } = transaction;
-      out = {
-        ...unsignedTransaction,
-        feePayer
-      };
-    } else {
-      out = {
-        ...transaction,
-        feePayer
-      };
-    }
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      feePayer
+    };
     Object.freeze(out);
     return out;
   }
 
   // src/instructions.ts
-  function replaceInstructions(transaction, nextInstructions) {
-    let out;
-    if ("signatures" in transaction) {
-      const {
-        signatures: _,
-        // eslint-disable-line @typescript-eslint/no-unused-vars
-        ...unsignedTransaction
-      } = transaction;
-      out = {
-        ...unsignedTransaction,
-        instructions: nextInstructions
-      };
-    } else {
-      out = {
-        ...transaction,
-        instructions: nextInstructions
-      };
-    }
-    return out;
-  }
   function appendTransactionInstruction(instruction, transaction) {
-    const nextInstructions = [...transaction.instructions, instruction];
-    const out = replaceInstructions(transaction, nextInstructions);
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      instructions: [...transaction.instructions, instruction]
+    };
     Object.freeze(out);
     return out;
   }
   function prependTransactionInstruction(instruction, transaction) {
-    const nextInstructions = [instruction, ...transaction.instructions];
-    const out = replaceInstructions(transaction, nextInstructions);
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      instructions: [instruction, ...transaction.instructions]
+    };
     Object.freeze(out);
     return out;
   }
-  function getBase58EncodedAddressCodec(config) {
-    return string({
-      description: config?.description ?? ("A 32-byte account address" ),
-      encoding: base58,
-      size: 32
-    });
-  }
-  function getBase58EncodedAddressComparator() {
-    return new Intl.Collator("en", {
-      caseFirst: "lower",
-      ignorePunctuation: false,
-      localeMatcher: "best fit",
-      numeric: false,
-      sensitivity: "variant",
-      usage: "sort"
-    }).compare;
-  }
+
+  // ../assertions/dist/index.browser.js
   function assertIsSecureContext() {
     if (!globalThis.isSecureContext) {
       throw new Error(
@@ -622,7 +685,24 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("No signing implementation could be found");
     }
   }
-  async function getBase58EncodedAddressFromPublicKey(publicKey) {
+  function getBase58EncodedAddressCodec(config) {
+    return string({
+      description: config?.description ?? ("A 32-byte account address" ),
+      encoding: base58,
+      size: 32
+    });
+  }
+  function getBase58EncodedAddressComparator() {
+    return new Intl.Collator("en", {
+      caseFirst: "lower",
+      ignorePunctuation: false,
+      localeMatcher: "best fit",
+      numeric: false,
+      sensitivity: "variant",
+      usage: "sort"
+    }).compare;
+  }
+  async function getAddressFromPublicKey(publicKey) {
     await assertKeyExporterIsAvailable();
     if (publicKey.type !== "public" || publicKey.algorithm.name !== "Ed25519") {
       throw new Error("The `CryptoKey` must be an `Ed25519` public key");
@@ -631,35 +711,14 @@ this.globalThis.solanaWeb3 = (function (exports) {
     const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
     return base58EncodedAddress;
   }
+
+  // ../keys/dist/index.browser.js
   async function signBytes(key, data) {
     await assertSigningCapabilityIsAvailable();
     const signedData = await crypto.subtle.sign("Ed25519", key, data);
     return new Uint8Array(signedData);
   }
 
-  // ../instructions/dist/index.browser.js
-  var AccountRole = /* @__PURE__ */ ((AccountRole2) => {
-    AccountRole2[AccountRole2["WRITABLE_SIGNER"] = /* 3 */
-    3] = "WRITABLE_SIGNER";
-    AccountRole2[AccountRole2["READONLY_SIGNER"] = /* 2 */
-    2] = "READONLY_SIGNER";
-    AccountRole2[AccountRole2["WRITABLE"] = /* 1 */
-    1] = "WRITABLE";
-    AccountRole2[AccountRole2["READONLY"] = /* 0 */
-    0] = "READONLY";
-    return AccountRole2;
-  })(AccountRole || {});
-  var IS_WRITABLE_BITMASK = 1;
-  function isSignerRole(role) {
-    return role >= 2;
-  }
-  function isWritableRole(role) {
-    return (role & IS_WRITABLE_BITMASK) !== 0;
-  }
-  function mergeRoles(roleA, roleB) {
-    return roleA | roleB;
-  }
-
   // src/accounts.ts
   function upsert(addressMap, address, update) {
     addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
@@ -1015,7 +1074,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
           )
         ],
         [
-          "addressIndices",
+          "accountIndices",
           array(
             u8({
               description: "The index of an account, according to the well-ordered accounts list for this transaction" 
@@ -1035,23 +1094,23 @@ this.globalThis.solanaWeb3 = (function (exports) {
         ]
       ]),
       (value) => {
-        if (value.addressIndices !== void 0 && value.data !== void 0) {
+        if (value.accountIndices !== void 0 && value.data !== void 0) {
           return value;
         }
         return {
           ...value,
-          addressIndices: value.addressIndices ?? [],
+          accountIndices: value.accountIndices ?? [],
           data: value.data ?? new Uint8Array(0)
         };
       },
       (value) => {
-        if (value.addressIndices.length && value.data.byteLength) {
+        if (value.accountIndices.length && value.data.byteLength) {
           return value;
         }
-        const { addressIndices, data, ...rest } = value;
+        const { accountIndices, data, ...rest } = value;
         return {
           ...rest,
-          ...addressIndices.length ? { addressIndices } : null,
+          ...accountIndices.length ? { accountIndices } : null,
           ...data.byteLength ? { data } : null
         };
       }
@@ -1182,7 +1241,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   async function signTransaction(keyPair, transaction) {
     const compiledMessage = compileMessage(transaction);
     const [signerPublicKey, signature] = await Promise.all([
-      getBase58EncodedAddressFromPublicKey(keyPair.publicKey),
+      getAddressFromPublicKey(keyPair.publicKey),
       getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
     ]);
     const nextSignatures = {
@@ -1252,10 +1311,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   exports.appendTransactionInstruction = appendTransactionInstruction;
   exports.assertIsBlockhash = assertIsBlockhash;
+  exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
   exports.createTransaction = createTransaction;
   exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
   exports.prependTransactionInstruction = prependTransactionInstruction;
   exports.setTransactionFeePayer = setTransactionFeePayer;
+  exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
+  exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
   exports.signTransaction = signTransaction;
 
   return exports;