@requestnetwork/smart-contracts 0.28.1-next.1719 → 0.28.1-next.1720
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/scripts-create2/constructor-args.d.ts.map +1 -1
- package/dist/scripts-create2/constructor-args.js +13 -0
- package/dist/scripts-create2/constructor-args.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +4 -0
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +35 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchPayments.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupBatchPayments.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js +38 -0
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js.map +1 -0
- package/dist/scripts-create2/deploy-one.d.ts.map +1 -1
- package/dist/scripts-create2/deploy-one.js +8 -0
- package/dist/scripts-create2/deploy-one.js.map +1 -1
- package/dist/scripts-create2/utils.d.ts +1 -1
- package/dist/scripts-create2/utils.d.ts.map +1 -1
- package/dist/scripts-create2/utils.js +4 -1
- 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 +7 -0
- package/dist/scripts-create2/verify-one.js.map +1 -1
- package/dist/src/lib/artifacts/BatchPayments/0.1.0.json +41 -0
- package/dist/src/lib/artifacts/BatchPayments/index.js +2 -2
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,
|
|
1
|
+
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EAiD7E,CAAC"}
|
|
@@ -31,6 +31,19 @@ const getConstructorArgs = (contract, network) => {
|
|
|
31
31
|
const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
|
|
32
32
|
return [erc20FeeProxyAddress, process.env.ADMIN_WALLET_ADDRESS];
|
|
33
33
|
}
|
|
34
|
+
case 'BatchPayments': {
|
|
35
|
+
if (!process.env.ADMIN_WALLET_ADDRESS) {
|
|
36
|
+
throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
|
|
37
|
+
}
|
|
38
|
+
if (!network) {
|
|
39
|
+
throw new Error('Batch contract requires network parameter to get correct address of erc20FeeProxy and ethereumFeeProxy');
|
|
40
|
+
}
|
|
41
|
+
return [
|
|
42
|
+
'0x0000000000000000000000000000000000000000',
|
|
43
|
+
'0x0000000000000000000000000000000000000000',
|
|
44
|
+
process.env.ADMIN_WALLET_ADDRESS,
|
|
45
|
+
];
|
|
46
|
+
}
|
|
34
47
|
default:
|
|
35
48
|
return [];
|
|
36
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAEjC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC3C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SACjE;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAEjC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC3C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SACjE;QACD,KAAK,eAAe,CAAC,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAjDW,QAAA,kBAAkB,sBAiD7B"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { BigNumber } from 'ethers';
|
|
2
2
|
export declare const REQUEST_SWAP_FEES = 5;
|
|
3
|
+
export declare const BATCH_FEE = 10;
|
|
3
4
|
export declare const updateChainlinkConversionPath: (contract: any, network: string, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
4
5
|
export declare const updateSwapRouter: (contract: any, network: string, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
5
6
|
export declare const updateRequestSwapFees: (contract: any, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
7
|
+
export declare const updateBatchPaymentFees: (contract: any, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
8
|
+
export declare const updatePaymentErc20FeeProxy: (contract: any, network: string, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
9
|
+
export declare const updatePaymentEthFeeProxy: (contract: any, network: string, nonce: number, gasPrice: BigNumber) => Promise<void>;
|
|
6
10
|
//# sourceMappingURL=adminTasks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,KAAK,CAAC;AAE5B,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,SACR,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,SACR,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,GAAG,SACN,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CAKd,CAAC;AAEF,eAAO,MAAM,sBAAsB,aACvB,GAAG,SACN,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CAKd,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,SACR,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,GAAG,WACJ,MAAM,SACR,MAAM,YACH,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.REQUEST_SWAP_FEES = void 0;
|
|
3
|
+
exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
6
|
const utils_1 = require("../../scripts/utils");
|
|
7
|
+
const artifacts = require("../../src/lib");
|
|
7
8
|
// Fees: 0.5%
|
|
8
9
|
exports.REQUEST_SWAP_FEES = 5;
|
|
10
|
+
// Batch Fees: 1%
|
|
11
|
+
exports.BATCH_FEE = 10;
|
|
9
12
|
const updateChainlinkConversionPath = (contract, network, nonce, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
10
13
|
const currentChainlinkAddress = yield contract.chainlinkConversionPath();
|
|
11
14
|
const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, '0.1.0');
|
|
@@ -34,4 +37,35 @@ const updateRequestSwapFees = (contract, nonce, gasPrice) => (0, tslib_1.__await
|
|
|
34
37
|
}
|
|
35
38
|
});
|
|
36
39
|
exports.updateRequestSwapFees = updateRequestSwapFees;
|
|
40
|
+
const updateBatchPaymentFees = (contract, nonce, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
41
|
+
const currentFees = yield contract.batchFee();
|
|
42
|
+
if (currentFees !== exports.BATCH_FEE) {
|
|
43
|
+
yield contract.setBatchFee(exports.BATCH_FEE, { nonce: nonce, gasPrice: gasPrice });
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
exports.updateBatchPaymentFees = updateBatchPaymentFees;
|
|
47
|
+
const updatePaymentErc20FeeProxy = (contract, network, nonce, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
48
|
+
const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
|
|
49
|
+
const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
|
|
50
|
+
const currentAddress = yield contract.paymentErc20FeeProxy();
|
|
51
|
+
if (currentAddress !== erc20FeeProxyAddress) {
|
|
52
|
+
yield contract.setPaymentErc20FeeProxy(erc20FeeProxyAddress, {
|
|
53
|
+
nonce: nonce,
|
|
54
|
+
gasPrice: gasPrice,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
exports.updatePaymentErc20FeeProxy = updatePaymentErc20FeeProxy;
|
|
59
|
+
const updatePaymentEthFeeProxy = (contract, network, nonce, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
60
|
+
const ethereumFeeProxy = artifacts.ethereumFeeProxyArtifact;
|
|
61
|
+
const ethereumFeeProxyAddress = ethereumFeeProxy.getAddress(network);
|
|
62
|
+
const currentAddress = yield contract.paymentEthFeeProxy();
|
|
63
|
+
if (currentAddress !== ethereumFeeProxyAddress) {
|
|
64
|
+
yield contract.setPaymentEthFeeProxy(ethereumFeeProxyAddress, {
|
|
65
|
+
nonce: nonce,
|
|
66
|
+
gasPrice: gasPrice,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
exports.updatePaymentEthFeeProxy = updatePaymentEthFeeProxy;
|
|
37
71
|
//# sourceMappingURL=adminTasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Updates the values of the batch fees of the BatchPayments contract, if needed
|
|
4
|
+
* @param contractAddress address of the BatchPayment Proxy
|
|
5
|
+
* @param hre Hardhat runtime environment
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupBatchPayments: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupBatchPayments.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupBatchPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,oBACZ,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CA4Bd,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupBatchPayments = 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 batch fees of the BatchPayments contract, if needed
|
|
10
|
+
* @param contractAddress address of the BatchPayment Proxy
|
|
11
|
+
* @param hre Hardhat runtime environment
|
|
12
|
+
*/
|
|
13
|
+
const setupBatchPayments = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
14
|
+
// Setup contract parameters
|
|
15
|
+
const batchPaymentContract = new hre.ethers.Contract(contractAddress, lib_1.batchPaymentsArtifact.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 batchPaymentConnected = yield batchPaymentContract.connect(signer);
|
|
27
|
+
const adminNonce = yield signer.getTransactionCount();
|
|
28
|
+
const gasPrice = yield provider.getGasPrice();
|
|
29
|
+
yield Promise.all([
|
|
30
|
+
(0, adminTasks_1.updateBatchPaymentFees)(batchPaymentConnected, adminNonce + 3, gasPrice),
|
|
31
|
+
(0, adminTasks_1.updatePaymentErc20FeeProxy)(batchPaymentConnected, network, adminNonce + 4, gasPrice),
|
|
32
|
+
(0, adminTasks_1.updatePaymentEthFeeProxy)(batchPaymentConnected, network, adminNonce + 5, gasPrice),
|
|
33
|
+
]);
|
|
34
|
+
})));
|
|
35
|
+
console.log('Setup for setupBatchPayment successfull');
|
|
36
|
+
});
|
|
37
|
+
exports.setupBatchPayments = setupBatchPayments;
|
|
38
|
+
//# sourceMappingURL=setupBatchPayments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupBatchPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,iDAA0C;AAC1C,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAChC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAClD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,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,qBAAqB,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzE,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,mCAAsB,EAAC,qBAAqB,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,CAAC;YACvE,IAAA,uCAA0B,EAAC,qBAAqB,EAAE,OAAO,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,CAAC;YACpF,IAAA,qCAAwB,EAAC,qBAAqB,EAAE,OAAO,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,CAAC;SACnF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CACH,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC,CAAA,CAAC;AA/BW,QAAA,kBAAkB,sBA+B7B"}
|
|
@@ -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;AAO5D,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CAkChB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CAkCd,CAAC"}
|
|
@@ -6,6 +6,7 @@ const utils_1 = require("./utils");
|
|
|
6
6
|
const xdeployer_1 = require("./xdeployer");
|
|
7
7
|
const constructor_args_1 = require("./constructor-args");
|
|
8
8
|
const contract_setup_1 = require("./contract-setup");
|
|
9
|
+
const setupBatchPayments_1 = require("./contract-setup/setupBatchPayments");
|
|
9
10
|
// Deploys, set up the contracts and returns the address
|
|
10
11
|
const deployOneWithCreate2 = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
11
12
|
if (!hre.config.xdeploy.networks || hre.config.xdeploy.networks.length === 0) {
|
|
@@ -59,6 +60,13 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
59
60
|
yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
60
61
|
break;
|
|
61
62
|
}
|
|
63
|
+
case 'BatchPayments': {
|
|
64
|
+
const network = hre.config.xdeploy.networks[0];
|
|
65
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
66
|
+
const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
67
|
+
yield (0, setupBatchPayments_1.setupBatchPayments)(address, hre);
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
62
70
|
// Other cases to add when necessary
|
|
63
71
|
default:
|
|
64
72
|
throw new Error(`The contrat ${contract} is not to be deployed using the CREATE2 scheme`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":";;;;AAAA,mCAA4E;AAG5E,2CAAsC;AACtC,yDAAwD;AACxD,qDAA8D;
|
|
1
|
+
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Contract } from 'ethers';
|
|
2
2
|
import * as artifacts from '../src/lib';
|
|
3
3
|
/**
|
|
4
|
-
* List of smart contract that we deploy using the CREATE2 scheme
|
|
4
|
+
* List of smart contract that we deploy using the CREATE2 scheme through the Request Deployer contract
|
|
5
5
|
*/
|
|
6
6
|
export declare const create2ContractDeploymentList: string[];
|
|
7
7
|
/**
|
|
@@ -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,UAOzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAc,MAAM,KAAG,UAAU,gBAAgB,CAAC,QAAQ,CA+BjF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,WACP,MAAM,mBACE,MAAM,KACtB,OAIF,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.isContractDeployed = exports.getArtifact = exports.create2ContractDeploymentList = void 0;
|
|
4
4
|
const artifacts = require("../src/lib");
|
|
5
5
|
/**
|
|
6
|
-
* List of smart contract that we deploy using the CREATE2 scheme
|
|
6
|
+
* List of smart contract that we deploy using the CREATE2 scheme through the Request Deployer contract
|
|
7
7
|
*/
|
|
8
8
|
exports.create2ContractDeploymentList = [
|
|
9
9
|
'EthereumProxy',
|
|
@@ -11,6 +11,7 @@ exports.create2ContractDeploymentList = [
|
|
|
11
11
|
'Erc20ConversionProxy',
|
|
12
12
|
'ERC20SwapToConversion',
|
|
13
13
|
'ERC20EscrowToPay',
|
|
14
|
+
'BatchPayments',
|
|
14
15
|
];
|
|
15
16
|
/**
|
|
16
17
|
* Returns the artifact of the specified contract
|
|
@@ -42,6 +43,8 @@ const getArtifact = (contract) => {
|
|
|
42
43
|
return artifacts.erc20SwapConversionArtifact;
|
|
43
44
|
case 'ERC20EscrowToPay':
|
|
44
45
|
return artifacts.erc20EscrowToPayArtifact;
|
|
46
|
+
case 'BatchPayments':
|
|
47
|
+
return artifacts.batchPaymentsArtifact;
|
|
45
48
|
default:
|
|
46
49
|
throw new Error('Contract unknown');
|
|
47
50
|
}
|
|
@@ -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,uBAAuB;IACvB,kBAAkB;
|
|
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;IAClB,eAAe;CAChB,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,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC;YACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AA/BW,QAAA,WAAW,eA+BtB;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,CAwCjG"}
|
|
@@ -39,6 +39,13 @@ function VerifyCreate2FromList(hre) {
|
|
|
39
39
|
yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
|
|
40
40
|
break;
|
|
41
41
|
}
|
|
42
|
+
case 'batchPayment': {
|
|
43
|
+
const network = hre.config.xdeploy.networks[0];
|
|
44
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
45
|
+
address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
|
|
46
|
+
yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
42
49
|
// Other cases to add when necessary
|
|
43
50
|
default:
|
|
44
51
|
throw new Error(`The contrat ${contract} is not to be deployed using the CREATE2 scheme`);
|
|
@@ -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,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;
|
|
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,KAAK,cAAc,CAAC,CAAC;wBACnB,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;AAxCD,sDAwCC"}
|
|
@@ -236,6 +236,21 @@
|
|
|
236
236
|
"stateMutability": "view",
|
|
237
237
|
"type": "function"
|
|
238
238
|
},
|
|
239
|
+
{
|
|
240
|
+
"constant": true,
|
|
241
|
+
"inputs": [],
|
|
242
|
+
"name": "paymentEthFeeProxy",
|
|
243
|
+
"outputs": [
|
|
244
|
+
{
|
|
245
|
+
"internalType": "contract IEthereumFeeProxy",
|
|
246
|
+
"name": "",
|
|
247
|
+
"type": "address"
|
|
248
|
+
}
|
|
249
|
+
],
|
|
250
|
+
"payable": false,
|
|
251
|
+
"stateMutability": "view",
|
|
252
|
+
"type": "function"
|
|
253
|
+
},
|
|
239
254
|
{
|
|
240
255
|
"constant": true,
|
|
241
256
|
"inputs": [],
|
|
@@ -250,6 +265,32 @@
|
|
|
250
265
|
"payable": false,
|
|
251
266
|
"stateMutability": "view",
|
|
252
267
|
"type": "function"
|
|
268
|
+
},
|
|
269
|
+
{
|
|
270
|
+
"inputs": [
|
|
271
|
+
{
|
|
272
|
+
"internalType": "address",
|
|
273
|
+
"name": "_paymentErc20FeeProxy",
|
|
274
|
+
"type": "address"
|
|
275
|
+
}
|
|
276
|
+
],
|
|
277
|
+
"name": "setPaymentErc20FeeProxy",
|
|
278
|
+
"outputs": [],
|
|
279
|
+
"stateMutability": "nonpayable",
|
|
280
|
+
"type": "function"
|
|
281
|
+
},
|
|
282
|
+
{
|
|
283
|
+
"inputs": [
|
|
284
|
+
{
|
|
285
|
+
"internalType": "address",
|
|
286
|
+
"name": "_paymentEthFeeProxy",
|
|
287
|
+
"type": "address"
|
|
288
|
+
}
|
|
289
|
+
],
|
|
290
|
+
"name": "setPaymentEthFeeProxy",
|
|
291
|
+
"outputs": [],
|
|
292
|
+
"stateMutability": "nonpayable",
|
|
293
|
+
"type": "function"
|
|
253
294
|
}
|
|
254
295
|
]
|
|
255
296
|
}
|
|
@@ -12,8 +12,8 @@ exports.batchPaymentsArtifact = new ContractArtifact_1.ContractArtifact({
|
|
|
12
12
|
creationBlockNumber: 0,
|
|
13
13
|
},
|
|
14
14
|
rinkeby: {
|
|
15
|
-
address: '
|
|
16
|
-
creationBlockNumber:
|
|
15
|
+
address: '0xfeE3f8937Ca62DA486a4E067Ed11aA6Bc6B21b4B',
|
|
16
|
+
creationBlockNumber: 10732960,
|
|
17
17
|
},
|
|
18
18
|
},
|
|
19
19
|
},
|