Skip to content
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.

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

feat: Configurable base asset #1339

Merged
merged 80 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
bf05d67
Update chain.rs
bvrooman Aug 29, 2023
6ff5c66
Update dependent costs in schema
bvrooman Aug 29, 2023
fc28088
Fix whitespace
bvrooman Aug 29, 2023
1801d8a
Update CHANGELOG.md
bvrooman Aug 29, 2023
1fbe703
Update schema
bvrooman Aug 29, 2023
902f0e5
Merge branch 'master' into bvrooman/feat/configurable-base-asset-id
Aug 29, 2023
e71952a
Use AssetId type
bvrooman Aug 30, 2023
fbc7331
Update `chainspec` files
bvrooman Aug 30, 2023
43f0d75
Update
bvrooman Aug 31, 2023
6d3dc18
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Aug 31, 2023
15b83c3
Update
bvrooman Aug 31, 2023
1fc2c59
Merge branch 'master' into bvrooman/fix/update-dependent-cost-schema
bvrooman Aug 31, 2023
7829004
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
Aug 31, 2023
d5908e0
Update CHANGELOG.md
bvrooman Aug 31, 2023
037178a
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
Aug 31, 2023
a3cd09c
Revert "Update CHANGELOG.md"
bvrooman Aug 31, 2023
b5c910d
Update CHANGELOG.md
bvrooman Aug 31, 2023
6797b37
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
Aug 31, 2023
df10efe
Update CHANGELOG.md
bvrooman Aug 31, 2023
6d8fb19
Update CHANGELOG.md
bvrooman Aug 31, 2023
c51fb6f
Merge branch 'master' into bvrooman/fix/update-dependent-cost-schema
Sep 5, 2023
20a2dce
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 5, 2023
250e19c
Migrate to canonical serialization
bvrooman Sep 6, 2023
dcc152d
Update chainspecs
bvrooman Sep 6, 2023
7fd086e
Update
bvrooman Sep 6, 2023
c04ea5e
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 6, 2023
5c4b85b
Migrate to canonical serialization
bvrooman Sep 6, 2023
ed51f8c
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 6, 2023
1fafe53
Update chain and schema
bvrooman Sep 6, 2023
f1cf059
WIP tests
bvrooman Sep 6, 2023
0f2b81f
Update snapshots
bvrooman Sep 6, 2023
d6fcfac
Update chainspecs with dummy costs
bvrooman Sep 6, 2023
86042c6
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 6, 2023
c2b17b7
Update chainspec dependent costs
bvrooman Sep 7, 2023
9d5d789
Update fuel-vm to 0.37.0
bvrooman Sep 7, 2023
48cd5cf
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 7, 2023
655e3aa
Update chainspec
bvrooman Sep 7, 2023
dc7e762
Fix
bvrooman Sep 7, 2023
6e0f903
Update rust version in dockerfiles
bvrooman Sep 7, 2023
567d6ab
Update rust in CI
bvrooman Sep 7, 2023
4704685
Clippy
bvrooman Sep 7, 2023
7da3126
Clippy
bvrooman Sep 7, 2023
3200d64
Clippy
bvrooman Sep 7, 2023
48334e5
Clippy
bvrooman Sep 7, 2023
5e5c303
Clippy
bvrooman Sep 7, 2023
4420b73
Clippy
bvrooman Sep 7, 2023
38bf216
Clippy
bvrooman Sep 7, 2023
d9e88de
fmt
bvrooman Sep 8, 2023
26ebe72
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
bvrooman Sep 8, 2023
6da1ed7
Update ci.yml
bvrooman Sep 8, 2023
f557ed0
Clippy
bvrooman Sep 8, 2023
f414a92
Update CHANGELOG.md
bvrooman Sep 8, 2023
b32f278
Clippy
bvrooman Sep 8, 2023
ec21308
Clippy
bvrooman Sep 7, 2023
8fe731a
Clippy
bvrooman Sep 7, 2023
d682035
Restore comments
bvrooman Sep 8, 2023
4f2b4ce
Upgrade dockerfile rust versions
bvrooman Sep 8, 2023
0ced293
Cargo fmt
bvrooman Sep 8, 2023
80daf0c
Merge branch 'bvrooman/chore/rust-1.72.0-ci' into bvrooman/fix/update…
bvrooman Sep 8, 2023
af6964d
Merge branch 'bvrooman/fix/update-dependent-cost-schema' into bvrooma…
Sep 8, 2023
382d656
Update
bvrooman Sep 8, 2023
9cf2ed6
Merge branch 'master' into bvrooman/feat/configurable-base-asset-id
bvrooman Sep 8, 2023
1c12bc2
Update
bvrooman Sep 8, 2023
b9e04a1
Update Test
bvrooman Sep 10, 2023
336546d
debugging
bvrooman Sep 11, 2023
8a56dbf
More debugging
bvrooman Sep 11, 2023
0286199
debug
bvrooman Sep 11, 2023
a65aaae
Update coins_query.rs
bvrooman Sep 11, 2023
2d1fb63
Refactor
bvrooman Sep 12, 2023
2298754
Remove debug
bvrooman Sep 12, 2023
7c3eaa9
Update schema.sdl
bvrooman Sep 12, 2023
1cb8725
Update coins_query.rs
bvrooman Sep 12, 2023
01673f8
Update schema
bvrooman Sep 12, 2023
38aa61e
Update asset_query.rs
bvrooman Sep 12, 2023
9c57b73
Clippy
bvrooman Sep 12, 2023
119bbe8
More clippy
bvrooman Sep 12, 2023
acc1b55
Merge branch 'master' into bvrooman/feat/configurable-base-asset-id
Sep 12, 2023
011518b
Merge branch 'master' into bvrooman/feat/configurable-base-asset-id
bvrooman Sep 12, 2023
7a55c72
Update asset_query coins
bvrooman Sep 13, 2023
9a53d36
Update
bvrooman Sep 13, 2023
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ Description of the upcoming release here.
### Added

