@exodus/solana-lib 1.2.24 → 1.2.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.2.24",
+  "version": "1.2.25",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -24,5 +24,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "131c0987f26bbef2c42e9bcf54b799c63a0dea7b"
+  "gitHead": "2703cd0c4f81f6b99570579e3b3ae3bfb1585f0a"
 }

package/src/constants.js

@@ -9,4 +9,8 @@ export const STAKE_PROGRAM_ID = StakeProgram.programId
 
 export const TOKEN_PROGRAM_ID = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA')
 
+export const MAGIC_EDEN_ESCROW_PROGRAM_ID = new PublicKey(
+  'MEisE1HzehtrDpAAT8PnLHjpSSkRYakotTuJRPjTpo8'
+)
+
 export const SEED = 'stake:0'

package/src/index.js

@@ -4,6 +4,6 @@ export * from './constants'
 export * from './encode'
 export * from './keypair'
 export * from './tx'
-export { StakeInstruction } from './vendor'
+export { StakeInstruction, PublicKey } from './vendor'
 export { default as tokens } from './tokens'
 export { default as Transaction } from './transaction'

package/src/magiceden/coders.js

@@ -1,28 +1,25 @@
 import * as BufferLayout from '@exodus/buffer-layout'
-
-import { snakeCase } from 'lodash'
 import createHash from 'create-hash'
 
