@m0-foundation/ntt-sdk-route 0.0.14 → 0.0.15

package/dist/index.d.mts

@@ -71,7 +71,7 @@ declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
         mLikeTokens: string[];
     };
     getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
-    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain, outboxItem: PublicKey): TransactionInstruction;
+    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain): Promise<TransactionInstruction>;
     getReleaseInboundMintExtensionIx(nttMessage: Ntt.Message, emitterChain: Chain, payer: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
     getAddressLookupTableAccounts(connection: Connection): Promise<AddressLookupTableAccount>;
     static createReleaseInboundMintInstruction<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, args: {

package/dist/index.d.ts

@@ -71,7 +71,7 @@ declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
         mLikeTokens: string[];
     };
     getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
-    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain, outboxItem: PublicKey): TransactionInstruction;
+    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain): Promise<TransactionInstruction>;
     getReleaseInboundMintExtensionIx(nttMessage: Ntt.Message, emitterChain: Chain, payer: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
     getAddressLookupTableAccounts(connection: Connection): Promise<AddressLookupTableAccount>;
     static createReleaseInboundMintInstruction<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, args: {

package/dist/index.js

@@ -87,6 +87,10 @@ var SolanaRoutes = class _SolanaRoutes {
         usdkyPPxgV7sfNyKb8eDz66ogPrkRXG3wS2FVb6LLUf: {
           program: pk("3PskKTHgboCbUSQPMcCAZdZNFHbNvSoZ8zEFYANCdob7"),
           tokenProgram: splToken.TOKEN_2022_PROGRAM_ID
+        },
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: splToken.TOKEN_PROGRAM_ID
         }
       }
     }[network];
@@ -335,14 +339,27 @@ var SolanaRoutes = class _SolanaRoutes {
       ])
     });
   }
-  getExecutorRelayIx(sender, quote, destinationChain, outboxItem) {
-    const nttPeer = web3_js.PublicKey.findProgramAddressSync(
-      [
-        Buffer.from("peer"),
-        new BN__default.default(sdkConnect.chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2)
-      ],
-      this.programs.portal
+  async getExecutorRelayIx(sender, quote, destinationChain) {
+    const emitter = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("emitter")],
+      this.ntt.program.programId
     )[0];
+    const bridgeSequence = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("Sequence"), emitter.toBytes()],
+      new web3_js.PublicKey(this.ntt.contracts.coreBridge)
+    )[0];
+    const info = await this.ntt.connection.getAccountInfo(bridgeSequence);
+    const sequence = new BN__default.default(info.data, "le");
+    const vaaReqBytes = Buffer.concat([
+      Buffer.from("ERV1"),
+      // type
+      new BN__default.default(sdkConnect.chainToChainId(this.ntt.chain)).toArrayLike(Buffer, "be", 2),
+      // emitter chain
+      emitter.toBuffer(),
+      // emitter address
+      sequence.toArrayLike(Buffer, "be", 8)
+      // sequence
+    ]);
     const signedQuoteBytes = Buffer.from(quote.signedQuote);
     const relayInstructions = Buffer.from(quote.relayInstructions);
     return new web3_js.TransactionInstruction({
@@ -358,47 +375,35 @@ var SolanaRoutes = class _SolanaRoutes {
           isSigner: false,
           isWritable: true
         },
-        {
-          // ntt_program_id
-          pubkey: this.programs.portal,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: nttPeer,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          // ntt_message
-          pubkey: outboxItem,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          // executor_program
-          pubkey: new web3_js.PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
-          isSigner: false,
-          isWritable: false
-        },
         {
           pubkey: web3_js.SystemProgram.programId,
           isSigner: false,
           isWritable: false
         }
       ],
-      programId: new web3_js.PublicKey("nex1gkSWtRBheEJuQZMqHhbMG5A45qPU76KqnCZNVHR"),
+      programId: new web3_js.PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
       data: Buffer.concat([
-        Buffer.from(sha2.sha256("global:relay_ntt_mesage").subarray(0, 8)),
+        Buffer.from(sha2.sha256("global:request_for_execution").subarray(0, 8)),
+        // [109, 107, 87, 37, 151, 192, 119, 115]
+        new BN__default.default(quote.estimatedCost.toString()).toArrayLike(Buffer, "le", 8),
+        // amount
         new BN__default.default(sdkConnect.chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2),
-        // recipient_chain
+        // dst_chain
+        this.ntt.program.programId.toBuffer(),
+        // peer portal address
+        sender.toBuffer(),
+        // refund_addr
         new BN__default.default(signedQuoteBytes.length).toArrayLike(Buffer, "le", 4),
         // vec length
-        Buffer.from(signedQuoteBytes),
+        signedQuoteBytes,
         // signed_quote_bytes
+        new BN__default.default(vaaReqBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        vaaReqBytes,
+        // request_bytes
         new BN__default.default(relayInstructions.length).toArrayLike(Buffer, "le", 4),
         // vec length
-        Buffer.from(relayInstructions)
+        relayInstructions
         // relay_instructions
       ])
     });
