From cd11167e83b26dd57fe60f890474d363f81c6e5d Mon Sep 17 00:00:00 2001
From: Martin Fraga <martin.fraga@lambdaclass.com>
Date: Mon, 10 Jun 2024 20:40:25 -0300
Subject: [PATCH] deps: point to miden-node's next branch and fix compilation
 errors

---
 Cargo.toml                             | 2 +-
 Makefile                               | 2 +-
 src/client/transactions/mod.rs         | 4 ++--
 src/store/sqlite_store/transactions.rs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 488ac2ab3..ddbc179af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ comfy-table = "7.1.0"
 figment = { version = "0.10", features = ["toml", "env"] }
 lazy_static = "1.4.0"
 miden-lib = { package = "miden-lib", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
-miden-node-proto = { package = "miden-node-proto", git = "https://github.com/0xPolygonMiden/miden-node.git", branch = "polydez-tx-ids-in-sync", default-features = false }
+miden-node-proto = { package = "miden-node-proto", git = "https://github.com/0xPolygonMiden/miden-node.git", branch = "next", default-features = false }
 miden-tx = { package = "miden-tx", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
 miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde"] }
 rand = { version = "0.8.5" }
diff --git a/Makefile b/Makefile
index 6f69d8ec4..0db73f714 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ clean-node: ## Clean node directory
 .PHONY: node
 node: ## Setup node
 	if [ -d miden-node ]; then cd miden-node ; else git clone https://github.com/0xPolygonMiden/miden-node.git && cd miden-node; fi
-	cd miden-node && git checkout polydez-tx-ids-in-sync && git pull origin polydez-tx-ids-in-sync && cargo update
+	cd miden-node && git checkout next && git pull origin next && cargo update
 	cd miden-node && rm -rf miden-store.sqlite3*
 	cd miden-node && cargo run --bin miden-node --features $(NODE_FEATURES_TESTING) -- make-genesis --inputs-path ../tests/config/genesis.toml --force
 
diff --git a/src/client/transactions/mod.rs b/src/client/transactions/mod.rs
index 7f4311b29..f5e9fb6a8 100644
--- a/src/client/transactions/mod.rs
+++ b/src/client/transactions/mod.rs
@@ -8,7 +8,7 @@ use miden_objects::{
     crypto::rand::RpoRandomCoin,
     notes::{Note, NoteDetails, NoteId, NoteType},
     transaction::{
-        ExecutedTransaction, InputNotes, OutputNote, OutputNotes, ProvenTransaction,
+        ExecutedTransaction, InputNote, InputNotes, OutputNote, OutputNotes, ProvenTransaction,
         TransactionArgs, TransactionId, TransactionScript,
     },
     Digest, Felt, Word,
@@ -92,7 +92,7 @@ impl TransactionResult {
         self.transaction.account_delta()
     }
 
-    pub fn consumed_notes(&self) -> &InputNotes {
+    pub fn consumed_notes(&self) -> &InputNotes<InputNote> {
         self.transaction.tx_inputs().input_notes()
     }
 }
diff --git a/src/store/sqlite_store/transactions.rs b/src/store/sqlite_store/transactions.rs
index dd92f661f..8a0b8df6b 100644
--- a/src/store/sqlite_store/transactions.rs
+++ b/src/store/sqlite_store/transactions.rs
@@ -4,7 +4,7 @@ use miden_objects::{
     accounts::AccountId,
     assembly::{AstSerdeOptions, ProgramAst},
     crypto::utils::{Deserializable, Serializable},
-    transaction::{OutputNotes, ToNullifier, TransactionId, TransactionScript},
+    transaction::{OutputNotes, ToInputNoteCommitments, TransactionId, TransactionScript},
     Digest, Felt,
 };
 use rusqlite::{params, Transaction};