@sign-global/tokentable 0.4.1-beta.4 → 0.4.1-beta.6

package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json

@@ -1,5 +1,5 @@
 {
-    "address": "EA9xKVuSHRae4wyrBSB1Hi22fgeti36S9kM6fVM2YYZb",
+    "address": "FCkSnf5Qd5Jva3ZdjFNGyZNhpCxmvjikXDkpWgE1vD3R",
     "metadata": {
         "name": "fungible_token_distributor_solana",
         "version": "0.1.0",
@@ -207,10 +207,15 @@
                 {
                     "name": "fee_collector",
                     "optional": true,
-                    "address": "88vcxLLBpjFMdmErmhxnHHnQMz5XYyNcRmmp41kQH65b"
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
                 },
                 {
-                    "name": "user_fee",
+                    "name": "fee_token_mint",
+                    "writable": true,
+                    "optional": true
+                },
+                {
+                    "name": "fee",
                     "writable": true
                 },
                 {
@@ -489,6 +494,20 @@
                         ]
                     }
                 },
+                {
+                    "name": "fee_collector",
+                    "optional": true,
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+                },
+                {
+                    "name": "fee_collector_storage",
+                    "optional": true
+                },
+                {
+                    "name": "fee",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "authority",
                     "writable": true,
@@ -504,6 +523,10 @@
                     "name": "project_id",
                     "type": "string"
                 },
+                {
+                    "name": "project_token",
+                    "type": "pubkey"
+                },
                 {
                     "name": "owner",
                     "type": "pubkey"
@@ -511,6 +534,10 @@
                 {
                     "name": "fee_collector",
                     "type": "pubkey"
+                },
+                {
+                    "name": "init_fee_account",
+                    "type": "bool"
                 }
             ]
         },
@@ -644,6 +671,20 @@
                         ]
                     }
                 },
+                {
+                    "name": "fee_collector",
+                    "optional": true,
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+                },
+                {
+                    "name": "fee_collector_storage",
+                    "optional": true
+                },
+                {
+                    "name": "fee",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -657,6 +698,10 @@
                 {
                     "name": "fee_collector",
                     "type": "pubkey"
+                },
+                {
+                    "name": "init_fee_account",
+                    "type": "bool"
                 }
             ]
         },
@@ -832,6 +877,11 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "new_owner",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -885,6 +935,11 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "new_admin",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"

package/dist/esm/airdrop/types/index.d.ts

@@ -1,8 +1,9 @@
-import { TonConnectUI } from '@tonconnect/ui-react';
+import { TonConnectUI as TonWalletClient } from '@tonconnect/ui-react';
 import { AirdropService as TonAirdropService } from '../contracts/ton/AirdropService';
 import { AirdropService as EvmAirdropService } from '../contracts/evm/AirdropService';
 import { ChainConfig } from '../constants';
 import { WalletClient as ViemWalletClient } from 'viem';
