Update RelayEncoder to be 9430 compatible

precompiles/relay-encoder/RelayEncoder.sol

@@ -18,12 +18,10 @@ RelayEncoder constant RELAY_ENCODER_CONTRACT = RelayEncoder(
 interface RelayEncoder {
     /// @dev Encode 'bond' relay call
     /// @custom:selector a82948d4
-    /// @param controllerAddress: Address of the controller
     /// @param amount: The amount to bond
     /// @param rewardDestination: the account that should receive the reward
     /// @return result The bytes associated with the encoded call
     function encodeBond(
-        uint256 controllerAddress,
         uint256 amount,
         bytes memory rewardDestination
     ) external pure returns (bytes memory result);
@@ -32,47 +30,43 @@ interface RelayEncoder {
     /// @custom:selector 813667a0
     /// @param amount: The extra amount to bond
     /// @return result The bytes associated with the encoded call
-    function encodeBondExtra(uint256 amount)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeBondExtra(
+        uint256 amount
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'unbond' relay call
     /// @custom:selector 51b14e57
     /// @param amount The amount to unbond
     /// @return result The bytes associated with the encoded call
-    function encodeUnbond(uint256 amount)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeUnbond(
+        uint256 amount
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'withdrawUnbonded' relay call
     /// @custom:selector d5ad108e
     /// @param slashes Weight hint, number of slashing spans
     /// @return result The bytes associated with the encoded call
-    function encodeWithdrawUnbonded(uint32 slashes)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeWithdrawUnbonded(
+        uint32 slashes
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'validate' relay call
     /// @custom:selector bb64ca0c
     /// @param comission: Comission of the validator as partsPerBillion
     /// @param blocked: Whether or not the validator is accepting more nominations
     /// @return result The bytes associated with the encoded call
-    function encodeValidate(uint256 comission, bool blocked)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeValidate(
+        uint256 comission,
+        bool blocked
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'nominate' relay call
     /// @custom:selector d2ea7b08
     /// @param nominees: An array of AccountIds corresponding to the accounts we will nominate
     /// @return result The bytes associated with the encoded call
-    function encodeNominate(uint256[] memory nominees)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeNominate(
+        uint256[] memory nominees
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'chill' relay call
     /// @custom:selector b5eaac43
@@ -83,64 +77,59 @@ interface RelayEncoder {
     /// @custom:selector 414be337
     /// @param rewardDestination: the account that should receive the reward
     /// @return result The bytes associated with the encoded call
-    function encodeSetPayee(bytes memory rewardDestination)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeSetPayee(
+        bytes memory rewardDestination
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'setController' relay call
     /// @custom:selector 07f7c6dc
-    /// @param controller: The controller address
     /// @return result The bytes associated with the encoded call
-    function encodeSetController(uint256 controller)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeSetController() external pure returns (bytes memory result);
 
     /// @dev Encode 'rebond' relay call
     /// @custom:selector 0922ee17
     /// @param amount: The amount to rebond
     /// @return result The bytes associated with the encoded call
-    function encodeRebond(uint256 amount)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeRebond(
+        uint256 amount
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'hrmp.init_open_channel' relay call
     /// @custom:selector e5e20a64
     /// @param recipient: The paraId to whom we want to initiate the open channel
     /// @param maxCapacity: The maximum capacity for the channel
     /// @param maxMessageSize: The maximum message size for the channel
     /// @return result The bytes associated with the encoded call
-    function encodeHrmpInitOpenChannel(uint32 recipient, uint32 maxCapacity, uint32 maxMessageSize)
-        external
-        pure
-        returns (bytes memory result);
-
+    function encodeHrmpInitOpenChannel(
+        uint32 recipient,
+        uint32 maxCapacity,
+        uint32 maxMessageSize
+    ) external pure returns (bytes memory result);
+
     /// @dev Encode 'hrmp.accept_open_channel' relay call
     /// @custom:selector 98a76477
     /// @param sender: The paraId from which we want to accept the channel
-    function encodeHrmpAcceptOpenChannel(uint32 sender)
-        external
-        pure
-        returns (bytes memory result);
+    function encodeHrmpAcceptOpenChannel(
+        uint32 sender
+    ) external pure returns (bytes memory result);
 
     /// @dev Encode 'hrmp.close_channel' relay call
     /// @custom:selector 9cfbdfc5
     /// @param sender: The paraId of the sender
     /// @param sender: The paraId of the recipient
-    function encodeHrmpCloseChannel(uint32 sender, uint32 recipient)
-        external
-        pure
-        returns (bytes memory result);
-    
+    function encodeHrmpCloseChannel(
+        uint32 sender,
+        uint32 recipient
+    ) external pure returns (bytes memory result);
+
     /// @dev Encode 'hrmp.cancel_open_request' relay call
     /// @custom:selector 8fd5ce49
     /// @param sender: The paraId of the sender
     /// @param recipient: The paraId of the recipient
     /// @param openRequests: The number of open requests
-    function encodeHrmpCancelOpenRequest(uint32 sender, uint32 recipient, uint32 openRequests) 
-        external 
-        pure 
-        returns (bytes memory result);
+    function encodeHrmpCancelOpenRequest(
+        uint32 sender,
+        uint32 recipient,
+        uint32 openRequests
+    ) external pure returns (bytes memory result);
 }

precompiles/relay-encoder/src/lib.rs

@@ -44,7 +44,6 @@ mod tests;
 
 pub enum AvailableStakeCalls {
 	Bond(
-		relay_chain::AccountId,
 		relay_chain::Balance,
 		pallet_staking::RewardDestination<relay_chain::AccountId>,
 	),
@@ -55,7 +54,7 @@ pub enum AvailableStakeCalls {
 	Nominate(Vec<relay_chain::AccountId>),
 	Chill,
 	SetPayee(pallet_staking::RewardDestination<relay_chain::AccountId>),
-	SetController(relay_chain::AccountId),
+	SetController,
 	Rebond(relay_chain::Balance),
 }
 
@@ -79,30 +78,25 @@ where
 	Runtime: pallet_evm::Config,
 	Runtime::RuntimeCall: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
 {
-	#[precompile::public("encodeBond(uint256,uint256,bytes)")]
-	#[precompile::public("encode_bond(uint256,uint256,bytes)")]
+	#[precompile::public("encodeBond(uint256,bytes)")]
+	#[precompile::public("encode_bond(uint256,bytes)")]
 	#[precompile::view]
 	fn encode_bond(
 		handle: &mut impl PrecompileHandle,
-		controller_address: U256,
 		amount: U256,
 		reward_destination: RewardDestinationWrapper,
 	) -> EvmResult<UnboundedBytes> {
 		// No DB access but lot of logical stuff
 		// To prevent spam, we charge an arbitrary amount of gas
 		handle.record_cost(1000)?;
 
-		let address: [u8; 32] = controller_address.into();
 		let relay_amount = u256_to_relay_amount(amount)?;
 		let reward_destination = reward_destination.into();
 
-		let encoded = RelayRuntime::encode_call(AvailableStakeCalls::Bond(
-			address.into(),
-			relay_amount,
-			reward_destination,
-		))
-		.as_slice()
-		.into();
+		let encoded =
+			RelayRuntime::encode_call(AvailableStakeCalls::Bond(relay_amount, reward_destination))
+				.as_slice()
+				.into();
 
 		Ok(encoded)
 	}
@@ -250,23 +244,17 @@ where
 		Ok(encoded)
 	}
 
-	#[precompile::public("encodeSetController(uint256)")]
-	#[precompile::public("encode_set_controller(uint256)")]
+	#[precompile::public("encodeSetController()")]
+	#[precompile::public("encode_set_controller()")]
 	#[precompile::view]
-	fn encode_set_controller(
-		handle: &mut impl PrecompileHandle,
-		controller: U256,
-	) -> EvmResult<UnboundedBytes> {
+	fn encode_set_controller(handle: &mut impl PrecompileHandle) -> EvmResult<UnboundedBytes> {
 		// No DB access but lot of logical stuff
 		// To prevent spam, we charge an arbitrary amount of gas
 		handle.record_cost(1000)?;
 
-		let controller: [u8; 32] = controller.into();
-
-		let encoded =
-			RelayRuntime::encode_call(AvailableStakeCalls::SetController(controller.into()))
-				.as_slice()
-				.into();
+		let encoded = RelayRuntime::encode_call(AvailableStakeCalls::SetController)
+			.as_slice()
+			.into();
 
 		Ok(encoded)
 	}

precompiles/relay-encoder/src/test_relay_runtime.rs

@@ -35,7 +35,6 @@ pub enum StakeCall {
 	#[codec(index = 0u16)]
 	// the index should match the position of the dispatchable in the target pallet
 	Bond(
-		<AccountIdLookup<AccountId32, ()> as StaticLookup>::Source,
 		#[codec(compact)] cumulus_primitives_core::relay_chain::Balance,
 		pallet_staking::RewardDestination<AccountId32>,
 	),
@@ -54,7 +53,7 @@ pub enum StakeCall {
 	#[codec(index = 7u16)]
 	SetPayee(pallet_staking::RewardDestination<AccountId32>),
 	#[codec(index = 8u16)]
-	SetController(<AccountIdLookup<AccountId32, ()> as StaticLookup>::Source),
+	SetController,
 	#[codec(index = 19u16)]
 	Rebond(#[codec(compact)] cumulus_primitives_core::relay_chain::Balance),
 }
@@ -77,9 +76,7 @@ pub struct TestEncoder;
 impl StakeEncodeCall for TestEncoder {
 	fn encode_call(call: AvailableStakeCalls) -> Vec<u8> {
 		match call {
-			AvailableStakeCalls::Bond(a, b, c) => {
-				RelayCall::Stake(StakeCall::Bond(a.into(), b, c)).encode()
-			}
+			AvailableStakeCalls::Bond(b, c) => RelayCall::Stake(StakeCall::Bond(b, c)).encode(),
 
 			AvailableStakeCalls::BondExtra(a) => RelayCall::Stake(StakeCall::BondExtra(a)).encode(),
 
@@ -97,8 +94,8 @@ impl StakeEncodeCall for TestEncoder {
 				RelayCall::Stake(StakeCall::SetPayee(a.into())).encode()
 			}
 
-			AvailableStakeCalls::SetController(a) => {
-				RelayCall::Stake(StakeCall::SetController(a.into())).encode()
+			AvailableStakeCalls::SetController => {
+				RelayCall::Stake(StakeCall::SetController).encode()
 			}
 
 			AvailableStakeCalls::Rebond(a) => {

precompiles/relay-encoder/src/tests.rs

@@ -90,7 +90,6 @@ fn test_encode_bond() {
 					Alice,
 					Precompile1,
 					PCall::encode_bond {
-						controller_address: [1u8; 32].into(),
 						amount: 100.into(),
 						reward_destination: RewardDestinationWrapper(RewardDestination::Controller),
 					},
@@ -99,7 +98,6 @@ fn test_encode_bond() {
 				.expect_no_logs()
 				.execute_returns(UnboundedBytes::from(
 					TestEncoder::encode_call(AvailableStakeCalls::Bond(
-						[1u8; 32].into(),
 						100u32.into(),
 						RewardDestination::Controller,
 					))
@@ -201,15 +199,12 @@ fn test_encode_set_controller() {
 				.prepare_test(
 					Alice,
 					Precompile1,
-					PCall::encode_set_controller {
-						controller: [1u8; 32].into(),
-					},
+					PCall::encode_set_controller {},
 				)
 				.expect_cost(1000)
 				.expect_no_logs()
 				.execute_returns(UnboundedBytes::from(
-					TestEncoder::encode_call(AvailableStakeCalls::SetController([1u8; 32].into()))
-						.as_slice(),
+					TestEncoder::encode_call(AvailableStakeCalls::SetController).as_slice(),
 				))
 		});
 }