Add command to update registerTokenFee and sendTokenFee

contracts/src/Gateway.sol

@@ -8,7 +8,7 @@ import {Verification} from "./Verification.sol";
 import {Assets} from "./Assets.sol";
 import {AgentExecutor} from "./AgentExecutor.sol";
 import {Agent} from "./Agent.sol";
-import {Channel, InboundMessage, OperatingMode, ParaID, Config, Command} from "./Types.sol";
+import {Channel, InboundMessage, OperatingMode, ParaID, Config, Command, AssetFees} from "./Types.sol";
 import {IGateway} from "./interfaces/IGateway.sol";
 import {IInitializable} from "./interfaces/IInitializable.sol";
 import {ERC1967} from "./utils/ERC1967.sol";
@@ -173,6 +173,11 @@ contract Gateway is IGateway, IInitializable {
             catch {
                 success = false;
             }
+        } else if (message.command == Command.UpdateFees) {
+            try Gateway(this).updateFees{gas: maxDispatchGas}(message.params) {}
+            catch {
+                success = false;
+            }
         }
 
         // Calculate the actual cost of executing this message
@@ -230,6 +235,13 @@ contract Gateway is IGateway, IInitializable {
         return ERC1967.load();
     }
 
+    function assetFees() external view returns (AssetFees memory fees) {
+        AssetsStorage.Layout storage $ = AssetsStorage.layout();
+        fees.register = $.registerTokenFee;
+        fees.send = $.sendTokenFee;
+        return fees;
+    }
+
     /**
      * Handlers
      */
@@ -411,6 +423,15 @@ contract Gateway is IGateway, IInitializable {
         emit AgentFundsWithdrawn(params.agentID, params.recipient, params.amount);
     }
 
+    // @dev Set the operating mode of the gateway
+    function updateFees(bytes calldata data) external onlySelf {
+        AssetsStorage.Layout storage $ = AssetsStorage.layout();
+        AssetFees memory params = abi.decode(data, (AssetFees));
+        $.registerTokenFee = params.register;
+        $.sendTokenFee = params.send;
+        emit FeeUpdated(params.register, params.send);
+    }
+
     /**
      * Assets
      */

contracts/src/Types.sol

@@ -72,7 +72,15 @@ enum Command {
     CreateChannel,
     UpdateChannel,
     SetOperatingMode,
-    TransferNativeFromAgent
+    TransferNativeFromAgent,
+    UpdateFees
 }
 
 enum AgentExecuteCommand {TransferToken}
+
+struct AssetFees {
+    /// @dev register token
+    uint256 register;
+    /// @dev send token to parachain
+    uint256 send;
+}

contracts/src/interfaces/IGateway.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 pragma solidity 0.8.20;
 
