Skip to content

Commit

Permalink
Merge branch 'master' into hal3e/dynamic-configurables
Browse files Browse the repository at this point in the history
  • Loading branch information
hal3e authored Dec 11, 2024
2 parents 82412bc + 567bf4a commit 4675e3f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ zeroize = "1.7.0"
octocrab = { version = "0.39", default-features = false }
dotenv = { version = "0.15", default-features = false }
toml = { version = "0.8", default-features = false }
async-graphql = { version = "=7.0.11", default-features = false }
async-graphql-derive = { version = "=7.0.11", default-features = false }

# Dependencies from the `fuel-core` repository:
fuel-core = { version = "0.40.1", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion packages/fuels-programs/src/calls/receipt_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl ReceiptParser {
)
}

fn extract_contract_call_data(&mut self, target_contract: ContractId) -> Option<Vec<u8>> {
pub fn extract_contract_call_data(&mut self, target_contract: ContractId) -> Option<Vec<u8>> {
// If the script contains nested calls, we need to extract the data of the top-level call
let mut nested_calls_stack = vec![];

Expand Down
16 changes: 15 additions & 1 deletion packages/fuels-test-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ repository = { workspace = true }
rust-version = { workspace = true }
description = "Fuel Rust SDK test helpers."

[package.metadata.cargo-machete]
ignored = ["async-graphql", "async-graphql-derive"]

[dependencies]
fuel-core = { workspace = true, default-features = false, features = [
"test-helpers",
Expand All @@ -30,9 +33,20 @@ rand = { workspace = true, default-features = false }
tempfile = { workspace = true, default-features = false }
tokio = { workspace = true, default-features = false }
which = { workspace = true, default-features = false }
# fuel-core uses these deps. We need to list them here so that we can pin them
# to =7.0.11 even though fuel-core can accepts 7.0.11 onwards. 7.0.12 bumped the
# MSRV and broke the sdk build for users using anything less than Rust 1.81.
#
# Until the SDK MSRV reaches 1.81 we need to freeze these packages to 7.0.11
async-graphql = { workspace = true, optional = true }
async-graphql-derive = { workspace = true, optional = true }

[features]
default = ["fuels-accounts", "std"]
std = ["fuels-accounts?/std", "fuels-core/std", "fuel-core-chain-config/std"]
fuel-core-lib = ["dep:fuel-core"]
fuel-core-lib = [
"dep:fuel-core",
"dep:async-graphql",
"dep:async-graphql-derive",
]
rocksdb = ["fuel-core?/rocksdb"]

0 comments on commit 4675e3f

Please sign in to comment.