@requestnetwork/smart-contracts 0.28.1-next.1701 → 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/README.md +4 -6
- package/dist/hardhat.config.d.ts.map +1 -1
- package/dist/hardhat.config.js +3 -8
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts/deploy-payments.d.ts.map +1 -1
- package/dist/scripts/deploy-payments.js +4 -34
- 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/{6_deploy-all.d.ts → test-deploy-all.d.ts} +1 -1
- package/dist/scripts/test-deploy-all.d.ts.map +1 -0
- package/dist/scripts/test-deploy-all.js +22 -0
- package/dist/scripts/test-deploy-all.js.map +1 -0
- package/dist/scripts/{5_deploy-batch-erc-eth-deployment.d.ts → test-deploy-batch-erc-eth-deployment.d.ts} +1 -1
- package/dist/scripts/test-deploy-batch-erc-eth-deployment.d.ts.map +1 -0
- package/dist/scripts/{5_deploy-batch-erc-eth-deployment.js → test-deploy-batch-erc-eth-deployment.js} +7 -3
- package/dist/scripts/test-deploy-batch-erc-eth-deployment.js.map +1 -0
- package/dist/scripts/{4_deploy-escrow-deployment.d.ts → test-deploy-escrow-deployment.d.ts} +1 -1
- package/dist/scripts/test-deploy-escrow-deployment.d.ts.map +1 -0
- package/dist/scripts/{4_deploy-escrow-deployment.js → test-deploy-escrow-deployment.js} +3 -4
- package/dist/scripts/test-deploy-escrow-deployment.js.map +1 -0
- package/dist/scripts/{2_deploy-main-payments.d.ts → test-deploy-main-payments.d.ts} +1 -1
- package/dist/scripts/test-deploy-main-payments.d.ts.map +1 -0
- package/dist/scripts/{2_deploy-main-payments.js → test-deploy-main-payments.js} +1 -1
- package/dist/scripts/test-deploy-main-payments.js.map +1 -0
- package/dist/scripts/{1_deploy-request-storage.d.ts → test-deploy-request-storage.d.ts} +1 -1
- package/dist/scripts/test-deploy-request-storage.d.ts.map +1 -0
- package/dist/scripts/{1_deploy-request-storage.js → test-deploy-request-storage.js} +1 -1
- package/dist/scripts/test-deploy-request-storage.js.map +1 -0
- package/dist/scripts/test-deploy-superfluid.d.ts +4 -0
- package/dist/scripts/test-deploy-superfluid.d.ts.map +1 -0
- package/dist/scripts/test-deploy-superfluid.js +42 -0
- package/dist/scripts/test-deploy-superfluid.js.map +1 -0
- package/dist/scripts/{3_deploy_chainlink_contract.d.ts → test-deploy_chainlink_contract.d.ts} +1 -1
- package/dist/scripts/test-deploy_chainlink_contract.d.ts.map +1 -0
- package/dist/scripts/{3_deploy_chainlink_contract.js → test-deploy_chainlink_contract.js} +17 -8
- package/dist/scripts/test-deploy_chainlink_contract.js.map +1 -0
- 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/AggregatorMock__factory.d.ts +1 -1
- package/dist/src/types/factories/AggregatorMock__factory.js +1 -1
- package/dist/src/types/factories/BadERC20__factory.d.ts +1 -1
- package/dist/src/types/factories/BadERC20__factory.js +1 -1
- 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/BytesUtilsMock__factory.d.ts +1 -1
- package/dist/src/types/factories/BytesUtilsMock__factory.js +1 -1
- package/dist/src/types/factories/ChainlinkConversionPath__factory.d.ts +1 -1
- package/dist/src/types/factories/ChainlinkConversionPath__factory.js +1 -1
- package/dist/src/types/factories/ERC20Alpha__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20Alpha__factory.js +1 -1
- package/dist/src/types/factories/ERC20EscrowToPay__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20EscrowToPay__factory.js +1 -1
- package/dist/src/types/factories/ERC20False__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20False__factory.js +1 -1
- package/dist/src/types/factories/ERC20FeeProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20FeeProxy__factory.js +1 -1
- package/dist/src/types/factories/ERC20NoReturn__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20NoReturn__factory.js +1 -1
- package/dist/src/types/factories/ERC20Proxy__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20Proxy__factory.js +1 -1
- package/dist/src/types/factories/ERC20Revert__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20Revert__factory.js +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/ERC20SwapToPay__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20SwapToPay__factory.js +1 -1
- package/dist/src/types/factories/ERC20True__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20True__factory.js +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js +1 -1
- package/dist/src/types/factories/EthConversionProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/EthConversionProxy__factory.js +1 -1
- package/dist/src/types/factories/EtherPaymentFallback__factory.d.ts +1 -1
- package/dist/src/types/factories/EtherPaymentFallback__factory.js +1 -1
- package/dist/src/types/factories/EthereumFeeProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/EthereumFeeProxy__factory.js +1 -1
- package/dist/src/types/factories/EthereumProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/EthereumProxy__factory.js +1 -1
- package/dist/src/types/factories/FakeSwapRouter__factory.d.ts +1 -1
- package/dist/src/types/factories/FakeSwapRouter__factory.js +1 -1
- package/dist/src/types/factories/GnosisSafeProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/GnosisSafeProxy__factory.js +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/factories/Migrations__factory.d.ts +1 -1
- package/dist/src/types/factories/Migrations__factory.js +1 -1
- package/dist/src/types/factories/RequestDeployer__factory.d.ts +1 -1
- package/dist/src/types/factories/RequestDeployer__factory.js +1 -1
- package/dist/src/types/factories/RequestHashStorage__factory.d.ts +1 -1
- package/dist/src/types/factories/RequestHashStorage__factory.js +1 -1
- package/dist/src/types/factories/RequestOpenHashSubmitter__factory.d.ts +1 -1
- package/dist/src/types/factories/RequestOpenHashSubmitter__factory.js +1 -1
- package/dist/src/types/factories/StorageFeeCollector__factory.d.ts +1 -1
- package/dist/src/types/factories/StorageFeeCollector__factory.js +1 -1
- package/dist/src/types/factories/TestERC20__factory.d.ts +1 -1
- package/dist/src/types/factories/TestERC20__factory.js +1 -1
- package/dist/src/types/factories/UsdtFake__factory.d.ts +1 -1
- package/dist/src/types/factories/UsdtFake__factory.js +1 -1
- 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 +9 -6
- 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/AggregatorMock__factory.d.ts +1 -1
- package/types/factories/AggregatorMock__factory.js +1 -1
- package/types/factories/BadERC20__factory.d.ts +1 -1
- package/types/factories/BadERC20__factory.js +1 -1
- 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/BytesUtilsMock__factory.d.ts +1 -1
- package/types/factories/BytesUtilsMock__factory.js +1 -1
- package/types/factories/ChainlinkConversionPath__factory.d.ts +1 -1
- package/types/factories/ChainlinkConversionPath__factory.js +1 -1
- package/types/factories/ERC20Alpha__factory.d.ts +1 -1
- package/types/factories/ERC20Alpha__factory.js +1 -1
- package/types/factories/ERC20EscrowToPay__factory.d.ts +1 -1
- package/types/factories/ERC20EscrowToPay__factory.js +1 -1
- package/types/factories/ERC20False__factory.d.ts +1 -1
- package/types/factories/ERC20False__factory.js +1 -1
- package/types/factories/ERC20FeeProxy__factory.d.ts +1 -1
- package/types/factories/ERC20FeeProxy__factory.js +1 -1
- package/types/factories/ERC20NoReturn__factory.d.ts +1 -1
- package/types/factories/ERC20NoReturn__factory.js +1 -1
- package/types/factories/ERC20Proxy__factory.d.ts +1 -1
- package/types/factories/ERC20Proxy__factory.js +1 -1
- package/types/factories/ERC20Revert__factory.d.ts +1 -1
- package/types/factories/ERC20Revert__factory.js +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/ERC20SwapToPay__factory.d.ts +1 -1
- package/types/factories/ERC20SwapToPay__factory.js +1 -1
- package/types/factories/ERC20True__factory.d.ts +1 -1
- package/types/factories/ERC20True__factory.js +1 -1
- package/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/types/factories/Erc20ConversionProxy__factory.js +1 -1
- package/types/factories/EthConversionProxy__factory.d.ts +1 -1
- package/types/factories/EthConversionProxy__factory.js +1 -1
- package/types/factories/EtherPaymentFallback__factory.d.ts +1 -1
- package/types/factories/EtherPaymentFallback__factory.js +1 -1
- package/types/factories/EthereumFeeProxy__factory.d.ts +1 -1
- package/types/factories/EthereumFeeProxy__factory.js +1 -1
- package/types/factories/EthereumProxy__factory.d.ts +1 -1
- package/types/factories/EthereumProxy__factory.js +1 -1
- package/types/factories/FakeSwapRouter__factory.d.ts +1 -1
- package/types/factories/FakeSwapRouter__factory.js +1 -1
- package/types/factories/GnosisSafeProxy__factory.d.ts +1 -1
- package/types/factories/GnosisSafeProxy__factory.js +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/factories/Migrations__factory.d.ts +1 -1
- package/types/factories/Migrations__factory.js +1 -1
- package/types/factories/RequestDeployer__factory.d.ts +1 -1
- package/types/factories/RequestDeployer__factory.js +1 -1
- package/types/factories/RequestHashStorage__factory.d.ts +1 -1
- package/types/factories/RequestHashStorage__factory.js +1 -1
- package/types/factories/RequestOpenHashSubmitter__factory.d.ts +1 -1
- package/types/factories/RequestOpenHashSubmitter__factory.js +1 -1
- package/types/factories/StorageFeeCollector__factory.d.ts +1 -1
- package/types/factories/StorageFeeCollector__factory.js +1 -1
- package/types/factories/TestERC20__factory.d.ts +1 -1
- package/types/factories/TestERC20__factory.js +1 -1
- package/types/factories/UsdtFake__factory.d.ts +1 -1
- package/types/factories/UsdtFake__factory.js +1 -1
- 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/1_deploy-request-storage.d.ts.map +0 -1
- package/dist/scripts/1_deploy-request-storage.js.map +0 -1
- package/dist/scripts/2_deploy-main-payments.d.ts.map +0 -1
- package/dist/scripts/2_deploy-main-payments.js.map +0 -1
- package/dist/scripts/3_deploy_chainlink_contract.d.ts.map +0 -1
- package/dist/scripts/3_deploy_chainlink_contract.js.map +0 -1
- package/dist/scripts/4_deploy-escrow-deployment.d.ts.map +0 -1
- package/dist/scripts/4_deploy-escrow-deployment.js.map +0 -1
- package/dist/scripts/5_deploy-batch-erc-eth-deployment.d.ts.map +0 -1
- package/dist/scripts/5_deploy-batch-erc-eth-deployment.js.map +0 -1
- package/dist/scripts/6_deploy-all.d.ts.map +0 -1
- package/dist/scripts/6_deploy-all.js +0 -20
- package/dist/scripts/6_deploy-all.js.map +0 -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
package/README.md
CHANGED
|
@@ -36,13 +36,11 @@ import * as SmartContracts from '@requestnetwork/smart-contracts';
|
|
|
36
36
|
import { erc20FeeProxyArtifact } from '@requestnetwork/smart-contracts';
|
|
37
37
|
import { providers } from 'ethers';
|
|
38
38
|
|
|
39
|
-
const requestHashStorageMainnetAddress =
|
|
40
|
-
'mainnet'
|
|
41
|
-
);
|
|
39
|
+
const requestHashStorageMainnetAddress =
|
|
40
|
+
SmartContracts.requestHashStorageArtifact.getAddress('mainnet');
|
|
42
41
|
|
|
43
|
-
const requestHashSubmitterRinkebyAddress =
|
|
44
|
-
'rinkeby'
|
|
45
|
-
);
|
|
42
|
+
const requestHashSubmitterRinkebyAddress =
|
|
43
|
+
SmartContracts.requestHashSubmitterArtifact.getAddress('rinkeby');
|
|
46
44
|
|
|
47
45
|
const requestHashStorageABI = SmartContracts.requestHashStorageArtifact.getContractAbi();
|
|
48
46
|
|
|
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCnC,wBAkHE"}
|
package/dist/hardhat.config.js
CHANGED
|
@@ -8,9 +8,8 @@ require("@nomiclabs/hardhat-etherscan");
|
|
|
8
8
|
require("@nomiclabs/hardhat-ethers");
|
|
9
9
|
const config_1 = require("hardhat/config");
|
|
10
10
|
const dotenv_1 = require("dotenv");
|
|
11
|
-
const
|
|
11
|
+
const test_deploy_all_1 = require("./scripts/test-deploy-all");
|
|
12
12
|
const deploy_payments_1 = require("./scripts/deploy-payments");
|
|
13
|
-
const prepare_payments_1 = require("./scripts/prepare-payments");
|
|
14
13
|
const check_deployer_1 = require("./scripts-create2/check-deployer");
|
|
15
14
|
const deploy_request_deployer_1 = require("./scripts-create2/deploy-request-deployer");
|
|
16
15
|
const compute_one_address_1 = require("./scripts-create2/compute-one-address");
|
|
@@ -155,8 +154,7 @@ exports.default = {
|
|
|
155
154
|
// FIXME: use deployAllPaymentContracts instead to test with the same deployments
|
|
156
155
|
(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* () {
|
|
157
156
|
args.force = true;
|
|
158
|
-
yield
|
|
159
|
-
yield (0, _6_deploy_all_1.default)(args, hre);
|
|
157
|
+
yield (0, test_deploy_all_1.default)(args, hre);
|
|
160
158
|
console.log('All contracts (re)deployed locally');
|
|
161
159
|
}));
|
|
162
160
|
(0, config_1.task)('deploy-live-payments', 'Deploy payment contracts on a live network. Make sure to update all artifacts before running.')
|
|
@@ -170,15 +168,12 @@ exports.default = {
|
|
|
170
168
|
yield hre.run(DEPLOYER_KEY_GUARD);
|
|
171
169
|
yield (0, deploy_payments_1.deployAllPaymentContracts)(args, hre);
|
|
172
170
|
}));
|
|
173
|
-
(0, config_1.task)('prepare-live-payments', 'Run ERC20 approval transactions for Swap Conversion, with the second signer (FIXME with missing tasks).').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
174
|
-
yield hre.run(DEPLOYER_KEY_GUARD);
|
|
175
|
-
yield (0, prepare_payments_1.preparePayments)(hre);
|
|
176
|
-
}));
|
|
177
171
|
// Tasks inherent to the CREATE2 deployment scheme
|
|
178
172
|
(0, config_1.task)('deploy-deployer-contract', 'Deploy request deployer contract on the specified network').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
179
173
|
yield (0, deploy_request_deployer_1.deployDeployer)(hre);
|
|
180
174
|
}));
|
|
181
175
|
(0, config_1.task)('compute-contract-addresses', 'Compute the contract addresses from the Create2DeploymentList using the create2 scheme').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
176
|
+
yield hre.run('compile');
|
|
182
177
|
yield (0, compute_one_address_1.computeCreate2DeploymentAddressesFromList)(hre);
|
|
183
178
|
}));
|
|
184
179
|
(0, config_1.task)('deploy-contracts-through-deployer', 'Deploy the contracts from the Create2DeploymentList using the create2 scheme').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
@@ -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
|
|
1
|
+
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAmBnC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAG7E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,IAAI,CAAC,CA8Vf"}
|
|
@@ -4,7 +4,6 @@ exports.deployAllPaymentContracts = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
require("@nomiclabs/hardhat-ethers");
|
|
6
6
|
const lib_1 = require("../src/lib");
|
|
7
|
-
const erc20_swap_to_conversion_1 = require("./erc20-swap-to-conversion");
|
|
8
7
|
const conversion_proxy_1 = require("./conversion-proxy");
|
|
9
8
|
const deploy_one_1 = require("./deploy-one");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
@@ -120,7 +119,7 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
120
119
|
const NONCE_BATCH_4 = 10;
|
|
121
120
|
yield (0, utils_1.jumpToNonce)(args, hre, NONCE_BATCH_4);
|
|
122
121
|
// Deploy ChainlinkConversionPath
|
|
123
|
-
const { instance: chainlinkInstance, address: chainlinkConversionPathAddress
|
|
122
|
+
const { instance: chainlinkInstance, address: chainlinkConversionPathAddress } = yield runEasyDeployment({
|
|
124
123
|
contractName: 'ChainlinkConversionPath',
|
|
125
124
|
constructorArguments: [nativeTokenHash],
|
|
126
125
|
artifact: lib_1.chainlinkConversionPath,
|
|
@@ -161,9 +160,8 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
161
160
|
* Batch 5
|
|
162
161
|
* - 5.a ERC20ConversionProxy
|
|
163
162
|
* - 5.b ERC20ConversionProxy.transferOwnership
|
|
164
|
-
* - 5.c ERC20SwapConversion.setPaymentProxy
|
|
165
163
|
*/
|
|
166
|
-
const runDeploymentBatch_5 = (chainlinkInstance, erc20FeeProxyAddress,
|
|
164
|
+
const runDeploymentBatch_5 = (chainlinkInstance, erc20FeeProxyAddress, ethConversionResultInstance) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
167
165
|
const NONCE_BATCH_5 = 15;
|
|
168
166
|
yield (0, utils_1.jumpToNonce)(args, hre, NONCE_BATCH_5);
|
|
169
167
|
let chainlinkConversionPathAddress = chainlinkInstance === null || chainlinkInstance === void 0 ? void 0 : chainlinkInstance.address;
|
|
@@ -193,26 +191,6 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
193
191
|
switchToSimulation();
|
|
194
192
|
}
|
|
195
193
|
}
|
|
196
|
-
// 5.c ERC20SwapConversion.setPaymentProxy
|
|
197
|
-
// Ignore if the ERC20 conversion proxy is already live and used, until it gets deprecated
|
|
198
|
-
const IGNORE_SET_PAYMENT_PROXY = true;
|
|
199
|
-
console.warn(`DOUBLE-CHECK: ${IGNORE_SET_PAYMENT_PROXY ? '' : 'not '}ignoring erc20SwapConversionInstance.setPaymentProxy on ${erc20SwapConversionInstance.address}`);
|
|
200
|
-
if (!IGNORE_SET_PAYMENT_PROXY) {
|
|
201
|
-
if (yield nonceReady(NONCE_BATCH_5 + 2)) {
|
|
202
|
-
if (erc20ConversionResult) {
|
|
203
|
-
if (args.simulate === false) {
|
|
204
|
-
yield erc20SwapConversionInstance.setPaymentProxy(erc20ConversionResult === null || erc20ConversionResult === void 0 ? void 0 : erc20ConversionResult.address);
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
console.log('[i] Simulating setPaymentProxy to ERC20SwapConversion');
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
else {
|
|
211
|
-
console.warn(`Warning: the ERC20ConversionProxy contract instance is not ready for ERC20SwapConversion update, consider retrying.`);
|
|
212
|
-
switchToSimulation();
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
194
|
const ethConversionAdminNonce = NONCE_BATCH_5 + 3;
|
|
217
195
|
yield (0, utils_1.jumpToNonce)(args, hre, ethConversionAdminNonce);
|
|
218
196
|
// 5.d ETHConversion.transferOwnership
|
|
@@ -248,21 +226,13 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
248
226
|
});
|
|
249
227
|
// Batch 2
|
|
250
228
|
yield runDeploymentBatch_2(erc20FeeProxyAddress);
|
|
251
|
-
// Batch 3
|
|
252
|
-
// SwapToConversion
|
|
253
|
-
let swapRouterAddress = utils_1.uniswapV2RouterAddresses[hre.network.name];
|
|
254
|
-
if (!swapRouterAddress) {
|
|
255
|
-
logDeploymentMsg('ERC20SwapToConversion:', undefined, 'swap and chainlinkPath set to 0x000..000 - can be administrated by deployer');
|
|
256
|
-
swapRouterAddress = '0x0000000000000000000000000000000000000000';
|
|
257
|
-
}
|
|
258
|
-
const swapConversionResult = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: '0x0000000000000000000000000000000000000000', chainlinkConversionPathAddress: '0x0000000000000000000000000000000000000000', swapProxyAddress: swapRouterAddress, nonceCondition: 6 }), hre);
|
|
259
|
-
addToResult(swapConversionResult);
|
|
229
|
+
// Batch 3 - SwapToConversion : REMOVED -> Deployment CREATE2
|
|
260
230
|
// Compute EthereumFeeProxy address (CREATE2)
|
|
261
231
|
const ethFeeProxyAddress = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract: 'EthereumFeeProxy' }, hre);
|
|
262
232
|
// Batch 4
|
|
263
233
|
const { chainlinkInstance, ethConversionResult } = yield runDeploymentBatch_4(ethFeeProxyAddress);
|
|
264
234
|
// Batch 5
|
|
265
|
-
yield runDeploymentBatch_5(chainlinkInstance, erc20FeeProxyAddress,
|
|
235
|
+
yield runDeploymentBatch_5(chainlinkInstance, erc20FeeProxyAddress, ethConversionResult === null || ethConversionResult === void 0 ? void 0 : ethConversionResult.instance);
|
|
266
236
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
267
237
|
// Add future batches above this line
|
|
268
238
|
console.log('Done deploying.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,oCAKoB;AACpB,
|
|
1
|
+
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
2
|
-
import {
|
|
2
|
+
import { DeploymentResult } from './deploy-one';
|
|
3
3
|
export declare function deploySwapConversion(args: {
|
|
4
4
|
conversionProxyAddress?: string;
|
|
5
5
|
swapProxyAddress?: string;
|
|
6
|
-
chainlinkConversionPathAddress: string;
|
|
7
6
|
nonceCondition?: number;
|
|
8
|
-
}, hre: HardhatRuntimeEnvironment): Promise<
|
|
9
|
-
/**
|
|
10
|
-
* Prepares ERC20 approvals for the swap conversion contract.
|
|
11
|
-
* */
|
|
12
|
-
export declare function prepareSwapConversion(hre: HardhatRuntimeEnvironment, convSwapProxyAddress?: string): Promise<number>;
|
|
7
|
+
}, hre: HardhatRuntimeEnvironment): Promise<DeploymentResult>;
|
|
13
8
|
//# sourceMappingURL=erc20-swap-to-conversion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erc20-swap-to-conversion.d.ts","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"erc20-swap-to-conversion.d.ts","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,OAAO,EAAE,gBAAgB,EAAa,MAAM,cAAc,CAAC;AAK3D,wBAAsB,oBAAoB,CACxC,IAAI,EAAE;IACJ,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAkB3B"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.deploySwapConversion = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../src/lib");
|
|
6
6
|
const deploy_one_1 = require("./deploy-one");
|
|
7
7
|
const utils_1 = require("./utils");
|
|
8
8
|
const contractName = 'ERC20SwapToConversion';
|
|
9
9
|
function deploySwapConversion(args, hre) {
|
|
10
|
-
var _a;
|
|
11
10
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
|
+
const [deployer] = yield hre.ethers.getSigners();
|
|
12
12
|
if (!args.conversionProxyAddress) {
|
|
13
13
|
// FIXME: should try to retrieve information from artifacts instead
|
|
14
14
|
console.error(`Missing conversion proxy on ${hre.network.name}, cannot deploy ${contractName}.`);
|
|
@@ -17,11 +17,7 @@ function deploySwapConversion(args, hre) {
|
|
|
17
17
|
console.error(`Missing swap router, cannot deploy ${contractName}.`);
|
|
18
18
|
}
|
|
19
19
|
const deployment = yield (0, deploy_one_1.deployOne)(args, hre, contractName, {
|
|
20
|
-
constructorArguments: [
|
|
21
|
-
(_a = utils_1.uniswapV2RouterAddresses[hre.network.name]) !== null && _a !== void 0 ? _a : args.swapProxyAddress,
|
|
22
|
-
args.conversionProxyAddress,
|
|
23
|
-
args.chainlinkConversionPathAddress,
|
|
24
|
-
],
|
|
20
|
+
constructorArguments: [deployer.address],
|
|
25
21
|
artifact: lib_1.erc20SwapConversionArtifact,
|
|
26
22
|
nonceCondition: args.nonceCondition,
|
|
27
23
|
});
|
|
@@ -29,54 +25,4 @@ function deploySwapConversion(args, hre) {
|
|
|
29
25
|
});
|
|
30
26
|
}
|
|
31
27
|
exports.deploySwapConversion = deploySwapConversion;
|
|
32
|
-
/**
|
|
33
|
-
* Prepares ERC20 approvals for the swap conversion contract.
|
|
34
|
-
* */
|
|
35
|
-
function prepareSwapConversion(hre, convSwapProxyAddress) {
|
|
36
|
-
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
37
|
-
const [, signer] = yield hre.ethers.getSigners();
|
|
38
|
-
if (!signer) {
|
|
39
|
-
console.warn(`Warning: no signer given for administration tasks, cannot do ERC20 approvals.`);
|
|
40
|
-
}
|
|
41
|
-
const mainFactory = yield hre.ethers.getContractFactory(contractName, signer);
|
|
42
|
-
const convSwapProxy = convSwapProxyAddress
|
|
43
|
-
? mainFactory.attach(convSwapProxyAddress)
|
|
44
|
-
: lib_1.erc20SwapConversionArtifact.connect(hre.network.name, signer);
|
|
45
|
-
if (!defaultTokens[hre.network.name]) {
|
|
46
|
-
console.log(`No default token to approve for ${contractName} on ${hre.network.name}`);
|
|
47
|
-
return 0;
|
|
48
|
-
}
|
|
49
|
-
if (convSwapProxy) {
|
|
50
|
-
console.log(`Approving tokens for swaps...`);
|
|
51
|
-
const approbationTransactions = defaultTokens[hre.network.name].map((erc20Address) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
52
|
-
yield convSwapProxy.approveRouterToSpend(erc20Address);
|
|
53
|
-
yield convSwapProxy.approvePaymentProxyToSpend(erc20Address);
|
|
54
|
-
console.log(`Approved: ${erc20Address}`);
|
|
55
|
-
}));
|
|
56
|
-
yield Promise.all(approbationTransactions);
|
|
57
|
-
return defaultTokens[hre.network.name].length;
|
|
58
|
-
}
|
|
59
|
-
return 0;
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
exports.prepareSwapConversion = prepareSwapConversion;
|
|
63
|
-
/**
|
|
64
|
-
* Main tokens to be used to swap, per chain.
|
|
65
|
-
* The required ERC20 approvals for swapping will be performed on these tokens.
|
|
66
|
-
*/
|
|
67
|
-
const defaultTokens = {
|
|
68
|
-
// FIXME: add main tokens used on all chains
|
|
69
|
-
private: [
|
|
70
|
-
// ERC20Alpha
|
|
71
|
-
'0x38cF23C52Bb4B13F051Aec09580a2dE845a7FA35',
|
|
72
|
-
// TestERC20
|
|
73
|
-
'0x9FBDa871d559710256a2502A2517b794B482Db40',
|
|
74
|
-
],
|
|
75
|
-
rinkeby: [
|
|
76
|
-
// FAU
|
|
77
|
-
'0xfab46e002bbf0b4509813474841e0716e6730136',
|
|
78
|
-
// CTBK
|
|
79
|
-
'0x995d6a8c21f24be1dd04e105dd0d83758343e258',
|
|
80
|
-
],
|
|
81
|
-
};
|
|
82
28
|
//# sourceMappingURL=erc20-swap-to-conversion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erc20-swap-to-conversion.js","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":";;;;AAIA,oCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"erc20-swap-to-conversion.js","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":";;;;AAIA,oCAAyD;AACzD,6CAA2D;AAC3D,mCAAmD;AAEnD,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAE7C,SAAsB,oBAAoB,CACxC,IAIC,EACD,GAA8B;;QAE9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,+BAA+B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAClF,CAAC;SACH;QACD,IAAI,CAAC,gCAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACzE,OAAO,CAAC,KAAK,CAAC,sCAAsC,YAAY,GAAG,CAAC,CAAC;SACtE;QACD,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAS,EAAwB,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YACjF,oBAAoB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YACxC,QAAQ,EAAE,iCAA2B;YACrC,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;CAAA;AAzBD,oDAyBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-all.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-all.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAS1D,wBAA8B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CAO7F"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const test_deploy_request_storage_1 = require("./test-deploy-request-storage");
|
|
5
|
+
const test_deploy_main_payments_1 = require("./test-deploy-main-payments");
|
|
6
|
+
const test_deploy_chainlink_contract_1 = require("./test-deploy_chainlink_contract");
|
|
7
|
+
const test_deploy_escrow_deployment_1 = require("./test-deploy-escrow-deployment");
|
|
8
|
+
const test_deploy_batch_erc_eth_deployment_1 = require("./test-deploy-batch-erc-eth-deployment");
|
|
9
|
+
const test_deploy_superfluid_1 = require("./test-deploy-superfluid");
|
|
10
|
+
// Deploys, set up the contracts
|
|
11
|
+
function deploy(_args, hre) {
|
|
12
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
|
+
yield (0, test_deploy_request_storage_1.default)(_args, hre);
|
|
14
|
+
const mainPaymentAddresses = yield (0, test_deploy_main_payments_1.default)(_args, hre);
|
|
15
|
+
yield (0, test_deploy_chainlink_contract_1.default)(_args, hre, mainPaymentAddresses);
|
|
16
|
+
yield (0, test_deploy_escrow_deployment_1.deployEscrow)(hre);
|
|
17
|
+
yield (0, test_deploy_batch_erc_eth_deployment_1.deployBatchPayment)(_args, hre);
|
|
18
|
+
yield (0, test_deploy_superfluid_1.deploySuperFluid)(hre);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
exports.default = deploy;
|
|
22
|
+
//# sourceMappingURL=test-deploy-all.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-all.js","sourceRoot":"","sources":["../../scripts/test-deploy-all.ts"],"names":[],"mappings":";;;AACA,+EAA0D;AAC1D,2EAAwD;AACxD,qFAAgE;AAChE,mFAA+D;AAC/D,iGAA4E;AAC5E,qEAA4D;AAE5D,gCAAgC;AAChC,SAA8B,MAAM,CAAC,KAAU,EAAE,GAA8B;;QAC7E,MAAM,IAAA,qCAAa,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,MAAM,oBAAoB,GAAG,MAAM,IAAA,mCAAa,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,IAAA,wCAAgB,EAAC,KAAK,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;QACzD,MAAM,IAAA,4CAAY,EAAC,GAAG,CAAC,CAAC;QACxB,MAAM,IAAA,yDAAkB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,IAAA,yCAAgB,EAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CAAA;AAPD,yBAOC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
3
|
export declare function deployBatchPayment(args: any, hre: HardhatRuntimeEnvironment): Promise<any>;
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=test-deploy-batch-erc-eth-deployment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-batch-erc-eth-deployment.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-batch-erc-eth-deployment.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAM1D,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CA2BhG"}
|
|
@@ -4,6 +4,7 @@ exports.deployBatchPayment = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
require("@nomiclabs/hardhat-ethers");
|
|
6
6
|
const deploy_one_1 = require("../scripts/deploy-one");
|
|
7
|
+
const lib_1 = require("../src/lib");
|
|
7
8
|
// Deploys, set up the contracts
|
|
8
9
|
function deployBatchPayment(args, hre) {
|
|
9
10
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
@@ -18,11 +19,14 @@ function deployBatchPayment(args, hre) {
|
|
|
18
19
|
yield (yield hre.ethers.getSigners())[0].getAddress(),
|
|
19
20
|
],
|
|
20
21
|
});
|
|
21
|
-
|
|
22
|
+
// Initialize batch fee, useful to others packages.
|
|
23
|
+
const [owner] = yield hre.ethers.getSigners();
|
|
24
|
+
const batch = lib_1.batchPaymentsArtifact.connect(hre.network.name, owner);
|
|
25
|
+
yield batch.connect(owner).setBatchFee(10);
|
|
22
26
|
// ----------------------------------
|
|
23
27
|
console.log('Contracts deployed');
|
|
24
28
|
console.log(`
|
|
25
|
-
|
|
29
|
+
BatchPayments: ${BatchPaymentsAddress}
|
|
26
30
|
`);
|
|
27
31
|
}
|
|
28
32
|
catch (e) {
|
|
@@ -31,4 +35,4 @@ function deployBatchPayment(args, hre) {
|
|
|
31
35
|
});
|
|
32
36
|
}
|
|
33
37
|
exports.deployBatchPayment = deployBatchPayment;
|
|
34
|
-
//# sourceMappingURL=
|
|
38
|
+
//# sourceMappingURL=test-deploy-batch-erc-eth-deployment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-batch-erc-eth-deployment.js","sourceRoot":"","sources":["../../scripts/test-deploy-batch-erc-eth-deployment.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AAEnC,sDAAkD;AAElD,oCAAmD;AAEnD,gCAAgC;AAChC,SAAsB,kBAAkB,CAAC,IAAS,EAAE,GAA8B;;QAChF,IAAI;YACF,MAAM,oBAAoB,GAAG,4CAA4C,CAAC;YAC1E,MAAM,uBAAuB,GAAG,4CAA4C,CAAC;YAE7E,gCAAgC;YAChC,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE;gBACpF,oBAAoB,EAAE;oBACpB,oBAAoB;oBACpB,uBAAuB;oBACvB,MAAM,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE;iBACtD;aACF,CAAC,CAAC;YAEH,mDAAmD;YACnD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,2BAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrE,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAE3C,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC;kCACkB,oBAAoB;KACjD,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AA3BD,gDA2BC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
3
|
export declare function deployEscrow(hre: HardhatRuntimeEnvironment): Promise<void>;
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=test-deploy-escrow-deployment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-escrow-deployment.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-escrow-deployment.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,wBAAsB,YAAY,CAAC,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBhF"}
|
|
@@ -16,11 +16,10 @@ function deployEscrow(hre) {
|
|
|
16
16
|
const { address: erc20EscrowToPayAddress } = yield (0, deploy_one_1.deployOne)({}, hre, 'ERC20EscrowToPay', {
|
|
17
17
|
constructorArguments: [erc20FeeProxyAddress, deployerAddress],
|
|
18
18
|
});
|
|
19
|
-
console.log(`ERC20EscrowToPay Contract deployed: ${erc20EscrowToPayAddress}`);
|
|
20
19
|
// ----------------------------------
|
|
20
|
+
console.log('Contracts deployed');
|
|
21
21
|
console.log(`
|
|
22
|
-
|
|
23
|
-
ERC20EscrowToPay ${erc20EscrowToPayAddress}
|
|
22
|
+
ERC20EscrowToPay: ${erc20EscrowToPayAddress}
|
|
24
23
|
`);
|
|
25
24
|
}
|
|
26
25
|
catch (e) {
|
|
@@ -29,4 +28,4 @@ function deployEscrow(hre) {
|
|
|
29
28
|
});
|
|
30
29
|
}
|
|
31
30
|
exports.deployEscrow = deployEscrow;
|
|
32
|
-
//# sourceMappingURL=
|
|
31
|
+
//# sourceMappingURL=test-deploy-escrow-deployment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-escrow-deployment.js","sourceRoot":"","sources":["../../scripts/test-deploy-escrow-deployment.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AAGnC,sDAAkD;AAElD,gCAAgC;AAChC,SAAsB,YAAY,CAAC,GAA8B;;QAC/D,MAAM,oBAAoB,GAAG,4CAA4C,CAAC;QAC1E,IAAI,QAAgB,CAAC;QACrB,IAAI;YACF,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC3C,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;YACpD,yBAAyB;YACzB,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE;gBACxF,oBAAoB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;aAC9D,CAAC,CAAC;YAEH,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC;kCACkB,uBAAuB;KACpD,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAnBD,oCAmBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
3
|
export default function deploy(args: any, hre: HardhatRuntimeEnvironment): Promise<any>;
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=test-deploy-main-payments.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-main-payments.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-main-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,wBAA8B,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CA8G5F"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-main-payments.js","sourceRoot":"","sources":["../../scripts/test-deploy-main-payments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-request-storage.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-request-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,iBAuC9E"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-request-storage.js","sourceRoot":"","sources":["../../scripts/test-deploy-request-storage.ts"],"names":[],"mappings":";;;AAEA,MAAM,qBAAqB,GAAG,4CAA4C,CAAC;AAE3E,gCAAgC;AAChC,SAA8B,MAAM,CAAC,KAAU,EAAE,GAA8B;;QAC7E,IAAI;YACF,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC5D,mEAAmE;YACnE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/F,MAAM,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAEtD,yCAAyC;YACzC,MAAM,2BAA2B,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CACrE,oBAAoB,EACpB,QAAQ,CACT,CAAC;YACF,MAAM,kBAAkB,GAAG,MAAM,2BAA2B,CAAC,MAAM,EAAE,CAAC;YACtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAEnF,+CAA+C;YAC/C,MAAM,iCAAiC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAC3E,0BAA0B,EAC1B,QAAQ,CACT,CAAC;YACF,MAAM,wBAAwB,GAAG,MAAM,iCAAiC,CAAC,MAAM,CAC7E,kBAAkB,CAAC,OAAO,EAC1B,qBAAqB,CACtB,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,8CAA8C,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAE/F,2DAA2D;YAC3D,MAAM,kBAAkB,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;YAEtE,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC;kCACkB,kBAAkB,CAAC,OAAO;kCAC1B,wBAAwB,CAAC,OAAO;OAC3D,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAvCD,yBAuCC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-superfluid.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy-superfluid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,yBAAyB,CAAC;AAOjC,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,yBAAyB,iBA0BpE"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.deploySuperFluid = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const deployFramework = require("@superfluid-finance/ethereum-contracts/scripts/deploy-framework");
|
|
6
|
+
const deployTestToken = require("@superfluid-finance/ethereum-contracts/scripts/deploy-test-token");
|
|
7
|
+
const deploySuperToken = require("@superfluid-finance/ethereum-contracts/scripts/deploy-super-token");
|
|
8
|
+
require("@nomiclabs/hardhat-web3");
|
|
9
|
+
const errorHandler = (err) => {
|
|
10
|
+
if (err)
|
|
11
|
+
throw err;
|
|
12
|
+
};
|
|
13
|
+
// Deploys, set up the contracts
|
|
14
|
+
function deploySuperFluid(hre) {
|
|
15
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
16
|
+
let deployer;
|
|
17
|
+
try {
|
|
18
|
+
// get account from hardhat
|
|
19
|
+
[deployer] = yield hre.ethers.getSigners();
|
|
20
|
+
// deploy the framework
|
|
21
|
+
yield deployFramework(errorHandler, {
|
|
22
|
+
web3: hre.web3,
|
|
23
|
+
from: deployer.address,
|
|
24
|
+
});
|
|
25
|
+
// deploy a fake erc20 token
|
|
26
|
+
yield deployTestToken(errorHandler, [':', 'fDAI'], {
|
|
27
|
+
web3: hre.web3,
|
|
28
|
+
from: deployer.address,
|
|
29
|
+
});
|
|
30
|
+
// deploy a fake erc20 wrapper super token around the fDAI token
|
|
31
|
+
yield deploySuperToken(errorHandler, [':', 'fDAI'], {
|
|
32
|
+
web3: hre.web3,
|
|
33
|
+
from: deployer.address,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
console.error(e);
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
exports.deploySuperFluid = deploySuperFluid;
|
|
42
|
+
//# sourceMappingURL=test-deploy-superfluid.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy-superfluid.js","sourceRoot":"","sources":["../../scripts/test-deploy-superfluid.ts"],"names":[],"mappings":";;;;AAAA,mGAAoG;AACpG,oGAAqG;AACrG,sGAAuG;AAGvG,mCAAiC;AAEjC,MAAM,YAAY,GAAG,CAAC,GAAQ,EAAE,EAAE;IAChC,IAAI,GAAG;QAAE,MAAM,GAAG,CAAC;AACrB,CAAC,CAAC;AAEF,gCAAgC;AAChC,SAAsB,gBAAgB,CAAC,GAA8B;;QACnE,IAAI,QAA2B,CAAC;QAChC,IAAI;YACF,2BAA2B;YAC3B,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAE3C,uBAAuB;YACvB,MAAM,eAAe,CAAC,YAAY,EAAE;gBAClC,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,QAAQ,CAAC,OAAO;aACvB,CAAC,CAAC;YAEH,4BAA4B;YAC5B,MAAM,eAAe,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE;gBACjD,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,QAAQ,CAAC,OAAO;aACvB,CAAC,CAAC;YAEH,gEAAgE;YAChE,MAAM,gBAAgB,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE;gBAClD,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,QAAQ,CAAC,OAAO;aACvB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AA1BD,4CA0BC"}
|
package/dist/scripts/{3_deploy_chainlink_contract.d.ts → test-deploy_chainlink_contract.d.ts}
RENAMED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
3
|
export default function deploy(args: any, hre: HardhatRuntimeEnvironment, mainPaymentAddresses: any): Promise<void>;
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=test-deploy_chainlink_contract.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-deploy_chainlink_contract.d.ts","sourceRoot":"","sources":["../../scripts/test-deploy_chainlink_contract.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,CAClC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,GAAG,iBAyG1B"}
|