fix(Upgradable): improved contract id verification (#116)

* fix(Upgradable): improved contract id verification

* revert(Implementation): preserving current bytecode

* chore(npm): version bump

(cherry picked from commit 6632513)

contracts/test/utils/TestInterchainAddressTracker.sol

@@ -16,7 +16,7 @@ contract TestInterchainAddressTracker is InterchainAddressTracker, Ownable {
         string[] memory trustedAddresses
     ) Ownable(msg.sender) {
         _setChainName(chainName_);
-        
+
         if (_CHAIN_NAME_SLOT != bytes32(uint256(keccak256('interchain-address-tracker-chain-name')) - 1))
             revert Invalid();
 

contracts/upgradable/Upgradable.sol

@@ -46,7 +46,7 @@ abstract contract Upgradable is Ownable, Implementation, IUpgradable {
         bytes32 newImplementationCodeHash,
         bytes calldata params
     ) external override onlyOwner {
-        if (IUpgradable(newImplementation).contractId() != IUpgradable(this).contractId())
+        if (IUpgradable(newImplementation).contractId() != IUpgradable(implementation()).contractId())
             revert InvalidImplementation();
 
         if (newImplementationCodeHash != newImplementation.codehash) revert InvalidCodeHash();

contracts/utils/InterchainAddressTracker.sol

@@ -18,7 +18,7 @@ contract InterchainAddressTracker is IInterchainAddressTracker {
 
     function _setChainName(string memory chainName_) internal {
         StringStorage.set(_CHAIN_NAME_SLOT, chainName_);
-    } 
+    }
 
     /**
      * @dev Gets the name of the chain this is deployed at

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axelar-network/axelar-gmp-sdk-solidity",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "description": "Solidity GMP SDK and utilities provided by Axelar for cross-chain development",
   "main": "index.js",
   "scripts": {

test/utils/InterchainAddressTracker.js

@@ -6,9 +6,7 @@ const { expect } = chai;
 const { deployContract } = require('../utils.js');
 
 describe('InterchainAddressTracker', () => {
-  let ownerWallet,
-    otherWallet,
-    interchainAddressTracker;
+  let ownerWallet, otherWallet, interchainAddressTracker;
 
   const otherRemoteAddress = 'any string as an address';
   const otherChain = 'Other Name';