Skip to content

Commit

Permalink
Merge branch 'main' into refactor/fee-transfer-optimization
Browse files Browse the repository at this point in the history
# Conflicts:
#	contracts/interfaces/IERC20BurnableFrom.sol
#	contracts/token-manager/implementations/TokenManagerLockUnlockFee.sol
  • Loading branch information
re1ro committed Oct 3, 2023
2 parents d2887cf + 7311951 commit 445de01
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions contracts/interfaces/IERC20BurnableFrom.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +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
Expand Down

0 comments on commit 445de01

Please sign in to comment.