fix (fuel-indexer,fuel-indexer-types): Re-integrate block producer

docs/src/indexing/blocks-and-transactions.md

@@ -8,12 +8,13 @@ You can index use the `BlockData` and `TransactionData` data structures to index
 pub struct BlockData {
     pub height: u64,
     pub id: Bytes32,
+    pub producer: Option<Bytes32>,
     pub time: i64,
     pub transactions: Vec<TransactionData>,
 }
 ```
 
-The `BlockData` struct is how blocks are represented in the Fuel indexer. It contains metadata such as the ID, height, and time, as well as a list of the transactions it contains (represented by `TransactionData`).
+The `BlockData` struct is how blocks are represented in the Fuel indexer. It contains metadata such as the ID, height, and time, as well as a list of the transactions it contains (represented by `TransactionData`). It also contains the public key hash of the block producer, if present.
 
 ## `TransactionData`
 

examples/block-explorer/explorer-index/src/lib.rs

@@ -48,12 +48,12 @@ mod explorer_index {
         // a block entity `Block` that we can persist to the database. The `Block` type below is
         // defined in our schema/explorer.graphql and represents the type that we will
         // save to our database.
-        //
-        // Note: There is no miner/producer address for blocks in this example; the producer field
-        // was removed from the `Block` struct as part of fuel-core v0.12.
+        let producer = block_data.producer.unwrap_or(Bytes32::zeroed());
+
         let block = Block {
             id: block_data.id,
             height: block_data.height,
+            producer,
             timestamp: block_data.time,
             gas_limit: block_gas_limit,
         };

examples/block-explorer/schema/explorer_index.schema.graphql

@@ -14,6 +14,7 @@ type QueryRoot {
 type Block {
     id: Bytes32! @unique
     height: UInt8!
+    producer: Bytes32!
     timestamp: Int8!
     gas_limit: UInt8!
 }

examples/hello-world/hello-bin/Cargo.toml

@@ -9,9 +9,9 @@ fuel-indexer-lib = { version = "0.1", path = "../../../packages/fuel-indexer-lib
 fuel-indexer-tests = { version = "0.0.0", path = "./../../../packages/fuel-indexer-tests" }
 fuel-tx = "0.23"
 fuel-types = "0.5"
-fuels = { version = "0.30", features = ["fuel-core-lib"] }
-fuels-abigen-macro = "0.30"
-fuels-core = { version = "0.30", default-features = false }
+fuels = { version = "0.32", features = ["fuel-core-lib"] }
+fuels-abigen-macro = "0.32"
+fuels-core = { version = "0.32", default-features = false }
 rand = "0.8"
 thiserror = "1.0"
 tokio = { version = "1.17", features = ["macros", "rt-multi-thread"] }

packages/fuel-indexer-tests/Cargo.toml

@@ -34,9 +34,9 @@ fuel-indexer-sqlite = { version = "0.1", path = "./../fuel-indexer-database/sqli
 fuel-indexer-types = { version = "0.1", path = "./../fuel-indexer-types" }
 fuel-tx = "0.23"
 fuel-types = "0.5"
-fuels = { version = "0.30", features = ["fuel-core-lib"] }
-fuels-abigen-macro = "0.30"
-fuels-core = "0.30"
+fuels = { version = "0.32", features = ["fuel-core-lib"] }
+fuels-abigen-macro = "0.32"
+fuels-core = "0.32"
 futures = "0.3"
 hex = "0.4"
 itertools = "0.10"

packages/fuel-indexer-tests/components/web/Cargo.toml

@@ -21,9 +21,9 @@ fuel-indexer-lib = { version = "0.1", path = "../../../fuel-indexer-lib" }
 fuel-indexer-tests = { version = "0.0.0", path = "./../../../fuel-indexer-tests" }
 fuel-tx = "0.23"
 fuel-types = "0.5"
-fuels = { version = "0.30", features = ["fuel-core-lib"] }
-fuels-abigen-macro = "0.30"
-fuels-core = { version = "0.30", default-features = false }
+fuels = { version = "0.32", features = ["fuel-core-lib"] }
+fuels-abigen-macro = "0.32"
+fuels-core = { version = "0.32", default-features = false }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }

packages/fuel-indexer-tests/components/web/src/bin/web-api.rs

@@ -4,8 +4,8 @@ use fuel_indexer_tests::{
     defaults,
     fixtures::{get_contract_id, tx_params},
 };
+use fuels::fuels_abigen::abigen;
 use fuels::prelude::CallParameters;
-use fuels_abigen_macro::abigen;
 use std::path::Path;
 use tracing::info;
 

packages/fuel-indexer-tests/src/fixtures.rs

@@ -4,14 +4,14 @@ use fuel_indexer_database::IndexerConnectionPool;
 use fuel_indexer_lib::config::{
     DatabaseConfig, FuelNodeConfig, GraphQLConfig, IndexerConfig,
 };
+use fuels::core::parameters::StorageConfiguration;
 use fuels::{
     prelude::{
         setup_single_asset_coins, setup_test_client, AssetId, Bech32ContractId, Config,
         Contract, Provider, TxParameters, WalletUnlocked, DEFAULT_COIN_AMOUNT,
     },
     signers::Signer,
 };
-use fuels_core::parameters::StorageConfiguration;
 use sqlx::{
     pool::{Pool, PoolConnection},
     Postgres, Sqlite,

packages/fuel-indexer-tests/tests/integration/service.rs

@@ -4,13 +4,13 @@ use fuel_indexer_tests::{
     defaults,
     fixtures::{indexer_service_postgres, tx_params},
 };
+use fuels::core::parameters::StorageConfiguration;
+use fuels::fuels_abigen::abigen;
 use fuels::prelude::{
     setup_single_asset_coins, setup_test_client, AssetId, Contract, Provider,
     WalletUnlocked, DEFAULT_COIN_AMOUNT,
 };
 use fuels::signers::Signer;
-use fuels_abigen_macro::abigen;
-use fuels_core::parameters::StorageConfiguration;
 use std::path::Path;
 
 const SIMPLE_WASM_MANIFEST: &str = include_str!("./../../assets/macros/simple_wasm.yaml");

packages/fuel-indexer-tests/trybuild/pass_if_indexer_is_valid_multi_type.rs

@@ -47,6 +47,7 @@ fn main() {
     let data: Vec<BlockData> = vec![BlockData {
         id: [0u8; 32].into(),
         time: 1,
+        producer: None,
         height: 0,
         transactions: vec![TransactionData {
             id: [0u8; 32].into(),

packages/fuel-indexer-tests/trybuild/pass_if_indexer_is_valid_single_type.rs

@@ -31,6 +31,7 @@ fn main() {
     let data: Vec<BlockData> = vec![BlockData {
         id: [0u8; 32].into(),
         time: 1,
+        producer: None,
         height: 0,
         transactions: vec![TransactionData {
             status: TransactionStatus::default(),

packages/fuel-indexer-types/src/abi.rs

@@ -28,6 +28,7 @@ pub struct TransactionData {
 pub struct BlockData {
     pub height: u64,
     pub id: Bytes32,
+    pub producer: Option<Bytes32>,
     pub time: i64,
     pub transactions: Vec<TransactionData>,
 }

packages/fuel-indexer/Cargo.toml

@@ -15,7 +15,7 @@ bincode = "1.3.3"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "3.1", features = ["cargo", "derive", "env"] }
-fuel-gql-client = { version = "0.14" }
+fuel-gql-client = { version = "0.15" }
 fuel-indexer-api-server = { version = "0.1", path = "../fuel-indexer-api-server", optional = true }
 fuel-indexer-database = { version = "0.1", path = "../fuel-indexer-database" }
 fuel-indexer-database-types = { version = "0.1", path = "../fuel-indexer-database/database-types" }
@@ -48,7 +48,7 @@ wasmer-engine-universal = "2.0"
 [dev-dependencies]
 chrono = { version = "0.4", features = ["serde"] }
 fuel-crypto = "0.6"
-fuel-gql-client = { version = "0.14", features = ["test-helpers"] }
+fuel-gql-client = { version = "0.15", features = ["test-helpers"] }
 fuel-types = "0.5"
 itertools = { version = "0.10" }
 rand = "0.8"

packages/fuel-indexer/src/service.rs

@@ -151,6 +151,8 @@ fn run_executor<T: 'static + Executor + Send + Sync>(
 
             let mut block_info = Vec::new();
             for block in results.into_iter().rev() {
+                let producer = block.block_producer().map(|pk| pk.hash());
+
                 // NOTE: for now assuming we have a single contract instance,
                 // we'll need to watch contract creation events here in
                 // case an indexer would be interested in processing it.
@@ -245,6 +247,7 @@ fn run_executor<T: 'static + Executor + Send + Sync>(
                 let block = BlockData {
                     height: block.header.height.0,
                     id: Bytes32::from(block.id),
+                    producer,
                     time: block.header.time.0.to_unix(),
                     transactions,
                 };