chore: resolve conflicts

Signed-off-by: Dori Medini <[email protected]>

Author: dorimedini-starkware

Cargo.lock

@@ -216,15 +216,7 @@ bincode = "1.3.3"
 bisection = "0.1.0"
 bitvec = "1.0.1"
 blake2 = "0.10.6"
-<<<<<<< HEAD
-blake2s = { path = "crates/blake2s", version = "0.0.0" }
 blockifier = { path = "crates/blockifier", version = "0.0.0" }
-||||||| fb2708ce3
-blake2s = { path = "crates/blake2s", version = "0.16.0-rc.0" }
-blockifier = { path = "crates/blockifier", version = "0.16.0-rc.0" }
-=======
-blockifier = { path = "crates/blockifier", version = "0.16.0-rc.0" }
->>>>>>> origin/main-v0.14.1
 blockifier_reexecution.path = "crates/blockifier_reexecution"
 blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.0.0" }
 byteorder = "1.4.3"
@@ -348,22 +340,14 @@ sha2 = "0.10.8"
 sha3 = "0.10.8"
 shared_execution_objects.path = "crates/shared_execution_objects"
 simple_logger = "4.0.0"
-sizeof = { path = "crates/sizeof", version = "0.16.0-rc.0" }
-sizeof_internal = { path = "crates/sizeof/sizeof_internal", version = "0.16.0-rc.0" }
-sizeof_macro = { path = "crates/sizeof/sizeof_macro", version = "0.16.0-rc.0" }
+sizeof = { path = "crates/sizeof", version = "0.0.0" }
+sizeof_internal = { path = "crates/sizeof/sizeof_internal", version = "0.0.0" }
+sizeof_macro = { path = "crates/sizeof/sizeof_macro", version = "0.0.0" }
 socket2 = "0.5.8"
 starknet-core = "0.16.0"
 starknet-crypto = "0.8.1"
-<<<<<<< HEAD
-starknet-types-core = "0.2.1"
-starknet_api = { path = "crates/starknet_api", version = "0.0.0" }
-||||||| fb2708ce3
-starknet-types-core = "0.2.1"
-starknet_api = { path = "crates/starknet_api", version = "0.16.0-rc.0" }
-=======
 starknet-types-core = "=0.2.3"
-starknet_api = { path = "crates/starknet_api", version = "0.16.0-rc.0" }
->>>>>>> origin/main-v0.14.1
+starknet_api = { path = "crates/starknet_api", version = "0.0.0" }
 starknet_committer.path = "crates/starknet_committer"
 starknet_committer_and_os_cli.path = "crates/starknet_committer_and_os_cli"
 starknet_committer_cli.path = "crates/starknet_committer_cli"

Cargo.toml

