apollo_state_sync,apollo_consensus: fix merge conflict

Author: nadin-Starkware

crates/apollo_consensus/src/manager.rs

@@ -433,16 +433,9 @@ impl<ContextT: ConsensusContext> MultiHeightManager<ContextT> {
                     self.wait_until_sync_reaches_height(height, context).await;
                     RunHeightRes::Sync
                 }
-<<<<<<< HEAD
                 e @ ConsensusError::BlockInfoConversion(_)
                 | e @ ConsensusError::InternalNetworkError(_)
                 | e @ ConsensusError::Other(_) => {
-||||||| ee7eff7e4
-                e @ ConsensusError::BlockInfoConversion(_)
-                | e @ ConsensusError::InternalNetworkError(_) => {
-=======
-                e @ ConsensusError::InternalNetworkError(_) => {
->>>>>>> origin/main-v0.14.1
                     // The node is missing required components/data and cannot continue
                     // participating in the consensus. A fix and node restart are required.
                     return Err(e);

crates/apollo_consensus/src/types.rs

@@ -154,14 +154,8 @@ pub enum ConsensusError {
     // As opposed to an error between this node and peer nodes.
     #[error("{0}")]
     InternalNetworkError(String),
-<<<<<<< HEAD
     #[error("Block info conversion error: {0}")]
     BlockInfoConversion(#[from] starknet_api::StarknetApiError),
     #[error("{0}")]
     Other(String),
-||||||| ee7eff7e4
-    #[error("Block info conversion error: {0}")]
-    BlockInfoConversion(#[from] starknet_api::StarknetApiError),
-=======
->>>>>>> origin/main-v0.14.1
 }

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -72,13 +72,7 @@ use tokio_util::task::AbortOnDropHandle;
 use tracing::{error, error_span, info, instrument, trace, warn, Instrument};
 
 use crate::build_proposal::{build_proposal, BuildProposalError, ProposalBuildArguments};
-<<<<<<< HEAD
 use crate::cende::{BlobParameters, CendeContext, InternalTransactionWithReceipt};
-||||||| ee7eff7e4
-use crate::cende::{BlobParameters, CendeContext};
-=======
-use crate::cende::{BlobParameters, CendeAmbassadorError, CendeContext};
->>>>>>> origin/main-v0.14.1
 use crate::fee_market::{calculate_next_base_gas_price, FeeMarketInfo};
 use crate::metrics::{
     record_build_proposal_failure,
@@ -692,20 +686,8 @@ impl ConsensusContext for SequencerConsensusContext {
             proposals.remove_proposals_below_or_at_height(&height);
         }
 
-<<<<<<< HEAD
-        let DecisionReachedResponse {
-            state_diff,
-            l2_gas_used,
-            central_objects,
-            block_header_commitments,
-        } = self.deps.batcher.decision_reached(DecisionReachedInput { proposal_id }).await?;
-||||||| ee7eff7e4
-        let DecisionReachedResponse { state_diff, l2_gas_used, central_objects } =
-            self.deps.batcher.decision_reached(DecisionReachedInput { proposal_id }).await?;
-=======
         let decision_reached_response =
             self.deps.batcher.decision_reached(DecisionReachedInput { proposal_id }).await?;
->>>>>>> origin/main-v0.14.1
 
 <<<<<<< HEAD
         // A hash map of (possibly failed) transactions, where the key is the transaction hash

crates/apollo_state_sync/src/lib.rs

@@ -21,14 +21,8 @@ use apollo_storage::{StorageReader, StorageTxn};
 use async_trait::async_trait;
 use futures::channel::mpsc::{channel, Sender};
 use futures::SinkExt;
-<<<<<<< HEAD
 use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::block_hash::block_hash_calculator::BlockHeaderCommitments;
-||||||| ee7eff7e4
-use starknet_api::block::{BlockHash, BlockNumber};
-=======
-use starknet_api::block::{BlockHash, BlockHeader, BlockNumber};
->>>>>>> origin/main-v0.14.1
 use starknet_api::core::{ClassHash, ContractAddress, Nonce, BLOCK_HASH_TABLE_ADDRESS};
 use starknet_api::state::{StateNumber, StorageKey};
 use starknet_api::transaction::{Transaction, TransactionHash};

echonet/constants.py

@@ -17,15 +17,12 @@
 
 # Value to use as the end block number if none is given, large enough to not stop in the middle.
 MAX_BLOCK_NUMBER: int = 1 << 200
-<<<<<<< HEAD
 
 # Revert error patterns to ignore when extracting revert mappings.
 IGNORED_REVERT_PATTERNS = [
     "attestation is out of window",
     "attestation with wrong block hash",
 ]
-||||||| ee7eff7e4
-=======
 
 # ---------------------------------------------------------------------------
 # Echonet config file locations / names
@@ -38,4 +35,3 @@
 # Env overrides for paths (define once).
 ECHONET_ENV_KEYS_PATH = "ECHONET_KEYS_PATH"
 ECHONET_ENV_SECRETS_PATH = "ECHONET_SECRETS_PATH"
->>>>>>> origin/main-v0.14.1

echonet/deploy_echonet.py

@@ -15,31 +15,16 @@
 from __future__ import annotations
 
 import argparse
-<<<<<<< HEAD
-||||||| ee7eff7e4
-import json
-import subprocess
-from pathlib import Path
-
-=======
-import subprocess
-from pathlib import Path
-
->>>>>>> origin/main-v0.14.1
 import base64
 import json
 import logging
 import shlex
 import shutil
 import subprocess
 import tarfile
-<<<<<<< HEAD
 from pathlib import Path
-||||||| ee7eff7e4
-=======
 from constants import ECHONET_KEYS_FILENAME
 from helpers import read_json_object
->>>>>>> origin/main-v0.14.1
 
 logger = logging.getLogger("deploy_echonet")