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

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

@@ -5,7 +5,7 @@ import * as anchor from '@coral-xyz/anchor';
 import { FungibleTokenDistributorSolana } from './fungible_token_distributor_solana';
 import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
 import { FeeCollectorClient } from './FeeCollectorClient';
-import { getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
+import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
 
 export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTokenDistributorSolana> {
   projectId: string;
@@ -171,7 +171,9 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     const feeCollectorStoragePDA = await this.FeeCollector.getStoragePDA();
     const feePDA = await this.FeeCollector.getProjectFeePDA();
     const airdropPDA = await this.getAirdropPDA();
-    const vaultPDA = await this.getVaultPDA();
+    const tokenVersion = await fetchTokenVersion(config.token, {
+      clusterOrEndpoint: this.chainId
+    });
 
     const authorityATA = await getOrCreateAssociatedTokenAccount({
       connection: this.connection,
@@ -179,12 +181,13 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
       mint: new PublicKey(config.token),
       owner: new PublicKey(this.wallet.publicKey),
       signTransaction: (this.wallet as any).signTransaction,
-      programId: TOKEN_2022_PROGRAM_ID
+      programId: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID
     });
 
-    const tx = new anchor.web3.Transaction();
-
+    let lastHash = '';
+    // solana max transaction size of 1232
     for (const claim of data) {
+      const tx = new anchor.web3.Transaction();
       tx.add(
         anchor.web3.Ed25519Program.createInstructionWithPublicKey({
           publicKey: new PublicKey(config.signer).toBytes(),
@@ -213,20 +216,23 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
             authority: this.wallet.publicKey,
             airdrop: airdropPDA,
             claim: claimPDA,
-            // vault: vaultPDA,
             authorityAta: authorityATA.address,
             tokenMint: new PublicKey(config.token),
             feeCollectorStorage: feeCollectorStoragePDA,
             feeCollectorVault: null,
             fee: feePDA,
             authorityFeeAta: null,
-            tokenProgram: TOKEN_2022_PROGRAM_ID,
+            tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
             feeTokenMint: null
           })
           .transaction()
       );
+
+      const hash = await this.program.provider.sendAndConfirm?.(tx);
+
+      lastHash = hash!;
     }
 
-    return await this.program.provider.sendAndConfirm?.(tx);
+    return lastHash;
   }
 }

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

@@ -19,26 +19,6 @@ export class SignatureAirdropService {
     return this.airdropClient.getVersion();
   }
 
-  feeCollectors = async (address: string) => {
-    // const deployerClient = await this.getDeployerClient();
-    // return await deployerClient.feeCollectors(address);
-    return '';
-  };
-
-  feeTokens = async (address: string) => {
-    // const deployerClient = await this.getDeployerClient();
-    // return await deployerClient.feeTokens(address);
-    return '';
-  };
-
-  async getFeelessThreshold() {
-    // return this.airdropClient.getFeelessThreshold();
-  }
-
-  async getDeployer() {
-    return '';
-  }
-
   async getClaimFee(address: string, amount: bigint): Promise<bigint> {
     const fee = await this.airdropClient.getClaimFee(amount);
     return fee;

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

@@ -116,7 +116,7 @@ export abstract class SolanaContractClientBase<T extends Idl = Idl> {
         blockhash: latestBlockhash.blockhash,
         lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
       },
-      'confirmed'
+      'finalized'
     );
     return tx;
   }

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

@@ -98,41 +98,8 @@
                 "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": "token_program"
               },
               {
                 "kind": "arg",
@@ -749,6 +716,12 @@
           "writable": true,
           "signer": true
         },
+        {
+          "name": "new_owner",
+          "writable": true,
+          "signer": true,
+          "optional": true
+        },
         {
           "name": "system_program",
           "address": "11111111111111111111111111111111"
@@ -833,41 +806,8 @@
                 "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": "token_program"
               },
               {
                 "kind": "account",
@@ -1019,11 +959,16 @@
     },
     {
       "code": 6002,
+      "name": "NotPermissioned",
+      "msg": "NotPermissioned"
+    },
+    {
+      "code": 6003,
       "name": "FeesTooHigh",
       "msg": "FeesTooHigh"
     },
     {
-      "code": 6003,
+      "code": 6004,
       "name": "InvalidCallData",
       "msg": "InvalidCallData"
     }
@@ -1102,6 +1047,10 @@
             "name": "owner",
             "type": "pubkey"
           },
+          {
+            "name": "new_owner",
+            "type": "pubkey"
+          },
           {
             "name": "default_fees_bips",
             "type": "u64"

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

@@ -104,41 +104,8 @@ export type FeeCollector = {
                 "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": "arg",
@@ -755,6 +722,12 @@ export type FeeCollector = {
           "writable": true,
           "signer": true
         },
+        {
+          "name": "newOwner",
+          "writable": true,
+          "signer": true,
+          "optional": true
+        },
         {
           "name": "systemProgram",
           "address": "11111111111111111111111111111111"
@@ -839,41 +812,8 @@ export type FeeCollector = {
                 "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",
@@ -1025,11 +965,16 @@ export type FeeCollector = {
     },
     {
       "code": 6002,
+      "name": "notPermissioned",
+      "msg": "notPermissioned"
+    },
+    {
+      "code": 6003,
       "name": "feesTooHigh",
       "msg": "feesTooHigh"
     },
     {
-      "code": 6003,
+      "code": 6004,
       "name": "invalidCallData",
       "msg": "invalidCallData"
     }
@@ -1108,6 +1053,10 @@ export type FeeCollector = {
             "name": "owner",
             "type": "pubkey"
           },
+          {
+            "name": "newOwner",
+            "type": "pubkey"
+          },
           {
             "name": "defaultFeesBips",
             "type": "u64"

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

@@ -80,41 +80,8 @@
                 "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": "token_program"
               },
               {
                 "kind": "account",
@@ -541,6 +508,50 @@
         }
       ]
     },
+    {
+      "name": "receive_program_admin",
+      "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": "system_program",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": []
+    },
     {
       "name": "set_base_params",
       "discriminator": [
@@ -877,11 +888,6 @@
           "writable": true,
           "signer": true
         },
-        {
-          "name": "new_owner",
-          "writable": true,
-          "signer": true
-        },
         {
           "name": "system_program",
           "address": "11111111111111111111111111111111"
@@ -938,7 +944,8 @@
         {
           "name": "new_admin",
           "writable": true,
-          "signer": true
+          "signer": true,
+          "optional": true
         },
         {
           "name": "system_program",
@@ -1123,41 +1130,8 @@
                 "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": "token_program"
               },
               {
                 "kind": "account",
@@ -1395,16 +1369,21 @@
     },
     {
       "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"
     }
@@ -1511,6 +1490,10 @@
           {
             "name": "admin",
             "type": "pubkey"
+          },
+          {
+            "name": "new_admin",
+            "type": "pubkey"
           }
         ]
       }
@@ -1531,6 +1514,10 @@
             "name": "owner",
             "type": "pubkey"
           },
+          {
+            "name": "new_owner",
+            "type": "pubkey"
+          },
           {
             "name": "default_fees_bips",
             "type": "u64"