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.

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

Jump to bottom

Bump fuel-vm to 0.35.0 version #1256

Merged
merged 5 commits into from
Jul 14, 2023
Merged

Bump fuel-vm to 0.35.0 version #1256

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1150791
Bump `fuel-vm` to `0.35.0` version
xgreenx Jul 14, 2023
8f46dfd
Update crates/fuel-core/src/query/message.rs
xgreenx Jul 14, 2023
513ddab
Make fmt happy
xgreenx Jul 14, 2023
5580e58
Merge branch 'master' into feature/fuel-vm-0.35.0
xgreenx Jul 14, 2023
714392b
Fix compilaiton
xgreenx Jul 14, 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
55 changes: 40 additions & 15 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 @@ -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.34.1", package = "fuel-vm" }
fuel-vm-private = { version = "0.35.0", package = "fuel-vm" }

# Common dependencies
anyhow = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions benches/benches/set/blockchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,14 @@ pub fn run(c: &mut Criterion) {
run_group_ref(
&mut c.benchmark_group("mint"),
"mint",
VmBench::contract(rng, op::mint(RegId::ZERO))
VmBench::contract(rng, op::mint(RegId::ZERO, RegId::ZERO))
.expect("failed to prepare contract"),
);

run_group_ref(
&mut c.benchmark_group("burn"),
"burn",
VmBench::contract(rng, op::mint(RegId::ZERO))
VmBench::contract(rng, op::mint(RegId::ZERO, RegId::ZERO))
.expect("failed to prepare contract"),
);

Expand Down
6 changes: 3 additions & 3 deletions benches/benches/set/crypto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ pub fn run(c: &mut Criterion) {
let signature = Signature::sign(&secret, &message);

run_group_ref(
Copy link
Member

Choose a reason for hiding this comment

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

should we also setup benchmarks for ecr1 and ed19?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There is an issue for that=) #1254

&mut c.benchmark_group("ecr"),
"ecr",
VmBench::new(op::ecr(0x11, 0x20, 0x21))
&mut c.benchmark_group("eck1"),
"eck1",
VmBench::new(op::eck1(0x11, 0x20, 0x21))
.with_prepare_script(vec![
op::gtf_args(0x20, 0x00, GTFArgs::ScriptData),
op::addi(0x21, 0x20, signature.as_ref().len().try_into().unwrap()),
Expand Down
4 changes: 3 additions & 1 deletion .../snapshots/fuel_core_chain_config__config__tests__snapshot_configurable_block_height.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_balances.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...ig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...c/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_tx_pointer.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion .../src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_utxo_id.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_local_testnet_config.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...nfig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_coin_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_contract.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
4 changes: 3 additions & 1 deletion ...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_message_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ expression: json
"croo": 20,
"div": 1,
"divi": 1,
"ecr": 1592,
"eck1": 1592,
"ecr1": 3000,
"ed19": 3000,
"eq": 1,
"exp": 1,
"expi": 1,
Expand Down
8 changes: 6 additions & 2 deletions crates/client/assets/schema.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ type GasCosts {
croo: U64!
div: U64!
divi: U64!
ecr: U64!
ecr1: U64!
eck1: U64!
ed19: U64!
eq: U64!
exp: U64!
expi: U64!
Expand Down Expand Up @@ -701,14 +703,14 @@ type Receipt {
rd: U64
len: U64
receiptType: ReceiptType!
rawPayload: HexString!
result: U64
gasUsed: U64
data: HexString
sender: Address
recipient: Address
nonce: Nonce
contractId: ContractId
subId: Bytes32
}

enum ReceiptType {
Expand All @@ -723,6 +725,8 @@ enum ReceiptType {
TRANSFER_OUT
SCRIPT_RESULT
MESSAGE_OUT
MINT
BURN
}

enum ReturnType {
Expand Down
4 changes: 3 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 @@ -44,7 +44,9 @@ pub struct GasCosts {
pub croo: U64,
pub div: U64,
pub divi: U64,
pub ecr: U64,
pub eck1: U64,
pub ecr1: U64,
pub ed19: U64,
pub eq: U64,
pub exp: U64,
pub expi: U64,
Expand Down
5 changes: 3 additions & 2 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
@@ -1,6 +1,5 @@
---
source: crates/client/src/client/schema/chain.rs
assertion_line: 189
expression: operation.query
---
query {
Expand Down Expand Up @@ -71,7 +70,9 @@ query {
croo
div
divi
ecr
eck1
ecr1
ed19
eq
exp
expi
Expand Down
1 change: 1 addition & 0 deletions .../schema/snapshots/fuel_core_client__client__schema__tx__tests__dry_run_tx_gql_output.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ mutation($tx: HexString!, $utxoValidation: Boolean) {
recipient
nonce
contractId
subId
}
}

Expand Down
33 changes: 32 additions & 1 deletion ...el_core_client__client__schema__tx__tests__opaque_transaction_by_id_query_gql_output.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,38 @@ query($id: TransactionId!) {
transaction(id: $id) {
rawPayload
receipts {
rawPayload
param1
param2
amount
assetId
gas
digest
contract {
id
}
is
pc
ptr
ra
rb
rc
rd
reason
receiptType
to {
id
}
toAddress
val
len
result
gasUsed
data
sender
recipient
nonce
contractId
subId
}
status {
__typename
Expand Down
Loading