@bosonprotocol/core-sdk 1.25.2-alpha.1 → 1.25.3-alpha.0
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/native-meta-tx/handler.d.ts.map +1 -1
- package/dist/cjs/native-meta-tx/handler.js +10 -14
- package/dist/cjs/native-meta-tx/handler.js.map +1 -1
- package/dist/cjs/native-meta-tx/tokenSpecifics.d.ts +2 -2
- package/dist/cjs/native-meta-tx/tokenSpecifics.d.ts.map +1 -1
- package/dist/cjs/native-meta-tx/tokenSpecifics.js +9 -2
- package/dist/cjs/native-meta-tx/tokenSpecifics.js.map +1 -1
- package/dist/esm/native-meta-tx/handler.d.ts.map +1 -1
- package/dist/esm/native-meta-tx/handler.js +9 -12
- package/dist/esm/native-meta-tx/handler.js.map +1 -1
- package/dist/esm/native-meta-tx/tokenSpecifics.d.ts +2 -2
- package/dist/esm/native-meta-tx/tokenSpecifics.d.ts.map +1 -1
- package/dist/esm/native-meta-tx/tokenSpecifics.js +7 -2
- package/dist/esm/native-meta-tx/tokenSpecifics.js.map +1 -1
- package/package.json +3 -3
- package/src/native-meta-tx/handler.ts +14 -19
- package/src/native-meta-tx/tokenSpecifics.ts +8 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAa,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlE,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAa,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlE,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,GAAG;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,GACA,OAAO,CAAC,YAAY,CAAC,CAiCvB;AAED,wBAAsB,oCAAoC,CAAC,IAAI,EAAE;IAC/D,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,YAAY,CAAC;CACrB,yBA6BA;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE;QACN,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,cAAc,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1E,MAAM,EAAE;YACN,WAAW,EAAE,MAAM,CAAC;YACpB,iBAAiB,EAAE,SAAS,CAAC;YAC7B,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,EAAE,YAAY,CAAC;SACpB,CAAC;KACH,CAAC;CACH,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwC/B"}
|
|
@@ -19,7 +19,6 @@ const handler_1 = require("../erc20/handler");
|
|
|
19
19
|
const interface_2 = require("../erc20/interface");
|
|
20
20
|
const ERC712_VERSION = "1"; // Is consistent with all implementations of child tokens on Polygon
|
|
21
21
|
function getNonce(args) {
|
|
22
|
-
var _a;
|
|
23
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
23
|
try {
|
|
25
24
|
const result = yield args.web3Lib.call({
|
|
@@ -32,17 +31,14 @@ function getNonce(args) {
|
|
|
32
31
|
return String(nonce);
|
|
33
32
|
}
|
|
34
33
|
catch (e) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return String(nonce);
|
|
44
|
-
}
|
|
45
|
-
throw e;
|
|
34
|
+
console.warn(`Calling getNonce() for contract ${args.contractAddress} has failed. Try with 'nonces' instead`);
|
|
35
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
36
|
+
const result = yield args.web3Lib.call({
|
|
37
|
+
to: args.contractAddress,
|
|
38
|
+
data: interface_1.alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
39
|
+
});
|
|
40
|
+
const [nonce] = interface_1.alternativeNonceIface.decodeFunctionResult("nonces", result);
|
|
41
|
+
return String(nonce);
|
|
46
42
|
}
|
|
47
43
|
});
|
|
48
44
|
}
|
|
@@ -69,14 +65,14 @@ function signNativeMetaTx(args) {
|
|
|
69
65
|
}
|
|
70
66
|
exports.signNativeMetaTx = signNativeMetaTx;
|
|
71
67
|
function signNativeMetaTxApproveExchangeToken(args) {
|
|
72
|
-
var _a
|
|
68
|
+
var _a;
|
|
73
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
70
|
const domain = {
|
|
75
71
|
name: yield (0, handler_1.getName)({
|
|
76
72
|
contractAddress: args.exchangeToken,
|
|
77
73
|
web3Lib: args.web3Lib
|
|
78
74
|
}),
|
|
79
|
-
version: ((
|
|
75
|
+
version: ((_a = (0, tokenSpecifics_1.tokenSpecifics)(args.chainId, args.exchangeToken)) === null || _a === void 0 ? void 0 : _a.ERC712_VERSION) ||
|
|
80
76
|
ERC712_VERSION
|
|
81
77
|
};
|
|
82
78
|
const nonce = yield getNonce({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAMlD,wDAAmE;AAEnE,kDAA+C;AAE/C,kDAAoE;AACpE,2CAGqB;AACrB,8CAA2D;AAC3D,kDAAgD;AAEhD,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,oEAAoE;AAEhG,SAAsB,QAAQ,CAAC,IAI9B
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAMlD,wDAAmE;AAEnE,kDAA+C;AAE/C,kDAAoE;AACpE,2CAGqB;AACrB,8CAA2D;AAC3D,kDAAgD;AAEhD,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,oEAAoE;AAEhG,SAAsB,QAAQ,CAAC,IAI9B;;QACC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBACrC,EAAE,EAAE,IAAI,CAAC,eAAe;gBACxB,IAAI,EAAE,uCAA2B,CAAC,kBAAkB,CAAC,UAAU,EAAE;oBAC/D,IAAI,CAAC,IAAI;iBACV,CAAC;aACH,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,uCAA2B,CAAC,oBAAoB,CAC9D,UAAU,EACV,MAAM,CACP,CAAC;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,IAAI,CACV,mCAAmC,IAAI,CAAC,eAAe,wCAAwC,CAChG,CAAC;YACF,2DAA2D;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBACrC,EAAE,EAAE,IAAI,CAAC,eAAe;gBACxB,IAAI,EAAE,iCAAqB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtE,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,iCAAqB,CAAC,oBAAoB,CACxD,QAAQ,EACR,MAAM,CACP,CAAC;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;IACH,CAAC;CAAA;AAhCD,4BAgCC;AAED,SAAsB,gBAAgB,CACpC,IAOC;;QAED,MAAM,mBAAmB,GAAG;YAC1B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;YACjC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO,EAAE;SAC7C,CAAC;QAEF,MAAM,mBAAmB,GAAG;YAC1B,eAAe,EAAE,mBAAmB;SACrC,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAE5D,MAAM,OAAO,GAAG;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,aAAa;YACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,IAAA,0CAA8B,kCACjD,IAAI,KACP,wBAAwB,EAAE,IAAI,CAAC,oBAAoB,EACnD,mBAAmB,EACnB,gBAAgB,EAAE,IAAI,CAAC,MAAM,EAC7B,WAAW,EAAE,iBAAiB,EAC9B,OAAO,IACP,CAAC;QAEH,uBACE,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IACtC,SAAS,EACZ;IACJ,CAAC;CAAA;AA1CD,4CA0CC;AAED,SAAsB,oCAAoC,CAAC,IAO1D;;;QACC,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,MAAM,IAAA,iBAAY,EAAC;gBACvB,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YACF,OAAO,EACL,CAAA,MAAA,IAAA,+BAAc,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,0CAAE,cAAc;gBAChE,cAAc;SACjB,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;YAC3B,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,0BAA0B,CAAC;QAChD,MAAM,iBAAiB,GAAG,sBAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE;YACjE,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,KAAK;SACX,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC;YACtB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,oBAAoB,EAAE,IAAI,CAAC,aAAa;YACxC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,KAAK;YACZ,YAAY;YACZ,iBAAiB;YACjB,MAAM;SACP,CAAC,CAAC;;CACJ;AApCD,oFAoCC;AAED,SAAsB,0BAA0B,CAAC,IAchD;;QACC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAElD,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAC3B,MAAM,CAAC,MAAM,CAAC,UAAU,EACxB,MAAM,CAAC,MAAM,CAAC,MAAM,EACpB,MAAM,CAAC,MAAM,CAAC,KAAK,CACpB,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC;YACtD,EAAE,EAAE,eAAe;YACnB,MAAM,EAAE;gBACN,MAAM,CAAC,MAAM,CAAC,WAAW;gBACzB,MAAM,CAAC,MAAM,CAAC,iBAAiB;gBAC/B,MAAM,CAAC,MAAM,CAAC,IAAI;gBAClB,MAAM,CAAC,MAAM,CAAC,IAAI;gBAClB,MAAM,CAAC,MAAM,CAAC,IAAI;aACnB;YACD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,GAAS,EAAE;gBACf,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC;oBACvC,SAAS,EAAE,OAAO;oBAClB,eAAe,EAAE,eAAe,CAAC,MAAM;iBACxC,CAAC,CAAC;gBAEH,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;gBACzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBAC1E,OAAO;oBACL,EAAE,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,EAAE,KAAI,eAAe;oBACpC,IAAI,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,MAAM,CAAC,MAAM,CAAC,WAAW;oBAClD,eAAe,EAAE,MAAM;oBACvB,IAAI,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,EAAE;oBAC3B,iBAAiB,EAAE,qBAAS,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;iBACjE,CAAC;YACJ,CAAC,CAAA;YACD,IAAI,EAAE,eAAe,CAAC,MAAM;SAC7B,CAAC;IACJ,CAAC;CAAA;AAtDD,gEAsDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
declare type TokenSpecifics = {
|
|
2
2
|
ERC712_VERSION?: string;
|
|
3
3
|
};
|
|
4
|
-
/**
|
|
5
|
-
export declare const tokenSpecifics:
|
|
4
|
+
/** Returns the configuration items that are specific to some tokens on some chain */
|
|
5
|
+
export declare const tokenSpecifics: (chainId: number, tokenAddress: string) => TokenSpecifics;
|
|
6
6
|
export {};
|
|
7
7
|
//# sourceMappingURL=tokenSpecifics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenSpecifics.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAAA,aAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAAA,aAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAcF,qFAAqF;AACrF,eAAO,MAAM,cAAc,YAAa,MAAM,gBAAgB,MAAM,mBAEnE,CAAC"}
|
|
@@ -2,13 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.tokenSpecifics = void 0;
|
|
4
4
|
/** Configuration items that are specific to some tokens on some chain */
|
|
5
|
-
|
|
5
|
+
const _tokenSpecifics = {
|
|
6
6
|
80001: {
|
|
7
7
|
// MUMBAI
|
|
8
|
-
"
|
|
8
|
+
"0xe6b8a5cf854791412c1f6efc7caf629f5df1c747": {
|
|
9
|
+
// LOWER CASE
|
|
9
10
|
// USDC Token
|
|
10
11
|
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
11
12
|
}
|
|
12
13
|
}
|
|
13
14
|
};
|
|
15
|
+
/** Returns the configuration items that are specific to some tokens on some chain */
|
|
16
|
+
const tokenSpecifics = (chainId, tokenAddress) => {
|
|
17
|
+
var _a;
|
|
18
|
+
return (_a = _tokenSpecifics[chainId]) === null || _a === void 0 ? void 0 : _a[tokenAddress.toLowerCase()];
|
|
19
|
+
};
|
|
20
|
+
exports.tokenSpecifics = tokenSpecifics;
|
|
14
21
|
//# sourceMappingURL=tokenSpecifics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":";;;AAIA,yEAAyE;
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":";;;AAIA,yEAAyE;AACzE,MAAM,eAAe,GAAmD;IACtE,KAAK,EAAE;QACL,SAAS;QACT,4CAA4C,EAAE;YAC5C,aAAa;YACb,aAAa;YACb,cAAc,EAAE,GAAG,CAAC,yDAAyD;SAC9E;KACF;CACF,CAAC;AAEF,qFAAqF;AAC9E,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAE,EAAE;;IACtE,OAAO,MAAA,eAAe,CAAC,OAAO,CAAC,0CAAG,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;AAChE,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAa,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlE,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAa,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlE,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,GAAG;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,GACA,OAAO,CAAC,YAAY,CAAC,CAiCvB;AAED,wBAAsB,oCAAoC,CAAC,IAAI,EAAE;IAC/D,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,YAAY,CAAC;CACrB,yBA6BA;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE;QACN,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,cAAc,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1E,MAAM,EAAE;YACN,WAAW,EAAE,MAAM,CAAC;YACpB,iBAAiB,EAAE,SAAS,CAAC;YAC7B,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,EAAE,YAAY,CAAC;SACpB,CAAC;KACH,CAAC;CACH,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwC/B"}
|
|
@@ -18,17 +18,14 @@ export async function getNonce(args) {
|
|
|
18
18
|
return String(nonce);
|
|
19
19
|
}
|
|
20
20
|
catch (e) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return String(nonce);
|
|
30
|
-
}
|
|
31
|
-
throw e;
|
|
21
|
+
console.warn(`Calling getNonce() for contract ${args.contractAddress} has failed. Try with 'nonces' instead`);
|
|
22
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
23
|
+
const result = await args.web3Lib.call({
|
|
24
|
+
to: args.contractAddress,
|
|
25
|
+
data: alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
26
|
+
});
|
|
27
|
+
const [nonce] = alternativeNonceIface.decodeFunctionResult("nonces", result);
|
|
28
|
+
return String(nonce);
|
|
32
29
|
}
|
|
33
30
|
}
|
|
34
31
|
export async function signNativeMetaTx(args) {
|
|
@@ -66,7 +63,7 @@ export async function signNativeMetaTxApproveExchangeToken(args) {
|
|
|
66
63
|
contractAddress: args.exchangeToken,
|
|
67
64
|
web3Lib: args.web3Lib
|
|
68
65
|
}),
|
|
69
|
-
version: tokenSpecifics
|
|
66
|
+
version: tokenSpecifics(args.chainId, args.exchangeToken)?.ERC712_VERSION ||
|
|
70
67
|
ERC712_VERSION
|
|
71
68
|
};
|
|
72
69
|
const nonce = await getNonce({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAgB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,oEAAoE;AAEhG,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAI9B;IACC,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YACrC,EAAE,EAAE,IAAI,CAAC,eAAe;YACxB,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,UAAU,EAAE;gBAC/D,IAAI,CAAC,IAAI;aACV,CAAC;SACH,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,2BAA2B,CAAC,oBAAoB,CAC9D,UAAU,EACV,MAAM,CACP,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;KACtB;IAAC,OAAO,CAAC,EAAE;QACV,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
declare type TokenSpecifics = {
|
|
2
2
|
ERC712_VERSION?: string;
|
|
3
3
|
};
|
|
4
|
-
/**
|
|
5
|
-
export declare const tokenSpecifics:
|
|
4
|
+
/** Returns the configuration items that are specific to some tokens on some chain */
|
|
5
|
+
export declare const tokenSpecifics: (chainId: number, tokenAddress: string) => TokenSpecifics;
|
|
6
6
|
export {};
|
|
7
7
|
//# sourceMappingURL=tokenSpecifics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenSpecifics.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAAA,aAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAAA,aAAK,cAAc,GAAG;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAcF,qFAAqF;AACrF,eAAO,MAAM,cAAc,YAAa,MAAM,gBAAgB,MAAM,mBAEnE,CAAC"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
/** Configuration items that are specific to some tokens on some chain */
|
|
2
|
-
|
|
2
|
+
const _tokenSpecifics = {
|
|
3
3
|
80001: {
|
|
4
4
|
// MUMBAI
|
|
5
|
-
"
|
|
5
|
+
"0xe6b8a5cf854791412c1f6efc7caf629f5df1c747": {
|
|
6
|
+
// LOWER CASE
|
|
6
7
|
// USDC Token
|
|
7
8
|
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
};
|
|
12
|
+
/** Returns the configuration items that are specific to some tokens on some chain */
|
|
13
|
+
export const tokenSpecifics = (chainId, tokenAddress) => {
|
|
14
|
+
return _tokenSpecifics[chainId]?.[tokenAddress.toLowerCase()];
|
|
15
|
+
};
|
|
11
16
|
//# sourceMappingURL=tokenSpecifics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAIA,yEAAyE;AACzE,MAAM,
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAIA,yEAAyE;AACzE,MAAM,eAAe,GAAmD;IACtE,KAAK,EAAE;QACL,SAAS;QACT,4CAA4C,EAAE;YAC5C,aAAa;YACb,aAAa;YACb,cAAc,EAAE,GAAG,CAAC,yDAAyD;SAC9E;KACF;CACF,CAAC;AAEF,qFAAqF;AACrF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAE,EAAE;IACtE,OAAO,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;AAChE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bosonprotocol/core-sdk",
|
|
3
|
-
"version": "1.25.
|
|
3
|
+
"version": "1.25.3-alpha.0",
|
|
4
4
|
"description": "Facilitates interaction with the contracts and subgraphs of the Boson Protocol",
|
|
5
5
|
"main": "./dist/cjs/index.js",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"access": "public"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@bosonprotocol/common": "^1.22.0
|
|
36
|
+
"@bosonprotocol/common": "^1.22.0",
|
|
37
37
|
"@ethersproject/abi": "^5.5.0",
|
|
38
38
|
"@ethersproject/address": "^5.5.0",
|
|
39
39
|
"@ethersproject/bignumber": "^5.5.0",
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"ts-jest": "^27.1.3",
|
|
55
55
|
"typescript": "^4.5.5"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "93356d7635ea7f2bbd6f528105fd0130e1ad9a03"
|
|
58
58
|
}
|
|
@@ -36,24 +36,19 @@ export async function getNonce(args: {
|
|
|
36
36
|
);
|
|
37
37
|
return String(nonce);
|
|
38
38
|
} catch (e) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
result
|
|
53
|
-
);
|
|
54
|
-
return String(nonce);
|
|
55
|
-
}
|
|
56
|
-
throw e;
|
|
39
|
+
console.warn(
|
|
40
|
+
`Calling getNonce() for contract ${args.contractAddress} has failed. Try with 'nonces' instead`
|
|
41
|
+
);
|
|
42
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
43
|
+
const result = await args.web3Lib.call({
|
|
44
|
+
to: args.contractAddress,
|
|
45
|
+
data: alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
46
|
+
});
|
|
47
|
+
const [nonce] = alternativeNonceIface.decodeFunctionResult(
|
|
48
|
+
"nonces",
|
|
49
|
+
result
|
|
50
|
+
);
|
|
51
|
+
return String(nonce);
|
|
57
52
|
}
|
|
58
53
|
}
|
|
59
54
|
|
|
@@ -115,7 +110,7 @@ export async function signNativeMetaTxApproveExchangeToken(args: {
|
|
|
115
110
|
web3Lib: args.web3Lib
|
|
116
111
|
}),
|
|
117
112
|
version:
|
|
118
|
-
tokenSpecifics
|
|
113
|
+
tokenSpecifics(args.chainId, args.exchangeToken)?.ERC712_VERSION ||
|
|
119
114
|
ERC712_VERSION
|
|
120
115
|
};
|
|
121
116
|
const nonce = await getNonce({
|
|
@@ -3,12 +3,18 @@ type TokenSpecifics = {
|
|
|
3
3
|
};
|
|
4
4
|
|
|
5
5
|
/** Configuration items that are specific to some tokens on some chain */
|
|
6
|
-
|
|
6
|
+
const _tokenSpecifics: Record<number, Record<string, TokenSpecifics>> = {
|
|
7
7
|
80001: {
|
|
8
8
|
// MUMBAI
|
|
9
|
-
"
|
|
9
|
+
"0xe6b8a5cf854791412c1f6efc7caf629f5df1c747": {
|
|
10
|
+
// LOWER CASE
|
|
10
11
|
// USDC Token
|
|
11
12
|
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
12
13
|
}
|
|
13
14
|
}
|
|
14
15
|
};
|
|
16
|
+
|
|
17
|
+
/** Returns the configuration items that are specific to some tokens on some chain */
|
|
18
|
+
export const tokenSpecifics = (chainId: number, tokenAddress: string) => {
|
|
19
|
+
return _tokenSpecifics[chainId]?.[tokenAddress.toLowerCase()];
|
|
20
|
+
};
|