Revert "Merge pull request #996 from lambdaclass/gas-oracle"

This reverts commit 2a9b9bd, reversing changes made to 20574f7.
matter-labs · Apr 11, 2024 · 08d67f5 · 08d67f5
1 parent 67ef103
commit 08d67f5
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 391 deletions.
diff --git a/core/bin/zksync_server/src/main.rs b/core/bin/zksync_server/src/main.rs
@@ -5,7 +5,6 @@ use clap::Parser;
 use zksync_config::{
     configs::{
         api::{HealthCheckConfig, MerkleTreeApiConfig, Web3JsonRpcConfig},
-        base_token_fetcher::BaseTokenFetcherConfig,
         chain::{
             CircuitBreakerConfig, MempoolConfig, NetworkConfig, OperationsManagerConfig,
             StateKeeperConfig,
@@ -274,6 +273,5 @@ fn load_env_config() -> anyhow::Result<TempConfigStore> {
         object_store_config: ObjectStoreConfig::from_env().ok(),
         observability: ObservabilityConfig::from_env().ok(),
         snapshot_creator: SnapshotsCreatorConfig::from_env().ok(),
-        base_token_fetcher: BaseTokenFetcherConfig::from_env().ok(),
     })
 }
diff --git a/core/lib/config/src/configs/base_token_fetcher.rs b/core/lib/config/src/configs/base_token_fetcher.rs
diff --git a/core/lib/config/src/configs/general.rs b/core/lib/config/src/configs/general.rs
@@ -1,4 +1,3 @@
-use super::BaseTokenFetcherConfig;
 use crate::{
     configs::{
         chain::{CircuitBreakerConfig, MempoolConfig, OperationsManagerConfig, StateKeeperConfig},
@@ -33,5 +32,4 @@ pub struct GeneralConfig {
     pub eth: Option<ETHConfig>,
     pub snapshot_creator: Option<SnapshotsCreatorConfig>,
     pub observability: Option<ObservabilityConfig>,
-    pub base_token_fetcher: Option<BaseTokenFetcherConfig>,
 }
diff --git a/core/lib/config/src/configs/mod.rs b/core/lib/config/src/configs/mod.rs
@@ -1,7 +1,6 @@
 // Public re-exports
 pub use self::{
     api::ApiConfig,
-    base_token_fetcher::BaseTokenFetcherConfig,
     contract_verifier::ContractVerifierConfig,
     contracts::ContractsConfig,
     database::{DBConfig, PostgresConfig},
@@ -23,7 +22,6 @@ pub use self::{
 };
 
 pub mod api;
-pub mod base_token_fetcher;
 pub mod chain;
 pub mod contract_verifier;
 pub mod contracts;

diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
@@ -2309,7 +2309,7 @@ impl BlocksDal<'_, '_> {
                 )
             WHERE
                 l1_batch_number IS NULL
-                AND fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
+                AND fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
             "#
         )
         .execute(self.storage.conn())
@@ -2349,7 +2349,7 @@ impl BlocksDal<'_, '_> {
             WHERE
                 l1_batches.number = miniblocks.l1_batch_number
                 AND miniblocks.number BETWEEN $1 AND $2
-                AND miniblocks.fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
+                AND miniblocks.fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
             "#,
             i64::from(numbers.start().0),
             i64::from(numbers.end().0)

diff --git a/core/lib/env_config/src/base_token_fetcher.rs b/core/lib/env_config/src/base_token_fetcher.rs
diff --git a/core/lib/env_config/src/lib.rs b/core/lib/env_config/src/lib.rs
@@ -2,7 +2,6 @@ use anyhow::Context as _;
 use serde::de::DeserializeOwned;
 
 mod api;
-pub mod base_token_fetcher;
 mod chain;
 mod contract_verifier;
 mod contracts;

diff --git a/core/lib/protobuf_config/src/base_token_fetcher.rs b/core/lib/protobuf_config/src/base_token_fetcher.rs
diff --git a/core/lib/protobuf_config/src/general.rs b/core/lib/protobuf_config/src/general.rs
@@ -37,8 +37,6 @@ impl ProtoRepr for proto::GeneralConfig {
             snapshot_creator: read_optional_repr(&self.snapshot_creator)
                 .context("snapshot_creator")?,
             observability: read_optional_repr(&self.observability).context("observability")?,
-            base_token_fetcher: read_optional_repr(&self.base_token_fetcher)
-                .context("base_token_fetcher")?,
         })
     }
 
@@ -70,7 +68,6 @@ impl ProtoRepr for proto::GeneralConfig {
             eth: this.eth.as_ref().map(ProtoRepr::build),
             snapshot_creator: this.snapshot_creator.as_ref().map(ProtoRepr::build),
             observability: this.observability.as_ref().map(ProtoRepr::build),
-            base_token_fetcher: this.base_token_fetcher.as_ref().map(ProtoRepr::build),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/lib.rs b/core/lib/protobuf_config/src/lib.rs
@@ -5,7 +5,6 @@
 //! * protobuf json format
 
 mod api;
-mod base_token_fetcher;
 mod chain;
 mod circuit_breaker;
 mod contract_verifier;

diff --git a/core/lib/protobuf_config/src/proto/base_token_fetcher.proto b/core/lib/protobuf_config/src/proto/base_token_fetcher.proto
diff --git a/core/lib/protobuf_config/src/proto/general.proto b/core/lib/protobuf_config/src/proto/general.proto
@@ -13,8 +13,6 @@ import "zksync/config/house_keeper.proto";
 import "zksync/config/observability.proto";
 import "zksync/config/snapshots_creator.proto";
 import "zksync/config/utils.proto";
-import "zksync/config/utils.proto";
-import "zksync/config/base_token_fetcher.proto";
 
 message GeneralConfig {
   optional config.database.Postgres postgres = 1;
@@ -37,5 +35,6 @@ message GeneralConfig {
   optional config.prover.ProverGateway prover_gateway = 30;
   optional config.snapshot_creator.SnapshotsCreator snapshot_creator = 31;
   optional config.observability.Observability observability = 32;
-  optional config.base_token_fetcher.BaseTokenFetcher base_token_fetcher = 33;
+
 }
+
diff --git a/core/lib/zksync_core/src/base_token_fetcher/mod.rs b/core/lib/zksync_core/src/base_token_fetcher/mod.rs
diff --git a/core/lib/zksync_core/src/dev_api_conversion_rate/mod.rs b/core/lib/zksync_core/src/dev_api_conversion_rate/mod.rs