Merge branch 'main' into feat/slither

# Conflicts: # contracts/interchain-token-service/InterchainTokenService.sol # contracts/interfaces/IERC20BurnableFrom.sol # contracts/interfaces/IRemoteAddressValidator.sol # contracts/interfaces/IStandardizedToken.sol # contracts/interfaces/ITokenManagerLiquidityPool.sol # contracts/interfaces/ITokenManagerLockUnlock.sol # contracts/interfaces/ITokenManagerLockUnlockFee.sol # contracts/interfaces/ITokenManagerMintBurn.sol # contracts/token-implementations/ERC20Permit.sol # contracts/token-implementations/StandardizedToken.sol # contracts/token-manager/implementations/TokenManagerLiquidityPool.sol # contracts/token-manager/implementations/TokenManagerLockUnlock.sol # contracts/token-manager/implementations/TokenManagerLockUnlockFeeOnTransfer.sol # contracts/token-manager/implementations/TokenManagerMintBurn.sol
axelarnetwork · Oct 3, 2023 · 279be20 · 279be20
2 parents 0ea62fd + 7311951
commit 279be20
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
diff --git a/contracts/interchain-token-service/InterchainTokenService.sol b/contracts/interchain-token-service/InterchainTokenService.sol
@@ -892,5 +892,6 @@ contract InterchainTokenService is
 
         payload = abi.encode(SELECTOR_SEND_TOKEN_WITH_DATA, tokenId, destinationAddress, amount, sourceAddress.toBytes(), metadata);
         _callContract(destinationChain, payload, msg.value);
+
     }
 }
diff --git a/contracts/interfaces/IERC20BurnableFrom.sol b/contracts/interfaces/IERC20BurnableFrom.sol
@@ -6,22 +6,6 @@ pragma solidity ^0.8.0;
  * @dev Interface of the ERC20 standard as defined in the EIP.
  */
 interface IERC20BurnableFrom {
-    /**
-     * @notice Function to get the burn deposit address for a particular salt
-     * @notice It is needed to support legacy Axelar Gateway tokens
-     * @param salt The salt used to generate the burn deposit address
-     * @return address The burn deposit address
-     */
-    function depositAddress(bytes32 salt) external view returns (address);
-
-    /**
-     * @notice Function to burn tokens from a burn deposit address
-     * @notice It is needed to support legacy Axelar Gateway tokens
-     * @dev Can only be called after token is transferred to a deposit address.
-     * @param salt The address that will have its tokens burnt
-     */
-    function burn(bytes32 salt) external;
-
     /**
      * @notice Function to burn tokens
      * @notice Requires the caller to have allowance for `amount` on `from`

diff --git a/contracts/interfaces/IStandardizedToken.sol b/contracts/interfaces/IStandardizedToken.sol
@@ -16,7 +16,6 @@ import { IERC20 } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interf
 interface IStandardizedToken is IImplementation, IInterchainToken, IDistributable, IERC20MintableBurnable, IERC20 {
     error TokenManagerAddressZero();
     error TokenNameEmpty();
-
     /**
      * @notice Returns the contract id, which a proxy can check to ensure no false implementation was used.
      */

diff --git a/contracts/token-manager/implementations/TokenManagerLockUnlock.sol b/contracts/token-manager/implementations/TokenManagerLockUnlock.sol
@@ -2,7 +2,6 @@
 
 pragma solidity ^0.8.0;
 
-
 import { IERC20 } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IERC20.sol';
 import { SafeTokenTransfer, SafeTokenTransferFrom } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/SafeTransfer.sol';
-Original file line number
+Diff line change
@@ Expand Up / @@ -892,5 +892,6 @@ contract InterchainTokenService is @@
             payload = abi.encode(SELECTOR_SEND_TOKEN_WITH_DATA, tokenId, destinationAddress, amount, sourceAddress.toBytes(), metadata);
             _callContract(destinationChain, payload, msg.value);
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@

		pragma solidity ^0.8.0;


		import { IERC20 } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IERC20.sol';
		import { SafeTokenTransfer, SafeTokenTransferFrom } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/SafeTransfer.sol';

Expand Down