Move bindings to lib, refactor instruction creation utils

Author: barnjamin

sdk/__tests__/utils.ts

@@ -535,8 +535,8 @@ async function deploySolana(ctx: Ctx): Promise<Ctx> {
     );
 
     const initTxs = manager.initialize({
-      payer: keypair,
-      owner: keypair,
+      payer: keypair.publicKey,
+      owner: keypair.publicKey,
       chain: "Solana",
       mint,
       outboundLimit: 1000000000n,

solana/tests/anchor.test.ts

@@ -223,8 +223,8 @@ describe("example-native-token-transfers", () => {
 
         // init
         const initTxs = ntt.initialize({
-          payer,
-          owner: payer,
+          payer: payer.publicKey,
+          owner: payer.publicKey,
           chain: "Solana",
           mint: mint.publicKey,
           outboundLimit: 1000000n,

solana/ts/sdk/anchor-idl/1_0_0.ts solana/ts/lib/anchor-idl/1_0_0.ts

@@ -2,11 +2,18 @@ import { IdlAccounts, Program } from "@coral-xyz/anchor";
 import { Connection } from "@solana/web3.js";
 import { _1_0_0, _2_0_0 } from "./anchor-idl/index.js";
 
+export interface IdlBinding<V extends IdlVersion> {
+  idl: {
+    ntt: NttBindings.NativeTokenTransfer<V>;
+    quoter: NttBindings.Quoter<V>;
+  };
+}
+
 export const IdlVersions = {
   "1.0.0": _1_0_0,
   "2.0.0": _2_0_0,
-  default: _2_0_0,
 } as const;
+
 export type IdlVersion = keyof typeof IdlVersions;
 
 export namespace NttBindings {
@@ -22,43 +29,38 @@ export namespace NttBindings {
     NttBindings.NativeTokenTransfer<V>
   >;
 
-  export type Config<V extends IdlVersion = IdlVersion> =
-    ProgramAccounts<V>["config"];
-  export type InboxItem<V extends IdlVersion = IdlVersion> =
-    ProgramAccounts<V>["inboxItem"];
+  export type Config<V extends IdlVersion> = ProgramAccounts<V>["config"];
+  export type InboxItem<V extends IdlVersion> = ProgramAccounts<V>["inboxItem"];
 }
 
-function loadIdlVersion<const V extends IdlVersion>(
-  version: V
-): (typeof IdlVersions)[V] {
+function loadIdlVersion<V extends IdlVersion>(version: V): IdlBinding<V> {
   if (!(version in IdlVersions))
     throw new Error(`Unknown IDL version: ${version}`);
-  return IdlVersions[version];
+  return IdlVersions[version] as unknown as IdlBinding<V>;
 }
 
-export function getNttProgram<const V extends IdlVersion>(
+export function getNttProgram<V extends IdlVersion>(
   connection: Connection,
   address: string,
   version: V
 ): Program<NttBindings.NativeTokenTransfer<V>> {
-  return new Program<NttBindings.NativeTokenTransfer<V>>(
-    //@ts-ignore
-    loadIdlVersion(version).idl.ntt,
-    address,
-    { connection }
-  );
+  const {
+    idl: { ntt },
+  } = loadIdlVersion(version);
+  return new Program<NttBindings.NativeTokenTransfer<V>>(ntt, address, {
+    connection,
+  });
 }
 
-export function getQuoterProgram<const V extends IdlVersion>(
+export function getQuoterProgram<V extends IdlVersion>(
   connection: Connection,
   address: string,
   version: V
 ) {
-  return new Program<NttBindings.Quoter<V>>(
-    loadIdlVersion(version).idl.quoter,
-    address,
-    {
-      connection,
-    }
-  );
+  const {
+    idl: { quoter },
+  } = loadIdlVersion(version);
+  return new Program<NttBindings.Quoter<V>>(quoter, address, {
+    connection,
+  });
 }

solana/ts/sdk/anchor-idl/2_0_0.ts solana/ts/lib/anchor-idl/2_0_0.ts

@@ -1,2 +1,3 @@
 export * from "./ntt.js";
 export * from "./quoter.js";
+export * from "./bindings.js";