add native token hash on the constructor

RequestNetwork · Sep 29, 2021 · 4593ade · 4593ade
1 parent 7cc050a
commit 4593ade
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/packages/smart-contracts/scripts/3_deploy_chainlink_contract.ts b/packages/smart-contracts/scripts/3_deploy_chainlink_contract.ts
@@ -72,6 +72,7 @@ export default async function deploy(args: any, hre: HardhatRuntimeEnvironment)
       ...args,
       chainlinkConversionPathAddress: conversionPathInstance.address,
       ethFeeProxyAddress: '0x3d49d1eF2adE060a33c6E6Aa213513A7EE9a6241',
+      nativeTokenHash: ETH_address,
     },
     hre,
   );

diff --git a/packages/smart-contracts/scripts/eth-conversion-proxy.ts b/packages/smart-contracts/scripts/eth-conversion-proxy.ts
@@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { deployOne } from './deploy-one';
 
 export default async function deploy(
-  args: { chainlinkConversionPathAddress?: string; ethFeeProxyAddress?: string },
+  args: { chainlinkConversionPathAddress?: string; ethFeeProxyAddress?: string, nativeTokenHash?: string },
   hre: HardhatRuntimeEnvironment,
 ) {
   const contractName = 'EthConversionProxy';
@@ -20,8 +20,14 @@ export default async function deploy(
     return;
   }
 
+  if (!args.nativeTokenHash) {
+    console.error(`Missing nativeTokenHash on ${hre.network.name}, cannot deploy ${contractName}.`);
+    return;
+  }
+
   return deployOne(args, hre, contractName, [
     args.ethFeeProxyAddress,
     args.chainlinkConversionPathAddress,
+    args.nativeTokenHash,
   ]);
 }
diff --git a/packages/smart-contracts/src/contracts/EthConversionProxy.sol b/packages/smart-contracts/src/contracts/EthConversionProxy.sol
@@ -14,10 +14,12 @@ import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 contract EthConversionProxy is ReentrancyGuard {
   address public paymentProxy;
   ChainlinkConversionPath public chainlinkConversionPath;
+  address public nativeTokenHash;
 
-  constructor(address _paymentProxyAddress, address _chainlinkConversionPathAddress) {
+  constructor(address _paymentProxyAddress, address _chainlinkConversionPathAddress, address _nativeTokenHash) {
     paymentProxy = _paymentProxyAddress;
     chainlinkConversionPath = ChainlinkConversionPath(_chainlinkConversionPathAddress);
+    nativeTokenHash = _nativeTokenHash;
   }
 
   // Event to declare a conversion with a reference
@@ -60,10 +62,9 @@ contract EthConversionProxy is ReentrancyGuard {
     external
     payable
   {
-    // Request currency hash for ether: 0xF5AF88e117747e87fC5929F2ff87221B1447652E
     require(
-      _path[_path.length - 1] == address(0xF5AF88e117747e87fC5929F2ff87221B1447652E),
-      "payment currency must be ethers"
+      _path[_path.length - 1] == nativeTokenHash,
+      "payment currency must be the native token"
     );
 
     (uint256 amountToPay, uint256 amountToPayInFees) = getConversions(
@@ -115,7 +116,7 @@ contract EthConversionProxy is ReentrancyGuard {
       "aggregator rate is outdated"
     );
 
-    // Get the amount to pay in the crypto currency chosen
+    // Get the amount to pay in the native token
     amountToPay = (_requestAmount * rate) / decimals;
     amountToPayInFees = (_feeAmount * rate) /decimals;
   }

diff --git a/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/0.1.0.json b/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/0.1.0.json
@@ -11,6 +11,11 @@
           "internalType": "address",
           "name": "_chainlinkConversionPathAddress",
           "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_nativeTokenHash",
+          "type": "address"
         }
       ],
       "stateMutability": "nonpayable",
@@ -103,6 +108,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "nativeTokenHash",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "paymentProxy",

diff --git a/packages/smart-contracts/test/contracts/EthConversionProxy.test.ts b/packages/smart-contracts/test/contracts/EthConversionProxy.test.ts
@@ -43,6 +43,7 @@ describe('contract: EthConversionProxy', () => {
     testEthConversionProxy = await new EthConversionProxy__factory(signer).deploy(
       ethFeeProxy.address,
       chainlinkPath.address,
+      ETH_address,
     );
   });