From 849c5094ef9a5302b03dd6eb113afde446b60037 Mon Sep 17 00:00:00 2001
From: Mathis <sveitser@gmail.com>
Date: Wed, 11 Dec 2024 16:11:31 +0100
Subject: [PATCH] docker demo: read initial stake table from file (#2389)

- Avoid printing shortened Ethereum addresses
---
 docker-compose.yaml         |  3 +++
 sequencer/src/bin/deploy.rs |  1 +
 utils/src/deployer.rs       | 12 ++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index b10412001..46d844b77 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,6 +19,7 @@ services:
     image: ghcr.io/espressosystems/espresso-sequencer/deploy:main
     command: deploy --only fee-contract,permissioned-stake-table
     environment:
+      - ESPRESSO_SEQUENCER_INITIAL_PERMISSIONED_STAKE_TABLE_PATH=/data/initial_stake_table.toml
       - ESPRESSO_SEQUENCER_ETH_MULTISIG_ADDRESS
       - ESPRESSO_SEQUENCER_L1_PROVIDER
       - ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL
@@ -26,6 +27,8 @@ services:
       - RUST_LOG
       - RUST_LOG_FORMAT
       - ASYNC_STD_THREAD_COUNT
+    volumes:
+      - "./data/initial_stake_table.toml:/data/initial_stake_table.toml"
     depends_on:
       demo-l1-network:
         condition: service_healthy
diff --git a/sequencer/src/bin/deploy.rs b/sequencer/src/bin/deploy.rs
index afd6e96f7..a0fdf63dd 100644
--- a/sequencer/src/bin/deploy.rs
+++ b/sequencer/src/bin/deploy.rs
@@ -152,6 +152,7 @@ async fn main() -> anyhow::Result<()> {
     let genesis = light_client_genesis(&sequencer_url, opt.stake_table_capacity).boxed();
 
     let initial_stake_table = if let Some(path) = opt.initial_stake_table_path {
+        tracing::info!("Loading initial stake table from {:?}", path);
         Some(PermissionedStakeTableConfig::from_toml_file(&path)?.into())
     } else {
         None
diff --git a/utils/src/deployer.rs b/utils/src/deployer.rs
index 50826c042..3ffbe3318 100644
--- a/utils/src/deployer.rs
+++ b/utils/src/deployer.rs
@@ -390,8 +390,8 @@ pub async fn deploy(
         // Transfer ownership to the multisig wallet if provided.
         if let Some(owner) = multisig_address {
             tracing::info!(
-                %light_client_proxy_address,
-                %owner,
+                ?light_client_proxy_address,
+                ?owner,
                 "transferring light client proxy ownership to multisig",
             );
             proxy.transfer_ownership(owner).send().await?.await?;
@@ -429,8 +429,8 @@ pub async fn deploy(
         // Transfer ownership to the multisig wallet if provided.
         if let Some(owner) = multisig_address {
             tracing::info!(
-                %fee_contract_proxy_address,
-                %owner,
+                ?fee_contract_proxy_address,
+                ?owner,
                 "transferring fee contract proxy ownership to multisig",
             );
             proxy.transfer_ownership(owner).send().await?.await?;
@@ -451,8 +451,8 @@ pub async fn deploy(
         // Transfer ownership to the multisig wallet if provided.
         if let Some(owner) = multisig_address {
             tracing::info!(
-                %stake_table_address,
-                %owner,
+                ?stake_table_address,
+                ?owner,
                 "transferring PermissionedStakeTable ownership to multisig",
             );
             stake_table.transfer_ownership(owner).send().await?.await?;