@requestnetwork/smart-contracts 0.29.1-next.1826 → 0.29.1-next.1827
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 -1
- package/dist/scripts-create2/compute-one-address.js +1 -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 +5 -2
- package/dist/scripts-create2/constructor-args.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +33 -10
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +92 -25
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js +48 -0
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js.map +1 -0
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js +3 -2
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setups.d.ts +1 -1
- package/dist/scripts-create2/contract-setup/setups.js +4 -4
- package/dist/scripts-create2/contract-setup/setups.js.map +1 -1
- package/dist/scripts-create2/deploy.js +3 -3
- package/dist/scripts-create2/deploy.js.map +1 -1
- package/dist/scripts-create2/utils.js +3 -3
- package/dist/scripts-create2/utils.js.map +1 -1
- package/dist/scripts-create2/verify.js +1 -1
- package/dist/scripts-create2/verify.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/dist/scripts-create2/contract-setup/setupBatchPayments.d.ts +0 -8
- package/dist/scripts-create2/contract-setup/setupBatchPayments.d.ts.map +0 -1
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js +0 -32
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js.map +0 -1
package/README.md
CHANGED
|
@@ -157,7 +157,10 @@ This command will output details about each contract deployment on each chain:
|
|
|
157
157
|
|
|
158
158
|
### Verify the contracts
|
|
159
159
|
|
|
160
|
-
Verify and publish the contract code automatically to blockchain explorers, right after smart contracts compilation.
|
|
160
|
+
Verify and publish the contract code automatically to blockchain explorers, right after smart contracts compilation.
|
|
161
|
+
Environment variables needed: `ADMIN_...` key and wallet, `ETHERSCAN_API_KEY`, and `REQUEST_DEPLOYER_LIVE`.
|
|
162
|
+
Depending on the contracts you're verifying you will need to set up `WEB3_PROVIDER_URL`.
|
|
163
|
+
See `hardhat.config.ts`.
|
|
161
164
|
|
|
162
165
|
```bash
|
|
163
166
|
yarn hardhat verify-contract-from-deployer --network <NETWORK>
|
|
@@ -47,7 +47,7 @@ const computeCreate2DeploymentAddressesFromList = (hre) => (0, tslib_1.__awaiter
|
|
|
47
47
|
case 'ERC20FeeProxy':
|
|
48
48
|
case 'Erc20ConversionProxy':
|
|
49
49
|
case 'ERC20EscrowToPay':
|
|
50
|
-
case '
|
|
50
|
+
case 'BatchConversionPayments':
|
|
51
51
|
case 'ERC20SwapToConversion': {
|
|
52
52
|
try {
|
|
53
53
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, hre.network.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":";;;;AACA,oCAA6C;AAC7C,mCAAwD;AACxD,yDAAwD;AAExD,gCAAgC;AAChC,SAAsB,+BAA+B,CACnD,gBAAmC,EACnC,GAAsC;;QAEtC,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CACvD,uCAAuC,CACxC,CAAC;YACF,MAAM,eAAe,GAAG,qBAAe,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC;YACb,IAAI,gBAAgB,CAAC,eAAe,EAAE;gBACpC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;aAC7F;iBAAM;gBACL,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;aAC1D;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,0BAA0B,CACtE,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,EACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CACnC,CAAC;YACF,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CAAA;AArCD,0EAqCC;AAEM,MAAM,yCAAyC,GAAG,CACvD,GAAsC,EACvB,EAAE;IACjB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;QACnD,IAAI,OAAe,CAAC;QACpB,QAAQ,QAAQ,EAAE;YAChB,KAAK,eAAe,CAAC;YACrB,KAAK,kBAAkB,CAAC;YACxB,KAAK,oBAAoB,CAAC;YAC1B,KAAK,eAAe,CAAC;YACrB,KAAK,sBAAsB,CAAC;YAC5B,KAAK,kBAAkB,CAAC;YACxB,KAAK,
|
|
1
|
+
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,
|
|
1
|
+
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EAkD7E,CAAC"}
|
|
@@ -38,11 +38,14 @@ const getConstructorArgs = (contract, network) => {
|
|
|
38
38
|
const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
|
|
39
39
|
return [erc20FeeProxyAddress, getAdminWalletAddress(contract)];
|
|
40
40
|
}
|
|
41
|
-
case '
|
|
41
|
+
case 'BatchConversionPayments': {
|
|
42
42
|
if (!network) {
|
|
43
|
-
throw new Error('Batch contract requires network parameter to get correct address of erc20FeeProxy and
|
|
43
|
+
throw new Error('Batch conversion contract requires network parameter to get correct address of erc20FeeProxy, erc20ConversionFeeProxy, ethereumFeeProxy, ethereumConversionFeeProxy, and chainlinkConversionPath');
|
|
44
44
|
}
|
|
45
45
|
return [
|
|
46
|
+
'0x0000000000000000000000000000000000000000',
|
|
47
|
+
'0x0000000000000000000000000000000000000000',
|
|
48
|
+
'0x0000000000000000000000000000000000000000',
|
|
46
49
|
'0x0000000000000000000000000000000000000000',
|
|
47
50
|
'0x0000000000000000000000000000000000000000',
|
|
48
51
|
getAdminWalletAddress(contract),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,oFAAoF;gBACpF,2EAA2E;gBAC3E,wGAAwG;gBACxG,4CAA4C;aAC7C,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,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,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,
|
|
1
|
+
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,oFAAoF;gBACpF,2EAA2E;gBAC3E,wGAAwG;gBACxG,4CAA4C;aAC7C,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,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,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,yBAAyB,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,kMAAkM,CACnM,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAlDW,QAAA,kBAAkB,sBAkD7B"}
|
|
@@ -1,32 +1,55 @@
|
|
|
1
1
|
import { BigNumber, Wallet } from 'ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
3
3
|
export declare const REQUEST_SWAP_FEES = 5;
|
|
4
|
-
export declare const BATCH_FEE
|
|
4
|
+
export declare const BATCH_FEE: BigNumber;
|
|
5
5
|
/**
|
|
6
6
|
* Updates the chainlink address used by the contract.
|
|
7
7
|
* @param contract A contract using chainlink:
|
|
8
8
|
* Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
|
|
9
9
|
* @param network The network used.
|
|
10
|
-
* @param gasPrice The gas price used.Increase its value if needed.
|
|
10
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
11
11
|
* @param version The version of the chainlink proxy to use, the last one by default.
|
|
12
12
|
*/
|
|
13
|
-
export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: undefined) => Promise<void>;
|
|
13
|
+
export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: string | undefined) => Promise<void>;
|
|
14
14
|
export declare const updateSwapRouter: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
|
|
15
15
|
export declare const updateRequestSwapFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
|
|
16
|
+
/**
|
|
17
|
+
* Updates the batchFee applied by the batch conversion proxy.
|
|
18
|
+
* @param contract BatchConversionPayments contract.
|
|
19
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
20
|
+
*/
|
|
16
21
|
export declare const updateBatchPaymentFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
|
|
17
22
|
/**
|
|
18
|
-
* Updates the
|
|
23
|
+
* Updates the feeAMountUSDLimit of the batch conversion proxy.
|
|
24
|
+
* @param contract BatchConversionPayments contract.
|
|
25
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
26
|
+
*/
|
|
27
|
+
export declare const updateBatchPaymentFeeAmountUSDLimit: (contract: any, gasPrice: BigNumber) => Promise<void>;
|
|
28
|
+
/**
|
|
29
|
+
* Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
|
|
19
30
|
* @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
|
|
20
31
|
* @param network The network used.
|
|
21
|
-
* @param gasPrice The gas price used.Increase its value if needed.
|
|
32
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
22
33
|
* @param proxyType The type of the proxy fee.
|
|
23
34
|
* @param version The version of the fee proxy to use, the last one by default.
|
|
24
35
|
*/
|
|
25
|
-
export declare const updatePaymentFeeProxyAddress: (contract: any, network: string, gasPrice: BigNumber, proxyType: 'native' | 'erc20', version?: undefined) => Promise<void>;
|
|
26
|
-
/**
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
36
|
+
export declare const updatePaymentFeeProxyAddress: (contract: any, network: string, gasPrice: BigNumber, proxyType: 'native' | 'erc20', version?: string | undefined) => Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Update the address of a proxy used by batch conversion contract.
|
|
39
|
+
* @param contract BatchConversionPayments contract.
|
|
40
|
+
* @param network The network used.
|
|
41
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
42
|
+
* @param proxyName The name of the fee proxy to update.
|
|
43
|
+
*/
|
|
44
|
+
export declare const updateBatchConversionProxy: (contract: any, network: string, gasPrice: BigNumber, proxyName: 'native' | 'nativeConversion' | 'erc20' | 'erc20Conversion' | 'chainlinkConversionPath') => Promise<void>;
|
|
45
|
+
/**
|
|
46
|
+
* Update the native and the USD addresses used by batch conversion contract.
|
|
47
|
+
* @param contract BatchConversionPayments contract.
|
|
48
|
+
* @param NativeAddress The address of native token, eg: ETH.
|
|
49
|
+
* @param USDAddress The address of USD token.
|
|
50
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
51
|
+
*/
|
|
52
|
+
export declare const updateNativeAndUSDAddress: (contract: any, NativeAddress: string, USDAddress: string, gasPrice: BigNumber) => Promise<void>;
|
|
30
53
|
export declare const getSignerAndGasPrice: (network: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
|
|
31
54
|
signer: Wallet;
|
|
32
55
|
gasPrice: BigNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAI7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,WAAqB,CAAC;AAI5C;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,mCAElB,QAAQ,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO7F,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,aACpC,GAAG,YACH,SAAS,KAClB,QAAQ,IAAI,CAWd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC7B,GAAG,WACJ,MAAM,YACL,SAAS,aACR,QAAQ,GAAG,OAAO,mCAE5B,QAAQ,IAAI,CAoBd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,aAEf,QAAQ,GACR,kBAAkB,GAClB,OAAO,GACP,iBAAiB,GACjB,yBAAyB,KAC5B,QAAQ,IAAI,CAyCd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,aAC1B,GAAG,iBACE,MAAM,cACT,MAAM,YACR,SAAS,KAClB,QAAQ,IAAI,CAkBd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}
|
|
@@ -1,24 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSignerAndGasPrice = exports.
|
|
3
|
+
exports.getSignerAndGasPrice = exports.updateNativeAndUSDAddress = exports.updateBatchConversionProxy = exports.updatePaymentFeeProxyAddress = exports.updateBatchPaymentFeeAmountUSDLimit = 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
7
|
const artifacts = require("../../src/lib");
|
|
8
|
+
const ethers_1 = require("ethers");
|
|
8
9
|
const utils_2 = require("@requestnetwork/utils");
|
|
10
|
+
const utils_3 = require("ethers/lib/utils");
|
|
9
11
|
// Fees: 0.5%
|
|
10
12
|
exports.REQUEST_SWAP_FEES = 5;
|
|
11
13
|
// Batch Fees: .3%
|
|
12
|
-
exports.BATCH_FEE =
|
|
14
|
+
exports.BATCH_FEE = ethers_1.BigNumber.from(30);
|
|
15
|
+
// Batch fee amount in USD Limit: 150 * 1e8 ($150)
|
|
16
|
+
const BATCH_FEE_AMOUNT_USD_LIMIT = (0, utils_3.parseUnits)('150', 8);
|
|
13
17
|
/**
|
|
14
18
|
* Updates the chainlink address used by the contract.
|
|
15
19
|
* @param contract A contract using chainlink:
|
|
16
20
|
* Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
|
|
17
21
|
* @param network The network used.
|
|
18
|
-
* @param gasPrice The gas price used.Increase its value if needed.
|
|
22
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
19
23
|
* @param version The version of the chainlink proxy to use, the last one by default.
|
|
20
24
|
*/
|
|
21
|
-
const updateChainlinkConversionPath = (contract, network, gasPrice, version
|
|
25
|
+
const updateChainlinkConversionPath = (contract, network, gasPrice, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
22
26
|
const currentChainlinkAddress = yield contract.chainlinkConversionPath();
|
|
23
27
|
const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, version);
|
|
24
28
|
if (currentChainlinkAddress !== chainlinkConversionPathAddress) {
|
|
@@ -49,24 +53,45 @@ const updateRequestSwapFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(voi
|
|
|
49
53
|
}
|
|
50
54
|
});
|
|
51
55
|
exports.updateRequestSwapFees = updateRequestSwapFees;
|
|
56
|
+
/**
|
|
57
|
+
* Updates the batchFee applied by the batch conversion proxy.
|
|
58
|
+
* @param contract BatchConversionPayments contract.
|
|
59
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
60
|
+
*/
|
|
52
61
|
const updateBatchPaymentFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
53
62
|
const currentFees = yield contract.batchFee();
|
|
54
|
-
if (!
|
|
63
|
+
if (!exports.BATCH_FEE.eq(currentFees)) {
|
|
55
64
|
const tx = yield contract.setBatchFee(exports.BATCH_FEE, { gasPrice: gasPrice });
|
|
56
65
|
yield tx.wait(1);
|
|
57
|
-
console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE}`);
|
|
66
|
+
console.log(`Batch: currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE.toString()}`);
|
|
58
67
|
}
|
|
59
68
|
});
|
|
60
69
|
exports.updateBatchPaymentFees = updateBatchPaymentFees;
|
|
61
70
|
/**
|
|
62
|
-
* Updates the
|
|
71
|
+
* Updates the feeAMountUSDLimit of the batch conversion proxy.
|
|
72
|
+
* @param contract BatchConversionPayments contract.
|
|
73
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
74
|
+
*/
|
|
75
|
+
const updateBatchPaymentFeeAmountUSDLimit = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
76
|
+
const currentFeeAmountUSDLimit = yield contract.batchFeeAmountUSDLimit();
|
|
77
|
+
if (!currentFeeAmountUSDLimit.eq(BATCH_FEE_AMOUNT_USD_LIMIT)) {
|
|
78
|
+
const tx = yield contract.setBatchFeeAmountUSDLimit(BATCH_FEE_AMOUNT_USD_LIMIT, {
|
|
79
|
+
gasPrice: gasPrice,
|
|
80
|
+
});
|
|
81
|
+
yield tx.wait(1);
|
|
82
|
+
console.log(`Batch: the current fee amount in USD limit: ${currentFeeAmountUSDLimit.toString()}, have been replaced by: ${BATCH_FEE_AMOUNT_USD_LIMIT.toString()}. ($1 = 1e8)`);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
exports.updateBatchPaymentFeeAmountUSDLimit = updateBatchPaymentFeeAmountUSDLimit;
|
|
86
|
+
/**
|
|
87
|
+
* Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
|
|
63
88
|
* @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
|
|
64
89
|
* @param network The network used.
|
|
65
|
-
* @param gasPrice The gas price used.Increase its value if needed.
|
|
90
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
66
91
|
* @param proxyType The type of the proxy fee.
|
|
67
92
|
* @param version The version of the fee proxy to use, the last one by default.
|
|
68
93
|
*/
|
|
69
|
-
const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, version
|
|
94
|
+
const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
70
95
|
let proxyAddress;
|
|
71
96
|
let currentAddress;
|
|
72
97
|
if (proxyType === 'native') {
|
|
@@ -86,32 +111,74 @@ const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, ve
|
|
|
86
111
|
}
|
|
87
112
|
});
|
|
88
113
|
exports.updatePaymentFeeProxyAddress = updatePaymentFeeProxyAddress;
|
|
89
|
-
/**
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
114
|
+
/**
|
|
115
|
+
* Update the address of a proxy used by batch conversion contract.
|
|
116
|
+
* @param contract BatchConversionPayments contract.
|
|
117
|
+
* @param network The network used.
|
|
118
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
119
|
+
* @param proxyName The name of the fee proxy to update.
|
|
120
|
+
*/
|
|
121
|
+
const updateBatchConversionProxy = (contract, network, gasPrice, proxyName) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
122
|
+
let proxyAddress;
|
|
123
|
+
let batchSetProxy;
|
|
124
|
+
let currentAddress;
|
|
125
|
+
switch (proxyName) {
|
|
126
|
+
case 'native':
|
|
127
|
+
proxyAddress = artifacts.ethereumFeeProxyArtifact.getAddress(network);
|
|
128
|
+
batchSetProxy = yield contract.setPaymentNativeProxy;
|
|
129
|
+
currentAddress = yield contract.paymentNativeProxy();
|
|
130
|
+
break;
|
|
131
|
+
case 'nativeConversion':
|
|
132
|
+
proxyAddress = artifacts.ethConversionArtifact.getAddress(network);
|
|
133
|
+
batchSetProxy = yield contract.setPaymentNativeConversionProxy;
|
|
134
|
+
currentAddress = yield contract.paymentNativeConversionProxy();
|
|
135
|
+
break;
|
|
136
|
+
case 'erc20':
|
|
137
|
+
proxyAddress = artifacts.erc20FeeProxyArtifact.getAddress(network);
|
|
138
|
+
batchSetProxy = yield contract.setPaymentErc20Proxy;
|
|
139
|
+
currentAddress = yield contract.paymentErc20Proxy();
|
|
140
|
+
break;
|
|
141
|
+
case 'erc20Conversion':
|
|
142
|
+
proxyAddress = artifacts.erc20ConversionProxy.getAddress(network);
|
|
143
|
+
batchSetProxy = yield contract.setPaymentErc20ConversionProxy;
|
|
144
|
+
currentAddress = yield contract.paymentErc20ConversionProxy();
|
|
145
|
+
break;
|
|
146
|
+
case 'chainlinkConversionPath':
|
|
147
|
+
proxyAddress = artifacts.chainlinkConversionPath.getAddress(network);
|
|
148
|
+
batchSetProxy = yield contract.setChainlinkConversionPath;
|
|
149
|
+
currentAddress = yield contract.chainlinkConversionPath();
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
|
|
153
|
+
const tx = yield batchSetProxy(proxyAddress, {
|
|
96
154
|
gasPrice: gasPrice,
|
|
97
155
|
});
|
|
98
156
|
yield tx.wait(1);
|
|
157
|
+
console.log(`${proxyName}: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
|
|
99
158
|
}
|
|
100
159
|
});
|
|
101
|
-
exports.
|
|
102
|
-
/**
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
160
|
+
exports.updateBatchConversionProxy = updateBatchConversionProxy;
|
|
161
|
+
/**
|
|
162
|
+
* Update the native and the USD addresses used by batch conversion contract.
|
|
163
|
+
* @param contract BatchConversionPayments contract.
|
|
164
|
+
* @param NativeAddress The address of native token, eg: ETH.
|
|
165
|
+
* @param USDAddress The address of USD token.
|
|
166
|
+
* @param gasPrice The gas price used. Increase its value if needed.
|
|
167
|
+
*/
|
|
168
|
+
const updateNativeAndUSDAddress = (contract, NativeAddress, USDAddress, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
169
|
+
const currentUSDAddress = (yield contract.USDAddress()).toLocaleLowerCase();
|
|
170
|
+
const currentNativeAddress = (yield contract.NativeAddress()).toLocaleLowerCase();
|
|
171
|
+
if (currentNativeAddress !== NativeAddress.toLocaleLowerCase() ||
|
|
172
|
+
currentUSDAddress !== USDAddress.toLocaleLowerCase()) {
|
|
173
|
+
const tx = yield contract.setNativeAndUSDAddress(NativeAddress, USDAddress, {
|
|
109
174
|
gasPrice: gasPrice,
|
|
110
175
|
});
|
|
111
176
|
yield tx.wait(1);
|
|
177
|
+
console.log(`Batch: the current NativeAddress: ${currentNativeAddress}, have been replaced by: ${NativeAddress}`);
|
|
178
|
+
console.log(`Batch: the current USDAddress: ${currentUSDAddress}, have been replaced by: ${USDAddress}`);
|
|
112
179
|
}
|
|
113
180
|
});
|
|
114
|
-
exports.
|
|
181
|
+
exports.updateNativeAndUSDAddress = updateNativeAndUSDAddress;
|
|
115
182
|
const getSignerAndGasPrice = (network, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
116
183
|
let provider;
|
|
117
184
|
if (network === 'celo') {
|
|
@@ -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;
|
|
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 BatchConversionPayments contract, if needed.
|
|
4
|
+
* @param contractAddress address of the BatchConversionPayments proxy.
|
|
5
|
+
* @param hre Hardhat runtime environment.
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupBatchConversionPayments: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupBatchConversionPayments.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupBatchConversionPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,oBACtB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CA0Ed,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupBatchConversionPayments = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const lib_1 = require("../../src/lib");
|
|
6
|
+
const adminTasks_1 = require("./adminTasks");
|
|
7
|
+
const currency_1 = require("@requestnetwork/currency");
|
|
8
|
+
const types_1 = require("@requestnetwork/types");
|
|
9
|
+
/**
|
|
10
|
+
* Updates the values of the batch fees of the BatchConversionPayments contract, if needed.
|
|
11
|
+
* @param contractAddress address of the BatchConversionPayments proxy.
|
|
12
|
+
* @param hre Hardhat runtime environment.
|
|
13
|
+
*/
|
|
14
|
+
const setupBatchConversionPayments = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
15
|
+
// Setup contract parameters
|
|
16
|
+
const batchConversionPaymentContract = new hre.ethers.Contract(contractAddress, lib_1.batchConversionPaymentsArtifact.getContractAbi());
|
|
17
|
+
// constants related to chainlink and conversion rate
|
|
18
|
+
const currencyManager = currency_1.CurrencyManager.getDefault();
|
|
19
|
+
const setUpActions = (network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
20
|
+
console.log(`Setup BatchConversionPayments on ${network}`);
|
|
21
|
+
const NativeAddress = currencyManager.getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, network).hash;
|
|
22
|
+
const USDAddress = currencyManager.fromSymbol('USD').hash;
|
|
23
|
+
const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
|
|
24
|
+
const batchConversionPaymentConnected = batchConversionPaymentContract.connect(signer);
|
|
25
|
+
// start from the adminNonce, increase gasPrice if needed
|
|
26
|
+
const gasCoef = 2;
|
|
27
|
+
yield (0, adminTasks_1.updateBatchPaymentFees)(batchConversionPaymentConnected, gasPrice.mul(gasCoef));
|
|
28
|
+
yield (0, adminTasks_1.updateBatchPaymentFeeAmountUSDLimit)(batchConversionPaymentConnected, gasPrice.mul(gasCoef));
|
|
29
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'erc20');
|
|
30
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'native');
|
|
31
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'erc20Conversion');
|
|
32
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'nativeConversion');
|
|
33
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'chainlinkConversionPath');
|
|
34
|
+
yield (0, adminTasks_1.updateNativeAndUSDAddress)(batchConversionPaymentConnected, NativeAddress, USDAddress, gasPrice.mul(gasCoef));
|
|
35
|
+
});
|
|
36
|
+
for (const network of hre.config.xdeploy.networks) {
|
|
37
|
+
try {
|
|
38
|
+
yield Promise.resolve(setUpActions(network));
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
console.warn(`An error occurred during the setup of BatchConversion on ${network}`);
|
|
42
|
+
console.warn(err);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
console.log('Setup for setupBatchConversionPayment successfull');
|
|
46
|
+
});
|
|
47
|
+
exports.setupBatchConversionPayments = setupBatchConversionPayments;
|
|
48
|
+
//# sourceMappingURL=setupBatchConversionPayments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupBatchConversionPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAgE;AAEhE,6CAMsB;AACtB,uDAA2D;AAC3D,iDAA0D;AAE1D;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC5D,eAAe,EACf,qCAA+B,CAAC,cAAc,EAAE,CACjD,CAAC;IACF,qDAAqD;IACrD,MAAM,eAAe,GAAG,0BAAe,CAAC,UAAU,EAAE,CAAC;IAErD,MAAM,YAAY,GAAG,CAAO,OAAe,EAAE,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,eAAe,CAAC,iBAAiB,CACrD,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACP,CAAC,IAAI,CAAC;QACR,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QAE3D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACtE,MAAM,+BAA+B,GAAG,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEvF,yDAAyD;QACzD,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,IAAA,mCAAsB,EAAC,+BAA+B,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACrF,MAAM,IAAA,gDAAmC,EACvC,+BAA+B,EAC/B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CACtB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,OAAO,CACR,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,QAAQ,CACT,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,iBAAiB,CAClB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,kBAAkB,CACnB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,yBAAyB,CAC1B,CAAC;QACF,MAAM,IAAA,sCAAyB,EAC7B,+BAA+B,EAC/B,aAAa,EACb,UAAU,EACV,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CACtB,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QACjD,IAAI;YACF,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,4DAA4D,OAAO,EAAE,CAAC,CAAC;YACpF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;AACnE,CAAC,CAAA,CAAC;AA7EW,QAAA,4BAA4B,gCA6EvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAS7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAyBd,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.setupErc20ConversionProxy = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
6
|
const adminTasks_1 = require("./adminTasks");
|
|
7
|
+
const ERC20ConversionVersion = '0.1.2';
|
|
7
8
|
/**
|
|
8
9
|
* Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
|
|
9
10
|
* @param contractAddress address of the ERC20Conversion Proxy
|
|
@@ -11,11 +12,11 @@ const adminTasks_1 = require("./adminTasks");
|
|
|
11
12
|
*/
|
|
12
13
|
const setupErc20ConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
13
14
|
// Setup contract parameters
|
|
14
|
-
const Erc20ConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.erc20ConversionProxy.getContractAbi());
|
|
15
|
+
const Erc20ConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.erc20ConversionProxy.getContractAbi(ERC20ConversionVersion));
|
|
15
16
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
16
17
|
try {
|
|
17
18
|
const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
|
|
18
|
-
const Erc20ConversionProxyConnected =
|
|
19
|
+
const Erc20ConversionProxyConnected = Erc20ConversionProxyContract.connect(signer);
|
|
19
20
|
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(Erc20ConversionProxyConnected, network, gasPrice, 'erc20');
|
|
20
21
|
yield (0, adminTasks_1.updateChainlinkConversionPath)(Erc20ConversionProxyConnected, network, gasPrice);
|
|
21
22
|
console.log(`Setup of Erc20ConversionProxy successful on ${network}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAEvC;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAC5D,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,6BAA6B,GAAG,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnF,MAAM,IAAA,yCAA4B,EAChC,6BAA6B,EAC7B,OAAO,EACP,QAAQ,EACR,OAAO,CACR,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA5BW,QAAA,yBAAyB,6BA4BpC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
2
|
/**
|
|
3
|
-
* Updates the values of either
|
|
3
|
+
* Updates the values of either BatchConversionPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
|
|
4
4
|
* @param contractAddress address of the proxy
|
|
5
5
|
* @param hre Hardhat runtime environment
|
|
6
6
|
* @param contractName name of the contract
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupContract = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const setupETHConversionProxy_1 = require("./setupETHConversionProxy");
|
|
6
|
-
const
|
|
6
|
+
const setupBatchConversionPayments_1 = require("./setupBatchConversionPayments");
|
|
7
7
|
const setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
|
|
8
8
|
/**
|
|
9
|
-
* Updates the values of either
|
|
9
|
+
* Updates the values of either BatchConversionPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
|
|
10
10
|
* @param contractAddress address of the proxy
|
|
11
11
|
* @param hre Hardhat runtime environment
|
|
12
12
|
* @param contractName name of the contract
|
|
@@ -21,8 +21,8 @@ const setupContract = (contractAddress, hre, contractName) => (0, tslib_1.__awai
|
|
|
21
21
|
yield (0, setupERC20SwapToConversion_1.setupERC20SwapToConversion)(contractAddress, hre);
|
|
22
22
|
break;
|
|
23
23
|
}
|
|
24
|
-
case '
|
|
25
|
-
yield (0,
|
|
24
|
+
case 'BatchConversionPayments': {
|
|
25
|
+
yield (0, setupBatchConversionPayments_1.setupBatchConversionPayments)(contractAddress, hre);
|
|
26
26
|
break;
|
|
27
27
|
}
|
|
28
28
|
default: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setups.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setups.ts"],"names":[],"mappings":";;;;AACA,uEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"setups.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setups.ts"],"names":[],"mappings":";;;;AACA,uEAAoE;AACpE,iFAA8E;AAC9E,6EAA0E;AAE1E;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAC3B,eAAuB,EACvB,GAAsC,EACtC,YAAoB,EACL,EAAE;IACjB,QAAQ,YAAY,EAAE;QACpB,KAAK,oBAAoB,CAAC,CAAC;YACzB,MAAM,IAAA,iDAAuB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACpD,MAAM;SACP;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,MAAM,IAAA,uDAA0B,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACvD,MAAM;SACP;QACD,KAAK,yBAAyB,CAAC,CAAC;YAC9B,MAAM,IAAA,2DAA4B,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM;SACP;QACD,OAAO,CAAC,CAAC;YACP,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,MAAM;SACP;KACF;AACH,CAAC,CAAA,CAAC;AAvBW,QAAA,aAAa,iBAuBxB"}
|
|
@@ -6,7 +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
|
|
9
|
+
const setupBatchConversionPayments_1 = require("./contract-setup/setupBatchConversionPayments");
|
|
10
10
|
const setupETHConversionProxy_1 = require("./contract-setup/setupETHConversionProxy");
|
|
11
11
|
const setupErc20ConversionProxy_1 = require("./contract-setup/setupErc20ConversionProxy");
|
|
12
12
|
// Deploys, set up the contracts and returns the address
|
|
@@ -76,11 +76,11 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
76
76
|
yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
77
77
|
break;
|
|
78
78
|
}
|
|
79
|
-
case '
|
|
79
|
+
case 'BatchConversionPayments': {
|
|
80
80
|
const network = hre.config.xdeploy.networks[0];
|
|
81
81
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
82
82
|
const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
83
|
-
yield (0,
|
|
83
|
+
yield (0, setupBatchConversionPayments_1.setupBatchConversionPayments)(address, hre);
|
|
84
84
|
break;
|
|
85
85
|
}
|
|
86
86
|
// Other cases to add when necessary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":";;;;AAAA,mCAA4E;AAG5E,2CAAsC;AACtC,yDAAwD;AACxD,qDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ exports.create2ContractDeploymentList = [
|
|
|
14
14
|
'Erc20ConversionProxy',
|
|
15
15
|
'ERC20SwapToConversion',
|
|
16
16
|
'ERC20EscrowToPay',
|
|
17
|
-
'
|
|
17
|
+
'BatchConversionPayments',
|
|
18
18
|
// FIXME: EthConversionProxy cannot be deployed using xDeployer yet
|
|
19
19
|
// We need to be able to administrate the nativeTokenHash first.
|
|
20
20
|
// 'EthConversionProxy',
|
|
@@ -49,8 +49,8 @@ const getArtifact = (contract) => {
|
|
|
49
49
|
return artifacts.erc20SwapConversionArtifact;
|
|
50
50
|
case 'ERC20EscrowToPay':
|
|
51
51
|
return artifacts.erc20EscrowToPayArtifact;
|
|
52
|
-
case '
|
|
53
|
-
return artifacts.
|
|
52
|
+
case 'BatchConversionPayments':
|
|
53
|
+
return artifacts.batchConversionPaymentsArtifact;
|
|
54
54
|
default:
|
|
55
55
|
throw new Error('Contract unknown');
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;;;GAIG;AACU,QAAA,6BAA6B,GAAG;IAC3C,eAAe;IACf,kBAAkB;IAClB,eAAe;IACf,sBAAsB;IACtB,uBAAuB;IACvB,kBAAkB;IAClB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;;;GAIG;AACU,QAAA,6BAA6B,GAAG;IAC3C,eAAe;IACf,kBAAkB;IAClB,eAAe;IACf,sBAAsB;IACtB,uBAAuB;IACvB,kBAAkB;IAClB,yBAAyB;IACzB,mEAAmE;IACnE,uEAAuE;IACvE,wBAAwB;CACzB,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,yBAAyB;YAC5B,OAAO,SAAS,CAAC,+BAA+B,CAAC;QACnD;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"}
|
|
@@ -52,7 +52,7 @@ function VerifyCreate2FromList(hre) {
|
|
|
52
52
|
yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
|
|
53
53
|
break;
|
|
54
54
|
}
|
|
55
|
-
case '
|
|
55
|
+
case 'BatchConversionPayments': {
|
|
56
56
|
const network = hre.config.xdeploy.networks[0];
|
|
57
57
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
58
58
|
address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../scripts-create2/verify.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;;;eAGG;YACH,MAAM,KAAK,GAAG,GAAG,EAAE;gBACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC7B,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,OAAe,CAAC;YACpB,KAAK,MAAM,QAAQ,IAAI,qCAA6B,EAAE;gBACpD,IAAI;oBACF,MAAM,KAAK,EAAE,CAAC;oBACd,QAAQ,QAAQ,EAAE;wBAChB,KAAK,eAAe,CAAC;wBACrB,KAAK,kBAAkB,CAAC;wBACxB,KAAK,oBAAoB,CAAC;wBAC1B,KAAK,eAAe,CAAC;wBACrB,KAAK,uBAAuB,CAAC;wBAC7B,KAAK,sBAAsB,CAAC,CAAC;4BAC3B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;4BACrD,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BAC7D,MAAM;yBACP;wBACD,KAAK,kBAAkB,CAAC,CAAC;4BACvB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;4BAC/C,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;4BAC9D,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BAC7D,MAAM;yBACP;wBACD,KAAK,
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../scripts-create2/verify.ts"],"names":[],"mappings":"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"}
|