@orderly.network/default-solana-adapter 2.12.2 → 2.12.3

package/dist/index.d.mts

@@ -10,7 +10,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.12.2";
+declare const _default: "2.12.3";
 
 interface SolanaAdapterOption {
     provider: SolanaWalletProvider;

package/dist/index.d.ts

@@ -10,7 +10,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.12.2";
+declare const _default: "2.12.3";
 
 interface SolanaAdapterOption {
     provider: SolanaWalletProvider;

package/dist/index.js

@@ -76,9 +76,9 @@ module.exports = __toCommonJS(index_exports);
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/default-solana-adapter"] = "2.12.2";
+  window.__ORDERLY_VERSION__["@orderly.network/default-solana-adapter"] = "2.12.3";
 }
-var version_default = "2.12.2";
+var version_default = "2.12.3";
 
 // src/walletAdapter.ts
 var ed = __toESM(require("@noble/ed25519"));
@@ -120,6 +120,22 @@ var TREASURY_PROGRAM_ID = SEND_LIB_PROGRAM_ID;
 var DVN_PROGRAM_ID = new import_web3.PublicKey(
   "HtEYV4xB4wvsj5fgTkcfuChYpvGYzgzwvNhgDZQNh7wW"
 );
+var LZ_DVN_PROGRAM_ID = DVN_PROGRAM_ID;
+var CANARY_DVN_PROGRAM_ID = new import_web3.PublicKey(
+  "5KAALa8AEEKnW6p6AacdnqNDmGMpfhwR7AEyWs1gUvsT"
+);
+var NEVERMIND_DVN_PROGRAM_ID = new import_web3.PublicKey(
+  "4fs6aL12L18K5giDy9Dgxgrb3aNRYiuRV2a7JPPj3e7F"
+);
+var LZ_DVN_PDA = new import_web3.PublicKey(
+  "4VDjp6XQaxoZf5RGwiPU9NR1EXSZn2TP4ATMmiSzLfhb"
+);
+var CANARY_DVN_PDA = new import_web3.PublicKey(
+  "7jMeX5mzXnSSKYd8DxBDP4xMnkNFZZZm5W28FWUTbwU3"
+);
+var NEVERMIND_DVN_PDA = new import_web3.PublicKey(
+  "GPjyWr8vCotGuFubDpTxDxy9Vj1ZeEN4F2dwRmFiaGab"
+);
 var VAULT_AUTHORITY_SEED = "VaultAuthority";
 var BROKER_SEED = "Broker";
 var TOKEN_SEED = "Token";
@@ -2541,11 +2557,103 @@ function getPriceFeedPda() {
     PRICE_FEED_PROGRAM_ID
   )[0];
 }
