@solana/compat 2.0.0-experimental.782d1ea

package/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2018 Solana Labs, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -0,0 +1,25 @@
+[![npm][npm-image]][npm-url]
+[![npm-downloads][npm-downloads-image]][npm-url]
+[![semantic-release][semantic-release-image]][semantic-release-url]
+<br />
+[![code-style-prettier][code-style-prettier-image]][code-style-prettier-url]
+
+[code-style-prettier-image]: https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square
+[code-style-prettier-url]: https://github.com/prettier/prettier
+[npm-downloads-image]: https://img.shields.io/npm/dm/@solana/compat/experimental.svg?style=flat
+[npm-image]: https://img.shields.io/npm/v/@solana/compat/experimental.svg?style=flat
+[npm-url]: https://www.npmjs.com/package/@solana/compat/v/experimental
+[semantic-release-image]: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
+[semantic-release-url]: https://github.com/semantic-release/semantic-release
+
+# @solana/compat
+
+This package contains utilities for converting from legacy web3js classes to the new data structures. It can be used standalone, but it is also exported as part of the Solana JavaScript SDK [`@solana/web3.js@experimental`](https://github.com/solana-labs/solana-web3.js/tree/master/packages/library).
+
+## Types
+
+TODO
+
+## Functions
+
+TODO

package/dist/index.browser.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+var functional = require('@solana/functional');
+var instructions = require('@solana/instructions');
+var transactions = require('@solana/transactions');
+
+// src/transaction.ts
+function convertAccount(message, accountKeys, accountIndex) {
+  const accountPublicKey = accountKeys.get(accountIndex);
+  if (!accountPublicKey) {
+    throw new Error(`Could not find account address at index ${accountIndex}`);
+  }
+  const isSigner = message.isAccountSigner(accountIndex);
+  const isWritable = message.isAccountWritable(accountIndex);
+  const role = isSigner ? isWritable ? instructions.AccountRole.WRITABLE_SIGNER : instructions.AccountRole.READONLY_SIGNER : isWritable ? instructions.AccountRole.WRITABLE : instructions.AccountRole.READONLY;
+  return {
+    address: accountPublicKey.toBase58(),
+    role
+  };
+}
+function convertInstruction(message, accountKeys, instruction) {
+  const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+  if (!programAddressPublicKey) {
+    throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+  }
+  const accounts = instruction.accountKeyIndexes.map(
+    (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+  );
+  return {
+    programAddress: programAddressPublicKey.toBase58(),
+    ...accounts.length ? { accounts } : {},
+    ...instruction.data.length ? { data: instruction.data } : {}
+  };
+}
+function convertSignatures(transaction, staticAccountKeys) {
+  return transaction.signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccountKeys[index].toBase58();
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+  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 blockhashLifetime = {
+    blockhash: transaction.message.recentBlockhash,
+    lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+    // U64 MAX
+  };
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return functional.pipe(
+    transactions.createTransaction({ version: transaction.version }),
+    (tx) => transactions.setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => transactions.setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return transactions.appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+exports.fromVersionedTransactionWithBlockhash = fromVersionedTransactionWithBlockhash;
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.browser.cjs.map

package/dist/index.browser.cjs.map

@@ -0,0 +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"]}

package/dist/index.browser.js

@@ -0,0 +1,72 @@
+import { pipe } from '@solana/functional';
+import { AccountRole } from '@solana/instructions';
+import { createTransaction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, appendTransactionInstruction } from '@solana/transactions';
+
+// src/transaction.ts
+function convertAccount(message, accountKeys, accountIndex) {
+  const accountPublicKey = accountKeys.get(accountIndex);
+  if (!accountPublicKey) {
+    throw new Error(`Could not find account address at index ${accountIndex}`);
+  }
+  const isSigner = message.isAccountSigner(accountIndex);
+  const isWritable = message.isAccountWritable(accountIndex);
+  const role = isSigner ? isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER : isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
+  return {
+    address: accountPublicKey.toBase58(),
+    role
+  };
+}
+function convertInstruction(message, accountKeys, instruction) {
+  const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+  if (!programAddressPublicKey) {
+    throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+  }
+  const accounts = instruction.accountKeyIndexes.map(
+    (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+  );
+  return {
+    programAddress: programAddressPublicKey.toBase58(),
+    ...accounts.length ? { accounts } : {},
+    ...instruction.data.length ? { data: instruction.data } : {}
+  };
+}
+function convertSignatures(transaction, staticAccountKeys) {
+  return transaction.signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccountKeys[index].toBase58();
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+  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 blockhashLifetime = {
+    blockhash: transaction.message.recentBlockhash,
+    lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+    // U64 MAX
+  };
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return pipe(
+    createTransaction({ version: transaction.version }),
+    (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+export { fromVersionedTransactionWithBlockhash };
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.browser.js.map

package/dist/index.browser.js.map

@@ -0,0 +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"]}

package/dist/index.development.js

@@ -0,0 +1,148 @@
+this.globalThis = this.globalThis || {};
+this.globalThis.solanaWeb3 = (function (exports) {
+  'use strict';
+
+  // ../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 */
+    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 || {});
+
+  // ../transactions/dist/index.browser.js
+  function getUnsignedTransaction(transaction) {
+    if ("signatures" in transaction) {
+      const {
+        signatures: _,
+        // eslint-disable-line @typescript-eslint/no-unused-vars
+        ...unsignedTransaction
+      } = transaction;
+      return unsignedTransaction;
+    } else {
+      return transaction;
+    }
+  }
+  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;
+  }
+  function createTransaction({
+    version
+  }) {
+    const out = {
+      instructions: [],
+      version
+    };
+    Object.freeze(out);
+    return out;
+  }
+  function setTransactionFeePayer(feePayer, transaction) {
+    if ("feePayer" in transaction && feePayer === transaction.feePayer) {
+      return transaction;
+    }
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      feePayer
+    };
+    Object.freeze(out);
+    return out;
+  }
+  function appendTransactionInstruction(instruction, transaction) {
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      instructions: [...transaction.instructions, instruction]
+    };
+    Object.freeze(out);
+    return out;
+  }
+
+  // src/transaction.ts
+  function convertAccount(message, accountKeys, accountIndex) {
+    const accountPublicKey = accountKeys.get(accountIndex);
+    if (!accountPublicKey) {
+      throw new Error(`Could not find account address at index ${accountIndex}`);
+    }
+    const isSigner = message.isAccountSigner(accountIndex);
+    const isWritable = message.isAccountWritable(accountIndex);
+    const role = isSigner ? isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER : isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
+    return {
+      address: accountPublicKey.toBase58(),
+      role
+    };
+  }
+  function convertInstruction(message, accountKeys, instruction) {
+    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+    if (!programAddressPublicKey) {
+      throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+    }
+    const accounts = instruction.accountKeyIndexes.map(
+      (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+    );
+    return {
+      programAddress: programAddressPublicKey.toBase58(),
+      ...accounts.length ? { accounts } : {},
+      ...instruction.data.length ? { data: instruction.data } : {}
+    };
+  }
+  function convertSignatures(transaction, staticAccountKeys) {
+    return transaction.signatures.reduce((acc, sig, index) => {
+      const allZeros = sig.every((byte) => byte === 0);
+      if (allZeros)
+        return acc;
+      const address = staticAccountKeys[index].toBase58();
+      return { ...acc, [address]: sig };
+    }, {});
+  }
+  function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+    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 blockhashLifetime = {
+      blockhash: transaction.message.recentBlockhash,
+      lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+      // U64 MAX
+    };
+    const instructions = transaction.message.compiledInstructions.map(
+      (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+    );
+    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+    return pipe(
+      createTransaction({ version: transaction.version }),
+      (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+      (tx) => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+      (tx) => instructions.reduce((acc, instruction) => {
+        return appendTransactionInstruction(instruction, acc);
+      }, tx),
+      (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+    );
+  }
+
+  exports.fromVersionedTransactionWithBlockhash = fromVersionedTransactionWithBlockhash;
+
+  return exports;
+
+})({});
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.development.js.map

package/dist/index.development.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../functional/src/pipe.ts","../../instructions/src/roles.ts","../../transactions/src/unsigned-transaction.ts","../../transactions/src/blockhash.ts","../../transactions/src/create-transaction.ts","../../transactions/src/fee-payer.ts","../../transactions/src/instructions.ts","../src/transaction.ts"],"names":["AccountRole"],"mappings":";AAyGO,SAAS,KAAe,SAAmB,KAAyB;AACvE,SAAO,IAAI,OAAO,CAAC,KAAK,OAAO,GAAG,GAAG,GAAG,IAAI;AAChD;;;ACvGO,IAAK,cAAL,kBAAKA,iBAAL;AAEHA,eAAAA,aAAA,iBAAA;EAA0B,CAAA,IAA1B;AACAA,eAAAA,aAAA,iBAAA;EAA0B,CAAA,IAA1B;AACAA,eAAAA,aAAA,UAAA;EAA0B,CAAA,IAA1B;AACAA,eAAAA,aAAA,UAAA;EAA0B,CAAA,IAA1B;AALQ,SAAAA;AAAA,GAAA,eAAA,CAAA,CAAA;;;ACER,SAAI,uBAAgB,aAAa;AAE7B,MAAA,gBAAM,aAAA;AAAA,UACF;MAAY,YAAA;;MAEhB,GAAI;IACJ,IAAA;AACJ,WAAO;EACH,OAAA;AACJ,WAAA;EACJ;;AC0CI,SACI,qCACA,6BAAY,aAAmB;AAG/B,MAAA,wBAAO,eAAA,YAAA,mBAAA,cAAA,4BAAA,aAAA,YAAA,mBAAA,yBAAA,4BAAA,sBAAA;AACX,WAAA;EACA;AAAY,QACL,MAAA;IACH,GAAA,uBAAoB,WAAA;IACxB,oBAAA;EACA;AACA,SAAO,OAAA,GAAA;AACX,SAAA;;AC9DuE,SACnE,kBAAA;EACJ;AACI,GAAA;AAAyB,QACrB,MAAA;IACA,cAAA,CAAA;IACJ;EACA;AACA,SAAO,OAAA,GAAA;AACX,SAAA;;ACYI,SAAI,uBAAc,UAAe,aAAa;AAC1C,MAAA,cAAO,eAAA,aAAA,YAAA,UAAA;AACX,WAAA;EACA;AAAY,QACL,MAAA;IACH,GAAA,uBAAA,WAAA;IACJ;EACA;AACA,SAAO,OAAA,GAAA;AACX,SAAA;;AC/BI,SAAM,6BAAM,aAAA,aAAA;AAAA,QACL,MAAA;IACH,GAAA,uBAAkB,WAAY;IAClC,cAAA,CAAA,GAAA,YAAA,cAAA,WAAA;EACA;AACA,SAAO,OAAA,GAAA;AACX,SAAA;AAEO;;;;ACUP,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":["/**\n * General pipe function.\n * Provide an initial value and a list of functions to pipe it through.\n *\n * Following common implementations of pipe functions that use TypeScript,\n * this function supports a maximum arity of 10 for type safety.\n * @see https://github.com/ramda/ramda/blob/master/source/pipe.js\n * @see https://github.com/darky/rocket-pipes/blob/master/index.ts\n *\n * Note you can use nested pipes to extend this limitation, like so:\n * ```typescript\n * const myValue = pipe(\n *      pipe(\n *          1,\n *          (x) => x + 1,\n *          (x) => x * 2,\n *          (x) => x - 1,\n *      ),\n *      (y) => y / 3,\n *      (y) => y + 1,\n * );\n * ```\n * @param init  The initial value\n * @param fns   Any number of functions to pipe the value through\n * @returns     The final value with all functions applied\n */\nexport function pipe<TInitial>(init: TInitial): TInitial;\nexport function pipe<TInitial, R1>(init: TInitial, init_r1: (init: TInitial) => R1): R1;\nexport function pipe<TInitial, R1, R2>(init: TInitial, init_r1: (init: TInitial) => R1, r1_r2: (r1: R1) => R2): R2;\nexport function pipe<TInitial, R1, R2, R3>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3\n): R3;\nexport function pipe<TInitial, R1, R2, R3, R4>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4\n): R4;\nexport function pipe<TInitial, R1, R2, R3, R4, R5>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5\n): R5;\nexport function pipe<TInitial, R1, R2, R3, R4, R5, R6>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5,\n    r5_r6: (r5: R5) => R6\n): R6;\nexport function pipe<TInitial, R1, R2, R3, R4, R5, R6, R7>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5,\n    r5_r6: (r5: R5) => R6,\n    r6_r7: (r6: R6) => R7\n): R7;\nexport function pipe<TInitial, R1, R2, R3, R4, R5, R6, R7, R8>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5,\n    r5_r6: (r5: R5) => R6,\n    r6_r7: (r6: R6) => R7,\n    r7_r8: (r7: R7) => R8\n): R8;\nexport function pipe<TInitial, R1, R2, R3, R4, R5, R6, R7, R8, R9>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5,\n    r5_r6: (r5: R5) => R6,\n    r6_r7: (r6: R6) => R7,\n    r7_r8: (r7: R7) => R8,\n    r8_r9: (r8: R8) => R9\n): R9;\nexport function pipe<TInitial, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10>(\n    init: TInitial,\n    init_r1: (init: TInitial) => R1,\n    r1_r2: (r1: R1) => R2,\n    r2_r3: (r2: R2) => R3,\n    r3_r4: (r3: R3) => R4,\n    r4_r5: (r4: R4) => R5,\n    r5_r6: (r5: R5) => R6,\n    r6_r7: (r6: R6) => R7,\n    r7_r8: (r7: R7) => R8,\n    r8_r9: (r8: R8) => R9,\n    r9_r10: (r9: R9) => R10\n): R10;\nexport function pipe<TInitial>(init: TInitial, ...fns: CallableFunction[]) {\n    return fns.reduce((acc, fn) => fn(acc), init);\n}\n","/**\n * Quick primer on bitwise operations: https://stackoverflow.com/a/1436448/802047\n */\n\nexport enum AccountRole {\n    // Bitflag guide: is signer ⌄⌄ is writable\n    WRITABLE_SIGNER = /* 3 */ 0b11, // prettier-ignore\n    READONLY_SIGNER = /* 2 */ 0b10, // prettier-ignore\n    WRITABLE =        /* 1 */ 0b01, // prettier-ignore\n    READONLY =        /* 0 */ 0b00, // prettier-ignore\n}\n\nconst IS_SIGNER_BITMASK = 0b10;\nconst IS_WRITABLE_BITMASK = 0b01;\n\nexport function downgradeRoleToNonSigner(role: AccountRole.READONLY_SIGNER): AccountRole.READONLY;\nexport function downgradeRoleToNonSigner(role: AccountRole.WRITABLE_SIGNER): AccountRole.WRITABLE;\nexport function downgradeRoleToNonSigner(role: AccountRole): AccountRole;\nexport function downgradeRoleToNonSigner(role: AccountRole): AccountRole {\n    return role & ~IS_SIGNER_BITMASK;\n}\n\nexport function downgradeRoleToReadonly(role: AccountRole.WRITABLE): AccountRole.READONLY;\nexport function downgradeRoleToReadonly(role: AccountRole.WRITABLE_SIGNER): AccountRole.READONLY_SIGNER;\nexport function downgradeRoleToReadonly(role: AccountRole): AccountRole;\nexport function downgradeRoleToReadonly(role: AccountRole): AccountRole {\n    return role & ~IS_WRITABLE_BITMASK;\n}\n\nexport function isSignerRole(role: AccountRole): role is AccountRole.READONLY_SIGNER | AccountRole.WRITABLE_SIGNER {\n    return role >= AccountRole.READONLY_SIGNER;\n}\n\nexport function isWritableRole(role: AccountRole): role is AccountRole.WRITABLE | AccountRole.WRITABLE_SIGNER {\n    return (role & IS_WRITABLE_BITMASK) !== 0;\n}\n\nexport function mergeRoles(roleA: AccountRole.WRITABLE, roleB: AccountRole.READONLY_SIGNER): AccountRole.WRITABLE_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole.READONLY_SIGNER, roleB: AccountRole.WRITABLE): AccountRole.WRITABLE_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole, roleB: AccountRole.WRITABLE_SIGNER): AccountRole.WRITABLE_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole.WRITABLE_SIGNER, roleB: AccountRole): AccountRole.WRITABLE_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole, roleB: AccountRole.READONLY_SIGNER): AccountRole.READONLY_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole.READONLY_SIGNER, roleB: AccountRole): AccountRole.READONLY_SIGNER; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole, roleB: AccountRole.WRITABLE): AccountRole.WRITABLE; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole.WRITABLE, roleB: AccountRole): AccountRole.WRITABLE; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole.READONLY, roleB: AccountRole.READONLY): AccountRole.READONLY; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole, roleB: AccountRole): AccountRole; // prettier-ignore\nexport function mergeRoles(roleA: AccountRole, roleB: AccountRole): AccountRole {\n    return roleA | roleB;\n}\n\nexport function upgradeRoleToSigner(role: AccountRole.READONLY): AccountRole.READONLY_SIGNER;\nexport function upgradeRoleToSigner(role: AccountRole.WRITABLE): AccountRole.WRITABLE_SIGNER;\nexport function upgradeRoleToSigner(role: AccountRole): AccountRole;\nexport function upgradeRoleToSigner(role: AccountRole): AccountRole {\n    return role | IS_SIGNER_BITMASK;\n}\n\nexport function upgradeRoleToWritable(role: AccountRole.READONLY): AccountRole.WRITABLE;\nexport function upgradeRoleToWritable(role: AccountRole.READONLY_SIGNER): AccountRole.WRITABLE_SIGNER;\nexport function upgradeRoleToWritable(role: AccountRole): AccountRole;\nexport function upgradeRoleToWritable(role: AccountRole): AccountRole {\n    return role | IS_WRITABLE_BITMASK;\n}\n","import { ITransactionWithSignatures } from '.';\nimport { BaseTransaction } from './types';\n\nexport function getUnsignedTransaction<TTransaction extends BaseTransaction>(\n    transaction: TTransaction | (TTransaction & ITransactionWithSignatures)\n): TTransaction | Omit<TTransaction & ITransactionWithSignatures, keyof ITransactionWithSignatures> {\n    if ('signatures' in transaction) {\n        // The implication of the lifetime constraint changing is that any existing signatures are invalid.\n        const {\n            signatures: _, // eslint-disable-line @typescript-eslint/no-unused-vars\n            ...unsignedTransaction\n        } = transaction;\n        return unsignedTransaction;\n    } else {\n        return transaction;\n    }\n}\n","import { base58 } from '@metaplex-foundation/umi-serializers';\n\nimport { IDurableNonceTransaction } from './durable-nonce';\nimport { ITransactionWithSignatures } from './signatures';\nimport { BaseTransaction } from './types';\nimport { getUnsignedTransaction } from './unsigned-transaction';\n\nexport type Blockhash = string & { readonly __brand: unique symbol };\n\ntype BlockhashLifetimeConstraint = Readonly<{\n    blockhash: Blockhash;\n    lastValidBlockHeight: bigint;\n}>;\n\nexport interface ITransactionWithBlockhashLifetime {\n    readonly lifetimeConstraint: BlockhashLifetimeConstraint;\n}\n\nexport function assertIsBlockhash(putativeBlockhash: string): asserts putativeBlockhash is Blockhash {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest value (32 bytes of zeroes)\n            putativeBlockhash.length < 32 ||\n            // Highest value (32 bytes of 255)\n            putativeBlockhash.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 bytes = base58.serialize(putativeBlockhash);\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(`\\`${putativeBlockhash}\\` is not a blockhash`, {\n            cause: e,\n        });\n    }\n}\n\nexport function setTransactionLifetimeUsingBlockhash<TTransaction extends BaseTransaction & IDurableNonceTransaction>(\n    blockhashLifetimeConstraint: BlockhashLifetimeConstraint,\n    transaction: TTransaction | (TTransaction & ITransactionWithSignatures)\n): Omit<TTransaction, keyof ITransactionWithSignatures | 'lifetimeConstraint'> & ITransactionWithBlockhashLifetime;\n\nexport function setTransactionLifetimeUsingBlockhash<\n    TTransaction extends BaseTransaction | (BaseTransaction & ITransactionWithBlockhashLifetime)\n>(\n    blockhashLifetimeConstraint: BlockhashLifetimeConstraint,\n    transaction: TTransaction | (TTransaction & ITransactionWithSignatures)\n): Omit<TTransaction, keyof ITransactionWithSignatures> & ITransactionWithBlockhashLifetime;\n\nexport function setTransactionLifetimeUsingBlockhash(\n    blockhashLifetimeConstraint: BlockhashLifetimeConstraint,\n    transaction: BaseTransaction | (BaseTransaction & ITransactionWithBlockhashLifetime)\n) {\n    if (\n        'lifetimeConstraint' in transaction &&\n        transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash &&\n        transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight\n    ) {\n        return transaction;\n    }\n    const out = {\n        ...getUnsignedTransaction(transaction),\n        lifetimeConstraint: blockhashLifetimeConstraint,\n    };\n    Object.freeze(out);\n    return out;\n}\n","import { Transaction, TransactionVersion } from './types';\n\ntype TransactionConfig<TVersion extends TransactionVersion> = Readonly<{\n    version: TVersion;\n}>;\n\nexport function createTransaction<TVersion extends TransactionVersion>(\n    config: TransactionConfig<TVersion>\n): Extract<Transaction, { version: TVersion }>;\nexport function createTransaction<TVersion extends TransactionVersion>({\n    version,\n}: TransactionConfig<TVersion>): Transaction {\n    const out: Transaction = {\n        instructions: [],\n        version,\n    };\n    Object.freeze(out);\n    return out;\n}\n","import { Base58EncodedAddress } from '@solana/addresses';\n\nimport { ITransactionWithSignatures } from './signatures';\nimport { BaseTransaction } from './types';\nimport { getUnsignedTransaction } from './unsigned-transaction';\n\nexport interface ITransactionWithFeePayer<TAddress extends string = string> {\n    readonly feePayer: Base58EncodedAddress<TAddress>;\n}\n\nexport function setTransactionFeePayer<TFeePayerAddress extends string, TTransaction extends BaseTransaction>(\n    feePayer: Base58EncodedAddress<TFeePayerAddress>,\n    transaction:\n        | (TTransaction & ITransactionWithSignatures)\n        | (TTransaction & ITransactionWithFeePayer<string> & ITransactionWithSignatures)\n): Omit<TTransaction, keyof ITransactionWithSignatures> & ITransactionWithFeePayer<TFeePayerAddress>;\n\nexport function setTransactionFeePayer<TFeePayerAddress extends string, TTransaction extends BaseTransaction>(\n    feePayer: Base58EncodedAddress<TFeePayerAddress>,\n    transaction: TTransaction | (TTransaction & ITransactionWithFeePayer<string>)\n): TTransaction & ITransactionWithFeePayer<TFeePayerAddress>;\n\nexport function setTransactionFeePayer<TFeePayerAddress extends string, TTransaction extends BaseTransaction>(\n    feePayer: Base58EncodedAddress<TFeePayerAddress>,\n    transaction:\n        | TTransaction\n        | (TTransaction & ITransactionWithFeePayer<string>)\n        | (TTransaction & ITransactionWithSignatures)\n        | (TTransaction & ITransactionWithFeePayer<string> & ITransactionWithSignatures)\n) {\n    if ('feePayer' in transaction && feePayer === transaction.feePayer) {\n        return transaction;\n    }\n    const out = {\n        ...getUnsignedTransaction(transaction),\n        feePayer,\n    };\n    Object.freeze(out);\n    return out;\n}\n","import { ITransactionWithSignatures } from './signatures';\nimport { BaseTransaction } from './types';\nimport { getUnsignedTransaction } from './unsigned-transaction';\n\nexport function appendTransactionInstruction<TTransaction extends BaseTransaction>(\n    instruction: TTransaction['instructions'][number],\n    transaction: TTransaction | (TTransaction & ITransactionWithSignatures)\n): TTransaction | Omit<TTransaction, keyof ITransactionWithSignatures> {\n    const out = {\n        ...getUnsignedTransaction(transaction),\n        instructions: [...transaction.instructions, instruction],\n    };\n    Object.freeze(out);\n    return out;\n}\n\nexport function prependTransactionInstruction<TTransaction extends BaseTransaction>(\n    instruction: TTransaction['instructions'][number],\n    transaction: TTransaction | (TTransaction & ITransactionWithSignatures)\n): TTransaction | Omit<TTransaction, keyof ITransactionWithSignatures> {\n    const out = {\n        ...getUnsignedTransaction(transaction),\n        instructions: [instruction, ...transaction.instructions],\n    };\n    Object.freeze(out);\n    return out;\n}\n","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"]}

package/dist/index.native.js

@@ -0,0 +1,70 @@
+import { pipe } from '@solana/functional';
+import { AccountRole } from '@solana/instructions';
+import { createTransaction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, appendTransactionInstruction } from '@solana/transactions';
+
+// src/transaction.ts
+function convertAccount(message, accountKeys, accountIndex) {
+  const accountPublicKey = accountKeys.get(accountIndex);
+  if (!accountPublicKey) {
+    throw new Error(`Could not find account address at index ${accountIndex}`);
+  }
+  const isSigner = message.isAccountSigner(accountIndex);
+  const isWritable = message.isAccountWritable(accountIndex);
+  const role = isSigner ? isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER : isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
+  return {
+    address: accountPublicKey.toBase58(),
+    role
+  };
+}
+function convertInstruction(message, accountKeys, instruction) {
+  const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+  if (!programAddressPublicKey) {
+    throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+  }
+  const accounts = instruction.accountKeyIndexes.map(
+    (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+  );
+  return {
+    programAddress: programAddressPublicKey.toBase58(),
+    ...accounts.length ? { accounts } : {},
+    ...instruction.data.length ? { data: instruction.data } : {}
+  };
+}
+function convertSignatures(transaction, staticAccountKeys) {
+  return transaction.signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccountKeys[index].toBase58();
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+  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 blockhashLifetime = {
+    blockhash: transaction.message.recentBlockhash,
+    lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+    // U64 MAX
+  };
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return pipe(
+    createTransaction({ version: transaction.version }),
+    (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+export { fromVersionedTransactionWithBlockhash };

package/dist/index.native.js.map

@@ -0,0 +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"]}

package/dist/index.node.cjs

@@ -0,0 +1,72 @@
+'use strict';
+
+var functional = require('@solana/functional');
+var instructions = require('@solana/instructions');
+var transactions = require('@solana/transactions');
+
+// src/transaction.ts
+function convertAccount(message, accountKeys, accountIndex) {
+  const accountPublicKey = accountKeys.get(accountIndex);
+  if (!accountPublicKey) {
+    throw new Error(`Could not find account address at index ${accountIndex}`);
+  }
+  const isSigner = message.isAccountSigner(accountIndex);
+  const isWritable = message.isAccountWritable(accountIndex);
+  const role = isSigner ? isWritable ? instructions.AccountRole.WRITABLE_SIGNER : instructions.AccountRole.READONLY_SIGNER : isWritable ? instructions.AccountRole.WRITABLE : instructions.AccountRole.READONLY;
+  return {
+    address: accountPublicKey.toBase58(),
+    role
+  };
+}
+function convertInstruction(message, accountKeys, instruction) {
+  const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+  if (!programAddressPublicKey) {
+    throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+  }
+  const accounts = instruction.accountKeyIndexes.map(
+    (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+  );
+  return {
+    programAddress: programAddressPublicKey.toBase58(),
+    ...accounts.length ? { accounts } : {},
+    ...instruction.data.length ? { data: instruction.data } : {}
+  };
+}
+function convertSignatures(transaction, staticAccountKeys) {
+  return transaction.signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccountKeys[index].toBase58();
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+  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 blockhashLifetime = {
+    blockhash: transaction.message.recentBlockhash,
+    lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+    // U64 MAX
+  };
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return functional.pipe(
+    transactions.createTransaction({ version: transaction.version }),
+    (tx) => transactions.setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => transactions.setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return transactions.appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+exports.fromVersionedTransactionWithBlockhash = fromVersionedTransactionWithBlockhash;

package/dist/index.node.cjs.map

@@ -0,0 +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"]}

package/dist/index.node.js

@@ -0,0 +1,72 @@
+import { pipe } from '@solana/functional';
+import { AccountRole } from '@solana/instructions';
+import { createTransaction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, appendTransactionInstruction } from '@solana/transactions';
+
+// src/transaction.ts
+function convertAccount(message, accountKeys, accountIndex) {
+  const accountPublicKey = accountKeys.get(accountIndex);
+  if (!accountPublicKey) {
+    throw new Error(`Could not find account address at index ${accountIndex}`);
+  }
+  const isSigner = message.isAccountSigner(accountIndex);
+  const isWritable = message.isAccountWritable(accountIndex);
+  const role = isSigner ? isWritable ? AccountRole.WRITABLE_SIGNER : AccountRole.READONLY_SIGNER : isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
+  return {
+    address: accountPublicKey.toBase58(),
+    role
+  };
+}
+function convertInstruction(message, accountKeys, instruction) {
+  const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);
+  if (!programAddressPublicKey) {
+    throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);
+  }
+  const accounts = instruction.accountKeyIndexes.map(
+    (accountIndex) => convertAccount(message, accountKeys, accountIndex)
+  );
+  return {
+    programAddress: programAddressPublicKey.toBase58(),
+    ...accounts.length ? { accounts } : {},
+    ...instruction.data.length ? { data: instruction.data } : {}
+  };
+}
+function convertSignatures(transaction, staticAccountKeys) {
+  return transaction.signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccountKeys[index].toBase58();
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function fromVersionedTransactionWithBlockhash(transaction, lastValidBlockHeight) {
+  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 blockhashLifetime = {
+    blockhash: transaction.message.recentBlockhash,
+    lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+    // U64 MAX
+  };
+  const instructions = transaction.message.compiledInstructions.map(
+    (instruction) => convertInstruction(transaction.message, accountKeys, instruction)
+  );
+  const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);
+  return pipe(
+    createTransaction({ version: transaction.version }),
+    (tx) => setTransactionFeePayer(feePayer.toBase58(), tx),
+    (tx) => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => transaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+export { fromVersionedTransactionWithBlockhash };
+//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.node.js.map

package/dist/index.node.js.map

@@ -0,0 +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"]}

package/dist/index.production.min.js

@@ -0,0 +1,11 @@
+this.globalThis = this.globalThis || {};
+this.globalThis.solanaWeb3 = (function (exports) {
+	'use strict';
+
+	function l(e,...n){return n.reduce((r,s)=>s(r),e)}var a=(e=>(e[e.WRITABLE_SIGNER=3]="WRITABLE_SIGNER",e[e.READONLY_SIGNER=2]="READONLY_SIGNER",e[e.WRITABLE=1]="WRITABLE",e[e.READONLY=0]="READONLY",e))(a||{});function u(e){if("signatures"in e){let{signatures:n,...r}=e;return r}else return e}function f(e,n){if("lifetimeConstraint"in n&&n.lifetimeConstraint.blockhash===e.blockhash&&n.lifetimeConstraint.lastValidBlockHeight===e.lastValidBlockHeight)return n;let r={...u(n),lifetimeConstraint:e};return Object.freeze(r),r}function g({version:e}){let n={instructions:[],version:e};return Object.freeze(n),n}function h(e,n){if("feePayer"in n&&e===n.feePayer)return n;let r={...u(n),feePayer:e};return Object.freeze(r),r}function p(e,n){let r={...u(n),instructions:[...n.instructions,e]};return Object.freeze(r),r}function A(e,n,r){let s=n.get(r);if(!s)throw new Error(`Could not find account address at index ${r}`);let o=e.isAccountSigner(r),i=e.isAccountWritable(r),c=o?i?a.WRITABLE_SIGNER:a.READONLY_SIGNER:i?a.WRITABLE:a.READONLY;return {address:s.toBase58(),role:c}}function T(e,n,r){let s=n.get(r.programIdIndex);if(!s)throw new Error(`Could not find program address at index ${r.programIdIndex}`);let o=r.accountKeyIndexes.map(i=>A(e,n,i));return {programAddress:s.toBase58(),...o.length?{accounts:o}:{},...r.data.length?{data:r.data}:{}}}function I(e,n){return e.signatures.reduce((r,s,o)=>{if(s.every(t=>t===0))return r;let c=n[o].toBase58();return {...r,[c]:s}},{})}function x(e,n){if(e.message.addressTableLookups.length>0)throw new Error("Cannot convert transaction with addressTableLookups");let r=e.message.getAccountKeys(),s=r.staticAccountKeys[0];if(!s)throw new Error("No fee payer set in VersionedTransaction");let o={blockhash:e.message.recentBlockhash,lastValidBlockHeight:n??2n**64n-1n},i=e.message.compiledInstructions.map(t=>T(e.message,r,t)),c=I(e,r.staticAccountKeys);return l(g({version:e.version}),t=>h(s.toBase58(),t),t=>f(o,t),t=>i.reduce((m,b)=>p(b,m),t),t=>e.signatures.length?{...t,signatures:c}:t)}
+
+	exports.fromVersionedTransactionWithBlockhash = x;
+
+	return exports;
+
+})({});

package/dist/types/index.d.ts

@@ -0,0 +1,2 @@
+export * from './transaction';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/dist/types/transaction.d.ts

@@ -0,0 +1,4 @@
+import type { ITransactionWithBlockhashLifetime, ITransactionWithFeePayer, Transaction } from '@solana/transactions';
+import type { VersionedTransaction } from '@solana/web3.js';
+export declare function fromVersionedTransactionWithBlockhash(transaction: VersionedTransaction, lastValidBlockHeight?: bigint): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime;
+//# sourceMappingURL=transaction.d.ts.map

package/dist/types/transaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAER,iCAAiC,EACjC,wBAAwB,EAExB,WAAW,EACd,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EAKR,oBAAoB,EACvB,MAAM,iBAAiB,CAAC;AAkEzB,wBAAgB,qCAAqC,CACjD,WAAW,EAAE,oBAAoB,EACjC,oBAAoB,CAAC,EAAE,MAAM,GAC9B,WAAW,GAAG,wBAAwB,GAAG,iCAAiC,CAsC5E"}

package/package.json

@@ -0,0 +1,104 @@
+{
+  "name": "@solana/compat",
+  "version": "2.0.0-experimental.782d1ea",
+  "description": "Helpers for converting from legacy web3js classes",
+  "exports": {
+    "browser": {
+      "import": "./dist/index.browser.js",
+      "require": "./dist/index.browser.cjs"
+    },
+    "node": {
+      "import": "./dist/index.node.js",
+      "require": "./dist/index.node.cjs"
+    },
+    "react-native": "./dist/index.native.js",
+    "types": "./dist/types/index.d.ts"
+  },
+  "browser": {
+    "./dist/index.node.cjs": "./dist/index.browser.cjs",
+    "./dist/index.node.js": "./dist/index.browser.js"
+  },
+  "main": "./dist/index.node.cjs",
+  "module": "./dist/index.node.js",
+  "react-native": "./dist/index.native.js",
+  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "files": [
+    "./dist/"
+  ],
+  "sideEffects": false,
+  "keywords": [
+    "blockchain",
+    "solana",
+    "web3"
+  ],
+  "author": "Solana Labs Maintainers <maintainers@solanalabs.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/solana-labs/solana-web3.js"
+  },
+  "bugs": {
+    "url": "http://github.com/solana-labs/solana-web3.js/issues"
+  },
+  "browserslist": [
+    "supports bigint and not dead",
+    "maintained node versions"
+  ],
+  "engine": {
+    "node": ">=17.4"
+  },
+  "dependencies": {
+    "@solana/functional": "2.0.0-development",
+    "@solana/instructions": "2.0.0-development",
+    "@solana/transactions": "2.0.0-development"
+  },
+  "devDependencies": {
+    "@solana/eslint-config-solana": "^1.0.2",
+    "@swc/jest": "^0.2.28",
+    "@types/jest": "^29.5.5",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.3.0",
+    "agadoo": "^3.0.0",
+    "eslint": "^8.45.0",
+    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-sort-keys-fix": "^1.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.6.4",
+    "jest-runner-eslint": "^2.1.0",
+    "jest-runner-prettier": "^1.0.0",
+    "prettier": "^2.8",
+    "tsup": "7.2.0",
+    "typescript": "^5.2.2",
+    "version-from-git": "^1.1.1",
+    "test-config": "0.0.0",
+    "build-scripts": "0.0.0",
+    "@solana/addresses": "2.0.0-development",
+    "tsconfig": "0.0.0",
+    "@solana/web3.js": "0.0.0-development",
+    "@solana/keys": "2.0.0-development"
+  },
+  "bundlewatch": {
+    "defaultCompression": "gzip",
+    "files": [
+      {
+        "path": "./dist/index*.js"
+      }
+    ]
+  },
+  "scripts": {
+    "compile:js": "tsup --config build-scripts/tsup.config.library.ts",
+    "compile:typedefs": "tsc -p ./tsconfig.declarations.json",
+    "dev": "jest -c node_modules/test-config/jest-dev.config.ts --rootDir . --watch",
+    "publish-packages": "pnpm publish --tag experimental --access public --no-git-checks",
+    "style:fix": "pnpm eslint --fix src/* && pnpm prettier -w src/*",
+    "test:lint": "jest -c node_modules/test-config/jest-lint.config.ts --rootDir . --silent",
+    "test:prettier": "jest -c node_modules/test-config/jest-prettier.config.ts --rootDir . --silent",
+    "test:treeshakability:browser": "agadoo dist/index.browser.js",
+    "test:treeshakability:native": "agadoo dist/index.node.js",
+    "test:treeshakability:node": "agadoo dist/index.native.js",
+    "test:typecheck": "tsc --noEmit",
+    "test:unit:browser": "jest -c node_modules/test-config/jest-unit.config.browser.ts --rootDir . --silent",
+    "test:unit:node": "jest -c node_modules/test-config/jest-unit.config.node.ts --rootDir . --silent"
+  }
+}