refactor(Implementation): dependencies

axelarnetwork · Oct 13, 2023 · 9ea3c34 · 9ea3c34
1 parent fa4b054
commit 9ea3c34
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/contracts/interfaces/IImplementation.sol b/contracts/interfaces/IImplementation.sol
@@ -2,6 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-interface IImplementation {
+import { IContractIdentifier } from './IContractIdentifier.sol';
+
+interface IImplementation is IContractIdentifier {
     error NotProxy();
 }
diff --git a/contracts/interfaces/IUpgradable.sol b/contracts/interfaces/IUpgradable.sol
@@ -3,10 +3,10 @@
 pragma solidity ^0.8.0;
 
 import { IOwnable } from './IOwnable.sol';
-import { IContractIdentifier } from './IContractIdentifier.sol';
+import { IImplementation } from './IImplementation.sol';
 
 // General interface for upgradable contracts
-interface IUpgradable is IOwnable, IContractIdentifier {
+interface IUpgradable is IOwnable, IImplementation {
     error InvalidCodeHash();
     error InvalidImplementation();
     error SetupFailed();

diff --git a/contracts/test/utils/TestImplementation.sol → ...ts/test/upgradable/TestImplementation.sol b/contracts/test/utils/TestImplementation.sol → ...ts/test/upgradable/TestImplementation.sol
@@ -10,4 +10,8 @@ contract TestImplementation is Implementation {
     function setup(bytes calldata params) external override onlyProxy {
         val = abi.decode(params, (uint256));
     }
+
+    function contractId() external pure override returns (bytes32) {
+        return keccak256('TestImplementation');
+    }
 }
diff --git a/contracts/upgradable/Upgradable.sol b/contracts/upgradable/Upgradable.sol
@@ -13,7 +13,6 @@ import { Implementation } from './Implementation.sol';
 abstract contract Upgradable is Ownable, Implementation, IUpgradable {
     // bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
     bytes32 internal constant _IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
-    address internal immutable implementationAddress;
 
     /**
      * @notice Constructor sets the implementation address to the address of the contract itself
@@ -23,7 +22,6 @@ abstract contract Upgradable is Ownable, Implementation, IUpgradable {
      * set as the zero address because Ownable is designed to throw an error for ownership transfers to the zero address.
      */
     constructor() Ownable(address(1)) {
-        implementationAddress = address(this);
     }
 
     /**

diff --git a/test/utils/Implementation.js b/test/utils/Implementation.js
@@ -7,7 +7,7 @@ const { defaultAbiCoder } = ethers.utils;
 const { expect } = chai;
 const { deployContract } = require('../utils.js');
 
-const TestImplementation = require('../../artifacts/contracts/test/utils/TestImplementation.sol/TestImplementation.json');
+const TestImplementation = require('../../artifacts/contracts/test/upgradable/TestImplementation.sol/TestImplementation.json');
 
 let ownerWallet;
 before(async () => {