@sign-global/tokentable 0.4.1-beta.5 → 0.4.1-beta.7

package/src/airdrop/contracts/solana/fungible_token_distributor_solana.json

@@ -210,7 +210,12 @@
           "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/src/airdrop/contracts/solana/fungible_token_distributor_solana.ts

@@ -216,7 +216,12 @@ export type FungibleTokenDistributorSolana = {
           "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
         },
         {
-          "name": "userFee",
+          "name": "feeTokenMint",
+          "writable": true,
+          "optional": true
+        },
+        {
+          "name": "fee",
           "writable": true
         },
         {
@@ -495,6 +500,20 @@ export type FungibleTokenDistributorSolana = {
             ]
           }
         },
+        {
+          "name": "feeCollector",
+          "optional": true,
+          "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+        },
+        {
+          "name": "feeCollectorStorage",
+          "optional": true
+        },
+        {
+          "name": "fee",
+          "writable": true,
+          "optional": true
+        },
         {
           "name": "authority",
           "writable": true,
@@ -510,6 +529,10 @@ export type FungibleTokenDistributorSolana = {
           "name": "projectId",
           "type": "string"
         },
+        {
+          "name": "projectToken",
+          "type": "pubkey"
+        },
         {
           "name": "owner",
           "type": "pubkey"
@@ -517,6 +540,10 @@ export type FungibleTokenDistributorSolana = {
         {
           "name": "feeCollector",
           "type": "pubkey"
+        },
+        {
+          "name": "initFeeAccount",
+          "type": "bool"
         }
       ]
     },
@@ -650,6 +677,20 @@ export type FungibleTokenDistributorSolana = {
             ]
           }
         },
+        {
+          "name": "feeCollector",
+          "optional": true,
+          "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+        },
+        {
+          "name": "feeCollectorStorage",
+          "optional": true
+        },
+        {
+          "name": "fee",
+          "writable": true,
+          "optional": true
+        },
         {
           "name": "systemProgram",
           "address": "11111111111111111111111111111111"
@@ -663,6 +704,10 @@ export type FungibleTokenDistributorSolana = {
         {
           "name": "feeCollector",
           "type": "pubkey"
+        },
+        {
+          "name": "initFeeAccount",
+          "type": "bool"
         }
       ]
     },
@@ -838,6 +883,11 @@ export type FungibleTokenDistributorSolana = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "newOwner",
+          "writable": true,
+          "signer": true
+        },
         {
           "name": "systemProgram",
           "address": "11111111111111111111111111111111"
@@ -891,6 +941,11 @@ export type FungibleTokenDistributorSolana = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "newAdmin",
+          "writable": true,
+          "signer": true
+        },
         {
           "name": "systemProgram",
           "address": "11111111111111111111111111111111"

package/src/utils/web3.ts

@@ -8,9 +8,18 @@ import {
   TokenInvalidAccountOwnerError,
   TokenInvalidMintError,
   TokenInvalidOwnerError,
-  TOKEN_PROGRAM_ID
+  TOKEN_PROGRAM_ID,
+  TOKEN_2022_PROGRAM_ID
 } from '@solana/spl-token';
-import { Commitment, Connection, PublicKey, Transaction } from '@solana/web3.js';
+import {
+  Cluster,
+  clusterApiUrl,
+  Commitment,
+  Connection,
+  ParsedAccountData,
+  PublicKey,
+  Transaction
+} from '@solana/web3.js';
 
 export function flipAddressType(address: string) {
   if (!address) return '';
@@ -110,3 +119,54 @@ export async function getOrCreateAssociatedTokenAccount({
   if (!account.owner.equals(owner)) throw new TokenInvalidOwnerError();
   return account;
 }
+
+export enum SplTokenVersion {
+  SplToken = 'spl-token',
+  SplToken2022 = 'spl-token-2022'
+}
+
+export type FetchTokenVersionOptions = {
+  clusterOrEndpoint?: Cluster | string;
+};
+
+export type FetchTokenMetadataOptions = FetchTokenVersionOptions & {
+  fetchOffchainMetadata?: boolean;
+};
+
+async function _getTokenProgramAndParsedAccountData(conn: Connection, tokenAddress: string) {
+  const tokenMintAddress = new PublicKey(tokenAddress);
+  const parsedMintAccountInfo = await conn.getParsedAccountInfo(tokenMintAddress);
+  const parsedMintAccountData = parsedMintAccountInfo.value?.data as ParsedAccountData;
+  if (parsedMintAccountData?.program === SplTokenVersion.SplToken) {
+    return {
+      name: SplTokenVersion.SplToken,
+      programId: TOKEN_PROGRAM_ID,
+      parsedMintAccountData
+    };
+  } else if (parsedMintAccountData?.program === SplTokenVersion.SplToken2022) {
+    return {
+      name: SplTokenVersion.SplToken2022,
+      programId: TOKEN_2022_PROGRAM_ID,
+      parsedMintAccountData
+    };
+  }
+  return null;
+}
+
+function _getConnection(clusterOrEndpoint: Cluster | string) {
+  let endpoint: string;
+  try {
+    endpoint = clusterApiUrl((clusterOrEndpoint as Cluster) ?? 'mainnet-beta');
+  } catch {
+    endpoint = clusterOrEndpoint as string;
+  }
+
+  const conn = new Connection(endpoint);
+  return conn;
+}
+
+export async function fetchTokenVersion(tokenAddress: string, options: FetchTokenMetadataOptions) {
+  const conn = _getConnection(options.clusterOrEndpoint!);
+  const data = await _getTokenProgramAndParsedAccountData(conn, tokenAddress);
+  return data ? { name: data.name, programId: data.programId } : null;
+}

package/src/wallets/providers/evm/EvmWallet.ts

@@ -44,29 +44,37 @@ export class EvmWallet extends WalletBase<EVMStoreType> {
   }
 
   async sign(_message: string) {
-    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;
+    }
   }
 
   override async signin(statement: string, prepare = true): Promise<ISignResult> {
-    return new Promise((resolve) => {
-      const signCallback = (data: ReturnType<typeof useAccount>) => {
-        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: ReturnType<typeof useAccount>) => {
+        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!);