diff --git a/Cargo.lock b/Cargo.lock index 59400b77..7fdc73ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3109,9 +3109,9 @@ dependencies = [ [[package]] name = "fuel-core" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7acb38ece08548cd074ea78132912550e5fd20d08561f11c1c2ccf78df8f24" +checksum = "5d10d43f0760e4e890aee00dbf577cc9badd79456110f2d86f0a83b47c663e2d" dependencies = [ "anyhow", "async-graphql", @@ -3138,7 +3138,7 @@ dependencies = [ "fuel-core-storage", "fuel-core-sync", "fuel-core-txpool", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-core-upgradable-executor", "futures", "hex", @@ -3168,9 +3168,9 @@ dependencies = [ [[package]] name = "fuel-core-bin" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d209de1b69012323a733482a28cf95bfc017a7ecd80e27e3e2837f5141dcc567" +checksum = "b82390da0bbadd8b0d369ede63447a9602c9b669abda9ed2501c7159a5396e13" dependencies = [ "anyhow", "clap 4.5.27", @@ -3180,7 +3180,7 @@ dependencies = [ "fuel-core-chain-config", "fuel-core-compression", "fuel-core-metrics", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "hex", "humantime", "pyroscope", @@ -3195,15 +3195,15 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b18487bdc6f941eed36d8b1ad6b2980790450b5af90bc8ec54133b41e7d8989" +checksum = "a0caac1f2bc8812e9ecf4d45782d4ccfc83e358e8c2e288e060e14b0aff22a6f" dependencies = [ "anyhow", "bech32", "derivative", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "itertools 0.12.1", "postcard", "rand", @@ -3215,16 +3215,16 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbe9d7b473c675fcedc563e770f7a6b4bef5a0ec2ce2604ca5a96e3e4fc6e65" +checksum = "6e57aae73b33a9c9b51edd3b05e31720cece8dcaf016fd14affd2d6322275651" dependencies = [ "anyhow", "base64 0.22.1", "cynic", "derive_more 0.99.18", "eventsource-client", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "futures", "hex", "hyper-rustls 0.24.2", @@ -3240,12 +3240,12 @@ dependencies = [ [[package]] name = "fuel-core-compression" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e65d86a7dc70fc98de2b63b14e6340f126ec3dc828eec2eab327c9a315786" +checksum = "ae09638c5d5ae494c052e0df9367d957eed391adb865b80fae19ed135685e341" dependencies = [ "anyhow", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "paste", "rand", "serde", @@ -3255,38 +3255,38 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4661732e88b44c8bf1546b34cbe6089ec7c3af66cf0638c50ce8e14d5a19bbd" +checksum = "9cbcc6d8ce00e4998703d0c8b54681bdf0eeeae22cdd8e5b2395f04305e973dd" dependencies = [ "anyhow", "fuel-core-chain-config", "fuel-core-poa", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", ] [[package]] name = "fuel-core-database" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab143ca4facf47c2419a7cc5f29257a21ad8ae7a05b9122da32c0eb0ff76e99" +checksum = "4b819280eeda06ef4585a789262a5d8abb60fa7972daed9d2ead76077894c291" dependencies = [ "anyhow", "derive_more 0.99.18", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", ] [[package]] name = "fuel-core-executor" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b8ba80ebb07ef8403d199ce0bd52ef9303ec104cd39c3e29a79b0c86fbf245" +checksum = "f5cac2302d5ebb43aa8d0bf72834fddb8f0078206ec77707816795ec4fd3d34b" dependencies = [ "anyhow", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "hex", "parking_lot", "serde", @@ -3295,16 +3295,16 @@ dependencies = [ [[package]] name = "fuel-core-gas-price-service" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69876a49ae61dbcae3ce587e01c53d001fc75fb1f4509c99cd1679b5855c105" +checksum = "7bdf400da04adbad91382a3dd6159c7eb802711d4a6770bbc845250a3b86ca1a" dependencies = [ "anyhow", "async-trait", "enum-iterator", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-gas-price-algorithm", "futures", "num_enum", @@ -3321,15 +3321,15 @@ dependencies = [ [[package]] name = "fuel-core-importer" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08f974de990923ab32e91b1a9144c8117a09b12c7494e0930ac2612652c35bf" +checksum = "44c3513c293fddd7b816018d86bb47c69342294654501ab3535e423d2da92427" dependencies = [ "anyhow", "derive_more 0.99.18", "fuel-core-metrics", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "parking_lot", "rayon", "tokio", @@ -3354,9 +3354,9 @@ dependencies = [ [[package]] name = "fuel-core-p2p" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e679cce64782359dfb47d906ff9156611a2039b312b9873d50e0858dddd03e6" +checksum = "7fc006c114a6fe11dac4f353cea412ccd38f951ccfede06782930276c41c2371" dependencies = [ "anyhow", "async-trait", @@ -3364,7 +3364,7 @@ dependencies = [ "fuel-core-metrics", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "futures", "hex", "hickory-resolver", @@ -3388,16 +3388,16 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8258a8ecda4af55c385101965d0588f6e2f902bd8bd42a354f2e74b6d8c0c4" +checksum = "07c5fed1aaa5952121595829bf90236a6372ac3d7d5005362717d007006b9b09" dependencies = [ "anyhow", "async-trait", "fuel-core-chain-config", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "serde", "serde_json", "tokio", @@ -3407,15 +3407,15 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad997b11b36193fa753cc6e84a59aba9f7d36852d42545d7fa4480b88869b66" +checksum = "84d14cc9b43ce07be472ef2af360cc0eaf0d64475b510efd29b8bd5b4486e83f" dependencies = [ "anyhow", "async-trait", "derive_more 0.99.18", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "tokio", "tokio-rayon", "tracing", @@ -3423,9 +3423,9 @@ dependencies = [ [[package]] name = "fuel-core-relayer" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2f0e2b8fcb2c5371a3b885efa834efa58e01e228225ec61ec66674bb95f191" +checksum = "0440f68bf2e136f4b732bade8c415f363728353b1f2ba8dd966102be4d4dc41d" dependencies = [ "anyhow", "async-trait", @@ -3436,7 +3436,7 @@ dependencies = [ "ethers-providers", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "futures", "once_cell", "strum 0.25.0", @@ -3448,9 +3448,9 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da1932f16553adfe222a5bb68ae09b1b6faafb66ed835b2b9b452b5da89a825" +checksum = "d947cc7a032eb386f88920b7b1ae0a63cfa0fc9cdbc7824e0b6c72aa1777dab9" dependencies = [ "anyhow", "async-trait", @@ -3465,9 +3465,9 @@ dependencies = [ [[package]] name = "fuel-core-shared-sequencer" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be25a3d4e0fbfe0bcf4acc232eedc0d568c37d910df5d720b54c74c3d947ac3" +checksum = "85a8768524eda07c712a6c8f98bc617523670c9ef67267287aa69a6faab876ee" dependencies = [ "anyhow", "async-trait", @@ -3475,7 +3475,7 @@ dependencies = [ "cosmos-sdk-proto", "cosmrs", "fuel-core-services", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-sequencer-proto", "futures", "postcard", @@ -3490,14 +3490,14 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbace6f87011eab167e15963533e10d248ad86ba695806ad7f57dd600eb04da5" +checksum = "346d3e757e8357d5372e09f7554ec1ae0daeeaf68540aee82e87ec1b896dc3fe" dependencies = [ "anyhow", "derive_more 0.99.18", "enum-iterator", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-vm 0.58.2", "impl-tools", "itertools 0.12.1", @@ -3514,14 +3514,14 @@ dependencies = [ [[package]] name = "fuel-core-sync" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f39be4a31ade5dd5a7920d9b9df82a94752f35caf099b515c586b77a66354a" +checksum = "f3454598afee53b1ba7a3a276eadcbda1f2a78aabd57c9ad054a855b92b01d41" dependencies = [ "anyhow", "async-trait", "fuel-core-services", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "futures", "rand", "tokio", @@ -3531,16 +3531,16 @@ dependencies = [ [[package]] name = "fuel-core-txpool" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fd60237a2df2307f683c2e11818e9e1d11977d25babe97563e3cd210ecd84c" +checksum = "900fcf25afd4fc963f9105e52ee3312c491982473316330e524206a30289bbc2" dependencies = [ "anyhow", "async-trait", "derive_more 0.99.18", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "futures", "num-rational", "parking_lot", @@ -3568,9 +3568,9 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1af4d93280d630121ea025aa3797862ede4186cbce043929ac46ea86e1f55f1" +checksum = "96ecd468edca9520a0a6958c5e7a40fd6b0c877e26771e3a9ed1a3f138f4bcce" dependencies = [ "anyhow", "bs58", @@ -3587,15 +3587,15 @@ dependencies = [ [[package]] name = "fuel-core-upgradable-executor" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc490456ccdcd4ee1fe4e107a6617e76e590dea253d714cc8e3089c7f570b27" +checksum = "f4d9e64a4d441f24d586c29ae9ef8a0ef582cb727f3218543e9f4860f964ae25" dependencies = [ "anyhow", "derive_more 0.99.18", "fuel-core-executor", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-core-wasm-executor", "parking_lot", "postcard", @@ -3605,15 +3605,15 @@ dependencies = [ [[package]] name = "fuel-core-wasm-executor" -version = "0.40.4" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8909b6c84a0c97f99841306930f7d1941e65bf4bbe8348ac56400853622c400c" +checksum = "5af3e511b49df9ebe59e42b4fc0c189893cb98e3f481aba657f851ce73814414" dependencies = [ "anyhow", "fuel-core-executor", "fuel-core-storage", "fuel-core-types 0.35.0", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "postcard", "serde", "serde_json", @@ -3831,7 +3831,7 @@ version = "0.0.24" dependencies = [ "async-trait", "fuel-core", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-streams-store", "fuel-streams-subject", "fuel-streams-types", @@ -3898,7 +3898,7 @@ dependencies = [ "anyhow", "fuel-core", "fuel-core-client", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-message-broker", "fuel-streams-core", "fuel-streams-domains", @@ -3927,7 +3927,7 @@ dependencies = [ "fuel-core-importer", "fuel-core-services", "fuel-core-storage", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-tx 0.58.2", "fuel-vm 0.58.2", "hex", @@ -9255,7 +9255,7 @@ dependencies = [ "clap 4.5.27", "fuel-core", "fuel-core-bin", - "fuel-core-types 0.40.4", + "fuel-core-types 0.40.3", "fuel-message-broker", "fuel-streams-core", "fuel-streams-domains", diff --git a/Cargo.toml b/Cargo.toml index 2127571f..dbcc2f16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,25 +74,26 @@ tracing-subscriber = { version = "0.3", features = [ ] } # Fuel Core dependencies -fuel-core = { version = "=0.40.4", default-features = false, features = [ +fuel-core = { version = "=0.40.3", default-features = false, features = [ + "p2p", "relayer", "rocksdb", ] } -fuel-core-bin = { version = "=0.40.4", default-features = false, features = [ +fuel-core-bin = { version = "=0.40.3", default-features = false, features = [ "p2p", "relayer", "rocksdb", ] } -fuel-core-client = { version = "=0.40.4", default-features = false, features = [ +fuel-core-client = { version = "=0.40.3", default-features = false, features = [ "std", ] } -fuel-core-importer = { version = "=0.40.4" } -fuel-core-poa = { version = "=0.40.4", default-features = false } -fuel-core-services = { version = "=0.40.4", default-features = false } -fuel-core-storage = { version = "=0.40.4" } -fuel-core-txpool = { version = "=0.40.4" } -fuel-core-types = { version = "=0.40.4", default-features = false, features = [ +fuel-core-importer = { version = "=0.40.3" } +fuel-core-poa = { version = "=0.40.3", default-features = false } +fuel-core-services = { version = "=0.40.3", default-features = false } +fuel-core-storage = { version = "=0.40.3" } +fuel-core-txpool = { version = "=0.40.3" } +fuel-core-types = { version = "=0.40.3", default-features = false, features = [ "serde", "std", ] } diff --git a/cluster/charts/fuel-streams/values.yaml b/cluster/charts/fuel-streams/values.yaml index a27409d1..ca471b8a 100755 --- a/cluster/charts/fuel-streams/values.yaml +++ b/cluster/charts/fuel-streams/values.yaml @@ -269,7 +269,7 @@ webserver: service: enabled: true port: 8080 - type: LoadBalancer + type: ClusterIP host: "stream-staging.fuel.network" loadBalancerClass: service.k8s.aws/nlb config: diff --git a/crates/types/src/fuel_core.rs b/crates/types/src/fuel_core.rs index 7a644c69..21862945 100644 --- a/crates/types/src/fuel_core.rs +++ b/crates/types/src/fuel_core.rs @@ -1,12 +1,23 @@ -use fuel_core::state::{ - generic_database::GenericDatabase, - iterable_key_value_view::IterableKeyValueViewWrapper, +use std::sync::Arc; + +use fuel_core::{ + combined_database::CombinedDatabase, + database::{database_description::on_chain::OnChain, Database}, + fuel_core_graphql_api::ports::DatabaseBlocks, }; +use fuel_core_bin::FuelService; pub use fuel_core_client::client::{ schema::Tai64Timestamp as FuelCoreTai64Timestamp, types::TransactionStatus as FuelCoreClientTransactionStatus, }; +use fuel_core_importer::ports::ImporterDatabase; pub use fuel_core_importer::ImporterResult as FuelCoreImporterResult; +use fuel_core_storage::{ + tables::Transactions, + transactional::AtomicView, + StorageAsRef, +}; +use fuel_core_types::blockchain::consensus::{Consensus, Sealed}; pub use fuel_core_types::{ blockchain::{ block::Block as FuelCoreBlock, @@ -59,29 +70,6 @@ pub use fuel_core_types::{ }, tai64::Tai64 as FuelCoreTai64, }; - -pub type FuelCoreOffchainDatabase = GenericDatabase< - IterableKeyValueViewWrapper< - fuel_core::fuel_core_graphql_api::storage::Column, - >, - FuelCoreBlockHeight, ->; - -use std::sync::Arc; - -use fuel_core::{ - combined_database::CombinedDatabase, - database::{database_description::on_chain::OnChain, Database}, - fuel_core_graphql_api::ports::DatabaseBlocks, -}; -use fuel_core_bin::FuelService; -use fuel_core_importer::ports::ImporterDatabase; -use fuel_core_storage::{ - tables::Transactions, - transactional::AtomicView, - StorageAsRef, -}; -use fuel_core_types::blockchain::consensus::{Consensus, Sealed}; use tokio::sync::broadcast::Receiver; #[derive(thiserror::Error, Debug)] @@ -125,17 +113,6 @@ pub trait FuelCoreLike: Sync + Send { self.database().on_chain() } - fn offchain_database( - &self, - ) -> FuelCoreResult> { - let database = self - .database() - .off_chain() - .latest_view() - .map_err(|e| FuelCoreError::Database(e.to_string()))?; - Ok(Arc::new(database)) - } - fn blocks_subscription( &self, ) -> Receiver; @@ -329,7 +306,12 @@ impl FuelCoreLike for FuelCore { &self, tx_id: &FuelCoreBytes32, ) -> FuelCoreResult> { - self.offchain_database()? + let offchain_database = self + .database() + .off_chain() + .latest_view() + .map_err(|e| FuelCoreError::Database(e.to_string()))?; + offchain_database .get_tx_status(tx_id) .map_err(|e| FuelCoreError::Database(e.to_string())) } diff --git a/crates/types/src/primitives/tx_kind.rs b/crates/types/src/primitives/tx_kind.rs index f05624dc..8c23265b 100644 --- a/crates/types/src/primitives/tx_kind.rs +++ b/crates/types/src/primitives/tx_kind.rs @@ -141,6 +141,7 @@ impl From<&FuelCoreTransaction> for TransactionKind { #[cfg(test)] mod tests { + use pretty_assertions::assert_eq; use serde_json::json; use super::*; diff --git a/crates/types/src/primitives/tx_status.rs b/crates/types/src/primitives/tx_status.rs index 05ea3ae8..d21f5aaa 100644 --- a/crates/types/src/primitives/tx_status.rs +++ b/crates/types/src/primitives/tx_status.rs @@ -174,6 +174,8 @@ impl From for TransactionStatus { #[cfg(test)] mod tests { + use pretty_assertions::assert_eq; + use super::*; #[derive(Deserialize, Debug)]