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

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

@@ -86,41 +86,8 @@ export type FungibleTokenDistributorSolana = {
                 "path": "authority"
               },
               {
-                "kind": "const",
-                "value": [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                "kind": "account",
+                "path": "tokenProgram"
               },
               {
                 "kind": "account",
@@ -547,6 +514,50 @@ export type FungibleTokenDistributorSolana = {
         }
       ]
     },
+    {
+      "name": "receiveProgramAdmin",
+      "discriminator": [
+        238,
+        172,
+        61,
+        197,
+        23,
+        72,
+        249,
+        87
+      ],
+      "accounts": [
+        {
+          "name": "config",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "authority",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "systemProgram",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "setBaseParams",
       "discriminator": [
@@ -883,11 +894,6 @@ export type FungibleTokenDistributorSolana = {
           "writable": true,
           "signer": true
         },
-        {
-          "name": "newOwner",
-          "writable": true,
-          "signer": true
-        },
         {
           "name": "systemProgram",
           "address": "11111111111111111111111111111111"
@@ -944,7 +950,8 @@ export type FungibleTokenDistributorSolana = {
         {
           "name": "newAdmin",
           "writable": true,
-          "signer": true
+          "signer": true,
+          "optional": true
         },
         {
           "name": "systemProgram",
@@ -1129,41 +1136,8 @@ export type FungibleTokenDistributorSolana = {
                 "path": "authority"
               },
               {
-                "kind": "const",
-                "value": [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                "kind": "account",
+                "path": "tokenProgram"
               },
               {
                 "kind": "account",
@@ -1401,16 +1375,21 @@ export type FungibleTokenDistributorSolana = {
     },
     {
       "code": 6009,
+      "name": "notPermissioned",
+      "msg": "notPermissioned"
+    },
+    {
+      "code": 6010,
       "name": "ownableUnauthorizedAccount",
       "msg": "ownableUnauthorizedAccount"
     },
     {
-      "code": 6010,
+      "code": 6011,
       "name": "invalidFeeCollector",
       "msg": "invalidFeeCollector"
     },
     {
-      "code": 6011,
+      "code": 6012,
       "name": "paused",
       "msg": "paused"
     }
@@ -1517,6 +1496,10 @@ export type FungibleTokenDistributorSolana = {
           {
             "name": "admin",
             "type": "pubkey"
+          },
+          {
+            "name": "newAdmin",
+            "type": "pubkey"
           }
         ]
       }
@@ -1537,6 +1520,10 @@ export type FungibleTokenDistributorSolana = {
             "name": "owner",
             "type": "pubkey"
           },
+          {
+            "name": "newOwner",
+            "type": "pubkey"
+          },
           {
             "name": "defaultFeesBips",
             "type": "u64"

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;
+}