rebase over dep bump

axelarnetwork · Oct 9, 2023 · 14fecc4 · 14fecc4
1 parent 4569336
commit 14fecc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contracts/token-implementations/StandardizedToken.sol b/contracts/token-implementations/StandardizedToken.sol
@@ -2,6 +2,7 @@
 
 pragma solidity ^0.8.0;
 
+import { IImplementation } from '../interfaces/IImplementation.sol';
 import { IStandardizedToken } from '../interfaces/IStandardizedToken.sol';
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 import { IInterchainToken } from '../interfaces/IInterchainToken.sol';
@@ -46,7 +47,7 @@ contract StandardizedToken is InterchainToken, ERC20Permit, Implementation, Dist
      * @notice Returns the token manager for this token
      * @return ITokenManager The token manager contract
      */
-    function tokenManager() public view override(InterchainToken, IInterchainToken) returns (ITokenManager) {
+    function tokenManager() public view override(InterchainToken, IStandardizedToken) returns (ITokenManager) {
         return ITokenManager(tokenManager_);
     }
 
@@ -55,7 +56,7 @@ contract StandardizedToken is InterchainToken, ERC20Permit, Implementation, Dist
      * @param params The setup parameters in bytes
      * The setup params include tokenManager, distributor, tokenName, symbol, decimals, mintAmount and mintTo
      */
-    function setup(bytes calldata params) external override onlyProxy {
+    function setup(bytes calldata params) external override(IImplementation, IStandardizedToken) onlyProxy {
         {
             address distributor_;
             address tokenManagerAddress;

diff --git a/package.json b/package.json
@@ -55,4 +55,4 @@
     "README.md",
     "hardhat.config.js"
   ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ @@
         "README.md",
         "hardhat.config.js"
       ]
-    }
+    }