@sign-global/tokentable 0.4.1-beta.6 → 0.4.1-beta.8
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.d.ts +1 -1
- package/dist/cjs/airdrop/contracts/solana/AirdropSignatureClient.js +11 -6
- package/dist/cjs/airdrop/contracts/solana/AirdropSignatureClient.js.map +1 -1
- package/dist/cjs/airdrop/contracts/solana/SignatureAirdropService.d.ts +1 -5
- 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 +20 -71
- package/dist/cjs/airdrop/contracts/solana/fee_collector.json +20 -71
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +64 -77
- package/dist/cjs/airdrop/contracts/solana/fungible_token_distributor_solana.json +65 -78
- package/dist/cjs/utils/web3.d.ts +15 -1
- package/dist/cjs/utils/web3.js +43 -0
- package/dist/cjs/utils/web3.js.map +1 -1
- package/dist/esm/airdrop/contracts/solana/AirdropSignatureClient.d.ts +1 -1
- package/dist/esm/airdrop/contracts/solana/AirdropSignatureClient.js +12 -7
- package/dist/esm/airdrop/contracts/solana/AirdropSignatureClient.js.map +1 -1
- package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.d.ts +1 -5
- 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 +20 -71
- package/dist/esm/airdrop/contracts/solana/fee_collector.json +20 -71
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts +64 -77
- package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json +65 -78
- package/dist/esm/utils/web3.d.ts +15 -1
- package/dist/esm/utils/web3.js +43 -2
- package/dist/esm/utils/web3.js.map +1 -1
- package/package.json +1 -1
- package/src/airdrop/contracts/solana/AirdropSignatureClient.ts +14 -8
- 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 +20 -71
- package/src/airdrop/contracts/solana/fee_collector.ts +20 -71
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.json +65 -78
- package/src/airdrop/contracts/solana/fungible_token_distributor_solana.ts +65 -78
- package/src/utils/web3.ts +62 -2
|
@@ -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",
|
|
@@ -541,6 +508,50 @@
|
|
|
541
508
|
}
|
|
542
509
|
]
|
|
543
510
|
},
|
|
511
|
+
{
|
|
512
|
+
"name": "receive_program_admin",
|
|
513
|
+
"discriminator": [
|
|
514
|
+
238,
|
|
515
|
+
172,
|
|
516
|
+
61,
|
|
517
|
+
197,
|
|
518
|
+
23,
|
|
519
|
+
72,
|
|
520
|
+
249,
|
|
521
|
+
87
|
|
522
|
+
],
|
|
523
|
+
"accounts": [
|
|
524
|
+
{
|
|
525
|
+
"name": "config",
|
|
526
|
+
"writable": true,
|
|
527
|
+
"pda": {
|
|
528
|
+
"seeds": [
|
|
529
|
+
{
|
|
530
|
+
"kind": "const",
|
|
531
|
+
"value": [
|
|
532
|
+
99,
|
|
533
|
+
111,
|
|
534
|
+
110,
|
|
535
|
+
102,
|
|
536
|
+
105,
|
|
537
|
+
103
|
|
538
|
+
]
|
|
539
|
+
}
|
|
540
|
+
]
|
|
541
|
+
}
|
|
542
|
+
},
|
|
543
|
+
{
|
|
544
|
+
"name": "authority",
|
|
545
|
+
"writable": true,
|
|
546
|
+
"signer": true
|
|
547
|
+
},
|
|
548
|
+
{
|
|
549
|
+
"name": "system_program",
|
|
550
|
+
"address": "11111111111111111111111111111111"
|
|
551
|
+
}
|
|
552
|
+
],
|
|
553
|
+
"args": []
|
|
554
|
+
},
|
|
544
555
|
{
|
|
545
556
|
"name": "set_base_params",
|
|
546
557
|
"discriminator": [
|
|
@@ -877,11 +888,6 @@
|
|
|
877
888
|
"writable": true,
|
|
878
889
|
"signer": true
|
|
879
890
|
},
|
|
880
|
-
{
|
|
881
|
-
"name": "new_owner",
|
|
882
|
-
"writable": true,
|
|
883
|
-
"signer": true
|
|
884
|
-
},
|
|
885
891
|
{
|
|
886
892
|
"name": "system_program",
|
|
887
893
|
"address": "11111111111111111111111111111111"
|
|
@@ -938,7 +944,8 @@
|
|
|
938
944
|
{
|
|
939
945
|
"name": "new_admin",
|
|
940
946
|
"writable": true,
|
|
941
|
-
"signer": true
|
|
947
|
+
"signer": true,
|
|
948
|
+
"optional": true
|
|
942
949
|
},
|
|
943
950
|
{
|
|
944
951
|
"name": "system_program",
|
|
@@ -1123,41 +1130,8 @@
|
|
|
1123
1130
|
"path": "authority"
|
|
1124
1131
|
},
|
|
1125
1132
|
{
|
|
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
|
-
]
|
|
1133
|
+
"kind": "account",
|
|
1134
|
+
"path": "token_program"
|
|
1161
1135
|
},
|
|
1162
1136
|
{
|
|
1163
1137
|
"kind": "account",
|
|
@@ -1395,16 +1369,21 @@
|
|
|
1395
1369
|
},
|
|
1396
1370
|
{
|
|
1397
1371
|
"code": 6009,
|
|
1372
|
+
"name": "NotPermissioned",
|
|
1373
|
+
"msg": "NotPermissioned"
|
|
1374
|
+
},
|
|
1375
|
+
{
|
|
1376
|
+
"code": 6010,
|
|
1398
1377
|
"name": "OwnableUnauthorizedAccount",
|
|
1399
1378
|
"msg": "OwnableUnauthorizedAccount"
|
|
1400
1379
|
},
|
|
1401
1380
|
{
|
|
1402
|
-
"code":
|
|
1381
|
+
"code": 6011,
|
|
1403
1382
|
"name": "InvalidFeeCollector",
|
|
1404
1383
|
"msg": "InvalidFeeCollector"
|
|
1405
1384
|
},
|
|
1406
1385
|
{
|
|
1407
|
-
"code":
|
|
1386
|
+
"code": 6012,
|
|
1408
1387
|
"name": "Paused",
|
|
1409
1388
|
"msg": "Paused"
|
|
1410
1389
|
}
|
|
@@ -1511,6 +1490,10 @@
|
|
|
1511
1490
|
{
|
|
1512
1491
|
"name": "admin",
|
|
1513
1492
|
"type": "pubkey"
|
|
1493
|
+
},
|
|
1494
|
+
{
|
|
1495
|
+
"name": "new_admin",
|
|
1496
|
+
"type": "pubkey"
|
|
1514
1497
|
}
|
|
1515
1498
|
]
|
|
1516
1499
|
}
|
|
@@ -1531,6 +1514,10 @@
|
|
|
1531
1514
|
"name": "owner",
|
|
1532
1515
|
"type": "pubkey"
|
|
1533
1516
|
},
|
|
1517
|
+
{
|
|
1518
|
+
"name": "new_owner",
|
|
1519
|
+
"type": "pubkey"
|
|
1520
|
+
},
|
|
1534
1521
|
{
|
|
1535
1522
|
"name": "default_fees_bips",
|
|
1536
1523
|
"type": "u64"
|
package/dist/cjs/utils/web3.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Commitment, Connection, PublicKey, Transaction } from '@solana/web3.js';
|
|
1
|
+
import { Cluster, Commitment, Connection, PublicKey, Transaction } from '@solana/web3.js';
|
|
2
2
|
export declare function flipAddressType(address: string): string;
|
|
3
3
|
export declare function hexStrToU8Array(hexStr: string): number[];
|
|
4
4
|
export declare function getOrCreateAssociatedTokenAccount({ connection, payer, mint, owner, signTransaction, allowOwnerOffCurve, commitment, programId, associatedTokenProgramId }: {
|
|
@@ -12,3 +12,17 @@ export declare function getOrCreateAssociatedTokenAccount({ connection, payer, m
|
|
|
12
12
|
associatedTokenProgramId?: PublicKey;
|
|
13
13
|
signTransaction: (signature: Transaction) => Promise<Transaction>;
|
|
14
14
|
}): Promise<import("@solana/spl-token").Account>;
|
|
15
|
+
export declare enum SplTokenVersion {
|
|
16
|
+
SplToken = "spl-token",
|
|
17
|
+
SplToken2022 = "spl-token-2022"
|
|
18
|
+
}
|
|
19
|
+
export type FetchTokenVersionOptions = {
|
|
20
|
+
clusterOrEndpoint?: Cluster | string;
|
|
21
|
+
};
|
|
22
|
+
export type FetchTokenMetadataOptions = FetchTokenVersionOptions & {
|
|
23
|
+
fetchOffchainMetadata?: boolean;
|
|
24
|
+
};
|
|
25
|
+
export declare function fetchTokenVersion(tokenAddress: string, options: FetchTokenMetadataOptions): Promise<{
|
|
26
|
+
name: SplTokenVersion;
|
|
27
|
+
programId: PublicKey;
|
|
28
|
+
} | null>;
|
package/dist/cjs/utils/web3.js
CHANGED
|
@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SplTokenVersion = void 0;
|
|
6
7
|
exports.flipAddressType = flipAddressType;
|
|
7
8
|
exports.hexStrToU8Array = hexStrToU8Array;
|
|
8
9
|
exports.getOrCreateAssociatedTokenAccount = getOrCreateAssociatedTokenAccount;
|
|
10
|
+
exports.fetchTokenVersion = fetchTokenVersion;
|
|
9
11
|
const tonweb_1 = __importDefault(require("tonweb"));
|
|
10
12
|
const spl_token_1 = require("@solana/spl-token");
|
|
11
13
|
const web3_js_1 = require("@solana/web3.js");
|
|
@@ -71,4 +73,45 @@ async function getOrCreateAssociatedTokenAccount({ connection, payer, mint, owne
|
|
|
71
73
|
throw new spl_token_1.TokenInvalidOwnerError();
|
|
72
74
|
return account;
|
|
73
75
|
}
|
|
76
|
+
var SplTokenVersion;
|
|
77
|
+
(function (SplTokenVersion) {
|
|
78
|
+
SplTokenVersion["SplToken"] = "spl-token";
|
|
79
|
+
SplTokenVersion["SplToken2022"] = "spl-token-2022";
|
|
80
|
+
})(SplTokenVersion || (exports.SplTokenVersion = SplTokenVersion = {}));
|
|
81
|
+
async function _getTokenProgramAndParsedAccountData(conn, tokenAddress) {
|
|
82
|
+
const tokenMintAddress = new web3_js_1.PublicKey(tokenAddress);
|
|
83
|
+
const parsedMintAccountInfo = await conn.getParsedAccountInfo(tokenMintAddress);
|
|
84
|
+
const parsedMintAccountData = parsedMintAccountInfo.value?.data;
|
|
85
|
+
if (parsedMintAccountData?.program === SplTokenVersion.SplToken) {
|
|
86
|
+
return {
|
|
87
|
+
name: SplTokenVersion.SplToken,
|
|
88
|
+
programId: spl_token_1.TOKEN_PROGRAM_ID,
|
|
89
|
+
parsedMintAccountData
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
else if (parsedMintAccountData?.program === SplTokenVersion.SplToken2022) {
|
|
93
|
+
return {
|
|
94
|
+
name: SplTokenVersion.SplToken2022,
|
|
95
|
+
programId: spl_token_1.TOKEN_2022_PROGRAM_ID,
|
|
96
|
+
parsedMintAccountData
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
function _getConnection(clusterOrEndpoint) {
|
|
102
|
+
let endpoint;
|
|
103
|
+
try {
|
|
104
|
+
endpoint = (0, web3_js_1.clusterApiUrl)(clusterOrEndpoint ?? 'mainnet-beta');
|
|
105
|
+
}
|
|
106
|
+
catch {
|
|
107
|
+
endpoint = clusterOrEndpoint;
|
|
108
|
+
}
|
|
109
|
+
const conn = new web3_js_1.Connection(endpoint);
|
|
110
|
+
return conn;
|
|
111
|
+
}
|
|
112
|
+
async function fetchTokenVersion(tokenAddress, options) {
|
|
113
|
+
const conn = _getConnection(options.clusterOrEndpoint);
|
|
114
|
+
const data = await _getTokenProgramAndParsedAccountData(conn, tokenAddress);
|
|
115
|
+
return data ? { name: data.name, programId: data.programId } : null;
|
|
116
|
+
}
|
|
74
117
|
//# sourceMappingURL=web3.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/utils/web3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/utils/web3.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import IDL from './fungible_token_distributor_solana.json';
|
|
|
4
4
|
import * as anchor from '@coral-xyz/anchor';
|
|
5
5
|
import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
|
|
6
6
|
import { FeeCollectorClient } from './FeeCollectorClient';
|
|
7
|
-
import { getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
|
|
7
|
+
import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
|
|
8
8
|
export class AirdropSignatureClient extends SolanaContractClientBase {
|
|
9
9
|
projectId;
|
|
10
10
|
constructor(options) {
|
|
@@ -132,17 +132,21 @@ export class AirdropSignatureClient extends SolanaContractClientBase {
|
|
|
132
132
|
const feeCollectorStoragePDA = await this.FeeCollector.getStoragePDA();
|
|
133
133
|
const feePDA = await this.FeeCollector.getProjectFeePDA();
|
|
134
134
|
const airdropPDA = await this.getAirdropPDA();
|
|
135
|
-
const
|
|
135
|
+
const tokenVersion = await fetchTokenVersion(config.token, {
|
|
136
|
+
clusterOrEndpoint: this.chainId
|
|
137
|
+
});
|
|
136
138
|
const authorityATA = await getOrCreateAssociatedTokenAccount({
|
|
137
139
|
connection: this.connection,
|
|
138
140
|
payer: this.wallet.publicKey,
|
|
139
141
|
mint: new PublicKey(config.token),
|
|
140
142
|
owner: new PublicKey(this.wallet.publicKey),
|
|
141
143
|
signTransaction: this.wallet.signTransaction,
|
|
142
|
-
programId: TOKEN_2022_PROGRAM_ID
|
|
144
|
+
programId: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID
|
|
143
145
|
});
|
|
144
|
-
|
|
146
|
+
let lastHash = '';
|
|
147
|
+
// solana max transaction size of 1232
|
|
145
148
|
for (const claim of data) {
|
|
149
|
+
const tx = new anchor.web3.Transaction();
|
|
146
150
|
tx.add(anchor.web3.Ed25519Program.createInstructionWithPublicKey({
|
|
147
151
|
publicKey: new PublicKey(config.signer).toBytes(),
|
|
148
152
|
message: Uint8Array.from(hexStrToU8Array(claim.hash)),
|
|
@@ -159,19 +163,20 @@ export class AirdropSignatureClient extends SolanaContractClientBase {
|
|
|
159
163
|
authority: this.wallet.publicKey,
|
|
160
164
|
airdrop: airdropPDA,
|
|
161
165
|
claim: claimPDA,
|
|
162
|
-
// vault: vaultPDA,
|
|
163
166
|
authorityAta: authorityATA.address,
|
|
164
167
|
tokenMint: new PublicKey(config.token),
|
|
165
168
|
feeCollectorStorage: feeCollectorStoragePDA,
|
|
166
169
|
feeCollectorVault: null,
|
|
167
170
|
fee: feePDA,
|
|
168
171
|
authorityFeeAta: null,
|
|
169
|
-
tokenProgram: TOKEN_2022_PROGRAM_ID,
|
|
172
|
+
tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
|
|
170
173
|
feeTokenMint: null
|
|
171
174
|
})
|
|
172
175
|
.transaction());
|
|
176
|
+
const hash = await this.program.provider.sendAndConfirm?.(tx);
|
|
177
|
+
lastHash = hash;
|
|
173
178
|
}
|
|
174
|
-
return
|
|
179
|
+
return lastHash;
|
|
175
180
|
}
|
|
176
181
|
}
|
|
177
182
|
//# sourceMappingURL=AirdropSignatureClient.js.map
|
|
@@ -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;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iCAAiC,EAAE,eAAe,EAAE,MAAM,gBAAgB,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>;
|
|
@@ -20,5 +16,5 @@ export declare class SignatureAirdropService {
|
|
|
20
16
|
unlockingAt: number;
|
|
21
17
|
value: string;
|
|
22
18
|
hash: string;
|
|
23
|
-
}[], recipient?: string): Promise<string
|
|
19
|
+
}[], recipient?: string): Promise<string>;
|
|
24
20
|
}
|
|
@@ -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"}
|
|
@@ -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";
|
|
@@ -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";
|