@m0-foundation/ntt-sdk-route 0.0.11 → 0.0.13

package/dist/index.d.mts

@@ -6,7 +6,7 @@ import { EvmChains, EvmUnsignedTransaction } from '@wormhole-foundation/sdk-evm'
 import { SolanaChains, SolanaUnsignedTransaction } from '@wormhole-foundation/sdk-solana';
 import { NttRoute } from '@wormhole-foundation/sdk-route-ntt';
 import { TransactionRequest } from 'ethers';
-import { PublicKey, TransactionInstruction, Connection, AddressLookupTableAccount } from '@solana/web3.js';
+import { Keypair, PublicKey, TransactionInstruction, Connection, AddressLookupTableAccount } from '@solana/web3.js';
 
 type Op = NttRoute.Options;
 type Tp = routes.TransferParams<Op>;
@@ -44,7 +44,7 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
      */
     transferMLike<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, sender: AccountAddress<C>, amount: bigint, destination: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<EvmUnsignedTransaction<N, C>>;
     createUnsignedTx<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, txReq: TransactionRequest, description: string, parallelizable?: boolean): EvmUnsignedTransaction<N, C>;
-    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
+    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions, outboxItem?: Keypair): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
 }
 

package/dist/index.d.ts

@@ -6,7 +6,7 @@ import { EvmChains, EvmUnsignedTransaction } from '@wormhole-foundation/sdk-evm'
 import { SolanaChains, SolanaUnsignedTransaction } from '@wormhole-foundation/sdk-solana';
 import { NttRoute } from '@wormhole-foundation/sdk-route-ntt';
 import { TransactionRequest } from 'ethers';
-import { PublicKey, TransactionInstruction, Connection, AddressLookupTableAccount } from '@solana/web3.js';
+import { Keypair, PublicKey, TransactionInstruction, Connection, AddressLookupTableAccount } from '@solana/web3.js';
 
 type Op = NttRoute.Options;
 type Tp = routes.TransferParams<Op>;
@@ -44,7 +44,7 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
      */
     transferMLike<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, sender: AccountAddress<C>, amount: bigint, destination: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<EvmUnsignedTransaction<N, C>>;
     createUnsignedTx<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, txReq: TransactionRequest, description: string, parallelizable?: boolean): EvmUnsignedTransaction<N, C>;
-    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
+    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions, outboxItem?: Keypair): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
 }
 

package/dist/index.js

@@ -514,13 +514,27 @@ var SolanaRoutes = class _SolanaRoutes {
       additionalPayload.slice(8, 40)
     );
     if (destinationMint.equals(ntt.config.mint)) {
-      return [
-        await sdkSolanaNtt.NTT.createReleaseInboundMintInstruction(
-          ntt.program,
-          ntt.config,
-          args
-        )
-      ];
+      const ix = await sdkSolanaNtt.NTT.createReleaseInboundMintInstruction(
+        ntt.program,
+        ntt.config,
+        args
+      );
+      ix.keys.push(
+        {
+          pubkey: router.programs.earn,
+          isSigner: false,
+          isWritable: false
+        },
+        {
+          pubkey: web3_js.PublicKey.findProgramAddressSync(
+            [Buffer.from("global")],
+            router.programs.earn
+          )[0],
+          isSigner: false,
+          isWritable: true
+        }
+      );
+      return [ix];
     }
     const extPrograms = router.extPrograms[destinationMint.toBase58()];
     if (!extPrograms) {
@@ -810,14 +824,14 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       parallelizable
     );
   }
-  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options) {
+  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options, outboxItem) {
     const router = new SolanaRoutes(ntt);
     if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
     if (config.paused) throw new Error("Contract is paused");
-    const outboxItem = web3_js.Keypair.generate();
+    outboxItem = outboxItem ?? web3_js.Keypair.generate();
     const payerAddress = new sdkSolana.SolanaAddress(sender).unwrap();
     const ixs = [
       router.getTransferExtensionBurnIx(

package/dist/index.mjs

@@ -508,13 +508,27 @@ var SolanaRoutes = class _SolanaRoutes {
       additionalPayload.slice(8, 40)
     );
     if (destinationMint.equals(ntt.config.mint)) {
-      return [
-        await NTT.createReleaseInboundMintInstruction(
-          ntt.program,
-          ntt.config,
-          args
-        )
-      ];
+      const ix = await NTT.createReleaseInboundMintInstruction(
+        ntt.program,
+        ntt.config,
+        args
+      );
+      ix.keys.push(
+        {
+          pubkey: router.programs.earn,
+          isSigner: false,
+          isWritable: false
+        },
+        {
+          pubkey: PublicKey.findProgramAddressSync(
+            [Buffer.from("global")],
+            router.programs.earn
+          )[0],
+          isSigner: false,
+          isWritable: true
+        }
+      );
+      return [ix];
     }
     const extPrograms = router.extPrograms[destinationMint.toBase58()];
     if (!extPrograms) {
@@ -804,14 +818,14 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       parallelizable
     );
   }
-  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options) {
+  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options, outboxItem) {
     const router = new SolanaRoutes(ntt);
     if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
     if (config.paused) throw new Error("Contract is paused");
-    const outboxItem = Keypair.generate();
+    outboxItem = outboxItem ?? Keypair.generate();
     const payerAddress = new SolanaAddress(sender).unwrap();
     const ixs = [
       router.getTransferExtensionBurnIx(

package/package.json

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