Skip to content

Commit 55b3686

Browse files
authored
Integrate Block Aggregator (#3101)
## Linked Issues/PRs <!-- List of related issues/PRs --> Closes #3090 ## Description <!-- List of detailed changes --> ## Checklist - [ ] Breaking changes are clearly marked as such in the PR description and changelog - [ ] New behavior is reflected in tests - [ ] [The specification](https://github.com/FuelLabs/fuel-specs/) matches the implemented behavior (link update PR if changes are needed) ### Before requesting review - [ ] I have reviewed the code myself - [ ] I have created follow-up issues caused by this PR and linked them here ### After merging, notify other teams [Add or remove entries as needed] - [ ] [Rust SDK](https://github.com/FuelLabs/fuels-rs/) - [ ] [Sway compiler](https://github.com/FuelLabs/sway/) - [ ] [Platform documentation](https://github.com/FuelLabs/devrel-requests/issues/new?assignees=&labels=new+request&projects=&template=NEW-REQUEST.yml&title=%5BRequest%5D%3A+) (for out-of-organization contributors, the person merging the PR will do this) - [ ] Someone else? <!-- CURSOR_SUMMARY --> --- > [!NOTE] > <sup>[Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) is generating a summary for commit 4bb648d. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent db15acc commit 55b3686

File tree

58 files changed

+3847
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3847
-357
lines changed

.changes/added/3101.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Integrate new block aggregation RPC into Fuel Core

.changes/added/3116.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Complete coverage of proto block types to cover all cases

.changes/fixed/3112.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use Protobuf types in serialization rather than opaque bytes

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ jobs:
239239
- uses: dtolnay/rust-toolchain@master
240240
with:
241241
toolchain: ${{ env.RUST_VERSION }}
242+
- uses: arduino/setup-protoc@v3
242243
- uses: rui314/setup-mold@v1
243244
- uses: buildjet/cache@v3
244245
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ package-lock.json
1818
package.json
1919
bin/fuel-core/chainspec/local-testnet/state_transition_bytecode.wasm
2020
.DS_Store
21+
.fueldb/
2122

2223
local-testnet/

.typos.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ extend-ignore-identifiers-re = [
44
"tro",
55
"Tro",
66
"typ",
7+
"aloc",
8+
"ALOC",
79
]

Cargo.lock

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@ educe = { version = "0.6", default-features = false, features = [
8181
] }
8282
enum-iterator = "1.2"
8383
enum_dispatch = "0.3.13"
84-
# Workspace members
8584
fuel-core = { version = "0.47.1", path = "./crates/fuel-core", default-features = false }
8685
fuel-core-bin = { version = "0.47.1", path = "./bin/fuel-core" }
86+
# Workspace members
87+
fuel-core-block-aggregator-api = { version = "0.47.1", path = "crates/services/block_aggregator_api" }
8788
fuel-core-chain-config = { version = "0.47.1", path = "./crates/chain-config", default-features = false }
8889
fuel-core-client = { version = "0.47.1", path = "./crates/client" }
8990
fuel-core-compression = { version = "0.47.1", path = "./crates/compression" }

benches/benches/block_target_gas.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ fn service_with_many_contracts(
401401
Default::default(),
402402
Default::default(),
403403
Default::default(),
404+
Default::default(),
404405
),
405406
config.clone(),
406407
)

bin/e2e-test-client/tests/integration_tests.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ async fn works_in_multinode_local_env() {
7878
..Default::default()
7979
};
8080

81-
config.wallet_a.endpoint = Some(producer.node.bound_address.to_string());
82-
config.wallet_b.endpoint = Some(validator.node.bound_address.to_string());
81+
let producer_bound_addr = producer.node.bound_address.to_string();
82+
let validator_bound_addr = validator.node.bound_address.to_string();
83+
84+
config.wallet_a.endpoint = Some(producer_bound_addr.clone());
85+
config.wallet_b.endpoint = Some(validator_bound_addr);
8386

8487
// save config file
8588
let config = save_config_file(config);

0 commit comments

Comments
 (0)