thirdweb 5.50.0-nightly-aa556f17b6a1de4b889e7f58cd13ca8a3cc41d71-20240903000507 → 5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351
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/merkletree/MerkleTree.js +1 -1
- package/dist/cjs/merkletree/MerkleTree.js.map +1 -1
- package/dist/cjs/react/web/ui/prebuilt/thirdweb/ClaimButton/index.js +8 -4
- package/dist/cjs/react/web/ui/prebuilt/thirdweb/ClaimButton/index.js.map +1 -1
- package/dist/cjs/utils/extensions/drops/fetch-proofs-for-claimers.js +3 -3
- package/dist/cjs/utils/extensions/drops/fetch-proofs-for-claimers.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/merkletree/MerkleTree.js +1 -1
- package/dist/esm/merkletree/MerkleTree.js.map +1 -1
- package/dist/esm/react/web/ui/prebuilt/thirdweb/ClaimButton/index.js +8 -4
- package/dist/esm/react/web/ui/prebuilt/thirdweb/ClaimButton/index.js.map +1 -1
- package/dist/esm/utils/extensions/drops/fetch-proofs-for-claimers.js +4 -4
- package/dist/esm/utils/extensions/drops/fetch-proofs-for-claimers.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/react/web/ui/prebuilt/thirdweb/ClaimButton/index.d.ts.map +1 -1
- package/dist/types/react/web/ui/prebuilt/thirdweb/ClaimButton/types.d.ts +8 -5
- package/dist/types/react/web/ui/prebuilt/thirdweb/ClaimButton/types.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/merkletree/MerkleTree.test.ts +30 -0
- package/src/merkletree/MerkleTree.ts +1 -1
- package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx +8 -4
- package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/types.ts +8 -5
- package/src/utils/extensions/drops/fetch-proofs-for-claimers.ts +4 -4
- package/src/version.ts +1 -1
|
@@ -25,7 +25,7 @@ class MerkleTree {
|
|
|
25
25
|
value: []
|
|
26
26
|
});
|
|
27
27
|
this.leaves = leaves.map((el) => el instanceof Uint8Array ? el : (0, to_bytes_js_1.hexToBytes)(el));
|
|
28
|
-
this.leaves = this.leaves.sort();
|
|
28
|
+
this.leaves = this.leaves.sort(uint8_array_js_1.compareUint8Arrays);
|
|
29
29
|
this.createHashes(this.leaves);
|
|
30
30
|
}
|
|
31
31
|
getHexRoot() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MerkleTree.js","sourceRoot":"","sources":["../../../src/merkletree/MerkleTree.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAC5D,qDAAqE;AACrE,+DAA2D;AAC3D,gEAA0D;AAC1D,4DAIiC;AAOjC;;;GAGG;AACH,MAAa,UAAU;IAIrB,YAAY,MAA4B;QAHhC;;;;mBAAkB,EAAE;WAAC;QACrB;;;;mBAAmB,EAAE;WAAC;QAG5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC9B,EAAE,YAAY,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,wBAAU,EAAC,EAAE,CAAC,CAC/C,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"MerkleTree.js","sourceRoot":"","sources":["../../../src/merkletree/MerkleTree.ts"],"names":[],"mappings":"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"}
|
|
@@ -188,8 +188,9 @@ async function getERC721ClaimTo({ contract, account, claimParams, }) {
|
|
|
188
188
|
const { claimTo } = await Promise.resolve().then(() => require("../../../../../../extensions/erc721/drops/write/claimTo.js"));
|
|
189
189
|
return claimTo({
|
|
190
190
|
contract,
|
|
191
|
-
to: account?.address || "",
|
|
191
|
+
to: claimParams.to || account?.address || "",
|
|
192
192
|
quantity: claimParams.quantity,
|
|
193
|
+
from: claimParams.from,
|
|
193
194
|
});
|
|
194
195
|
}
|
|
195
196
|
/**
|
|
@@ -199,9 +200,10 @@ async function getERC1155ClaimTo({ contract, account, claimParams, }) {
|
|
|
199
200
|
const { claimTo } = await Promise.resolve().then(() => require("../../../../../../extensions/erc1155/drops/write/claimTo.js"));
|
|
200
201
|
return claimTo({
|
|
201
202
|
contract,
|
|
202
|
-
to: account?.address || "",
|
|
203
|
+
to: claimParams.to || account?.address || "",
|
|
203
204
|
quantity: claimParams.quantity,
|
|
204
205
|
tokenId: claimParams.tokenId,
|
|
206
|
+
from: claimParams.from,
|
|
205
207
|
});
|
|
206
208
|
}
|
|
207
209
|
/**
|
|
@@ -214,15 +216,17 @@ async function getERC20ClaimTo({ contract, account, claimParams, }) {
|
|
|
214
216
|
if ("quantity" in claimParams) {
|
|
215
217
|
return claimTo({
|
|
216
218
|
contract,
|
|
217
|
-
to: account?.address || "",
|
|
219
|
+
to: claimParams.to || account?.address || "",
|
|
218
220
|
quantity: claimParams.quantity,
|
|
221
|
+
from: claimParams.from,
|
|
219
222
|
});
|
|
220
223
|
}
|
|
221
224
|
if ("quantityInWei" in claimParams) {
|
|
222
225
|
return claimTo({
|
|
223
226
|
contract,
|
|
224
|
-
to: account?.address || "",
|
|
227
|
+
to: claimParams.to || account?.address || "",
|
|
225
228
|
quantityInWei: claimParams.quantityInWei,
|
|
229
|
+
from: claimParams.from,
|
|
226
230
|
});
|
|
227
231
|
}
|
|
228
232
|
throw new Error("Missing quantity or quantityInWei");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AA6Gb,kCAqDC;AAOD,wCAkBC;AAKD,kDAsBC;AAKD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -51,8 +51,8 @@ async function fetchProofsForClaimer(options) {
|
|
|
51
51
|
tokenDecimals: options.tokenDecimals,
|
|
52
52
|
});
|
|
53
53
|
}));
|
|
54
|
-
const tree = new MerkleTree_js_1.MerkleTree(hashedEntries);
|
|
55
54
|
// 5. get the proof for the claimer + the sub merkle tree root
|
|
55
|
+
const tree = new MerkleTree_js_1.MerkleTree(hashedEntries);
|
|
56
56
|
const entry = shardData.entries.find((i) => i.address.toLowerCase() === claimer.toLowerCase());
|
|
57
57
|
if (!entry) {
|
|
58
58
|
return null;
|
|
@@ -66,10 +66,10 @@ async function fetchProofsForClaimer(options) {
|
|
|
66
66
|
}))
|
|
67
67
|
.concat(shardData.proofs);
|
|
68
68
|
// 6. return the proof and the entry data for the contract call
|
|
69
|
-
const currencyAddress = (entry.currencyAddress || addresses_js_1.
|
|
69
|
+
const currencyAddress = (entry.currencyAddress || addresses_js_1.ZERO_ADDRESS);
|
|
70
70
|
const currencyDecimals = await (async () => {
|
|
71
71
|
if ((0, addresses_js_1.isNativeTokenAddress)(currencyAddress) ||
|
|
72
|
-
currencyAddress === addresses_js_1.
|
|
72
|
+
currencyAddress === addresses_js_1.ZERO_ADDRESS) {
|
|
73
73
|
return 18;
|
|
74
74
|
}
|
|
75
75
|
const [{ getContract }, { decimals: getDecimals }] = await Promise.all([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-proofs-for-claimers.js","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/fetch-proofs-for-claimers.ts"],"names":[],"mappings":";;AAiBA,sDAyGC;AA1HD,kEAGyC;AAEzC,mGAA6F;AAC7F,qEAA+D;AAC/D,8DAAwD;AAExD,+DAAwD;AACxD,mDAA4C;AAOrC,KAAK,UAAU,qBAAqB,CAAC,OAK3C;IACC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAClD,yCAAyC;IACzC,MAAM,QAAQ,GAAG,MAAM,IAAA,4CAAmB,EAAC;QACzC,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,UAAU,GAA2B,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAQ,EAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,GAAG,EAAE,WAAW;KACjB,CAAC,CAAC;IACH,MAAM,UAAU,GAA0B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEhE,oDAAoD;IACpD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1C,CAAC,CAAC,UAAU,CAAC,OAAO;QACpB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC;IAC7B,IAAI,SAAoB,CAAC;IAEzB,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,GAAG,GAAG,GAAG,OAAO,OAAO,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAQ,EAAC;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE,mBAAmB;SACzB,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0EAA0E;IAC1E,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpC,OAAO,IAAA,yBAAS,EAAC;YACf,KAAK;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,0BAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,
|
|
1
|
+
{"version":3,"file":"fetch-proofs-for-claimers.js","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/fetch-proofs-for-claimers.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.50.
|
|
4
|
+
exports.version = "5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -22,7 +22,7 @@ export class MerkleTree {
|
|
|
22
22
|
value: []
|
|
23
23
|
});
|
|
24
24
|
this.leaves = leaves.map((el) => el instanceof Uint8Array ? el : hexToBytes(el));
|
|
25
|
-
this.leaves = this.leaves.sort();
|
|
25
|
+
this.leaves = this.leaves.sort(compareUint8Arrays);
|
|
26
26
|
this.createHashes(this.leaves);
|
|
27
27
|
}
|
|
28
28
|
getHexRoot() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MerkleTree.js","sourceRoot":"","sources":["../../../src/merkletree/MerkleTree.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,OAAO,EAAY,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAOjC;;;GAGG;AACH,MAAM,OAAO,UAAU;IAIrB,YAAY,MAA4B;QAHhC;;;;mBAAkB,EAAE;WAAC;QACrB;;;;mBAAmB,EAAE;WAAC;QAG5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC9B,EAAE,YAAY,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAC/C,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"MerkleTree.js","sourceRoot":"","sources":["../../../src/merkletree/MerkleTree.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,8 +180,9 @@ export async function getERC721ClaimTo({ contract, account, claimParams, }) {
|
|
|
180
180
|
const { claimTo } = await import("../../../../../../extensions/erc721/drops/write/claimTo.js");
|
|
181
181
|
return claimTo({
|
|
182
182
|
contract,
|
|
183
|
-
to: account?.address || "",
|
|
183
|
+
to: claimParams.to || account?.address || "",
|
|
184
184
|
quantity: claimParams.quantity,
|
|
185
|
+
from: claimParams.from,
|
|
185
186
|
});
|
|
186
187
|
}
|
|
187
188
|
/**
|
|
@@ -191,9 +192,10 @@ export async function getERC1155ClaimTo({ contract, account, claimParams, }) {
|
|
|
191
192
|
const { claimTo } = await import("../../../../../../extensions/erc1155/drops/write/claimTo.js");
|
|
192
193
|
return claimTo({
|
|
193
194
|
contract,
|
|
194
|
-
to: account?.address || "",
|
|
195
|
+
to: claimParams.to || account?.address || "",
|
|
195
196
|
quantity: claimParams.quantity,
|
|
196
197
|
tokenId: claimParams.tokenId,
|
|
198
|
+
from: claimParams.from,
|
|
197
199
|
});
|
|
198
200
|
}
|
|
199
201
|
/**
|
|
@@ -206,15 +208,17 @@ export async function getERC20ClaimTo({ contract, account, claimParams, }) {
|
|
|
206
208
|
if ("quantity" in claimParams) {
|
|
207
209
|
return claimTo({
|
|
208
210
|
contract,
|
|
209
|
-
to: account?.address || "",
|
|
211
|
+
to: claimParams.to || account?.address || "",
|
|
210
212
|
quantity: claimParams.quantity,
|
|
213
|
+
from: claimParams.from,
|
|
211
214
|
});
|
|
212
215
|
}
|
|
213
216
|
if ("quantityInWei" in claimParams) {
|
|
214
217
|
return claimTo({
|
|
215
218
|
contract,
|
|
216
|
-
to: account?.address || "",
|
|
219
|
+
to: claimParams.to || account?.address || "",
|
|
217
220
|
quantityInWei: claimParams.quantityInWei,
|
|
221
|
+
from: claimParams.from,
|
|
218
222
|
});
|
|
219
223
|
}
|
|
220
224
|
throw new Error("Missing quantity or quantityInWei");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ZERO_ADDRESS, isNativeTokenAddress, } from "../../../constants/addresses.js";
|
|
2
2
|
import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
|
|
3
3
|
import { MerkleTree } from "../../../merkletree/MerkleTree.js";
|
|
4
4
|
import { download } from "../../../storage/download.js";
|
|
@@ -48,8 +48,8 @@ export async function fetchProofsForClaimer(options) {
|
|
|
48
48
|
tokenDecimals: options.tokenDecimals,
|
|
49
49
|
});
|
|
50
50
|
}));
|
|
51
|
-
const tree = new MerkleTree(hashedEntries);
|
|
52
51
|
// 5. get the proof for the claimer + the sub merkle tree root
|
|
52
|
+
const tree = new MerkleTree(hashedEntries);
|
|
53
53
|
const entry = shardData.entries.find((i) => i.address.toLowerCase() === claimer.toLowerCase());
|
|
54
54
|
if (!entry) {
|
|
55
55
|
return null;
|
|
@@ -63,10 +63,10 @@ export async function fetchProofsForClaimer(options) {
|
|
|
63
63
|
}))
|
|
64
64
|
.concat(shardData.proofs);
|
|
65
65
|
// 6. return the proof and the entry data for the contract call
|
|
66
|
-
const currencyAddress = (entry.currencyAddress ||
|
|
66
|
+
const currencyAddress = (entry.currencyAddress || ZERO_ADDRESS);
|
|
67
67
|
const currencyDecimals = await (async () => {
|
|
68
68
|
if (isNativeTokenAddress(currencyAddress) ||
|
|
69
|
-
currencyAddress ===
|
|
69
|
+
currencyAddress === ZERO_ADDRESS) {
|
|
70
70
|
return 18;
|
|
71
71
|
}
|
|
72
72
|
const [{ getContract }, { decimals: getDecimals }] = await Promise.all([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-proofs-for-claimers.js","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/fetch-proofs-for-claimers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,oBAAoB,GACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAK3C;IACC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAClD,yCAAyC;IACzC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC;QACzC,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,UAAU,GAA2B,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,GAAG,EAAE,WAAW;KACjB,CAAC,CAAC;IACH,MAAM,UAAU,GAA0B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEhE,oDAAoD;IACpD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1C,CAAC,CAAC,UAAU,CAAC,OAAO;QACpB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC;IAC7B,IAAI,SAAoB,CAAC;IAEzB,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,GAAG,GAAG,GAAG,OAAO,OAAO,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE,mBAAmB;SACzB,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0EAA0E;IAC1E,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpC,OAAO,SAAS,CAAC;YACf,KAAK;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,
|
|
1
|
+
{"version":3,"file":"fetch-proofs-for-claimers.js","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/fetch-proofs-for-claimers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,oBAAoB,GACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAK3C;IACC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAClD,yCAAyC;IACzC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC;QACzC,QAAQ;KACT,CAAC,CAAC;IACH,MAAM,UAAU,GAA2B,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,GAAG,EAAE,WAAW;KACjB,CAAC,CAAC;IACH,MAAM,UAAU,GAA0B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEhE,oDAAoD;IACpD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1C,CAAC,CAAC,UAAU,CAAC,OAAO;QACpB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC;IAC7B,IAAI,SAAoB,CAAC;IAEzB,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,GAAG,GAAG,GAAG,OAAO,OAAO,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE,mBAAmB;SACzB,CAAC,CAAC;QACH,SAAS,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0EAA0E;IAC1E,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpC,OAAO,SAAS,CAAC;YACf,KAAK;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;IACF,8DAA8D;IAC9D,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACzD,CAAC;IACF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,KAAK,GAAG,IAAI;SACf,WAAW,CACV,MAAM,SAAS,CAAC;QACd,KAAK;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC,CACH;SACA,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,+DAA+D;IAC/D,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,YAAY,CAAY,CAAC;IAC3E,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QACzC,IACE,oBAAoB,CAAC,eAAe,CAAC;YACrC,eAAe,KAAK,YAAY,EAChC,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrE,MAAM,CAAC,+BAA+B,CAAC;YACvC,MAAM,CAAC,4CAA4C,CAAC;SACrD,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,WAAW,CAAC;YACnC,OAAO,EAAE,eAAe;YACxB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC,CAAC;QACH,OAAO,MAAM,WAAW,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO;QACL,KAAK;QACL,sBAAsB,EAAE,eAAe,CAAC;YACtC,QAAQ,EAAE,KAAK,CAAC,YAAY,IAAI,WAAW;YAC3C,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC;QACF,aAAa,EAAE,eAAe,CAAC;YAC7B,QAAQ,EAAE,KAAK,CAAC,KAAK,IAAI,WAAW;YACpC,aAAa,EAAE,gBAAgB;SAChC,CAAC;QACF,QAAQ,EAAE,eAAe;KAC1B,CAAC;AACJ,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.50.
|
|
1
|
+
export const version = "5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,wCAAwC,CAAC;AAGhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAChG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gDAAgD,CAAC;AAK9E,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqFG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,8CAqDlD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgB5C;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAc/B;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,iBAAiB,CAAC;CAChC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,wCAAwC,CAAC;AAGhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAChG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gDAAgD,CAAC;AAK9E,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqFG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,8CAqDlD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,sBAAsB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgB5C;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAc/B;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,iBAAiB,CAAC;CAChC,8JAWA;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,kBAAkB,CAAC;CACjC,8JAYA;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE;IACD,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,gBAAgB,CAAC;CAC/B,8JAwBA"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import type { Chain } from "../../../../../../chains/types.js";
|
|
2
2
|
import type { ThirdwebClient } from "../../../../../../client/client.js";
|
|
3
|
+
import type { ClaimToParams as ClaimToParams721 } from "../../../../../../extensions/erc721/drops/write/claimTo.js";
|
|
4
|
+
import type { ClaimToParams as ClaimToParams1155 } from "../../../../../../extensions/erc1155/drops/write/claimTo.js";
|
|
3
5
|
import type { TransactionButtonProps } from "../../../../../core/hooks/transaction/transaction-button-utils.js";
|
|
4
|
-
export type Erc721ClaimParams = {
|
|
6
|
+
export type Erc721ClaimParams = Omit<ClaimToParams721, "to"> & {
|
|
5
7
|
type: "ERC721";
|
|
6
|
-
|
|
8
|
+
to?: string;
|
|
7
9
|
};
|
|
8
|
-
export type Erc1155ClaimParams = {
|
|
10
|
+
export type Erc1155ClaimParams = Omit<ClaimToParams1155, "to"> & {
|
|
9
11
|
type: "ERC1155";
|
|
10
|
-
|
|
11
|
-
tokenId: bigint;
|
|
12
|
+
to?: string;
|
|
12
13
|
};
|
|
13
14
|
export type Erc20ClaimParams = {
|
|
14
15
|
type: "ERC20";
|
|
16
|
+
to?: string;
|
|
17
|
+
from?: string;
|
|
15
18
|
} & ({
|
|
16
19
|
quantityInWei: bigint;
|
|
17
20
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mEAAmE,CAAC;AAEhH,MAAM,MAAM,iBAAiB,GAAG;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../src/react/web/ui/prebuilt/thirdweb/ClaimButton/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,IAAI,gBAAgB,EAAE,MAAM,4DAA4D,CAAC;AACpH,OAAO,KAAK,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,6DAA6D,CAAC;AACtH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mEAAmE,CAAC;AAEhH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG;IAC7D,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG;IAC/D,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEvD,MAAM,MAAM,WAAW,GACnB,iBAAiB,GACjB,kBAAkB,GAClB,gBAAgB,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAAG;IAC3E;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;IACb;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.50.
|
|
1
|
+
export declare const version = "5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.50.
|
|
3
|
+
"version": "5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
+
import type { Hex } from "../utils/encoding/hex.js";
|
|
2
3
|
import { stringToBytes } from "../utils/encoding/to-bytes.js";
|
|
3
4
|
import { MerkleTree } from "./MerkleTree.js";
|
|
4
5
|
|
|
@@ -14,6 +15,35 @@ describe("MerkleTree", () => {
|
|
|
14
15
|
`"0xebd2ffa91ce49e68a5ae1283e5babdf2655f8ea9ea0ee36ed525cc41d171a882"`,
|
|
15
16
|
);
|
|
16
17
|
});
|
|
18
|
+
|
|
19
|
+
it("should return root for large merkle trees", () => {
|
|
20
|
+
const leaves: Hex[] = [
|
|
21
|
+
"0xe1b12834247548c6bf6a9d37d2090a5f41beda62be633f705bc7c6e924342b4d",
|
|
22
|
+
"0x232570d6677f4e4b8947d8369750a4da492511d19e104db19dfae1200c3ff4db",
|
|
23
|
+
"0xe30d909533984527552083c16f23927cb9928c2e01b7252989f1c4fb9714deca",
|
|
24
|
+
"0xd13d5d1bf095147532482f25aac6d72905850864aab58f9dac28beb655dc4726",
|
|
25
|
+
"0xa0eea66d581045e22cbeccd59027e62b5d753fd3118f068b444bceec601be03f",
|
|
26
|
+
"0x222cd80957bf16ed8ce63a492a5035830cc2bfe04e2d46cc28e3aacb5db1277a",
|
|
27
|
+
"0xb1525c3a1a9d0fa632857acd0216609a80c19293fc3273f4cac664ca49a9e323",
|
|
28
|
+
"0x18b19c2a11bd54e98cc841bc8863d3e8582da3dd21903aedfe6745d41083653b",
|
|
29
|
+
"0xc198129437401b73388fa41dfaa82457015716050c6632364a1db94db1f0fb19",
|
|
30
|
+
"0x7621bd1c73bb5d8487459d8be36c5445a65a7fda457972d7f9de22a826739281",
|
|
31
|
+
"0x1cc9ca923d763f8de998921de43da79d6415eaff9b875e3e619c246fc26160b7",
|
|
32
|
+
"0xb4526c4f954e3230701cb7a392081007c050e950d886a25bac5fb14e3639e258",
|
|
33
|
+
"0x7d00f9a67344ed46afab13a398ea4bbf40915283f08f5caaf7d128a836361943",
|
|
34
|
+
"0xb11d4116f885aa50e9e9cbddf61b4d582413cd959302c68bfc0430fe8d5f609b",
|
|
35
|
+
"0xd474bee9ba879f0e0ae0827601642460e5439b4c3acb69da07b77ae2779a4eb2",
|
|
36
|
+
"0xb2b902dfab66d5dbee090467f02abd14c49e11f92a7d58fda53982f006f4360c",
|
|
37
|
+
"0x7ed8ec6456a2418c91d362f5ef5b4865d68a1df05722fe0fa9ecf23e0fc7e935",
|
|
38
|
+
"0xb1efbe628e4a0062c6f241f2ccd3663269fafb4305d2cbe33c6f94d0aea8e195",
|
|
39
|
+
];
|
|
40
|
+
const merkleTree = new MerkleTree(leaves);
|
|
41
|
+
const hexProof = merkleTree.getHexRoot();
|
|
42
|
+
|
|
43
|
+
expect(hexProof).toBe(
|
|
44
|
+
"0x58053466a63f980211c457688c927035d61a7717b7744afe3758138ce66a6fda",
|
|
45
|
+
);
|
|
46
|
+
});
|
|
17
47
|
});
|
|
18
48
|
|
|
19
49
|
describe("getHexProof", () => {
|
|
@@ -232,8 +232,9 @@ export async function getERC721ClaimTo({
|
|
|
232
232
|
|
|
233
233
|
return claimTo({
|
|
234
234
|
contract,
|
|
235
|
-
to: account?.address || "",
|
|
235
|
+
to: claimParams.to || account?.address || "",
|
|
236
236
|
quantity: claimParams.quantity,
|
|
237
|
+
from: claimParams.from,
|
|
237
238
|
});
|
|
238
239
|
}
|
|
239
240
|
|
|
@@ -255,9 +256,10 @@ export async function getERC1155ClaimTo({
|
|
|
255
256
|
|
|
256
257
|
return claimTo({
|
|
257
258
|
contract,
|
|
258
|
-
to: account?.address || "",
|
|
259
|
+
to: claimParams.to || account?.address || "",
|
|
259
260
|
quantity: claimParams.quantity,
|
|
260
261
|
tokenId: claimParams.tokenId,
|
|
262
|
+
from: claimParams.from,
|
|
261
263
|
});
|
|
262
264
|
}
|
|
263
265
|
|
|
@@ -282,15 +284,17 @@ export async function getERC20ClaimTo({
|
|
|
282
284
|
if ("quantity" in claimParams) {
|
|
283
285
|
return claimTo({
|
|
284
286
|
contract,
|
|
285
|
-
to: account?.address || "",
|
|
287
|
+
to: claimParams.to || account?.address || "",
|
|
286
288
|
quantity: claimParams.quantity,
|
|
289
|
+
from: claimParams.from,
|
|
287
290
|
});
|
|
288
291
|
}
|
|
289
292
|
if ("quantityInWei" in claimParams) {
|
|
290
293
|
return claimTo({
|
|
291
294
|
contract,
|
|
292
|
-
to: account?.address || "",
|
|
295
|
+
to: claimParams.to || account?.address || "",
|
|
293
296
|
quantityInWei: claimParams.quantityInWei,
|
|
297
|
+
from: claimParams.from,
|
|
294
298
|
});
|
|
295
299
|
}
|
|
296
300
|
throw new Error("Missing quantity or quantityInWei");
|
|
@@ -1,20 +1,23 @@
|
|
|
1
1
|
import type { Chain } from "../../../../../../chains/types.js";
|
|
2
2
|
import type { ThirdwebClient } from "../../../../../../client/client.js";
|
|
3
|
+
import type { ClaimToParams as ClaimToParams721 } from "../../../../../../extensions/erc721/drops/write/claimTo.js";
|
|
4
|
+
import type { ClaimToParams as ClaimToParams1155 } from "../../../../../../extensions/erc1155/drops/write/claimTo.js";
|
|
3
5
|
import type { TransactionButtonProps } from "../../../../../core/hooks/transaction/transaction-button-utils.js";
|
|
4
6
|
|
|
5
|
-
export type Erc721ClaimParams = {
|
|
7
|
+
export type Erc721ClaimParams = Omit<ClaimToParams721, "to"> & {
|
|
6
8
|
type: "ERC721";
|
|
7
|
-
|
|
9
|
+
to?: string;
|
|
8
10
|
};
|
|
9
11
|
|
|
10
|
-
export type Erc1155ClaimParams = {
|
|
12
|
+
export type Erc1155ClaimParams = Omit<ClaimToParams1155, "to"> & {
|
|
11
13
|
type: "ERC1155";
|
|
12
|
-
|
|
13
|
-
tokenId: bigint;
|
|
14
|
+
to?: string;
|
|
14
15
|
};
|
|
15
16
|
|
|
16
17
|
export type Erc20ClaimParams = {
|
|
17
18
|
type: "ERC20";
|
|
19
|
+
to?: string;
|
|
20
|
+
from?: string;
|
|
18
21
|
} & ({ quantityInWei: bigint } | { quantity: string });
|
|
19
22
|
|
|
20
23
|
export type ClaimParams =
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
ZERO_ADDRESS,
|
|
3
3
|
isNativeTokenAddress,
|
|
4
4
|
} from "../../../constants/addresses.js";
|
|
5
5
|
import type { ThirdwebContract } from "../../../contract/contract.js";
|
|
@@ -69,8 +69,8 @@ export async function fetchProofsForClaimer(options: {
|
|
|
69
69
|
});
|
|
70
70
|
}),
|
|
71
71
|
);
|
|
72
|
-
const tree = new MerkleTree(hashedEntries);
|
|
73
72
|
// 5. get the proof for the claimer + the sub merkle tree root
|
|
73
|
+
const tree = new MerkleTree(hashedEntries);
|
|
74
74
|
const entry = shardData.entries.find(
|
|
75
75
|
(i) => i.address.toLowerCase() === claimer.toLowerCase(),
|
|
76
76
|
);
|
|
@@ -88,11 +88,11 @@ export async function fetchProofsForClaimer(options: {
|
|
|
88
88
|
)
|
|
89
89
|
.concat(shardData.proofs);
|
|
90
90
|
// 6. return the proof and the entry data for the contract call
|
|
91
|
-
const currencyAddress = (entry.currencyAddress ||
|
|
91
|
+
const currencyAddress = (entry.currencyAddress || ZERO_ADDRESS) as Address;
|
|
92
92
|
const currencyDecimals = await (async () => {
|
|
93
93
|
if (
|
|
94
94
|
isNativeTokenAddress(currencyAddress) ||
|
|
95
|
-
currencyAddress ===
|
|
95
|
+
currencyAddress === ZERO_ADDRESS
|
|
96
96
|
) {
|
|
97
97
|
return 18;
|
|
98
98
|
}
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.50.
|
|
1
|
+
export const version = "5.50.1-nightly-b407bc9fd8379bf304ffb963f8cb8e64493914b5-20240904000351";
|