@exodus/solana-lib 3.4.2 → 3.5.1

package/CHANGELOG.md

@@ -0,0 +1,219 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [3.5.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.5.0...@exodus/solana-lib@3.5.1) (2024-08-26)
+
+
+### Bug Fixes
+
+* SOL lint ([#2953](https://github.com/ExodusMovement/assets/issues/2953)) ([3f1b3b8](https://github.com/ExodusMovement/assets/commit/3f1b3b8c9a1544ca7d41ac883c06e465d6928b32))
+
+
+
+## [3.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.4.2...@exodus/solana-lib@3.5.0) (2024-06-19)
+
+
+### Features
+
+* **solana-lib:** support signing legacy transaction from buffer ([#2604](https://github.com/ExodusMovement/assets/issues/2604)) ([b08a818](https://github.com/ExodusMovement/assets/commit/b08a8187916dc4a874eabb6b29e79014c63f835b))
+
+
+
+## [3.4.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.4.1...@exodus/solana-lib@3.4.2) (2024-06-06)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
+## [3.4.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.4.0...@exodus/solana-lib@3.4.1) (2024-05-28)
+
+
+### Bug Fixes
+
+* support using keychain private keys ([#2399](https://github.com/ExodusMovement/assets/issues/2399)) ([b900ad3](https://github.com/ExodusMovement/assets/commit/b900ad3b5bdf363f8c83175a5297333375a27529))
+
+
+
+## [3.4.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.3.1...@exodus/solana-lib@3.4.0) (2024-05-23)
+
+
+### Features
+
+* **solana-lib:** recreate a Web3.js transaction if `transactionBuffer` supplied ([#2351](https://github.com/ExodusMovement/assets/issues/2351)) ([8ab56db](https://github.com/ExodusMovement/assets/commit/8ab56dbd120380cd7f89a4954c5d0f765156dbe3))
+
+
+
+## [3.3.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.3.0...@exodus/solana-lib@3.3.1) (2024-05-15)
+
+
+### Bug Fixes
+
+* **solana-plugin:** supply a proper Web3 Transaction instance to simulation ([#2288](https://github.com/ExodusMovement/assets/issues/2288)) ([5316cc0](https://github.com/ExodusMovement/assets/commit/5316cc0ce23643da8e9926adfd8e0db904b704e4))
+
+
+
+## [3.3.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.2.2...@exodus/solana-lib@3.3.0) (2024-05-10)
+
+
+### Features
+
+* `signatureType` to external signer ([#2244](https://github.com/ExodusMovement/assets/issues/2244)) ([ba0f522](https://github.com/ExodusMovement/assets/commit/ba0f522acd0b0ef744c82405ba9e67d5f90ac9c3))
+
+
+
+## [3.2.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.2.1...@exodus/solana-lib@3.2.2) (2024-05-08)
+
+
+### Bug Fixes
+
+* provide `assetName` to createGetKeyIdentifier ([#2191](https://github.com/ExodusMovement/assets/issues/2191)) ([55e5171](https://github.com/ExodusMovement/assets/commit/55e5171b142fd72ff88b645f02f0ad358b93ccf8))
+
+
+
+## [3.2.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.2.0...@exodus/solana-lib@3.2.1) (2024-04-26)
+
+
+### Bug Fixes
+
+* handle decode staking tx crash ([#2161](https://github.com/ExodusMovement/assets/issues/2161)) ([970ef7c](https://github.com/ExodusMovement/assets/commit/970ef7ca4abc393826716702c4d4e56d13ee7914))
+
+
+
+## [3.2.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.1.1...@exodus/solana-lib@3.2.0) (2024-04-24)
+
+
+### Features
+
+* support external signer for solana message signing ([#2151](https://github.com/ExodusMovement/assets/issues/2151)) ([a58921c](https://github.com/ExodusMovement/assets/commit/a58921c6d2020fd67a99dc4c17129c04e346eb8b))
+
+
+
+## [3.1.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.1.0...@exodus/solana-lib@3.1.1) (2024-04-22)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
+## [3.1.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.0.1...@exodus/solana-lib@3.1.0) (2024-04-20)
+
+
+### Features
+
+* add compute budget instruction ([#2006](https://github.com/ExodusMovement/assets/issues/2006)) ([f1479ac](https://github.com/ExodusMovement/assets/commit/f1479aca619370da573f442ef4526e6d21db14d2))
+
+
+
+## [3.0.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.0.0...@exodus/solana-lib@3.0.1) (2024-04-17)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
+## [3.0.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@2.4.0...@exodus/solana-lib@3.0.0) (2024-04-12)
+
+
+### ⚠ BREAKING CHANGES
+
+* **solana:** transaction signing (#2017)
+
+### Bug Fixes
+
+* replace serum with fork ([#2037](https://github.com/ExodusMovement/assets/issues/2037)) ([d7fdbae](https://github.com/ExodusMovement/assets/commit/d7fdbae87cfa605afeff8f2b836a5a2839105f78))
+* **solana:** transaction signing ([#2017](https://github.com/ExodusMovement/assets/issues/2017)) ([78393f9](https://github.com/ExodusMovement/assets/commit/78393f96c5102636dab62e1cf0b368475c8b038e))
+
+
+
+## [2.4.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@2.3.0...@exodus/solana-lib@2.4.0) (2024-04-08)
+
+
+### Features
+
+* **solana:** add signMessage ([#1980](https://github.com/ExodusMovement/assets/issues/1980)) ([fd0b28c](https://github.com/ExodusMovement/assets/commit/fd0b28ce0c86249ec8a5d32ee0a3e542513c6d47))
+
+
+
+## [2.3.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@2.2.0...@exodus/solana-lib@2.3.0) (2024-04-04)
+
+
+### Features
+
+* implement helius priority fee ([#1799](https://github.com/ExodusMovement/assets/issues/1799)) ([e681ee7](https://github.com/ExodusMovement/assets/commit/e681ee7f52526bc8a77ab9917d57fb5c2fca2fd4))
+
+
+
+## [2.2.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@2.1.0...@exodus/solana-lib@2.2.0) (2024-04-04)
+
+
+### Features
+
+* add support for external signer for Solana ([#1952](https://github.com/ExodusMovement/assets/issues/1952)) ([70424fe](https://github.com/ExodusMovement/assets/commit/70424fe54c4bcf6be897a182761746b1e02475f3))
+
+
+
+## [2.1.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@2.0.0...@exodus/solana-lib@2.1.0) (2024-03-27)
+
+
+### Features
+
+* add new Solana token 2022 program ([#1808](https://github.com/ExodusMovement/assets/issues/1808)) ([90747bc](https://github.com/ExodusMovement/assets/commit/90747bc97fba0e629a1eaba5878dd06f834b0d72))
+
+
+### Bug Fixes
+
+* support token-2022 program for metaplex transfer ([#1894](https://github.com/ExodusMovement/assets/issues/1894)) ([31f712a](https://github.com/ExodusMovement/assets/commit/31f712a8fda681969b1c3dbe6f4c5e3d250f3062))
+
+
+
+## [2.0.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@1.8.2...@exodus/solana-lib@2.0.0) (2024-03-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* decouple solana-lib from solana-meta (#1810)
+
+### Features
+
+* decouple solana-lib from solana-meta ([#1810](https://github.com/ExodusMovement/assets/issues/1810)) ([50db597](https://github.com/ExodusMovement/assets/commit/50db59734b1e48f8616f5de1ff61bfac356685a3))
+
+
+
+## [1.8.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@1.8.1...@exodus/solana-lib@1.8.2) (2024-03-18)
+
+
+### Bug Fixes
+
+* accurately calculate solana priority fee ([#1777](https://github.com/ExodusMovement/assets/issues/1777)) ([aa72d65](https://github.com/ExodusMovement/assets/commit/aa72d65d0117e7ff418967c019c1f3cb865961eb))
+
+
+
+
+
+## [1.8.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@1.8.0...@exodus/solana-lib@1.8.1) (2024-03-16)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
+# [1.8.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@1.7.5...@exodus/solana-lib@1.8.0) (2024-03-12)
+
+
+### Bug Fixes
+
+* increase SOL fee boundary check ([#1717](https://github.com/ExodusMovement/assets/issues/1717)) ([6ae954e](https://github.com/ExodusMovement/assets/commit/6ae954e2314acf0a84ea6dea07b89e5bba96e5b1))
+* solana test case ([#1602](https://github.com/ExodusMovement/assets/issues/1602)) ([00b8ddd](https://github.com/ExodusMovement/assets/commit/00b8ddd7726d50bbfe227ddacced7e388c2af283))
+
+
+### Features
+
+* add SOL prioritization fee ([#1682](https://github.com/ExodusMovement/assets/issues/1682)) ([f199ef5](https://github.com/ExodusMovement/assets/commit/f199ef52dc9047768c5a8f4ccb75cd5f82a13e2e))
+* **solana:** migrate some implementations and remove `@exodus/solana-spl-tokan` usage. ([#1669](https://github.com/ExodusMovement/assets/issues/1669)) ([ee75e1f](https://github.com/ExodusMovement/assets/commit/ee75e1fbf5c276aafc91260dee9ad6e44e5c8b8b))

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.4.2",
+  "version": "3.5.1",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
-    "src/",
+    "src",
+    "CHANGELOG.md",
     "!src/**/__tests__"
   ],
-  "author": "Exodus",
+  "author": "Exodus Movement, Inc.",
   "license": "ISC",
   "publishConfig": {
     "access": "restricted"
   },
   "scripts": {
-    "test": "run -T jest",
-    "lint": "run -T eslint ./src",
+    "test": "run -T exodus-test --jest --esbuild",
+    "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
@@ -23,8 +24,7 @@
     "@exodus/currency": "^2.3.2",
     "@exodus/key-utils": "^3.1.0",
     "@exodus/models": "^10.1.0",
-    "@exodus/project-serum-serum": "0.13.64-exodus.0",
-    "@exodus/solana-web3.js": "^1.63.1-exodus.3",
+    "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc1",
     "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
@@ -34,11 +34,18 @@
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@exodus/key-identifier": "1.0.0",
-    "@exodus/keychain": "^6.2.0",
+    "@exodus/key-identifier": "^1.2.1",
+    "@exodus/keychain": "^6.7.0",
     "@exodus/solana-meta": "^1.1.0",
-    "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "9d24eb58422692fc1acdcb834061d02b2632801d"
+  "bugs": {
+    "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-lib"
+  },
+  "homepage": "https://github.com/ExodusMovement/assets/tree/master/solana/solana-lib",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ExodusMovement/assets.git"
+  },
+  "gitHead": "31e84436880a97a8cc17043ccd319e376578d7f4"
 }

package/src/constants.js

@@ -1,4 +1,4 @@
-import { PublicKey, SystemProgram, StakeProgram } from './vendor'
+import { PublicKey, StakeProgram, SystemProgram } from './vendor'
 
 export const SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID = new PublicKey(
   'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'

package/src/encode.js

@@ -1,16 +1,17 @@
 import assert from 'assert'
-import { PublicKey, StakeProgram } from './vendor'
+import BN from 'bn.js'
+import { deserializeUnchecked } from 'borsh'
+import bs58 from 'bs58'
+
 import {
+  MPL_TOKEN_METADATA_PROGRAM_ID,
+  SEED,
   SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
-  SEED,
-  MPL_TOKEN_METADATA_PROGRAM_ID,
 } from './constants'
-import { getPublicKey, getKeyPairFromPrivateKey } from './keypair'
-import bs58 from 'bs58'
-import BN from 'bn.js'
 import { Metadata, METADATA_SCHEMA } from './helpers/metadata-schema'
-import { deserializeUnchecked } from 'borsh'
+import { getKeyPairFromPrivateKey, getPublicKey } from './keypair'
+import { PublicKey, StakeProgram } from './vendor'
 
 export function getAddressFromPublicKey(publicKey) {
   return bs58.encode(Buffer.from(publicKey, 'hex'))

package/src/helpers/metadata-schema.js

@@ -1,7 +1,7 @@
 // metadata structs: https://github.com/metaplex-foundation/metaplex/blob/master/js/packages/common/src/actions/metadata.ts
 
-import bs58 from 'bs58'
 import { BinaryReader, BinaryWriter } from 'borsh'
+import bs58 from 'bs58'
 
 BinaryReader.prototype.readPubkeyAsString = function () {
   const array = this.readFixedArray(32)

package/src/helpers/metaplex-transfer.js

@@ -1,20 +1,19 @@
 import * as BufferLayout from '@exodus/buffer-layout'
 
-import { Transaction, PublicKey, TransactionInstruction } from '../vendor'
 import {
   MPL_TOKEN_METADATA_PROGRAM_ID,
   SYSTEM_PROGRAM_ID,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   TOKEN_PROGRAM_ID,
 } from '../constants'
-
-import { ASSOCIATED_TOKEN_PROGRAM_ID } from './spl-token'
 import {
   findAssociatedTokenAddress,
   getMasterEditionPDA,
   getMetadataAccount,
   getTokenRecordPDA,
 } from '../encode'
+import { PublicKey, Transaction, TransactionInstruction } from '../vendor'
+import { ASSOCIATED_TOKEN_PROGRAM_ID } from './spl-token'
 
 const TRANSFER_INSTRUCTION_DISCRIMINATOR = 49
 const TOKEN_AUTH_RULES_ID = new PublicKey('auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg')

package/src/helpers/spl-token-2022.js

@@ -1,6 +1,7 @@
-import { PublicKey, TransactionInstruction } from '../vendor'
 import { struct, u8 } from '@exodus/buffer-layout'
 import * as BufferLayout from '@exodus/buffer-layout'
+
+import { PublicKey, TransactionInstruction } from '../vendor'
 import { U64 } from './spl-token'
 
 /**
@@ -60,7 +61,7 @@ export const transferCheckedWithFeeInstructionData = struct([
  * @param fee             The expected fee assesed on this transfer, calculated off-chain based on the transferFeeBasisPoints and maximumFee of the mint.
  * @param programId       SPL Token program account
  *
- * @return Instruction to add to a transaction
+ * @returns Instruction to add to a transaction
  */
 export function createTransferCheckedWithFeeInstruction(
   source, // PublicKey
@@ -111,7 +112,7 @@ export function createTransferCheckedWithFeeInstruction(
  * @param instruction Transaction instruction to decode
  * @param programId   SPL Token program account
  *
- * @return Decoded, valid instruction
+ * @returns Decoded, valid instruction
  */
 export function decodeTransferCheckedWithFeeInstruction(
   instruction, // TransactionInstruction
@@ -151,7 +152,7 @@ export function decodeTransferCheckedWithFeeInstruction(
  *
  * @param instruction Transaction instruction to decode
  *
- * @return Decoded, non-validated instruction
+ * @returns Decoded, non-validated instruction
  */
 export function decodeTransferCheckedWithFeeInstructionUnchecked({
   programId,

package/src/helpers/spl-token.js

@@ -1,7 +1,8 @@
+import * as BufferLayout from '@exodus/buffer-layout'
 import assert from 'assert'
 import BN from 'bn.js'
-import * as BufferLayout from '@exodus/buffer-layout'
-import { PublicKey, SYSVAR_RENT_PUBKEY, SystemProgram, TransactionInstruction } from '../vendor'
+
+import { PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction } from '../vendor'
 import * as Layout from '../vendor/utils/layout'
 
 // Extracted from https://github.com/ExodusMovement/solana-spl-token/blob/master/src/index.js#L263
@@ -64,7 +65,7 @@ const uint64 = (property = 'uint64') => {
 /**
  * Unfortunately, BufferLayout.encode uses an `instanceof` check for `Buffer`
  * which fails when using `publicKey.toBuffer()` directly because the bundled `Buffer`
- * class in `@solana/web3.js` is different from the bundled `Buffer` class in this package
+ * class in `@exodus/solana-web3.js` is different from the bundled `Buffer` class in this package
  */
 const pubkeyToBuffer = (publicKey) => {
   return Buffer.from(publicKey.toBuffer())

package/src/helpers/tokenTransfer.js

@@ -1,7 +1,7 @@
-import { Token } from './spl-token'
-import { PublicKey, TransactionInstruction, SystemProgram, SYSVAR_RENT_PUBKEY } from '../vendor'
 import { SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../constants'
 import { findAssociatedTokenAddress } from '../encode'
+import { PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction } from '../vendor'
+import { Token } from './spl-token'
 
 // https://github.com/paul-schaaf/spl-token-ui/blob/main/src/solana/token/associatedToken.ts#L59
 export const createAssociatedTokenAccount = (

package/src/key-identifier.js

@@ -1,8 +1,8 @@
-import assert from 'minimalistic-assert'
 import {
   createGetKeyIdentifier as _createGetKeyIdentifier,
   unhardenDerivationIndex,
 } from '@exodus/key-utils'
+import assert from 'minimalistic-assert'
 
 export const getSupportedPurposes = () => [44]
 

package/src/keypair.js

@@ -1,4 +1,5 @@
 import nacl from 'tweetnacl'
+
 import { PublicKey } from './vendor/publickey'
 
 export function getKeyPairFromPrivateKey(privateKey) {

package/src/magiceden/escrow-program.js

@@ -1,5 +1,5 @@
+import { MAGIC_EDEN_ESCROW_PROGRAM_ID, SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../constants'
 import { PublicKey, Transaction } from '../vendor'
-import { SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID, MAGIC_EDEN_ESCROW_PROGRAM_ID } from '../constants'
 import { encodeData } from './coders'
 
 const PLATFORM_FEES_PROGRAM_ID = new PublicKey('2NZukH2TXpcuZP4htiuT8CFxcaQSWzkkR6kepSWnZ24Q')

package/src/msg/sign-message-deprecated.js

@@ -1,9 +1,9 @@
 import assert from 'assert'
-import nacl from 'tweetnacl'
 import bs58 from 'bs58'
+import nacl from 'tweetnacl'
 
-import { isTransactionMessage } from './validation'
 import { getKeyPairFromPrivateKey } from '../keypair'
+import { isTransactionMessage } from './validation'
 
 /**
  * @deprecated please use messageSigner

package/src/transaction.js

@@ -3,27 +3,27 @@ import BN from 'bn.js'
 import bs58 from 'bs58'
 import { get } from 'lodash'
 
-import { getKeyPairFromPrivateKey } from './keypair'
-import { findAssociatedTokenAddress, createStakeAddress } from './encode'
+import { MEMO_PROGRAM_ID, SEED, STAKE_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from './constants'
+import { createStakeAddress, findAssociatedTokenAddress } from './encode'
+import { createTransferCheckedWithFeeInstruction } from './helpers/spl-token-2022'
 import {
   createAssociatedTokenAccount,
-  createTokenTransferInstruction,
   createCloseAccountInstruction,
+  createTokenTransferInstruction,
 } from './helpers/tokenTransfer'
-import { createTransferCheckedWithFeeInstruction } from './helpers/spl-token-2022'
+import { getKeyPairFromPrivateKey } from './keypair'
+import { MagicEdenEscrowProgram } from './magiceden/escrow-program'
 import {
-  PublicKey,
   Account,
-  Transaction,
-  SystemProgram,
-  StakeProgram,
-  StakeInstruction,
   Authorized,
   Lockup,
+  PublicKey,
+  StakeInstruction,
+  StakeProgram,
+  SystemProgram,
+  Transaction,
   TransactionInstruction,
 } from './vendor'
-import { MagicEdenEscrowProgram } from './magiceden/escrow-program'
-import { MEMO_PROGRAM_ID, SEED, STAKE_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from './constants'
 
 class Tx {
   constructor({

package/src/tx/build-raw-transaction.js

@@ -1,4 +1,5 @@
 import * as nacl from 'tweetnacl'
+
 import { PACKET_DATA_SIZE } from '../vendor'
 
 // Copied from:

package/src/tx/common.js

@@ -22,16 +22,8 @@ export function getTxId(tx) {
 }
 
 function getFirstSignature(tx) {
-  if (isVersionedTransaction(tx)) {
-    // Versioned
-    if (tx.signatures.length > 0) {
-      return tx.signatures[0]
-    }
-  } else {
-    // Legacy
-    if (tx.signatures.length > 0) {
-      return tx.signatures[0].signature
-    }
+  if (tx.signatures.length > 0) {
+    return tx.signatures[0]
   }
 
   return null

package/src/tx/decode-tx-instructions.js

@@ -1,9 +1,10 @@
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../helpers/spl-token'
-import { MARKETS, TokenInstructions } from '@exodus/project-serum-serum'
 import * as BufferLayout from '@exodus/buffer-layout'
+import bs58 from 'bs58'
 
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../helpers/spl-token'
 import { SystemInstruction, SystemProgram } from './../vendor'
-import bs58 from 'bs58'
+import * as TokenInstructions from './token-instructions'
+import { MARKETS } from './tokens-and-markets'
 
 const INSTRUCTION_LAYOUT = BufferLayout.union(BufferLayout.u8('instruction'))
 INSTRUCTION_LAYOUT.addVariant(

package/src/tx/layout.js

@@ -0,0 +1,20 @@
+import { Blob } from '@exodus/buffer-layout'
+import { PublicKey } from '@exodus/solana-web3.js'
+
+class PublicKeyLayout extends Blob {
+  constructor(property) {
+    super(32, property)
+  }
+
+  decode(b, offset) {
+    return new PublicKey(super.decode(b, offset))
+  }
+
+  encode(src, b, offset) {
+    return super.encode(src.toBuffer(), b, offset)
+  }
+}
+
+export function publicKeyLayout(property) {
+  return new PublicKeyLayout(property)
+}