@layerzerolabs/oft-v2-solana-sdk 3.0.53 → 3.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/oft-v2-solana-sdk",
-  "version": "3.0.53",
+  "version": "3.0.56",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -20,23 +20,19 @@
     "src/**/*"
   ],
   "scripts": {
-    "_test": "anchor test --skip-build",
-    "api-gen": "$npm_execpath gen-idl && $npm_execpath ts-node scripts/generate.ts",
-    "build": "$npm_execpath clean-prebuild && $npm_execpath sync-target && $npm_execpath api-gen && $npm_execpath build-ts",
+    "api-gen": "$npm_execpath ts-node scripts/generate.ts",
+    "build": "$npm_execpath clean-prebuild && $npm_execpath sync && $npm_execpath api-gen && $npm_execpath build-ts",
     "build-ts": "$npm_execpath tsc --noEmit && $npm_execpath tsup",
     "clean": "$npm_execpath clean-prebuild",
     "clean-prebuild": "rimraf .turbo target dist",
-    "gen-idl": "$npm_execpath sync-target-idl && rsync -avc --delete target/idl/ ./idl/",
-    "sync-oft202": "cp ../contracts/target/idl/oft.json target/idl/oft202.json && cp ../contracts/target/deploy/oft.so target/deploy/oft202.so",
-    "sync-target": "$npm_execpath sync-target-deploy && $npm_execpath sync-target-idl && $npm_execpath sync-oft202",
-    "sync-target-deploy": "mkdir -p target/deploy && rsync -avc --delete ../../../../../packages/layerzero-v2/solana/target/deploy/ target/deploy/",
-    "sync-target-idl": "mkdir -p target/idl && rsync -avc --delete ../../../../../packages/layerzero-v2/solana/target/idl/oft.json target/idl/"
+    "sync": "./sync.mjs",
+    "test": "yarn run ts-mocha -b -p ./tsconfig.json -t 10000000 tests/**/*.test.ts"
   },
   "dependencies": {
     "@ethersproject/bytes": "^5.7.0",
-    "@layerzerolabs/lz-foundation": "^3.0.53",
-    "@layerzerolabs/lz-solana-sdk-v2": "^3.0.53",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.53",
+    "@layerzerolabs/lz-foundation": "^3.0.56",
+    "@layerzerolabs/lz-solana-sdk-v2": "^3.0.56",
+    "@layerzerolabs/lz-v2-utilities": "^3.0.56",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/umi": "^0.9.2",
@@ -53,9 +49,10 @@
     "@kinobi-so/nodes-from-anchor": "^0.21.2",
     "@kinobi-so/renderers": "^0.21.3",
     "@kinobi-so/renderers-js-umi": "^0.21.6",
+    "@layerzerolabs/lz-definitions": "^3.0.56",
     "@layerzerolabs/oft-v2-solana": "^0.0.0",
-    "@layerzerolabs/tsup-config-next": "^3.0.53",
-    "@layerzerolabs/typescript-config-next": "^3.0.53",
+    "@layerzerolabs/tsup-config-next": "^3.0.56",
+    "@layerzerolabs/typescript-config-next": "^3.0.56",
     "@metaplex-foundation/mpl-toolbox": "^0.9.2",
     "@metaplex-foundation/solita": "^0.20.1",
     "@metaplex-foundation/umi": "^0.9.2",
@@ -68,6 +65,7 @@
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.10.5",
+    "axios": "^1.6.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "kinobi": "^0.21.4",
@@ -76,7 +74,8 @@
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.1",
     "tsup": "^8.3.5",
-    "typescript": "~5.2.2"
+    "typescript": "~5.2.2",
+    "zx": "^8.1.3"
   },
   "publishConfig": {
     "access": "public"

package/src/oft202.ts

@@ -4,8 +4,8 @@
 // 2. init adapter OFT from existing mint, optionally an existing escrow
 // 3. Wire a peer
 // 4. Set the DVN etc. options
-import { hexlify } from '@ethersproject/bytes'
 import {
+    AccountMeta,
     Cluster,
     Program,
     ProgramError,
@@ -16,23 +16,21 @@ import {
     WrappedInstruction,
     createNullRpc,
     none,
-    publicKeyBytes,
     some,
 } from '@metaplex-foundation/umi'
 import { createDefaultProgramRepository } from '@metaplex-foundation/umi-program-repository'
 import { fromWeb3JsPublicKey, toWeb3JsInstruction, toWeb3JsPublicKey } from '@metaplex-foundation/umi-web3js-adapters'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { AccountMeta, ComputeBudgetProgram, Connection } from '@solana/web3.js'
+import { ComputeBudgetProgram } from '@solana/web3.js'
 
 import {
-    EndpointPDADeriver,
     EndpointProgram,
-    EventPDADeriver,
+    EventPDA,
     SimpleMessageLibProgram,
+    SolanaPacketPath,
     UlnProgram,
-    simulateTransaction,
-} from '@layerzerolabs/lz-solana-sdk-v2'
-import { PacketPath } from '@layerzerolabs/lz-v2-utilities'
+    simulateWeb3JsTransaction,
+} from '@layerzerolabs/lz-solana-sdk-v2/umi'
 
 import { OFT_DECIMALS } from './consts'
 import * as OFTAccounts from './generated/oft202/accounts'
@@ -70,7 +68,7 @@ export * as shared from './generated/oft202/shared'
 export * as types from './generated/oft202/types/index'
 export * as errors from './generated/oft202/errors'
 
-const ENDPOINT_PROGRAM_ID = fromWeb3JsPublicKey(EndpointProgram.PROGRAM_ID)
+const { ENDPOINT_PROGRAM_ID } = EndpointProgram
 const PROGRAM_NAME = 'oft'
 
 export function createOFTProgramRepo(oftProgram: PublicKey, rpc?: RpcInterface): ProgramRepositoryInterface {
@@ -103,7 +101,7 @@ export function initOft(
 ): WrappedInstruction {
     const programsRepo = createOFTProgramRepo(programs.oft)
     const deriver = new OftPDA(programsRepo.getPublicKey(PROGRAM_NAME))
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
+    const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
     const { payer, admin, mint, escrow } = accounts
     const [oftStore] = deriver.oftStore(escrow.publicKey)
     const [lzReceiveTypes] = deriver.lzReceiveTypesAccounts(oftStore)
@@ -124,19 +122,17 @@ export function initOft(
             oftType: oftType,
             admin: admin,
             sharedDecimals: sharedDecimals,
-            endpointProgram: fromWeb3JsPublicKey(endpoint.program),
+            endpointProgram: endpoint.programId,
         }
     )
     const retval = txBuilder.addRemainingAccounts(
-        endpoint
-            .getRegisterOappIxAccountMetaForCPI(toWeb3JsPublicKey(payer.publicKey), toWeb3JsPublicKey(oftStore))
-            .map((acc) => {
-                return {
-                    pubkey: fromWeb3JsPublicKey(acc.pubkey),
-                    isSigner: acc.isSigner,
-                    isWritable: acc.isWritable,
-                }
-            })
+        endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
+            return {
+                pubkey: acc.pubkey,
+                isSigner: acc.isSigner,
+                isWritable: acc.isWritable,
+            }
+        })
     ).items[0]
     retval.signers = [payer, escrow]
     return retval
