tweak args for init, remove utils file

Author: barnjamin

sdk/__tests__/utils.ts

@@ -481,7 +481,8 @@ async function deployEvm(ctx: Ctx): Promise<Ctx> {
 async function deploySolana(ctx: Ctx): Promise<Ctx> {
   const { signer, nativeSigner: keypair } = ctx.signers as Signers<"Solana">;
   const connection = (await ctx.context.getRpc()) as Connection;
-  const address = new PublicKey(signer.address());
+  const sender = Wormhole.chainAddress("Solana", signer.address());
+  const address = sender.address.toNative("Solana").unwrap();
   console.log(`Using public key: ${address}`);
 
   const mint = await spl.createMint(connection, keypair, address, null, 9);
@@ -534,10 +535,7 @@ async function deploySolana(ctx: Ctx): Promise<Ctx> {
       manager.pdas.tokenAuthority().toString()
     );
 
-    const initTxs = manager.initialize({
-      payer: keypair.publicKey,
-      owner: keypair.publicKey,
-      chain: "Solana",
+    const initTxs = manager.initialize(sender.address, {
       mint,
       outboundLimit: 1000000000n,
       mode: ctx.mode,

solana/tests/anchor.test.ts

@@ -222,10 +222,7 @@ describe("example-native-token-transfers", () => {
         );
 
         // init
-        const initTxs = ntt.initialize({
-          payer: payer.publicKey,
-          owner: payer.publicKey,
-          chain: "Solana",
+        const initTxs = ntt.initialize(sender, {
           mint: mint.publicKey,
           outboundLimit: 1000000n,
           mode: "burning",

solana/ts/lib/index.ts

@@ -1,3 +1,4 @@
 export * from "./ntt.js";
 export * from "./quoter.js";
 export * from "./bindings.js";
+export * from "./anchor-idl/index.js";

solana/ts/lib/ntt.ts

@@ -46,13 +46,15 @@ import {
 } from "./utils.js";
 
 export namespace NTT {
+  /** Arguments for transfer instruction */
   export interface TransferArgs {
     amount: BN;
     recipientChain: { id: ChainId };
     recipientAddress: number[];
     shouldQueue: boolean;
   }
 
+  /** utility to create TransferArgs from SDK types */
   export function transferArgs(
     amount: bigint,
     recipient: ChainAddress,
@@ -68,7 +70,9 @@ export namespace NTT {
     };
   }
 
+  /** Type of object containing methods to compute program addresses */
   export type Pdas = ReturnType<typeof pdas>;
+  /** pdas returns an object containing all functions to compute program addresses */
   export const pdas = (programId: PublicKeyInitData) => {
     const configAccount = (): PublicKey => derivePda("config", programId);
     const emitterAccount = (): PublicKey => derivePda("emitter", programId);
@@ -111,7 +115,7 @@ export namespace NTT {
           sender.toBytes(),
           keccak256(
             encoding.bytes.concat(
-              encoding.bytes.zpad(new Uint8Array(args.amount.toBuffer()), 8),
+              encoding.bytes.zpad(new Uint8Array(args.amount.toArray()), 8),
               chainToBytes(args.recipientChain.id),
               new Uint8Array(args.recipientAddress),
               new Uint8Array([args.shouldQueue ? 1 : 0])

solana/ts/lib/utils/wormhole.ts

@@ -5,5 +5,4 @@ import "@wormhole-foundation/sdk-definitions-ntt";
 
 registerProtocol(_platform, "Ntt", SolanaNtt);
 
-export * as idl from "../lib/anchor-idl/index.js";
 export * from "./ntt.js";

solana/ts/sdk/index.ts

@@ -165,35 +165,43 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
     );
   }
 
-  async *initialize(args: {
-    payer: PublicKey;
-    owner: PublicKey;
-    chain: Chain;
-    mint: PublicKey;
-    outboundLimit: bigint;
-    mode: "burning" | "locking";
-  }) {
+  async *initialize(
+    sender: AccountAddress<C>,
+    args: {
+      mint: PublicKey;
+      mode: Ntt.Mode;
+      outboundLimit: bigint;
+    }
+  ) {
     const mintInfo = await this.connection.getAccountInfo(args.mint);
     if (mintInfo === null)
       throw new Error(
         "Couldn't determine token program. Mint account is null."
       );
 
+    const payer = new SolanaAddress(sender).unwrap();
+
     const ix = await NTT.createInitializeInstruction(
       this.program,
-      { ...args, tokenProgram: mintInfo.owner },
+      {
+        ...args,
+        payer,
+        owner: payer,
+        chain: this.chain,
+        tokenProgram: mintInfo.owner,
+      },
       this.pdas
     );
 
     const tx = new Transaction();
-    tx.feePayer = args.payer;
+    tx.feePayer = payer;
     tx.add(ix);
     yield this.createUnsignedTx(
       { transaction: tx, signers: [] },
       "Ntt.Initialize"
     );
 
-    yield* this.initializeOrUpdateLUT({ payer: args.payer });
+    yield* this.initializeOrUpdateLUT({ payer });
   }
 
   // This function should be called after each upgrade. If there's nothing to