-import {OperatingMode, InboundMessage, ParaID} from "../Types.sol";
+import {OperatingMode, InboundMessage, ParaID, AssetFees} from "../Types.sol";
 import {Verification} from "../Verification.sol";
 
 interface IGateway {
@@ -34,6 +34,9 @@ interface IGateway {
     // Emitted when funds are withdrawn from an agent
     event AgentFundsWithdrawn(bytes32 indexed agentID, address indexed recipient, uint256 amount);
 
+    // Emitted when the fees updated
+    event FeeUpdated(uint256 register, uint256 send);
+
     /**
      * Getters
      */
@@ -44,6 +47,7 @@ interface IGateway {
     function channelNoncesOf(ParaID paraID) external view returns (uint64, uint64);
     function agentOf(bytes32 agentID) external view returns (address);
     function implementation() external view returns (address);
+    function assetFees() external view returns (AssetFees memory);
 
     /**
      * Messaging

contracts/test/Gateway.t.sol

@@ -22,7 +22,9 @@ import {SubstrateTypes} from "./../src/SubstrateTypes.sol";
 
 import {NativeTransferFailed} from "../src/utils/SafeTransfer.sol";
 
-import {AgentExecuteCommand, InboundMessage, OperatingMode, ParaID, Config, Command} from "../src/Types.sol";
+import {
+    AgentExecuteCommand, InboundMessage, OperatingMode, ParaID, Config, Command, AssetFees
+} from "../src/Types.sol";
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import "./mocks/GatewayUpgradeMock.sol";
@@ -747,4 +749,11 @@ contract GatewayTest is Test {
             InboundMessage(bridgeHubParaID, 1, command, params, 1, maxRefund, reward), proof, makeMockProof()
         );
     }
+
+    function testSetFees() public {
+        GatewayMock(address(gateway)).updateFeesPublic(abi.encode(AssetFees({register: 1, send: 1})));
+        AssetFees memory fees = IGateway(address(gateway)).assetFees();
+        assertEq(fees.register, 1);
+        assertEq(fees.send, 1);
+    }
 }

contracts/test/mocks/GatewayMock.sol

@@ -63,6 +63,10 @@ contract GatewayMock is Gateway {
             return commitmentsAreVerified;
         }
     }
+
+    function updateFeesPublic(bytes calldata params) external {
+        this.updateFees(params);
+    }
 }
 
 library AdditionalStorage {

contracts/test/mocks/GatewayUpgradeMock.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 pragma solidity 0.8.20;
 
-import {Channel, InboundMessage, OperatingMode, ParaID, Config, Command} from "../../src/Types.sol";
+import {Channel, InboundMessage, OperatingMode, ParaID, Config, Command, AssetFees} from "../../src/Types.sol";
 import {IGateway} from "../../src/interfaces/IGateway.sol";
 import {IInitializable} from "../../src/interfaces/IInitializable.sol";
 import {Verification} from "../../src/Verification.sol";
@@ -32,6 +32,10 @@ contract GatewayUpgradeMock is IGateway, IInitializable {
         return address(0);
     }
 
+    function assetFees() external pure returns (AssetFees memory) {
+        return AssetFees({register: 1, send: 1});
+    }
+
     function implementation() external pure returns (address) {
         return address(0);
     }

parachain/pallets/control/src/lib.rs

@@ -68,9 +68,12 @@ use frame_support::{
 };
 use frame_system::pallet_prelude::*;
 use snowbridge_core::{
-	outbound::{Command, Initializer, Message, OperatingMode, ParaId, SendError, SendMessage},
+	outbound::{
+		Command, Initializer, Message, OperatingMode, ParaId, SendError, SendMessage, TokenFees,
+	},
 	sibling_sovereign_account, AgentId,
 };
+use sp_runtime::SaturatedConversion;
 
 #[cfg(feature = "runtime-benchmarks")]
 use frame_support::traits::OriginTrait;
@@ -176,6 +179,8 @@ pub mod pallet {
 		SetOperatingMode { mode: OperatingMode },
 		/// An TransferNativeFromAgent message was sent to the Gateway
 		TransferNativeFromAgent { agent_id: AgentId, recipient: H160, amount: u128 },
+		/// An UpdateFees message was sent to the Gateway
+		UpdateFees { register: u128, send: u128 },
 	}
 
 	#[pallet::error]
@@ -424,6 +429,31 @@ pub mod pallet {
 
 			Self::do_transfer_native_from_agent(agent_id, para_id, recipient, amount, pays_fee)
 		}
+
+		/// Sends a message to the Gateway contract to update fees
+		///
+		/// Privileged. Can only be called by root.
+		///
+		/// Fee required: No
+		///
+		/// - `origin`: Must be root
+		/// - `location`: Location used to resolve the agent
+		/// - `recipient`: Recipient of funds
+		/// - `amount`: Amount to transfer
+		#[pallet::call_index(8)]
+		#[pallet::weight(T::WeightInfo::update_fees())]
+		pub fn update_fees(origin: OriginFor<T>, fees: TokenFees<BalanceOf<T>>) -> DispatchResult {
+			ensure_root(origin)?;
+
+			let (register, send) =
+				(fees.register.saturated_into::<u128>(), fees.send.saturated_into::<u128>());
+
+			let command = Command::SetTokenFee { register, send };
+			Self::send(T::OwnParaId::get(), command, PaysFee::<T>::No)?;
+
+			Self::deposit_event(Event::<T>::UpdateFees { register, send });
+			Ok(())
+		}
 	}
 
 	impl<T: Config> Pallet<T> {

parachain/pallets/control/src/weights.rs

@@ -40,6 +40,7 @@ pub trait WeightInfo {
 	fn set_operating_mode() -> Weight;
 	fn transfer_native_from_agent() -> Weight;
 	fn force_transfer_native_from_agent() -> Weight;
+	fn update_fees() -> Weight;
 }
 
 // For backwards compatibility and tests.
@@ -204,4 +205,24 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
+
+	/// Storage: ParachainInfo ParachainId (r:1 w:0)
+	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0)
+	/// Proof: EthereumOutboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:0 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn update_fees() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `80`
+		//  Estimated: `3517`
+		// Minimum execution time: 31_000_000 picoseconds.
+		Weight::from_parts(42_000_000, 3517)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
+	}
 }

parachain/primitives/core/src/outbound.rs

@@ -111,6 +111,13 @@ mod v1 {
 			/// The amount to transfer
 			amount: u128,
 		},
+		/// Set token fees of the Gateway contract
+		SetTokenFee {
+			/// The fee for register token
+			register: u128,
+			/// The fee for send token to para chain
+			send: u128,
+		},
 	}
 
 	impl Command {
@@ -124,6 +131,7 @@ mod v1 {
 				Command::UpdateChannel { .. } => 4,
 				Command::SetOperatingMode { .. } => 5,
 				Command::TransferNativeFromAgent { .. } => 6,
+				Command::SetTokenFee { .. } => 7,
 			}
 		}
 
@@ -170,6 +178,10 @@ mod v1 {
 						Token::Address(*recipient),
 						Token::Uint(U256::from(*amount)),
 					])]),
+				Command::SetTokenFee { register, send } => ethabi::encode(&[Token::Tuple(vec![
+					Token::Uint(U256::from(*register)),
+					Token::Uint(U256::from(*send)),
+				])]),
 			}
 		}
 	}
@@ -335,6 +347,7 @@ impl GasMeter for ConstantGasMeter {
 				// the the initializer is called.
 				50_000 + initializer_max_gas
 			},
+			Command::SetTokenFee { .. } => 60_000,
 		}
 	}
 }
@@ -367,3 +380,12 @@ pub enum AggregateMessageOrigin {
 }
 
 pub const ETHER_DECIMALS: u8 = 18;
+
+#[derive(Copy, Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+pub struct TokenFees<Balance>
+where
+	Balance: BaseArithmetic + Unsigned + Copy,
+{
+	pub register: Balance,
+	pub send: Balance,
+}