refactor: create senders based on escrow account version (#624)

* refactor: create senders based on escrow account

Signed-off-by: Gustavo Inacio <[email protected]>

* refactor: implement get_pending_sender_allocation_id_v2

Signed-off-by: Gustavo Inacio <[email protected]>

* test: update test-log to print debug messages

Signed-off-by: Gustavo Inacio <[email protected]>

* test: update create_manager() to receive list of initial accounts

Signed-off-by: Gustavo Inacio <[email protected]>

* refactor: pass sender_type to sender_account

Signed-off-by: Gustavo Inacio <[email protected]>

* chore: add just ci cmd

Signed-off-by: Gustavo Inacio <[email protected]>

* test: add back where last

Signed-off-by: Gustavo Inacio <[email protected]>

* docs: add just ci docs

Signed-off-by: Gustavo Inacio <[email protected]>

* perf: update queries to load up v2

Signed-off-by: Gustavo Inacio <[email protected]>

---------

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

.sqlx/query-b1d4dfcd202af310df032edc34d83dabb56d7b947b023ee3a8b32b24b07bcd18.json renamed to .sqlx/query-1644e9aa44b08e99180cff30a6b0cc1fe1e5367bd545ca489d116de0a709a6ee.json

@@ -95,12 +95,33 @@ pub async fn escrow_accounts(
     reject_thawing_signers: bool,
 ) -> Result<EscrowAccountsWatcher, anyhow::Error> {
     indexer_watcher::new_watcher(interval, move || {
-        get_escrow_accounts(escrow_subgraph, indexer_address, reject_thawing_signers)
+        get_escrow_accounts_v1(escrow_subgraph, indexer_address, reject_thawing_signers)
     })
     .await
 }
 
-async fn get_escrow_accounts(
+pub async fn escrow_accounts_v2(
+    escrow_subgraph: &'static SubgraphClient,
+    indexer_address: Address,
+    interval: Duration,
+    reject_thawing_signers: bool,
+) -> Result<EscrowAccountsWatcher, anyhow::Error> {
+    indexer_watcher::new_watcher(interval, move || {
+        get_escrow_accounts_v2(escrow_subgraph, indexer_address, reject_thawing_signers)
+    })
+    .await
+}
+
+// TODO implement escrow accounts v2 query
+async fn get_escrow_accounts_v2(
+    _escrow_subgraph: &'static SubgraphClient,
+    _indexer_address: Address,
+    _reject_thawing_signers: bool,
+) -> anyhow::Result<EscrowAccounts> {
+    Ok(EscrowAccounts::new(HashMap::new(), HashMap::new()))
+}
+
+async fn get_escrow_accounts_v1(
     escrow_subgraph: &'static SubgraphClient,
     indexer_address: Address,
     reject_thawing_signers: bool,

.sqlx/query-386e6b18da62b478ccdba5439490817f582abaec68e1ba01d55daee1e1edcbbd.json

@@ -15,6 +15,7 @@ pub use crate::{
     deployment_to_allocation::{deployment_to_allocation, DeploymentToAllocationWatcher},
     dispute_manager::{dispute_manager, DisputeManagerWatcher},
     escrow_accounts::{
-        escrow_accounts, EscrowAccounts, EscrowAccountsError, EscrowAccountsWatcher,
+        escrow_accounts, escrow_accounts_v2, EscrowAccounts, EscrowAccountsError,
+        EscrowAccountsWatcher,
     },
 };

.sqlx/query-7bf9c412120de537eecb8efb64da5b4ace9acc032be502cd1d9fc72c5b9ed50a.json

@@ -62,6 +62,6 @@ tempfile = "3.8.0"
 wiremock.workspace = true
 wiremock-grpc = "0.0.3-alpha3"
 test-assets = { path = "../test-assets" }
-test-log = { version = "0.2.12", default-features = false }
+test-log = { version = "0.2.12", features = ["trace"] }
 bon = "3.3"
 rstest = "0.24.0"

Cargo.lock

@@ -39,7 +39,9 @@ use indexer_config::{
     Config, EscrowSubgraphConfig, GraphNodeConfig, IndexerConfig, NetworkSubgraphConfig,
     SubgraphConfig, SubgraphsConfig, TapConfig,
 };
-use indexer_monitor::{escrow_accounts, indexer_allocations, DeploymentDetails, SubgraphClient};
+use indexer_monitor::{
+    escrow_accounts, escrow_accounts_v2, indexer_allocations, DeploymentDetails, SubgraphClient,
+};
 use ractor::{concurrency::JoinHandle, Actor, ActorRef};
 use sender_account::SenderAccountConfig;
 use sender_accounts_manager::SenderAccountsManager;
@@ -154,7 +156,16 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
         .await,
     ));
 
-    let escrow_accounts = escrow_accounts(
+    let escrow_accounts_v1 = escrow_accounts(
+        escrow_subgraph,
+        *indexer_address,
+        *escrow_sync_interval,
+        false,
+    )
+    .await
+    .expect("Error creating escrow_accounts channel");
+
+    let escrow_accounts_v2 = escrow_accounts_v2(
         escrow_subgraph,
         *indexer_address,
         *escrow_sync_interval,
@@ -170,7 +181,8 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
         domain_separator: EIP_712_DOMAIN.clone(),
         pgpool,
         indexer_allocations,
-        escrow_accounts,
+        escrow_accounts_v1,
+        escrow_accounts_v2,
         escrow_subgraph,
         network_subgraph,
         sender_aggregator_endpoints: sender_aggregator_endpoints.clone(),