thirdweb 5.29.1-nightly-6746416db9a99634916a039a23ae26d877821d74-20240613231259 → 5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952
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/extensions/erc721/write/sigMint.js +25 -2
- package/dist/cjs/extensions/erc721/write/sigMint.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/extensions/erc721/write/sigMint.js +25 -2
- package/dist/esm/extensions/erc721/write/sigMint.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/extensions/erc721/write/sigMint.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/extensions/erc721/write/sigMint.ts +33 -2
- package/src/extensions/erc721/write/sigMint721.test.ts +28 -6
- package/src/version.ts +1 -1
- package/src/wallets/smart/smart-wallet-zksync.test.ts +3 -3
|
@@ -110,15 +110,38 @@ async function generateMintSignature(options) {
|
|
|
110
110
|
]);
|
|
111
111
|
const startTime = mintRequest.validityStartTimestamp || new Date(0);
|
|
112
112
|
const endTime = mintRequest.validityEndTimestamp || (0, date_js_1.tenYearsFromNow)();
|
|
113
|
+
let saleRecipient;
|
|
114
|
+
if (mintRequest.primarySaleRecipient?.length === 0 ||
|
|
115
|
+
!mintRequest.primarySaleRecipient) {
|
|
116
|
+
const { primarySaleRecipient } = await Promise.resolve().then(() => require("../../common/__generated__/IPrimarySale/read/primarySaleRecipient.js"));
|
|
117
|
+
saleRecipient = await primarySaleRecipient({
|
|
118
|
+
contract,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
saleRecipient = mintRequest.primarySaleRecipient;
|
|
123
|
+
}
|
|
124
|
+
let royaltyRecipient;
|
|
125
|
+
if (mintRequest.royaltyRecipient?.length === 0 ||
|
|
126
|
+
!mintRequest.royaltyRecipient) {
|
|
127
|
+
const { getDefaultRoyaltyInfo } = await Promise.resolve().then(() => require("../../common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.js"));
|
|
128
|
+
const royaltyInfo = await getDefaultRoyaltyInfo({
|
|
129
|
+
contract,
|
|
130
|
+
});
|
|
131
|
+
royaltyRecipient = royaltyInfo[0];
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
royaltyRecipient = mintRequest.royaltyRecipient;
|
|
135
|
+
}
|
|
113
136
|
const payload = {
|
|
114
137
|
uri,
|
|
115
138
|
currency,
|
|
116
139
|
uid,
|
|
117
140
|
price,
|
|
118
141
|
to: mintRequest.to,
|
|
119
|
-
royaltyRecipient:
|
|
142
|
+
royaltyRecipient: royaltyRecipient,
|
|
120
143
|
royaltyBps: (0, bigint_js_1.toBigInt)(mintRequest.royaltyBps || 0),
|
|
121
|
-
primarySaleRecipient:
|
|
144
|
+
primarySaleRecipient: saleRecipient,
|
|
122
145
|
validityStartTimestamp: (0, date_js_1.dateToSeconds)(startTime),
|
|
123
146
|
validityEndTimestamp: (0, date_js_1.dateToSeconds)(endTime),
|
|
124
147
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sigMint.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.ts"],"names":[],"mappings":";;;AAEA,kEAGyC;AAGzC,wDAAoD;AACpD,oDAAwE;AAExE,wDAA0D;AAE1D,2GAG0E;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,iBAAiB,CAC/B,OAAwD;IAExD,MAAM,KAAK,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC1D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK;QACvB,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,IAAA,wCAA0B,EAAC;QAChC,GAAG,OAAO;QACV,SAAS,EAAE;YACT,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAZD,8CAYC;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACI,KAAK,UAAU,qBAAqB,CACzC,OAAqC;IAErC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,mCAAoB,CAAC;IAC9D,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,yBAAyB;QACzB,CAAC,KAAK,IAAI,EAAE;YACV,oCAAoC;YACpC,IAAI,YAAY,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1D,OAAO,WAAW,CAAC,UAAU,CAAC;YAChC,CAAC;YACD,0CAA0C;YAC1C,IAAI,OAAO,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAC7B,mDAAmD,EACpD,CAAC;gBACF,OAAO,MAAM,kBAAkB,CAAC;oBAC9B,MAAM,EAAE,WAAW,CAAC,KAAK;oBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,YAAY,EAAE,QAAQ;iBACvB,CAAC,CAAC;YACL,CAAC;YACD,4DAA4D;YAC5D,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;QACJ,MAAM;QACN,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;gBAC9B,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC7C,qEAAqE;oBACrE,MAAM,EAAE,MAAM,EAAE,GAAG,2CAAa,4BAA4B,EAAC,CAAC;oBAC9D,OAAO,MAAM,MAAM,CAAC;wBAClB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;wBAC/B,KAAK,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;qBAC9B,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC9B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;QACJ,kBAAkB;QAClB,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,IAAA,0BAAc,GAAE,CAAC;KAC5C,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,WAAW,CAAC,sBAAsB,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,WAAW,CAAC,oBAAoB,IAAI,IAAA,yBAAe,GAAE,CAAC;IAEtE,MAAM,
|
|
1
|
+
{"version":3,"file":"sigMint.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.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.29.1-nightly-
|
|
4
|
+
exports.version = "5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -106,15 +106,38 @@ export async function generateMintSignature(options) {
|
|
|
106
106
|
]);
|
|
107
107
|
const startTime = mintRequest.validityStartTimestamp || new Date(0);
|
|
108
108
|
const endTime = mintRequest.validityEndTimestamp || tenYearsFromNow();
|
|
109
|
+
let saleRecipient;
|
|
110
|
+
if (mintRequest.primarySaleRecipient?.length === 0 ||
|
|
111
|
+
!mintRequest.primarySaleRecipient) {
|
|
112
|
+
const { primarySaleRecipient } = await import("../../common/__generated__/IPrimarySale/read/primarySaleRecipient.js");
|
|
113
|
+
saleRecipient = await primarySaleRecipient({
|
|
114
|
+
contract,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
saleRecipient = mintRequest.primarySaleRecipient;
|
|
119
|
+
}
|
|
120
|
+
let royaltyRecipient;
|
|
121
|
+
if (mintRequest.royaltyRecipient?.length === 0 ||
|
|
122
|
+
!mintRequest.royaltyRecipient) {
|
|
123
|
+
const { getDefaultRoyaltyInfo } = await import("../../common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.js");
|
|
124
|
+
const royaltyInfo = await getDefaultRoyaltyInfo({
|
|
125
|
+
contract,
|
|
126
|
+
});
|
|
127
|
+
royaltyRecipient = royaltyInfo[0];
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
royaltyRecipient = mintRequest.royaltyRecipient;
|
|
131
|
+
}
|
|
109
132
|
const payload = {
|
|
110
133
|
uri,
|
|
111
134
|
currency,
|
|
112
135
|
uid,
|
|
113
136
|
price,
|
|
114
137
|
to: mintRequest.to,
|
|
115
|
-
royaltyRecipient:
|
|
138
|
+
royaltyRecipient: royaltyRecipient,
|
|
116
139
|
royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
|
|
117
|
-
primarySaleRecipient:
|
|
140
|
+
primarySaleRecipient: saleRecipient,
|
|
118
141
|
validityStartTimestamp: dateToSeconds(startTime),
|
|
119
142
|
validityEndTimestamp: dateToSeconds(endTime),
|
|
120
143
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sigMint.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAEL,iBAAiB,IAAI,0BAA0B,GAChD,MAAM,kEAAkE,CAAC;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAAwD;IAExD,MAAM,KAAK,GAAG,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC1D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK;QACvB,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,0BAA0B,CAAC;QAChC,GAAG,OAAO;QACV,SAAS,EAAE;YACT,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAqC;IAErC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAEnD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,oBAAoB,CAAC;IAC9D,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1C,yBAAyB;QACzB,CAAC,KAAK,IAAI,EAAE;YACV,oCAAoC;YACpC,IAAI,YAAY,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1D,OAAO,WAAW,CAAC,UAAU,CAAC;YAChC,CAAC;YACD,0CAA0C;YAC1C,IAAI,OAAO,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,mDAAmD,CACpD,CAAC;gBACF,OAAO,MAAM,kBAAkB,CAAC;oBAC9B,MAAM,EAAE,WAAW,CAAC,KAAK;oBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,YAAY,EAAE,QAAQ;iBACvB,CAAC,CAAC;YACL,CAAC;YACD,4DAA4D;YAC5D,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;QACJ,MAAM;QACN,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;gBAC9B,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC7C,qEAAqE;oBACrE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;oBAC9D,OAAO,MAAM,MAAM,CAAC;wBAClB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;wBAC/B,KAAK,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;qBAC9B,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC9B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,EAAE;QACJ,kBAAkB;QAClB,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,cAAc,EAAE,CAAC;KAC5C,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,WAAW,CAAC,sBAAsB,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,WAAW,CAAC,oBAAoB,IAAI,eAAe,EAAE,CAAC;IAEtE,MAAM,
|
|
1
|
+
{"version":3,"file":"sigMint.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.29.1-nightly-
|
|
1
|
+
export const version = "5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sigMint.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,OAAO,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAKhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,kEAAkE,CAAC;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,CAAC,uBAAuB,CAAC,kMAWzD;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,4BAA4B;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sigMint.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/erc721/write/sigMint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,OAAO,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAKhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAG5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,kEAAkE,CAAC;AAE1E;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,CAAC,uBAAuB,CAAC,kMAWzD;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,4BAA4B;;;;;;;;;;;;;;GAyGtC;AAQD,KAAK,oBAAoB,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sBAAsB,CAAC,EAAE,IAAI,CAAC;IAC9B,oBAAoB,CAAC,EAAE,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,GAAG,CAAC;CACX,CAAC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.29.1-nightly-
|
|
1
|
+
export declare const version = "5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.29.1-nightly-
|
|
3
|
+
"version": "5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -135,15 +135,46 @@ export async function generateMintSignature(
|
|
|
135
135
|
const startTime = mintRequest.validityStartTimestamp || new Date(0);
|
|
136
136
|
const endTime = mintRequest.validityEndTimestamp || tenYearsFromNow();
|
|
137
137
|
|
|
138
|
+
let saleRecipient: Address;
|
|
139
|
+
if (
|
|
140
|
+
mintRequest.primarySaleRecipient?.length === 0 ||
|
|
141
|
+
!mintRequest.primarySaleRecipient
|
|
142
|
+
) {
|
|
143
|
+
const { primarySaleRecipient } = await import(
|
|
144
|
+
"../../common/__generated__/IPrimarySale/read/primarySaleRecipient.js"
|
|
145
|
+
);
|
|
146
|
+
saleRecipient = await primarySaleRecipient({
|
|
147
|
+
contract,
|
|
148
|
+
});
|
|
149
|
+
} else {
|
|
150
|
+
saleRecipient = mintRequest.primarySaleRecipient;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
let royaltyRecipient: Address;
|
|
154
|
+
if (
|
|
155
|
+
mintRequest.royaltyRecipient?.length === 0 ||
|
|
156
|
+
!mintRequest.royaltyRecipient
|
|
157
|
+
) {
|
|
158
|
+
const { getDefaultRoyaltyInfo } = await import(
|
|
159
|
+
"../../common/__generated__/IRoyalty/read/getDefaultRoyaltyInfo.js"
|
|
160
|
+
);
|
|
161
|
+
const royaltyInfo = await getDefaultRoyaltyInfo({
|
|
162
|
+
contract,
|
|
163
|
+
});
|
|
164
|
+
royaltyRecipient = royaltyInfo[0];
|
|
165
|
+
} else {
|
|
166
|
+
royaltyRecipient = mintRequest.royaltyRecipient;
|
|
167
|
+
}
|
|
168
|
+
|
|
138
169
|
const payload: PayloadType = {
|
|
139
170
|
uri,
|
|
140
171
|
currency,
|
|
141
172
|
uid,
|
|
142
173
|
price,
|
|
143
174
|
to: mintRequest.to,
|
|
144
|
-
royaltyRecipient:
|
|
175
|
+
royaltyRecipient: royaltyRecipient,
|
|
145
176
|
royaltyBps: toBigInt(mintRequest.royaltyBps || 0),
|
|
146
|
-
primarySaleRecipient:
|
|
177
|
+
primarySaleRecipient: saleRecipient,
|
|
147
178
|
validityStartTimestamp: dateToSeconds(startTime),
|
|
148
179
|
validityEndTimestamp: dateToSeconds(endTime),
|
|
149
180
|
};
|
|
@@ -4,6 +4,7 @@ import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
|
|
|
4
4
|
import {
|
|
5
5
|
TEST_ACCOUNT_A,
|
|
6
6
|
TEST_ACCOUNT_B,
|
|
7
|
+
TEST_ACCOUNT_C,
|
|
7
8
|
} from "../../../../test/src/test-wallets.js";
|
|
8
9
|
import { NATIVE_TOKEN_ADDRESS } from "../../../constants/addresses.js";
|
|
9
10
|
import {
|
|
@@ -34,6 +35,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
|
34
35
|
params: {
|
|
35
36
|
name: "Test",
|
|
36
37
|
symbol: "TST",
|
|
38
|
+
royaltyRecipient: TEST_ACCOUNT_C.address,
|
|
39
|
+
saleRecipient: TEST_ACCOUNT_B.address,
|
|
37
40
|
},
|
|
38
41
|
type: "TokenERC721",
|
|
39
42
|
}),
|
|
@@ -93,13 +96,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
|
93
96
|
});
|
|
94
97
|
|
|
95
98
|
expect(payload.to).toBe("0x70997970C51812dc3A010C7d01b50e0d17dc79C8");
|
|
96
|
-
expect(payload.royaltyRecipient).toBe(
|
|
97
|
-
"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
|
98
|
-
);
|
|
99
|
+
expect(payload.royaltyRecipient).toBe(TEST_ACCOUNT_C.address);
|
|
99
100
|
expect(payload.royaltyBps).toBe(0n);
|
|
100
|
-
expect(payload.primarySaleRecipient).toBe(
|
|
101
|
-
"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
|
102
|
-
);
|
|
101
|
+
expect(payload.primarySaleRecipient).toBe(TEST_ACCOUNT_B.address);
|
|
103
102
|
expect(payload.uri).toBe("https://example.com/token");
|
|
104
103
|
expect(payload.price).toBe(0n);
|
|
105
104
|
expect(payload.currency).toBe(NATIVE_TOKEN_ADDRESS);
|
|
@@ -156,5 +155,28 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
|
156
155
|
);
|
|
157
156
|
expect(signature.length).toBe(132);
|
|
158
157
|
});
|
|
158
|
+
|
|
159
|
+
it("should default sale recipient to the contract's primarySaleRecipient when empty", async () => {
|
|
160
|
+
const { payload, signature } = await generateMintSignature({
|
|
161
|
+
mintRequest: {
|
|
162
|
+
to: TEST_ACCOUNT_B.address,
|
|
163
|
+
royaltyBps: 500,
|
|
164
|
+
metadata: "https://example.com/token",
|
|
165
|
+
price: "0.2",
|
|
166
|
+
currency: erc20TokenContract.address,
|
|
167
|
+
validityStartTimestamp: new Date(1635724800),
|
|
168
|
+
validityEndTimestamp: new Date(1867260800),
|
|
169
|
+
uid: toHex("abcdef1234567890", { size: 32 }),
|
|
170
|
+
primarySaleRecipient: "",
|
|
171
|
+
royaltyRecipient: "",
|
|
172
|
+
},
|
|
173
|
+
account: TEST_ACCOUNT_A,
|
|
174
|
+
contract: erc721Contract,
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
expect(payload.royaltyRecipient).toBe(TEST_ACCOUNT_C.address);
|
|
178
|
+
expect(payload.primarySaleRecipient).toBe(TEST_ACCOUNT_B.address);
|
|
179
|
+
expect(signature.length).toBe(132);
|
|
180
|
+
});
|
|
159
181
|
},
|
|
160
182
|
);
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.29.1-nightly-
|
|
1
|
+
export const version = "5.29.1-nightly-502c53ac0b771d4ac502196be04c3d96665ace02-20240614054952";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { beforeAll, describe, expect, it } from "vitest";
|
|
2
2
|
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
|
3
|
-
import {
|
|
3
|
+
import { ANVIL_PKEY_B } from "../../../test/src/test-wallets.js";
|
|
4
4
|
import { zkSyncSepolia } from "../../chains/chain-definitions/zksync-sepolia.js";
|
|
5
5
|
import { defineChain } from "../../chains/utils.js";
|
|
6
6
|
import { getContract } from "../../contract/contract.js";
|
|
@@ -25,7 +25,7 @@ const contract = getContract({
|
|
|
25
25
|
client,
|
|
26
26
|
});
|
|
27
27
|
|
|
28
|
-
describe.runIf(process.env.TW_SECRET_KEY)(
|
|
28
|
+
describe.runIf(process.env.TW_SECRET_KEY).skip(
|
|
29
29
|
"SmartWallet zksync tests",
|
|
30
30
|
{
|
|
31
31
|
retry: 0,
|
|
@@ -35,7 +35,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
|
35
35
|
beforeAll(async () => {
|
|
36
36
|
personalAccount = privateKeyToAccount({
|
|
37
37
|
client,
|
|
38
|
-
privateKey:
|
|
38
|
+
privateKey: ANVIL_PKEY_B,
|
|
39
39
|
});
|
|
40
40
|
wallet = smartWallet({
|
|
41
41
|
chain,
|