Merge branch 'reorg' into rem-asset-to-share

Author: aroralanuk

cairo/Scarb.toml

@@ -14,7 +14,6 @@ readme = "../README.md"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [workspace.dependencies]
-array = "0.4.0"
 assert_macros = "2.10.1"
 starknet = "2.10.1"
 alexandria_bytes = "0.4.0"

cairo/crates/contracts/src/lib.cairo

@@ -48,6 +48,3 @@ pub mod utils {
     pub mod store_arrays;
     pub mod utils;
 }
-pub mod paradex {
-    pub mod interface;
-}

cairo/crates/contracts/src/paradex/interface.cairo

@@ -107,6 +107,8 @@ fn test_aggregation_verify() {
         ownable.contract_address, OWNER().try_into().unwrap(), CheatSpan::TargetCalls(1),
     );
     let mut concat_metadata = BytesTrait::new_empty();
+    // starts at 16, ends at 416
+    // starts at 416, ends at 425
     concat_metadata.append_u128(0x00000010000001A0000001A0000001A9);
     concat_metadata.concat(@message_id_metadata);
     concat_metadata.concat(@message_id_metadata);
@@ -159,73 +161,12 @@ fn test_aggregation_verify_threshold_not_met() {
         ownable.contract_address, OWNER().try_into().unwrap(), CheatSpan::TargetCalls(1),
     );
     let mut concat_metadata = BytesTrait::new_empty();
+    // starts at 16, ends at 416
+    // starts at 416, ends at 425
     concat_metadata.append_u128(0x00000010000001A0000001A0000001A9);
     concat_metadata.concat(@message_id_metadata);
     concat_metadata.concat(@message_id_metadata);
 
     // panic with 'Pausable: paused'
     assert(aggregation.verify(concat_metadata, message), 'Aggregation: verify failed');
 }
-
-
-#[test]
-fn test_aggregation_verify_e2e() {
-    let aggregation_threshold = 1;
-
-    // MESSAGEID
-    let message_body = BytesTrait::new(11, array![0x68656C6C6F20776F726C640000000000]);
-    let metadata = BytesTrait::new(
-        144,
-        array![
-            0x000000080000008d071e1b5e54086bbd,
-            0xe2b7a131a2c913f442485974c32df56e,
-            0xe47f9456b3270daebe22faba5bc0223a,
-            0x7e3077adcd04391f2ccdd2b2ad2eac2d,
-            0x71c3f04755d5d95d000000015dcbf07f,
-            0xa1898b0d8b64991f099e8478268fb36e,
-            0x0e5fe7832aa345da8b8888645622786d,
-            0x53d898c95d75d37a582de78deda23497,
-            0x7d806349eac6653e9190d11a1c000000,
-        ],
-    );
-    let message = Message {
-        version: HYPERLANE_VERSION,
-        nonce: 0,
-        origin: 23448593,
-        sender: 0x00b3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca,
-        destination: 23448594,
-        recipient: 0x0777c88c0822f31828c97688a219af6b6689cae7bc90a7aa71437956dfed16a1,
-        body: message_body.clone(),
-    };
-
-    let multisig_threshold = 1;
-    let validators_array: Array<felt252> = array![
-        0x15d34aaf54267db7d7c367839aaf71a00a2c6a65.try_into().unwrap(),
-    ];
-
-    // Deploy the messageid contract at a specific address
-    let specific_address: ContractAddress =
-        0x045133e4b0a40aa7992bfb5d7f552b767be1b070af81f0313adf8e01cf3ab32c
-        .try_into()
-        .unwrap();
-    let messageid_class = declare("messageid_multisig_ism").unwrap().contract_class();
-    let mut parameters = Default::default();
-    let owner: felt252 = 0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca
-        .try_into()
-        .unwrap();
-    Serde::serialize(@owner, ref parameters);
-    Serde::serialize(@validators_array.span(), ref parameters);
-    Serde::serialize(@multisig_threshold, ref parameters);
-    messageid_class.deploy_at(@parameters, specific_address);
-
-    let messageid_ism = IInterchainSecurityModuleDispatcher { contract_address: specific_address };
-    // println!("E2E test messageid_ism: {}", messageid_ism.contract_address());
-
-    let aggregation = setup_aggregation(
-        array![messageid_ism.contract_address.into()].span(),
-        aggregation_threshold.try_into().unwrap(),
-    );
-
-    assert(aggregation.verify(metadata, message), 'Aggregation: verify failed');
-}
-

cairo/crates/contracts/tests/isms/test_aggregation.cairo

@@ -11,7 +11,6 @@ pub mod mock_account;
 pub mod mock_eth;
 pub mod mock_hyp_erc721_uri_storage;
 pub mod mock_mailbox;
-pub mod mock_paradex_dex;
 pub mod mock_rate_limited;
 pub mod mock_validator_announce;
 pub mod test_erc20;