Retrayable messages fuel-core part

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.27", package = "fuel-vm" }
+fuel-vm-private = { version = "0.28", package = "fuel-vm" }
 
 # Common dependencies
 anyhow = "1.0"

benches/benches/set/blockchain.rs

@@ -7,6 +7,7 @@ use criterion::{
     Throughput,
 };
 use fuel_core_benches::*;
+use fuel_core_storage::ContractsAssetsStorage;
 use fuel_core_types::{
     fuel_asm::*,
     fuel_tx::{
@@ -424,7 +425,6 @@ pub fn run(c: &mut Criterion) {
     for i in linear.clone() {
         let mut input = VmBench::contract(rng, op::smo(0x15, 0x16, 0x17, 0x18))
             .expect("failed to prepare contract");
-        input.outputs.push(Output::message(Address::zeroed(), 1));
         let index = input.outputs.len() - 1;
         input.post_call.extend(vec![
             op::gtf_args(0x15, 0x00, GTFArgs::ScriptData),

benches/src/bin/collect.rs

@@ -701,6 +701,7 @@ mod tests {
             .arg(&manifest_path)
             .output()
             .unwrap();
+        println!("{}", String::from_utf8(output.stderr).unwrap());
         assert!(output.status.success());
     }
 

bin/e2e-test-client/src/test_context.rs

@@ -5,7 +5,7 @@ use anyhow::{
     Context,
 };
 use fuel_core_client::client::{
-    schema::resource::Resource,
+    schema::coins::CoinType,
     types::TransactionStatus,
     FuelClient,
     PageDirection,
@@ -142,9 +142,9 @@ impl Wallet {
         let asset_id_str = asset_id_string.as_str();
         let total_amount = transfer_amount + BASE_AMOUNT;
         // select coins
-        let resources = &self
+        let coins = &self
             .client
-            .resources_to_spend(
+            .coins_to_spend(
                 self.address.to_string().as_str(),
                 vec![(asset_id_str, total_amount, None)],
                 None,
@@ -156,8 +156,8 @@ impl Wallet {
         tx.gas_price(1);
         tx.gas_limit(BASE_AMOUNT);
 
-        for resource in resources {
-            if let Resource::Coin(coin) = resource {
+        for coin in coins {
+            if let CoinType::Coin(coin) = coin {
                 tx.add_unsigned_coin_input(
                     self.secret,
                     coin.utxo_id.clone().into(),
@@ -204,9 +204,9 @@ impl Wallet {
         let asset_id_str = asset_id_string.as_str();
         let total_amount = BASE_AMOUNT;
         // select coins
-        let resources = &self
+        let coins = &self
             .client
-            .resources_to_spend(
+            .coins_to_spend(
                 self.address.to_string().as_str(),
                 vec![(asset_id_str, total_amount, None)],
                 None,
@@ -222,8 +222,8 @@ impl Wallet {
         tx.gas_price(1);
         tx.gas_limit(BASE_AMOUNT);
 
-        for resource in resources {
-            if let Resource::Coin(coin) = resource {
+        for coin in coins {
+            if let CoinType::Coin(coin) = coin {
                 tx.add_unsigned_coin_input(
                     self.secret,
                     coin.utxo_id.clone().into(),

crates/chain-config/src/config/coin.rs

@@ -8,7 +8,7 @@ use crate::{
 use fuel_core_storage::MerkleRoot;
 use fuel_core_types::{
     blockchain::primitives::BlockHeight,
-    entities::coin::CompressedCoin,
+    entities::coins::coin::CompressedCoin,
     fuel_crypto::Hasher,
     fuel_types::{
         Address,
@@ -58,13 +58,21 @@ pub struct CoinConfig {
 
 impl GenesisCommitment for CompressedCoin {
     fn root(&self) -> anyhow::Result<MerkleRoot> {
+        let Self {
+            owner,
+            amount,
+            asset_id,
+            maturity,
+            tx_pointer,
+        } = self;
+
         let coin_hash = *Hasher::default()
-            .chain(self.owner)
-            .chain(self.amount.to_be_bytes())
-            .chain(self.asset_id)
-            .chain((*self.maturity).to_be_bytes())
-            .chain(self.tx_pointer.block_height().to_be_bytes())
-            .chain(self.tx_pointer.tx_index().to_be_bytes())
+            .chain(owner)
+            .chain(amount.to_be_bytes())
+            .chain(asset_id)
+            .chain((*maturity).to_be_bytes())
+            .chain(tx_pointer.block_height().to_be_bytes())
+            .chain(tx_pointer.tx_index().to_be_bytes())
             .finalize();
 
         Ok(coin_hash)

crates/chain-config/src/config/message.rs

@@ -10,27 +10,27 @@ use fuel_core_types::{
     blockchain::primitives::DaBlockHeight,
     entities::message::Message,
     fuel_asm::Word,
-    fuel_types::Address,
+    fuel_crypto::Hasher,
+    fuel_types::{
+        Address,
+        Nonce,
+    },
 };
 use serde::{
     Deserialize,
     Serialize,
 };
-use serde_with::{
-    serde_as,
-    skip_serializing_none,
-};
+use serde_with::serde_as;
 
-#[skip_serializing_none]
 #[serde_as]
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Eq, PartialEq)]
 pub struct MessageConfig {
     #[serde_as(as = "HexType")]
     pub sender: Address,
     #[serde_as(as = "HexType")]
     pub recipient: Address,
-    #[serde_as(as = "HexNumber")]
-    pub nonce: Word,
+    #[serde_as(as = "HexType")]
+    pub nonce: Nonce,
     #[serde_as(as = "HexNumber")]
     pub amount: Word,
     #[serde_as(as = "HexType")]
@@ -55,6 +55,23 @@ impl From<MessageConfig> for Message {
 
 impl GenesisCommitment for Message {
     fn root(&self) -> anyhow::Result<MerkleRoot> {
-        Ok(self.id().into())
+        let Self {
+            sender,
+            recipient,
+            nonce,
+            amount,
+            data,
+            da_height,
+        } = self;
+
+        let message_hash = *Hasher::default()
+            .chain(sender)
+            .chain(recipient)
+            .chain(nonce)
+            .chain(amount.to_be_bytes())
+            .chain(data.as_slice())
+            .chain(da_height.to_be_bytes())
+            .finalize();
+        Ok(message_hash)
     }
 }

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_configurable_block_height.snap

@@ -52,6 +52,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_balances.snap

@@ -63,6 +63,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_state.snap

@@ -63,6 +63,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_tx_pointer.snap

@@ -59,6 +59,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_contract_with_utxo_id.snap

@@ -59,6 +59,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_local_testnet_config.snap

@@ -78,6 +78,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_coin_state.snap

@@ -63,6 +63,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,

crates/chain-config/src/snapshots/fuel_core_chain_config__config__tests__snapshot_simple_contract.snap

@@ -57,6 +57,12 @@ expression: json
     "jne": 1,
     "jnei": 1,
     "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
     "k256": 19,
     "lb": 1,
     "log": 40,