refactor(AddressBytes): using lib from SDK

contracts/interchain-token-service/InterchainTokenService.sol

@@ -9,6 +9,7 @@ import { ExpressExecutorTracker } from '@axelar-network/axelar-gmp-sdk-solidity/
 import { Upgradable } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Upgradable.sol';
 import { Create3Address } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/deploy/Create3Address.sol';
 import { SafeTokenTransferFrom } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/SafeTransfer.sol';
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
 import { StringToBytes32, Bytes32ToString } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/Bytes32String.sol';
 import { Multicall } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/Multicall.sol';
 import { IInterchainAddressTracker } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IInterchainAddressTracker.sol';
@@ -22,7 +23,6 @@ import { IInterchainTokenExpressExecutable } from '../interfaces/IInterchainToke
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 import { IERC20Named } from '../interfaces/IERC20Named.sol';
 
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
 import { Operatable } from '../utils/Operatable.sol';
 
 /**
@@ -42,8 +42,8 @@ contract InterchainTokenService is
 {
     using StringToBytes32 for string;
     using Bytes32ToString for bytes32;
-    using AddressBytesUtils for bytes;
-    using AddressBytesUtils for address;
+    using AddressBytes for bytes;
+    using AddressBytes for address;
     using SafeTokenTransferFrom for IERC20;
 
     address internal immutable implementationLockUnlock;

contracts/test/InvalidStandardizedToken.sol

@@ -2,17 +2,18 @@
 
 pragma solidity ^0.8.0;
 
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
+
 import { IERC20MintableBurnable } from '../interfaces/IERC20MintableBurnable.sol';
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 
 import { InterchainToken } from '../interchain-token/InterchainToken.sol';
 import { ERC20Permit } from '../token-implementations/ERC20Permit.sol';
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
 import { Implementation } from '../utils/Implementation.sol';
 import { Distributable } from '../utils/Distributable.sol';
 
 contract InvalidStandardizedToken is IERC20MintableBurnable, InterchainToken, ERC20Permit, Implementation, Distributable {
-    using AddressBytesUtils for bytes;
+    using AddressBytes for bytes;
 
     string public name;
     string public symbol;

contracts/token-implementations/StandardizedToken.sol

@@ -2,13 +2,14 @@
 
 pragma solidity ^0.8.0;
 
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
+
 import { IImplementation } from '../interfaces/IImplementation.sol';
 import { IStandardizedToken } from '../interfaces/IStandardizedToken.sol';
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 
 import { InterchainToken } from '../interchain-token/InterchainToken.sol';
 import { ERC20Permit } from '../token-implementations/ERC20Permit.sol';
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
 import { Implementation } from '../utils/Implementation.sol';
 import { Distributable } from '../utils/Distributable.sol';
 
@@ -18,7 +19,7 @@ import { Distributable } from '../utils/Distributable.sol';
  * This contract also inherits Distributable and Implementation logic.
  */
 contract StandardizedToken is InterchainToken, ERC20Permit, Implementation, Distributable, IStandardizedToken {
-    using AddressBytesUtils for bytes;
+    using AddressBytes for bytes;
 
     string public name;
     string public symbol;

contracts/token-manager/TokenManager.sol

@@ -2,20 +2,21 @@
 
 pragma solidity ^0.8.0;
 
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
+
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 import { IInterchainTokenService } from '../interfaces/IInterchainTokenService.sol';
 
 import { Operatable } from '../utils/Operatable.sol';
 import { FlowLimit } from '../utils/FlowLimit.sol';
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
 import { Implementation } from '../utils/Implementation.sol';
 
 /**
  * @title The main functionality of TokenManagers.
  * @notice This contract is responsible for handling tokens before initiating a cross chain token transfer, or after receiving one.
  */
 abstract contract TokenManager is ITokenManager, Operatable, FlowLimit, Implementation {
-    using AddressBytesUtils for bytes;
+    using AddressBytes for bytes;
 
     IInterchainTokenService public immutable interchainTokenService;
 

contracts/token-registrars/StandardizedTokenRegistrar.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import { SafeTokenTransfer } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/SafeTransfer.sol';
 import { Multicall } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/Multicall.sol';
+import { AddressBytes } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/AddressBytes.sol';
 
 import { Upgradable } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Upgradable.sol';
 
@@ -13,11 +14,9 @@ import { ITokenManagerType } from '../interfaces/ITokenManagerType.sol';
 import { ITokenManager } from '../interfaces/ITokenManager.sol';
 import { IStandardizedToken } from '../interfaces/IStandardizedToken.sol';
 
-import { AddressBytesUtils } from '../libraries/AddressBytesUtils.sol';
-
 contract StandardizedTokenRegistrar is IStandardizedTokenRegistrar, ITokenManagerType, Multicall, Upgradable {
-    using AddressBytesUtils for bytes;
-    using AddressBytesUtils for address;
+    using AddressBytes for bytes;
+    using AddressBytes for address;
     using SafeTokenTransfer for IStandardizedToken;
 
     IInterchainTokenService public immutable service;

test/UtilsTest.js

@@ -6,7 +6,7 @@ const { ethers } = require('hardhat');
 const { time } = require('@nomicfoundation/hardhat-network-helpers');
 const { Wallet, Contract } = ethers;
 const { AddressZero } = ethers.constants;
-const { defaultAbiCoder, arrayify, toUtf8Bytes, hexlify } = ethers.utils;
+const { defaultAbiCoder } = ethers.utils;
 const { expect } = chai;
 const { getRandomBytes32, expectRevert, isHardhat, waitFor } = require('./utils');
 const { deployContract } = require('../scripts/deploy');
@@ -312,32 +312,4 @@ describe('InterchainTokenDeployer', () => {
             'AlreadyDeployed',
         );
     });
-
-    describe('AddressBytesUtils', () => {
-        let addressBytesUtils;
-
-        before(async () => {
-            addressBytesUtils = await deployContract(ownerWallet, 'AddressBytesUtilsTest');
-        });
-
-        it('Should convert bytes address to address', async () => {
-            const bytesAddress = arrayify(ownerWallet.address);
-            const convertedAddress = await addressBytesUtils.toAddress(bytesAddress);
-            expect(convertedAddress).to.eq(ownerWallet.address);
-        });
-
-        it('Should revert on invalid bytes length', async () => {
-            const bytesAddress = defaultAbiCoder.encode(['bytes'], [toUtf8Bytes(ownerWallet.address)]);
-            await expectRevert(
-                (gasOptions) => addressBytesUtils.toAddress(bytesAddress, gasOptions),
-                addressBytesUtils,
-                'InvalidBytesLength',
-            );
-        });
-
-        it('Should convert address to bytes address', async () => {
-            const convertedAddress = await addressBytesUtils.toBytes(ownerWallet.address);
-            expect(convertedAddress).to.eq(hexlify(ownerWallet.address));
-        });
-    });
 });