@@ -155,7 +151,6 @@ export function setOFTConfig(
 ): WrappedInstruction {
     let actualParams: types.SetOFTConfigParamsArgs
     const { oftStore, admin } = accounts
-    const oftStoreWeb3Js = toWeb3JsPublicKey(oftStore)
     const remainingAccounts: AccountMeta[] = []
     if (params.__kind === 'Admin') {
         if (params.admin === undefined) {
@@ -173,18 +168,9 @@ export function setOFTConfig(
             __kind: 'Delegate',
             fields: [params.delegate],
         }
-        const endpointProgram = toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
-        const [oAppRegistry] = new EndpointPDADeriver(endpointProgram).oappRegistry(oftStoreWeb3Js)
-        const [endpointEventAuthority] = new EventPDADeriver(endpointProgram).eventAuthority()
-        const keys = EndpointProgram.instructions.createSetDelegateInstructionAccounts(
-            {
-                oapp: oftStoreWeb3Js,
-                oappRegistry: oAppRegistry,
-                eventAuthority: endpointEventAuthority,
-                program: endpointProgram,
-            },
-            endpointProgram
-        )
+        const endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID
+        const endpointSDK = new EndpointProgram.Endpoint(endpointProgram)
+        const keys = endpointSDK.getSetDelegateIxAccountMetaForCPI(oftStore)
         for (const acc of keys) {
             acc.isSigner = false
         }
@@ -235,7 +221,7 @@ export function setOFTConfig(
     return txBuilder.addRemainingAccounts(
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -381,29 +367,25 @@ export async function send(
     const [oftStore] = deriver.oftStore(tokenEscrow)
     const [peer] = deriver.peer(oftStore, dstEid)
 
-    const connection = new Connection(rpc.getEndpoint())
     if (remainingAccounts === undefined || remainingAccounts.length === 0) {
         const peerAddr: Uint8Array =
             accounts.peerAddr ??
             (await OFTAccounts.fetchPeerConfig({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress))
 
-        const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
-        const msgLibProgram = await getSendLibraryProgram(connection, endpoint, payer.publicKey, oftStore, dstEid)
-        const packetPath: PacketPath = {
-            srcEid: 0,
+        const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
+        const msgLibProgram = await getSendLibraryProgram(rpc, endpoint, payer.publicKey, oftStore, dstEid)
+        const packetPath: SolanaPacketPath = {
             dstEid,
-            sender: hexlify(publicKeyBytes(oftStore)),
-            receiver: hexlify(peerAddr),
+            sender: oftStore,
+            receiver: peerAddr,
         }
-        remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-            connection,
-            toWeb3JsPublicKey(payer.publicKey),
-            packetPath,
-            msgLibProgram
-        )
+        remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+            path: packetPath,
+            msgLibProgram: msgLibProgram,
+        })
     }
 
-    const [eventAuthorityPDA] = new EventPDADeriver(toWeb3JsPublicKey(oftProgramId)).eventAuthority()
+    const [eventAuthorityPDA] = new EventPDA(oftProgramId).eventAuthority()
     const tokenProgram: PublicKey = programs.token ?? fromWeb3JsPublicKey(TOKEN_PROGRAM_ID)
     const txBuilder = instructions.send(
         { programs: programsRepo },
@@ -415,7 +397,7 @@ export async function send(
             tokenEscrow: tokenEscrow,
             tokenMint: tokenMint,
             tokenProgram: tokenProgram,
-            eventAuthority: fromWeb3JsPublicKey(eventAuthorityPDA),
+            eventAuthority: eventAuthorityPDA,
             program: oftProgramId,
             // params
             dstEid: dstEid,
@@ -433,7 +415,7 @@ export async function send(
     return txBuilder.addRemainingAccounts(
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -465,7 +447,8 @@ export async function quote(
         oft: PublicKey | ProgramRepositoryInterface
         endpoint?: PublicKey
     },
-    remainingAccounts?: AccountMeta[]
+    remainingAccounts?: AccountMeta[],
+    addressLookupTable?: PublicKey
 ): Promise<{ nativeFee: bigint; lzTokenFee: bigint }> {
     const { dstEid, to, amountLd, minAmountLd, options, payInLzToken, composeParams } = quoteParams
     const { payer, tokenMint, tokenEscrow } = accounts
@@ -474,25 +457,17 @@ export async function quote(
     const [oftStore] = deriver.oftStore(tokenEscrow)
     const [peer] = deriver.peer(oftStore, dstEid)
 
-    const connection = new Connection(rpc.getEndpoint(), 'confirmed')
     if (remainingAccounts === undefined || remainingAccounts.length === 0) {
         const peerAddr: Uint8Array =
             accounts.peerAddr ??
             (await OFTAccounts.fetchPeerConfig({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress))
 
-        const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
-        const messageLib = await getSendLibraryProgram(connection, endpoint, payer, oftStore, dstEid)
-
-        remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
-            connection,
-            toWeb3JsPublicKey(payer),
-            {
-                sender: hexlify(publicKeyBytes(oftStore)),
-                dstEid: dstEid,
-                receiver: hexlify(peerAddr),
-            },
-            messageLib
-        )
+        const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
+        const messageLib = await getSendLibraryProgram(rpc, endpoint, payer, oftStore, dstEid)
+        remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(rpc, payer, {
+            path: { sender: oftStore, dstEid: dstEid, receiver: peerAddr },
+            msgLibProgram: messageLib,
+        })
     }
 
     let txBuilder = instructions.quoteSend(
@@ -516,7 +491,7 @@ export async function quote(
         // Get remaining accounts from msgLib(simple_msgLib or uln)
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -526,15 +501,16 @@ export async function quote(
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
         units: 1000000,
     })
-    const buffer = await simulateTransaction(
-        connection,
+    return simulateWeb3JsTransaction(
+        rpc,
         [modifyComputeUnits, web3Ix],
         web3Ix.programId,
         toWeb3JsPublicKey(payer),
-        'confirmed'
+        EndpointProgram.types.getMessagingFeeSerializer(),
+        'confirmed',
+        undefined,
+        addressLookupTable === undefined ? undefined : toWeb3JsPublicKey(addressLookupTable)
     )
-    const fee = EndpointProgram.types.messagingFeeBeet.read(buffer, 0)
-    return { nativeFee: BigInt(fee.nativeFee.toString()), lzTokenFee: BigInt(fee.lzTokenFee.toString()) }
 }
 
 export async function quoteOft(
@@ -580,35 +556,34 @@ export async function quoteOft(
         )
         .getInstructions()[0]
     const web3Ix = toWeb3JsInstruction(ix)
-    const connection = new Connection(rpc.getEndpoint())
-    const returnedValues = await simulateTransaction(
-        connection,
+
+    return simulateWeb3JsTransaction(
+        rpc.getEndpoint(),
         [web3Ix],
         web3Ix.programId,
         toWeb3JsPublicKey(payer),
+        types.getQuoteOFTResultSerializer(),
         'confirmed'
     )
-    const [result] = types.getQuoteOFTResultSerializer().deserialize(returnedValues, 0)
-    return result
 }
 
 async function getSendLibraryProgram(
-    connection: Connection,
+    rpc: RpcInterface,
     endpoint: EndpointProgram.Endpoint,
     payer: PublicKey,
     oftStore: PublicKey,
     remoteEid: number
 ): Promise<SimpleMessageLibProgram.SimpleMessageLib | UlnProgram.Uln> {
-    const sendLibInfo = await endpoint.getSendLibrary(connection, toWeb3JsPublicKey(oftStore), remoteEid)
-    if (!sendLibInfo?.programId) {
+    const sendLibInfo = await endpoint.getSendLibrary(rpc, oftStore, remoteEid)
+    if (!sendLibInfo.programId) {
         throw new Error('Send library not initialized or blocked message library')
     }
     const { programId: msgLibProgram } = sendLibInfo
-    const msgLibVersion = await endpoint.getMessageLibVersion(connection, toWeb3JsPublicKey(payer), msgLibProgram)
-    if (msgLibVersion?.major.toString() === '0' && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    const msgLibVersion = await endpoint.getMessageLibVersion(rpc, payer, msgLibProgram)
+    if (msgLibVersion.major.toString() === '0' && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
         return new SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram)
     } else if (
-        msgLibVersion?.major.toString() === '3' &&
+        msgLibVersion.major.toString() === '3' &&
         msgLibVersion.minor == 0 &&
         msgLibVersion.endpointVersion == 2
     ) {