use type prefix when calculating the L2Request hash

gasp-xyz · Oct 21, 2024 · 0579572 · 0579572
1 parent 9350c6d
commit 0579572
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/pallets/rolldown/src/messages/eth_abi.rs b/pallets/rolldown/src/messages/eth_abi.rs
@@ -143,6 +143,9 @@ sol! {
 	#[derive(Debug, Eq, PartialEq, Encode, Decode, TypeInfo)]
 	enum Chain{ Ethereum, Arbitrum }
 
+	#[derive(Debug, Eq, PartialEq, Encode, Decode, TypeInfo)]
+	enum L2RequestType{ Withdrawal, Cancel, FailedDepositResolution }
+
 	#[derive(Debug)]
 	struct L1Update {
 		Chain chain;

diff --git a/pallets/rolldown/src/messages/mod.rs b/pallets/rolldown/src/messages/mod.rs
@@ -58,9 +58,25 @@ where
 impl<AccountId: Clone> EthAbi for L2Request<AccountId> {
 	fn abi_encode(&self) -> Vec<u8> {
 		match self {
-			L2Request::FailedDepositResolution(deposit) => deposit.abi_encode(),
-			L2Request::Cancel(cancel) => cancel.abi_encode(),
-			L2Request::Withdrawal(withdrawal) => withdrawal.abi_encode(),
+			L2Request::FailedDepositResolution(deposit) =>
+				eth_abi::L2RequestType::FailedDepositResolution
+					.abi_encode()
+					.iter()
+					.chain(deposit.abi_encode().iter())
+					.cloned()
+					.collect(),
+			L2Request::Cancel(cancel) => eth_abi::L2RequestType::Cancel
+				.abi_encode()
+				.iter()
+				.chain(cancel.abi_encode().iter())
+				.cloned()
+				.collect(),
+			L2Request::Withdrawal(withdrawal) => eth_abi::L2RequestType::Withdrawal
+				.abi_encode()
+				.iter()
+				.chain(withdrawal.abi_encode().iter())
+				.cloned()
+				.collect(),
 		}
 	}
 }