break out consts to separate file, add createAta fn to redeem

barnjamin · barnjamin · commit 274ec00bb4a5 · 2024-04-20T16:12:20.000-04:00
diff --git a/sdk/examples/src/automaticRoute.ts b/sdk/examples/src/automaticRoute.ts
@@ -1,53 +1,14 @@
-import {
-  Chain,
-  canonicalAddress,
-  routes,
-  wormhole,
-} from "@wormhole-foundation/sdk";
+import { canonicalAddress, routes, wormhole } from "@wormhole-foundation/sdk";
 import evm from "@wormhole-foundation/sdk/evm";
 import solana from "@wormhole-foundation/sdk/solana";
 
 // register protocol implementations
-import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
 import "@wormhole-foundation/sdk-evm-ntt";
 import "@wormhole-foundation/sdk-solana-ntt";
 
-import {
-  NttRoute,
-  nttAutomaticRoute,
-} from "@wormhole-foundation/sdk-route-ntt";
+import { nttAutomaticRoute } from "@wormhole-foundation/sdk-route-ntt";
 import { getSigner } from "./helpers.js";
-
-const NTT_CONTRACTS: Record<string, Ntt.Contracts> = {
-  Solana: {
-    token: "E3W7KwMH8ptaitYyWtxmfBUpqcuf2XieaFtQSn1LVXsA",
-    manager: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
-    transceiver: {
-      wormhole: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
-    },
-    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
-  },
-  ArbitrumSepolia: {
-    token: "0x87579Dc40781e99b870DDce46e93bd58A0e58Ae5",
-    manager: "0xdA5a8e05e276AAaF4d79AB5b937a002E5221a4D8",
-    transceiver: {
-      wormhole: "0xd2940c256a3D887833D449eF357b6D639Cb98e12",
-    },
-  },
-};
-
-// Reformat NTT contracts to fit token list list
-const tokens = {
-  Jito: Object.entries(NTT_CONTRACTS).map(([c, contracts]) => {
-    const chain = c as Chain;
-    const { token, manager, transceiver: transceivers, quoter } = contracts;
-    const transceiver = Object.entries(transceivers).map(([k, v]) => {
-      return { type: k as NttRoute.TransceiverType, address: v };
-    });
-
-    return { chain, token, manager, quoter, transceiver };
-  }),
-};
+import { NttTokens } from "./consts.js";
 
 (async function () {
   const wh = await wormhole("Testnet", [solana, evm]);
@@ -58,7 +19,7 @@ const tokens = {
   const srcSigner = await getSigner(src);
   const dstSigner = await getSigner(dst);
 
-  const resolver = wh.resolver([nttAutomaticRoute({ tokens })]);
+  const resolver = wh.resolver([nttAutomaticRoute({ tokens: NttTokens })]);
 
   const srcTokens = await resolver.supportedSourceTokens(src);
   console.log(
@@ -112,9 +73,7 @@ const tokens = {
   // this new var must be passed to the next step, quote
   const validated = await bestRoute.validate({
     amount: "0.00001",
-    options: {
-      gasDropoff: "0.0000001",
-    },
+    options: { gasDropoff: "0.0" },
   });
   if (!validated.valid) throw validated.error;
   console.log("Validated parameters: ", validated.params);
@@ -125,13 +84,12 @@ const tokens = {
   if (!quote.success) throw quote.error;
   console.log("Best route quote: ", quote);
 
-  return;
   // Now the transfer may be initiated
   // A receipt will be returned, guess what you gotta do with that?
-  //const receipt = await bestRoute.initiate(srcSigner.signer, quote);
-  //console.log("Initiated transfer with receipt: ", receipt);
+  const receipt = await bestRoute.initiate(srcSigner.signer, quote);
+  console.log("Initiated transfer with receipt: ", receipt);
 
-  //// Kick off a wait log, if there is an opportunity to complete, this function will do it
-  //// see the implementation for how this works
-  //await routes.checkAndCompleteTransfer(bestRoute, receipt, dstSigner.signer);
+  // Kick off a wait log, if there is an opportunity to complete, this function will do it
+  // see the implementation for how this works
+  await routes.checkAndCompleteTransfer(bestRoute, receipt, dstSigner.signer);
 })();
diff --git a/sdk/examples/src/consts.ts b/sdk/examples/src/consts.ts
@@ -0,0 +1,64 @@
+import { Chain } from "@wormhole-foundation/sdk";
+import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
+import { NttRoute } from "@wormhole-foundation/sdk-route-ntt";
+type NttContracts = {
+  [key in Chain]?: Ntt.Contracts;
+};
+
+export const JITO_NTT_CONTRACTS: NttContracts = {
+  Solana: {
+    token: "E3W7KwMH8ptaitYyWtxmfBUpqcuf2XieaFtQSn1LVXsA",
+    manager: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
+    transceiver: { wormhole: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f" },
+    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
+  },
+  ArbitrumSepolia: {
+    token: "0x87579Dc40781e99b870DDce46e93bd58A0e58Ae5",
+    manager: "0xdA5a8e05e276AAaF4d79AB5b937a002E5221a4D8",
+    transceiver: { wormhole: "0xd2940c256a3D887833D449eF357b6D639Cb98e12" },
+  },
+};
+
+export const TEST_NTT_TOKENS: NttContracts = {
+  Sepolia: {
+    token: "0x738141EFf659625F2eAD4feECDfCD94155C67f18",
+    manager: "0x06413c42e913327Bc9a08B7C1E362BAE7C0b9598",
+    transceiver: { wormhole: "0x649fF7B32C2DE771043ea105c4aAb2D724497238" },
+  },
+  ArbitrumSepolia: {
+    token: "0x395D3C74232D12916ecA8952BA352b4d27818035",
+    manager: "0xCeC6FB4F352bf3DC2b95E1c41831E4D2DBF9a35D",
+    transceiver: { wormhole: "0xfA42603152E4f133F5F3DA610CDa91dF5821d8bc" },
+  },
+  OptimismSepolia: {
+    token: "0x1d30E78B7C7fbbcef87ae6e97B5389b2e470CA4a",
+    manager: "0x27F9Fdd3eaD5aA9A5D827Ca860Be28442A1e7582",
+    transceiver: { wormhole: "0xeCF0496DE01e9Aa4ADB50ae56dB550f52003bdB7" },
+  },
+  BaseSepolia: {
+    token: "0xdDFeABcCf2063CD66f53a1218e23c681Ba6e7962",
+    manager: "0x8b9E328bE1b1Bc7501B413d04EBF7479B110775c",
+    transceiver: { wormhole: "0x149987472333cD48ac6D28293A338a1EEa6Be7EE" },
+  },
+  Solana: {
+    token: "EetppHswYvV1jjRWoQKC1hejdeBDHR9NNzNtCyRQfrrQ",
+    manager: "NTtAaoDJhkeHeaVUHnyhwbPNAN6WgBpHkHBTc6d7vLK",
+    transceiver: { wormhole: "NTtAaoDJhkeHeaVUHnyhwbPNAN6WgBpHkHBTc6d7vLK" },
+    quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ",
+  },
+};
+
+// Reformat NTT contracts to fit TokenConfig for Route
+function reformat(contracts: NttContracts) {
+  return Object.entries(TEST_NTT_TOKENS).map(([chain, contracts]) => {
+    const { token, manager, transceiver: xcvrs, quoter } = contracts;
+    const transceiver = Object.entries(xcvrs).map(([k, v]) => {
+      return { type: k as NttRoute.TransceiverType, address: v };
+    });
+    return { chain: chain as Chain, token, manager, quoter, transceiver };
+  });
+}
+
+export const NttTokens = {
+  Test: reformat(TEST_NTT_TOKENS),
+};
diff --git a/sdk/examples/src/helpers.ts b/sdk/examples/src/helpers.ts
@@ -30,7 +30,7 @@ export async function getSigner<N extends Network, C extends Chain>(
       signer = await solana.getSigner(
         await chain.getRpc(),
         getEnv("OTHER_SOL_PRIVATE_KEY"),
-        { priorityFeePercentile: 0.9 }
+        { priorityFeePercentile: 0.9, debug: true }
       );
       break;
     case "Evm":
diff --git a/sdk/examples/src/index.ts b/sdk/examples/src/index.ts
@@ -7,25 +7,12 @@ import evm from "@wormhole-foundation/sdk/evm";
 import solana from "@wormhole-foundation/sdk/solana";
 
 // register protocol implementations
-import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
 import "@wormhole-foundation/sdk-evm-ntt";
 import "@wormhole-foundation/sdk-solana-ntt";
 
+import { TEST_NTT_TOKENS } from "./consts.js";
 import { getSigner } from "./helpers.js";
 
-const NTT_CONTRACTS: Record<string, Ntt.Contracts> = {
-  Solana: {
-    token: "E3W7KwMH8ptaitYyWtxmfBUpqcuf2XieaFtQSn1LVXsA",
-    manager: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
-    transceiver: { wormhole: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f" },
-  },
-  ArbitrumSepolia: {
-    token: "0x87579Dc40781e99b870DDce46e93bd58A0e58Ae5",
-    manager: "0xdA5a8e05e276AAaF4d79AB5b937a002E5221a4D8",
-    transceiver: { wormhole: "0xd2940c256a3D887833D449eF357b6D639Cb98e12" },
-  },
-};
-
 // Recover an in-flight transfer by setting txids here from output of previous run
 const recoverTxids: TransactionId[] = [
   // { chain: "Solana", txid: "hZXRs9TEvMWnSAzcgmrEuHsq1C5rbcompy63vkJ2SrXv4a7u6ZBEaJAkBMXKAfScCooDNhN36Jt4PMcDhN8yGjP", },
@@ -40,10 +27,10 @@ const recoverTxids: TransactionId[] = [
   const dstSigner = await getSigner(dst);
 
   const srcNtt = await src.getProtocol("Ntt", {
-    ntt: NTT_CONTRACTS[src.chain],
+    ntt: TEST_NTT_TOKENS[src.chain],
   });
   const dstNtt = await dst.getProtocol("Ntt", {
-    ntt: NTT_CONTRACTS[dst.chain],
+    ntt: TEST_NTT_TOKENS[dst.chain],
   });
 
   // Initiate the transfer (or set to recoverTxids to complete transfer)
diff --git a/sdk/examples/src/manualRoute.ts b/sdk/examples/src/manualRoute.ts
@@ -1,54 +1,15 @@
-import {
-  Chain,
-  canonicalAddress,
-  routes,
-  wormhole,
-} from "@wormhole-foundation/sdk";
+import { canonicalAddress, routes, wormhole } from "@wormhole-foundation/sdk";
 import evm from "@wormhole-foundation/sdk/evm";
 import solana from "@wormhole-foundation/sdk/solana";
 
 // register protocol implementations
-import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
 import "@wormhole-foundation/sdk-evm-ntt";
 import "@wormhole-foundation/sdk-solana-ntt";
 
-import { NttRoute, nttManualRoute } from "@wormhole-foundation/sdk-route-ntt";
+import { nttManualRoute } from "@wormhole-foundation/sdk-route-ntt";
+import { NttTokens } from "./consts.js";
 import { getSigner } from "./helpers.js";
 
-const NTT_CONTRACTS: Record<string, Ntt.Contracts> = {
-  Solana: {
-    token: "E3W7KwMH8ptaitYyWtxmfBUpqcuf2XieaFtQSn1LVXsA",
-    manager: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
-    transceiver: {
-      wormhole: "WZLm4bJU4BNVmzWEwEzGVMQ5XFUc4iBmMSLutFbr41f",
-    },
-  },
-  ArbitrumSepolia: {
-    token: "0x87579Dc40781e99b870DDce46e93bd58A0e58Ae5",
-    manager: "0xdA5a8e05e276AAaF4d79AB5b937a002E5221a4D8",
-    transceiver: {
-      wormhole: "0xd2940c256a3D887833D449eF357b6D639Cb98e12",
-    },
-  },
-};
-
-// Reformat NTT contracts to fit token list list
-const tokens = {
-  Jito: Object.entries(NTT_CONTRACTS).map(([chain, contracts]) => {
-    return {
-      chain: chain as Chain,
-      token: contracts.token,
-      manager: contracts.manager,
-      transceiver: [
-        {
-          type: "wormhole",
-          address: contracts.transceiver.wormhole,
-        },
-      ],
-    } as NttRoute.TokenConfig;
-  }),
-};
-
 (async function () {
   const wh = await wormhole("Testnet", [solana, evm]);
 
@@ -58,7 +19,7 @@ const tokens = {
   const srcSigner = await getSigner(src);
   const dstSigner = await getSigner(dst);
 
-  const resolver = wh.resolver([nttManualRoute({ tokens })]);
+  const resolver = wh.resolver([nttManualRoute({ tokens: NttTokens })]);
 
   const srcTokens = await resolver.supportedSourceTokens(src);
   console.log(
diff --git a/sdk/route/src/automatic.ts b/sdk/route/src/automatic.ts
@@ -173,6 +173,7 @@ export class NttAutomaticRoute<N extends Network>
     const ntt = await fromChain.getProtocol("Ntt", {
       ntt: params.normalizedParams.sourceContracts,
     });
+
     const initXfer = ntt.transfer(
       sender,
       amount.units(params.normalizedParams.amount),
diff --git a/sdk/solana/src/ntt.ts b/sdk/solana/src/ntt.ts
@@ -1,7 +1,10 @@
 import { Program } from "@coral-xyz/anchor";
 import { associatedAddress } from "@coral-xyz/anchor/dist/cjs/utils/token.js";
 import * as splToken from "@solana/spl-token";
-import { getAssociatedTokenAddressSync } from "@solana/spl-token";
+import {
+  createAssociatedTokenAccountInstruction,
+  getAssociatedTokenAddressSync,
+} from "@solana/spl-token";
 import {
   Connection,
   Keypair,
@@ -410,6 +413,7 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
 
     const senderAddress = new SolanaAddress(sender).unwrap();
     const fromAuthority = senderAddress;
+    console.log(config.mint);
     const from = getAssociatedTokenAddressSync(config.mint, fromAuthority);
 
     const transferArgs: TransferArgs = {
@@ -474,6 +478,26 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
     );
   }
 
+  private async *createAta(sender: AccountAddress<C>, mint: PublicKey) {
+    const senderAddress = new SolanaAddress(sender).unwrap();
+    const ata = getAssociatedTokenAddressSync(mint, senderAddress);
+
+    // If the ata doesn't exist yet, create it
+    const acctInfo = await this.connection.getAccountInfo(ata);
+    if (acctInfo === null) {
+      const transaction = new Transaction().add(
+        createAssociatedTokenAccountInstruction(
+          senderAddress,
+          ata,
+          senderAddress,
+          mint
+        )
+      );
+      transaction.feePayer = senderAddress;
+      yield this.createUnsignedTx({ transaction }, "Redeem.CreateATA");
+    }
+  }
+
   async *redeem(attestations: Ntt.Attestation[], payer: AccountAddress<C>) {
     const config = await this.getConfig();
     if (config.paused) throw new Error("Contract is paused");
@@ -482,6 +506,9 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
     // if (attestations.length !== this.xcvrs.length) throw "No";
     const wormholeNTT = attestations[0]! as WormholeNttTransceiver.VAA;
 
+    // Create the vaa if necessary
+    yield* this.createAta(payer, config.mint);
+
     // Post the VAA that we intend to redeem
     yield* this.core.postVaa(payer, wormholeNTT);
 
