@exodus/solana-lib 1.3.13 → 1.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -13,7 +13,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^3.6.0",
+    "@exodus/asset-lib": "^3.6.2",
     "@exodus/assets": "^8.0.68",
     "@exodus/assets-base": "^8.0.139",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
@@ -29,5 +29,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "12104775b7a98f110b78e928321ca0d530757d88"
+  "gitHead": "3c0551a25d29f31be43d522e742d5754cd7deb5f"
 }

package/src/tx/sign-unsigned-tx.js

@@ -1,3 +1,4 @@
+import { merge } from 'lodash'
 import assets from '@exodus/assets'
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
 import { Transaction } from '../'
@@ -6,118 +7,42 @@ export function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
   privateKey: Buffer
 ): SignedTransaction {
-  const {
-    from,
-    to,
-    amount: unitAmount,
-    recentBlockhash,
-    // tokens related
-    tokenMintAddress,
-    destinationAddressType,
-    isAssociatedTokenAccountActive,
-    fromTokenAddresses,
-    // staking related
-    stakeAddresses,
-    method,
-    seed,
-    pool,
-    // MagicEden escrow/related:
-    initializerAddress,
-    initializerDepositTokenAddress,
-    takerAmount,
-    escrowAddress,
-    escrowBump,
-    pdaAddress,
-    takerAddress,
-    expectedTakerAmount,
-    expectedMintAddress,
-    metadataAddress,
-    creators,
-    // Wallet Connect
-    instructions,
-    feePayer,
-  } = unsignedTx.txData
+  const { amount: unitAmount, from, method } = unsignedTx.txData
 
   const asset = assets.solana
 
   const address = from
   const amount = unitAmount ? asset.currency.baseUnit(unitAmount).toNumber() : unitAmount
 
+  const args = merge(unsignedTx.txData, {
+    asset,
+    address,
+    amount,
+  })
   let tx
   switch (method) {
     case 'delegate':
-      tx = Transaction.createStakeAccountTransaction({
-        address,
-        amount,
-        recentBlockhash,
-        seed,
-        pool,
-      })
+      tx = createDelegateTransaction(args)
       break
     case 'undelegate':
-      tx = Transaction.undelegate({
-        address,
-        stakeAddresses,
-        recentBlockhash,
-      })
+      tx = createUndelegateTransaction(args)
       break
     case 'withdraw':
-      tx = Transaction.withdraw({
-        address,
-        stakeAddresses,
-        amount,
-        recentBlockhash,
-      })
+      tx = createWithdrawTransaction(args)
       break
     case 'initializeEscrow': {
-      tx = Transaction.magicEdenInitializeEscrow({
-        initializerAddress,
-        initializerDepositTokenAddress,
-        escrowBump,
-        escrowAddress,
-        takerAmount,
-        recentBlockhash,
-      })
-
+      tx = createMagicEdenInitializeEscrowTransaction(args)
       break
     }
     case 'cancelEscrow':
-      tx = Transaction.magicEdenCancelEscrow({
-        initializerAddress,
-        initializerDepositTokenAddress,
-        escrowAddress,
-        pdaAddress,
-        recentBlockhash,
-      })
+      tx = createMagicEdenCancelEscrowTransaction(args)
       break
     case 'exchange':
-      tx = Transaction.magicEdenExchange({
-        expectedTakerAmount,
-        expectedMintAddress,
-        takerAddress,
-        initializerAddress,
-        initializerDepositTokenAddress,
-        escrowAddress,
-        pdaAddress,
-        metadataAddress,
-        creators,
-        recentBlockhash,
-      })
+      tx = createMagicEdenExchangeTransaction(args)
       break
     default:
       // SOL and Token tx
-      tx = new Transaction({
-        from,
-        to,
-        amount,
-        recentBlockhash,
-        tokenMintAddress,
-        destinationAddressType,
-        isAssociatedTokenAccountActive,
-        fromTokenAddresses,
-        instructions,
-        feePayer,
-      })
+      tx = createTokenTransaction(args)
       break
   }
 
@@ -128,3 +53,109 @@ export function signUnsignedTx(
 
   return { txId, rawTx }
 }
+
+const createDelegateTransaction = ({ address, amount, pool, recentBlockhash, seed }) =>
+  Transaction.createStakeAccountTransaction({
+    address,
+    amount,
+    recentBlockhash,
+    seed,
+    pool,
+  })
+
+const createUndelegateTransaction = ({ address, recentBlockhash, stakeAddresses }) =>
+  Transaction.undelegate({
+    address,
+    recentBlockhash,
+    stakeAddresses,
+  })
+
+const createWithdrawTransaction = ({ address, amount, recentBlockhash, stakeAddresses }) =>
+  Transaction.withdraw({
+    address,
+    amount,
+    recentBlockhash,
+    stakeAddresses,
+  })
+
+const createMagicEdenInitializeEscrowTransaction = ({
+  escrowAddress,
+  escrowBump,
+  initializerDepositTokenAddress,
+  recentBlockhash,
+  takerAmount,
+  initializerAddress,
+}) =>
+  Transaction.magicEdenInitializeEscrow({
+    escrowAddress,
+    escrowBump,
+    initializerAddress,
+    initializerDepositTokenAddress,
+    recentBlockhash,
+    takerAmount,
+  })
+
+const createMagicEdenCancelEscrowTransaction = ({
+  escrowAddress,
+  initializerAddress,
+  initializerDepositTokenAddress,
+  pdaAddress,
+  recentBlockhash,
+}) =>
+  Transaction.magicEdenCancelEscrow({
+    escrowAddress,
+    initializerAddress,
+    initializerDepositTokenAddress,
+    pdaAddress,
+    recentBlockhash,
+  })
+
+const createMagicEdenExchangeTransaction = ({
+  creators,
+  escrowAddress,
+  expectedMintAddress,
+  expectedTakerAmount,
+  initializerAddress,
+  initializerDepositTokenAddress,
+  metadataAddress,
+  pdaAddress,
+  recentBlockhash,
+  takerAddress,
+}) =>
+  Transaction.magicEdenExchange({
+    creators,
+    escrowAddress,
+    expectedMintAddress,
+    expectedTakerAmount,
+    initializerAddress,
+    initializerDepositTokenAddress,
+    metadataAddress,
+    pdaAddress,
+    recentBlockhash,
+    takerAddress,
+  })
+
+const createTokenTransaction = ({
+  amount,
+  destinationAddressType,
+  feePayer,
+  from,
+  fromTokenAddresses,
+  instructions,
+  isAssociatedTokenAccountActive,
+  recentBlockhash,
+  to,
+  tokenMintAddress,
+}) =>
+  new Transaction({
+    amount,
+    destinationAddressType,
+    feePayer,
+    from,
+    fromTokenAddresses,
+    instructions,
+    isAssociatedTokenAccountActive,
+    recentBlockhash,
+    to,
+    tokenMintAddress,
+  })

package/src/vendor/transaction.js

@@ -262,10 +262,19 @@ export class Transaction {
 
     // Sort. Prioritizing first by signer, then by writable
     accountMetas.sort(function(x, y) {
-      const pubkeySorting = x.pubkey.toBase58().localeCompare(y.pubkey.toBase58())
-      const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1
-      const checkWritable = x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1
-      return checkSigner || checkWritable
+      if (x.isSigner !== y.isSigner) {
+        // Signers always come before non-signers
+        return x.isSigner ? -1 : 1
+      }
+      if (x.isWritable !== y.isWritable) {
+        // Writable accounts always come before read-only accounts
+        return x.isWritable ? -1 : 1
+      }
+
+      const xPubKey = x.pubkey.toBase58().toLowerCase()
+      const yPubKey = y.pubkey.toBase58().toLowerCase()
+
+      return xPubKey < yPubKey ? -1 : xPubKey > yPubKey ? 1 : 0
     })
 
     // Cull duplicate account metas