Merge pull request #832 from oceanprotocol/feature/check_fre_basetoke…

…n_for_eoa check if basetoken is contract
oceanprotocol · Oct 26, 2023 · 1a2cad4 · 1a2cad4
2 parents fa8abae + 3f6697c
commit 1a2cad4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/contracts/pools/fixedRate/FixedRateExchange.sol b/contracts/pools/fixedRate/FixedRateExchange.sol
@@ -180,7 +180,18 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
         return IFactoryRouter(router).getOPCFee(baseTokenAddress);
     }
 
-
+    /**
+     * @dev isContract
+     *      checks if address is a contract 
+     * addr  - address to be checked
+     */
+    function isContract(address addr) public view returns(bool){
+      uint32 size;
+      assembly {
+        size := extcodesize(addr)
+      }
+      return (size > 0);
+    }
     /**
      * @dev create
      *      creates new exchange pairs between a baseToken
@@ -209,6 +220,10 @@ contract FixedRateExchange is ReentrancyGuard, IFixedRateExchange {
             addresses[0] != address(0),
             "FixedRateExchange: Invalid baseToken,  zero address"
         );
+        require(
+            isContract(addresses[0]),
+            "FixedRateExchange: Invalid baseToken, looks EOA"
+        );
         require(
             datatoken != address(0),
             "FixedRateExchange: Invalid datatoken,  zero address"

diff --git a/test/flow/FixedRateExchange.test.js b/test/flow/FixedRateExchange.test.js
@@ -204,6 +204,15 @@ describe("FixedRateExchange", () => {
       mockDT18 = erc20Token;
     });
 
+    it("should fail if basetoken is EOA", async () => {
+      await expectRevert(mockDT18.connect(alice)
+      .createFixedRate(
+        fixedRateExchange.address,
+        [bob.address, alice.address, marketFeeCollector.address, ZERO_ADDRESS],
+        [18, 18, rate, marketFee, 0])
+      ,"FixedRateExchange: Invalid baseToken, looks EOA" )
+
+    });
     it("#2 - create exchange", async () => {
       marketFee = 1e15;