FT

contracts/token/contracts/evm/UniversalTokenCore.sol

@@ -127,7 +127,7 @@ abstract contract UniversalTokenCore is
             gateway.call(
                 universal,
                 message,
-                RevertOptions(address(this), false, address(0), message, 0)
+                RevertOptions(address(this), false, universal, message, 0)
             );
         } else {
             gateway.depositAndCall{value: msg.value}(
@@ -136,7 +136,7 @@ abstract contract UniversalTokenCore is
                 RevertOptions(
                     address(this),
                     true,
-                    address(0),
+                    universal,
                     abi.encode(amount, msg.sender),
                     gasLimitAmount
                 )

contracts/token/contracts/shared/UniversalTokenEvents.sol

@@ -12,6 +12,7 @@ contract UniversalTokenEvents {
     );
     event TokenTransferReceived(address indexed receiver, uint256 amount);
     event TokenTransferReverted(address indexed sender, uint256 amount);
+    event TokenTransferAborted(address indexed sender, uint256 amount);
     event TokenTransferToDestination(
         address indexed destination,
         address indexed sender,

contracts/token/contracts/zetachain/UniversalTokenCore.sol

@@ -11,6 +11,15 @@ import {SwapHelperLib} from "@zetachain/toolkit/contracts/SwapHelperLib.sol";
 
 import "../shared/UniversalTokenEvents.sol";
 
+struct AbortContext {
+    bytes sender;
+    address asset;
+    uint256 amount;
+    bool outgoing;
+    uint256 chainID;
+    bytes revertMessage;
+}
+
 /**
  * @title UniversalTokenCore
  * @dev This abstract contract provides the core logic for Universal Tokens. It is designed
@@ -161,8 +170,8 @@ abstract contract UniversalTokenCore is
         RevertOptions memory revertOptions = RevertOptions(
             address(this),
             true,
-            address(0),
-            abi.encode(amount, msg.sender),
+            address(this),
+            abi.encode(receiver, amount, msg.sender),
             gasLimitAmount
         );
 
@@ -230,7 +239,7 @@ abstract contract UniversalTokenCore is
                     address(this),
                     true,
                     address(0),
-                    abi.encode(tokenAmount, sender),
+                    abi.encode(receiver, tokenAmount, sender),
                     0
                 )
             );
@@ -243,11 +252,20 @@ abstract contract UniversalTokenCore is
      * @param context Metadata about the failed call.
      */
     function onRevert(RevertContext calldata context) external onlyGateway {
-        (uint256 amount, address sender) = abi.decode(
+        (, uint256 amount, address sender) = abi.decode(
             context.revertMessage,
-            (uint256, address)
+            (address, uint256, address)
         );
         _mint(sender, amount);
         emit TokenTransferReverted(sender, amount);
     }
+
+    function onAbort(AbortContext calldata context) external {
+        (, uint256 amount, address sender) = abi.decode(
+            context.revertMessage,
+            (address, uint256, address)
+        );
+        _mint(sender, amount);
+        emit TokenTransferAborted(sender, amount);
+    }
 }

contracts/token/package.json

@@ -20,15 +20,15 @@
     "@nomicfoundation/hardhat-toolbox": "^2.0.0",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-etherscan": "^3.0.0",
-    "@typechain/ethers-v5": "^10.1.0",
     "@openzeppelin/hardhat-upgrades": "1.28.0",
+    "@typechain/ethers-v5": "^10.1.0",
     "@typechain/hardhat": "^6.1.2",
     "@types/chai": "^4.2.0",
     "@types/mocha": ">=9.1.0",
     "@types/node": ">=12.0.0",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",
-    "@zetachain/localnet": "4.0.0-rc6",
+    "@zetachain/localnet": "5.0.0-rc1",
     "@zetachain/toolkit": "13.0.0-rc8",
     "axios": "^1.3.6",
     "chai": "^4.2.0",
@@ -59,4 +59,4 @@
     "@solana/web3.js": "^1.95.2",
     "@zetachain/protocol-contracts": "11.0.0-rc3"
   }
-}
+}

contracts/token/yarn.lock

@@ -2536,15 +2536,15 @@
     typescript "5.5.4"
     zod "3.22.4"
 
-"@zetachain/localnet@4.0.0-rc6":
-  version "4.0.0-rc6"
-  resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-4.0.0-rc6.tgz#9b36f5ab0e8fac766d63cfca4b1cab6a263bdd5d"
-  integrity sha512-DGKspMAJZLUrgNirc3NzFYg9jRfaOyuF5ePj85D93qAA//f8lOsXpmh/6Bvq/MrEscCLpVavgVP7+ePy4KJ2Fw==
+"@zetachain/localnet@5.0.0-rc1":
+  version "5.0.0-rc1"
+  resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-5.0.0-rc1.tgz#920803084156a7b86fe763541b83a24833fb54d6"
+  integrity sha512-HHQ01dp9fxoA8WBBEXLmh5p/GMqVdd/0oYkdzzFZQ52UNXi+ucc4B/wdpBlKwub06r6Q8edPXiPfOjGPFthcMQ==
   dependencies:
     "@inquirer/prompts" "^5.5.0"
     "@uniswap/v2-core" "^1.0.1"
     "@uniswap/v2-periphery" "^1.1.0-beta.0"
-    "@zetachain/protocol-contracts" "11.0.0-rc3"
+    "@zetachain/protocol-contracts" "11.0.0-rc4"
     ansis "^3.3.2"
     concurrently "^8.2.2"
     ethers "^6.13.2"
@@ -2568,6 +2568,16 @@
     "@zetachain/networks" "^10.0.0"
     ethers "5.6.8"
 
+"@zetachain/[email protected]":
+  version "11.0.0-rc4"
+  resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc4.tgz#2e2df98734793873e9c50629f6ec9f5eec6f9f54"
+  integrity sha512-7MJzEyUad7JgHucveIhtU8aaPkoMMzsfhKkh9MDMdxUzlaOmmxrQw2hi5B2b7UPxw2K9vFffkmIox6gd6c1+Yw==
+  dependencies:
+    "@openzeppelin/contracts" "^5.0.2"
+    "@openzeppelin/contracts-upgradeable" "^5.0.2"
+    "@zetachain/networks" "^10.0.0"
+    ethers "5.6.8"
+
 "@zetachain/[email protected]":
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-9.0.0.tgz#c20ad5da43f6f3676f31556b303d1cb4ea17357e"