@solana/compat 2.0.0-experimental.ba21818 → 2.0.0-experimental.be901cf

package/dist/index.browser.cjs

@@ -4,7 +4,76 @@ var functional = require('@solana/functional');
 var instructions = require('@solana/instructions');
 var transactions = require('@solana/transactions');
 
-// src/transaction.ts
+// ../codecs-strings/dist/index.browser.js
+function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+  if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+    throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
+  }
+}
+var getBaseXEncoder = (alphabet4) => {
+  const base = alphabet4.length;
+  const baseBigInt = BigInt(base);
+  return {
+    description: `base${base}`,
+    encode(value) {
+      assertValidBaseString(alphabet4, value);
+      if (value === "")
+        return new Uint8Array();
+      const chars = [...value];
+      let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
+      trailIndex = trailIndex === -1 ? chars.length : trailIndex;
+      const leadingZeroes = Array(trailIndex).fill(0);
+      if (trailIndex === chars.length)
+        return Uint8Array.from(leadingZeroes);
+      const tailChars = chars.slice(trailIndex);
+      let base10Number = 0n;
+      let baseXPower = 1n;
+      for (let i = tailChars.length - 1; i >= 0; i -= 1) {
+        base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
+        baseXPower *= baseBigInt;
+      }
+      const tailBytes = [];
+      while (base10Number > 0n) {
+        tailBytes.unshift(Number(base10Number % 256n));
+        base10Number /= 256n;
+      }
+      return Uint8Array.from(leadingZeroes.concat(tailBytes));
+    },
+    fixedSize: null,
+    maxSize: null
+  };
+};
+var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+
+// ../addresses/dist/index.browser.js
+var memoizedBase58Encoder;
+function getMemoizedBase58Encoder() {
+  if (!memoizedBase58Encoder)
+    memoizedBase58Encoder = getBase58Encoder();
+  return memoizedBase58Encoder;
+}
+function assertIsAddress(putativeBase58EncodedAddress) {
+  try {
+    if (
+      // Lowest address (32 bytes of zeroes)
+      putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
+      putativeBase58EncodedAddress.length > 44
+    ) {
+      throw new Error("Expected input string to decode to a byte array of length 32.");
+    }
+    const base58Encoder = getMemoizedBase58Encoder();
+    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 32) {
+      throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
+    }
+  } catch (e2) {
+    throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
+      cause: e2
+    });
+  }
+}
 function convertAccount(message, accountKeys, accountIndex) {
   const accountPublicKey = accountKeys.get(accountIndex);
   if (!accountPublicKey) {
@@ -68,7 +137,45 @@ function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight
     (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
   );
 }
+function fromVersionedTransactionWithDurableNonce(transaction) {
+  if (transaction.message.addressTableLookups.length > 0) {
+    throw new Error("Cannot convert transaction with addressTableLookups");
+  }
+  const accountKeys = transaction.message.getAccountKeys();
+  const feePayer = accountKeys.staticAccountKeys[0];
+  if (!feePayer)
+    throw new Error("No fee payer set in VersionedTransaction");
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  if (instructions.length === 0) {
+    throw new Error("transaction with no instructions cannot be durable nonce transaction");
+  }
+  if (!transactions.isAdvanceNonceAccountInstruction(instructions[0])) {
+    throw new Error("transaction first instruction is not advance nonce account instruction");
+  }
+  const nonceAccountAddress = instructions[0].accounts[0].address;
+  assertIsAddress(nonceAccountAddress);
+  const nonceAuthorityAddress = instructions[0].accounts[2].address;
+  assertIsAddress(nonceAuthorityAddress);
+  const durableNonceLifetime = {
+    nonce: transaction.message.recentBlockhash,
+    nonceAccountAddress,
+    nonceAuthorityAddress
+  };
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return functional.pipe(
+    transactions.createTransaction({ version: transaction.version }),
+    (tx) => transactions.setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => transactions.setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),
+    (tx) => instructions.slice(1).reduce((acc, instruction) => {
+      return transactions.appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
 
 exports.fromVersionedTransactionWithBlockhash = fromVersionedTransactionWithBlockhash;
+exports.fromVersionedTransactionWithDurableNonce = fromVersionedTransactionWithDurableNonce;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.cjs.map

package/dist/index.browser.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transaction.ts"],"names":[],"mappings":";AACA,SAAS,YAAY;AAErB,SAAS,mBAAmB;AAS5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AASP,SAAS,eACL,SACA,aACA,cACY;AACZ,QAAM,mBAAmB,YAAY,IAAI,YAAY;AACrD,MAAI,CAAC,kBAAkB;AAEnB,UAAM,IAAI,MAAM,2CAA2C,YAAY,EAAE;AAAA,EAC7E;AACA,QAAM,WAAW,QAAQ,gBAAgB,YAAY;AACrD,QAAM,aAAa,QAAQ,kBAAkB,YAAY;AAEzD,QAAM,OAAO,WACP,aACI,YAAY,kBACZ,YAAY,kBAChB,aACA,YAAY,WACZ,YAAY;AAElB,SAAO;AAAA,IACH,SAAS,iBAAiB,SAAS;AAAA,IACnC;AAAA,EACJ;AACJ;AAEA,SAAS,mBACL,SACA,aACA,aACY;AACZ,QAAM,0BAA0B,YAAY,IAAI,YAAY,cAAc;AAC1E,MAAI,CAAC,yBAAyB;AAE1B,UAAM,IAAI,MAAM,2CAA2C,YAAY,cAAc,EAAE;AAAA,EAC3F;AAEA,QAAM,WAAW,YAAY,kBAAkB;AAAA,IAAI,kBAC/C,eAAe,SAAS,aAAa,YAAY;AAAA,EACrD;AAEA,SAAO;AAAA,IACH,gBAAgB,wBAAwB,SAAS;AAAA,IACjD,GAAI,SAAS,SAAS,EAAE,SAAS,IAAI,CAAC;AAAA,IACtC,GAAI,YAAY,KAAK,SAAS,EAAE,MAAM,YAAY,KAAK,IAAI,CAAC;AAAA,EAChE;AACJ;AAEA,SAAS,kBACL,aACA,mBACwC;AACxC,SAAO,YAAY,WAAW,OAAO,CAAC,KAAK,KAAK,UAAU;AAGtD,UAAM,WAAW,IAAI,MAAM,UAAQ,SAAS,CAAC;AAC7C,QAAI;AAAU,aAAO;AAErB,UAAM,UAAU,kBAAkB,KAAK,EAAE,SAAS;AAClD,WAAO,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,IAAwB;AAAA,EACxD,GAAG,CAAC,CAAC;AACT;AAEO,SAAS,sCACZ,aACA,sBAC0E;AAI1E,MAAI,YAAY,QAAQ,oBAAoB,SAAS,GAAG;AAEpD,UAAM,IAAI,MAAM,qDAAqD;AAAA,EACzE;AAEA,QAAM,cAAc,YAAY,QAAQ,eAAe;AAGvD,QAAM,WAAW,YAAY,kBAAkB,CAAC;AAEhD,MAAI,CAAC;AAAU,UAAM,IAAI,MAAM,0CAA0C;AAGzE,QAAM,oBAAoB;AAAA,IACtB,WAAW,YAAY,QAAQ;AAAA,IAC/B,sBAAsB,wBAAwB,MAAM,MAAM;AAAA;AAAA,EAC9D;AAEA,QAAM,eAAe,YAAY,QAAQ,qBAAqB;AAAA,IAAI,iBAC9D,mBAAmB,YAAY,SAAS,aAAa,WAAW;AAAA,EACpE;AAEA,QAAM,aAAa,kBAAkB,aAAa,YAAY,iBAAiB;AAE/E,SAAO;AAAA,IACH,kBAAkB,EAAE,SAAS,YAAY,QAAQ,CAAC;AAAA,IAClD,QAAM,uBAAuB,SAAS,SAAS,GAA2B,EAAE;AAAA,IAC5E,QAAM,qCAAqC,mBAAmB,EAAE;AAAA,IAChE,QACI,aAAa,OAAO,CAAC,KAAK,gBAAgB;AACtC,aAAO,6BAA6B,aAAa,GAAG;AAAA,IACxD,GAAG,EAAE;AAAA,IACT,QAAO,YAAY,WAAW,SAAS,EAAE,GAAG,IAAI,WAAW,IAAI;AAAA,EACnE;AACJ","sourcesContent":["import type { Base58EncodedAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { Ed25519Signature } from '@solana/keys';\nimport type {\n    Blockhash,\n    ITransactionWithBlockhashLifetime,\n    ITransactionWithFeePayer,\n    ITransactionWithSignatures,\n    Transaction,\n} from '@solana/transactions';\nimport {\n    appendTransactionInstruction,\n    createTransaction,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n        ? AccountRole.WRITABLE\n        : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Base58EncodedAddress,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex)\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Base58EncodedAddress,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[]\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Base58EncodedAddress;\n        return { ...acc, [address]: sig as Ed25519Signature };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    // TOOD: add support for durable nonce transactions\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n"]}
+{"version":3,"sources":["../../codecs-strings/dist/index.browser.js","../../addresses/src/address.ts","../src/transaction.ts"],"names":["e"],"mappings":";AAIA,SAAS,sBAAsB,WAAW,WAAW,aAAa,WAAW;AAC3E,MAAI,CAAC,UAAU,MAAM,IAAI,OAAO,KAAK,SAAS,KAAK,CAAC,GAAG;AACrD,UAAM,IAAI,MAAM,6BAA6B,UAAU,MAAM,UAAU,UAAU,IAAI;AAAA,EACvF;AACF;AACA,IAAI,kBAAkB,CAAC,cAAc;AACnC,QAAM,OAAO,UAAU;AACvB,QAAM,aAAa,OAAO,IAAI;AAC9B,SAAO;AAAA,IACL,aAAa,OAAO,IAAI;AAAA,IACxB,OAAO,OAAO;AACZ,4BAAsB,WAAW,KAAK;AACtC,UAAI,UAAU;AACZ,eAAO,IAAI,WAAW;AACxB,YAAM,QAAQ,CAAC,GAAG,KAAK;AACvB,UAAI,aAAa,MAAM,UAAU,CAAC,MAAM,MAAM,UAAU,CAAC,CAAC;AAC1D,mBAAa,eAAe,KAAK,MAAM,SAAS;AAChD,YAAM,gBAAgB,MAAM,UAAU,EAAE,KAAK,CAAC;AAC9C,UAAI,eAAe,MAAM;AACvB,eAAO,WAAW,KAAK,aAAa;AACtC,YAAM,YAAY,MAAM,MAAM,UAAU;AACxC,UAAI,eAAe;AACnB,UAAI,aAAa;AACjB,eAAS,IAAI,UAAU,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG;AACjD,wBAAgB,aAAa,OAAO,UAAU,QAAQ,UAAU,CAAC,CAAC,CAAC;AACnE,sBAAc;AAAA,MAChB;AACA,YAAM,YAAY,CAAC;AACnB,aAAO,eAAe,IAAI;AACxB,kBAAU,QAAQ,OAAO,eAAe,IAAI,CAAC;AAC7C,wBAAgB;AAAA,MAClB;AACA,aAAO,WAAW,KAAK,cAAc,OAAO,SAAS,CAAC;AAAA,IACxD;AAAA,IACA,WAAW;AAAA,IACX,SAAS;AAAA,EACX;AACF;AAyDA,IAAI,YAAY;AAChB,IAAI,mBAAmB,MAAM,gBAAgB,SAAS;AAuFtD,IAAI,IAAI,WAAW;AACnB,IAAI,IAAI,WAAW;;;ACjLnB,IAAA;AACgC,SAAA,2BAAwB;AACpD,MAAA,CAAA;AACJ,4BAAA,iBAAA;AAEA,SAAS;AACL;AA+BI,SAAA,gBAAA,8BAAA;AAAA,MAAA;AAAA;;MAKE,6BAAA,SAAA;MACE,6BAAgB,SAAA;MACpB;AAEA,YAAM,IAAA,MAAA,+DAAyC;IAC/C;AACA,UAAM,gBAAW,yBAAM;AACvB,UAAI,QAAA,cAAiB,OAAA,4BAAA;AACjB,UAAA,WAAU,MAAM;AACpB,QAAA,aAAA,IAAA;AACJ,YAAS,IAAG,MAAA,gFAAA,QAAA,EAAA;IACR;EAAwF,SACpFA,IAAO;AACX,UAAC,IAAA,MAAA,KAAA,4BAAA,uCAAA;MACL,OAAAA;IACJ,CAAA;EAEO;AAGH;;;ACvEJ,SAAS,YAAY;AAErB,SAAS,mBAAmB;AAE5B;AAAA,EACI;AAAA,EAEA;AAAA,EAEA;AAAA,EAKA;AAAA,EACA;AAAA,EACA;AAAA,OAEG;AASP,SAAS,eACL,SACA,aACA,cACY;AACZ,QAAM,mBAAmB,YAAY,IAAI,YAAY;AACrD,MAAI,CAAC,kBAAkB;AAEnB,UAAM,IAAI,MAAM,2CAA2C,YAAY,EAAE;AAAA,EAC7E;AACA,QAAM,WAAW,QAAQ,gBAAgB,YAAY;AACrD,QAAM,aAAa,QAAQ,kBAAkB,YAAY;AAEzD,QAAM,OAAO,WACP,aACI,YAAY,kBACZ,YAAY,kBAChB,aACA,YAAY,WACZ,YAAY;AAElB,SAAO;AAAA,IACH,SAAS,iBAAiB,SAAS;AAAA,IACnC;AAAA,EACJ;AACJ;AAEA,SAAS,mBACL,SACA,aACA,aACY;AACZ,QAAM,0BAA0B,YAAY,IAAI,YAAY,cAAc;AAC1E,MAAI,CAAC,yBAAyB;AAE1B,UAAM,IAAI,MAAM,2CAA2C,YAAY,cAAc,EAAE;AAAA,EAC3F;AAEA,QAAM,WAAW,YAAY,kBAAkB;AAAA,IAAI,kBAC/C,eAAe,SAAS,aAAa,YAAY;AAAA,EACrD;AAEA,SAAO;AAAA,IACH,gBAAgB,wBAAwB,SAAS;AAAA,IACjD,GAAI,SAAS,SAAS,EAAE,SAAS,IAAI,CAAC;AAAA,IACtC,GAAI,YAAY,KAAK,SAAS,EAAE,MAAM,YAAY,KAAK,IAAI,CAAC;AAAA,EAChE;AACJ;AAEA,SAAS,kBACL,aACA,mBACwC;AACxC,SAAO,YAAY,WAAW,OAAO,CAAC,KAAK,KAAK,UAAU;AAGtD,UAAM,WAAW,IAAI,MAAM,UAAQ,SAAS,CAAC;AAC7C,QAAI;AAAU,aAAO;AAErB,UAAM,UAAU,kBAAkB,KAAK,EAAE,SAAS;AAClD,WAAO,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,IAAwB;AAAA,EACxD,GAAG,CAAC,CAAC;AACT;AAEO,SAAS,sCACZ,aACA,sBAC0E;AAI1E,MAAI,YAAY,QAAQ,oBAAoB,SAAS,GAAG;AAEpD,UAAM,IAAI,MAAM,qDAAqD;AAAA,EACzE;AAEA,QAAM,cAAc,YAAY,QAAQ,eAAe;AAGvD,QAAM,WAAW,YAAY,kBAAkB,CAAC;AAEhD,MAAI,CAAC;AAAU,UAAM,IAAI,MAAM,0CAA0C;AAGzE,QAAM,oBAAoB;AAAA,IACtB,WAAW,YAAY,QAAQ;AAAA,IAC/B,sBAAsB,wBAAwB,MAAM,MAAM;AAAA;AAAA,EAC9D;AAEA,QAAM,eAAe,YAAY,QAAQ,qBAAqB;AAAA,IAAI,iBAC9D,mBAAmB,YAAY,SAAS,aAAa,WAAW;AAAA,EACpE;AAEA,QAAM,aAAa,kBAAkB,aAAa,YAAY,iBAAiB;AAE/E,SAAO;AAAA,IACH,kBAAkB,EAAE,SAAS,YAAY,QAAQ,CAAC;AAAA,IAClD,QAAM,uBAAuB,SAAS,SAAS,GAA2B,EAAE;AAAA,IAC5E,QAAM,qCAAqC,mBAAmB,EAAE;AAAA,IAChE,QACI,aAAa,OAAO,CAAC,KAAK,gBAAgB;AACtC,aAAO,6BAA6B,aAAa,GAAG;AAAA,IACxD,GAAG,EAAE;AAAA,IACT,QAAO,YAAY,WAAW,SAAS,EAAE,GAAG,IAAI,WAAW,IAAI;AAAA,EACnE;AACJ;AAEO,SAAS,yCACZ,aACiE;AAIjE,MAAI,YAAY,QAAQ,oBAAoB,SAAS,GAAG;AAEpD,UAAM,IAAI,MAAM,qDAAqD;AAAA,EACzE;AAEA,QAAM,cAAc,YAAY,QAAQ,eAAe;AAGvD,QAAM,WAAW,YAAY,kBAAkB,CAAC;AAEhD,MAAI,CAAC;AAAU,UAAM,IAAI,MAAM,0CAA0C;AAEzE,QAAM,eAAe,YAAY,QAAQ,qBAAqB;AAAA,IAAI,iBAC9D,mBAAmB,YAAY,SAAS,aAAa,WAAW;AAAA,EACpE;AAGA,MAAI,aAAa,WAAW,GAAG;AAE3B,UAAM,IAAI,MAAM,sEAAsE;AAAA,EAC1F;AAEA,MAAI,CAAC,iCAAiC,aAAa,CAAC,CAAC,GAAG;AAEpD,UAAM,IAAI,MAAM,wEAAwE;AAAA,EAC5F;AAGA,QAAM,sBAAsB,aAAa,CAAC,EAAE,SAAU,CAAC,EAAE;AACzD,kBAAgB,mBAAmB;AAEnC,QAAM,wBAAwB,aAAa,CAAC,EAAE,SAAU,CAAC,EAAE;AAC3D,kBAAgB,qBAAqB;AAErC,QAAM,uBAAuB;AAAA,IACzB,OAAO,YAAY,QAAQ;AAAA,IAC3B;AAAA,IACA;AAAA,EACJ;AAEA,QAAM,aAAa,kBAAkB,aAAa,YAAY,iBAAiB;AAE/E,SAAO;AAAA,IACH,kBAAkB,EAAE,SAAS,YAAY,QAAQ,CAAC;AAAA,IAClD,QAAM,uBAAuB,SAAS,SAAS,GAA2B,EAAE;AAAA,IAC5E,QAAM,wCAAwC,sBAAsB,EAAE;AAAA,IACtE,QACI,aAAa,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,gBAAgB;AAC/C,aAAO,6BAA6B,aAAa,GAAG;AAAA,IACxD,GAAG,EAAE;AAAA,IACT,QAAO,YAAY,WAAW,SAAS,EAAE,GAAG,IAAI,WAAW,IAAI;AAAA,EACnE;AACJ","sourcesContent":["import { combineCodec, fixEncoder, mergeBytes, fixDecoder, assertByteArrayIsNotEmptyForCodec, assertByteArrayHasEnoughBytesForCodec } from '@solana/codecs-core';\nimport { getU32Encoder, getU32Decoder } from '@solana/codecs-numbers';\n\n// src/assertions.ts\nfunction assertValidBaseString(alphabet4, testValue, givenValue = testValue) {\n  if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {\n    throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);\n  }\n}\nvar getBaseXEncoder = (alphabet4) => {\n  const base = alphabet4.length;\n  const baseBigInt = BigInt(base);\n  return {\n    description: `base${base}`,\n    encode(value) {\n      assertValidBaseString(alphabet4, value);\n      if (value === \"\")\n        return new Uint8Array();\n      const chars = [...value];\n      let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);\n      trailIndex = trailIndex === -1 ? chars.length : trailIndex;\n      const leadingZeroes = Array(trailIndex).fill(0);\n      if (trailIndex === chars.length)\n        return Uint8Array.from(leadingZeroes);\n      const tailChars = chars.slice(trailIndex);\n      let base10Number = 0n;\n      let baseXPower = 1n;\n      for (let i = tailChars.length - 1; i >= 0; i -= 1) {\n        base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));\n        baseXPower *= baseBigInt;\n      }\n      const tailBytes = [];\n      while (base10Number > 0n) {\n        tailBytes.unshift(Number(base10Number % 256n));\n        base10Number /= 256n;\n      }\n      return Uint8Array.from(leadingZeroes.concat(tailBytes));\n    },\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getBaseXDecoder = (alphabet4) => {\n  const base = alphabet4.length;\n  const baseBigInt = BigInt(base);\n  return {\n    decode(rawBytes, offset = 0) {\n      const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n      if (bytes.length === 0)\n        return [\"\", 0];\n      let trailIndex = bytes.findIndex((n) => n !== 0);\n      trailIndex = trailIndex === -1 ? bytes.length : trailIndex;\n      const leadingZeroes = alphabet4[0].repeat(trailIndex);\n      if (trailIndex === bytes.length)\n        return [leadingZeroes, rawBytes.length];\n      let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);\n      const tailChars = [];\n      while (base10Number > 0n) {\n        tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);\n        base10Number /= baseBigInt;\n      }\n      return [leadingZeroes + tailChars.join(\"\"), rawBytes.length];\n    },\n    description: `base${base}`,\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getBaseXCodec = (alphabet4) => combineCodec(getBaseXEncoder(alphabet4), getBaseXDecoder(alphabet4));\n\n// src/base10.ts\nvar alphabet = \"0123456789\";\nvar getBase10Encoder = () => getBaseXEncoder(alphabet);\nvar getBase10Decoder = () => getBaseXDecoder(alphabet);\nvar getBase10Codec = () => getBaseXCodec(alphabet);\nvar getBase16Encoder = () => ({\n  description: \"base16\",\n  encode(value) {\n    const lowercaseValue = value.toLowerCase();\n    assertValidBaseString(\"0123456789abcdef\", lowercaseValue, value);\n    const matches = lowercaseValue.match(/.{1,2}/g);\n    return Uint8Array.from(matches ? matches.map((byte) => parseInt(byte, 16)) : []);\n  },\n  fixedSize: null,\n  maxSize: null\n});\nvar getBase16Decoder = () => ({\n  decode(bytes, offset = 0) {\n    const value = bytes.slice(offset).reduce((str, byte) => str + byte.toString(16).padStart(2, \"0\"), \"\");\n    return [value, bytes.length];\n  },\n  description: \"base16\",\n  fixedSize: null,\n  maxSize: null\n});\nvar getBase16Codec = () => combineCodec(getBase16Encoder(), getBase16Decoder());\n\n// src/base58.ts\nvar alphabet2 = \"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\";\nvar getBase58Encoder = () => getBaseXEncoder(alphabet2);\nvar getBase58Decoder = () => getBaseXDecoder(alphabet2);\nvar getBase58Codec = () => getBaseXCodec(alphabet2);\nvar getBaseXResliceEncoder = (alphabet4, bits) => ({\n  description: `base${alphabet4.length}`,\n  encode(value) {\n    assertValidBaseString(alphabet4, value);\n    if (value === \"\")\n      return new Uint8Array();\n    const charIndices = [...value].map((c) => alphabet4.indexOf(c));\n    return new Uint8Array(reslice(charIndices, bits, 8, false));\n  },\n  fixedSize: null,\n  maxSize: null\n});\nvar getBaseXResliceDecoder = (alphabet4, bits) => ({\n  decode(rawBytes, offset = 0) {\n    const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n    if (bytes.length === 0)\n      return [\"\", rawBytes.length];\n    const charIndices = reslice([...bytes], 8, bits, true);\n    return [charIndices.map((i) => alphabet4[i]).join(\"\"), rawBytes.length];\n  },\n  description: `base${alphabet4.length}`,\n  fixedSize: null,\n  maxSize: null\n});\nvar getBaseXResliceCodec = (alphabet4, bits) => combineCodec(getBaseXResliceEncoder(alphabet4, bits), getBaseXResliceDecoder(alphabet4, bits));\nfunction reslice(input, inputBits, outputBits, useRemainder) {\n  const output = [];\n  let accumulator = 0;\n  let bitsInAccumulator = 0;\n  const mask = (1 << outputBits) - 1;\n  for (const value of input) {\n    accumulator = accumulator << inputBits | value;\n    bitsInAccumulator += inputBits;\n    while (bitsInAccumulator >= outputBits) {\n      bitsInAccumulator -= outputBits;\n      output.push(accumulator >> bitsInAccumulator & mask);\n    }\n  }\n  if (useRemainder && bitsInAccumulator > 0) {\n    output.push(accumulator << outputBits - bitsInAccumulator & mask);\n  }\n  return output;\n}\nvar getBase64Encoder = () => {\n  {\n    return {\n      description: `base64`,\n      encode(value) {\n        try {\n          const bytes = atob(value).split(\"\").map((c) => c.charCodeAt(0));\n          return new Uint8Array(bytes);\n        } catch (e2) {\n          throw new Error(`Expected a string of base 64, got [${value}].`);\n        }\n      },\n      fixedSize: null,\n      maxSize: null\n    };\n  }\n};\nvar getBase64Decoder = () => {\n  {\n    return {\n      decode(bytes, offset = 0) {\n        const slice = bytes.slice(offset);\n        const value = btoa(String.fromCharCode(...slice));\n        return [value, bytes.length];\n      },\n      description: `base64`,\n      fixedSize: null,\n      maxSize: null\n    };\n  }\n};\nvar getBase64Codec = () => combineCodec(getBase64Encoder(), getBase64Decoder());\n\n// src/null-characters.ts\nvar removeNullCharacters = (value) => (\n  // eslint-disable-next-line no-control-regex\n  value.replace(/\\u0000/g, \"\")\n);\nvar padNullCharacters = (value, chars) => value.padEnd(chars, \"\\0\");\n\n// ../text-encoding-impl/dist/index.browser.js\nvar e = globalThis.TextDecoder;\nvar o = globalThis.TextEncoder;\n\n// src/utf8.ts\nvar getUtf8Encoder = () => {\n  let textEncoder;\n  return {\n    description: \"utf8\",\n    encode: (value) => new Uint8Array((textEncoder || (textEncoder = new o())).encode(value)),\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getUtf8Decoder = () => {\n  let textDecoder;\n  return {\n    decode(bytes, offset = 0) {\n      const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));\n      return [removeNullCharacters(value), bytes.length];\n    },\n    description: \"utf8\",\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getUtf8Codec = () => combineCodec(getUtf8Encoder(), getUtf8Decoder());\n\n// src/string.ts\nvar getStringEncoder = (options = {}) => {\n  const size = options.size ?? getU32Encoder();\n  const encoding = options.encoding ?? getUtf8Encoder();\n  const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;\n  if (size === \"variable\") {\n    return { ...encoding, description };\n  }\n  if (typeof size === \"number\") {\n    return fixEncoder(encoding, size, description);\n  }\n  return {\n    description,\n    encode: (value) => {\n      const contentBytes = encoding.encode(value);\n      const lengthBytes = size.encode(contentBytes.length);\n      return mergeBytes([lengthBytes, contentBytes]);\n    },\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getStringDecoder = (options = {}) => {\n  const size = options.size ?? getU32Decoder();\n  const encoding = options.encoding ?? getUtf8Decoder();\n  const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;\n  if (size === \"variable\") {\n    return { ...encoding, description };\n  }\n  if (typeof size === \"number\") {\n    return fixDecoder(encoding, size, description);\n  }\n  return {\n    decode: (bytes, offset = 0) => {\n      assertByteArrayIsNotEmptyForCodec(\"string\", bytes, offset);\n      const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);\n      const length = Number(lengthBigInt);\n      offset = lengthOffset;\n      const contentBytes = bytes.slice(offset, offset + length);\n      assertByteArrayHasEnoughBytesForCodec(\"string\", length, contentBytes);\n      const [value, contentOffset] = encoding.decode(contentBytes);\n      offset += contentOffset;\n      return [value, offset];\n    },\n    description,\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getStringCodec = (options = {}) => combineCodec(getStringEncoder(options), getStringDecoder(options));\nfunction getSizeDescription(size) {\n  return typeof size === \"object\" ? size.description : `${size}`;\n}\n\nexport { assertValidBaseString, getBase10Codec, getBase10Decoder, getBase10Encoder, getBase16Codec, getBase16Decoder, getBase16Encoder, getBase58Codec, getBase58Decoder, getBase58Encoder, getBase64Codec, getBase64Decoder, getBase64Encoder, getBaseXCodec, getBaseXDecoder, getBaseXEncoder, getBaseXResliceCodec, getBaseXResliceDecoder, getBaseXResliceEncoder, getStringCodec, getStringDecoder, getStringEncoder, getUtf8Codec, getUtf8Decoder, getUtf8Encoder, padNullCharacters, removeNullCharacters };\n","import { Codec, combineCodec, Decoder, Encoder, mapEncoder } from '@solana/codecs-core';\nimport { getBase58Decoder, getBase58Encoder, getStringDecoder, getStringEncoder } from '@solana/codecs-strings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __brand: unique symbol;\n};\n\nlet memoizedBase58Encoder: Encoder<string> | undefined;\nlet memoizedBase58Decoder: Decoder<string> | undefined;\n\nfunction getMemoizedBase58Encoder(): Encoder<string> {\n    if (!memoizedBase58Encoder) memoizedBase58Encoder = getBase58Encoder();\n    return memoizedBase58Encoder;\n}\n\nfunction getMemoizedBase58Decoder(): Decoder<string> {\n    if (!memoizedBase58Decoder) memoizedBase58Decoder = getBase58Decoder();\n    return memoizedBase58Decoder;\n}\n\nexport function isAddress(\n    putativeBase58EncodedAddress: string\n): putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    // Fast-path; see if the input string is of an acceptable length.\n    if (\n        // Lowest address (32 bytes of zeroes)\n        putativeBase58EncodedAddress.length < 32 ||\n        // Highest address (32 bytes of 255)\n        putativeBase58EncodedAddress.length > 44\n    ) {\n        return false;\n    }\n    // Slow-path; actually attempt to decode the input string.\n    const base58Encoder = getMemoizedBase58Encoder();\n    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n    const numBytes = bytes.byteLength;\n    if (numBytes !== 32) {\n        return false;\n    }\n    return true;\n}\n\nexport function assertIsAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const base58Encoder = getMemoizedBase58Encoder();\n        const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function address<TAddress extends string = string>(\n    putativeBase58EncodedAddress: TAddress\n): Base58EncodedAddress<TAddress> {\n    assertIsAddress(putativeBase58EncodedAddress);\n    return putativeBase58EncodedAddress as Base58EncodedAddress<TAddress>;\n}\n\nexport function getAddressEncoder(config?: Readonly<{ description: string }>): Encoder<Base58EncodedAddress> {\n    return mapEncoder(\n        getStringEncoder({\n            description: config?.description ?? 'Base58EncodedAddress',\n            encoding: getMemoizedBase58Encoder(),\n            size: 32,\n        }),\n        putativeAddress => address(putativeAddress)\n    );\n}\n\nexport function getAddressDecoder(config?: Readonly<{ description: string }>): Decoder<Base58EncodedAddress> {\n    return getStringDecoder({\n        description: config?.description ?? 'Base58EncodedAddress',\n        encoding: getMemoizedBase58Decoder(),\n        size: 32,\n    }) as Decoder<Base58EncodedAddress>;\n}\n\nexport function getAddressCodec(config?: Readonly<{ description: string }>): Codec<Base58EncodedAddress> {\n    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));\n}\n\nexport function getAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n","import { assertIsAddress, type Base58EncodedAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { Ed25519Signature } from '@solana/keys';\nimport {\n    appendTransactionInstruction,\n    type Blockhash,\n    createTransaction,\n    type IDurableNonceTransaction,\n    isAdvanceNonceAccountInstruction,\n    type ITransactionWithBlockhashLifetime,\n    type ITransactionWithFeePayer,\n    type ITransactionWithSignatures,\n    type Nonce,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n    setTransactionLifetimeUsingDurableNonce,\n    type Transaction,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n        ? AccountRole.WRITABLE\n        : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Base58EncodedAddress,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex)\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Base58EncodedAddress,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[]\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Base58EncodedAddress;\n        return { ...acc, [address]: sig as Ed25519Signature };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    // TOOD: add support for durable nonce transactions\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n\nexport function fromVersionedTransactionWithDurableNonce(\n    transaction: VersionedTransaction\n): Transaction & ITransactionWithFeePayer & IDurableNonceTransaction {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    // Check first instruction is durable nonce + extract params\n    if (instructions.length === 0) {\n        // TODO: coded error\n        throw new Error('transaction with no instructions cannot be durable nonce transaction');\n    }\n\n    if (!isAdvanceNonceAccountInstruction(instructions[0])) {\n        // TODO: coded error\n        throw new Error('transaction first instruction is not advance nonce account instruction');\n    }\n\n    // We know these accounts are defined because we checked `isAdvanceNonceAccountInstruction`\n    const nonceAccountAddress = instructions[0].accounts![0].address;\n    assertIsAddress(nonceAccountAddress);\n\n    const nonceAuthorityAddress = instructions[0].accounts![2].address;\n    assertIsAddress(nonceAuthorityAddress);\n\n    const durableNonceLifetime = {\n        nonce: transaction.message.recentBlockhash as Nonce,\n        nonceAccountAddress,\n        nonceAuthorityAddress,\n    };\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),\n        tx =>\n            instructions.slice(1).reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n"]}

package/dist/index.browser.js

@@ -1,8 +1,77 @@
 import { pipe } from '@solana/functional';
 import { AccountRole } from '@solana/instructions';
-import { createTransaction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, appendTransactionInstruction } from '@solana/transactions';
+import { createTransaction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, appendTransactionInstruction, isAdvanceNonceAccountInstruction, setTransactionLifetimeUsingDurableNonce } from '@solana/transactions';
 
-// src/transaction.ts
+// ../codecs-strings/dist/index.browser.js
+function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+  if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+    throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
+  }
+}
+var getBaseXEncoder = (alphabet4) => {
+  const base = alphabet4.length;
+  const baseBigInt = BigInt(base);
+  return {
+    description: `base${base}`,
+    encode(value) {
+      assertValidBaseString(alphabet4, value);
+      if (value === "")
+        return new Uint8Array();
+      const chars = [...value];
+      let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
+      trailIndex = trailIndex === -1 ? chars.length : trailIndex;
+      const leadingZeroes = Array(trailIndex).fill(0);
+      if (trailIndex === chars.length)
+        return Uint8Array.from(leadingZeroes);
+      const tailChars = chars.slice(trailIndex);
+      let base10Number = 0n;
+      let baseXPower = 1n;
+      for (let i = tailChars.length - 1; i >= 0; i -= 1) {
+        base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
+        baseXPower *= baseBigInt;
+      }
+      const tailBytes = [];
+      while (base10Number > 0n) {
+        tailBytes.unshift(Number(base10Number % 256n));
+        base10Number /= 256n;
+      }
+      return Uint8Array.from(leadingZeroes.concat(tailBytes));
+    },
+    fixedSize: null,
+    maxSize: null
+  };
+};
+var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+
+// ../addresses/dist/index.browser.js
+var memoizedBase58Encoder;
+function getMemoizedBase58Encoder() {
+  if (!memoizedBase58Encoder)
+    memoizedBase58Encoder = getBase58Encoder();
+  return memoizedBase58Encoder;
+}
+function assertIsAddress(putativeBase58EncodedAddress) {
+  try {
+    if (
+      // Lowest address (32 bytes of zeroes)
+      putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
+      putativeBase58EncodedAddress.length > 44
+    ) {
+      throw new Error("Expected input string to decode to a byte array of length 32.");
+    }
+    const base58Encoder = getMemoizedBase58Encoder();
+    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 32) {
+      throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
+    }
+  } catch (e2) {
+    throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
+      cause: e2
+    });
+  }
+}
 function convertAccount(message, accountKeys, accountIndex) {
   const accountPublicKey = accountKeys.get(accountIndex);
   if (!accountPublicKey) {
@@ -66,7 +135,44 @@ function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight
     (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
   );
 }
+function fromVersionedTransactionWithDurableNonce(transaction) {
+  if (transaction.message.addressTableLookups.length > 0) {
+    throw new Error("Cannot convert transaction with addressTableLookups");
+  }
+  const accountKeys = transaction.message.getAccountKeys();
+  const feePayer = accountKeys.staticAccountKeys[0];
+  if (!feePayer)
+    throw new Error("No fee payer set in VersionedTransaction");
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  if (instructions.length === 0) {
+    throw new Error("transaction with no instructions cannot be durable nonce transaction");
+  }
+  if (!isAdvanceNonceAccountInstruction(instructions[0])) {
+    throw new Error("transaction first instruction is not advance nonce account instruction");
+  }
+  const nonceAccountAddress = instructions[0].accounts[0].address;
+  assertIsAddress(nonceAccountAddress);
+  const nonceAuthorityAddress = instructions[0].accounts[2].address;
+  assertIsAddress(nonceAuthorityAddress);
+  const durableNonceLifetime = {
+    nonce: transaction.message.recentBlockhash,
+    nonceAccountAddress,
+    nonceAuthorityAddress
+  };
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return pipe(
+    createTransaction({ version: transaction.version }),
+    (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),
+    (tx) => instructions.slice(1).reduce((acc, instruction) => {
+      return appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
 
-export { fromVersionedTransactionWithBlockhash };
+export { fromVersionedTransactionWithBlockhash, fromVersionedTransactionWithDurableNonce };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map

package/dist/index.browser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transaction.ts"],"names":[],"mappings":";AACA,SAAS,YAAY;AAErB,SAAS,mBAAmB;AAS5B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AASP,SAAS,eACL,SACA,aACA,cACY;AACZ,QAAM,mBAAmB,YAAY,IAAI,YAAY;AACrD,MAAI,CAAC,kBAAkB;AAEnB,UAAM,IAAI,MAAM,2CAA2C,YAAY,EAAE;AAAA,EAC7E;AACA,QAAM,WAAW,QAAQ,gBAAgB,YAAY;AACrD,QAAM,aAAa,QAAQ,kBAAkB,YAAY;AAEzD,QAAM,OAAO,WACP,aACI,YAAY,kBACZ,YAAY,kBAChB,aACA,YAAY,WACZ,YAAY;AAElB,SAAO;AAAA,IACH,SAAS,iBAAiB,SAAS;AAAA,IACnC;AAAA,EACJ;AACJ;AAEA,SAAS,mBACL,SACA,aACA,aACY;AACZ,QAAM,0BAA0B,YAAY,IAAI,YAAY,cAAc;AAC1E,MAAI,CAAC,yBAAyB;AAE1B,UAAM,IAAI,MAAM,2CAA2C,YAAY,cAAc,EAAE;AAAA,EAC3F;AAEA,QAAM,WAAW,YAAY,kBAAkB;AAAA,IAAI,kBAC/C,eAAe,SAAS,aAAa,YAAY;AAAA,EACrD;AAEA,SAAO;AAAA,IACH,gBAAgB,wBAAwB,SAAS;AAAA,IACjD,GAAI,SAAS,SAAS,EAAE,SAAS,IAAI,CAAC;AAAA,IACtC,GAAI,YAAY,KAAK,SAAS,EAAE,MAAM,YAAY,KAAK,IAAI,CAAC;AAAA,EAChE;AACJ;AAEA,SAAS,kBACL,aACA,mBACwC;AACxC,SAAO,YAAY,WAAW,OAAO,CAAC,KAAK,KAAK,UAAU;AAGtD,UAAM,WAAW,IAAI,MAAM,UAAQ,SAAS,CAAC;AAC7C,QAAI;AAAU,aAAO;AAErB,UAAM,UAAU,kBAAkB,KAAK,EAAE,SAAS;AAClD,WAAO,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,IAAwB;AAAA,EACxD,GAAG,CAAC,CAAC;AACT;AAEO,SAAS,sCACZ,aACA,sBAC0E;AAI1E,MAAI,YAAY,QAAQ,oBAAoB,SAAS,GAAG;AAEpD,UAAM,IAAI,MAAM,qDAAqD;AAAA,EACzE;AAEA,QAAM,cAAc,YAAY,QAAQ,eAAe;AAGvD,QAAM,WAAW,YAAY,kBAAkB,CAAC;AAEhD,MAAI,CAAC;AAAU,UAAM,IAAI,MAAM,0CAA0C;AAGzE,QAAM,oBAAoB;AAAA,IACtB,WAAW,YAAY,QAAQ;AAAA,IAC/B,sBAAsB,wBAAwB,MAAM,MAAM;AAAA;AAAA,EAC9D;AAEA,QAAM,eAAe,YAAY,QAAQ,qBAAqB;AAAA,IAAI,iBAC9D,mBAAmB,YAAY,SAAS,aAAa,WAAW;AAAA,EACpE;AAEA,QAAM,aAAa,kBAAkB,aAAa,YAAY,iBAAiB;AAE/E,SAAO;AAAA,IACH,kBAAkB,EAAE,SAAS,YAAY,QAAQ,CAAC;AAAA,IAClD,QAAM,uBAAuB,SAAS,SAAS,GAA2B,EAAE;AAAA,IAC5E,QAAM,qCAAqC,mBAAmB,EAAE;AAAA,IAChE,QACI,aAAa,OAAO,CAAC,KAAK,gBAAgB;AACtC,aAAO,6BAA6B,aAAa,GAAG;AAAA,IACxD,GAAG,EAAE;AAAA,IACT,QAAO,YAAY,WAAW,SAAS,EAAE,GAAG,IAAI,WAAW,IAAI;AAAA,EACnE;AACJ","sourcesContent":["import type { Base58EncodedAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { Ed25519Signature } from '@solana/keys';\nimport type {\n    Blockhash,\n    ITransactionWithBlockhashLifetime,\n    ITransactionWithFeePayer,\n    ITransactionWithSignatures,\n    Transaction,\n} from '@solana/transactions';\nimport {\n    appendTransactionInstruction,\n    createTransaction,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n        ? AccountRole.WRITABLE\n        : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Base58EncodedAddress,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex)\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Base58EncodedAddress,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[]\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Base58EncodedAddress;\n        return { ...acc, [address]: sig as Ed25519Signature };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    // TOOD: add support for durable nonce transactions\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n"]}
+{"version":3,"sources":["../../codecs-strings/dist/index.browser.js","../../addresses/src/address.ts","../src/transaction.ts"],"names":["e"],"mappings":"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","sourcesContent":["import { combineCodec, fixEncoder, mergeBytes, fixDecoder, assertByteArrayIsNotEmptyForCodec, assertByteArrayHasEnoughBytesForCodec } from '@solana/codecs-core';\nimport { getU32Encoder, getU32Decoder } from '@solana/codecs-numbers';\n\n// src/assertions.ts\nfunction assertValidBaseString(alphabet4, testValue, givenValue = testValue) {\n  if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {\n    throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);\n  }\n}\nvar getBaseXEncoder = (alphabet4) => {\n  const base = alphabet4.length;\n  const baseBigInt = BigInt(base);\n  return {\n    description: `base${base}`,\n    encode(value) {\n      assertValidBaseString(alphabet4, value);\n      if (value === \"\")\n        return new Uint8Array();\n      const chars = [...value];\n      let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);\n      trailIndex = trailIndex === -1 ? chars.length : trailIndex;\n      const leadingZeroes = Array(trailIndex).fill(0);\n      if (trailIndex === chars.length)\n        return Uint8Array.from(leadingZeroes);\n      const tailChars = chars.slice(trailIndex);\n      let base10Number = 0n;\n      let baseXPower = 1n;\n      for (let i = tailChars.length - 1; i >= 0; i -= 1) {\n        base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));\n        baseXPower *= baseBigInt;\n      }\n      const tailBytes = [];\n      while (base10Number > 0n) {\n        tailBytes.unshift(Number(base10Number % 256n));\n        base10Number /= 256n;\n      }\n      return Uint8Array.from(leadingZeroes.concat(tailBytes));\n    },\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getBaseXDecoder = (alphabet4) => {\n  const base = alphabet4.length;\n  const baseBigInt = BigInt(base);\n  return {\n    decode(rawBytes, offset = 0) {\n      const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n      if (bytes.length === 0)\n        return [\"\", 0];\n      let trailIndex = bytes.findIndex((n) => n !== 0);\n      trailIndex = trailIndex === -1 ? bytes.length : trailIndex;\n      const leadingZeroes = alphabet4[0].repeat(trailIndex);\n      if (trailIndex === bytes.length)\n        return [leadingZeroes, rawBytes.length];\n      let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);\n      const tailChars = [];\n      while (base10Number > 0n) {\n        tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);\n        base10Number /= baseBigInt;\n      }\n      return [leadingZeroes + tailChars.join(\"\"), rawBytes.length];\n    },\n    description: `base${base}`,\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getBaseXCodec = (alphabet4) => combineCodec(getBaseXEncoder(alphabet4), getBaseXDecoder(alphabet4));\n\n// src/base10.ts\nvar alphabet = \"0123456789\";\nvar getBase10Encoder = () => getBaseXEncoder(alphabet);\nvar getBase10Decoder = () => getBaseXDecoder(alphabet);\nvar getBase10Codec = () => getBaseXCodec(alphabet);\nvar getBase16Encoder = () => ({\n  description: \"base16\",\n  encode(value) {\n    const lowercaseValue = value.toLowerCase();\n    assertValidBaseString(\"0123456789abcdef\", lowercaseValue, value);\n    const matches = lowercaseValue.match(/.{1,2}/g);\n    return Uint8Array.from(matches ? matches.map((byte) => parseInt(byte, 16)) : []);\n  },\n  fixedSize: null,\n  maxSize: null\n});\nvar getBase16Decoder = () => ({\n  decode(bytes, offset = 0) {\n    const value = bytes.slice(offset).reduce((str, byte) => str + byte.toString(16).padStart(2, \"0\"), \"\");\n    return [value, bytes.length];\n  },\n  description: \"base16\",\n  fixedSize: null,\n  maxSize: null\n});\nvar getBase16Codec = () => combineCodec(getBase16Encoder(), getBase16Decoder());\n\n// src/base58.ts\nvar alphabet2 = \"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\";\nvar getBase58Encoder = () => getBaseXEncoder(alphabet2);\nvar getBase58Decoder = () => getBaseXDecoder(alphabet2);\nvar getBase58Codec = () => getBaseXCodec(alphabet2);\nvar getBaseXResliceEncoder = (alphabet4, bits) => ({\n  description: `base${alphabet4.length}`,\n  encode(value) {\n    assertValidBaseString(alphabet4, value);\n    if (value === \"\")\n      return new Uint8Array();\n    const charIndices = [...value].map((c) => alphabet4.indexOf(c));\n    return new Uint8Array(reslice(charIndices, bits, 8, false));\n  },\n  fixedSize: null,\n  maxSize: null\n});\nvar getBaseXResliceDecoder = (alphabet4, bits) => ({\n  decode(rawBytes, offset = 0) {\n    const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n    if (bytes.length === 0)\n      return [\"\", rawBytes.length];\n    const charIndices = reslice([...bytes], 8, bits, true);\n    return [charIndices.map((i) => alphabet4[i]).join(\"\"), rawBytes.length];\n  },\n  description: `base${alphabet4.length}`,\n  fixedSize: null,\n  maxSize: null\n});\nvar getBaseXResliceCodec = (alphabet4, bits) => combineCodec(getBaseXResliceEncoder(alphabet4, bits), getBaseXResliceDecoder(alphabet4, bits));\nfunction reslice(input, inputBits, outputBits, useRemainder) {\n  const output = [];\n  let accumulator = 0;\n  let bitsInAccumulator = 0;\n  const mask = (1 << outputBits) - 1;\n  for (const value of input) {\n    accumulator = accumulator << inputBits | value;\n    bitsInAccumulator += inputBits;\n    while (bitsInAccumulator >= outputBits) {\n      bitsInAccumulator -= outputBits;\n      output.push(accumulator >> bitsInAccumulator & mask);\n    }\n  }\n  if (useRemainder && bitsInAccumulator > 0) {\n    output.push(accumulator << outputBits - bitsInAccumulator & mask);\n  }\n  return output;\n}\nvar getBase64Encoder = () => {\n  {\n    return {\n      description: `base64`,\n      encode(value) {\n        try {\n          const bytes = atob(value).split(\"\").map((c) => c.charCodeAt(0));\n          return new Uint8Array(bytes);\n        } catch (e2) {\n          throw new Error(`Expected a string of base 64, got [${value}].`);\n        }\n      },\n      fixedSize: null,\n      maxSize: null\n    };\n  }\n};\nvar getBase64Decoder = () => {\n  {\n    return {\n      decode(bytes, offset = 0) {\n        const slice = bytes.slice(offset);\n        const value = btoa(String.fromCharCode(...slice));\n        return [value, bytes.length];\n      },\n      description: `base64`,\n      fixedSize: null,\n      maxSize: null\n    };\n  }\n};\nvar getBase64Codec = () => combineCodec(getBase64Encoder(), getBase64Decoder());\n\n// src/null-characters.ts\nvar removeNullCharacters = (value) => (\n  // eslint-disable-next-line no-control-regex\n  value.replace(/\\u0000/g, \"\")\n);\nvar padNullCharacters = (value, chars) => value.padEnd(chars, \"\\0\");\n\n// ../text-encoding-impl/dist/index.browser.js\nvar e = globalThis.TextDecoder;\nvar o = globalThis.TextEncoder;\n\n// src/utf8.ts\nvar getUtf8Encoder = () => {\n  let textEncoder;\n  return {\n    description: \"utf8\",\n    encode: (value) => new Uint8Array((textEncoder || (textEncoder = new o())).encode(value)),\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getUtf8Decoder = () => {\n  let textDecoder;\n  return {\n    decode(bytes, offset = 0) {\n      const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));\n      return [removeNullCharacters(value), bytes.length];\n    },\n    description: \"utf8\",\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getUtf8Codec = () => combineCodec(getUtf8Encoder(), getUtf8Decoder());\n\n// src/string.ts\nvar getStringEncoder = (options = {}) => {\n  const size = options.size ?? getU32Encoder();\n  const encoding = options.encoding ?? getUtf8Encoder();\n  const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;\n  if (size === \"variable\") {\n    return { ...encoding, description };\n  }\n  if (typeof size === \"number\") {\n    return fixEncoder(encoding, size, description);\n  }\n  return {\n    description,\n    encode: (value) => {\n      const contentBytes = encoding.encode(value);\n      const lengthBytes = size.encode(contentBytes.length);\n      return mergeBytes([lengthBytes, contentBytes]);\n    },\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getStringDecoder = (options = {}) => {\n  const size = options.size ?? getU32Decoder();\n  const encoding = options.encoding ?? getUtf8Decoder();\n  const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;\n  if (size === \"variable\") {\n    return { ...encoding, description };\n  }\n  if (typeof size === \"number\") {\n    return fixDecoder(encoding, size, description);\n  }\n  return {\n    decode: (bytes, offset = 0) => {\n      assertByteArrayIsNotEmptyForCodec(\"string\", bytes, offset);\n      const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);\n      const length = Number(lengthBigInt);\n      offset = lengthOffset;\n      const contentBytes = bytes.slice(offset, offset + length);\n      assertByteArrayHasEnoughBytesForCodec(\"string\", length, contentBytes);\n      const [value, contentOffset] = encoding.decode(contentBytes);\n      offset += contentOffset;\n      return [value, offset];\n    },\n    description,\n    fixedSize: null,\n    maxSize: null\n  };\n};\nvar getStringCodec = (options = {}) => combineCodec(getStringEncoder(options), getStringDecoder(options));\nfunction getSizeDescription(size) {\n  return typeof size === \"object\" ? size.description : `${size}`;\n}\n\nexport { assertValidBaseString, getBase10Codec, getBase10Decoder, getBase10Encoder, getBase16Codec, getBase16Decoder, getBase16Encoder, getBase58Codec, getBase58Decoder, getBase58Encoder, getBase64Codec, getBase64Decoder, getBase64Encoder, getBaseXCodec, getBaseXDecoder, getBaseXEncoder, getBaseXResliceCodec, getBaseXResliceDecoder, getBaseXResliceEncoder, getStringCodec, getStringDecoder, getStringEncoder, getUtf8Codec, getUtf8Decoder, getUtf8Encoder, padNullCharacters, removeNullCharacters };\n","import { Codec, combineCodec, Decoder, Encoder, mapEncoder } from '@solana/codecs-core';\nimport { getBase58Decoder, getBase58Encoder, getStringDecoder, getStringEncoder } from '@solana/codecs-strings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __brand: unique symbol;\n};\n\nlet memoizedBase58Encoder: Encoder<string> | undefined;\nlet memoizedBase58Decoder: Decoder<string> | undefined;\n\nfunction getMemoizedBase58Encoder(): Encoder<string> {\n    if (!memoizedBase58Encoder) memoizedBase58Encoder = getBase58Encoder();\n    return memoizedBase58Encoder;\n}\n\nfunction getMemoizedBase58Decoder(): Decoder<string> {\n    if (!memoizedBase58Decoder) memoizedBase58Decoder = getBase58Decoder();\n    return memoizedBase58Decoder;\n}\n\nexport function isAddress(\n    putativeBase58EncodedAddress: string\n): putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    // Fast-path; see if the input string is of an acceptable length.\n    if (\n        // Lowest address (32 bytes of zeroes)\n        putativeBase58EncodedAddress.length < 32 ||\n        // Highest address (32 bytes of 255)\n        putativeBase58EncodedAddress.length > 44\n    ) {\n        return false;\n    }\n    // Slow-path; actually attempt to decode the input string.\n    const base58Encoder = getMemoizedBase58Encoder();\n    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n    const numBytes = bytes.byteLength;\n    if (numBytes !== 32) {\n        return false;\n    }\n    return true;\n}\n\nexport function assertIsAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const base58Encoder = getMemoizedBase58Encoder();\n        const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function address<TAddress extends string = string>(\n    putativeBase58EncodedAddress: TAddress\n): Base58EncodedAddress<TAddress> {\n    assertIsAddress(putativeBase58EncodedAddress);\n    return putativeBase58EncodedAddress as Base58EncodedAddress<TAddress>;\n}\n\nexport function getAddressEncoder(config?: Readonly<{ description: string }>): Encoder<Base58EncodedAddress> {\n    return mapEncoder(\n        getStringEncoder({\n            description: config?.description ?? 'Base58EncodedAddress',\n            encoding: getMemoizedBase58Encoder(),\n            size: 32,\n        }),\n        putativeAddress => address(putativeAddress)\n    );\n}\n\nexport function getAddressDecoder(config?: Readonly<{ description: string }>): Decoder<Base58EncodedAddress> {\n    return getStringDecoder({\n        description: config?.description ?? 'Base58EncodedAddress',\n        encoding: getMemoizedBase58Decoder(),\n        size: 32,\n    }) as Decoder<Base58EncodedAddress>;\n}\n\nexport function getAddressCodec(config?: Readonly<{ description: string }>): Codec<Base58EncodedAddress> {\n    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));\n}\n\nexport function getAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n","import { assertIsAddress, type Base58EncodedAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { Ed25519Signature } from '@solana/keys';\nimport {\n    appendTransactionInstruction,\n    type Blockhash,\n    createTransaction,\n    type IDurableNonceTransaction,\n    isAdvanceNonceAccountInstruction,\n    type ITransactionWithBlockhashLifetime,\n    type ITransactionWithFeePayer,\n    type ITransactionWithSignatures,\n    type Nonce,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n    setTransactionLifetimeUsingDurableNonce,\n    type Transaction,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n        ? AccountRole.WRITABLE\n        : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Base58EncodedAddress,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex)\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Base58EncodedAddress,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[]\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Base58EncodedAddress;\n        return { ...acc, [address]: sig as Ed25519Signature };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    // TOOD: add support for durable nonce transactions\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n\nexport function fromVersionedTransactionWithDurableNonce(\n    transaction: VersionedTransaction\n): Transaction & ITransactionWithFeePayer & IDurableNonceTransaction {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    // Check first instruction is durable nonce + extract params\n    if (instructions.length === 0) {\n        // TODO: coded error\n        throw new Error('transaction with no instructions cannot be durable nonce transaction');\n    }\n\n    if (!isAdvanceNonceAccountInstruction(instructions[0])) {\n        // TODO: coded error\n        throw new Error('transaction first instruction is not advance nonce account instruction');\n    }\n\n    // We know these accounts are defined because we checked `isAdvanceNonceAccountInstruction`\n    const nonceAccountAddress = instructions[0].accounts![0].address;\n    assertIsAddress(nonceAccountAddress);\n\n    const nonceAuthorityAddress = instructions[0].accounts![2].address;\n    assertIsAddress(nonceAuthorityAddress);\n\n    const durableNonceLifetime = {\n        nonce: transaction.message.recentBlockhash as Nonce,\n        nonceAccountAddress,\n        nonceAuthorityAddress,\n    };\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),\n        tx =>\n            instructions.slice(1).reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n"]}

package/dist/index.development.js

@@ -2,22 +2,93 @@ this.globalThis = this.globalThis || {};
 this.globalThis.solanaWeb3 = (function (exports) {
   'use strict';
 
+  // ../codecs-strings/dist/index.browser.js
+  function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+    if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+      throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
+    }
+  }
+  var getBaseXEncoder = (alphabet4) => {
+    const base = alphabet4.length;
+    const baseBigInt = BigInt(base);
+    return {
+      description: `base${base}`,
+      encode(value) {
+        assertValidBaseString(alphabet4, value);
+        if (value === "")
+          return new Uint8Array();
+        const chars = [...value];
+        let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
+        trailIndex = trailIndex === -1 ? chars.length : trailIndex;
+        const leadingZeroes = Array(trailIndex).fill(0);
+        if (trailIndex === chars.length)
+          return Uint8Array.from(leadingZeroes);
+        const tailChars = chars.slice(trailIndex);
+        let base10Number = 0n;
+        let baseXPower = 1n;
+        for (let i = tailChars.length - 1; i >= 0; i -= 1) {
+          base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
+          baseXPower *= baseBigInt;
+        }
+        const tailBytes = [];
+        while (base10Number > 0n) {
+          tailBytes.unshift(Number(base10Number % 256n));
+          base10Number /= 256n;
+        }
+        return Uint8Array.from(leadingZeroes.concat(tailBytes));
+      },
+      fixedSize: null,
+      maxSize: null
+    };
+  };
+  var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+  var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+
+  // ../addresses/dist/index.browser.js
+  var memoizedBase58Encoder;
+  function getMemoizedBase58Encoder() {
+    if (!memoizedBase58Encoder)
+      memoizedBase58Encoder = getBase58Encoder();
+    return memoizedBase58Encoder;
+  }
+  function assertIsAddress(putativeBase58EncodedAddress) {
+    try {
+      if (
+        // Lowest address (32 bytes of zeroes)
+        putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
+        putativeBase58EncodedAddress.length > 44
+      ) {
+        throw new Error("Expected input string to decode to a byte array of length 32.");
+      }
+      const base58Encoder = getMemoizedBase58Encoder();
+      const bytes = base58Encoder.encode(putativeBase58EncodedAddress);
+      const numBytes = bytes.byteLength;
+      if (numBytes !== 32) {
+        throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
+      }
+    } catch (e2) {
+      throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
+        cause: e2
+      });
+    }
+  }
+
   // ../functional/dist/index.browser.js
   function pipe(init, ...fns) {
     return fns.reduce((acc, fn) => fn(acc), init);
   }
 
   // ../instructions/dist/index.browser.js
-  var AccountRole = /* @__PURE__ */ ((AccountRole2) => {
-    AccountRole2[AccountRole2["WRITABLE_SIGNER"] = /* 3 */
+  var AccountRole = /* @__PURE__ */ ((AccountRole22) => {
+    AccountRole22[AccountRole22["WRITABLE_SIGNER"] = /* 3 */
     3] = "WRITABLE_SIGNER";
-    AccountRole2[AccountRole2["READONLY_SIGNER"] = /* 2 */
+    AccountRole22[AccountRole22["READONLY_SIGNER"] = /* 2 */
     2] = "READONLY_SIGNER";
-    AccountRole2[AccountRole2["WRITABLE"] = /* 1 */
+    AccountRole22[AccountRole22["WRITABLE"] = /* 1 */
     1] = "WRITABLE";
-    AccountRole2[AccountRole2["READONLY"] = /* 0 */
+    AccountRole22[AccountRole22["READONLY"] = /* 0 */
     0] = "READONLY";
-    return AccountRole2;
+    return AccountRole22;
   })(AccountRole || {});
 
   // ../transactions/dist/index.browser.js
@@ -54,6 +125,69 @@ this.globalThis.solanaWeb3 = (function (exports) {
     Object.freeze(out);
     return out;
   }
+  var AccountRole2 = /* @__PURE__ */ ((AccountRole22) => {
+    AccountRole22[AccountRole22["WRITABLE_SIGNER"] = /* 3 */
+    3] = "WRITABLE_SIGNER";
+    AccountRole22[AccountRole22["READONLY_SIGNER"] = /* 2 */
+    2] = "READONLY_SIGNER";
+    AccountRole22[AccountRole22["WRITABLE"] = /* 1 */
+    1] = "WRITABLE";
+    AccountRole22[AccountRole22["READONLY"] = /* 0 */
+    0] = "READONLY";
+    return AccountRole22;
+  })(AccountRole2 || {});
+  var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
+  var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
+  function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
+    return {
+      accounts: [
+        { address: nonceAccountAddress, role: AccountRole2.WRITABLE },
+        {
+          address: RECENT_BLOCKHASHES_SYSVAR_ADDRESS,
+          role: AccountRole2.READONLY
+        },
+        { address: nonceAuthorityAddress, role: AccountRole2.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 === AccountRole2.WRITABLE && // Second account is recent blockhashes sysvar
+    instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole2.READONLY && // Third account is nonce authority account
+    instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole2.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;
+  }
   function setTransactionFeePayer(feePayer, transaction) {
     if ("feePayer" in transaction && feePayer === transaction.feePayer) {
       return transaction;
@@ -138,8 +272,46 @@ this.globalThis.solanaWeb3 = (function (exports) {
       (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
     );
   }
+  function fromVersionedTransactionWithDurableNonce(transaction) {
+    if (transaction.message.addressTableLookups.length > 0) {
+      throw new Error("Cannot convert transaction with addressTableLookups");
+    }
+    const accountKeys = transaction.message.getAccountKeys();
+    const feePayer = accountKeys.staticAccountKeys[0];
+    if (!feePayer)
+      throw new Error("No fee payer set in VersionedTransaction");
+    const instructions = transaction.message.compiledInstructions.map(
+      (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+    );
+    if (instructions.length === 0) {
+      throw new Error("transaction with no instructions cannot be durable nonce transaction");
+    }
+    if (!isAdvanceNonceAccountInstruction(instructions[0])) {
+      throw new Error("transaction first instruction is not advance nonce account instruction");
+    }
+    const nonceAccountAddress = instructions[0].accounts[0].address;
+    assertIsAddress(nonceAccountAddress);
+    const nonceAuthorityAddress = instructions[0].accounts[2].address;
+    assertIsAddress(nonceAuthorityAddress);
+    const durableNonceLifetime = {
+      nonce: transaction.message.recentBlockhash,
+      nonceAccountAddress,
+      nonceAuthorityAddress
+    };
+    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+    return pipe(
+      createTransaction({ version: transaction.version }),
+      (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+      (tx) => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),
+      (tx) => instructions.slice(1).reduce((acc, instruction) => {
+        return appendTransactionInstruction(instruction, acc);
+      }, tx),
+      (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+    );
+  }
 
   exports.fromVersionedTransactionWithBlockhash = fromVersionedTransactionWithBlockhash;
+  exports.fromVersionedTransactionWithDurableNonce = fromVersionedTransactionWithDurableNonce;
 
   return exports;