@@ -1036,12 +1041,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
         amount2
       );
       tx.add(
-        router.getExecutorRelayIx(
-          payerAddress,
-          quote,
-          recipient.chain,
-          outboxItem.publicKey
-        )
+        await router.getExecutorRelayIx(payerAddress, quote, recipient.chain)
       );
     } else if (options.automatic) {
       if (!ntt.quoter) {

package/dist/index.mjs

@@ -79,6 +79,10 @@ var SolanaRoutes = class _SolanaRoutes {
         usdkyPPxgV7sfNyKb8eDz66ogPrkRXG3wS2FVb6LLUf: {
           program: pk("3PskKTHgboCbUSQPMcCAZdZNFHbNvSoZ8zEFYANCdob7"),
           tokenProgram: TOKEN_2022_PROGRAM_ID
+        },
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: TOKEN_PROGRAM_ID
         }
       }
     }[network];
@@ -327,14 +331,27 @@ var SolanaRoutes = class _SolanaRoutes {
       ])
     });
   }
-  getExecutorRelayIx(sender, quote, destinationChain, outboxItem) {
-    const nttPeer = PublicKey.findProgramAddressSync(
-      [
-        Buffer.from("peer"),
-        new BN(chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2)
-      ],
-      this.programs.portal
+  async getExecutorRelayIx(sender, quote, destinationChain) {
+    const emitter = PublicKey.findProgramAddressSync(
+      [Buffer.from("emitter")],
+      this.ntt.program.programId
     )[0];
+    const bridgeSequence = PublicKey.findProgramAddressSync(
+      [Buffer.from("Sequence"), emitter.toBytes()],
+      new PublicKey(this.ntt.contracts.coreBridge)
+    )[0];
+    const info = await this.ntt.connection.getAccountInfo(bridgeSequence);
+    const sequence = new BN(info.data, "le");
+    const vaaReqBytes = Buffer.concat([
+      Buffer.from("ERV1"),
+      // type
+      new BN(chainToChainId(this.ntt.chain)).toArrayLike(Buffer, "be", 2),
+      // emitter chain
+      emitter.toBuffer(),
+      // emitter address
+      sequence.toArrayLike(Buffer, "be", 8)
+      // sequence
+    ]);
     const signedQuoteBytes = Buffer.from(quote.signedQuote);
     const relayInstructions = Buffer.from(quote.relayInstructions);
     return new TransactionInstruction({
@@ -350,47 +367,35 @@ var SolanaRoutes = class _SolanaRoutes {
           isSigner: false,
           isWritable: true
         },
-        {
-          // ntt_program_id
-          pubkey: this.programs.portal,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: nttPeer,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          // ntt_message
-          pubkey: outboxItem,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          // executor_program
-          pubkey: new PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
-          isSigner: false,
-          isWritable: false
-        },
         {
           pubkey: SystemProgram.programId,
           isSigner: false,
           isWritable: false
         }
       ],
-      programId: new PublicKey("nex1gkSWtRBheEJuQZMqHhbMG5A45qPU76KqnCZNVHR"),
+      programId: new PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
       data: Buffer.concat([
-        Buffer.from(sha256("global:relay_ntt_mesage").subarray(0, 8)),
+        Buffer.from(sha256("global:request_for_execution").subarray(0, 8)),
+        // [109, 107, 87, 37, 151, 192, 119, 115]
+        new BN(quote.estimatedCost.toString()).toArrayLike(Buffer, "le", 8),
+        // amount
         new BN(chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2),
-        // recipient_chain
+        // dst_chain
+        this.ntt.program.programId.toBuffer(),
+        // peer portal address
+        sender.toBuffer(),
+        // refund_addr
         new BN(signedQuoteBytes.length).toArrayLike(Buffer, "le", 4),
         // vec length
-        Buffer.from(signedQuoteBytes),
+        signedQuoteBytes,
         // signed_quote_bytes
+        new BN(vaaReqBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        vaaReqBytes,
+        // request_bytes
         new BN(relayInstructions.length).toArrayLike(Buffer, "le", 4),
         // vec length
-        Buffer.from(relayInstructions)
+        relayInstructions
         // relay_instructions
       ])
     });
@@ -1028,12 +1033,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
         amount2
       );
       tx.add(
-        router.getExecutorRelayIx(
-          payerAddress,
-          quote,
-          recipient.chain,
-          outboxItem.publicKey
-        )
+        await router.getExecutorRelayIx(payerAddress, quote, recipient.chain)
       );
     } else if (options.automatic) {
       if (!ntt.quoter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m0-foundation/ntt-sdk-route",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",