Merge pull request #71 from flood-protocol/chain-ops

handling NotAContract()
flood-protocol · Jul 11, 2023 · d251ada · d251ada
2 parents 99b6a04 + 67a594d
commit d251ada
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/decoders/extensions/DecoderWithRegistry.sol b/src/decoders/extensions/DecoderWithRegistry.sol
@@ -25,14 +25,23 @@ contract DecoderWithRegistry is IDecoder, Ownable2Step {
     constructor() Ownable2Step() {}
 
     function setZone(uint8 zoneId, address zone) external onlyOwner {
+        if (zone.code.length == 0) {
+            revert IFloodPlain.NotAContract();
+        }
         _zones.set(zoneId, zone);
     }
 
     function setFulfiller(uint8 fulfillerId, address fulfiller) external onlyOwner {
+        if (fulfiller.code.length == 0) {
+            revert IFloodPlain.NotAContract();
+        }
         _fulfillers.set(fulfillerId, fulfiller);
     }
 
     function setToken(uint16 tokenId, address token) external onlyOwner {
+        if (token.code.length == 0) {
+            revert IFloodPlain.NotAContract();
+        }
         _tokens.set(tokenId, token);
     }
 

diff --git a/test/utils/TokenFixture.sol b/test/utils/TokenFixture.sol
@@ -13,14 +13,14 @@ address constant ARBITRUM_DAI = 0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1;
 address constant ARBITRUM_USDT = 0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9;
 
 contract MockToken is ERC20 {
-    uint8 public immutable __decimals;
+    uint8 internal immutable innerDecimals;
 
     constructor(string memory name, string memory symbol, uint8 _decimals) ERC20(name, symbol) {
-        __decimals = _decimals;
+        innerDecimals = _decimals;
     }
 
     function decimals() public view override returns (uint8) {
-        return __decimals;
+        return innerDecimals;
     }
 }