Burn token without the callback

Snowfork · Apr 4, 2024 · 9b7811d · 9b7811d
1 parent 28f513d
commit 9b7811d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/contracts/src/AgentExecutor.sol b/contracts/src/AgentExecutor.sol
@@ -49,8 +49,7 @@ contract AgentExecutor {
         emit TokenMinted(tokenID, token, recipient, amount);
     }
 
-    function burnToken(bytes32 tokenID, address sender, uint256 amount) external {
-        address token = Gateway(msg.sender).tokenAddressOf(tokenID);
+    function burnToken(bytes32 tokenID, address token, address sender, uint256 amount) external {
         ERC20(token).burn(sender, amount);
         emit TokenBurnt(tokenID, token, sender, amount);
     }

diff --git a/contracts/src/Assets.sol b/contracts/src/Assets.sol
@@ -188,7 +188,7 @@ library Assets {
         uint128 amount
     ) external returns (Ticket memory ticket) {
         // Polkadot-native token: burn wrapped token
-        _burnToken(executor, agent, info.tokenID, sender, amount);
+        _burnToken(executor, agent, info.tokenID, info.token, sender, amount);
 
         if (destinationChainFee == 0) {
             revert InvalidDestinationFee();
@@ -214,10 +214,15 @@ library Assets {
         emit IGateway.TokenSent(info.token, sender, destinationChain, destinationAddress, amount);
     }
 
-    function _burnToken(address agentExecutor, address agent, bytes32 tokenID, address sender, uint256 amount)
-        internal
-    {
-        bytes memory call = abi.encodeCall(AgentExecutor.burnToken, (tokenID, sender, amount));
+    function _burnToken(
+        address agentExecutor,
+        address agent,
+        bytes32 tokenID,
+        address token,
+        address sender,
+        uint256 amount
+    ) internal {
+        bytes memory call = abi.encodeCall(AgentExecutor.burnToken, (tokenID, token, sender, amount));
         (bool success, bytes memory returndata) = (Agent(payable(agent)).invoke(agentExecutor, call));
         Call.verifyResult(success, returndata);
     }