Skip to content

Add support for ConsensusParametersVersion::V2 #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 17, 2024
Merged

Add support for ConsensusParametersVersion::V2 #2188

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fa1288b
Add support for `ConsensusParametersVersion::V2`
Sep 11, 2024
0c65bbe
Update `CHANGELOG.md`
Sep 11, 2024
25432d2
Remove the temporary comment
Sep 12, 2024
0a0b6c2
Fix imports in tests
Sep 12, 2024
3068d2f
`#[allow(clippy::large_enum_variant)]` for `enum FakeProducedBlock` a…
Sep 12, 2024
0656491
Update expected GraphQL schema
Sep 12, 2024
a1ea188
Update `state_transition_bytecode.wasm`
Sep 12, 2024
7c14352
Merge remote-tracking branch 'upstream/master' into 2133_block_size_c…
Sep 13, 2024
b7d8da6
Merge branch 'feature/wasm-interface-breaking-changes' into 2133_bloc…
Sep 16, 2024
c85879b
Update patch for `fuel-vm` to `master` branch
Sep 16, 2024
ae183ae
Use new `fuel-vm 0.57.0`
xgreenx Sep 17, 2024
8c661dd
Updated CHANGELOG.md
xgreenx Sep 17, 2024
dba42fc
Merge branch 'refs/heads/feature/wasm-interface-breaking-changes' int…
xgreenx Sep 17, 2024
8368451
Resolve conflict
xgreenx Sep 17, 2024
975cc74
Make test happy
xgreenx Sep 17, 2024
879b566
Merge branch 'feature/wasm-interface-breaking-changes' into 2133_bloc…
Dentosal Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
- [2135](https://github.com/FuelLabs/fuel-core/pull/2135): Added metrics logging for number of blocks served over the p2p req/res protocol.
- [2151](https://github.com/FuelLabs/fuel-core/pull/2151): Added limitations on gas used during dry_run in API.
- [2188](https://github.com/FuelLabs/fuel-core/pull/2188): Added the new variant `V2` for the `ConsensusParameters` which contains the new `block_transaction_size_limit` parameter.
- [2163](https://github.com/FuelLabs/fuel-core/pull/2163): Added runnable task for fetching block committer data.

### Changed
Expand All @@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [2155](https://github.com/FuelLabs/fuel-core/pull/2155): Added trait declaration for block committer data
- [2142](https://github.com/FuelLabs/fuel-core/pull/2142): Added benchmarks for varied forms of db lookups to assist in optimizations.
- [2158](https://github.com/FuelLabs/fuel-core/pull/2158): Log the public address of the signing key, if it is specified
- [2188](https://github.com/FuelLabs/fuel-core/pull/2188): Upgraded the `fuel-vm` to `0.57.0`. More information in the [release](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.57.0).

## [Version 0.35.0]

Expand Down
180 changes: 148 additions & 32 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
fuel-gas-price-algorithm = { version = "0.35.0", path = "crates/fuel-gas-price-algorithm" }

# Fuel dependencies
fuel-vm-private = { version = "0.56.0", package = "fuel-vm", default-features = false }
fuel-vm-private = { version = "0.57.0", package = "fuel-vm", default-features = false }

# Common dependencies
anyhow = "1.0"
Expand Down
3 changes: 2 additions & 1 deletion bin/fuel-core/chainspec/local-testnet/chain_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"chain_name": "Local testnet",
"consensus_parameters": {
"V1": {
"V2": {
"tx_params": {
"V1": {
"max_inputs": 255,
Expand Down Expand Up @@ -293,6 +293,7 @@
},
"base_asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07",
"block_gas_limit": 30000000,
"block_transaction_size_limit": 129024,
"privileged_address": "9f0e19d6c2a6283a3222426ab2630d35516b1799b503f37b02105bebe1b8a3e9"
}
},
Expand Down
Binary file modified bin/fuel-core/chainspec/local-testnet/state_transition_bytecode.wasm
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions crates/client/assets/schema.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ type ConsensusParameters {
feeParams: FeeParameters!
baseAssetId: AssetId!
blockGasLimit: U64!
blockTransactionSizeLimit: U64!
Copy link
Contributor

@AurelienFT AurelienFT Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I first read it, I understood that it was the maximum size for a transaction. I think I misunderstood because the word transaction is singular. IMO, it should be plural.

Copy link
Contributor Author

@rafal-ch rafal-ch Sep 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the name could indeed be slightly improved. However, it's already merged in fuel-vm here.

In the follow-up PR to fuel-core I'll make sure that this is comprehensively documented.

chainId: U64!
gasCosts: GasCosts!
privilegedAddress: Address!
Expand Down
6 changes: 5 additions & 1 deletion crates/client/src/client/schema/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub struct ConsensusParameters {
pub fee_params: FeeParameters,
pub base_asset_id: AssetId,
pub block_gas_limit: U64,
pub block_transaction_size_limit: U64,
pub chain_id: U64,
pub gas_costs: GasCosts,
pub privileged_address: Address,
Expand Down Expand Up @@ -479,14 +480,17 @@ impl TryFrom<ConsensusParameters> for fuel_core_types::fuel_tx::ConsensusParamet
fn try_from(params: ConsensusParameters) -> Result<Self, Self::Error> {
match params.version {
ConsensusParametersVersion::V1 => Ok(
fuel_core_types::fuel_tx::consensus_parameters::ConsensusParametersV1 {
fuel_core_types::fuel_tx::consensus_parameters::ConsensusParametersV2 {
tx_params: params.tx_params.try_into()?,
predicate_params: params.predicate_params.try_into()?,
script_params: params.script_params.try_into()?,
contract_params: params.contract_params.try_into()?,
fee_params: params.fee_params.try_into()?,
base_asset_id: params.base_asset_id.into(),
block_gas_limit: params.block_gas_limit.into(),
block_transaction_size_limit: params
.block_transaction_size_limit
.into(),
chain_id: params.chain_id.0.into(),
gas_costs: params.gas_costs.try_into()?,
privileged_address: params.privileged_address.into(),
Expand Down
1 change: 1 addition & 0 deletions ...ema/snapshots/fuel_core_client__client__schema__chain__tests__chain_gql_query_output.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ query {
}
baseAssetId
blockGasLimit
blockTransactionSizeLimit
chainId
gasCosts {
version
Expand Down
Loading