Export types and IDLs

saber-hq · Jan 1, 2022 · b183b34 · b183b34
1 parent 62b80aa
commit b183b34
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,5 +1,16 @@
+import { SuperCoder } from "@saberhq/anchor-contrib";
 import { PublicKey } from "@solana/web3.js";
 
+import type { MerkleDistributorTypes } from ".";
+import { MerkleDistributorJSON } from "./idls/merkle_distributor";
+
 export const PROGRAM_ID = new PublicKey(
   "MRKGLMizK9XSTaD1d1jbVkdHZbQVCSnPpYiTw9aKQv8"
 );
+
+export const MERKLE_DISTRIBUTOR_PROGRAM_ID = PROGRAM_ID;
+
+export const MERKLE_DISTRIBUTOR_CODER = new SuperCoder<MerkleDistributorTypes>(
+  MERKLE_DISTRIBUTOR_PROGRAM_ID,
+  MerkleDistributorJSON
+);
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
 export * from "./constants";
+export * from "./idls/merkle_distributor";
 export * from "./pda";
 export * from "./sdk";
 export * from "./types";

diff --git a/src/sdk.ts b/src/sdk.ts
@@ -1,6 +1,6 @@
-import { Program, Provider as AnchorProvider } from "@project-serum/anchor";
-import type { Provider } from "@saberhq/solana-contrib";
-import { SignerWallet, SolanaProvider } from "@saberhq/solana-contrib";
+import { newProgram } from "@saberhq/anchor-contrib";
+import type { AugmentedProvider, Provider } from "@saberhq/solana-contrib";
+import { SolanaAugmentedProvider } from "@saberhq/solana-contrib";
 import type { PublicKey, Signer } from "@solana/web3.js";
 
 import { PROGRAM_ID } from "./constants";
@@ -14,18 +14,13 @@ import { MerkleDistributorWrapper } from "./wrapper";
 
 export class MerkleDistributorSDK {
   constructor(
-    readonly provider: Provider,
+    readonly provider: AugmentedProvider,
     readonly program: MerkleDistributorProgram
   ) {}
 
   withSigner(signer: Signer): MerkleDistributorSDK {
     return MerkleDistributorSDK.load({
-      provider: new SolanaProvider(
-        this.provider.connection,
-        this.provider.broadcaster,
-        new SignerWallet(signer),
-        this.provider.opts
-      ),
+      provider: this.provider.withSigner(signer),
     });
   }
 
@@ -39,18 +34,14 @@ export class MerkleDistributorSDK {
     // Provider
     provider: Provider;
   }): MerkleDistributorSDK {
-    const anchorProvider = new AnchorProvider(
-      provider.connection,
-      provider.wallet,
-      provider.opts
-    );
+    const aug = new SolanaAugmentedProvider(provider);
     return new MerkleDistributorSDK(
-      provider,
-      new Program(
+      aug,
+      newProgram<MerkleDistributorProgram>(
         MerkleDistributorJSON,
         PROGRAM_ID,
-        anchorProvider
-      ) as unknown as MerkleDistributorProgram
+        aug
+      )
     );
   }