fix(bridge-withdrawer)!: fix nonce handling

.github/workflows/docker-build.yml

@@ -135,7 +135,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Smoke Test Environment
-        timeout-minutes: 5
+        timeout-minutes: 10
         run: |
           TAG=sha-$(git rev-parse --short HEAD)
           just deploy cluster

charts/evm-bridge-withdrawer/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.2
+version: 0.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/evm-bridge-withdrawer/templates/configmaps.yaml

@@ -31,6 +31,7 @@ data:
   {{- if not .Values.global.dev }}
   ASTRIA_BRIDGE_WITHDRAWER_MIN_EXPECTED_FEE_ASSET_BALANCE: "{{ .Values.config.minExpectedFeeAssetBalance }}"
   {{- else }}
+  ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_GRPC_ENDPOINT: "{{ .Values.config.sequencerGrpcEndpoint }}"
   {{- end }}
 ---
 {{- if not .Values.secretProvider.enabled }}

charts/evm-bridge-withdrawer/values.yaml

@@ -15,6 +15,7 @@ images:
     devTag: latest
 
 config:
+  sequencerGrpcEndpoint: ""
   sequencerCometbftEndpoint: ""
   sequencerChainId: ""
   sequencerAddressPrefix: "astria"

crates/astria-bridge-withdrawer/Cargo.toml

@@ -33,10 +33,15 @@ tracing = { workspace = true }
 tryhard = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
 tokio-util = { workspace = true }
+tonic = { workspace = true }
 
 astria-bridge-contracts = { path = "../astria-bridge-contracts" }
 astria-build-info = { path = "../astria-build-info", features = ["runtime"] }
-astria-core = { path = "../astria-core", features = ["serde", "server"] }
+astria-core = { path = "../astria-core", features = [
+  "serde",
+  "server",
+  "client",
+] }
 astria-eyre = { path = "../astria-eyre" }
 config = { package = "astria-config", path = "../astria-config" }
 sequencer-client = { package = "astria-sequencer-client", path = "../astria-sequencer-client", features = [

crates/astria-bridge-withdrawer/local.env.example

@@ -19,6 +19,10 @@ ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT=false
 # `ASTRIA_BRIDGE_WITHDRAWER_PRETTY_PRINT` is set to `true`.
 NO_COLOR=
 
+# The sequencer application gRPC service used for fetching the pending nonce.
+# 127.0.0.1:8080 is the default socket address for its gRPC server.
+ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_GRPC_ENDPOINT="http://127.0.0.1:8080"
+
 # Address of cometbft/tendermint to request new block heights.
 # 127.0.0.1:26657 is the default socket address at which cometbft
 # serves RPCs.

crates/astria-bridge-withdrawer/src/bridge_withdrawer/mod.rs

@@ -76,6 +76,7 @@ impl BridgeWithdrawer {
             ethereum_rpc_endpoint,
             rollup_asset_denomination,
             sequencer_bridge_address,
+            sequencer_grpc_endpoint,
             ..
         } = cfg;
 
@@ -92,6 +93,7 @@ impl BridgeWithdrawer {
             sequencer_chain_id,
             sequencer_cometbft_endpoint: sequencer_cometbft_endpoint.clone(),
             sequencer_bridge_address,
+            sequencer_grpc_endpoint: sequencer_grpc_endpoint.clone(),
             expected_fee_asset: fee_asset_denomination,
         }
         .build()
@@ -104,6 +106,7 @@ impl BridgeWithdrawer {
             shutdown_token: shutdown_handle.token(),
             startup_handle: startup_handle.clone(),
             sequencer_cometbft_endpoint,
+            sequencer_grpc_endpoint,
             sequencer_key_path,
             sequencer_address_prefix: sequencer_address_prefix.clone(),
             state: state.clone(),
@@ -404,16 +407,3 @@ pub(crate) fn flatten_result<T>(res: Result<eyre::Result<T>, JoinError>) -> eyre
         Err(err) => Err(err).wrap_err("task panicked"),
     }
 }
-
-#[cfg(test)]
-/// Constructs an [`Address`] prefixed by `"astria"`.
-#[cfg(test)]
-pub(crate) fn astria_address(
-    array: [u8; astria_core::primitive::v1::ADDRESS_LEN],
-) -> astria_core::primitive::v1::Address {
-    astria_core::primitive::v1::Address::builder()
-        .array(array)
-        .prefix("astria")
-        .try_build()
-        .unwrap()
-}