revert: aggregate

many-things · Oct 17, 2023 · 00fe615 · 00fe615
1 parent 7abab20
commit 00fe615
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 419 deletions.
diff --git a/contracts/hooks/aggregate/Cargo.toml b/contracts/hooks/aggregate/Cargo.toml
diff --git a/contracts/hooks/aggregate/src/lib.rs b/contracts/hooks/aggregate/src/lib.rs
diff --git a/contracts/isms/aggregate/Cargo.toml b/contracts/isms/aggregate/Cargo.toml
diff --git a/contracts/isms/aggregate/src/contract.rs b/contracts/isms/aggregate/src/contract.rs
diff --git a/contracts/isms/aggregate/src/error.rs b/contracts/isms/aggregate/src/error.rs
diff --git a/contracts/isms/aggregate/src/lib.rs b/contracts/isms/aggregate/src/lib.rs
diff --git a/contracts/isms/multisig/src/lib.rs b/contracts/isms/multisig/src/lib.rs
@@ -39,14 +39,14 @@ pub fn eth_hash(message: HexBinary) -> Result<HexBinary, ContractError> {
 pub fn multisig_hash(
     mut domain_hash: Vec<u8>,
     mut root: Vec<u8>,
-    index: u32,
+    mut index: Vec<u8>,
     mut message_id: Vec<u8>,
 ) -> Result<HexBinary, ContractError> {
     let mut bz = vec![];
 
     bz.append(&mut domain_hash);
     bz.append(&mut root);
-    bz.append(&mut index.to_be_bytes().to_vec());
+    bz.append(&mut index);
     bz.append(&mut message_id);
 
     let hash = keccak256_hash(&bz);

diff --git a/contracts/isms/multisig/src/query.rs b/contracts/isms/multisig/src/query.rs
@@ -46,7 +46,7 @@ pub fn verify_message(
     let multisig_hash = multisig_hash(
         domain_hash(message.origin_domain, metadata.origin_merkle_tree)?.to_vec(),
         metadata.merkle_root.to_vec(),
-        0,
+        metadata.merkle_index.to_vec(),
         message.id().to_vec(),
     )?;
 

diff --git a/packages/interface/src/core/va.rs b/packages/interface/src/core/va.rs
@@ -35,5 +35,3 @@ pub struct GetAnnounceStorageLocationsResponse {
 pub struct GetAnnouncedValidatorsResponse {
     pub validators: Vec<String>,
 }
-
-