- [#1355](https://github.com/FuelLabs/fuel-core/pull/1355): Added new metrics related to block importing, such as tps, sync delays etc
- [#1339](https://github.com/FuelLabs/fuel-core/pull/1339): Adds `baseAssetId` to `FeeParameters` in the GraphQL API.
- [#1331](https://github.com/FuelLabs/fuel-core/pull/1331): Add peer reputation reporting to block import code
- [#1324](https://github.com/FuelLabs/fuel-core/pull/1324): Added pyroscope profiling to fuel-core, intended to be used by a secondary docker image that has debug symbols enabled.
- [#1309](https://github.com/FuelLabs/fuel-core/pull/1309): Add documentation for running debug builds with CLion and Visual Studio Code.
- [#1308](https://github.com/FuelLabs/fuel-core/pull/1308): Add support for loading .env files when compiling with the `env` feature. This allows users to conveniently supply CLI arguments in a secure and IDE-agnostic way.
- [#1304](https://github.com/FuelLabs/fuel-core/pull/1304): Implemented `submit_and_await_commit_with_receipts` method for `FuelClient`.
- [#1286](https://github.com/FuelLabs/fuel-core/pull/1286): Include readable names for test cases where missing.
- [#1274](https://github.com/FuelLabs/fuel-core/pull/1274): Added tests to benchmark block synchronization.
- [#1263](https://github.com/FuelLabs/fuel-core/pull/1263): Add gas benchmarks for `ED19` and `ECR1` instructions.
- [#1331](https://github.com/FuelLabs/fuel-core/pull/1331): Add peer reputation reporting to block import code

### Changed

Expand All @@ -33,6 +34,7 @@ Description of the upcoming release here.

### Breaking
- [#1363](https://github.com/FuelLabs/fuel-core/pull/1363): Change message_proof api to take `nonce` instead of `message_id`
- [#1339](https://github.com/FuelLabs/fuel-core/pull/1339): Added a new required field called `base_asset_id` to the `FeeParameters` definition in `ConsensusParameters`, as well as default values for `base_asset_id` in the `beta` and `dev` chainspecs.
- [#1355](https://github.com/FuelLabs/fuel-core/pull/1355): Removed the `metrics` feature flag from the fuel-core crate, and metrics are now included by default.
- [#1322](https://github.com/FuelLabs/fuel-core/pull/1322):
The `debug` flag is added to the CLI. The flag should be used for local development only. Enabling debug mode:
Expand Down
1 change: 1 addition & 0 deletions crates/client/assets/schema.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ type ConsensusParameters {
scriptParams: ScriptParameters!
contractParams: ContractParameters!
feeParams: FeeParameters!
baseAssetId: AssetId!
chainId: U64!
gasCosts: GasCosts!
}
Expand Down
3 changes: 2 additions & 1 deletion crates/client/src/client/schema/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub struct ConsensusParameters {
pub script_params: ScriptParameters,
pub contract_params: ContractParameters,
pub fee_params: FeeParameters,
pub base_asset_id: AssetId,
pub chain_id: U64,
pub gas_costs: GasCosts,
}
Expand Down Expand Up @@ -263,9 +264,9 @@ impl From<ConsensusParameters> for fuel_core_types::fuel_tx::ConsensusParameters
script_params: params.script_params.into(),
contract_params: params.contract_params.into(),
fee_params: params.fee_params.into(),
base_asset_id: params.base_asset_id.into(),
chain_id: params.chain_id.0.into(),
gas_costs: params.gas_costs.into(),
base_asset_id: AssetId::default().into(),
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ query {
gasPriceFactor
gasPerByte
}
baseAssetId
chainId
gasCosts {
add
Expand Down
Loading