@requestnetwork/smart-contracts 0.28.1-next.1703 → 0.28.1-next.1705
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/hardhat.config.d.ts.map +1 -1
- package/dist/hardhat.config.js +1 -6
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts/deploy-payments.d.ts.map +1 -1
- package/dist/scripts/deploy-payments.js +3 -33
- package/dist/scripts/deploy-payments.js.map +1 -1
- package/dist/scripts/erc20-swap-to-conversion.d.ts +2 -7
- package/dist/scripts/erc20-swap-to-conversion.d.ts.map +1 -1
- package/dist/scripts/erc20-swap-to-conversion.js +3 -57
- package/dist/scripts/erc20-swap-to-conversion.js.map +1 -1
- package/dist/scripts/test-deploy-batch-erc-eth-deployment.d.ts.map +1 -1
- package/dist/scripts/test-deploy-batch-erc-eth-deployment.js +6 -2
- package/dist/scripts/test-deploy-batch-erc-eth-deployment.js.map +1 -1
- package/dist/scripts/test-deploy-escrow-deployment.d.ts.map +1 -1
- package/dist/scripts/test-deploy-escrow-deployment.js +2 -3
- package/dist/scripts/test-deploy-escrow-deployment.js.map +1 -1
- package/dist/scripts/test-deploy_chainlink_contract.d.ts.map +1 -1
- package/dist/scripts/test-deploy_chainlink_contract.js +16 -7
- package/dist/scripts/test-deploy_chainlink_contract.js.map +1 -1
- package/dist/scripts-create2/check-deployer.d.ts.map +1 -1
- package/dist/scripts-create2/check-deployer.js +1 -6
- package/dist/scripts-create2/check-deployer.js.map +1 -1
- package/dist/scripts-create2/compute-one-address.d.ts.map +1 -1
- package/dist/scripts-create2/compute-one-address.js +2 -1
- package/dist/scripts-create2/compute-one-address.js.map +1 -1
- package/dist/scripts-create2/constructor-args.d.ts.map +1 -1
- package/dist/scripts-create2/constructor-args.js +6 -0
- package/dist/scripts-create2/constructor-args.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +6 -0
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/adminTasks.js +37 -0
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -0
- package/dist/scripts-create2/contract-setup/index.d.ts +2 -0
- package/dist/scripts-create2/contract-setup/index.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/index.js +6 -0
- package/dist/scripts-create2/contract-setup/index.js.map +1 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js +38 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js.map +1 -0
- package/dist/scripts-create2/deploy-one.d.ts.map +1 -1
- package/dist/scripts-create2/deploy-one.js +7 -0
- package/dist/scripts-create2/deploy-one.js.map +1 -1
- package/dist/scripts-create2/utils.d.ts.map +1 -1
- package/dist/scripts-create2/utils.js +1 -0
- package/dist/scripts-create2/utils.js.map +1 -1
- package/dist/scripts-create2/verify-one.d.ts.map +1 -1
- package/dist/scripts-create2/verify-one.js +1 -0
- package/dist/scripts-create2/verify-one.js.map +1 -1
- package/dist/scripts-create2/xdeployer.d.ts.map +1 -1
- package/dist/scripts-create2/xdeployer.js +3 -7
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/src/lib/artifacts/BatchPayments/index.js +3 -3
- package/dist/src/lib/artifacts/ERC20EscrowToPay/index.js +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/0.2.0.json +239 -0
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.js +27 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthConversionProxy/index.js +2 -2
- package/dist/src/types/BatchPayments.d.ts +60 -49
- package/dist/src/types/ERC20SwapToConversion.d.ts +101 -56
- package/dist/src/types/IERC20ConversionProxy.d.ts +207 -0
- package/dist/src/types/ISwapRouter.d.ts +137 -0
- package/dist/src/types/factories/BatchPayments__factory.d.ts +3 -3
- package/dist/src/types/factories/BatchPayments__factory.d.ts.map +1 -1
- package/dist/src/types/factories/BatchPayments__factory.js +15 -45
- package/dist/src/types/factories/BatchPayments__factory.js.map +1 -1
- package/dist/src/types/factories/ERC20SwapToConversion__factory.d.ts +3 -3
- package/dist/src/types/factories/ERC20SwapToConversion__factory.d.ts.map +1 -1
- package/dist/src/types/factories/ERC20SwapToConversion__factory.js +52 -39
- package/dist/src/types/factories/ERC20SwapToConversion__factory.js.map +1 -1
- package/dist/src/types/factories/IERC20ConversionProxy__factory.d.ts +32 -0
- package/dist/src/types/factories/IERC20ConversionProxy__factory.d.ts.map +1 -0
- package/dist/src/types/factories/IERC20ConversionProxy__factory.js +148 -0
- package/dist/src/types/factories/IERC20ConversionProxy__factory.js.map +1 -0
- package/dist/src/types/factories/ISwapRouter__factory.d.ts +23 -0
- package/dist/src/types/factories/ISwapRouter__factory.d.ts.map +1 -0
- package/dist/src/types/factories/ISwapRouter__factory.js +59 -0
- package/dist/src/types/factories/ISwapRouter__factory.js.map +1 -0
- package/dist/src/types/hardhat.d.ts +6 -2
- package/dist/src/types/index.d.ts +6 -2
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js +7 -3
- package/dist/src/types/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/types/BatchPayments.d.ts +60 -49
- package/types/ERC20SwapToConversion.d.ts +101 -56
- package/types/IERC20ConversionProxy.d.ts +207 -0
- package/types/ISwapRouter.d.ts +137 -0
- package/types/factories/BatchPayments__factory.d.ts +3 -3
- package/types/factories/BatchPayments__factory.d.ts.map +1 -1
- package/types/factories/BatchPayments__factory.js +15 -45
- package/types/factories/BatchPayments__factory.js.map +1 -1
- package/types/factories/ERC20SwapToConversion__factory.d.ts +3 -3
- package/types/factories/ERC20SwapToConversion__factory.d.ts.map +1 -1
- package/types/factories/ERC20SwapToConversion__factory.js +52 -39
- package/types/factories/ERC20SwapToConversion__factory.js.map +1 -1
- package/types/factories/IERC20ConversionProxy__factory.d.ts +32 -0
- package/types/factories/IERC20ConversionProxy__factory.d.ts.map +1 -0
- package/types/factories/IERC20ConversionProxy__factory.js +148 -0
- package/types/factories/IERC20ConversionProxy__factory.js.map +1 -0
- package/types/factories/ISwapRouter__factory.d.ts +23 -0
- package/types/factories/ISwapRouter__factory.d.ts.map +1 -0
- package/types/factories/ISwapRouter__factory.js +59 -0
- package/types/factories/ISwapRouter__factory.js.map +1 -0
- package/types/hardhat.d.ts +6 -2
- package/types/index.d.ts +6 -2
- package/types/index.d.ts.map +1 -1
- package/types/index.js +7 -3
- package/types/index.js.map +1 -1
- package/dist/scripts/prepare-payments.d.ts +0 -4
- package/dist/scripts/prepare-payments.d.ts.map +0 -1
- package/dist/scripts/prepare-payments.js +0 -31
- package/dist/scripts/prepare-payments.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;AAG/D,aAAa;AACA,QAAA,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,6BAA6B,GAAG,CAC3C,QAAa,EACb,OAAe,EACf,KAAa,EACb,QAAmB,EACJ,EAAE;IACjB,MAAM,uBAAuB,GAAG,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAAC;IACzE,MAAM,8BAA8B,GAAG,6BAAuB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5F,IAAI,uBAAuB,KAAK,8BAA8B,EAAE;QAC9D,MAAM,QAAQ,CAAC,2BAA2B,CAAC,8BAA8B,EAAE;YACzE,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAdW,QAAA,6BAA6B,iCAcxC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,QAAa,EACb,OAAe,EACf,KAAa,EACb,QAAmB,EACJ,EAAE;IACjB,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtD,IAAI,iBAAiB,KAAK,gCAAwB,CAAC,OAAO,CAAC,EAAE;QAC3D,MAAM,QAAQ,CAAC,SAAS,CAAC,gCAAwB,CAAC,OAAO,CAAC,EAAE;YAC1D,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,gBAAgB,oBAa3B;AAEK,MAAM,qBAAqB,GAAG,CACnC,QAAa,EACb,KAAa,EACb,QAAmB,EACJ,EAAE;IACjB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;IACrD,IAAI,WAAW,KAAK,yBAAiB,EAAE;QACrC,MAAM,QAAQ,CAAC,qBAAqB,CAAC,yBAAiB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;KAC/F;AACH,CAAC,CAAA,CAAC;AATW,QAAA,qBAAqB,yBAShC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupERC20SwapToConversion = void 0;
|
|
4
|
+
var setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
|
|
5
|
+
Object.defineProperty(exports, "setupERC20SwapToConversion", { enumerable: true, get: function () { return setupERC20SwapToConversion_1.setupERC20SwapToConversion; } });
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":";;;AAAA,2EAA0E;AAAjE,wIAAA,0BAA0B,OAAA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Updates the values of the chainlinkConversionPath and swap router of the ERC20SwapToConversion contract, if needed
|
|
4
|
+
* @param contractAddress address of the ERC20SwapToConversion Proxy
|
|
5
|
+
* @param hre Hardhat runtime environment
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupERC20SwapToConversion: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupERC20SwapToConversion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToConversion.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,oBACpB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAiCd,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupERC20SwapToConversion = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const lib_1 = require("../../src/lib");
|
|
6
|
+
const utils_1 = require("@requestnetwork/utils");
|
|
7
|
+
const adminTasks_1 = require("./adminTasks");
|
|
8
|
+
/**
|
|
9
|
+
* Updates the values of the chainlinkConversionPath and swap router of the ERC20SwapToConversion contract, if needed
|
|
10
|
+
* @param contractAddress address of the ERC20SwapToConversion Proxy
|
|
11
|
+
* @param hre Hardhat runtime environment
|
|
12
|
+
*/
|
|
13
|
+
const setupERC20SwapToConversion = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
14
|
+
// Setup contract parameters
|
|
15
|
+
const ERC20SwapToConversionContract = new hre.ethers.Contract(contractAddress, lib_1.erc20SwapConversionArtifact.getContractAbi());
|
|
16
|
+
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
17
|
+
let provider;
|
|
18
|
+
if (network === 'celo') {
|
|
19
|
+
provider = utils_1.default.getCeloProvider();
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
provider = utils_1.default.getDefaultProvider(network);
|
|
23
|
+
}
|
|
24
|
+
const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
|
|
25
|
+
const signer = wallet.connect(provider);
|
|
26
|
+
const ERC20SwapToConversionConnected = yield ERC20SwapToConversionContract.connect(signer);
|
|
27
|
+
const adminNonce = yield signer.getTransactionCount();
|
|
28
|
+
const gasPrice = yield provider.getGasPrice();
|
|
29
|
+
yield Promise.all([
|
|
30
|
+
(0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network, adminNonce, gasPrice),
|
|
31
|
+
(0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network, adminNonce + 1, gasPrice),
|
|
32
|
+
(0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected, adminNonce + 2, gasPrice),
|
|
33
|
+
]);
|
|
34
|
+
})));
|
|
35
|
+
console.log('Setup for ERC20SwapToConversion successfull');
|
|
36
|
+
});
|
|
37
|
+
exports.setupERC20SwapToConversion = setupERC20SwapToConversion;
|
|
38
|
+
//# sourceMappingURL=setupERC20SwapToConversion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToConversion.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":";;;;AAAA,uCAA4D;AAE5D,iDAA0C;AAC1C,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,0BAA0B,GAAG,CACxC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC3D,eAAe,EACf,iCAA2B,CAAC,cAAc,EAAE,CAC7C,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,QAAQ,GAAG,eAAK,CAAC,eAAe,EAAE,CAAC;SACpC;aAAM;YACL,QAAQ,GAAG,eAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC9C;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,8BAA8B,GAAG,MAAM,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3F,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;QAE9C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAA,0CAA6B,EAC3B,8BAA8B,EAC9B,OAAO,EACP,UAAU,EACV,QAAQ,CACT;YACD,IAAA,6BAAgB,EAAC,8BAA8B,EAAE,OAAO,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,CAAC;YACnF,IAAA,kCAAqB,EAAC,8BAA8B,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,CAAC;SAChF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CACH,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;AAC7D,CAAC,CAAA,CAAC;AApCW,QAAA,0BAA0B,8BAoCrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAM5D,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CAkChB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CA2Bd,CAAC"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
const xdeployer_1 = require("./xdeployer");
|
|
7
7
|
const constructor_args_1 = require("./constructor-args");
|
|
8
|
+
const contract_setup_1 = require("./contract-setup");
|
|
8
9
|
// Deploys, set up the contracts and returns the address
|
|
9
10
|
const deployOneWithCreate2 = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
10
11
|
if (!hre.config.xdeploy.networks || hre.config.xdeploy.networks.length === 0) {
|
|
@@ -46,6 +47,12 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
46
47
|
yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
47
48
|
break;
|
|
48
49
|
}
|
|
50
|
+
case 'ERC20SwapToConversion': {
|
|
51
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
|
|
52
|
+
const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
53
|
+
yield (0, contract_setup_1.setupERC20SwapToConversion)(address, hre);
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
49
56
|
case 'ERC20EscrowToPay': {
|
|
50
57
|
const network = hre.config.xdeploy.networks[0];
|
|
51
58
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":";;;;AAAA,mCAA4E;AAG5E,2CAAsC;AACtC,yDAAwD;
|
|
1
|
+
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,6BAA6B,UAMzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAc,MAAM,KAAG,UAAU,gBAAgB,CAAC,QAAQ,CA6BjF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,WACP,MAAM,mBACE,MAAM,KACtB,OAIF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;GAEG;AACU,QAAA,6BAA6B,GAAG;IAC3C,eAAe;IACf,kBAAkB;IAClB,sBAAsB;IACtB,kBAAkB;CACnB,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAwC,EAAE;IACpF,QAAQ,QAAQ,EAAE;QAChB,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,0BAA0B,CAAC;QAC9C,KAAK,0BAA0B;YAC7B,OAAO,SAAS,CAAC,4BAA4B,CAAC;QAChD,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,kBAAkB,CAAC;QACtC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,kBAAkB;YACrB,OAAO,SAAS,CAAC,wBAAwB,CAAC;QAC5C,KAAK,yBAAyB;YAC5B,OAAO,SAAS,CAAC,uBAAuB,CAAC;QAC3C,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC,oBAAoB,CAAC;QACxC,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,uBAAuB;YAC1B,OAAO,SAAS,CAAC,2BAA2B,CAAC;QAC/C,KAAK,kBAAkB;YACrB,OAAO,SAAS,CAAC,wBAAwB,CAAC;QAC5C;YACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB;AAEF;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,CAChC,QAAgB,EAChB,OAAe,EACf,eAAuB,EACd,EAAE;IACX,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC;AAC9D,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;GAEG;AACU,QAAA,6BAA6B,GAAG;IAC3C,eAAe;IACf,kBAAkB;IAClB,sBAAsB;IACtB,uBAAuB;IACvB,kBAAkB;CACnB,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAwC,EAAE;IACpF,QAAQ,QAAQ,EAAE;QAChB,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,0BAA0B,CAAC;QAC9C,KAAK,0BAA0B;YAC7B,OAAO,SAAS,CAAC,4BAA4B,CAAC;QAChD,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,kBAAkB,CAAC;QACtC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,kBAAkB;YACrB,OAAO,SAAS,CAAC,wBAAwB,CAAC;QAC5C,KAAK,yBAAyB;YAC5B,OAAO,SAAS,CAAC,uBAAuB,CAAC;QAC3C,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC,oBAAoB,CAAC;QACxC,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,uBAAuB;YAC1B,OAAO,SAAS,CAAC,2BAA2B,CAAC;QAC/C,KAAK,kBAAkB;YACrB,OAAO,SAAS,CAAC,wBAAwB,CAAC;QAC5C;YACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB;AAEF;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,CAChC,QAAgB,EAChB,OAAe,EACf,eAAuB,EACd,EAAE;IACX,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC;AAC9D,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG5C,eAAO,MAAM,SAAS,oBACH,MAAM,oBACL,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,IAAI,CASd,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"verify-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG5C,eAAO,MAAM,SAAS,oBACH,MAAM,oBACL,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,IAAI,CASd,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCjG"}
|
|
@@ -25,6 +25,7 @@ function VerifyCreate2FromList(hre) {
|
|
|
25
25
|
switch (contract) {
|
|
26
26
|
case 'EthereumProxy':
|
|
27
27
|
case 'EthereumFeeProxy':
|
|
28
|
+
case 'ERC20SwapToConversion':
|
|
28
29
|
case 'Erc20ConversionProxy': {
|
|
29
30
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
|
|
30
31
|
address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-one.js","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":";;;;AAAA,+DAAwE;AACxE,yDAAwD;AAGxD,mCAAwD;AAEjD,MAAM,SAAS,GAAG,CACvB,eAAuB,EACvB,gBAAmC,EACnC,GAAsC,EACvB,EAAE;IACjB,IAAI;QACF,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC7B,OAAO,EAAE,eAAe;YACxB,oBAAoB,EAAE,gBAAgB,CAAC,eAAe;SACvD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,SAAsB,qBAAqB,CAAC,GAAsC;;QAChF,IAAI;YACF,IAAI,OAAe,CAAC;YACpB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;gBACnD,QAAQ,QAAQ,EAAE;oBAChB,KAAK,eAAe,CAAC;oBACrB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,sBAAsB,CAAC,CAAC;wBAC3B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;wBACrD,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC7D,MAAM;qBACP;oBACD,KAAK,kBAAkB,CAAC,CAAC;wBACvB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;wBAC/C,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;wBAC9D,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC7D,MAAM;qBACP;oBACD,oCAAoC;oBACpC;wBACE,MAAM,IAAI,KAAK,CACb,eAAe,QAAQ,iDAAiD,CACzE,CAAC;iBACL;YACH,CAAC,CAAA,CAAC,CACH,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"verify-one.js","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":";;;;AAAA,+DAAwE;AACxE,yDAAwD;AAGxD,mCAAwD;AAEjD,MAAM,SAAS,GAAG,CACvB,eAAuB,EACvB,gBAAmC,EACnC,GAAsC,EACvB,EAAE;IACjB,IAAI;QACF,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC7B,OAAO,EAAE,eAAe;YACxB,oBAAoB,EAAE,gBAAgB,CAAC,eAAe;SACvD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,SAAsB,qBAAqB,CAAC,GAAsC;;QAChF,IAAI;YACF,IAAI,OAAe,CAAC;YACpB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;gBACnD,QAAQ,QAAQ,EAAE;oBAChB,KAAK,eAAe,CAAC;oBACrB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,uBAAuB,CAAC;oBAC7B,KAAK,sBAAsB,CAAC,CAAC;wBAC3B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;wBACrD,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC7D,MAAM;qBACP;oBACD,KAAK,kBAAkB,CAAC,CAAC;wBACvB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;wBAC/C,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;wBAC9D,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC7D,MAAM;qBACP;oBACD,oCAAoC;oBACpC;wBACE,MAAM,IAAI,KAAK,CACb,eAAe,QAAQ,iDAAiD,CACzE,CAAC;iBACL;YACH,CAAC,CAAA,CAAC,CACH,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAjCD,sDAiCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAMlG,eAAO,MAAM,OAAO,qBACA,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,iBAAiB,CAAC,CAwFlC,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.xdeploy = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const ethers_1 = require("ethers");
|
|
6
5
|
const utils_1 = require("@requestnetwork/utils");
|
|
7
6
|
const lib_1 = require("../src/lib");
|
|
8
7
|
const ZERO_ETH_INPUT = 0;
|
|
@@ -32,11 +31,7 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
32
31
|
console.log(`... on ${network}`);
|
|
33
32
|
let provider;
|
|
34
33
|
if (network === 'celo') {
|
|
35
|
-
provider =
|
|
36
|
-
const originalBlockFormatter = provider.formatter._block;
|
|
37
|
-
provider.formatter._block = (value, format) => {
|
|
38
|
-
return originalBlockFormatter(Object.assign({ gasLimit: ethers_1.constants.Zero }, value), format);
|
|
39
|
-
};
|
|
34
|
+
provider = utils_1.default.getCeloProvider();
|
|
40
35
|
}
|
|
41
36
|
else {
|
|
42
37
|
provider = utils_1.default.getDefaultProvider(network);
|
|
@@ -54,8 +49,9 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
54
49
|
let receipt = undefined;
|
|
55
50
|
let deployed = false;
|
|
56
51
|
let error = undefined;
|
|
52
|
+
const gasPrice = yield provider.getGasPrice();
|
|
57
53
|
try {
|
|
58
|
-
const createReceipt = yield (yield create2Deployer.deploy(ZERO_ETH_INPUT, hre.ethers.utils.id(hre.config.xdeploy.salt), initcode.data, { gasLimit: hre.config.xdeploy.gasLimit })).wait();
|
|
54
|
+
const createReceipt = yield (yield create2Deployer.deploy(ZERO_ETH_INPUT, hre.ethers.utils.id(hre.config.xdeploy.salt), initcode.data, { gasLimit: hre.config.xdeploy.gasLimit, gasPrice: gasPrice })).wait();
|
|
59
55
|
receipt = createReceipt;
|
|
60
56
|
deployed = true;
|
|
61
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":";;;;AACA,iDAA0C;AAC1C,oCAA6C;AAE7C,MAAM,cAAc,GAAG,CAAC,CAAC;AAElB,MAAM,OAAO,GAAG,CACrB,gBAAmC,EACnC,GAAsC,EACH,EAAE;IACrC,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,gBAAgB,CAAC;IACvD,OAAO,CAAC,GAAG,CACT,iBAAiB,QAAQ,yCACvB,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OACnD,EAAE,CACH,CAAC;IAEF,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;KACjC;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,IAAI,QAAa,CAAC;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC/D,IAAI,eAAe,IAAI,QAAQ,EAAE;QAC/B,QAAQ,GAAG,MAAM,QAAQ,CAAC,oBAAoB,CAAC,GAAG,eAAe,CAAC,CAAC;KACpE;SAAM,IAAI,CAAC,eAAe,IAAI,QAAQ,EAAE;QACvC,QAAQ,GAAG,MAAM,QAAQ,CAAC,oBAAoB,EAAE,CAAC;KAClD;IAED,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QACjD,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,QAAQ,GAAG,eAAK,CAAC,eAAe,EAAE,CAAC;SACpC;aAAM;YACL,QAAQ,GAAG,eAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC9C;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,uBAA+B,CAAC;QACpC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC7C,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAClC,qBAAe,CAAC,cAAc,EAAE,EAChC,MAAM,CACP,CAAC;QACF,IAAI;YACF,uBAAuB,GAAG,MAAM,eAAe,CAAC,cAAc,CAC5D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC1C,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;SACH;QAED,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC9C,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,CAC1B,MAAM,eAAe,CAAC,MAAM,CAC1B,cAAc,EACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,QAAQ,CAAC,IAAI,EACb,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAC9D,CACF,CAAC,IAAI,EAAE,CAAC;YACT,OAAO,GAAG,aAAa,CAAC;YACxB,QAAQ,GAAG,IAAI,CAAC;SACjB;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,GAAG,GAAG,CAAC;SACb;QACD,MAAM,CAAC,IAAI,CAAC;YACV,OAAO;YACP,QAAQ;YACR,OAAO,EAAE,uBAAuB;YAChC,OAAO;YACP,QAAQ;YACR,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AA3FW,QAAA,OAAO,WA2FlB"}
|
|
@@ -8,12 +8,12 @@ exports.batchPaymentsArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
8
8
|
abi: _0_1_0_json_1.abi,
|
|
9
9
|
deployment: {
|
|
10
10
|
private: {
|
|
11
|
-
address: '
|
|
11
|
+
address: '0x1411CB266FCEd1587b0AA29E9d5a9Ef3Db64A9C5',
|
|
12
12
|
creationBlockNumber: 0,
|
|
13
13
|
},
|
|
14
14
|
rinkeby: {
|
|
15
|
-
address: '
|
|
16
|
-
creationBlockNumber:
|
|
15
|
+
address: '0x18D38CaA769540cfF7dbF461961a151F6acCFd1B',
|
|
16
|
+
creationBlockNumber: 10525144,
|
|
17
17
|
},
|
|
18
18
|
},
|
|
19
19
|
},
|
|
@@ -8,7 +8,7 @@ exports.erc20EscrowToPayArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
8
8
|
abi: _0_1_0_json_1.abi,
|
|
9
9
|
deployment: {
|
|
10
10
|
private: {
|
|
11
|
-
address: '
|
|
11
|
+
address: '0x8e4C131B37383E431B9cd0635D3cF9f3F628EDae',
|
|
12
12
|
creationBlockNumber: 0,
|
|
13
13
|
},
|
|
14
14
|
mainnet: {
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
{
|
|
2
|
+
"abi": [
|
|
3
|
+
{
|
|
4
|
+
"inputs": [
|
|
5
|
+
{
|
|
6
|
+
"internalType": "address",
|
|
7
|
+
"name": "_owner",
|
|
8
|
+
"type": "address"
|
|
9
|
+
}
|
|
10
|
+
],
|
|
11
|
+
"stateMutability": "nonpayable",
|
|
12
|
+
"type": "constructor"
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
"anonymous": false,
|
|
16
|
+
"inputs": [
|
|
17
|
+
{
|
|
18
|
+
"indexed": true,
|
|
19
|
+
"internalType": "address",
|
|
20
|
+
"name": "previousOwner",
|
|
21
|
+
"type": "address"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"indexed": true,
|
|
25
|
+
"internalType": "address",
|
|
26
|
+
"name": "newOwner",
|
|
27
|
+
"type": "address"
|
|
28
|
+
}
|
|
29
|
+
],
|
|
30
|
+
"name": "OwnershipTransferred",
|
|
31
|
+
"type": "event"
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
"inputs": [
|
|
35
|
+
{
|
|
36
|
+
"internalType": "address",
|
|
37
|
+
"name": "_erc20Address",
|
|
38
|
+
"type": "address"
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"internalType": "address",
|
|
42
|
+
"name": "_paymentProxy",
|
|
43
|
+
"type": "address"
|
|
44
|
+
}
|
|
45
|
+
],
|
|
46
|
+
"name": "approvePaymentProxyToSpend",
|
|
47
|
+
"outputs": [],
|
|
48
|
+
"stateMutability": "nonpayable",
|
|
49
|
+
"type": "function"
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
"inputs": [
|
|
53
|
+
{
|
|
54
|
+
"internalType": "address",
|
|
55
|
+
"name": "_erc20Address",
|
|
56
|
+
"type": "address"
|
|
57
|
+
}
|
|
58
|
+
],
|
|
59
|
+
"name": "approveRouterToSpend",
|
|
60
|
+
"outputs": [],
|
|
61
|
+
"stateMutability": "nonpayable",
|
|
62
|
+
"type": "function"
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
"inputs": [],
|
|
66
|
+
"name": "chainlinkConversionPath",
|
|
67
|
+
"outputs": [
|
|
68
|
+
{
|
|
69
|
+
"internalType": "contract ChainlinkConversionPath",
|
|
70
|
+
"name": "",
|
|
71
|
+
"type": "address"
|
|
72
|
+
}
|
|
73
|
+
],
|
|
74
|
+
"stateMutability": "view",
|
|
75
|
+
"type": "function"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"inputs": [],
|
|
79
|
+
"name": "owner",
|
|
80
|
+
"outputs": [
|
|
81
|
+
{
|
|
82
|
+
"internalType": "address",
|
|
83
|
+
"name": "",
|
|
84
|
+
"type": "address"
|
|
85
|
+
}
|
|
86
|
+
],
|
|
87
|
+
"stateMutability": "view",
|
|
88
|
+
"type": "function"
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
"inputs": [],
|
|
92
|
+
"name": "renounceOwnership",
|
|
93
|
+
"outputs": [],
|
|
94
|
+
"stateMutability": "nonpayable",
|
|
95
|
+
"type": "function"
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
"inputs": [],
|
|
99
|
+
"name": "requestSwapFees",
|
|
100
|
+
"outputs": [
|
|
101
|
+
{
|
|
102
|
+
"internalType": "uint256",
|
|
103
|
+
"name": "",
|
|
104
|
+
"type": "uint256"
|
|
105
|
+
}
|
|
106
|
+
],
|
|
107
|
+
"stateMutability": "view",
|
|
108
|
+
"type": "function"
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
"inputs": [
|
|
112
|
+
{
|
|
113
|
+
"internalType": "address",
|
|
114
|
+
"name": "_newSwapRouterAddress",
|
|
115
|
+
"type": "address"
|
|
116
|
+
}
|
|
117
|
+
],
|
|
118
|
+
"name": "setRouter",
|
|
119
|
+
"outputs": [],
|
|
120
|
+
"stateMutability": "nonpayable",
|
|
121
|
+
"type": "function"
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
"inputs": [],
|
|
125
|
+
"name": "swapRouter",
|
|
126
|
+
"outputs": [
|
|
127
|
+
{
|
|
128
|
+
"internalType": "contract ISwapRouter",
|
|
129
|
+
"name": "",
|
|
130
|
+
"type": "address"
|
|
131
|
+
}
|
|
132
|
+
],
|
|
133
|
+
"stateMutability": "view",
|
|
134
|
+
"type": "function"
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
"inputs": [
|
|
138
|
+
{
|
|
139
|
+
"internalType": "address",
|
|
140
|
+
"name": "_paymentProxy",
|
|
141
|
+
"type": "address"
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"internalType": "address",
|
|
145
|
+
"name": "_to",
|
|
146
|
+
"type": "address"
|
|
147
|
+
},
|
|
148
|
+
{
|
|
149
|
+
"internalType": "uint256",
|
|
150
|
+
"name": "_requestAmount",
|
|
151
|
+
"type": "uint256"
|
|
152
|
+
},
|
|
153
|
+
{
|
|
154
|
+
"internalType": "uint256",
|
|
155
|
+
"name": "_amountInMax",
|
|
156
|
+
"type": "uint256"
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
"internalType": "address[]",
|
|
160
|
+
"name": "_swapRouterPath",
|
|
161
|
+
"type": "address[]"
|
|
162
|
+
},
|
|
163
|
+
{
|
|
164
|
+
"internalType": "address[]",
|
|
165
|
+
"name": "_chainlinkPath",
|
|
166
|
+
"type": "address[]"
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
"internalType": "bytes",
|
|
170
|
+
"name": "_paymentReference",
|
|
171
|
+
"type": "bytes"
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
"internalType": "uint256",
|
|
175
|
+
"name": "_requestFeeAmount",
|
|
176
|
+
"type": "uint256"
|
|
177
|
+
},
|
|
178
|
+
{
|
|
179
|
+
"internalType": "address",
|
|
180
|
+
"name": "_feeAddress",
|
|
181
|
+
"type": "address"
|
|
182
|
+
},
|
|
183
|
+
{
|
|
184
|
+
"internalType": "uint256",
|
|
185
|
+
"name": "_deadline",
|
|
186
|
+
"type": "uint256"
|
|
187
|
+
},
|
|
188
|
+
{
|
|
189
|
+
"internalType": "uint256",
|
|
190
|
+
"name": "_chainlinkMaxRateTimespan",
|
|
191
|
+
"type": "uint256"
|
|
192
|
+
}
|
|
193
|
+
],
|
|
194
|
+
"name": "swapTransferWithReference",
|
|
195
|
+
"outputs": [],
|
|
196
|
+
"stateMutability": "nonpayable",
|
|
197
|
+
"type": "function"
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
"inputs": [
|
|
201
|
+
{
|
|
202
|
+
"internalType": "address",
|
|
203
|
+
"name": "newOwner",
|
|
204
|
+
"type": "address"
|
|
205
|
+
}
|
|
206
|
+
],
|
|
207
|
+
"name": "transferOwnership",
|
|
208
|
+
"outputs": [],
|
|
209
|
+
"stateMutability": "nonpayable",
|
|
210
|
+
"type": "function"
|
|
211
|
+
},
|
|
212
|
+
{
|
|
213
|
+
"inputs": [
|
|
214
|
+
{
|
|
215
|
+
"internalType": "address",
|
|
216
|
+
"name": "_chainlinkConversionPath",
|
|
217
|
+
"type": "address"
|
|
218
|
+
}
|
|
219
|
+
],
|
|
220
|
+
"name": "updateConversionPathAddress",
|
|
221
|
+
"outputs": [],
|
|
222
|
+
"stateMutability": "nonpayable",
|
|
223
|
+
"type": "function"
|
|
224
|
+
},
|
|
225
|
+
{
|
|
226
|
+
"inputs": [
|
|
227
|
+
{
|
|
228
|
+
"internalType": "uint256",
|
|
229
|
+
"name": "_newRequestSwapFees",
|
|
230
|
+
"type": "uint256"
|
|
231
|
+
}
|
|
232
|
+
],
|
|
233
|
+
"name": "updateRequestSwapFees",
|
|
234
|
+
"outputs": [],
|
|
235
|
+
"stateMutability": "nonpayable",
|
|
236
|
+
"type": "function"
|
|
237
|
+
}
|
|
238
|
+
]
|
|
239
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/Erc20SwapConversion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/Erc20SwapConversion/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAElF,eAAO,MAAM,2BAA2B,yCA0EvC,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.erc20SwapConversionArtifact = void 0;
|
|
4
4
|
const ContractArtifact_1 = require("../../ContractArtifact");
|
|
5
5
|
const _0_1_0_json_1 = require("./0.1.0.json");
|
|
6
|
+
const _0_2_0_json_1 = require("./0.2.0.json");
|
|
6
7
|
exports.erc20SwapConversionArtifact = new ContractArtifact_1.ContractArtifact({
|
|
7
8
|
'0.1.0': {
|
|
8
9
|
abi: _0_1_0_json_1.abi,
|
|
@@ -49,5 +50,30 @@ exports.erc20SwapConversionArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
49
50
|
},
|
|
50
51
|
},
|
|
51
52
|
},
|
|
52
|
-
|
|
53
|
+
'0.2.0': {
|
|
54
|
+
abi: _0_2_0_json_1.abi,
|
|
55
|
+
deployment: {
|
|
56
|
+
private: {
|
|
57
|
+
address: '0xd54b47F8e6A1b97F3A84f63c867286272b273b7C',
|
|
58
|
+
creationBlockNumber: 0,
|
|
59
|
+
},
|
|
60
|
+
rinkeby: {
|
|
61
|
+
address: '0x3b4837C9F4A606b71e61FD56Db6241781194df92',
|
|
62
|
+
creationBlockNumber: 0,
|
|
63
|
+
},
|
|
64
|
+
matic: {
|
|
65
|
+
address: '0x3b4837C9F4A606b71e61FD56Db6241781194df92',
|
|
66
|
+
creationBlockNumber: 27597829,
|
|
67
|
+
},
|
|
68
|
+
mainnet: {
|
|
69
|
+
address: '0x3b4837C9F4A606b71e61FD56Db6241781194df92',
|
|
70
|
+
creationBlockNumber: 14660280,
|
|
71
|
+
},
|
|
72
|
+
xdai: {
|
|
73
|
+
address: '0x3b4837C9F4A606b71e61FD56Db6241781194df92',
|
|
74
|
+
creationBlockNumber: 21837165,
|
|
75
|
+
},
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
}, '0.2.0');
|
|
53
79
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/Erc20SwapConversion/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,2BAA2B,GAAG,IAAI,mCAAgB,CAC7D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/Erc20SwapConversion/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAChD,8CAAgD;AAInC,QAAA,2BAA2B,GAAG,IAAI,mCAAgB,CAC7D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}
|
|
@@ -9,7 +9,7 @@ exports.ethConversionArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
9
9
|
abi: _0_1_0_json_1.abi,
|
|
10
10
|
deployment: {
|
|
11
11
|
private: {
|
|
12
|
-
address: '
|
|
12
|
+
address: '0x98d9f9e8DEbd4A632682ba207670d2a5ACD3c489',
|
|
13
13
|
creationBlockNumber: 0,
|
|
14
14
|
},
|
|
15
15
|
rinkeby: {
|
|
@@ -38,7 +38,7 @@ exports.ethConversionArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
38
38
|
abi: _0_2_0_json_1.abi,
|
|
39
39
|
deployment: {
|
|
40
40
|
private: {
|
|
41
|
-
address: '
|
|
41
|
+
address: '0x98d9f9e8DEbd4A632682ba207670d2a5ACD3c489',
|
|
42
42
|
creationBlockNumber: 0,
|
|
43
43
|
},
|
|
44
44
|
mainnet: {
|