Merge pull request #1744 from skalenetwork/feature/add-receiver-field…

…-for-chain-to-chain-transfers Feature/add receiver field for chain to chain transfers
skalenetwork · Dec 23, 2024 · 1140de1 · 1140de1
2 parents fb51ab8 + 71f32cc
commit 1140de1
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3.0
diff --git a/contracts/schain/TokenManagers/TokenManagerERC20.sol b/contracts/schain/TokenManagers/TokenManagerERC20.sol
@@ -124,11 +124,8 @@ contract TokenManagerERC20 is TokenManager, ITokenManagerERC20 {
     )
         external
         override
-        rightTransaction(targetSchainName, msg.sender)
     {
-        SchainHash targetSchainHash = SchainHash.wrap(keccak256(abi.encodePacked(targetSchainName)));
-        communityLocker.checkAllowedToSendMessage(targetSchainHash, msg.sender);
-        _exit(targetSchainHash, tokenManagers[targetSchainHash], contractOnMainnet, msg.sender, amount);
+        transferToSchainERC20Direct(targetSchainName, contractOnMainnet, amount, msg.sender);
     }
 
     /**
@@ -212,6 +209,27 @@ contract TokenManagerERC20 is TokenManager, ITokenManagerERC20 {
         );
     }
 
+    /**
+     * @dev Move tokens from schain to schain to specified receiver.
+     *
+     * {contractOnMainnet} tokens are burned on origin schain
+     * and are minted on {targetSchainName} schain for {receiver} address.
+     */
+    function transferToSchainERC20Direct(
+        string calldata targetSchainName,
+        address contractOnMainnet,
+        uint256 amount,
+        address receiver
+    )
+        public
+        override
+        rightTransaction(targetSchainName, receiver)
+    {
+        SchainHash targetSchainHash = SchainHash.wrap(keccak256(abi.encodePacked(targetSchainName)));
+        communityLocker.checkAllowedToSendMessage(targetSchainHash, msg.sender);
+        _exit(targetSchainHash, tokenManagers[targetSchainHash], contractOnMainnet, receiver, amount);
+    }
+
     // private
 
     /**
@@ -304,7 +322,7 @@ contract TokenManagerERC20 is TokenManager, ITokenManagerERC20 {
             data = _receiveERC20(
                 chainHash,
                 address(contractOnSchain),
-                msg.sender,
+                to,
                 amount
             );
             _saveTransferredAmount(chainHash, address(contractOnSchain), amount);

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "@openzeppelin/hardhat-upgrades": "^3.1.1",
         "@safe-global/api-kit": "2.5.4",
         "@skalenetwork/etherbase-interfaces": "^0.0.1-develop.20",
-        "@skalenetwork/ima-interfaces": "^2.0.0-execution-layer.13",
+        "@skalenetwork/ima-interfaces": "2.0.0-add-receiver-field-for-chain-to-chain-transfers.1",
         "@skalenetwork/skale-manager-interfaces": "2.0.0",
         "@skalenetwork/upgrade-tools": "3.0.0-develop.34",
         "axios": "^0.21.4",

diff --git a/test/TokenManagerERC20.ts b/test/TokenManagerERC20.ts
@@ -336,6 +336,43 @@ describe("TokenManagerERC20", () => {
             outgoingMessagesCounter.should.be.equal(1);
         });
 
+        it("should invoke `transferToSchainERC20Direct` without mistakes", async () => {
+            const amount = "20000000000000000";
+            await messageProxyForSchain.registerExtraContract(newSchainName, tokenManagerErc20);
+
+            // add connected chain:
+            await messageProxyForSchain.connect(deployer).grantRole(await messageProxyForSchain.CHAIN_CONNECTOR_ROLE(), deployer.address);
+            await messageProxyForSchain.connect(deployer).addConnectedChain(newSchainName);
+
+            await erc20OnOriginChain.connect(deployer).mint(user.address, amount);
+            await erc20OnOriginChain.connect(user).approve(tokenManagerErc20, amount);
+
+            await tokenManagerErc20
+                .connect(user)
+                .transferToSchainERC20Direct(newSchainName, erc20OnOriginChain, amount, deployer.address)
+                .should.be.eventually.rejectedWith("Incorrect Token Manager address");
+
+            await tokenManagerErc20
+                .connect(user)
+                .transferToSchainERC20Direct("Mainnet", erc20OnOriginChain, amount, deployer.address)
+                .should.be.eventually.rejectedWith("This function is not for transferring to Mainnet");
+
+            await tokenManagerErc20.addTokenManager(newSchainName, tokenManagerErc202);
+
+            const data = await messages.encodeTransferErc20AndTokenInfoMessage(erc20OnOriginChain, deployer.address, amount, amount, { name: "NewToken", symbol: "NTN", decimals: 18 });
+
+            // execution:
+            await tokenManagerErc20
+                .connect(user)
+                .transferToSchainERC20Direct(newSchainName, erc20OnOriginChain, amount, deployer.address)
+                .should.emit(messageProxyForSchain, "OutgoingMessage")
+                .withArgs(newSchainId, 0, tokenManagerErc20, tokenManagerErc202, data);
+
+            // expectation:
+            const outgoingMessagesCounter = await messageProxyForSchain.getOutgoingMessagesCounter(newSchainName);
+            outgoingMessagesCounter.should.be.deep.equal(1n);
+        });
+
         it("should reject `transferToSchainERC20` when executing earlier than allowed", async () => {
             const amount = "20000000000000000";
             await messageProxyForSchain.registerExtraContract(newSchainName, tokenManagerErc20);

diff --git a/yarn.lock b/yarn.lock
@@ -1286,10 +1286,10 @@
   resolved "https://registry.yarnpkg.com/@skalenetwork/etherbase-interfaces/-/etherbase-interfaces-0.0.1.tgz#97ed2069256a835efa1b088a58de17e2783a9e71"
   integrity sha512-CgAo41sSL1KT9e1d3sUTxW5WPbEvHQwoqo3hLt+VW/6kGYukCuW4AHWMyDr5Jjw9KtjDKSOySDcoukhaeKxToQ==
 
-"@skalenetwork/ima-interfaces@^2.0.0-execution-layer.13":
-  version "2.0.0-execution-layer.13"
-  resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-2.0.0-execution-layer.13.tgz#5ed8e488f6cec755b15aefcbff2a4333596e51b8"
-  integrity sha512-SyrKE8qGtXq9QVcn5Z4yT5CgLpG79yLxcs8KuygiFEXopdYbM2tuQHIspVBSL+6UtIUYRz40g7IZN1vdVY+RcQ==
+"@skalenetwork/ima-interfaces@2.0.0-add-receiver-field-for-chain-to-chain-transfers.1":
+  version "2.0.0-add-receiver-field-for-chain-to-chain-transfers.1"
+  resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-2.0.0-add-receiver-field-for-chain-to-chain-transfers.1.tgz#24621a1510e3df52506bb16884a58f54f8af1e34"
+  integrity sha512-NLGuHXAWS5t6QoaxZNShG92VhmBsbV4MCbmWiaDQbrjUDyyi2LzzCEuzDjvlLqMRUpE/2ztPRBOjqMg7dzeLGg==
   dependencies:
     "@skalenetwork/skale-manager-interfaces" "^3.2.0-develop.0"