-import { bnAmountU64 } from '../vendor/utils/layout'
+import { bnAmountU64, publicKey } from '../vendor/utils/layout'
 
 const idl = {
   initializeEscrow: {
-    name: 'initializeEscrow',
-    layout: BufferLayout.struct([bnAmountU64('takerAmount')]),
+    name: 'initialize_escrow2',
+    layout: BufferLayout.struct([bnAmountU64('takerAmount'), BufferLayout.u8('escrowBump')]),
   },
   cancelEscrow: {
-    name: 'cancelEscrow',
+    name: 'cancel_escrow',
     layout: BufferLayout.struct([]),
   },
   exchange: {
-    name: 'exchange',
-    layout: BufferLayout.struct([]),
+    name: 'exchange2',
+    layout: BufferLayout.struct([bnAmountU64('expectedTakerAmount'), publicKey('expectedMint')]),
   },
 }
 
 export function sighash(nameSpace, ixName) {
-  let name = snakeCase(ixName)
-  let preimage = `${nameSpace}:${name}`
+  let preimage = `${nameSpace}:${ixName}`
 
   return Buffer.from(
     createHash('sha256')

package/src/magiceden/escrow-program.js

@@ -1,12 +1,12 @@
-import { PublicKey, Transaction, SystemProgram } from '../vendor'
-import { 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')
 
 export class MagicEdenEscrowProgram {
   static get programId() {
-    return new PublicKey('MEisE1HzehtrDpAAT8PnLHjpSSkRYakotTuJRPjTpo8')
+    return MAGIC_EDEN_ESCROW_PROGRAM_ID
   }
 
   static get space() {
@@ -18,22 +18,12 @@ export class MagicEdenEscrowProgram {
       initializerPubkey,
       initializerDepositTokenPubkey,
       escrowPubkey,
-      lamports,
+      escrowBump,
       takerAmount,
     } = params
 
     const transaction = new Transaction()
 
-    transaction.add(
-      SystemProgram.createAccount({
-        fromPubkey: initializerPubkey,
-        newAccountPubkey: escrowPubkey,
-        lamports: lamports,
-        space: this.space,
-        programId: this.programId,
-      })
-    )
-
     return transaction.add({
       keys: [
         {
@@ -56,9 +46,14 @@ export class MagicEdenEscrowProgram {
           isSigner: false,
           isWritable: false,
         },
+        {
+          pubkey: SYSTEM_PROGRAM_ID,
+          isSigner: false,
+          isWritable: false,
+        },
       ],
       programId: this.programId,
-      data: encodeData('initializeEscrow', { takerAmount }),
+      data: encodeData('initializeEscrow', { takerAmount, escrowBump }),
     })
   }
 
@@ -100,6 +95,8 @@ export class MagicEdenEscrowProgram {
 
   static exchange(params) {
     const {
+      expectedTakerAmount,
+      expectedMintPubkey,
       takerPubkey,
       initializerDepositTokenPubkey,
       initializerPubkey,
@@ -165,7 +162,10 @@ export class MagicEdenEscrowProgram {
         ...remainingAccounts,
       ],
       programId: this.programId,
-      data: encodeData('exchange'),
+      data: encodeData('exchange', {
+        expectedTakerAmount,
+        expectedMint: expectedMintPubkey.toBuffer(),
+      }),
     })
   }
 }

package/src/transaction.js

@@ -209,19 +209,20 @@ class Tx {
   static magicEdenInitializeEscrow({
     initializerAddress,
     initializerDepositTokenAddress,
-    lamports,
     takerAmount,
-    escrowAccount,
+    escrowAddress,
+    escrowBump,
     recentBlockhash,
   }) {
     const initializerPubkey = new PublicKey(initializerAddress)
     const initializerDepositTokenPubkey = new PublicKey(initializerDepositTokenAddress)
+    const escrowPubkey = new PublicKey(escrowAddress)
 
     const transaction = MagicEdenEscrowProgram.initializeEscrow({
       initializerPubkey,
       initializerDepositTokenPubkey,
-      escrowPubkey: escrowAccount.publicKey,
-      lamports,
+      escrowPubkey,
+      escrowBump,
       takerAmount: assets.solana.currency.baseUnit(takerAmount)._number,
     })
 
@@ -255,6 +256,8 @@ class Tx {
   }
 
   static magicEdenExchange({
+    expectedTakerAmount,
+    expectedMintAddress,
     takerAddress,
     initializerAddress,
     initializerDepositTokenAddress,
@@ -264,6 +267,7 @@ class Tx {
     creators,
     recentBlockhash,
   }) {
+    const expectedMintPubkey = new PublicKey(expectedMintAddress)
     const takerPubkey = new PublicKey(takerAddress)
     const initializerPubkey = new PublicKey(initializerAddress)
     const initializerDepositTokenPubkey = new PublicKey(initializerDepositTokenAddress)
@@ -272,6 +276,8 @@ class Tx {
     const metadataPubkey = new PublicKey(metadataAddress)
 
     const transaction = MagicEdenEscrowProgram.exchange({
+      expectedTakerAmount,
+      expectedMintPubkey,
       takerPubkey,
       initializerPubkey,
       initializerDepositTokenPubkey,

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

@@ -22,11 +22,13 @@ export function createUnsignedTx({
   // MagicEden escrow/related:
   initializerAddress,
   initializerDepositTokenAddress,
-  lamports,
   takerAmount,
   escrowAddress,
+  escrowBump,
   pdaAddress,
   takerAddress,
+  expectedTakerAmount,
+  expectedMintAddress,
   metadataAddress,
   creators,
 }: ParsedTransaction): UnsignedTransaction {
@@ -51,10 +53,12 @@ export function createUnsignedTx({
       // MagicEden escrow/related:
       initializerAddress,
       initializerDepositTokenAddress,
-      lamports,
       takerAmount: takerAmount ? takerAmount.toBaseString() : null,
       escrowAddress,
+      escrowBump,
       pdaAddress,
+      expectedTakerAmount: expectedTakerAmount ? expectedTakerAmount.toBaseString() : null,
+      expectedMintAddress,
       takerAddress,
       metadataAddress,
       creators,

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

@@ -18,11 +18,13 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     pool,
     initializerAddress,
     initializerDepositTokenAddress,
-    lamports,
     takerAmount,
     escrowAddress,
+    escrowBump,
     pdaAddress,
     takerAddress,
+    expectedTakerAmount,
+    expectedMintAddress,
     metadataAddress,
     creators,
     ...txData
@@ -51,11 +53,13 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     // MagicEden escrow/related:
     initializerAddress,
     initializerDepositTokenAddress,
-    lamports,
-    takerAmount: asset.currency.baseUnit(txData.takerAmount),
+    takerAmount: takerAmount ? asset.currency.baseUnit(takerAmount) : null,
     escrowAddress,
+    escrowBump,
     pdaAddress,
     takerAddress,
+    expectedTakerAmount: expectedTakerAmount ? asset.currency.baseUnit(expectedTakerAmount) : null,
+    expectedMintAddress,
     metadataAddress,
     creators,
   }

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

@@ -1,7 +1,6 @@
 import assets from '@exodus/assets'
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
-import { Account } from '../vendor'
-import { Transaction, generateKeyPair } from '../'
+import { Transaction } from '../'
 
 export function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
@@ -26,11 +25,13 @@ export function signUnsignedTx(
     // MagicEden escrow/related:
     initializerAddress,
     initializerDepositTokenAddress,
-    lamports,
     takerAmount,
     escrowAddress,
+    escrowBump,
     pdaAddress,
     takerAddress,
+    expectedTakerAmount,
+    expectedMintAddress,
     metadataAddress,
     creators,
   } = unsignedTx.txData
@@ -41,7 +42,6 @@ export function signUnsignedTx(
   const amount = unitAmount ? asset.currency.baseUnit(unitAmount).toNumber() : unitAmount
 
   let tx
-  const extraSigners = []
   switch (method) {
     case 'delegate':
       tx = Transaction.createStakeAccountTransaction({
@@ -68,18 +68,15 @@ export function signUnsignedTx(
       })
       break
     case 'initializeEscrow': {
-      const escrowAccount = new Account(generateKeyPair().secretKey)
-
       tx = Transaction.magicEdenInitializeEscrow({
         initializerAddress,
         initializerDepositTokenAddress,
-        lamports,
+        escrowBump,
+        escrowAddress,
         takerAmount,
-        escrowAccount,
         recentBlockhash,
       })
 
-      extraSigners.push(escrowAccount)
       break
     }
     case 'cancelEscrow':
@@ -93,6 +90,8 @@ export function signUnsignedTx(
       break
     case 'exchange':
       tx = Transaction.magicEdenExchange({
+        expectedTakerAmount,
+        expectedMintAddress,
         takerAddress,
         initializerAddress,
         initializerDepositTokenAddress,
@@ -120,7 +119,7 @@ export function signUnsignedTx(
   }
 
   // sign plain tx
-  Transaction.sign(tx, privateKey, extraSigners)
+  Transaction.sign(tx, privateKey)
   const rawTx = Transaction.serialize(tx)
   const txId = Transaction.getTxId(tx)