rlp decoding fixes

polytope-labs · Oct 12, 2023 · 791bb96 · 791bb96
1 parent 84a5c2d
commit 791bb96
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/parachain/modules/ismp/sync-committee/src/arbitrum.rs b/parachain/modules/ismp/sync-committee/src/arbitrum.rs
@@ -249,11 +249,13 @@ pub fn verify_arbitrum_payload<H: IsmpHost + Send + Sync>(
         _ => Err(Error::MembershipProofVerificationFailed("Value not found in proof".to_string()))?,
     };
 
-    let proof_value = <B256 as Decodable>::decode(&mut &*proof_value).map_err(|_| {
-        Error::ImplementationSpecific(format!("Error decoding state hash {:?}", &proof_value))
-    })?;
+    let proof_value = <alloy_primitives::U256 as Decodable>::decode(&mut &*proof_value)
+        .map_err(|_| {
+            Error::ImplementationSpecific(format!("Error decoding state hash {:?}", &proof_value))
+        })?
+        .to_be_bytes::<32>();
 
-    if proof_value.0 != state_hash.0 {
+    if proof_value != state_hash.0 {
         Err(Error::MembershipProofVerificationFailed(
             "State hash from proof does not match calculated state hash".to_string(),
         ))?

diff --git a/parachain/modules/ismp/sync-committee/src/optimism.rs b/parachain/modules/ismp/sync-committee/src/optimism.rs
@@ -84,14 +84,16 @@ pub fn verify_optimism_payload<H: IsmpHost + Send + Sync>(
         _ => Err(Error::MembershipProofVerificationFailed("Value not found in proof".to_string()))?,
     };
 
-    let proof_value = <B256 as Decodable>::decode(&mut &*proof_value).map_err(|_| {
-        Error::ImplementationSpecific(format!(
-            "Error decoding contract account from key {:?}",
-            &proof_value
-        ))
-    })?;
+    let proof_value = <alloy_primitives::U256 as Decodable>::decode(&mut &*proof_value)
+        .map_err(|_| {
+            Error::ImplementationSpecific(format!(
+                "Error decoding output root from {:?}",
+                &proof_value
+            ))
+        })?
+        .to_be_bytes::<32>();
 
-    if proof_value.0 != output_root.0 {
+    if proof_value != output_root.0 {
         return Err(Error::MembershipProofVerificationFailed(
             "Invalid optimism output root proof".to_string(),
         ))
@@ -109,15 +111,15 @@ pub fn verify_optimism_payload<H: IsmpHost + Send + Sync>(
         _ => Err(Error::MembershipProofVerificationFailed("Value not found in proof".to_string()))?,
     };
 
-    let block_and_timestamp = <Bytes as Decodable>::decode(&mut &*block_and_timestamp)
-        .map_err(|_| {
-            Error::ImplementationSpecific(format!(
-                "Error decoding block and timestamp from{:?}",
-                &block_and_timestamp
-            ))
-        })?
-        .0
-        .to_vec();
+    let block_and_timestamp =
+        <alloy_primitives::U256 as Decodable>::decode(&mut &*block_and_timestamp)
+            .map_err(|_| {
+                Error::ImplementationSpecific(format!(
+                    "Error decoding block and timestamp from{:?}",
+                    &block_and_timestamp
+                ))
+            })?
+            .to_be_bytes::<32>();
 
     let block_and_timestamp = U256::from_big_endian(&block_and_timestamp);
     // Timestamp is contained in the first two u64 values

diff --git a/parachain/modules/ismp/sync-committee/src/utils.rs b/parachain/modules/ismp/sync-committee/src/utils.rs
@@ -119,7 +119,7 @@ pub fn get_contract_storage_root<H: IsmpHost + Send + Sync>(
 
     let contract_account = <Account as Decodable>::decode(&mut &*result).map_err(|_| {
         Error::ImplementationSpecific(format!(
-            "Error decoding contract account from key {:?}",
+            "Error decoding contract account from value {:?}",
             &result
         ))
     })?;
@@ -172,7 +172,7 @@ pub(super) fn get_values_from_proof<H: IsmpHost + Send + Sync>(
     Ok(values)
 }
 
-pub(super) fn get_value_from_proof<H: IsmpHost + Send + Sync>(
+pub fn get_value_from_proof<H: IsmpHost + Send + Sync>(
     key: Vec<u8>,
     root: H256,
     proof: Vec<Vec<u8>>,