From 025adcd9b589eab4d539c8ee92516458d0e491a1 Mon Sep 17 00:00:00 2001
From: kafeikui <72855105+kafeikui@users.noreply.github.com>
Date: Tue, 18 Jun 2024 00:42:36 +0800
Subject: [PATCH] Fix node shell (#104)

* add retry of coordinator.publish()

* fix signer address

* bump version
---
 Cargo.lock                                    | 24 +++++++++----------
 Cargo.toml                                    | 16 ++++++-------
 .../contract-client/src/ethers/coordinator.rs |  2 +-
 .../src/ethers/node_registry.rs               |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d80b8c8f..a2296df4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -481,7 +481,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-contract-client"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "arpa-core",
@@ -506,7 +506,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-core"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -531,7 +531,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-dal"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "arpa-core",
@@ -550,7 +550,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-log"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "arpa-log-impl",
@@ -566,7 +566,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-log-impl"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -575,7 +575,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-node"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -619,7 +619,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-sqlite-db"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "arpa-core",
@@ -644,7 +644,7 @@ dependencies = [
 
 [[package]]
 name = "arpa-user-cli"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "arpa-contract-client",
@@ -1893,7 +1893,7 @@ dependencies = [
 
 [[package]]
 name = "dkg-core"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "async-trait",
  "bincode",
@@ -2000,7 +2000,7 @@ dependencies = [
 
 [[package]]
 name = "entity"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "sea-orm",
  "serde",
@@ -3453,7 +3453,7 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "migration"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "async-std",
  "entity",
@@ -5964,7 +5964,7 @@ dependencies = [
 
 [[package]]
 name = "threshold-bls"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
diff --git a/Cargo.toml b/Cargo.toml
index 203ed5c9..1c4ca98c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 documentation = "https://docs.arpanetwork.io/"
@@ -49,13 +49,13 @@ debug-assertions = true
 debug = true
 
 [workspace.dependencies]
-arpa-log = { version = "0.2.1", path = "crates/log" }
-arpa-core = { version = "0.2.1", path = "crates/core" }
-arpa-dal = { version = "0.2.1", path = "crates/dal" }
-arpa-sqlite-db = { version = "0.2.1", path = "crates/dal/sqlite" }
-arpa-contract-client = { version = "0.2.1", path = "crates/contract-client" }
-dkg-core = { version = "0.2.1", path = "crates/dkg-core" }
-threshold-bls = { version = "0.2.1", path = "crates/threshold-bls", default-features = false, features = [
+arpa-log = { version = "0.2.2", path = "crates/log" }
+arpa-core = { version = "0.2.2", path = "crates/core" }
+arpa-dal = { version = "0.2.2", path = "crates/dal" }
+arpa-sqlite-db = { version = "0.2.2", path = "crates/dal/sqlite" }
+arpa-contract-client = { version = "0.2.2", path = "crates/contract-client" }
+dkg-core = { version = "0.2.2", path = "crates/dkg-core" }
+threshold-bls = { version = "0.2.2", path = "crates/threshold-bls", default-features = false, features = [
     "bn254",
 ] }
 ethers = "2.0"
diff --git a/crates/contract-client/src/ethers/coordinator.rs b/crates/contract-client/src/ethers/coordinator.rs
index e80aa216..058de490 100644
--- a/crates/contract-client/src/ethers/coordinator.rs
+++ b/crates/contract-client/src/ethers/coordinator.rs
@@ -100,7 +100,7 @@ impl CoordinatorTransactions for CoordinatorClient {
             coordinator_contract.client_ref(),
             call,
             self.contract_transaction_retry_descriptor,
-            false,
+            true,
         )
         .await
     }
diff --git a/crates/contract-client/src/ethers/node_registry.rs b/crates/contract-client/src/ethers/node_registry.rs
index 001e1d16..3c48803c 100644
--- a/crates/contract-client/src/ethers/node_registry.rs
+++ b/crates/contract-client/src/ethers/node_registry.rs
@@ -68,7 +68,7 @@ impl NodeRegistryClient {
 
         let digest_hash = avs_directory_contract
             .calculate_operator_avs_registration_digest_hash(
-                self.client.inner().address(),
+                signer.address(),
                 service_manager_address,
                 salt,
                 expiry,