@sign-global/tokentable 0.4.0-beta.15 → 0.4.0-beta.17
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/SignatureAirdropClient.js +23 -9
- package/dist/cjs/airdrop/SignatureAirdropClient.js.map +1 -1
- package/dist/cjs/wallets/providers/solana/index.d.ts +3 -1
- package/dist/cjs/wallets/providers/solana/index.js +3 -9
- package/dist/cjs/wallets/providers/solana/index.js.map +1 -1
- package/dist/esm/airdrop/SignatureAirdropClient.js +23 -9
- package/dist/esm/airdrop/SignatureAirdropClient.js.map +1 -1
- package/dist/esm/wallets/providers/solana/index.d.ts +3 -1
- package/dist/esm/wallets/providers/solana/index.js +3 -9
- package/dist/esm/wallets/providers/solana/index.js.map +1 -1
- package/package.json +1 -1
- package/src/airdrop/SignatureAirdropClient.ts +25 -10
- package/src/wallets/providers/solana/index.tsx +4 -9
|
@@ -74,7 +74,7 @@ class SignatureAirdropClient {
|
|
|
74
74
|
};
|
|
75
75
|
window.addEventListener('message', onWindowMessage);
|
|
76
76
|
const authorizeUrl = project.identities.find((item) => item.identityType === types_2.AirdropSigIdentityTypeEnum.Twitter)?.authorizeUrl;
|
|
77
|
-
window.open(authorizeUrl + '&state=state',
|
|
77
|
+
window.open(authorizeUrl + '&state=state', `twitter_auth_${project.id}`, 'width=600,height=800');
|
|
78
78
|
}
|
|
79
79
|
async connectWallet({ chainType, onSuccess, onError }) {
|
|
80
80
|
try {
|
|
@@ -97,7 +97,7 @@ class SignatureAirdropClient {
|
|
|
97
97
|
const payload = {
|
|
98
98
|
signature: signature,
|
|
99
99
|
message: message,
|
|
100
|
-
key:
|
|
100
|
+
key: wallet.publicKey || wallet.address,
|
|
101
101
|
projectId: project.id,
|
|
102
102
|
timestamp: timestamp,
|
|
103
103
|
recipientType: recipientTypeMap[chainType]
|
|
@@ -155,22 +155,36 @@ class SignatureAirdropClient {
|
|
|
155
155
|
if (!walletClient) {
|
|
156
156
|
throw new Error('Wallet client is required');
|
|
157
157
|
}
|
|
158
|
+
if (!this.claims?.length) {
|
|
159
|
+
throw new Error('No claims available');
|
|
160
|
+
}
|
|
158
161
|
const service = await this.getStrategy(walletClient);
|
|
159
162
|
const res = await (0, services_1.checkGetSignatures)({
|
|
160
163
|
claimIds,
|
|
161
164
|
projectId: this.projectId
|
|
162
165
|
}, this.endpoint);
|
|
166
|
+
if (!res?.signatures?.length) {
|
|
167
|
+
throw new Error('Failed to get signatures');
|
|
168
|
+
}
|
|
163
169
|
const signatureMap = res?.signatures?.reduce((map, item) => {
|
|
164
170
|
map[item.claimId] = item;
|
|
165
171
|
return map;
|
|
166
172
|
}, {});
|
|
167
|
-
const
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
173
|
+
const filteredClaims = this.claims.filter((it) => claimIds.includes(it.claimId));
|
|
174
|
+
if (!filteredClaims.length) {
|
|
175
|
+
throw new Error('No matching claims found');
|
|
176
|
+
}
|
|
177
|
+
const claimData = filteredClaims.map((it) => {
|
|
178
|
+
const signature = signatureMap[it.claimId];
|
|
179
|
+
if (!signature) {
|
|
180
|
+
throw new Error(`Signature not found for claim ID: ${it.claimId}`);
|
|
181
|
+
}
|
|
182
|
+
return {
|
|
183
|
+
...it,
|
|
184
|
+
recipient: recipient ? recipient : walletClient.account?.address,
|
|
185
|
+
...signature
|
|
186
|
+
};
|
|
187
|
+
});
|
|
174
188
|
const delegateMode = recipient ? (0, viem_1.getAddress)(recipient) !== walletClient.account?.address : false;
|
|
175
189
|
const feeData = (await this.getClaimFee(1n)) || 0n;
|
|
176
190
|
const hash = (await service.claim(claimData, delegateMode ? feeData * BigInt(claimData.length) : feeData));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignatureAirdropClient.js","sourceRoot":"","sources":["../../../src/airdrop/SignatureAirdropClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SignatureAirdropClient.js","sourceRoot":"","sources":["../../../src/airdrop/SignatureAirdropClient.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,2CAAoC;AACpC,2CAAyD;AACzD,wCAA2C;AAC3C,4CAA6C;AAC7C,yCAOoB;AACpB,mCAUiB;AAEjB,MAAa,sBAAsB;IACzB,SAAS,CAAU;IACnB,QAAQ,CAAU;IAClB,OAAO,CAAuB;IAC5B,MAAM,CAA4B;IAClC,UAAU,CAA+B;IAC3C,cAAc,CAA4B;IAClD,YAAY,MAAuB;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IAEgB,wBAAwB,GAAG,MAAM,CAAC;IAE3C,MAAM,CAAC,SAAiB,EAAE,GAAW;QAC3C,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,wBAAwB,GAAG,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC;IACnF,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,SAAiB;QACjD,IAAI,CAAC,OAAO,GAAG,MAAM,IAAA,4BAAiB,EAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnE,CAAC;IAES,KAAK,CAAC,kBAAkB;QAChC,IAAI,CAAC;YACH,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAE/B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,OAAO,EAAkD;QACnF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;YAC7C,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAK,CAAC,oBAAoB,EAAE,CAAC;gBAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAc,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAEjF,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;wBACb,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;oBACpC,CAAC;oBACD,SAAS,EAAE,CAAC;gBACd,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,EAAE,CAAC;gBACZ,CAAC;wBAAS,CAAC;oBACT,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAC1C,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,kCAA0B,CAAC,OAAO,CACxE,EAAE,YAAY,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,YAAY,GAAG,cAAc,EAAE,gBAAgB,OAAO,CAAC,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAClB,SAAS,EACT,SAAS,EACT,OAAO,EAKR;QACC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,uBAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,gBAAgB,GAAG;gBACvB,CAAC,iBAAS,CAAC,GAAG,CAAC,EAAE,kCAA0B,CAAC,SAAS;gBACrD,CAAC,iBAAS,CAAC,MAAM,CAAC,EAAE,kCAA0B,CAAC,YAAY;gBAC3D,CAAC,iBAAS,CAAC,GAAG,CAAC,EAAE,EAAE;aACpB,CAAC;YACF,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3E,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;YAEhD,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC7F,OAAO,EAAE,CAAC,iBAAS,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG;gBACd,SAAS,EAAE,SAAmB;gBAC9B,OAAO,EAAE,OAAiB;gBAC1B,GAAG,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAQ;gBACxC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,SAAS,EAAE,SAAS;gBACpB,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC;aAC3C,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAU,EAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACpC,CAAC;YACD,SAAS,EAAE,EAAE,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAgB,EAChC;YACE,SAAS,EAAE,OAAO,CAAC,EAAE;SACtB,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,EAC9B,aAAa,EACb,SAAS,EAIV;QACC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,OAAO,MAAM,IAAA,8BAAmB,EAC9B;YACE,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,aAAa;YACb,SAAS;SACV,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,YAA4B;QACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,IAAI,sCAA0B,CAAC;YACpC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAY;YAC3C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,YAAY,EAAE,YAAmB;SAClC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,IAAI,EAAE,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACjB,QAAQ,EACR,YAAY,EACZ,SAAS,EAKV;QACC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAkB,EAClC;YACE,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,SAAU;SAC3B,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACzD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACzB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1C,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,OAAO;gBACL,GAAG,EAAE;gBACL,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,OAAQ;gBACjE,GAAG,SAAS;aACb,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,iBAAU,EAAC,SAAS,CAAC,KAAK,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QACjG,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,CAAC,MAAM,OAAQ,CAAC,KAAK,CAChC,SAAS,EACT,YAAY,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAC5D,CAAkB,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC9B,CAAC;CACF;AA7PD,wDA6PC"}
|
|
@@ -4,6 +4,7 @@ import { useWalletModal } from '@solana/wallet-adapter-react-ui';
|
|
|
4
4
|
import '@solana/wallet-adapter-react-ui/styles.css';
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { useWallet } from '@solana/wallet-adapter-react';
|
|
7
|
+
import { Cluster } from '@solana/web3.js';
|
|
7
8
|
import EventEmitter from 'events';
|
|
8
9
|
interface SolStoreType {
|
|
9
10
|
connectModal: ReturnType<typeof useWalletModal> | null;
|
|
@@ -21,7 +22,8 @@ export declare class SolWallet extends WalletBase<SolStoreType> {
|
|
|
21
22
|
signin(statement: string, prepare?: boolean): Promise<ISignResult>;
|
|
22
23
|
}
|
|
23
24
|
export declare const SolConnector: () => null;
|
|
24
|
-
export declare const SolanaProvider: ({ children }: {
|
|
25
|
+
export declare const SolanaProvider: ({ children, cluster }: {
|
|
25
26
|
children: ReactNode;
|
|
27
|
+
cluster?: Cluster;
|
|
26
28
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
27
29
|
export {};
|
|
@@ -93,12 +93,6 @@ const SolConnector = () => {
|
|
|
93
93
|
const eventKey = (0, exports.getEventKey)();
|
|
94
94
|
exports.eventBus.emit(eventKey, wallet);
|
|
95
95
|
}
|
|
96
|
-
else if (solStore.counter > 0) {
|
|
97
|
-
// is connect button clicked
|
|
98
|
-
wallet.connect().catch((error) => {
|
|
99
|
-
console.error(error);
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
96
|
}
|
|
103
97
|
}, [wallet]);
|
|
104
98
|
solStore.connectModal = walletModal;
|
|
@@ -106,13 +100,13 @@ const SolConnector = () => {
|
|
|
106
100
|
return null;
|
|
107
101
|
};
|
|
108
102
|
exports.SolConnector = SolConnector;
|
|
109
|
-
const SolanaProvider = ({ children }) => {
|
|
110
|
-
const endpoint = (0, web3_js_1.clusterApiUrl)('mainnet-beta');
|
|
103
|
+
const SolanaProvider = ({ children, cluster }) => {
|
|
104
|
+
const endpoint = (0, web3_js_1.clusterApiUrl)(cluster ? cluster : 'mainnet-beta');
|
|
111
105
|
const wallets = (0, react_1.useMemo)(() => [new wallet_adapter_wallets_1.PhantomWalletAdapter(), new wallet_adapter_wallets_1.TrustWalletAdapter()], []);
|
|
112
106
|
const onError = (0, react_1.useCallback)((error) => {
|
|
113
107
|
console.error(error);
|
|
114
108
|
}, []);
|
|
115
|
-
return ((0, jsx_runtime_1.jsx)(wallet_adapter_react_1.ConnectionProvider, { endpoint: endpoint, children: (0, jsx_runtime_1.jsx)(wallet_adapter_react_1.WalletProvider, { wallets: wallets, onError: onError, children: (0, jsx_runtime_1.jsxs)(wallet_adapter_react_ui_1.WalletModalProvider, { children: [(0, jsx_runtime_1.jsx)(exports.SolConnector, {}), children] }) }) }));
|
|
109
|
+
return ((0, jsx_runtime_1.jsx)(wallet_adapter_react_1.ConnectionProvider, { endpoint: endpoint, children: (0, jsx_runtime_1.jsx)(wallet_adapter_react_1.WalletProvider, { wallets: wallets, onError: onError, autoConnect: true, children: (0, jsx_runtime_1.jsxs)(wallet_adapter_react_ui_1.WalletModalProvider, { children: [(0, jsx_runtime_1.jsx)(exports.SolConnector, {}), children] }) }) }));
|
|
116
110
|
};
|
|
117
111
|
exports.SolanaProvider = SolanaProvider;
|
|
118
112
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";;;;;;;AAAA,iCAAmE;AACnE,iDAA8C;AAC9C,6EAAsF;AACtF,sDAAoD;AAEpD,uEAA6F;AAC7F,2EAA0F;AAC1F,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ export class SignatureAirdropClient {
|
|
|
71
71
|
};
|
|
72
72
|
window.addEventListener('message', onWindowMessage);
|
|
73
73
|
const authorizeUrl = project.identities.find((item) => item.identityType === AirdropSigIdentityTypeEnum.Twitter)?.authorizeUrl;
|
|
74
|
-
window.open(authorizeUrl + '&state=state',
|
|
74
|
+
window.open(authorizeUrl + '&state=state', `twitter_auth_${project.id}`, 'width=600,height=800');
|
|
75
75
|
}
|
|
76
76
|
async connectWallet({ chainType, onSuccess, onError }) {
|
|
77
77
|
try {
|
|
@@ -94,7 +94,7 @@ export class SignatureAirdropClient {
|
|
|
94
94
|
const payload = {
|
|
95
95
|
signature: signature,
|
|
96
96
|
message: message,
|
|
97
|
-
key:
|
|
97
|
+
key: wallet.publicKey || wallet.address,
|
|
98
98
|
projectId: project.id,
|
|
99
99
|
timestamp: timestamp,
|
|
100
100
|
recipientType: recipientTypeMap[chainType]
|
|
@@ -152,22 +152,36 @@ export class SignatureAirdropClient {
|
|
|
152
152
|
if (!walletClient) {
|
|
153
153
|
throw new Error('Wallet client is required');
|
|
154
154
|
}
|
|
155
|
+
if (!this.claims?.length) {
|
|
156
|
+
throw new Error('No claims available');
|
|
157
|
+
}
|
|
155
158
|
const service = await this.getStrategy(walletClient);
|
|
156
159
|
const res = await checkGetSignatures({
|
|
157
160
|
claimIds,
|
|
158
161
|
projectId: this.projectId
|
|
159
162
|
}, this.endpoint);
|
|
163
|
+
if (!res?.signatures?.length) {
|
|
164
|
+
throw new Error('Failed to get signatures');
|
|
165
|
+
}
|
|
160
166
|
const signatureMap = res?.signatures?.reduce((map, item) => {
|
|
161
167
|
map[item.claimId] = item;
|
|
162
168
|
return map;
|
|
163
169
|
}, {});
|
|
164
|
-
const
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
170
|
+
const filteredClaims = this.claims.filter((it) => claimIds.includes(it.claimId));
|
|
171
|
+
if (!filteredClaims.length) {
|
|
172
|
+
throw new Error('No matching claims found');
|
|
173
|
+
}
|
|
174
|
+
const claimData = filteredClaims.map((it) => {
|
|
175
|
+
const signature = signatureMap[it.claimId];
|
|
176
|
+
if (!signature) {
|
|
177
|
+
throw new Error(`Signature not found for claim ID: ${it.claimId}`);
|
|
178
|
+
}
|
|
179
|
+
return {
|
|
180
|
+
...it,
|
|
181
|
+
recipient: recipient ? recipient : walletClient.account?.address,
|
|
182
|
+
...signature
|
|
183
|
+
};
|
|
184
|
+
});
|
|
171
185
|
const delegateMode = recipient ? getAddress(recipient) !== walletClient.account?.address : false;
|
|
172
186
|
const feeData = (await this.getClaimFee(1n)) || 0n;
|
|
173
187
|
const hash = (await service.claim(claimData, delegateMode ? feeData * BigInt(claimData.length) : feeData));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignatureAirdropClient.js","sourceRoot":"","sources":["../../../src/airdrop/SignatureAirdropClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SignatureAirdropClient.js","sourceRoot":"","sources":["../../../src/airdrop/SignatureAirdropClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,0BAA0B,EAE1B,SAAS,EAOV,MAAM,SAAS,CAAC;AAEjB,MAAM,OAAO,sBAAsB;IACzB,SAAS,CAAU;IACnB,QAAQ,CAAU;IAClB,OAAO,CAAuB;IAC5B,MAAM,CAA4B;IAClC,UAAU,CAA+B;IAC3C,cAAc,CAA4B;IAClD,YAAY,MAAuB;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IAEgB,wBAAwB,GAAG,MAAM,CAAC;IAE3C,MAAM,CAAC,SAAiB,EAAE,GAAW;QAC3C,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,wBAAwB,GAAG,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC;IACnF,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,SAAiB;QACjD,IAAI,CAAC,OAAO,GAAG,MAAM,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnE,CAAC;IAES,KAAK,CAAC,kBAAkB;QAChC,IAAI,CAAC;YACH,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAE/B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,OAAO,EAAkD;QACnF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;YAC7C,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,oBAAoB,EAAE,CAAC;gBAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAEjF,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;wBACb,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;oBACpC,CAAC;oBACD,SAAS,EAAE,CAAC;gBACd,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,EAAE,CAAC;gBACZ,CAAC;wBAAS,CAAC;oBACT,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAC1C,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,0BAA0B,CAAC,OAAO,CACxE,EAAE,YAAY,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,YAAY,GAAG,cAAc,EAAE,gBAAgB,OAAO,CAAC,EAAE,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAClB,SAAS,EACT,SAAS,EACT,OAAO,EAKR;QACC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,gBAAgB,GAAG;gBACvB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,0BAA0B,CAAC,SAAS;gBACrD,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,0BAA0B,CAAC,YAAY;gBAC3D,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE;aACpB,CAAC;YACF,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3E,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;YAEhD,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC7F,OAAO,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG;gBACd,SAAS,EAAE,SAAmB;gBAC9B,OAAO,EAAE,OAAiB;gBAC1B,GAAG,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAQ;gBACxC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,SAAS,EAAE,SAAS;gBACpB,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC;aAC3C,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACpC,CAAC;YACD,SAAS,EAAE,EAAE,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC;YACE,SAAS,EAAE,OAAO,CAAC,EAAE;SACtB,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,EAC9B,aAAa,EACb,SAAS,EAIV;QACC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,OAAO,MAAM,mBAAmB,CAC9B;YACE,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,aAAa;YACb,SAAS;SACV,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,YAA4B;QACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,IAAI,0BAA0B,CAAC;YACpC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAY;YAC3C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,YAAY,EAAE,YAAmB;SAClC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,IAAI,EAAE,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACjB,QAAQ,EACR,YAAY,EACZ,SAAS,EAKV;QACC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAClC;YACE,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,SAAU;SAC3B,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACzD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACzB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1C,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,OAAO;gBACL,GAAG,EAAE;gBACL,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,OAAQ;gBACjE,GAAG,SAAS;aACb,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QACjG,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,CAAC,MAAM,OAAQ,CAAC,KAAK,CAChC,SAAS,EACT,YAAY,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAC5D,CAAkB,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC9B,CAAC;CACF"}
|
|
@@ -4,6 +4,7 @@ import { useWalletModal } from '@solana/wallet-adapter-react-ui';
|
|
|
4
4
|
import '@solana/wallet-adapter-react-ui/styles.css';
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { useWallet } from '@solana/wallet-adapter-react';
|
|
7
|
+
import { Cluster } from '@solana/web3.js';
|
|
7
8
|
import EventEmitter from 'events';
|
|
8
9
|
interface SolStoreType {
|
|
9
10
|
connectModal: ReturnType<typeof useWalletModal> | null;
|
|
@@ -21,7 +22,8 @@ export declare class SolWallet extends WalletBase<SolStoreType> {
|
|
|
21
22
|
signin(statement: string, prepare?: boolean): Promise<ISignResult>;
|
|
22
23
|
}
|
|
23
24
|
export declare const SolConnector: () => null;
|
|
24
|
-
export declare const SolanaProvider: ({ children }: {
|
|
25
|
+
export declare const SolanaProvider: ({ children, cluster }: {
|
|
25
26
|
children: ReactNode;
|
|
27
|
+
cluster?: Cluster;
|
|
26
28
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
27
29
|
export {};
|
|
@@ -85,24 +85,18 @@ export const SolConnector = () => {
|
|
|
85
85
|
const eventKey = getEventKey();
|
|
86
86
|
eventBus.emit(eventKey, wallet);
|
|
87
87
|
}
|
|
88
|
-
else if (solStore.counter > 0) {
|
|
89
|
-
// is connect button clicked
|
|
90
|
-
wallet.connect().catch((error) => {
|
|
91
|
-
console.error(error);
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
88
|
}
|
|
95
89
|
}, [wallet]);
|
|
96
90
|
solStore.connectModal = walletModal;
|
|
97
91
|
solStore.account = wallet;
|
|
98
92
|
return null;
|
|
99
93
|
};
|
|
100
|
-
export const SolanaProvider = ({ children }) => {
|
|
101
|
-
const endpoint = clusterApiUrl('mainnet-beta');
|
|
94
|
+
export const SolanaProvider = ({ children, cluster }) => {
|
|
95
|
+
const endpoint = clusterApiUrl(cluster ? cluster : 'mainnet-beta');
|
|
102
96
|
const wallets = useMemo(() => [new PhantomWalletAdapter(), new TrustWalletAdapter()], []);
|
|
103
97
|
const onError = useCallback((error) => {
|
|
104
98
|
console.error(error);
|
|
105
99
|
}, []);
|
|
106
|
-
return (_jsx(ConnectionProvider, { endpoint: endpoint, children: _jsx(WalletProvider, { wallets: wallets, onError: onError, children: _jsxs(WalletModalProvider, { children: [_jsx(SolConnector, {}), children] }) }) }));
|
|
100
|
+
return (_jsx(ConnectionProvider, { endpoint: endpoint, children: _jsx(WalletProvider, { wallets: wallets, onError: onError, autoConnect: true, children: _jsxs(WalletModalProvider, { children: [_jsx(SolConnector, {}), children] }) }) }));
|
|
107
101
|
};
|
|
108
102
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAa,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1F,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAa,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1F,OAAO,EAAW,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,YAAY,MAAM,QAAQ,CAAC;AAQlC,MAAM,QAAQ,GAAiB;IAC7B,YAAY,EAAE,IAAI;IAClB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;AAE3C,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,GAAG,aAAa,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,OAAO,SAAU,SAAQ,UAAwB;IACrD,QAAQ;QACN,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,WAAW;QACb,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IACvC,CAAC;IACD,OAAO;QACL,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU;QACR,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe;QACxB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAQ,CAAC;YACnC,MAAM,cAAc,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,CAAC;YAEnE,OAAO;gBACL,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,aAAc,CAAC;aACvC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,CAAC,SAAiB,EAAE,OAAO,GAAG,IAAI;QACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,YAAY,GAAG,CAAC,IAAkC,EAAE,EAAE;gBAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC9B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;gBACjB,IAAI,WAAW,GAAG,SAAS,CAAC;gBAC5B,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,kBAAkB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAQ,EAAE,CAAC,CAAC;oBACpF,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gBACpC,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAEnC,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC;YAEF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,CAAC,OAAQ,CAAC,CAAC;gBAChC,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC/B,OAAO,CAAC,GAAG,CAAC,qDAAqD,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACnF,YAAY,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,oFAAoF;AACpF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;gBAC/B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,QAAQ,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAA8C,EAAE,EAAE;IAClG,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,EAAE,IAAI,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1F,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE;QACzC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,KAAC,kBAAkB,IAAC,QAAQ,EAAE,QAAQ,YACpC,KAAC,cAAc,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,kBAC7D,MAAC,mBAAmB,eAClB,KAAC,YAAY,KAAG,EACf,QAAQ,IACW,GACP,GACE,CACtB,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -96,7 +96,7 @@ export class SignatureAirdropClient {
|
|
|
96
96
|
const authorizeUrl = project.identities.find(
|
|
97
97
|
(item: any) => item.identityType === AirdropSigIdentityTypeEnum.Twitter
|
|
98
98
|
)?.authorizeUrl;
|
|
99
|
-
window.open(authorizeUrl + '&state=state',
|
|
99
|
+
window.open(authorizeUrl + '&state=state', `twitter_auth_${project.id}`, 'width=600,height=800');
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
async connectWallet({
|
|
@@ -130,7 +130,7 @@ export class SignatureAirdropClient {
|
|
|
130
130
|
const payload = {
|
|
131
131
|
signature: signature as string,
|
|
132
132
|
message: message as string,
|
|
133
|
-
key:
|
|
133
|
+
key: wallet.publicKey || wallet.address!,
|
|
134
134
|
projectId: project.id,
|
|
135
135
|
timestamp: timestamp,
|
|
136
136
|
recipientType: recipientTypeMap[chainType]
|
|
@@ -215,6 +215,9 @@ export class SignatureAirdropClient {
|
|
|
215
215
|
if (!walletClient) {
|
|
216
216
|
throw new Error('Wallet client is required');
|
|
217
217
|
}
|
|
218
|
+
if (!this.claims?.length) {
|
|
219
|
+
throw new Error('No claims available');
|
|
220
|
+
}
|
|
218
221
|
const service = await this.getStrategy(walletClient);
|
|
219
222
|
const res = await checkGetSignatures(
|
|
220
223
|
{
|
|
@@ -223,18 +226,30 @@ export class SignatureAirdropClient {
|
|
|
223
226
|
},
|
|
224
227
|
this.endpoint
|
|
225
228
|
);
|
|
229
|
+
if (!res?.signatures?.length) {
|
|
230
|
+
throw new Error('Failed to get signatures');
|
|
231
|
+
}
|
|
226
232
|
const signatureMap = res?.signatures?.reduce((map, item) => {
|
|
227
233
|
map[item.claimId] = item;
|
|
228
234
|
return map;
|
|
229
235
|
}, {} as Record<string, IClaimSignature>);
|
|
230
|
-
const
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
236
|
+
const filteredClaims = this.claims.filter((it) => claimIds.includes(it.claimId));
|
|
237
|
+
if (!filteredClaims.length) {
|
|
238
|
+
throw new Error('No matching claims found');
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
const claimData = filteredClaims.map((it) => {
|
|
242
|
+
const signature = signatureMap[it.claimId];
|
|
243
|
+
if (!signature) {
|
|
244
|
+
throw new Error(`Signature not found for claim ID: ${it.claimId}`);
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
return {
|
|
248
|
+
...it,
|
|
249
|
+
recipient: recipient ? recipient : walletClient.account?.address!,
|
|
250
|
+
...signature
|
|
251
|
+
};
|
|
252
|
+
});
|
|
238
253
|
const delegateMode = recipient ? getAddress(recipient) !== walletClient.account?.address : false;
|
|
239
254
|
const feeData = (await this.getClaimFee(1n)) || 0n;
|
|
240
255
|
const hash = (await service!.claim(
|
|
@@ -5,7 +5,7 @@ import '@solana/wallet-adapter-react-ui/styles.css';
|
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { ConnectionProvider, useWallet, WalletProvider } from '@solana/wallet-adapter-react';
|
|
7
7
|
import { PhantomWalletAdapter, TrustWalletAdapter } from '@solana/wallet-adapter-wallets';
|
|
8
|
-
import { clusterApiUrl } from '@solana/web3.js';
|
|
8
|
+
import { Cluster, clusterApiUrl } from '@solana/web3.js';
|
|
9
9
|
import bs58 from 'bs58';
|
|
10
10
|
import { get4361Message, prepareSignMessage } from '../../utils';
|
|
11
11
|
import EventEmitter from 'events';
|
|
@@ -103,11 +103,6 @@ export const SolConnector = () => {
|
|
|
103
103
|
if (wallet.connected) {
|
|
104
104
|
const eventKey = getEventKey();
|
|
105
105
|
eventBus.emit(eventKey, wallet);
|
|
106
|
-
} else if (solStore.counter > 0) {
|
|
107
|
-
// is connect button clicked
|
|
108
|
-
wallet.connect().catch((error) => {
|
|
109
|
-
console.error(error);
|
|
110
|
-
});
|
|
111
106
|
}
|
|
112
107
|
}
|
|
113
108
|
}, [wallet]);
|
|
@@ -117,8 +112,8 @@ export const SolConnector = () => {
|
|
|
117
112
|
return null;
|
|
118
113
|
};
|
|
119
114
|
|
|
120
|
-
export const SolanaProvider = ({ children }: { children: ReactNode }) => {
|
|
121
|
-
const endpoint = clusterApiUrl('mainnet-beta');
|
|
115
|
+
export const SolanaProvider = ({ children, cluster }: { children: ReactNode; cluster?: Cluster }) => {
|
|
116
|
+
const endpoint = clusterApiUrl(cluster ? cluster : 'mainnet-beta');
|
|
122
117
|
|
|
123
118
|
const wallets = useMemo(() => [new PhantomWalletAdapter(), new TrustWalletAdapter()], []);
|
|
124
119
|
|
|
@@ -127,7 +122,7 @@ export const SolanaProvider = ({ children }: { children: ReactNode }) => {
|
|
|
127
122
|
}, []);
|
|
128
123
|
return (
|
|
129
124
|
<ConnectionProvider endpoint={endpoint}>
|
|
130
|
-
<WalletProvider wallets={wallets} onError={onError}>
|
|
125
|
+
<WalletProvider wallets={wallets} onError={onError} autoConnect>
|
|
131
126
|
<WalletModalProvider>
|
|
132
127
|
<SolConnector />
|
|
133
128
|
{children}
|