Skip to content

Commit

Permalink
Merge branch 'master' into ns/fix/ts-api-docs-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
arboleya authored Feb 6, 2025
2 parents 9e617f8 + bb1df4e commit 2a8e35f
Show file tree
Hide file tree
Showing 37 changed files with 86 additions and 498 deletions.
10 changes: 10 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@
[submodule "docs/sway-standards"]
path = docs/sway-standards
url = https://github.com/FuelLabs/sway-standards
# TODO: Remove this and nightly after master syncs up with the lastest released version
branch = docs/fix-16-examples
[submodule "docs/nightly/sway-standards"]
path = docs/nightly/sway-standards
# TODO: Remove this and nightly after master syncs up with the lastest released version
branch = docs/fix-16-examples
url = https://github.com/FuelLabs/sway-standards
[submodule "docs/chain-configuration"]
path = docs/chain-configuration
Expand Down Expand Up @@ -109,3 +113,9 @@
[submodule "docs/nightly/fuel-token-overview"]
path = docs/nightly/fuel-token-overview
url = https://github.com/FuelLabs/fuel-token-overview.git
[submodule "docs/node-operator"]
path = docs/node-operator
url = https://github.com/FuelLabs/node-operator
[submodule "docs/nightly/node-operator"]
path = docs/nightly/node-operator
url = https://github.com/FuelLabs/node-operator.git
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"**/migrations-and-disclosures": true,
"**/fuel-book": true,
"**/verified-addresses": true,
"**/fuel-token-overview": true
"**/fuel-token-overview": true,
"**/node-operator": true
},
"git.ignoreLimitWarning": true,
"[typescriptreact]": {
Expand Down
4 changes: 4 additions & 0 deletions contentlayer.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const includeDirs = [
'docs/verified-addresses/docs/src',
'docs/fuel-token-overview/docs/src',
'docs/integration-docs/docs/src',
'docs/node-operator/docs/src',
// NIGHTLY DOCS
'docs/nightly/sway/docs/book/src',
'docs/nightly/fuels-rs/docs/src',
Expand All @@ -84,6 +85,7 @@ const includeDirs = [
'docs/nightly/verified-addresses/docs/src',
'docs/nightly/fuel-token-overview/docs/src',
'docs/nightly/integration-docs/docs/src',
'docs/nightly/node-operator/docs/src',
];

const excludeDirs = [
Expand All @@ -103,6 +105,7 @@ const excludeDirs = [
'docs/verified-addresses/docs/src/SUMMARY.md',
'docs/fuel-token-overview/docs/src/SUMMARY.md',
'docs/integration-docs/docs/src/SUMMARY.md',
'docs/node-operator/docs/src/SUMMARY.md',
// NIGHTLY DOCS
'docs/nightly/sway/docs/book/src/SUMMARY.md',
'docs/nightly/fuels-rs/docs/src/SUMMARY.md',
Expand All @@ -115,6 +118,7 @@ const excludeDirs = [
'docs/nightly/verified-addresses/docs/src/SUMMARY.md',
'docs/nightly/fuel-token-overview/docs/src/SUMMARY.md',
'docs/nightly/integration-docs/docs/src/SUMMARY.md',
'docs/nightly/node-operator/docs/src/SUMMARY.md',
];

export default makeSource({
Expand Down
2 changes: 1 addition & 1 deletion docs/builds/sway
Submodule sway updated 2145 files
2 changes: 1 addition & 1 deletion docs/fuels-rs
Submodule fuels-rs updated 84 files
+3 −3 .github/workflows/ci.yml
+28 −25 Cargo.toml
+1 −0 docs/src/SUMMARY.md
+2 −2 docs/src/connecting/short-lived.md
+1 −1 docs/src/custom-transactions/transaction-builders.md
+24 −0 docs/src/debugging/decoding-script-transactions.md
+2 −2 e2e/Forc.toml
+15 −2 e2e/sway/contracts/asserts/src/main.sw
+1 −1 e2e/sway/contracts/revert_logs/Forc.toml
+28 −0 e2e/sway/contracts/revert_logs/src/main.sw
+11 −0 e2e/sway/scripts/script_asserts/src/main.sw
+1 −1 e2e/sway/scripts/script_revert_logs/Forc.toml
+21 −0 e2e/sway/scripts/script_revert_logs/src/main.sw
+11 −6 e2e/sway/scripts/script_struct/src/main.sw
+8 −0 e2e/sway/types/contracts/nested_structs/src/main.sw
+1 −1 e2e/sway/types/contracts/vectors/src/main.sw
+1 −1 e2e/sway/types/scripts/script_vectors/src/main.sw
+56 −41 e2e/tests/contracts.rs
+500 −0 e2e/tests/debug_utils.rs
+203 −62 e2e/tests/logs.rs
+20 −11 e2e/tests/predicates.rs
+65 −17 e2e/tests/providers.rs
+3 −0 e2e/tests/scripts.rs
+7 −9 e2e/tests/types_predicates.rs
+21 −7 e2e/tests/wallets.rs
+75 −3 examples/contracts/src/lib.rs
+10 −7 examples/cookbook/src/lib.rs
+4 −4 examples/debugging/src/lib.rs
+2 −1 examples/providers/src/lib.rs
+6 −4 examples/wallets/src/lib.rs
+2 −0 packages/fuels-accounts/Cargo.toml
+42 −39 packages/fuels-accounts/src/account.rs
+3 −6 packages/fuels-accounts/src/accounts_utils.rs
+11 −11 packages/fuels-accounts/src/impersonated_account.rs
+4 −4 packages/fuels-accounts/src/predicate.rs
+261 −141 packages/fuels-accounts/src/provider.rs
+277 −0 packages/fuels-accounts/src/provider/cache.rs
+15 −4 packages/fuels-accounts/src/provider/retryable_client.rs
+1 −1 packages/fuels-accounts/src/provider/supported_fuel_core_version.rs
+38 −1 packages/fuels-accounts/src/schema/schema.sdl
+27 −13 packages/fuels-accounts/src/wallet.rs
+1 −0 packages/fuels-code-gen/src/program_bindings/custom_types.rs
+5 −0 packages/fuels-code-gen/src/program_bindings/generated_code.rs
+14 −6 packages/fuels-core/src/codec.rs
+66 −41 packages/fuels-core/src/codec/abi_decoder.rs
+103 −265 packages/fuels-core/src/codec/abi_decoder/bounded_decoder.rs
+24 −18 packages/fuels-core/src/codec/abi_decoder/decode_as_debug_str.rs
+133 −0 packages/fuels-core/src/codec/abi_formatter.rs
+2 −2 packages/fuels-core/src/codec/logs.rs
+8 −8 packages/fuels-core/src/types/dry_runner.rs
+181 −29 packages/fuels-core/src/types/transaction_builders.rs
+15 −3 packages/fuels-core/src/types/transaction_builders/blob.rs
+22 −15 packages/fuels-core/src/types/transaction_builders/script_tx_estimator.rs
+15 −2 packages/fuels-core/src/types/tx_status.rs
+25 −19 packages/fuels-core/src/types/wrappers/coin_type.rs
+38 −75 packages/fuels-core/src/types/wrappers/transaction.rs
+9 −10 packages/fuels-core/src/types/wrappers/transaction_response.rs
+1 −0 packages/fuels-programs/Cargo.toml
+3 −0 packages/fuels-programs/src/assembly.rs
+329 −0 packages/fuels-programs/src/assembly/contract_call.rs
+50 −0 packages/fuels-programs/src/assembly/cursor.rs
+301 −0 packages/fuels-programs/src/assembly/script_and_predicate_loader.rs
+7 −3 packages/fuels-programs/src/calls/call_handler.rs
+19 −1 packages/fuels-programs/src/calls/contract_call.rs
+3 −3 packages/fuels-programs/src/calls/receipt_parser.rs
+67 −200 packages/fuels-programs/src/calls/utils.rs
+4 −0 packages/fuels-programs/src/contract.rs
+8 −78 packages/fuels-programs/src/contract/loader.rs
+1 −0 packages/fuels-programs/src/contract/regular.rs
+456 −0 packages/fuels-programs/src/debug.rs
+13 −197 packages/fuels-programs/src/executable.rs
+9 −0 packages/fuels-programs/src/lib.rs
+19 −0 packages/fuels-programs/src/utils.rs
+3 −1 packages/fuels-test-helpers/Cargo.toml
+7 −2 packages/fuels-test-helpers/src/accounts.rs
+2 −2 packages/fuels-test-helpers/src/lib.rs
+1 −3 packages/fuels-test-helpers/src/node_types.rs
+10 −5 packages/fuels-test-helpers/src/service.rs
+3 −3 packages/fuels/Cargo.toml
+0 −1 packages/fuels/src/lib.rs
+1 −1 scripts/fuel-core-version/Cargo.toml
+27 −8 scripts/fuel-core-version/src/main.rs
+1 −0 wasm-tests/Cargo.toml
+237 −1 wasm-tests/src/lib.rs
2 changes: 1 addition & 1 deletion docs/fuels-ts
Submodule fuels-ts updated 304 files
2 changes: 1 addition & 1 deletion docs/fuels-wallet
Submodule fuels-wallet updated 153 files
8 changes: 0 additions & 8 deletions docs/guides/docs/guides.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@
"React"
]
},
"running_a_node": {
"title": "Running a Node",
"description": "Run a local Fuel node.",
"featured": false,
"tags": [
"fuel-core"
]
},
"installation": {
"title": "Toolchain Installation",
"description": "Install the Fuel toolchain and binaries.",
Expand Down
5 changes: 0 additions & 5 deletions docs/guides/docs/nav.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"menu": [
"Installation",
"Running a Node",
"Counter Dapp",
"Contract Quickstart",
"Frontend Quickstart",
Expand All @@ -18,10 +17,6 @@
],
"contract-quickstart": [],
"frontend-quickstart": [],
"running_a_node": [
"Running a Local Node",
"Running a Testnet Node"
],
"intro_to_sway": [
"Introduction to Sway",
"Prerequisites",
Expand Down
52 changes: 0 additions & 52 deletions docs/guides/docs/running-a-node/index.mdx

This file was deleted.

102 changes: 0 additions & 102 deletions docs/guides/docs/running-a-node/running-a-local-node.mdx

This file was deleted.

Loading

0 comments on commit 2a8e35f

Please sign in to comment.