@requestnetwork/smart-contracts 0.29.1-next.1855 → 0.29.1-next.1857
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 +5 -5
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts-create2/check-deployer.d.ts.map +1 -1
- package/dist/scripts-create2/check-deployer.js +2 -2
- package/dist/scripts-create2/check-deployer.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +6 -6
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/xdeployer.js +4 -4
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CnC,wBAsJE"}
|
package/dist/hardhat.config.js
CHANGED
|
@@ -15,8 +15,8 @@ const deploy_request_deployer_1 = require("./scripts-create2/deploy-request-depl
|
|
|
15
15
|
const compute_one_address_1 = require("./scripts-create2/compute-one-address");
|
|
16
16
|
const verify_1 = require("./scripts-create2/verify");
|
|
17
17
|
const deploy_1 = require("./scripts-create2/deploy");
|
|
18
|
-
const utils_1 = require("
|
|
19
|
-
const utils_2 = require("
|
|
18
|
+
const utils_1 = require("./scripts/utils");
|
|
19
|
+
const utils_2 = require("@requestnetwork/utils");
|
|
20
20
|
(0, dotenv_1.config)();
|
|
21
21
|
const accounts = process.env.DEPLOYMENT_PRIVATE_KEY
|
|
22
22
|
? [process.env.DEPLOYMENT_PRIVATE_KEY]
|
|
@@ -38,7 +38,7 @@ const REQUEST_SALT = '0x0679724da7211bc62502a39f41cbf818fc7132c266e7c819fc2b06fa
|
|
|
38
38
|
const requestDeployer = process.env.REQUEST_DEPLOYER_LIVE
|
|
39
39
|
? LIVE_DEPLOYER_ADDRESS
|
|
40
40
|
: LOCAL_DEPLOYER_ADDRESS;
|
|
41
|
-
const url = (network) => process.env.WEB3_PROVIDER_URL ||
|
|
41
|
+
const url = (network) => process.env.WEB3_PROVIDER_URL || utils_2.networkRpcs[network];
|
|
42
42
|
exports.default = {
|
|
43
43
|
solidity: '0.8.9',
|
|
44
44
|
paths: {
|
|
@@ -194,8 +194,8 @@ exports.default = {
|
|
|
194
194
|
(0, config_1.task)('deploy-local-env', 'Deploy a local environment').setAction((args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
195
195
|
args.force = true;
|
|
196
196
|
yield (0, test_deploy_all_1.default)(args, hre);
|
|
197
|
-
if (
|
|
198
|
-
console.log(`Deployment failed, please check the ${
|
|
197
|
+
if (utils_1.NUMBER_ERRORS > 0) {
|
|
198
|
+
console.log(`Deployment failed, please check the ${utils_1.NUMBER_ERRORS} errors`);
|
|
199
199
|
}
|
|
200
200
|
else {
|
|
201
201
|
console.log('All contracts (re)deployed locally');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;;AAAA,8BAA4B;AAC5B,qCAAmC;AACnC,sCAAoC;AACpC,wCAAsC;AACtC,qCAAmC;AACnC,2CAA+C;AAC/C,mCAAgC;AAChC,+DAA2D;AAC3D,+DAAsE;AACtE,qEAAwE;AACxE,uFAA2E;AAE3E,+EAAkG;AAClG,qDAAiE;AACjE,qDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-deployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/check-deployer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"check-deployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/check-deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAG5D,eAAO,MAAM,oBAAoB,QAC1B,iCAAiC,KACrC,QAAQ,IAAI,CAwBd,CAAC"}
|
|
@@ -13,10 +13,10 @@ const checkCreate2Deployer = (hre) => (0, tslib_1.__awaiter)(void 0, void 0, voi
|
|
|
13
13
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
14
14
|
let provider;
|
|
15
15
|
if (network === 'celo') {
|
|
16
|
-
provider = utils_1.
|
|
16
|
+
provider = (0, utils_1.getCeloProvider)();
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
19
|
-
provider = utils_1.
|
|
19
|
+
provider = (0, utils_1.getDefaultProvider)(network);
|
|
20
20
|
}
|
|
21
21
|
const code = yield provider.getCode(hre.config.xdeploy.deployerAddress);
|
|
22
22
|
if (code === '0x') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-deployer.js","sourceRoot":"","sources":["../../scripts-create2/check-deployer.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"check-deployer.js","sourceRoot":"","sources":["../../scripts-create2/check-deployer.ts"],"names":[],"mappings":";;;;AACA,iDAA4E;AAErE,MAAM,oBAAoB,GAAG,CAClC,GAAsC,EACvB,EAAE;IACjB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5E,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IACD,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAe,EAAE,EAAE;QACxD,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,QAAQ,GAAG,IAAA,uBAAe,GAAE,CAAC;SAC9B;aAAM;YACL,QAAQ,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;SACxC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAExE,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,MAAM,IAAI,KAAK,CACb,6CAA6C,OAAO,eAAe,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CACxG,CAAC;SACH;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA1BW,QAAA,oBAAoB,wBA0B/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAK7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,WAAqB,CAAC;AAI5C;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,eACF,SAAS,mCAErB,QAAQ,IAAI,CAad,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,eACF,SAAS,KACrB,QAAQ,IAAI,CAMd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CAOd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,aACvB,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CAOd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,aACpC,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CASd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC7B,GAAG,WACJ,MAAM,eACF,SAAS,aACX,QAAQ,GAAG,OAAO,mCAE5B,QAAQ,IAAI,CAkBd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,eACF,SAAS,aAElB,QAAQ,GACR,kBAAkB,GAClB,OAAO,GACP,iBAAiB,GACjB,yBAAyB,KAC5B,QAAQ,IAAI,CAuCd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,aAC1B,GAAG,iBACE,MAAM,cACT,MAAM,eACL,SAAS,KACrB,QAAQ,IAAI,CAgBd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YACrB,MAAM,OACV,iCAAiC;YAE9B,MAAM;iBACD;QACX,YAAY,CAAC,EAAE,SAAS,CAAC;QACzB,oBAAoB,CAAC,EAAE,SAAS,CAAC;KAClC;EAqBF,CAAC"}
|
|
@@ -6,14 +6,14 @@ const lib_1 = require("../../src/lib");
|
|
|
6
6
|
const utils_1 = require("../../scripts/utils");
|
|
7
7
|
const artifacts = require("../../src/lib");
|
|
8
8
|
const ethers_1 = require("ethers");
|
|
9
|
-
const utils_2 = require("
|
|
10
|
-
const utils_3 = require("
|
|
9
|
+
const utils_2 = require("ethers/lib/utils");
|
|
10
|
+
const utils_3 = require("@requestnetwork/utils");
|
|
11
11
|
// Fees: 0.5%
|
|
12
12
|
exports.REQUEST_SWAP_FEES = 5;
|
|
13
13
|
// Batch Fees: .3%
|
|
14
14
|
exports.BATCH_FEE = ethers_1.BigNumber.from(30);
|
|
15
15
|
// Batch fee amount in USD Limit: 150 * 1e8 ($150)
|
|
16
|
-
const BATCH_FEE_AMOUNT_USD_LIMIT = (0,
|
|
16
|
+
const BATCH_FEE_AMOUNT_USD_LIMIT = (0, utils_2.parseUnits)('150', 8);
|
|
17
17
|
/**
|
|
18
18
|
* Updates the chainlink address used by the contract.
|
|
19
19
|
* @param contract A contract using chainlink:
|
|
@@ -178,15 +178,15 @@ exports.updateNativeAndUSDAddress = updateNativeAndUSDAddress;
|
|
|
178
178
|
const getSignerAndGasFees = (network, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
179
179
|
let provider;
|
|
180
180
|
if (network === 'celo') {
|
|
181
|
-
provider =
|
|
181
|
+
provider = (0, utils_3.getCeloProvider)();
|
|
182
182
|
}
|
|
183
183
|
else {
|
|
184
|
-
provider =
|
|
184
|
+
provider = (0, utils_3.getDefaultProvider)(network);
|
|
185
185
|
}
|
|
186
186
|
const signer = new hre.ethers.Wallet(hre.config.xdeploy.signer).connect(provider);
|
|
187
187
|
let txOverrides;
|
|
188
188
|
try {
|
|
189
|
-
txOverrides = yield
|
|
189
|
+
txOverrides = yield (0, utils_3.estimateGasFees)({ provider });
|
|
190
190
|
}
|
|
191
191
|
catch (err) {
|
|
192
192
|
txOverrides = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;AAC/D,2CAA2C;AAC3C,mCAAsD;
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.xdeploy = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const utils_1 = require("@requestnetwork/utils");
|
|
6
5
|
const lib_1 = require("../src/lib");
|
|
6
|
+
const utils_1 = require("@requestnetwork/utils");
|
|
7
7
|
const ZERO_ETH_INPUT = 0;
|
|
8
8
|
const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
9
9
|
const { contract, constructorArgs } = deploymentParams;
|
|
@@ -31,10 +31,10 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
31
31
|
console.log(`... on ${network}`);
|
|
32
32
|
let provider;
|
|
33
33
|
if (network === 'celo') {
|
|
34
|
-
provider = utils_1.
|
|
34
|
+
provider = (0, utils_1.getCeloProvider)();
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
provider = utils_1.
|
|
37
|
+
provider = (0, utils_1.getDefaultProvider)(network);
|
|
38
38
|
}
|
|
39
39
|
const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
|
|
40
40
|
const signer = wallet.connect(provider);
|
|
@@ -51,7 +51,7 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
51
51
|
let error = undefined;
|
|
52
52
|
let txOverrides;
|
|
53
53
|
try {
|
|
54
|
-
txOverrides = yield utils_1.
|
|
54
|
+
txOverrides = yield (0, utils_1.estimateGasFees)({ provider });
|
|
55
55
|
const gasLimit = hre.config.xdeploy.gasLimit;
|
|
56
56
|
txOverrides.gasLimit = gasLimit;
|
|
57
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":"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"}
|