Merge branch 'main' into ron/transact-from-eth-to-sub

contracts/src/Assets.sol

@@ -23,6 +23,7 @@ library Assets {
     error InvalidDestination();
     error TokenNotRegistered();
     error Unsupported();
+    error InvalidDestinationFee();
 
     function isTokenRegistered(address token) external view returns (bool) {
         return AssetsStorage.layout().tokenRegistry[token].isRegistered;
@@ -106,6 +107,9 @@ library Assets {
                 revert Unsupported();
             }
         } else {
+            if (destinationChainFee == 0) {
+                revert InvalidDestinationFee();
+            }
             // The funds will be minted into sovereign account of the destination parachain on AssetHub,
             // and then reserve-transferred to the receiver's account on the destination parachain.
             if (destinationAddress.isAddress32()) {

contracts/test/Gateway.t.sol

@@ -898,6 +898,23 @@ contract GatewayTest is Test {
         assertEq(fee, 10000000000000000);
     }
 
+    function testSendTokenToForeignDestWithInvalidFee() public {
+        // Let gateway lock up to 1 tokens
+        token.approve(address(gateway), 1);
+
+        // Multilocation for recipient
+        ParaID destPara = ParaID.wrap(2043);
+
+        // register token first
+        uint256 fee = IGateway(address(gateway)).quoteRegisterTokenFee();
+        IGateway(address(gateway)).registerToken{value: fee}(address(token));
+
+        fee = IGateway(address(gateway)).quoteSendTokenFee(address(token), destPara, 0);
+
+        vm.expectRevert(Assets.InvalidDestinationFee.selector);
+        IGateway(address(gateway)).sendToken{value: fee}(address(token), destPara, recipientAddress32, 0, 1);
+    }
+
     /**
      * Transact
      */

control/.gitignore

@@ -0,0 +1,12 @@
+# Generated by Cargo
+# will have compiled files and executables
+**/target/
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+*.log
+
+.envrc
+
+# The cache for chain data in container
+.local