fix bad rebase?

FuelLabs · Nov 2, 2023 · f25910d · f25910d
1 parent f95dddc
commit f25910d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,16 +88,13 @@ fuel-indexer-utils = { version = "0.23.0", path = "./packages/fuel-indexer-utils
 fuel-tx = { version = "=0.35.3", default-features = false }
 fuel-types = { version = "=0.35.3", default-features = false, features = ["serde"] }
 fuel-vm = { version = "=0.35.3", default-features = false }
-<<<<<<< HEAD
 fuels = { version = "0.49", default-features = false }
-=======
-# fuels = { version = "0.46", default-features = false }
-fuels = { git = "https://github.com/FuelLabs/fuels", branch = "hal3e/predicate-abigen-wasm", default-features = false }
->>>>>>> a0a5ec17 (post halil chat)
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false }
 thiserror = "1.0"
 tokio = "1.28"
 tokio-util = "0.7"
 tracing = "0.1"
 
+# [patch.crates-io]
+# fuels = { git = "https://github.com/FuelLabs/fuels.git", branch = "master", default-features = false }
diff --git a/packages/fuel-indexer-macros/src/indexer.rs b/packages/fuel-indexer-macros/src/indexer.rs
@@ -854,7 +854,8 @@ fn process_fn_items(
             #subscribed_contract_ids
 
             let mut process_transaction = |decoder: &mut Decoders, tx: fuel::TransactionData| -> anyhow::Result<()> {
-                match &tx_data.transaction {
+                let tx_id = tx.id;
+                match &tx.transaction {
                     fuel::Transaction::Script(script) => {
                         let fuel::Script {
                             inputs,
@@ -908,7 +909,7 @@ fn process_fn_items(
                                         utxo.to == *owner
                                     });
 
-                                
+
                                     let configurable = match pred {
                                         Some(p) => {
                                             let template_id = p.template_id().to_string();