-function getDvnConfigPda() {
-  return import_web32.PublicKey.findProgramAddressSync(
-    [Buffer.from(import_lz_solana_sdk_v2.DVN_CONFIG_SEED, "utf8")],
-    DVN_PROGRAM_ID
-  )[0];
+function appendThreeDvnQuoteRemainingAccounts(priceFeedPda) {
+  const priceFeedPair = () => [
+    {
+      pubkey: PRICE_FEED_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: priceFeedPda,
+      isWritable: false,
+      isSigner: false
+    }
+  ];
+  return [
+    {
+      pubkey: LZ_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: LZ_DVN_PDA,
+      isWritable: false,
+      isSigner: false
+    },
+    ...priceFeedPair(),
+    {
+      pubkey: CANARY_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: CANARY_DVN_PDA,
+      isWritable: false,
+      isSigner: false
+    },
+    ...priceFeedPair(),
+    {
+      pubkey: NEVERMIND_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: NEVERMIND_DVN_PDA,
+      isWritable: false,
+      isSigner: false
+    },
+    ...priceFeedPair()
+  ];
+}
+function appendThreeDvnDepositRemainingAccounts(priceFeedPda) {
+  const priceFeedPair = () => [
+    {
+      pubkey: PRICE_FEED_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: priceFeedPda,
+      isWritable: false,
+      isSigner: false
+    }
+  ];
+  return [
+    {
+      pubkey: LZ_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: LZ_DVN_PDA,
+      isWritable: true,
+      isSigner: false
+    },
+    ...priceFeedPair(),
+    {
+      pubkey: CANARY_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: CANARY_DVN_PDA,
+      isWritable: true,
+      isSigner: false
+    },
+    ...priceFeedPair(),
+    {
+      pubkey: NEVERMIND_DVN_PROGRAM_ID,
+      isWritable: false,
+      isSigner: false
+    },
+    {
+      pubkey: NEVERMIND_DVN_PDA,
+      isWritable: true,
+      isSigner: false
+    },
+    ...priceFeedPair()
+  ];
 }
 function getDstEID(OAPP_PROGRAM_ID) {
   if (OAPP_PROGRAM_ID.toBase58() === MAINNET_OAPP_PROGRAM_ID.toBase58()) {
@@ -2876,7 +2984,6 @@ function getDepositQuoteFee(_0) {
     const defaultSendConfigPDA = getDefaultSendConfigPda(DST_EID);
     const executorConfigPDA = getExecutorConfigPda();
     const priceFeedPDA = getPriceFeedPda();
-    const dvnConfigPDA = getDvnConfigPda();
     const messageLibPDA = getMessageLibPda(SEND_LIB_PROGRAM_ID);
     const messageLibInfoPDA = getMessageLibInfoPda(messageLibPDA);
     const vaultAuthorityPDA = getVaultAuthorityPda(appProgramId);
@@ -2963,26 +3070,7 @@ function getDepositQuoteFee(_0) {
         isWritable: false,
         isSigner: false
       },
-      {
-        pubkey: DVN_PROGRAM_ID,
-        isWritable: false,
-        isSigner: false
-      },
-      {
-        pubkey: dvnConfigPDA,
-        isWritable: false,
-        isSigner: false
-      },
-      {
-        pubkey: PRICE_FEED_PROGRAM_ID,
-        isWritable: false,
-        isSigner: false
-      },
-      {
-        pubkey: priceFeedPDA,
-        isWritable: false,
-        isSigner: false
-      }
+      ...appendThreeDvnQuoteRemainingAccounts(priceFeedPDA)
     ]).instruction();
     const lastBlockHash = yield connection.getLatestBlockhash();
     const lookupTableAddress = getLookupTableAddress(appProgramId);
@@ -2994,10 +3082,13 @@ function getDepositQuoteFee(_0) {
       console.log("-- lookup table account error");
       throw new Error("-- lookup table account error");
     }
+    const ixQuoteComputeBudget = import_web33.ComputeBudgetProgram.setComputeUnitLimit({
+      units: 6e5
+    });
     const feeMsg = new import_web33.TransactionMessage({
       payerKey: userPublicKey,
       recentBlockhash: lastBlockHash.blockhash,
-      instructions: [quoteFee]
+      instructions: [ixQuoteComputeBudget, quoteFee]
     }).compileToV0Message([lookupTableAccount]);
     const feeTx = new import_web33.VersionedTransaction(feeMsg);
     const feeRes = yield connection.simulateTransaction(feeTx);
@@ -3083,7 +3174,6 @@ function deposit(_0) {
     const ulnEventAuthorityPDA = getUlnEventAuthorityPda();
     const executorConfigPDA = getExecutorConfigPda();
     const priceFeedPDA = getPriceFeedPda();
-    const dvnConfigPDA = getDvnConfigPda();
     const vaultDepositParams = getDepositParams(userAddress, depositData);
     const buildSendRemainingAccounts = () => [
       // ENDPOINT solana/programs/programs/uln/src/instructions/endpoint/send.rs
@@ -3211,28 +3301,7 @@ function deposit(_0) {
         // 17
         pubkey: priceFeedPDA
       },
-      {
-        isSigner: false,
-        isWritable: false,
-        pubkey: DVN_PROGRAM_ID
-      },
-      {
-        isSigner: false,
-        isWritable: true,
-        // 18
-        pubkey: dvnConfigPDA
-      },
-      {
-        isSigner: false,
-        isWritable: false,
-        pubkey: PRICE_FEED_PROGRAM_ID
-      },
-      {
-        isSigner: false,
-        isWritable: false,
-        // 17
-        pubkey: priceFeedPDA
-      }
+      ...appendThreeDvnDepositRemainingAccounts(priceFeedPDA)
     ];
     const fee = yield getDepositQuoteFee({
       vaultAddress,
@@ -3279,7 +3348,7 @@ function deposit(_0) {
       return;
     }
     const ixAddComputeBudget = import_web33.ComputeBudgetProgram.setComputeUnitLimit({
-      units: 4e5
+      units: 8e5
     });
     const lastBlockHash = yield connection.getLatestBlockhash();
     const msg = new import_web33.TransactionMessage({