Lightprotocol · SwenSchaeferjohann · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/light-sdk-ts/src/constants.ts b/light-sdk-ts/src/constants.ts
@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
 export const TOKEN_REGISTRY = [
   {
     symbol: "SOL",
-    decimals: 1e9,
+    decimals: new anchor.BN(1e9),
     isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
     isSol: true,
     tokenAccount: SystemProgram.programId,
   },
   {
     symbol: "USDC",
-    decimals: 1e2,
+    decimals: new anchor.BN(1e2),
     isNft: false,
     isSol: false,
     // copied from MINT (test-utils)

diff --git a/light-sdk-ts/src/errors.ts b/light-sdk-ts/src/errors.ts
@@ -1,3 +1,5 @@
+import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";
+
 export enum UtxoErrorCode {
   APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
   INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
   ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
 }
 
+export enum UserErrorCode {
+  NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
+  LOAD_ERROR = "LOAD_ERROR",
+  PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
+  UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
+  USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
+  TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
+  NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
+  APPROVE_ERROR = "APPROVE_ERROR",
+  INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
+  ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
+  TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
+  SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
+  TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
+  INVALID_TOKEN = "INVALID_TOKEN",
+}
+
 export enum SelectInUtxosErrorCode {
   INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
   FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
   INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
   INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
   RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
-  NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
-  NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
+  NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
+  NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
   MINT_UNDEFINED = "MINT_UNDEFINED",
   SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
   ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
 export class ProviderError extends MetaError {}
 
 export class SelectInUtxosError extends MetaError {}
+
+export class UserError extends MetaError {}
diff --git a/light-sdk-ts/src/test-utils/createAccounts.ts b/light-sdk-ts/src/test-utils/createAccounts.ts
@@ -243,14 +243,9 @@ export async function createTestAccounts(
   let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
   if (balance === 0) {
     let amount = 1_000_000_000_000;
-    console.time("requestAirdrop");
 
     let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
-    console.timeEnd("requestAirdrop");
-    console.time("confirmAirdrop");
-
     await connection.confirmTransaction(res, "confirmed");
-    console.timeEnd("confirmAirdrop");
 
     let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);
 
@@ -287,7 +282,10 @@ export async function createTestAccounts(
       mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
       connection,
     });
-    console.log("created mint");
+    console.log(
+      "created mint ",
+      Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
+    );
   }
 
   let balanceUserToken = null;
@@ -330,17 +328,17 @@ export async function createTestAccounts(
   } catch (error) {
     console.log(error);
   }
-  console.log("userSplAccount ", userSplAccount);
+  console.log("userSplAccount ", userSplAccount?.toBase58());
 
-  console.log(
-    "funded account",
-    await getAccount(
-      connection,
-      userSplAccount!, //userTokenAccount,
-      "confirmed",
-      TOKEN_PROGRAM_ID,
-    ),
-  );
+  // console.log(
+  //   "funded account",
+  //   await getAccount(
+  //     connection,
+  //     userSplAccount!, //userTokenAccount,
+  //     "confirmed",
+  //     TOKEN_PROGRAM_ID,
+  //   ),
+  // );
 
   try {
     if (balanceUserToken == null) {

diff --git a/light-sdk-ts/src/test-utils/setUpMerkleTree.ts b/light-sdk-ts/src/test-utils/setUpMerkleTree.ts
@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
       console.log(e);
     }
 
-    console.log("AUTHORITY: ", AUTHORITY);
+    // console.log("AUTHORITY: ", AUTHORITY);
 
-    console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
+    // console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
 
-    console.log(
-      "verifierProgramZero.programId: ",
-      Array.from(verifierProgramZero.programId.toBytes()),
-    );
-    console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
-    console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
+    // console.log(
+    //   "verifierProgramZero.programId: ",
+    //   Array.from(verifierProgramZero.programId.toBytes()),
+    // );
+    // console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
+    // console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
     // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
     // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))
 
@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 
     try {
       await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
-      console.log("Registering Verifier One success");
+      console.log("Registering Verifier Two success");
     } catch (e) {
       console.log(e);
     }
@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
       console.log(e);
     }
 
-    console.log("MINT: ", MINT.toBase58());
-    console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
+    // console.log("MINT: ", MINT.toBase58());
+    // console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
     try {
       await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
       console.log("Registering spl pool success");

diff --git a/light-sdk-ts/src/wallet/buildBalance.ts b/light-sdk-ts/src/wallet/buildBalance.ts
@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
       let accountInfo = await provider.connection.getAccountInfo(
         nullifierPubkey,
       );
-      console.log(
-        "inserted -- spent?",
-        accountInfo ? "yes" : "no ",
-        nullifierPubkey.toBase58(),
-        "amount:",
-        decryptedUtxo.amounts[0].toNumber(),
-      );
+      // console.log(
+      //   "inserted -- spent?",
+      //   accountInfo ? "yes" : "no ",
+      //   nullifierPubkey.toBase58(),
+      //   "amount:",
+      //   decryptedUtxo.amounts[0].toNumber(),
+      // );
       if (
         !accountInfo &&
         (decryptedUtxo.amounts[1].toString() !== "0" ||
@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
       }
     }
   }
-  if (decryptedUtxos.length == 0) {
-    console.log("no unspent leaf found");
-  }
 
   return decryptedUtxos;
 }
diff --git a/light-sdk-ts/src/wallet/createOutUtxos.ts b/light-sdk-ts/src/wallet/createOutUtxos.ts
@@ -80,17 +80,17 @@ export function createOutUtxos({
   poseidon,
   inUtxos,
   publicMint,
-  publicSplAmount,
-  publicSolAmount,
+  publicAmountSpl,
+  publicAmountSol,
   relayerFee,
   changeUtxoAccount,
   recipients = [],
   action,
 }: {
   inUtxos?: Utxo[];
   publicMint?: PublicKey;
-  publicSplAmount?: BN;
-  publicSolAmount?: BN;
+  publicAmountSpl?: BN;
+  publicAmountSol?: BN;
   relayerFee?: BN;
   poseidon: any;
   changeUtxoAccount: Account;
@@ -105,8 +105,8 @@ export function createOutUtxos({
     );
 
   if (relayerFee) {
-    publicSolAmount = publicSolAmount
-      ? publicSolAmount.add(relayerFee)
+    publicAmountSol = publicAmountSol
+      ? publicAmountSol.add(relayerFee)
       : relayerFee;
   }
 
@@ -192,20 +192,20 @@ export function createOutUtxos({
 
   // subtract public amounts from sumIns
   if (action === Action.UNSHIELD) {
-    if (!publicSolAmount && !publicSplAmount)
+    if (!publicAmountSol && !publicAmountSpl)
       throw new CreateUtxoError(
         CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
         "createOutUtxos",
-        "publicSolAmount not initialized for unshield",
+        "publicAmountSol not initialized for unshield",
       );
-    if (!publicSplAmount) publicSplAmount = new BN(0);
-    if (!publicSolAmount)
+    if (!publicAmountSpl) publicAmountSpl = new BN(0);
+    if (!publicAmountSol)
       throw new CreateUtxoError(
         CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
         "constructor",
       );
 
-    if (publicSplAmount && !publicMint)
+    if (publicAmountSpl && !publicMint)
       throw new CreateUtxoError(
         CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
         "createOutUtxos",
@@ -217,9 +217,9 @@ export function createOutUtxos({
     );
 
     assets[publicSplAssetIndex].sumIn =
-      assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
+      assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
     assets[publicSolAssetIndex].sumIn =
-      assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
+      assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
     // add public amounts to sumIns
   } else if (action === Action.SHIELD) {
     if (relayerFee)
@@ -228,26 +228,20 @@ export function createOutUtxos({
         "createOutUtxos",
         "Shield and relayer fee defined",
       );
-    if (!publicSolAmount && !publicSplAmount)
-      throw new CreateUtxoError(
-        CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
-        "createOutUtxos",
-        "publicSolAmount not initialized for unshield",
-      );
-    if (!publicSplAmount) publicSplAmount = new BN(0);
-    if (!publicSolAmount) publicSolAmount = new BN(0);
+    if (!publicAmountSpl) publicAmountSpl = new BN(0);
+    if (!publicAmountSol) publicAmountSol = new BN(0);
     let publicSplAssetIndex = assets.findIndex(
       (x) => x.asset.toBase58() === publicMint?.toBase58(),
     );
     let publicSolAssetIndex = assets.findIndex(
       (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
     );
     assets[publicSplAssetIndex].sumIn =
-      assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
+      assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
     assets[publicSolAssetIndex].sumIn =
-      assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
+      assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
   } else if (action === Action.TRANSFER) {
-    if (!publicSolAmount)
+    if (!publicAmountSol)
       throw new CreateUtxoError(
         CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
         "constructor",
@@ -257,7 +251,7 @@ export function createOutUtxos({
     );
 
     assets[publicSolAssetIndex].sumIn =
-      assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
+      assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
   }
 
   var outputUtxos: Utxo[] = [];

diff --git a/light-sdk-ts/src/wallet/provider.ts b/light-sdk-ts/src/wallet/provider.ts
@@ -1,4 +1,10 @@
-import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
+import {
+  AnchorError,
+  AnchorProvider,
+  BN,
+  setProvider,
+  Wallet,
+} from "@coral-xyz/anchor";
 import { SolMerkleTree } from "../merkleTree";
 import {
   PublicKey,
@@ -37,8 +43,8 @@ export class Provider {
   solMerkleTree?: SolMerkleTree;
   provider?: AnchorProvider | { connection: Connection }; // temp -?
   url?: string;
-  // TODO: refactor by streamlining everything towards using connection and not anchor provider
-  // - get rid of url
+  minimumLamports: BN;
+
   /**
    * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
    * Optionally provide confirmConfig, Default = 'confirmed'.
@@ -49,12 +55,14 @@ export class Provider {
     confirmConfig,
     connection,
     url = "http://127.0.0.1:8899",
+    minimumLamports = new BN(5000 * 30),
   }: {
     nodeWallet?: SolanaKeypair;
     browserWallet?: BrowserWallet;
     confirmConfig?: ConfirmOptions;
     connection?: Connection;
     url?: string;
+    minimumLamports?: BN;
   }) {
     if (nodeWallet && browserWallet)
       throw new ProviderError(
@@ -82,6 +90,7 @@ export class Provider {
       );
 
     this.confirmConfig = confirmConfig || { commitment: "confirmed" };
+    this.minimumLamports = minimumLamports;
 
     if (nodeWallet) {
       this.nodeWallet = nodeWallet;