Bumping fuel-vm to v0.40.0 (#1468)

crypto523 · Nov 1, 2023 · bad7fc9 · bad7fc9
1 parent cd17277
commit bad7fc9
Show file tree

Hide file tree

Showing 24 changed files with 194 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Description of the upcoming release here.
 
 ### Changed
 
+- [#1468](https://github.com/FuelLabs/fuel-core/pull/1468): Bumped version of the `fuel-vm` to `v0.40.0`. It brings some breaking changes into consensus parameters API because of changes in the underlying types.
 - [#1460](https://github.com/FuelLabs/fuel-core/pull/1460): Change tracking branch from main to master for releasy tests.
 - [#1440](https://github.com/FuelLabs/fuel-core/pull/1440): Don't report reserved nodes that send invalid transactions.
 - [#1439](https://github.com/FuelLabs/fuel-core/pull/1439): Reduced memory BMT consumption during creation of the header.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -77,7 +77,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.39.0", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.40.0", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

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
@@ -13,7 +13,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -191,6 +192,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -25,7 +25,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -203,6 +204,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -25,7 +25,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -203,6 +204,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -21,7 +21,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -199,6 +200,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -21,7 +21,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -199,6 +200,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -39,7 +39,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -217,6 +218,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -24,7 +24,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -202,6 +203,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -19,7 +19,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -197,6 +198,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

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
@@ -22,7 +22,8 @@ expression: json
       "max_inputs": 255,
       "max_outputs": 255,
       "max_witnesses": 255,
-      "max_gas_per_tx": 100000000
+      "max_gas_per_tx": 100000000,
+      "max_size": 17825792
     },
     "predicate_params": {
       "max_predicate_length": 1048576,
@@ -200,6 +201,14 @@ expression: json
       "swwq": {
         "base": 44,
         "dep_per_unit": 5
+      },
+      "contract_root": {
+        "base": 75,
+        "dep_per_unit": 1
+      },
+      "state_root": {
+        "base": 412,
+        "dep_per_unit": 1
       }
     },
     "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000"

diff --git a/crates/client/assets/schema.sdl b/crates/client/assets/schema.sdl
@@ -386,6 +386,8 @@ type GasCosts {
 	scwq: DependentCost!
 	smo: DependentCost!
 	srwq: DependentCost!
+	contractRoot: DependentCost!
+	stateRoot: DependentCost!
 	swwq: DependentCost!
 }
 
@@ -903,10 +905,11 @@ scalar TransactionId
 union TransactionStatus = SubmittedStatus | SuccessStatus | SqueezedOutStatus | FailureStatus
 
 type TxParameters {
-	maxInputs: U64!
-	maxOutputs: U64!
-	maxWitnesses: U64!
+	maxInputs: U8!
+	maxOutputs: U8!
+	maxWitnesses: U32!
 	maxGasPerTx: U64!
+	maxSize: U64!
 }
 
 scalar TxPointer
@@ -915,6 +918,8 @@ scalar U32
 
 scalar U64
 
+scalar U8
+
 scalar UtxoId
 
 type VariableOutput {