diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03eb486b4..047a7c078 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ env: CARGO_TERM_COLOR: always DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64 RUSTFLAGS: "-D warnings" - FUEL_CORE_VERSION: 0.35.0 - FUEL_CORE_PATCH_BRANCH: "hal3e/unknown-variants" + FUEL_CORE_VERSION: 0.36.0 + FUEL_CORE_PATCH_BRANCH: "" RUST_VERSION: 1.79.0 FORC_VERSION: 0.63.3 FORC_PATCH_BRANCH: "" diff --git a/Cargo.toml b/Cargo.toml index bccd8d3db..cac8aa252 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,12 +85,14 @@ octocrab = { version = "0.39", default-features = false } dotenv = { version = "0.15", default-features = false } # Dependencies from the `fuel-core` repository: -fuel-core = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core", default-features = false, features = ["wasm-executor"] } -fuel-core-chain-config = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-chain-config", default-features = false } -fuel-core-client = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-client", default-features = false } # TODO: remove this @hal3e -fuel-core-poa = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-poa", default-features = false } -fuel-core-services = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-services", default-features = false } -fuel-core-types = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-types", default-features = false } +fuel-core = { version = "0.36.0", default-features = false, features = [ + "wasm-executor", +] } +fuel-core-chain-config = { version = "0.36.0", default-features = false } +fuel-core-client = { version = "0.36.0", default-features = false } +fuel-core-poa = { version = "0.36.0", default-features = false } +fuel-core-services = { version = "0.36.0", default-features = false } +fuel-core-types = { version = "0.36.0", default-features = false } # Dependencies from the `fuel-vm` repository: fuel-asm = { version = "0.57.0" } @@ -110,3 +112,13 @@ fuels-macros = { version = "0.66.4", path = "./packages/fuels-macros", default-f fuels-programs = { version = "0.66.4", path = "./packages/fuels-programs", default-features = false } fuels-test-helpers = { version = "0.66.4", path = "./packages/fuels-test-helpers", default-features = false } versions-replacer = { version = "0.66.4", path = "./scripts/versions-replacer", default-features = false } + +[patch.crates-io] +fuel-core = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core"} +fuel-core-chain-config = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-chain-config"} +fuel-core-client = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-client"} # TODO: remove this @hal3e +fuel-core-poa = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-poa"} +fuel-core-services = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-services"} +fuel-core-types = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-types"} +fuel-core-wasm-executor = { git = "https://github.com/FuelLabs/fuel-core", branch = "hal3e/unknown-variants", package = "fuel-core-wasm-executor"} + diff --git a/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs b/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs index 7bd7364bb..e78792073 100644 --- a/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs +++ b/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs @@ -1 +1 @@ -pub const SUPPORTED_FUEL_CORE_VERSION: semver::Version = semver::Version::new(0, 35, 0); +pub const SUPPORTED_FUEL_CORE_VERSION: semver::Version = semver::Version::new(0, 36, 0);