Fix: Validator Announce type (#13)

* Fix: Validator Announce type * fix: sn foundry version
astraly-labs · May 28, 2024 · b71a495 · b71a495
1 parent 1d3aa3a
commit b71a495
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,8 @@ jobs:
 
       - uses: software-mansion/setup-scarb@v1
       - uses: foundry-rs/setup-snfoundry@v3
-
+        with:
+          starknet-foundry-version: '0.22.0'
       - working-directory: ${{ env.working-directory}}
         run: scarb fmt --check
 

diff --git a/contracts/src/contracts/isms/multisig/validator_announce.cairo b/contracts/src/contracts/isms/multisig/validator_announce.cairo
@@ -1,6 +1,7 @@
 #[starknet::contract]
 pub mod validator_announce {
     use alexandria_bytes::{Bytes, BytesTrait};
+    use alexandria_data_structures::array_ext::ArrayTraitExt;
     use core::keccak::keccak_u256s_be_inputs;
     use hyperlane_starknet::contracts::libs::checkpoint_lib::checkpoint_lib::{
         HYPERLANE_ANNOUNCEMENT
@@ -33,7 +34,7 @@ pub mod validator_announce {
     #[derive(starknet::Event, Drop)]
     pub struct ValidatorAnnouncement {
         pub validator: EthAddress,
-        pub storage_location: felt252
+        pub storage_location: Array<felt252>
     }
 
     pub mod Errors {
@@ -51,16 +52,22 @@ pub mod validator_announce {
         fn announce(
             ref self: ContractState,
             _validator: EthAddress,
-            _storage_location: felt252,
+            mut _storage_location: Array<felt252>,
             _signature: Bytes
         ) -> bool {
             let felt252_validator: felt252 = _validator.into();
-            let mut input: Array<u256> = array![
-                felt252_validator.into(), _storage_location.into(),
-            ];
+            let mut _input: Array<u256> = array![felt252_validator.into()];
+            let mut u256_storage_location: Array<u256> = array![];
+            loop {
+                match _storage_location.pop_front() {
+                    Option::Some(storage) => u256_storage_location.append(storage.into()),
+                    Option::None(()) => { break (); },
+                }
+            };
+            let input = _input.concat(@u256_storage_location);
             let replay_id = keccak_hash(input.span());
             assert(!self.replay_protection.read(replay_id), Errors::REPLAY_PROTECTION_ERROR);
-            let announcement_digest = self.get_announcement_digest(_storage_location);
+            let announcement_digest = self.get_announcement_digest(u256_storage_location);
             let signature: Signature = convert_to_signature(_signature);
             assert(
                 bool_is_eth_signature_valid(announcement_digest, signature, _validator),
@@ -73,8 +80,7 @@ pub mod validator_announce {
                     self.validators.write(last_validator, _validator);
                 }
             };
-            let mut storage_locations = self.storage_location.read(_validator);
-            storage_locations.append(_storage_location);
+            self.storage_location.write(_validator, _storage_location.clone());
             self
                 .emit(
                     ValidatorAnnouncement {
@@ -103,10 +109,10 @@ pub mod validator_announce {
         fn get_announced_validators(self: @ContractState) -> Span<EthAddress> {
             build_validators_array(self)
         }
-        fn get_announcement_digest(self: @ContractState, _storage_location: felt252) -> u256 {
+        fn get_announcement_digest(self: @ContractState, _storage_location: Array<u256>) -> u256 {
             let domain_hash = domain_hash(self);
             let arguments = keccak_u256s_be_inputs(
-                array![domain_hash.into(), _storage_location.into()].span()
+                array![domain_hash.into()].concat(@_storage_location).span()
             );
             let reverse_args = reverse_endianness(arguments);
             to_eth_signature(reverse_args)
@@ -117,7 +123,7 @@ pub mod validator_announce {
     fn convert_to_signature(_signature: Bytes) -> Signature {
         let (_, r) = _signature.read_u256(0);
         let (_, s) = _signature.read_u256(32);
-        let (_, v) = _signature.read_u256(64);
+        let (_, v) = _signature.read_u8(64);
         signature_from_vrs(v.try_into().unwrap(), r, s)
     }
     fn keccak_hash(_input: Span<u256>) -> u256 {

diff --git a/contracts/src/interfaces.cairo b/contracts/src/interfaces.cairo
@@ -264,11 +264,11 @@ pub trait IValidatorAnnounce<TContractState> {
     fn announce(
         ref self: TContractState,
         _validator: EthAddress,
-        _storage_location: felt252,
+        _storage_location: Array<felt252>,
         _signature: Bytes
     ) -> bool;
 
-    fn get_announcement_digest(self: @TContractState, _storage_location: felt252) -> u256;
+    fn get_announcement_digest(self: @TContractState, _storage_location: Array<u256>) -> u256;
 }
 
 #[starknet::interface]

diff --git a/contracts/src/tests/isms/test_multisig.cairo b/contracts/src/tests/isms/test_multisig.cairo
@@ -9,7 +9,7 @@ use hyperlane_starknet::interfaces::IMessageRecipientDispatcherTrait;
 use hyperlane_starknet::interfaces::{
     IMailbox, IMailboxDispatcher, IMailboxDispatcherTrait, ModuleType,
     IInterchainSecurityModuleDispatcher, IInterchainSecurityModuleDispatcherTrait,
-    IInterchainSecurityModule
+    IInterchainSecurityModule,
 };
 use hyperlane_starknet::tests::setup::{
     setup, mock_setup, setup_messageid_multisig_ism, OWNER, NEW_OWNER, VALIDATOR_ADDRESS_1,