@sign-global/tokentable 0.4.1-beta.7 → 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/SignatureAirdropService.d.ts +0 -4
- package/dist/cjs/airdrop/contracts/solana/SignatureAirdropService.js +0 -16
- package/dist/cjs/airdrop/contracts/solana/SignatureAirdropService.js.map +1 -1
- package/dist/cjs/airdrop/contracts/solana/SolanaContractClient.js +1 -1
- package/dist/cjs/airdrop/contracts/solana/fee_collector.d.ts +30 -81
- package/dist/cjs/airdrop/contracts/solana/fee_collector.json +30 -81
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +71 -81
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.json +72 -82
- 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/SignatureAirdropService.d.ts +0 -4
- package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.js +0 -16
- package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.js.map +1 -1
- package/dist/esm/airdrop/contracts/solana/SolanaContractClient.js +1 -1
- package/dist/esm/airdrop/contracts/solana/fee_collector.d.ts +30 -81
- package/dist/esm/airdrop/contracts/solana/fee_collector.json +30 -81
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +71 -81
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json +72 -82
- package/package.json +1 -1
- package/src/airdrop/contracts/solana/AirdropSignatureClient.ts +5 -2
- package/src/airdrop/contracts/solana/SignatureAirdropService.ts +0 -20
- package/src/airdrop/contracts/solana/SolanaContractClient.ts +1 -1
- package/src/airdrop/contracts/solana/fee_collector.json +30 -81
- package/src/airdrop/contracts/solana/fee_collector.ts +30 -81
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.json +72 -82
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.ts +72 -82
|
@@ -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",
|
|
@@ -80,41 +80,8 @@
|
|
|
80
80
|
"path": "authority"
|
|
81
81
|
},
|
|
82
82
|
{
|
|
83
|
-
"kind": "
|
|
84
|
-
"
|
|
85
|
-
6,
|
|
86
|
-
221,
|
|
87
|
-
246,
|
|
88
|
-
225,
|
|
89
|
-
215,
|
|
90
|
-
101,
|
|
91
|
-
161,
|
|
92
|
-
147,
|
|
93
|
-
217,
|
|
94
|
-
203,
|
|
95
|
-
225,
|
|
96
|
-
70,
|
|
97
|
-
206,
|
|
98
|
-
235,
|
|
99
|
-
121,
|
|
100
|
-
172,
|
|
101
|
-
28,
|
|
102
|
-
180,
|
|
103
|
-
133,
|
|
104
|
-
237,
|
|
105
|
-
95,
|
|
106
|
-
91,
|
|
107
|
-
55,
|
|
108
|
-
145,
|
|
109
|
-
58,
|
|
110
|
-
140,
|
|
111
|
-
245,
|
|
112
|
-
133,
|
|
113
|
-
126,
|
|
114
|
-
255,
|
|
115
|
-
0,
|
|
116
|
-
169
|
|
117
|
-
]
|
|
83
|
+
"kind": "account",
|
|
84
|
+
"path": "token_program"
|
|
118
85
|
},
|
|
119
86
|
{
|
|
120
87
|
"kind": "account",
|
|
@@ -207,7 +174,7 @@
|
|
|
207
174
|
{
|
|
208
175
|
"name": "fee_collector",
|
|
209
176
|
"optional": true,
|
|
210
|
-
"address": "
|
|
177
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
211
178
|
},
|
|
212
179
|
{
|
|
213
180
|
"name": "fee_token_mint",
|
|
@@ -225,6 +192,9 @@
|
|
|
225
192
|
{
|
|
226
193
|
"name": "token_program"
|
|
227
194
|
},
|
|
195
|
+
{
|
|
196
|
+
"name": "fee_token_program"
|
|
197
|
+
},
|
|
228
198
|
{
|
|
229
199
|
"name": "associated_token_program",
|
|
230
200
|
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
@@ -497,7 +467,7 @@
|
|
|
497
467
|
{
|
|
498
468
|
"name": "fee_collector",
|
|
499
469
|
"optional": true,
|
|
500
|
-
"address": "
|
|
470
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
501
471
|
},
|
|
502
472
|
{
|
|
503
473
|
"name": "fee_collector_storage",
|
|
@@ -541,6 +511,50 @@
|
|
|
541
511
|
}
|
|
542
512
|
]
|
|
543
513
|
},
|
|
514
|
+
{
|
|
515
|
+
"name": "receive_program_admin",
|
|
516
|
+
"discriminator": [
|
|
517
|
+
238,
|
|
518
|
+
172,
|
|
519
|
+
61,
|
|
520
|
+
197,
|
|
521
|
+
23,
|
|
522
|
+
72,
|
|
523
|
+
249,
|
|
524
|
+
87
|
|
525
|
+
],
|
|
526
|
+
"accounts": [
|
|
527
|
+
{
|
|
528
|
+
"name": "config",
|
|
529
|
+
"writable": true,
|
|
530
|
+
"pda": {
|
|
531
|
+
"seeds": [
|
|
532
|
+
{
|
|
533
|
+
"kind": "const",
|
|
534
|
+
"value": [
|
|
535
|
+
99,
|
|
536
|
+
111,
|
|
537
|
+
110,
|
|
538
|
+
102,
|
|
539
|
+
105,
|
|
540
|
+
103
|
|
541
|
+
]
|
|
542
|
+
}
|
|
543
|
+
]
|
|
544
|
+
}
|
|
545
|
+
},
|
|
546
|
+
{
|
|
547
|
+
"name": "authority",
|
|
548
|
+
"writable": true,
|
|
549
|
+
"signer": true
|
|
550
|
+
},
|
|
551
|
+
{
|
|
552
|
+
"name": "system_program",
|
|
553
|
+
"address": "11111111111111111111111111111111"
|
|
554
|
+
}
|
|
555
|
+
],
|
|
556
|
+
"args": []
|
|
557
|
+
},
|
|
544
558
|
{
|
|
545
559
|
"name": "set_base_params",
|
|
546
560
|
"discriminator": [
|
|
@@ -674,7 +688,7 @@
|
|
|
674
688
|
{
|
|
675
689
|
"name": "fee_collector",
|
|
676
690
|
"optional": true,
|
|
677
|
-
"address": "
|
|
691
|
+
"address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8"
|
|
678
692
|
},
|
|
679
693
|
{
|
|
680
694
|
"name": "fee_collector_storage",
|
|
@@ -877,11 +891,6 @@
|
|
|
877
891
|
"writable": true,
|
|
878
892
|
"signer": true
|
|
879
893
|
},
|
|
880
|
-
{
|
|
881
|
-
"name": "new_owner",
|
|
882
|
-
"writable": true,
|
|
883
|
-
"signer": true
|
|
884
|
-
},
|
|
885
894
|
{
|
|
886
895
|
"name": "system_program",
|
|
887
896
|
"address": "11111111111111111111111111111111"
|
|
@@ -938,7 +947,8 @@
|
|
|
938
947
|
{
|
|
939
948
|
"name": "new_admin",
|
|
940
949
|
"writable": true,
|
|
941
|
-
"signer": true
|
|
950
|
+
"signer": true,
|
|
951
|
+
"optional": true
|
|
942
952
|
},
|
|
943
953
|
{
|
|
944
954
|
"name": "system_program",
|
|
@@ -1123,41 +1133,8 @@
|
|
|
1123
1133
|
"path": "authority"
|
|
1124
1134
|
},
|
|
1125
1135
|
{
|
|
1126
|
-
"kind": "
|
|
1127
|
-
"
|
|
1128
|
-
6,
|
|
1129
|
-
221,
|
|
1130
|
-
246,
|
|
1131
|
-
225,
|
|
1132
|
-
215,
|
|
1133
|
-
101,
|
|
1134
|
-
161,
|
|
1135
|
-
147,
|
|
1136
|
-
217,
|
|
1137
|
-
203,
|
|
1138
|
-
225,
|
|
1139
|
-
70,
|
|
1140
|
-
206,
|
|
1141
|
-
235,
|
|
1142
|
-
121,
|
|
1143
|
-
172,
|
|
1144
|
-
28,
|
|
1145
|
-
180,
|
|
1146
|
-
133,
|
|
1147
|
-
237,
|
|
1148
|
-
95,
|
|
1149
|
-
91,
|
|
1150
|
-
55,
|
|
1151
|
-
145,
|
|
1152
|
-
58,
|
|
1153
|
-
140,
|
|
1154
|
-
245,
|
|
1155
|
-
133,
|
|
1156
|
-
126,
|
|
1157
|
-
255,
|
|
1158
|
-
0,
|
|
1159
|
-
169
|
|
1160
|
-
]
|
|
1136
|
+
"kind": "account",
|
|
1137
|
+
"path": "token_program"
|
|
1161
1138
|
},
|
|
1162
1139
|
{
|
|
1163
1140
|
"kind": "account",
|
|
@@ -1395,16 +1372,21 @@
|
|
|
1395
1372
|
},
|
|
1396
1373
|
{
|
|
1397
1374
|
"code": 6009,
|
|
1375
|
+
"name": "NotPermissioned",
|
|
1376
|
+
"msg": "NotPermissioned"
|
|
1377
|
+
},
|
|
1378
|
+
{
|
|
1379
|
+
"code": 6010,
|
|
1398
1380
|
"name": "OwnableUnauthorizedAccount",
|
|
1399
1381
|
"msg": "OwnableUnauthorizedAccount"
|
|
1400
1382
|
},
|
|
1401
1383
|
{
|
|
1402
|
-
"code":
|
|
1384
|
+
"code": 6011,
|
|
1403
1385
|
"name": "InvalidFeeCollector",
|
|
1404
1386
|
"msg": "InvalidFeeCollector"
|
|
1405
1387
|
},
|
|
1406
1388
|
{
|
|
1407
|
-
"code":
|
|
1389
|
+
"code": 6012,
|
|
1408
1390
|
"name": "Paused",
|
|
1409
1391
|
"msg": "Paused"
|
|
1410
1392
|
}
|
|
@@ -1511,6 +1493,10 @@
|
|
|
1511
1493
|
{
|
|
1512
1494
|
"name": "admin",
|
|
1513
1495
|
"type": "pubkey"
|
|
1496
|
+
},
|
|
1497
|
+
{
|
|
1498
|
+
"name": "new_admin",
|
|
1499
|
+
"type": "pubkey"
|
|
1514
1500
|
}
|
|
1515
1501
|
]
|
|
1516
1502
|
}
|
|
@@ -1531,6 +1517,10 @@
|
|
|
1531
1517
|
"name": "owner",
|
|
1532
1518
|
"type": "pubkey"
|
|
1533
1519
|
},
|
|
1520
|
+
{
|
|
1521
|
+
"name": "new_owner",
|
|
1522
|
+
"type": "pubkey"
|
|
1523
|
+
},
|
|
1534
1524
|
{
|
|
1535
1525
|
"name": "default_fees_bips",
|
|
1536
1526
|
"type": "u64"
|
|
@@ -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":"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"}
|
|
@@ -4,10 +4,6 @@ export declare class SignatureAirdropService {
|
|
|
4
4
|
constructor(options: SolanaContractInfo);
|
|
5
5
|
private get airdropClient();
|
|
6
6
|
getVersion(): Promise<string>;
|
|
7
|
-
feeCollectors: (address: string) => Promise<string>;
|
|
8
|
-
feeTokens: (address: string) => Promise<string>;
|
|
9
|
-
getFeelessThreshold(): Promise<void>;
|
|
10
|
-
getDeployer(): Promise<string>;
|
|
11
7
|
getClaimFee(address: string, amount: bigint): Promise<bigint>;
|
|
12
8
|
batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]>;
|
|
13
9
|
getPaused(): Promise<boolean>;
|
|
@@ -13,22 +13,6 @@ export class SignatureAirdropService {
|
|
|
13
13
|
async getVersion() {
|
|
14
14
|
return this.airdropClient.getVersion();
|
|
15
15
|
}
|
|
16
|
-
feeCollectors = async (address) => {
|
|
17
|
-
// const deployerClient = await this.getDeployerClient();
|
|
18
|
-
// return await deployerClient.feeCollectors(address);
|
|
19
|
-
return '';
|
|
20
|
-
};
|
|
21
|
-
feeTokens = async (address) => {
|
|
22
|
-
// const deployerClient = await this.getDeployerClient();
|
|
23
|
-
// return await deployerClient.feeTokens(address);
|
|
24
|
-
return '';
|
|
25
|
-
};
|
|
26
|
-
async getFeelessThreshold() {
|
|
27
|
-
// return this.airdropClient.getFeelessThreshold();
|
|
28
|
-
}
|
|
29
|
-
async getDeployer() {
|
|
30
|
-
return '';
|
|
31
|
-
}
|
|
32
16
|
async getClaimFee(address, amount) {
|
|
33
17
|
const fee = await this.airdropClient.getClaimFee(amount);
|
|
34
18
|
return fee;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignatureAirdropService.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/SignatureAirdropService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAqB;IAC5B,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"SignatureAirdropService.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/SignatureAirdropService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAqB;IAC5B,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACrE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IASG,EACH,SAAkB;QAElB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,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";
|
|
@@ -104,41 +104,8 @@ export type FeeCollector = {
|
|
|
104
104
|
"path": "authority";
|
|
105
105
|
},
|
|
106
106
|
{
|
|
107
|
-
"kind": "
|
|
108
|
-
"
|
|
109
|
-
6,
|
|
110
|
-
221,
|
|
111
|
-
246,
|
|
112
|
-
225,
|
|
113
|
-
215,
|
|
114
|
-
101,
|
|
115
|
-
161,
|
|
116
|
-
147,
|
|
117
|
-
217,
|
|
118
|
-
203,
|
|
119
|
-
225,
|
|
120
|
-
70,
|
|
121
|
-
206,
|
|
122
|
-
235,
|
|
123
|
-
121,
|
|
124
|
-
172,
|
|
125
|
-
28,
|
|
126
|
-
180,
|
|
127
|
-
133,
|
|
128
|
-
237,
|
|
129
|
-
95,
|
|
130
|
-
91,
|
|
131
|
-
55,
|
|
132
|
-
145,
|
|
133
|
-
58,
|
|
134
|
-
140,
|
|
135
|
-
245,
|
|
136
|
-
133,
|
|
137
|
-
126,
|
|
138
|
-
255,
|
|
139
|
-
0,
|
|
140
|
-
169
|
|
141
|
-
];
|
|
107
|
+
"kind": "account";
|
|
108
|
+
"path": "tokenProgram";
|
|
142
109
|
},
|
|
143
110
|
{
|
|
144
111
|
"kind": "arg";
|
|
@@ -475,16 +442,16 @@ export type FeeCollector = {
|
|
|
475
442
|
"args": [];
|
|
476
443
|
},
|
|
477
444
|
{
|
|
478
|
-
"name": "
|
|
445
|
+
"name": "receiveOwnership";
|
|
479
446
|
"discriminator": [
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
447
|
+
156,
|
|
448
|
+
163,
|
|
449
|
+
211,
|
|
450
|
+
191,
|
|
451
|
+
160,
|
|
452
|
+
158,
|
|
453
|
+
61,
|
|
454
|
+
55
|
|
488
455
|
];
|
|
489
456
|
"accounts": [
|
|
490
457
|
{
|
|
@@ -755,6 +722,12 @@ export type FeeCollector = {
|
|
|
755
722
|
"writable": true;
|
|
756
723
|
"signer": true;
|
|
757
724
|
},
|
|
725
|
+
{
|
|
726
|
+
"name": "newOwner";
|
|
727
|
+
"writable": true;
|
|
728
|
+
"signer": true;
|
|
729
|
+
"optional": true;
|
|
730
|
+
},
|
|
758
731
|
{
|
|
759
732
|
"name": "systemProgram";
|
|
760
733
|
"address": "11111111111111111111111111111111";
|
|
@@ -839,41 +812,8 @@ export type FeeCollector = {
|
|
|
839
812
|
"path": "authority";
|
|
840
813
|
},
|
|
841
814
|
{
|
|
842
|
-
"kind": "
|
|
843
|
-
"
|
|
844
|
-
6,
|
|
845
|
-
221,
|
|
846
|
-
246,
|
|
847
|
-
225,
|
|
848
|
-
215,
|
|
849
|
-
101,
|
|
850
|
-
161,
|
|
851
|
-
147,
|
|
852
|
-
217,
|
|
853
|
-
203,
|
|
854
|
-
225,
|
|
855
|
-
70,
|
|
856
|
-
206,
|
|
857
|
-
235,
|
|
858
|
-
121,
|
|
859
|
-
172,
|
|
860
|
-
28,
|
|
861
|
-
180,
|
|
862
|
-
133,
|
|
863
|
-
237,
|
|
864
|
-
95,
|
|
865
|
-
91,
|
|
866
|
-
55,
|
|
867
|
-
145,
|
|
868
|
-
58,
|
|
869
|
-
140,
|
|
870
|
-
245,
|
|
871
|
-
133,
|
|
872
|
-
126,
|
|
873
|
-
255,
|
|
874
|
-
0,
|
|
875
|
-
169
|
|
876
|
-
];
|
|
815
|
+
"kind": "account";
|
|
816
|
+
"path": "tokenProgram";
|
|
877
817
|
},
|
|
878
818
|
{
|
|
879
819
|
"kind": "account";
|
|
@@ -1025,11 +965,16 @@ export type FeeCollector = {
|
|
|
1025
965
|
},
|
|
1026
966
|
{
|
|
1027
967
|
"code": 6002;
|
|
968
|
+
"name": "notPermissioned";
|
|
969
|
+
"msg": "notPermissioned";
|
|
970
|
+
},
|
|
971
|
+
{
|
|
972
|
+
"code": 6003;
|
|
1028
973
|
"name": "feesTooHigh";
|
|
1029
974
|
"msg": "feesTooHigh";
|
|
1030
975
|
},
|
|
1031
976
|
{
|
|
1032
|
-
"code":
|
|
977
|
+
"code": 6004;
|
|
1033
978
|
"name": "invalidCallData";
|
|
1034
979
|
"msg": "invalidCallData";
|
|
1035
980
|
}
|
|
@@ -1108,6 +1053,10 @@ export type FeeCollector = {
|
|
|
1108
1053
|
"name": "owner";
|
|
1109
1054
|
"type": "pubkey";
|
|
1110
1055
|
},
|
|
1056
|
+
{
|
|
1057
|
+
"name": "newOwner";
|
|
1058
|
+
"type": "pubkey";
|
|
1059
|
+
},
|
|
1111
1060
|
{
|
|
1112
1061
|
"name": "defaultFeesBips";
|
|
1113
1062
|
"type": "u64";
|