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

chore: Upgrade fuel-vm to 0.37.0 #1338

Merged
merged 34 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
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
1fc2c59
Merge branch 'master' into bvrooman/fix/update-dependent-cost-schema
bvrooman Aug 31, 2023
d5908e0
Update CHANGELOG.md
bvrooman Aug 31, 2023
a3cd09c
Revert "Update CHANGELOG.md"
bvrooman Aug 31, 2023
c51fb6f
Merge branch 'master' into bvrooman/fix/update-dependent-cost-schema
Sep 5, 2023
250e19c
Migrate to canonical serialization
bvrooman Sep 6, 2023
5c4b85b
Migrate to canonical serialization
bvrooman Sep 6, 2023
0f2b81f
Update snapshots
bvrooman Sep 6, 2023
d6fcfac
Update chainspecs with dummy costs
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
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
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
cbc414b
Merge branch 'master' into bvrooman/fix/update-dependent-cost-schema
Sep 8, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ Description of the upcoming release here.
### Removed

#### Breaking
- [#1338](https://github.com/FuelLabs/fuel-core/pull/1338): Updated GraphQL client to use `DependentCost` for `k256`, `mcpi`, `s256`, `scwq`, `swwq` opcodes.
- [#1322](https://github.com/FuelLabs/fuel-core/pull/1322): The `manual_blocks_enabled` flag is removed from the CLI. The analog is a `debug` flag.
82 changes: 65 additions & 17 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fuel-core-tests = { version = "0.0.0", path = "./tests" }
fuel-core-xtask = { version = "0.0.0", path = "./xtask" }

# Fuel dependencies
fuel-vm-private = { version = "0.36.0", package = "fuel-vm" }
fuel-vm-private = { version = "0.37.0", package = "fuel-vm" }

# Common dependencies
anyhow = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions bin/e2e-test-client/src/test_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use fuel_core_types::{
UtxoId,
},
fuel_types::{
bytes::SizedBytes,
canonical::SerializedSize,
Address,
AssetId,
},
Expand Down Expand Up @@ -253,7 +253,7 @@ impl Wallet {
});

let tx = tx.finalize();
println!("The size of the transaction is {}", tx.serialized_size());
println!("The size of the transaction is {}", tx.size());

let status = self
.client
Expand Down
2 changes: 1 addition & 1 deletion bin/e2e-test-client/src/tests/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use fuel_core_types::{
ScriptExecutionResult,
Transaction,
},
fuel_types::bytes::Deserializable,
fuel_types::canonical::Deserialize,
};
use libtest_mimic::Failed;
use std::time::Duration;
Expand Down
2 changes: 1 addition & 1 deletion ci_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# The script runs almost all CI checks locally.
#
# Requires installed:
# - Rust `1.71.0`
# - Rust `1.72.0`
# - Nightly rust formatter
# - `cargo install cargo-sort`

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/chain-config/src/config.rs
assertion_line: 91
expression: json
---
{
Expand Down Expand Up @@ -72,12 +71,10 @@ expression: json
"jnzb": 1,
"jnef": 1,
"jneb": 1,
"k256": 11,
"lb": 1,
"log": 9,
"lt": 1,
"lw": 1,
"mcpi": 33,
"mint": 135,
"mlog": 1,
"mod": 1,
Expand All @@ -98,9 +95,7 @@ expression: json
"pshl": 2,
"ret_contract": 13,
"rvrt_contract": 13,
"s256": 2,
"sb": 1,
"scwq": 13,
"sll": 1,
"slli": 1,
"srl": 1,
Expand All @@ -109,8 +104,7 @@ expression: json
"sub": 1,
"subi": 1,
"sw": 1,
"sww": 43,
"swwq": 44,
"sww": 67,
"time": 1,
"tr": 105,
"tro": 60,
Expand Down Expand Up @@ -142,6 +136,10 @@ expression: json
"base": 17,
"dep_per_unit": 790
},
"k256": {
"base": 11,
"dep_per_unit": 214
},
"ldc": {
"base": 15,
"dep_per_unit": 272
Expand All @@ -162,6 +160,10 @@ expression: json
"base": 1,
"dep_per_unit": 2000
},
"mcpi": {
"base": 3,
"dep_per_unit": 2000
},
"meq": {
"base": 1,
"dep_per_unit": 2500
Expand All @@ -170,15 +172,28 @@ expression: json
"base": 29,
"dep_per_unit": 62
},
"s256": {
"base": 2,
"dep_per_unit": 214
},
"scwq": {
"base": 13,
"dep_per_unit": 5
},
"smo": {
"base": 209,
"dep_per_unit": 55
},
"srwq": {
"base": 47,
"dep_per_unit": 5
},
"swwq": {
"base": 44,
"dep_per_unit": 5
}
}
},
"base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"
},
"consensus": {
"PoA": {
Expand Down
Loading
Loading