@bosonprotocol/core-sdk 1.22.0-alpha.7 → 1.22.1-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 +28 -9
- package/dist/cjs/native-meta-tx/handler.js.map +1 -1
- package/dist/cjs/native-meta-tx/interface.d.ts +1 -0
- package/dist/cjs/native-meta-tx/interface.d.ts.map +1 -1
- package/dist/cjs/native-meta-tx/interface.js +24 -1
- package/dist/cjs/native-meta-tx/interface.js.map +1 -1
- package/dist/cjs/native-meta-tx/tokenSpecifics.d.ts +7 -0
- package/dist/cjs/native-meta-tx/tokenSpecifics.d.ts.map +1 -0
- package/dist/cjs/native-meta-tx/tokenSpecifics.js +14 -0
- package/dist/cjs/native-meta-tx/tokenSpecifics.js.map +1 -0
- package/dist/esm/native-meta-tx/handler.d.ts.map +1 -1
- package/dist/esm/native-meta-tx/handler.js +27 -10
- package/dist/esm/native-meta-tx/handler.js.map +1 -1
- package/dist/esm/native-meta-tx/interface.d.ts +1 -0
- package/dist/esm/native-meta-tx/interface.d.ts.map +1 -1
- package/dist/esm/native-meta-tx/interface.js +23 -0
- package/dist/esm/native-meta-tx/interface.js.map +1 -1
- package/dist/esm/native-meta-tx/tokenSpecifics.d.ts +7 -0
- package/dist/esm/native-meta-tx/tokenSpecifics.d.ts.map +1 -0
- package/dist/esm/native-meta-tx/tokenSpecifics.js +11 -0
- package/dist/esm/native-meta-tx/tokenSpecifics.js.map +1 -0
- package/package.json +3 -3
- package/src/native-meta-tx/handler.ts +40 -14
- package/src/native-meta-tx/interface.ts +25 -0
- package/src/native-meta-tx/tokenSpecifics.ts +14 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"
|
|
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,CAiClB;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,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QACzD,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"}
|
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.relayNativeMetaTransaction = exports.signNativeMetaTxApproveExchangeToken = exports.signNativeMetaTx = exports.getNonce = void 0;
|
|
13
|
+
const tokenSpecifics_1 = require("./tokenSpecifics");
|
|
13
14
|
const bignumber_1 = require("@ethersproject/bignumber");
|
|
14
15
|
const biconomy_1 = require("../meta-tx/biconomy");
|
|
15
16
|
const signature_1 = require("../utils/signature");
|
|
@@ -18,15 +19,31 @@ const handler_1 = require("../erc20/handler");
|
|
|
18
19
|
const interface_2 = require("../erc20/interface");
|
|
19
20
|
const ERC712_VERSION = "1"; // Is consistent with all implementations of child tokens on Polygon
|
|
20
21
|
function getNonce(args) {
|
|
22
|
+
var _a;
|
|
21
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
try {
|
|
25
|
+
const result = yield args.web3Lib.call({
|
|
26
|
+
to: args.contractAddress,
|
|
27
|
+
data: interface_1.nativeMetaTransactionsIface.encodeFunctionData("getNonce", [
|
|
28
|
+
args.user
|
|
29
|
+
])
|
|
30
|
+
});
|
|
31
|
+
const [nonce] = interface_1.nativeMetaTransactionsIface.decodeFunctionResult("getNonce", result);
|
|
32
|
+
return String(nonce);
|
|
33
|
+
}
|
|
34
|
+
catch (e) {
|
|
35
|
+
// Check if the error means the 'getNonce()' function does not exists in the contract
|
|
36
|
+
if ((_a = e.message) === null || _a === void 0 ? void 0 : _a.match(/Transaction reverted without a reason string/)) {
|
|
37
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
38
|
+
const result = yield args.web3Lib.call({
|
|
39
|
+
to: args.contractAddress,
|
|
40
|
+
data: interface_1.alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
41
|
+
});
|
|
42
|
+
const [nonce] = interface_1.alternativeNonceIface.decodeFunctionResult("nonces", result);
|
|
43
|
+
return String(nonce);
|
|
44
|
+
}
|
|
45
|
+
throw e;
|
|
46
|
+
}
|
|
30
47
|
});
|
|
31
48
|
}
|
|
32
49
|
exports.getNonce = getNonce;
|
|
@@ -52,13 +69,15 @@ function signNativeMetaTx(args) {
|
|
|
52
69
|
}
|
|
53
70
|
exports.signNativeMetaTx = signNativeMetaTx;
|
|
54
71
|
function signNativeMetaTxApproveExchangeToken(args) {
|
|
72
|
+
var _a, _b;
|
|
55
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
74
|
const domain = {
|
|
57
75
|
name: yield (0, handler_1.getName)({
|
|
58
76
|
contractAddress: args.exchangeToken,
|
|
59
77
|
web3Lib: args.web3Lib
|
|
60
78
|
}),
|
|
61
|
-
version: ERC712_VERSION
|
|
79
|
+
version: ((_b = (_a = tokenSpecifics_1.tokenSpecifics[args.chainId]) === null || _a === void 0 ? void 0 : _a[args.exchangeToken]) === null || _b === void 0 ? void 0 : _b.ERC712_VERSION) ||
|
|
80
|
+
ERC712_VERSION
|
|
62
81
|
};
|
|
63
82
|
const nonce = yield getNonce({
|
|
64
83
|
contractAddress: args.exchangeToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
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,qFAAqF;YACrF,IACE,MAAC,CAAC,CAAC,OAAkB,0CAAE,KAAK,CAC1B,8CAA8C,CAC/C,EACD;gBACA,2DAA2D;gBAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;oBACrC,EAAE,EAAE,IAAI,CAAC,eAAe;oBACxB,IAAI,EAAE,iCAAqB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACtE,CAAC,CAAC;gBACH,MAAM,CAAC,KAAK,CAAC,GAAG,iCAAqB,CAAC,oBAAoB,CACxD,QAAQ,EACR,MAAM,CACP,CAAC;gBACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YACD,MAAM,CAAC,CAAC;SACT;;CACF;AArCD,4BAqCC;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,MAAA,+BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,0CAAG,IAAI,CAAC,aAAa,CAAC,0CAAE,cAAc;gBAClE,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,eAAO,MAAM,2BAA2B,WAEvC,CAAC"}
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,eAAO,MAAM,2BAA2B,WAEvC,CAAC;AAyBF,eAAO,MAAM,qBAAqB,WAA2B,CAAC"}
|
|
@@ -1,7 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.nativeMetaTransactionsIface = void 0;
|
|
3
|
+
exports.alternativeNonceIface = exports.nativeMetaTransactionsIface = void 0;
|
|
4
4
|
const common_1 = require("@bosonprotocol/common");
|
|
5
5
|
const abi_1 = require("@ethersproject/abi");
|
|
6
6
|
exports.nativeMetaTransactionsIface = new abi_1.Interface(common_1.abis.NativeMetaTransactionABI);
|
|
7
|
+
const noncesAbi = [
|
|
8
|
+
{
|
|
9
|
+
inputs: [
|
|
10
|
+
{
|
|
11
|
+
internalType: "address",
|
|
12
|
+
name: "owner",
|
|
13
|
+
type: "address"
|
|
14
|
+
}
|
|
15
|
+
],
|
|
16
|
+
name: "nonces",
|
|
17
|
+
outputs: [
|
|
18
|
+
{
|
|
19
|
+
internalType: "uint256",
|
|
20
|
+
name: "",
|
|
21
|
+
type: "uint256"
|
|
22
|
+
}
|
|
23
|
+
],
|
|
24
|
+
stateMutability: "view",
|
|
25
|
+
type: "function"
|
|
26
|
+
}
|
|
27
|
+
];
|
|
28
|
+
// Some tokens (USDC) does not implement getNonces(), but nonces() instead
|
|
29
|
+
exports.alternativeNonceIface = new abi_1.Interface(noncesAbi);
|
|
7
30
|
//# sourceMappingURL=interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,4CAA+C;AAElC,QAAA,2BAA2B,GAAG,IAAI,eAAS,CACtD,aAAI,CAAC,wBAAwB,CAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,4CAA+C;AAElC,QAAA,2BAA2B,GAAG,IAAI,eAAS,CACtD,aAAI,CAAC,wBAAwB,CAC9B,CAAC;AAEF,MAAM,SAAS,GAAG;IAChB;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAEF,0EAA0E;AAC7D,QAAA,qBAAqB,GAAG,IAAI,eAAS,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
declare type TokenSpecifics = {
|
|
2
|
+
ERC712_VERSION?: string;
|
|
3
|
+
};
|
|
4
|
+
/** Configuration items that are specific to some tokens on some chain */
|
|
5
|
+
export declare const tokenSpecifics: Record<number, Record<string, TokenSpecifics>>;
|
|
6
|
+
export {};
|
|
7
|
+
//# sourceMappingURL=tokenSpecifics.d.ts.map
|
|
@@ -0,0 +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;AAEF,yEAAyE;AACzE,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAQzE,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tokenSpecifics = void 0;
|
|
4
|
+
/** Configuration items that are specific to some tokens on some chain */
|
|
5
|
+
exports.tokenSpecifics = {
|
|
6
|
+
80001: {
|
|
7
|
+
// MUMBAI
|
|
8
|
+
"0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747": {
|
|
9
|
+
// USDC Token
|
|
10
|
+
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=tokenSpecifics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":";;;AAIA,yEAAyE;AAC5D,QAAA,cAAc,GAAmD;IAC5E,KAAK,EAAE;QACL,SAAS;QACT,4CAA4C,EAAE;YAC5C,aAAa;YACb,cAAc,EAAE,GAAG,CAAC,yDAAyD;SAC9E;KACF;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"
|
|
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,CAiClB;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,CAAC,GAAG;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QACzD,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"}
|
|
@@ -1,19 +1,35 @@
|
|
|
1
|
+
import { tokenSpecifics } from "./tokenSpecifics";
|
|
1
2
|
import { BigNumber } from "@ethersproject/bignumber";
|
|
2
3
|
import { Biconomy } from "../meta-tx/biconomy";
|
|
3
4
|
import { prepareDataSignatureParameters } from "../utils/signature";
|
|
4
|
-
import { nativeMetaTransactionsIface } from "./interface";
|
|
5
|
+
import { nativeMetaTransactionsIface, alternativeNonceIface } from "./interface";
|
|
5
6
|
import { getName as getERC20Name } from "../erc20/handler";
|
|
6
7
|
import { erc20Iface } from "../erc20/interface";
|
|
7
8
|
const ERC712_VERSION = "1"; // Is consistent with all implementations of child tokens on Polygon
|
|
8
9
|
export async function getNonce(args) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
try {
|
|
11
|
+
const result = await args.web3Lib.call({
|
|
12
|
+
to: args.contractAddress,
|
|
13
|
+
data: nativeMetaTransactionsIface.encodeFunctionData("getNonce", [
|
|
14
|
+
args.user
|
|
15
|
+
])
|
|
16
|
+
});
|
|
17
|
+
const [nonce] = nativeMetaTransactionsIface.decodeFunctionResult("getNonce", result);
|
|
18
|
+
return String(nonce);
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
// Check if the error means the 'getNonce()' function does not exists in the contract
|
|
22
|
+
if (e.message?.match(/Transaction reverted without a reason string/)) {
|
|
23
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
24
|
+
const result = await args.web3Lib.call({
|
|
25
|
+
to: args.contractAddress,
|
|
26
|
+
data: alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
27
|
+
});
|
|
28
|
+
const [nonce] = alternativeNonceIface.decodeFunctionResult("nonces", result);
|
|
29
|
+
return String(nonce);
|
|
30
|
+
}
|
|
31
|
+
throw e;
|
|
32
|
+
}
|
|
17
33
|
}
|
|
18
34
|
export async function signNativeMetaTx(args) {
|
|
19
35
|
const metaTransactionType = [
|
|
@@ -50,7 +66,8 @@ export async function signNativeMetaTxApproveExchangeToken(args) {
|
|
|
50
66
|
contractAddress: args.exchangeToken,
|
|
51
67
|
web3Lib: args.web3Lib
|
|
52
68
|
}),
|
|
53
|
-
version: ERC712_VERSION
|
|
69
|
+
version: tokenSpecifics[args.chainId]?.[args.exchangeToken]?.ERC712_VERSION ||
|
|
70
|
+
ERC712_VERSION
|
|
54
71
|
};
|
|
55
72
|
const nonce = await getNonce({
|
|
56
73
|
contractAddress: args.exchangeToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/native-meta-tx/handler.ts"],"names":[],"mappings":"
|
|
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,qFAAqF;QACrF,IACG,CAAC,CAAC,OAAkB,EAAE,KAAK,CAC1B,8CAA8C,CAC/C,EACD;YACA,2DAA2D;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBACrC,EAAE,EAAE,IAAI,CAAC,eAAe;gBACxB,IAAI,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtE,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,qBAAqB,CAAC,oBAAoB,CACxD,QAAQ,EACR,MAAM,CACP,CAAC;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAOC;IAED,MAAM,mBAAmB,GAAG;QAC1B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;QACjC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO,EAAE;KAC7C,CAAC;IAEF,MAAM,mBAAmB,GAAG;QAC1B,eAAe,EAAE,mBAAmB;KACrC,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE5D,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,IAAI,EAAE,aAAa;QACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;KAC1C,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,8BAA8B,CAAC;QACrD,GAAG,IAAI;QACP,wBAAwB,EAAE,IAAI,CAAC,oBAAoB;QACnD,mBAAmB;QACnB,gBAAgB,EAAE,IAAI,CAAC,MAAM;QAC7B,WAAW,EAAE,iBAAiB;QAC9B,OAAO;KACR,CAAC,CAAC;IAEH,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAC,IAO1D;IACC,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,MAAM,YAAY,CAAC;YACvB,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;QACF,OAAO,EACL,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,cAAc;YAClE,cAAc;KACjB,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;QAC3B,eAAe,EAAE,IAAI,CAAC,aAAa;QACnC,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,0BAA0B,CAAC;IAChD,MAAM,iBAAiB,GAAG,UAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE;QACjE,IAAI,CAAC,OAAO;QACZ,IAAI,CAAC,KAAK;KACX,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;QACtB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,oBAAoB,EAAE,IAAI,CAAC,aAAa;QACxC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,KAAK,EAAE,KAAK;QACZ,YAAY;QACZ,iBAAiB;QACjB,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,IAchD;IACC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC3B,MAAM,CAAC,MAAM,CAAC,UAAU,EACxB,MAAM,CAAC,MAAM,CAAC,MAAM,EACpB,MAAM,CAAC,MAAM,CAAC,KAAK,CACpB,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC;QACtD,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE;YACN,MAAM,CAAC,MAAM,CAAC,WAAW;YACzB,MAAM,CAAC,MAAM,CAAC,iBAAiB;YAC/B,MAAM,CAAC,MAAM,CAAC,IAAI;YAClB,MAAM,CAAC,MAAM,CAAC,IAAI;YAClB,MAAM,CAAC,MAAM,CAAC,IAAI;SACnB;QACD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;KAChC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC;gBACvC,SAAS,EAAE,OAAO;gBAClB,eAAe,EAAE,eAAe,CAAC,MAAM;aACxC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAC1E,OAAO;gBACL,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,eAAe;gBACpC,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW;gBAClD,eAAe,EAAE,MAAM;gBACvB,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE;gBAC3B,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;aACjE,CAAC;QACJ,CAAC;QACD,IAAI,EAAE,eAAe,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,eAAO,MAAM,2BAA2B,WAEvC,CAAC"}
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,eAAO,MAAM,2BAA2B,WAEvC,CAAC;AAyBF,eAAO,MAAM,qBAAqB,WAA2B,CAAC"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
import { abis } from "@bosonprotocol/common";
|
|
2
2
|
import { Interface } from "@ethersproject/abi";
|
|
3
3
|
export const nativeMetaTransactionsIface = new Interface(abis.NativeMetaTransactionABI);
|
|
4
|
+
const noncesAbi = [
|
|
5
|
+
{
|
|
6
|
+
inputs: [
|
|
7
|
+
{
|
|
8
|
+
internalType: "address",
|
|
9
|
+
name: "owner",
|
|
10
|
+
type: "address"
|
|
11
|
+
}
|
|
12
|
+
],
|
|
13
|
+
name: "nonces",
|
|
14
|
+
outputs: [
|
|
15
|
+
{
|
|
16
|
+
internalType: "uint256",
|
|
17
|
+
name: "",
|
|
18
|
+
type: "uint256"
|
|
19
|
+
}
|
|
20
|
+
],
|
|
21
|
+
stateMutability: "view",
|
|
22
|
+
type: "function"
|
|
23
|
+
}
|
|
24
|
+
];
|
|
25
|
+
// Some tokens (USDC) does not implement getNonces(), but nonces() instead
|
|
26
|
+
export const alternativeNonceIface = new Interface(noncesAbi);
|
|
4
27
|
//# sourceMappingURL=interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,SAAS,CACtD,IAAI,CAAC,wBAAwB,CAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/native-meta-tx/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,SAAS,CACtD,IAAI,CAAC,wBAAwB,CAC9B,CAAC;AAEF,MAAM,SAAS,GAAG;IAChB;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAEF,0EAA0E;AAC1E,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
declare type TokenSpecifics = {
|
|
2
|
+
ERC712_VERSION?: string;
|
|
3
|
+
};
|
|
4
|
+
/** Configuration items that are specific to some tokens on some chain */
|
|
5
|
+
export declare const tokenSpecifics: Record<number, Record<string, TokenSpecifics>>;
|
|
6
|
+
export {};
|
|
7
|
+
//# sourceMappingURL=tokenSpecifics.d.ts.map
|
|
@@ -0,0 +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;AAEF,yEAAyE;AACzE,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAQzE,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Configuration items that are specific to some tokens on some chain */
|
|
2
|
+
export const tokenSpecifics = {
|
|
3
|
+
80001: {
|
|
4
|
+
// MUMBAI
|
|
5
|
+
"0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747": {
|
|
6
|
+
// USDC Token
|
|
7
|
+
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=tokenSpecifics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenSpecifics.js","sourceRoot":"","sources":["../../../src/native-meta-tx/tokenSpecifics.ts"],"names":[],"mappings":"AAIA,yEAAyE;AACzE,MAAM,CAAC,MAAM,cAAc,GAAmD;IAC5E,KAAK,EAAE;QACL,SAAS;QACT,4CAA4C,EAAE;YAC5C,aAAa;YACb,cAAc,EAAE,GAAG,CAAC,yDAAyD;SAC9E;KACF;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bosonprotocol/core-sdk",
|
|
3
|
-
"version": "1.22.
|
|
3
|
+
"version": "1.22.1-alpha.0",
|
|
4
4
|
"description": "> TODO: description",
|
|
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.19.0
|
|
36
|
+
"@bosonprotocol/common": "^1.19.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": "19e71d1f6a0353238669a393e739f873f9060208"
|
|
58
58
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { tokenSpecifics } from "./tokenSpecifics";
|
|
1
2
|
import {
|
|
2
3
|
MetaTxConfig,
|
|
3
4
|
Web3LibAdapter,
|
|
@@ -8,7 +9,10 @@ import { BytesLike } from "@ethersproject/bytes";
|
|
|
8
9
|
import { Biconomy } from "../meta-tx/biconomy";
|
|
9
10
|
import { BaseMetaTxArgs, SignedMetaTx } from "../meta-tx/handler";
|
|
10
11
|
import { prepareDataSignatureParameters } from "../utils/signature";
|
|
11
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
nativeMetaTransactionsIface,
|
|
14
|
+
alternativeNonceIface
|
|
15
|
+
} from "./interface";
|
|
12
16
|
import { getName as getERC20Name } from "../erc20/handler";
|
|
13
17
|
import { erc20Iface } from "../erc20/interface";
|
|
14
18
|
|
|
@@ -19,18 +23,38 @@ export async function getNonce(args: {
|
|
|
19
23
|
user: string;
|
|
20
24
|
web3Lib: Web3LibAdapter;
|
|
21
25
|
}): Promise<string> {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
26
|
+
try {
|
|
27
|
+
const result = await args.web3Lib.call({
|
|
28
|
+
to: args.contractAddress,
|
|
29
|
+
data: nativeMetaTransactionsIface.encodeFunctionData("getNonce", [
|
|
30
|
+
args.user
|
|
31
|
+
])
|
|
32
|
+
});
|
|
33
|
+
const [nonce] = nativeMetaTransactionsIface.decodeFunctionResult(
|
|
34
|
+
"getNonce",
|
|
35
|
+
result
|
|
36
|
+
);
|
|
37
|
+
return String(nonce);
|
|
38
|
+
} catch (e) {
|
|
39
|
+
// Check if the error means the 'getNonce()' function does not exists in the contract
|
|
40
|
+
if (
|
|
41
|
+
(e.message as string)?.match(
|
|
42
|
+
/Transaction reverted without a reason string/
|
|
43
|
+
)
|
|
44
|
+
) {
|
|
45
|
+
// If so, call 'nonces()' instead (USDC case, for instance)
|
|
46
|
+
const result = await args.web3Lib.call({
|
|
47
|
+
to: args.contractAddress,
|
|
48
|
+
data: alternativeNonceIface.encodeFunctionData("nonces", [args.user])
|
|
49
|
+
});
|
|
50
|
+
const [nonce] = alternativeNonceIface.decodeFunctionResult(
|
|
51
|
+
"nonces",
|
|
52
|
+
result
|
|
53
|
+
);
|
|
54
|
+
return String(nonce);
|
|
55
|
+
}
|
|
56
|
+
throw e;
|
|
57
|
+
}
|
|
34
58
|
}
|
|
35
59
|
|
|
36
60
|
export async function signNativeMetaTx(
|
|
@@ -90,7 +114,9 @@ export async function signNativeMetaTxApproveExchangeToken(args: {
|
|
|
90
114
|
contractAddress: args.exchangeToken,
|
|
91
115
|
web3Lib: args.web3Lib
|
|
92
116
|
}),
|
|
93
|
-
version:
|
|
117
|
+
version:
|
|
118
|
+
tokenSpecifics[args.chainId]?.[args.exchangeToken]?.ERC712_VERSION ||
|
|
119
|
+
ERC712_VERSION
|
|
94
120
|
};
|
|
95
121
|
const nonce = await getNonce({
|
|
96
122
|
contractAddress: args.exchangeToken,
|
|
@@ -4,3 +4,28 @@ import { Interface } from "@ethersproject/abi";
|
|
|
4
4
|
export const nativeMetaTransactionsIface = new Interface(
|
|
5
5
|
abis.NativeMetaTransactionABI
|
|
6
6
|
);
|
|
7
|
+
|
|
8
|
+
const noncesAbi = [
|
|
9
|
+
{
|
|
10
|
+
inputs: [
|
|
11
|
+
{
|
|
12
|
+
internalType: "address",
|
|
13
|
+
name: "owner",
|
|
14
|
+
type: "address"
|
|
15
|
+
}
|
|
16
|
+
],
|
|
17
|
+
name: "nonces",
|
|
18
|
+
outputs: [
|
|
19
|
+
{
|
|
20
|
+
internalType: "uint256",
|
|
21
|
+
name: "",
|
|
22
|
+
type: "uint256"
|
|
23
|
+
}
|
|
24
|
+
],
|
|
25
|
+
stateMutability: "view",
|
|
26
|
+
type: "function"
|
|
27
|
+
}
|
|
28
|
+
];
|
|
29
|
+
|
|
30
|
+
// Some tokens (USDC) does not implement getNonces(), but nonces() instead
|
|
31
|
+
export const alternativeNonceIface = new Interface(noncesAbi);
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
type TokenSpecifics = {
|
|
2
|
+
ERC712_VERSION?: string;
|
|
3
|
+
};
|
|
4
|
+
|
|
5
|
+
/** Configuration items that are specific to some tokens on some chain */
|
|
6
|
+
export const tokenSpecifics: Record<number, Record<string, TokenSpecifics>> = {
|
|
7
|
+
80001: {
|
|
8
|
+
// MUMBAI
|
|
9
|
+
"0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747": {
|
|
10
|
+
// USDC Token
|
|
11
|
+
ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
};
|