Bump fuel-vm to 0.35.0 version (#1256)

The PR uses the latest `fuel-vm 0.35.0`. It affects the `fuel-core` in the next way: - Removes support for `OpaqueReceipt` transaction - Adds new opcodes `eck1`, `ecr1`, `ed19` - Adds new `Receipt::Mint` and `Receipt::Burn` --------- Co-authored-by: Brandon Kite <[email protected]>
FuelLabs · Jul 14, 2023 · ed82fb4 · ed82fb4
1 parent d6654c6
commit ed82fb4
Show file tree

Hide file tree

Showing 31 changed files with 278 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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"

diff --git a/benches/benches/set/blockchain.rs b/benches/benches/set/blockchain.rs
@@ -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"),
     );
 

diff --git a/benches/benches/set/crypto.rs b/benches/benches/set/crypto.rs
@@ -20,9 +20,9 @@ pub fn run(c: &mut Criterion) {
     let signature = Signature::sign(&secret, &message);
 
     run_group_ref(
-        &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()),

diff --git a/.../snapshots/fuel_core_chain_config__config__tests__snapshot_configurable_block_height.snap b/.../snapshots/fuel_core_chain_config__config__tests__snapshot_configurable_block_height.snap
@@ -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,

diff --git a/...src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_balances.snap b/...src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_balances.snap
@@ -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,

diff --git a/...ig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_state.snap b/...ig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_state.snap
@@ -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,

diff --git a/...c/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_tx_pointer.snap b/...c/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_tx_pointer.snap
@@ -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,

diff --git a/.../src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_utxo_id.snap b/.../src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_utxo_id.snap
@@ -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,

diff --git a/...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_local_testnet_config.snap b/...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_local_testnet_config.snap
@@ -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,

diff --git a/...nfig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_coin_state.snap b/...nfig/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_coin_state.snap
@@ -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,

diff --git a/...config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_contract.snap b/...config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_contract.snap
@@ -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,

diff --git a/...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_message_state.snap b/...g/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_message_state.snap
@@ -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,

diff --git a/crates/client/assets/schema.sdl b/crates/client/assets/schema.sdl
@@ -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!
@@ -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 {
@@ -723,6 +725,8 @@ enum ReceiptType {
 	TRANSFER_OUT
 	SCRIPT_RESULT
 	MESSAGE_OUT
+	MINT
+	BURN
 }
 
 enum ReturnType {

diff --git a/crates/client/src/client/schema/chain.rs b/crates/client/src/client/schema/chain.rs
@@ -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,

diff --git a/...ema/snapshots/fuel_core_client__client__schema__chain__tests__chain_gql_query_output.snap b/...ema/snapshots/fuel_core_client__client__schema__chain__tests__chain_gql_query_output.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/client/src/client/schema/chain.rs
-assertion_line: 189
 expression: operation.query
 ---
 query {
@@ -71,7 +70,9 @@ query {
       croo
       div
       divi
-      ecr
+      eck1
+      ecr1
+      ed19
       eq
       exp
       expi

diff --git a/.../schema/snapshots/fuel_core_client__client__schema__tx__tests__dry_run_tx_gql_output.snap b/.../schema/snapshots/fuel_core_client__client__schema__tx__tests__dry_run_tx_gql_output.snap
@@ -35,6 +35,7 @@ mutation($tx: HexString!, $utxoValidation: Boolean) {
     recipient
     nonce
     contractId
+    subId
   }
 }
 

diff --git a/...el_core_client__client__schema__tx__tests__opaque_transaction_by_id_query_gql_output.snap b/...el_core_client__client__schema__tx__tests__opaque_transaction_by_id_query_gql_output.snap
@@ -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