@sign-global/tokentable 0.4.1-beta.8 → 0.4.1-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/airdrop/contracts/solana/AirdropSignatureClient.js +4 -1
- package/dist/cjs/airdrop/contracts/solana/AirdropSignatureClient.js.map +1 -1
- package/dist/cjs/airdrop/contracts/solana/fee_collector.d.ts +10 -10
- package/dist/cjs/airdrop/contracts/solana/fee_collector.json +10 -10
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +7 -4
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.json +7 -4
- package/dist/esm/airdrop/contracts/solana/AirdropSignatureClient.js +5 -2
- package/dist/esm/airdrop/contracts/solana/AirdropSignatureClient.js.map +1 -1
- package/dist/esm/airdrop/contracts/solana/fee_collector.d.ts +10 -10
- package/dist/esm/airdrop/contracts/solana/fee_collector.json +10 -10
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +7 -4
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json +7 -4
- package/package.json +1 -1
- package/src/airdrop/contracts/solana/AirdropSignatureClient.ts +5 -2
- package/src/airdrop/contracts/solana/fee_collector.json +10 -10
- package/src/airdrop/contracts/solana/fee_collector.ts +10 -10
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.json +7 -4
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.ts +7 -4
|
@@ -199,10 +199,13 @@ class AirdropSignatureClient extends SolanaContractClient_1.SolanaContractClient
|
|
|
199
199
|
fee: feePDA,
|
|
200
200
|
authorityFeeAta: null,
|
|
201
201
|
tokenProgram: tokenVersion?.programId || spl_token_1.TOKEN_2022_PROGRAM_ID,
|
|
202
|
+
feeTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
|
|
202
203
|
feeTokenMint: null
|
|
203
204
|
})
|
|
204
205
|
.transaction());
|
|
205
|
-
const hash = await this.program.provider.sendAndConfirm?.(tx
|
|
206
|
+
const hash = await this.program.provider.sendAndConfirm?.(tx, [], {
|
|
207
|
+
commitment: 'finalized'
|
|
208
|
+
});
|
|
206
209
|
lastHash = hash;
|
|
207
210
|
}
|
|
208
211
|
return lastHash;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirdropSignatureClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/AirdropSignatureClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,iEAAsF;AACtF,sHAA2D;AAC3D,0DAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"AirdropSignatureClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/AirdropSignatureClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fee_collector.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FeeCollector = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "feeCollector";
|
|
11
11
|
"version": "0.1.0";
|
|
@@ -442,16 +442,16 @@ export type FeeCollector = {
|
|
|
442
442
|
"args": [];
|
|
443
443
|
},
|
|
444
444
|
{
|
|
445
|
-
"name": "
|
|
445
|
+
"name": "receiveOwnership";
|
|
446
446
|
"discriminator": [
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
447
|
+
156,
|
|
448
|
+
163,
|
|
449
|
+
211,
|
|
450
|
+
191,
|
|
451
|
+
160,
|
|
452
|
+
158,
|
|
453
|
+
61,
|
|
454
|
+
55
|
|
455
455
|
];
|
|
456
456
|
"accounts": [
|
|
457
457
|
{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fee_collector",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -436,16 +436,16 @@
|
|
|
436
436
|
"args": []
|
|
437
437
|
},
|
|
438
438
|
{
|
|
439
|
-
"name": "
|
|
439
|
+
"name": "receive_ownership",
|
|
440
440
|
"discriminator": [
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
441
|
+
156,
|
|
442
|
+
163,
|
|
443
|
+
211,
|
|
444
|
+
191,
|
|
445
|
+
160,
|
|
446
|
+
158,
|
|
447
|
+
61,
|
|
448
|
+
55
|
|
449
449
|
],
|
|
450
450
|
"accounts": [
|
|
451
451
|
{
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fungible_token_distributor_solana.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FungibleTokenDistributorSolana = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA";
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "fungibleTokenDistributorSolana";
|
|
11
11
|
"version": "0.1.0";
|
|
@@ -180,7 +180,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
180
180
|
{
|
|
181
181
|
"name": "feeCollector";
|
|
182
182
|
"optional": true;
|
|
183
|
-
"address": "
|
|
183
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"name": "feeTokenMint";
|
|
@@ -198,6 +198,9 @@ export type FungibleTokenDistributorSolana = {
|
|
|
198
198
|
{
|
|
199
199
|
"name": "tokenProgram";
|
|
200
200
|
},
|
|
201
|
+
{
|
|
202
|
+
"name": "feeTokenProgram";
|
|
203
|
+
},
|
|
201
204
|
{
|
|
202
205
|
"name": "associatedTokenProgram";
|
|
203
206
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
|
|
@@ -470,7 +473,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
470
473
|
{
|
|
471
474
|
"name": "feeCollector";
|
|
472
475
|
"optional": true;
|
|
473
|
-
"address": "
|
|
476
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
474
477
|
},
|
|
475
478
|
{
|
|
476
479
|
"name": "feeCollectorStorage";
|
|
@@ -691,7 +694,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
691
694
|
{
|
|
692
695
|
"name": "feeCollector";
|
|
693
696
|
"optional": true;
|
|
694
|
-
"address": "
|
|
697
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
695
698
|
},
|
|
696
699
|
{
|
|
697
700
|
"name": "feeCollectorStorage";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fungible_token_distributor_solana",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
{
|
|
175
175
|
"name": "fee_collector",
|
|
176
176
|
"optional": true,
|
|
177
|
-
"address": "
|
|
177
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"name": "fee_token_mint",
|
|
@@ -192,6 +192,9 @@
|
|
|
192
192
|
{
|
|
193
193
|
"name": "token_program"
|
|
194
194
|
},
|
|
195
|
+
{
|
|
196
|
+
"name": "fee_token_program"
|
|
197
|
+
},
|
|
195
198
|
{
|
|
196
199
|
"name": "associated_token_program",
|
|
197
200
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
@@ -464,7 +467,7 @@
|
|
|
464
467
|
{
|
|
465
468
|
"name": "fee_collector",
|
|
466
469
|
"optional": true,
|
|
467
|
-
"address": "
|
|
470
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
468
471
|
},
|
|
469
472
|
{
|
|
470
473
|
"name": "fee_collector_storage",
|
|
@@ -685,7 +688,7 @@
|
|
|
685
688
|
{
|
|
686
689
|
"name": "fee_collector",
|
|
687
690
|
"optional": true,
|
|
688
|
-
"address": "
|
|
691
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
689
692
|
},
|
|
690
693
|
{
|
|
691
694
|
"name": "fee_collector_storage",
|
|
@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
|
|
|
2
2
|
import { SolanaContractClientBase } from './SolanaContractClient';
|
|
3
3
|
import IDL from './fungible_token_distributor_solana.json';
|
|
4
4
|
import * as anchor from '@coral-xyz/anchor';
|
|
5
|
-
import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
|
|
5
|
+
import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
|
|
6
6
|
import { FeeCollectorClient } from './FeeCollectorClient';
|
|
7
7
|
import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
|
|
8
8
|
export class AirdropSignatureClient extends SolanaContractClientBase {
|
|
@@ -170,10 +170,13 @@ export class AirdropSignatureClient extends SolanaContractClientBase {
|
|
|
170
170
|
fee: feePDA,
|
|
171
171
|
authorityFeeAta: null,
|
|
172
172
|
tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
|
|
173
|
+
feeTokenProgram: TOKEN_PROGRAM_ID,
|
|
173
174
|
feeTokenMint: null
|
|
174
175
|
})
|
|
175
176
|
.transaction());
|
|
176
|
-
const hash = await this.program.provider.sendAndConfirm?.(tx
|
|
177
|
+
const hash = await this.program.provider.sendAndConfirm?.(tx, [], {
|
|
178
|
+
commitment: 'finalized'
|
|
179
|
+
});
|
|
177
180
|
lastHash = hash;
|
|
178
181
|
}
|
|
179
182
|
return lastHash;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirdropSignatureClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/AirdropSignatureClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAsB,MAAM,wBAAwB,CAAC;AACtF,OAAO,GAAG,MAAM,0CAA0C,CAAC;AAC3D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"AirdropSignatureClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/AirdropSignatureClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAsB,MAAM,wBAAwB,CAAC;AACtF,OAAO,GAAG,MAAM,0CAA0C,CAAC;AAC3D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEvG,MAAM,OAAO,sBAAuB,SAAQ,wBAAwD;IAClG,SAAS,CAAS;IAClB,YAAY,OAA2B;QACrC,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,GAAG,EAAE,GAAG;SACT,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEhG,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,kBAAkB,CAAC;YAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,MAAM;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC9B,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEnH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe;QAC/B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YACvC,UAAU,CAAC,QAAQ,EAAE;YACrB,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACzC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEvE,OAAO;YACL,OAAO,EAAE,OAAiB;YAC1B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAY;YACxC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YACnC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,MAAiB;YAChC,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAY;YACpD,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAY;SACzC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACjE,OAAO,SAAS,EAAE,IAAI,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7E,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,YAAwB;QAC1D,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACtC,YAAY,EACZ;YACE,uBAAuB;YACvB,mCAAmC;aACpC,EACD,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,IAAI,SAAS,CAAC,OAAO,CAAC,CACtD,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,YAAoB,EAAE,SAAiB,EAAE,OAAe,EAAE,MAAc;QAC1F,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,EACpC,GAAG,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtH,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAClE,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACpC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE;SAC7C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IASG;QAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE5C,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE;YACzD,iBAAiB,EAAE,IAAI,CAAC,OAAO;SAChC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iCAAiC,CAAC;YAC3D,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC5B,IAAI,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,KAAK,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAC3C,eAAe,EAAG,IAAI,CAAC,MAAc,CAAC,eAAe;YACrD,SAAS,EAAE,YAAY,EAAE,SAAS,IAAI,qBAAqB;SAC5D,CAAC,CAAC;QAEH,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,sCAAsC;QACtC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACzC,EAAE,CAAC,GAAG,CACJ,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,8BAA8B,CAAC;gBACxD,SAAS,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE;gBACjD,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrD,SAAS,EAAE,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;aAC5D,CAAC,CACH,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAEvD,MAAM,WAAW,GAAG;gBAClB,kBAAkB,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC;gBACpD,eAAe,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;aAC5C,CAAC;YAEF,EAAE,CAAC,GAAG,CACJ,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO;iBACvB,KAAK,CACJ,IAAI,CAAC,SAAS,EACd,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAC9C,EAAE,EACF,WAAW,EACX,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAC9C;iBACA,eAAe,CAAC;gBACf,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;gBAChC,OAAO,EAAE,UAAU;gBACnB,KAAK,EAAE,QAAQ;gBACf,YAAY,EAAE,YAAY,CAAC,OAAO;gBAClC,SAAS,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;gBACtC,mBAAmB,EAAE,sBAAsB;gBAC3C,iBAAiB,EAAE,IAAI;gBACvB,GAAG,EAAE,MAAM;gBACX,eAAe,EAAE,IAAI;gBACrB,YAAY,EAAE,YAAY,EAAE,SAAS,IAAI,qBAAqB;gBAC9D,eAAe,EAAE,gBAAgB;gBACjC,YAAY,EAAE,IAAI;aACnB,CAAC;iBACD,WAAW,EAAE,CACjB,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;gBAChE,UAAU,EAAE,WAAW;aACxB,CAAC,CAAC;YAEH,QAAQ,GAAG,IAAK,CAAC;QACnB,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fee_collector.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FeeCollector = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "feeCollector";
|
|
11
11
|
"version": "0.1.0";
|
|
@@ -442,16 +442,16 @@ export type FeeCollector = {
|
|
|
442
442
|
"args": [];
|
|
443
443
|
},
|
|
444
444
|
{
|
|
445
|
-
"name": "
|
|
445
|
+
"name": "receiveOwnership";
|
|
446
446
|
"discriminator": [
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
447
|
+
156,
|
|
448
|
+
163,
|
|
449
|
+
211,
|
|
450
|
+
191,
|
|
451
|
+
160,
|
|
452
|
+
158,
|
|
453
|
+
61,
|
|
454
|
+
55
|
|
455
455
|
];
|
|
456
456
|
"accounts": [
|
|
457
457
|
{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fee_collector",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -436,16 +436,16 @@
|
|
|
436
436
|
"args": []
|
|
437
437
|
},
|
|
438
438
|
{
|
|
439
|
-
"name": "
|
|
439
|
+
"name": "receive_ownership",
|
|
440
440
|
"discriminator": [
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
441
|
+
156,
|
|
442
|
+
163,
|
|
443
|
+
211,
|
|
444
|
+
191,
|
|
445
|
+
160,
|
|
446
|
+
158,
|
|
447
|
+
61,
|
|
448
|
+
55
|
|
449
449
|
],
|
|
450
450
|
"accounts": [
|
|
451
451
|
{
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fungible_token_distributor_solana.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FungibleTokenDistributorSolana = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA";
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "fungibleTokenDistributorSolana";
|
|
11
11
|
"version": "0.1.0";
|
|
@@ -180,7 +180,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
180
180
|
{
|
|
181
181
|
"name": "feeCollector";
|
|
182
182
|
"optional": true;
|
|
183
|
-
"address": "
|
|
183
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"name": "feeTokenMint";
|
|
@@ -198,6 +198,9 @@ export type FungibleTokenDistributorSolana = {
|
|
|
198
198
|
{
|
|
199
199
|
"name": "tokenProgram";
|
|
200
200
|
},
|
|
201
|
+
{
|
|
202
|
+
"name": "feeTokenProgram";
|
|
203
|
+
},
|
|
201
204
|
{
|
|
202
205
|
"name": "associatedTokenProgram";
|
|
203
206
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
|
|
@@ -470,7 +473,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
470
473
|
{
|
|
471
474
|
"name": "feeCollector";
|
|
472
475
|
"optional": true;
|
|
473
|
-
"address": "
|
|
476
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
474
477
|
},
|
|
475
478
|
{
|
|
476
479
|
"name": "feeCollectorStorage";
|
|
@@ -691,7 +694,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
691
694
|
{
|
|
692
695
|
"name": "feeCollector";
|
|
693
696
|
"optional": true;
|
|
694
|
-
"address": "
|
|
697
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
|
|
695
698
|
},
|
|
696
699
|
{
|
|
697
700
|
"name": "feeCollectorStorage";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fungible_token_distributor_solana",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
{
|
|
175
175
|
"name": "fee_collector",
|
|
176
176
|
"optional": true,
|
|
177
|
-
"address": "
|
|
177
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"name": "fee_token_mint",
|
|
@@ -192,6 +192,9 @@
|
|
|
192
192
|
{
|
|
193
193
|
"name": "token_program"
|
|
194
194
|
},
|
|
195
|
+
{
|
|
196
|
+
"name": "fee_token_program"
|
|
197
|
+
},
|
|
195
198
|
{
|
|
196
199
|
"name": "associated_token_program",
|
|
197
200
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
@@ -464,7 +467,7 @@
|
|
|
464
467
|
{
|
|
465
468
|
"name": "fee_collector",
|
|
466
469
|
"optional": true,
|
|
467
|
-
"address": "
|
|
470
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
468
471
|
},
|
|
469
472
|
{
|
|
470
473
|
"name": "fee_collector_storage",
|
|
@@ -685,7 +688,7 @@
|
|
|
685
688
|
{
|
|
686
689
|
"name": "fee_collector",
|
|
687
690
|
"optional": true,
|
|
688
|
-
"address": "
|
|
691
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
689
692
|
},
|
|
690
693
|
{
|
|
691
694
|
"name": "fee_collector_storage",
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@ import { SolanaContractClientBase, SolanaContractInfo } from './SolanaContractCl
|
|
|
3
3
|
import IDL from './fungible_token_distributor_solana.json';
|
|
4
4
|
import * as anchor from '@coral-xyz/anchor';
|
|
5
5
|
import { FungibleTokenDistributorSolana } from './fungible_token_distributor_solana';
|
|
6
|
-
import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
|
|
6
|
+
import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
|
|
7
7
|
import { FeeCollectorClient } from './FeeCollectorClient';
|
|
8
8
|
import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
|
|
9
9
|
|
|
@@ -223,12 +223,15 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
|
|
|
223
223
|
fee: feePDA,
|
|
224
224
|
authorityFeeAta: null,
|
|
225
225
|
tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
|
|
226
|
+
feeTokenProgram: TOKEN_PROGRAM_ID,
|
|
226
227
|
feeTokenMint: null
|
|
227
228
|
})
|
|
228
229
|
.transaction()
|
|
229
230
|
);
|
|
230
231
|
|
|
231
|
-
const hash = await this.program.provider.sendAndConfirm?.(tx
|
|
232
|
+
const hash = await this.program.provider.sendAndConfirm?.(tx, [], {
|
|
233
|
+
commitment: 'finalized'
|
|
234
|
+
});
|
|
232
235
|
|
|
233
236
|
lastHash = hash!;
|
|
234
237
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fee_collector",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -436,16 +436,16 @@
|
|
|
436
436
|
"args": []
|
|
437
437
|
},
|
|
438
438
|
{
|
|
439
|
-
"name": "
|
|
439
|
+
"name": "receive_ownership",
|
|
440
440
|
"discriminator": [
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
441
|
+
156,
|
|
442
|
+
163,
|
|
443
|
+
211,
|
|
444
|
+
191,
|
|
445
|
+
160,
|
|
446
|
+
158,
|
|
447
|
+
61,
|
|
448
|
+
55
|
|
449
449
|
],
|
|
450
450
|
"accounts": [
|
|
451
451
|
{
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fee_collector.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FeeCollector = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8",
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "feeCollector",
|
|
11
11
|
"version": "0.1.0",
|
|
@@ -442,16 +442,16 @@ export type FeeCollector = {
|
|
|
442
442
|
"args": []
|
|
443
443
|
},
|
|
444
444
|
{
|
|
445
|
-
"name": "
|
|
445
|
+
"name": "receiveOwnership",
|
|
446
446
|
"discriminator": [
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
447
|
+
156,
|
|
448
|
+
163,
|
|
449
|
+
211,
|
|
450
|
+
191,
|
|
451
|
+
160,
|
|
452
|
+
158,
|
|
453
|
+
61,
|
|
454
|
+
55
|
|
455
455
|
],
|
|
456
456
|
"accounts": [
|
|
457
457
|
{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"address": "
|
|
2
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA",
|
|
3
3
|
"metadata": {
|
|
4
4
|
"name": "fungible_token_distributor_solana",
|
|
5
5
|
"version": "0.1.0",
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
{
|
|
175
175
|
"name": "fee_collector",
|
|
176
176
|
"optional": true,
|
|
177
|
-
"address": "
|
|
177
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"name": "fee_token_mint",
|
|
@@ -192,6 +192,9 @@
|
|
|
192
192
|
{
|
|
193
193
|
"name": "token_program"
|
|
194
194
|
},
|
|
195
|
+
{
|
|
196
|
+
"name": "fee_token_program"
|
|
197
|
+
},
|
|
195
198
|
{
|
|
196
199
|
"name": "associated_token_program",
|
|
197
200
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
@@ -464,7 +467,7 @@
|
|
|
464
467
|
{
|
|
465
468
|
"name": "fee_collector",
|
|
466
469
|
"optional": true,
|
|
467
|
-
"address": "
|
|
470
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
468
471
|
},
|
|
469
472
|
{
|
|
470
473
|
"name": "fee_collector_storage",
|
|
@@ -685,7 +688,7 @@
|
|
|
685
688
|
{
|
|
686
689
|
"name": "fee_collector",
|
|
687
690
|
"optional": true,
|
|
688
|
-
"address": "
|
|
691
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
689
692
|
},
|
|
690
693
|
{
|
|
691
694
|
"name": "fee_collector_storage",
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* IDL can be found at `target/idl/fungible_token_distributor_solana.json`.
|
|
6
6
|
*/
|
|
7
7
|
export type FungibleTokenDistributorSolana = {
|
|
8
|
-
"address": "
|
|
8
|
+
"address": "2fLgxHG1eCxQmfUMn8LYffxE7EQKWzeJhDpcAsyb1VKA",
|
|
9
9
|
"metadata": {
|
|
10
10
|
"name": "fungibleTokenDistributorSolana",
|
|
11
11
|
"version": "0.1.0",
|
|
@@ -180,7 +180,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
180
180
|
{
|
|
181
181
|
"name": "feeCollector",
|
|
182
182
|
"optional": true,
|
|
183
|
-
"address": "
|
|
183
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"name": "feeTokenMint",
|
|
@@ -198,6 +198,9 @@ export type FungibleTokenDistributorSolana = {
|
|
|
198
198
|
{
|
|
199
199
|
"name": "tokenProgram"
|
|
200
200
|
},
|
|
201
|
+
{
|
|
202
|
+
"name": "feeTokenProgram"
|
|
203
|
+
},
|
|
201
204
|
{
|
|
202
205
|
"name": "associatedTokenProgram",
|
|
203
206
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
@@ -470,7 +473,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
470
473
|
{
|
|
471
474
|
"name": "feeCollector",
|
|
472
475
|
"optional": true,
|
|
473
|
-
"address": "
|
|
476
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
474
477
|
},
|
|
475
478
|
{
|
|
476
479
|
"name": "feeCollectorStorage",
|
|
@@ -691,7 +694,7 @@ export type FungibleTokenDistributorSolana = {
|
|
|
691
694
|
{
|
|
692
695
|
"name": "feeCollector",
|
|
693
696
|
"optional": true,
|
|
694
|
-
"address": "
|
|
697
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
695
698
|
},
|
|
696
699
|
{
|
|
697
700
|
"name": "feeCollectorStorage",
|