+import { WalletContextState as SolanaWalletState } from '@solana/wallet-adapter-react';
 export type ChainId = keyof typeof ChainConfig;
 export interface EvmContractClientOption {
     chainId: ChainId;
@@ -143,7 +144,8 @@ export declare enum EvmAirdropVersionEnum {
     V3 = "0.3.0",// zeta 收费
     V4 = "0.4.0"
 }
-export type IWalletClient = TonConnectUI | ViemWalletClient;
+export type IWalletClient = TonWalletClient | ViemWalletClient | SolanaWalletState;
+export type { TonWalletClient, ViemWalletClient, SolanaWalletState };
 export type IAirdropService = TonAirdropService | EvmAirdropService;
 type BaseAirdropOptions = {
     endpoint?: string;
@@ -166,4 +168,3 @@ export interface IContractConfig {
 export declare enum ErrorCode {
     WALLET_ALREADY_CONNECTED = "Wallet already connected"
 }
-export {};

package/dist/esm/airdrop/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAeA,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAsDD,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IACpC,mDAAqB,CAAA;IACrB,4DAA8B,CAAA;IAC9B,sDAAwB,CAAA;IACxB,sDAAwB,CAAA;AAC1B,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAUD,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,qCAAuB,CAAA;IACvB,4BAAc,CAAA;AAChB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AA6DD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;IACjB,4CAAmB,CAAA;AACrB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;AAED,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,qCAAY,CAAA,CAAC,yBAAyB;AACxC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AA6BD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6BAA6B;IAC7B,kEAAqD,CAAA;AACvD,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAsDD,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IACpC,mDAAqB,CAAA;IACrB,4DAA8B,CAAA;IAC9B,sDAAwB,CAAA;IACxB,sDAAwB,CAAA;AAC1B,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAUD,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,qCAAuB,CAAA;IACvB,4BAAc,CAAA;AAChB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AA6DD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;IACjB,4CAAmB,CAAA;AACrB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;AAED,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,qCAAY,CAAA,CAAC,yBAAyB;AACxC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AA8BD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6BAA6B;IAC7B,kEAAqD,CAAA;AACvD,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}

package/dist/esm/wallets/providers/evm/EvmWallet.js

@@ -25,26 +25,36 @@ export class EvmWallet extends WalletBase {
         await disconnect(evmStore.config);
     }
     async sign(_message) {
-        const sign = await signMessage(evmStore.config, {
-            message: _message
-        });
-        return {
-            message: _message,
-            signature: sign
-        };
+        try {
+            const sign = await signMessage(evmStore.config, {
+                message: _message
+            });
+            return {
+                message: _message,
+                signature: sign
+            };
+        }
+        catch (error) {
+            throw error;
+        }
     }
     async signin(statement, prepare = true) {
-        return new Promise((resolve) => {
-            const signCallback = (data) => {
-                this.address = data.address;
-                this.chainId = data.chainId;
-                let fullMessage = statement;
-                if (prepare) {
-                    const msg = prepareSignMessage({ statement, chainId: data.chainId, address: data.address });
-                    fullMessage = get4361Message(msg);
+        return new Promise((resolve, reject) => {
+            const signCallback = async (data) => {
+                try {
+                    this.address = data.address;
+                    this.chainId = data.chainId;
+                    let fullMessage = statement;
+                    if (prepare) {
+                        const msg = prepareSignMessage({ statement, chainId: data.chainId, address: data.address });
+                        fullMessage = get4361Message(msg);
+                    }
+                    const res = await this.sign(fullMessage);
+                    resolve(res);
+                }
+                catch (error) {
+                    reject(error);
                 }
-                const res = this.sign(fullMessage);
-                resolve(res);
             };
             const account = getAccount(evmStore.config);
             this.provider = evmStore.walletClient;

package/dist/esm/wallets/providers/evm/EvmWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"EvmWallet.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/evm/EvmWallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EvmWallet.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/evm/EvmWallet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sign-global/tokentable",
-  "version": "0.4.1-beta.4",
+  "version": "0.4.1-beta.6",
   "publishConfig": {
     "access": "public"
   },

package/src/airdrop/SignatureAirdropClient.ts

@@ -1,4 +1,3 @@
-import { getAddress } from 'viem';
 import { CONST } from './constants';
 import { EvmSignatureAirdropService, SolanaSignatureAirdropService } from './contracts';
 import { WalletFactory } from '../wallets';
@@ -20,7 +19,9 @@ import {
   IAirdropSignatureIdentity,
   IClaimSignature,
   IProject,
-  IWalletClient
+  IWalletClient,
+  SolanaWalletState,
+  ViemWalletClient
 } from './types';
 import { cleanUrlParams, isMobile } from '../utils';
 
@@ -32,6 +33,7 @@ export class SignatureAirdropClient {
   protected identities?: IAirdropSignatureIdentity[];
   private projectPromise: Promise<void> | undefined;
   private twitterPromise: Promise<void> | undefined;
+  private strategyCache: Map<string, EvmSignatureAirdropService | SolanaSignatureAirdropService> = new Map();
   constructor(params: IAirdropOptions) {
     this.projectId = params.projectId;
     this.endpoint = params.endpoint;
@@ -212,19 +214,32 @@ export class SignatureAirdropClient {
   ): Promise<EvmSignatureAirdropService | SolanaSignatureAirdropService> {
     const project = await this.getProjectInfo();
 
-    if (project.chainType === ChainType.Solana) {
-      return new SolanaSignatureAirdropService({
-        chainId: project.chainId,
-        projectId: project.id,
-        token: project.tokenAddress,
-        walletClient: walletClient as any
-      });
+    const cacheKey = walletClient
+      ? project.chainType === ChainType.Evm
+        ? (walletClient as ViemWalletClient).account?.address!
+        : project.chainType === ChainType.Solana
+        ? (walletClient as SolanaWalletState).publicKey!.toString()
+        : 'walletClient'
+      : 'default';
+    if (this.strategyCache.has(cacheKey)) {
+      return this.strategyCache.get(cacheKey)!;
     }
-    return new EvmSignatureAirdropService({
-      chainId: Number(project.chainId) as ChainId,
-      contractAddress: project.contractAddress,
-      walletClient: walletClient as any
-    });
+
+    const strategy =
+      project.chainType === ChainType.Solana
+        ? new SolanaSignatureAirdropService({
+            chainId: project.chainId,
+            projectId: project.id,
+            token: project.tokenAddress,
+            walletClient: walletClient as any
+          })
+        : new EvmSignatureAirdropService({
+            chainId: Number(project.chainId) as ChainId,
+            contractAddress: project.contractAddress,
+            walletClient: walletClient as any
+          });
+    this.strategyCache.set(cacheKey, strategy);
+    return strategy;
   }
 
   async getVersion(): Promise<string> {
@@ -232,8 +247,9 @@ export class SignatureAirdropClient {
     return strategy.getVersion();
   }
 
-  async getClaimFee(amount?: bigint): Promise<undefined | bigint> {
-    const strategy = await this.getStrategy();
+  // solana prams need to wallet
+  async getClaimFee(amount?: bigint, walletClient?: IWalletClient): Promise<undefined | bigint> {
+    const strategy = await this.getStrategy(walletClient);
     if (!strategy.getClaimFee) {
       throw new Error('getClaimFee is not supported for this chain');
     }
@@ -259,6 +275,7 @@ export class SignatureAirdropClient {
       throw new Error('No claims available');
     }
     const service = await this.getStrategy(walletClient);
+    const project = await this.getProjectInfo();
     const res = await checkGetSignatures(
       {
         claimIds,
@@ -278,6 +295,10 @@ export class SignatureAirdropClient {
       throw new Error('No matching claims found');
     }
 
+    // only evm use
+    const defaultRecipient =
+      project.chainType === ChainType.Evm ? (walletClient as ViemWalletClient).account?.address! : '';
+
     const claimData = filteredClaims.map((it) => {
       const signature = signatureMap[it.claimId];
       if (!signature) {
@@ -286,16 +307,12 @@ export class SignatureAirdropClient {
 
       return {
         ...it,
-        recipient: recipient ? recipient : walletClient.account?.address!,
+        recipient: recipient ? recipient : defaultRecipient,
         ...signature
       };
     });
-    const delegateMode = recipient ? getAddress(recipient) !== walletClient.account?.address : false;
-    const feeData = (await this.getClaimFee(1n)) || 0n;
-    const hash = (await service!.claim(
-      claimData,
-      delegateMode ? feeData * BigInt(claimData.length) : feeData
-    )) as `0x${string}`;
+
+    const hash = (await service!.claim(claimData, recipient)) as `0x${string}`;
     return hash;
   }
 

package/src/airdrop/constants/chain-config.ts

@@ -4,7 +4,6 @@ import {
   baseSepolia,
   cyber,
   mainnet,
-  mantaTestnet,
   polygonMumbai,
   polygonAmoy,
   sepolia,
@@ -12,7 +11,8 @@ import {
   zetachainAthensTestnet,
   zkSync,
   bsc,
-  berachainTestnet
+  berachainTestnet,
+  arbitrum
 } from 'viem/chains';
 import { mevmDevNet, tonMainNet, tonTestNet } from './network';
 
@@ -49,6 +49,10 @@ export const ChainConfig = {
     contractAddress: '0x00aFD4466E4Afa4F43cCd414b1BC65e574ACA2f5',
     rpcUrl: 'https://zetachain-mainnet.g.alchemy.com/v2/1tmk0FrhwTJHXh0XIyae7_SXw1lDCjgs'
   },
+  [arbitrum.id]: {
+    contractAddress: '0x759ac3CA33FeeAfB8C41aEbC8687A7Bd849Fc87a',
+    rpcUrl: arbitrum.rpcUrls.default.http[0]
+  },
   [berachainTestnet.id]: {
     contractAddress: '',
     rpcUrl: '',
@@ -97,6 +101,7 @@ export const SupportedChains = [
   polygonMumbai,
   polygonAmoy,
   mevmDevNet,
+  arbitrum,
   tonTestNet,
   tonMainNet
 ];

package/src/airdrop/contracts/evm/SignatureAirdropService.ts

@@ -1,3 +1,4 @@
+import { getAddress } from 'viem';
 import { ZERO_ADDRESS } from '../../constants';
 import { ChainId, EvmContractClientOption } from '../../types';
 import { AirdropSignatureClient } from './contracts/AirdropSignatureClient';
@@ -87,8 +88,12 @@ export class SignatureAirdropService {
       signature: string;
       extraData?: string;
     }[],
-    value?: bigint
+    recipient?: string
   ) {
+    const defaultRecipient = this.options.walletClient?.account?.address;
+    const delegateMode = recipient ? getAddress(recipient) !== defaultRecipient : false;
+    const feeData = (await this.getClaimFee(this.options.contractAddress, 1n)) || 0n;
+    const value = delegateMode ? feeData * BigInt(data.length) : feeData;
     return this.airdropClient.claim(data, value);
   }
 }

package/src/airdrop/contracts/solana/AirdropSignatureClient.ts

@@ -17,8 +17,16 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     this.projectId = options.projectId;
   }
 
-  getVersion() {
-    return '1.0.0';
+  async getVersionPDA(): Promise<PublicKey> {
+    const [versionPDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('version')]);
+
+    return versionPDA;
+  }
+
+  async getVersion() {
+    const versionPDA = await this.getVersionPDA();
+    const versionData = await this.fetchAccountData('version', versionPDA);
+    return versionData.version;
   }
 
   get FeeCollector() {
@@ -29,6 +37,10 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     });
   }
 
+  async getClaimFee(amount: bigint) {
+    return this.FeeCollector.getClaimFee(amount.toString());
+  }
+
   async getStoragePDA(): Promise<PublicKey> {
     const [storagePDA] = await this.findProgramAddress([
       anchor.utils.bytes.utf8.encode('storage'),
@@ -133,6 +145,15 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     await this.invokeInstruction('togglePause', {}, [this.projectId]);
   }
 
+  async getFeeInfo() {
+    const airdropPDA = await this.getAirdropPDA();
+    const config = await this.fetchAccountData('airdrop', airdropPDA);
+    return {
+      feeToken: config.feeToken.toString(),
+      feeCollector: config.feeCollector.toString()
+    };
+  }
+
   async claim(
     data: {
       recipient: string;
@@ -148,7 +169,7 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     const config = await this.getContractInfo();
 
     const feeCollectorStoragePDA = await this.FeeCollector.getStoragePDA();
-    const userFeePDA = await this.FeeCollector.getUserFeePDA();
+    const feePDA = await this.FeeCollector.getProjectFeePDA();
     const airdropPDA = await this.getAirdropPDA();
     const vaultPDA = await this.getVaultPDA();
 
@@ -172,32 +193,12 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
         })
       );
 
-      console.log(
-        anchor.web3.Ed25519Program.programId.toString(),
-        {
-          publicKey: new PublicKey(config.signer).toBytes(),
-          message: Uint8Array.from(hexStrToU8Array(claim.hash)),
-          signature: new Uint8Array(hexStrToU8Array(claim.signature))
-        },
-        'sign'
-      );
-
       const claimPDA = await this.getClaimPDA(claim.claimId);
 
       const decodedData = {
         claimableTimestamp: new anchor.BN(claim.unlockingAt),
         claimableAmount: new anchor.BN(claim.value)
       };
-      console.log(
-        airdropPDA.toString(),
-        claimPDA,
-        this.projectId,
-        new Uint8Array(hexStrToU8Array(claim.claimId)),
-        [],
-        decodedData,
-        Buffer.from(hexStrToU8Array(claim.signature)),
-        'txdata'
-      );
 
       tx.add(
         await this.program.methods
@@ -212,18 +213,18 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
             authority: this.wallet.publicKey,
             airdrop: airdropPDA,
             claim: claimPDA,
-            vault: vaultPDA,
+            // vault: vaultPDA,
             authorityAta: authorityATA.address,
             tokenMint: new PublicKey(config.token),
             feeCollectorStorage: feeCollectorStoragePDA,
             feeCollectorVault: null,
-            userFee: userFeePDA,
+            fee: feePDA,
             authorityFeeAta: null,
-            tokenProgram: TOKEN_2022_PROGRAM_ID
+            tokenProgram: TOKEN_2022_PROGRAM_ID,
+            feeTokenMint: null
           })
           .transaction()
       );
-      console.log(tx);
     }
 
     return await this.program.provider.sendAndConfirm?.(tx);

package/src/airdrop/contracts/solana/FeeCollectorClient.ts

@@ -20,15 +20,24 @@ export class FeeCollectorClient extends SolanaContractClientBase<FeeCollector> {
     return storagePDA;
   }
 
-  async getUserFeePDA(): Promise<PublicKey> {
-    const [userFeePDA] = await this.findProgramAddress([
+  async getProjectFeePDA(): Promise<PublicKey> {
+    const [projectFeePDA] = await this.findProgramAddress([
       anchor.utils.bytes.utf8.encode('fee'),
       anchor.utils.bytes.utf8.encode(this.projectId)
     ]);
-    return userFeePDA;
+    return projectFeePDA;
   }
 
   async setDefaultFee(fee: string) {
     return this.invokeInstruction('setDefaultFee', {}, [new anchor.BN(fee)]);
   }
+
+  async getClaimFee(tokenAmount: string): Promise<bigint> {
+    try {
+      const fee = await this.invokeView('getFee', [this.projectId, new anchor.BN(tokenAmount)]);
+      return BigInt(fee);
+    } catch (error) {
+      return BigInt(0);
+    }
+  }
 }

package/src/airdrop/contracts/solana/SignatureAirdropService.ts

@@ -39,15 +39,9 @@ export class SignatureAirdropService {
     return '';
   }
 
-  async getClaimFee(address: string, amount: bigint): Promise<bigint | undefined> {
-    // const feeCollector = await this.feeCollectors(this.options.contractAddress as string);
-    // if (!feeCollector || feeCollector === ZERO_ADDRESS) {
-    //   return undefined;
-    // }
-    // const feeClient = this.getFeeClient(feeCollector as string);
-    // const fee = (await feeClient.getFee(address, amount)) as bigint;
-    // return fee;
-    return 0n;
+  async getClaimFee(address: string, amount: bigint): Promise<bigint> {
+    const fee = await this.airdropClient.getClaimFee(amount);
+    return fee;
   }
 
   async batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]> {
@@ -70,7 +64,7 @@ export class SignatureAirdropService {
       value: string;
       hash: string;
     }[],
-    value?: bigint
+    recipient?: string
   ) {
     return this.airdropClient.claim(data);
   }

package/src/airdrop/contracts/solana/SolanaContractClient.ts

@@ -1,4 +1,4 @@
-import { Program, AnchorProvider, setProvider, Wallet, Idl, AccountNamespace } from '@coral-xyz/anchor';
+import { Program, AnchorProvider, setProvider, Wallet, Idl } from '@coral-xyz/anchor';
 import {
   AllAccountsMap,
   AllInstructions,
@@ -70,7 +70,7 @@ export abstract class SolanaContractClientBase<T extends Idl = Idl> {
   async invokeView<M extends keyof MakeMethodsNamespace<T, AllInstructions<T>>>(
     methodName: M,
     args: Parameters<MakeMethodsNamespace<T, AllInstructions<T>>[M]>
-  ): Promise<ReturnType<MakeMethodsNamespace<T, AllInstructions<T>>[M]>> {
+  ): Promise<any> {
     try {
       if (!this.program.methods[methodName]) {
         throw new Error(`Method ${methodName} not found in program`);
@@ -91,27 +91,35 @@ export abstract class SolanaContractClientBase<T extends Idl = Idl> {
     args: any,
     options?: { signers?: Signer[] }
   ): Promise<string> {
-    const latestBlockhash = await this.connection.getLatestBlockhash();
-
+    if (!this.program.methods[methodName]) {
+      throw new Error(`Method ${methodName} not found in program`);
+    }
     let instruction = this.program.methods[methodName](...args).accounts(accounts);
 
     if (options?.signers?.length) {
       instruction = instruction.signers(options.signers);
     }
 
-    console.log(instruction, 'in');
-
     const tx = await instruction.rpc();
 
-    await this.connection.confirmTransaction({
-      signature: tx,
-      blockhash: latestBlockhash.blockhash,
-      lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
-    });
+    await this.confirmTransaction(tx);
     console.log(tx);
 
     return tx;
   }
+
+  async confirmTransaction(tx: string): Promise<string> {
+    const latestBlockhash = await this.connection.getLatestBlockhash();
+    await this.connection.confirmTransaction(
+      {
+        signature: tx,
+        blockhash: latestBlockhash.blockhash,
+        lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
+      },
+      'confirmed'
+    );
+    return tx;
+  }
   // protected abstract getProgramAccount(accountName: string, address: PublicKey): Promise<any>;
 
   // protected abstract getEventLogs(signature: string, eventName: string): Promise<any[]>;