@@ -72,16 +72,10 @@ fn expect_validate_proposal(context: &mut MockTestContext, block_hash: Felt, tim
 
 fn assert_decision(res: RunHeightRes, id: Felt, round: u32) {
     match res {
-<<<<<<< HEAD
         RunHeightRes::Decision(decision) => {
-            assert_eq!(decision.block, BlockHash(id));
+            assert_eq!(decision.block, ProposalCommitment(id));
             assert_eq!(decision.precommits[0].round, round);
         }
-||||||| fb2708ce3
-        RunHeightRes::Decision(decision) => assert_eq!(decision.block, BlockHash(id)),
-=======
-        RunHeightRes::Decision(decision) => assert_eq!(decision.block, ProposalCommitment(id)),
->>>>>>> origin/main-v0.14.1
         _ => panic!("Expected decision"),
     }
 }
@@ -398,7 +392,7 @@ async fn future_height_limit_caching_and_dropping() {
     let (height2_nil_vote_trigger, height2_nil_vote_wait) = oneshot::channel();
     context
         .expect_broadcast()
-        .withf(move |vote: &Vote| vote.height == 2 && vote.block_hash.is_none())
+        .withf(move |vote: &Vote| vote.height == 2 && vote.proposal_commitment.is_none())
         .times(1)
         .return_once(move |_| {
             height2_nil_vote_trigger.send(()).unwrap();

crates/apollo_consensus/src/manager_test.rs

@@ -260,15 +260,9 @@ impl ConsensusManager {
         } else {
             QuorumType::Byzantine
         };
-<<<<<<< HEAD
         // TODO(Asmaa): refactor to pass entire consensus_manager_config instead of extracting
         // each field, and handle non-config params.
-        let run_consensus_args = apollo_consensus::RunConsensusArguments {
-||||||| fb2708ce3
-        let run_consensus_args = apollo_consensus::RunConsensusArguments {
-=======
         apollo_consensus::RunConsensusArguments {
->>>>>>> origin/main-v0.14.1
             start_active_height: active_height,
             start_observe_height: observer_height,
             validator_id: self.config.consensus_manager_config.dynamic_config.validator_id,
@@ -280,53 +274,7 @@ impl ConsensusManager {
                 .static_config
                 .sync_retry_interval,
             quorum_type,
-<<<<<<< HEAD
             future_msg_limit: self.config.consensus_manager_config.static_config.future_msg_limit,
-        };
-        let consensus_fut = apollo_consensus::run_consensus(
-            run_consensus_args,
-            context,
-            votes_broadcast_channels.into(),
-            inbound_internal_receiver,
-        );
-
-        tokio::select! {
-            consensus_result = consensus_fut => {
-                match consensus_result {
-                    Ok(_) => panic!("Consensus task finished unexpectedly"),
-                    Err(e) => Err(e),
-                }
-            },
-            network_result = network_task => {
-                panic!("Consensus' network task finished unexpectedly: {network_result:?}");
-            }
-            stream_handler_result = stream_handler_task => {
-                panic!("Consensus' stream handler task finished unexpectedly: {stream_handler_result:?}");
-            }
-||||||| fb2708ce3
-        };
-        let consensus_fut = apollo_consensus::run_consensus(
-            run_consensus_args,
-            context,
-            votes_broadcast_channels.into(),
-            inbound_internal_receiver,
-        );
-
-        tokio::select! {
-            consensus_result = consensus_fut => {
-                match consensus_result {
-                    Ok(_) => panic!("Consensus task finished unexpectedly"),
-                    Err(e) => Err(e),
-                }
-            },
-            network_result = network_task => {
-                panic!("Consensus' network task finished unexpectedly: {network_result:?}");
-            }
-            stream_handler_result = stream_handler_task => {
-                panic!("Consensus' stream handler task finished unexpectedly: {stream_handler_result:?}");
-            }
-=======
->>>>>>> origin/main-v0.14.1
         }
     }
 

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -26,13 +26,7 @@ use crate::rpc_objects::{RpcErrorCode, RpcErrorResponse};
 pub type GatewayResult<T> = Result<T, StarknetError>;
 
 #[derive(Debug, Error)]
-<<<<<<< HEAD
 #[cfg_attr(any(test, feature = "testing"), derive(PartialEq))]
-||||||| fb2708ce3
-#[cfg_attr(test, derive(PartialEq))]
-=======
-#[cfg_attr(any(feature = "testing", test), derive(PartialEq))]
->>>>>>> origin/main-v0.14.1
 pub enum StatelessTransactionValidatorError {
     #[error(
         "Calldata length exceeded maximum: length {calldata_length}

crates/apollo_gateway/src/errors.rs

@@ -190,10 +190,7 @@ impl BaseLayerContract for AnvilBaseLayer {
         self.ethereum_base_layer.latest_proved_block(finality).await
     }
 
-    async fn latest_l1_block_number(
-        &self,
-        finality: u64,
-    ) -> Result<Option<L1BlockNumber>, Self::Error> {
+    async fn latest_l1_block_number(&self, finality: u64) -> Result<L1BlockNumber, Self::Error> {
         self.ethereum_base_layer.latest_l1_block_number(finality).await
     }
 

crates/apollo_integration_tests/src/anvil_base_layer.rs

@@ -8,14 +8,6 @@ use apollo_integration_tests::utils::{
 };
 use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
-<<<<<<< HEAD
-use starknet_api::execution_resources::GasAmount;
-||||||| fb2708ce3
-use papyrus_base_layer::ethereum_base_layer_contract::L1ToL2MessageArgs;
-use starknet_api::execution_resources::GasAmount;
-=======
-use papyrus_base_layer::ethereum_base_layer_contract::L1ToL2MessageArgs;
->>>>>>> origin/main-v0.14.1
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::transaction::{L1HandlerTransaction, TransactionHash};
 

crates/apollo_integration_tests/tests/end_to_end_flow_test.rs

@@ -32,16 +32,8 @@ async fn custom_cairo1_txs() {
     end_to_end_flow(
         TestIdentifier::EndToEndFlowTestCustomSyscallInvokeTxs,
         create_custom_cairo1_txs_scenario(),
-<<<<<<< HEAD
-        GasAmount(120000000),
-        true,
-||||||| fb2708ce3
-        GasAmount(110000000),
-        true,
-=======
         BouncerWeights::default().proving_gas,
         false,
->>>>>>> origin/main-v0.14.1
         false,
     )
     .await

crates/apollo_integration_tests/tests/test_custom_cairo1_txs.rs

@@ -10,6 +10,7 @@ use mempool_test_utils::starknet_api_test_utils::{
 use starknet_api::execution_resources::GasAmount;
 use starknet_api::felt;
 use starknet_api::rpc_transaction::RpcTransaction;
+use starknet_api::transaction::fields::Tip;
 
 use crate::common::{end_to_end_flow, validate_tx_count, TestScenario};
 
@@ -80,7 +81,9 @@ fn generate_direct_test_contract_invoke_txs(
     .iter()
     .map(|(fn_name, fn_args)| {
         let calldata = create_calldata(test_contract.get_instance_address(0), fn_name, fn_args);
-        account_tx_generator.generate_rpc_invoke_tx(DEFAULT_TIP, calldata)
+        let args =
+            account_tx_generator.build_invoke_tx_args().tip(Tip(DEFAULT_TIP)).calldata(calldata);
+        account_tx_generator.generate_raw_invoke(args)
     })
     .collect()
 }
@@ -98,7 +101,6 @@ fn generate_nested_library_call_invoke_txs(
         .iter()
         .map(|(fn_name, fn_args)| {
             account_tx_generator.generate_library_call_invoke_tx(
-                DEFAULT_TIP,
                 &test_contract,
                 &test_contract,
                 fn_name,

crates/apollo_integration_tests/tests/test_custom_syscall_invoke_txs.rs

@@ -1,9 +1,5 @@
 from starkware.cairo.common.alloc import alloc
 from starkware.cairo.common.cairo_blake2s.blake2s import blake_with_opcode
-<<<<<<< HEAD
-||||||| fb2708ce3
-from starkware.cairo.common.cairo_blake2s.blake2s import BLAKE2S_FINALIZE_INSTRUCTION
-=======
 
 // Gets a felt that represent a 256-bit unsigned integer stored as an array of eight 32-bit unsigned integers
 // represented in little-endian notation. Return the felt representation of the integer modulo prime.
@@ -12,7 +8,6 @@ func felt_from_le_u32s(u32s: felt*) -> felt {
         u32s[3] * 2 ** 96 + u32s[2] * 2 ** 64 + u32s[1] * 2 ** 32 + u32s[0];
     return value;
 }
->>>>>>> origin/main-v0.14.1
 
 // Computes blake2s of `input` of size 16 felts, representing 32 bits each.
 // The initial state is the standard BLAKE2s IV XORed with the parameter block P[0] = 0x01010020.