Merge pull request #7673 from MinaProtocol/fix/run-local-net-redux

Fix for local net script, redux
MinaProtocol · Jan 25, 2021 · 18a035c · 18a035c
2 parents f34cb18 + d2749f1
commit 18a035c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/automation/scripts/testnet-keys.py b/automation/scripts/testnet-keys.py
@@ -13,7 +13,7 @@
 client = docker.from_env()
 p = inflect.engine()
 
-CODA_DAEMON_IMAGE = "codaprotocol/coda-daemon:0.0.14-rosetta-scaffold-inversion-489d898"
+CODA_DAEMON_IMAGE = "gcr.io/o1labs-192920/coda-daemon:0.2.6-5c08d6d"
 SCRIPT_DIR = Path(__file__).parent.absolute()
 
 # Default output folders for various kinds of keys
@@ -322,7 +322,7 @@ def generate_ledger(generate_remainder, service_accounts_directory,
                     online_fish_accounts_directory,
                     offline_fish_accounts_directory, staker_csv_file):
     """
-    Generates a Genesis Ledger based on previously generated Whale, Fish, and Block Producer keys. 
+    Generates a Genesis Ledger based on previously generated Whale, Fish, and Block Producer keys.
     If keys are not present on the filesystem at the specified location, they are not generated.
     """
 

diff --git a/scripts/run_local_network.sh b/scripts/run_local_network.sh
@@ -107,7 +107,7 @@ fi
 # ================================================
 # Update Timestamp
 
-python - <<END
+python3 - <<END
 import json
 import datetime
 
@@ -170,7 +170,7 @@ for i in $(seq 1 $whales); do
   metrics_port=$(echo $whale_start_port + 3 + $i*5 | bc)
   libp2p_metrics_port=$(echo $whale_start_port + 4 + $i*5 | bc)
 
-  CODA_PRIVKEY_PASS="naughty blue worm" $CODA daemon -peer "/ip4/127.0.0.1/tcp/3002/p2p/12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr" -client-port $client_port -rest-port $rest_port -external-port $ext_port -metrics-port $metrics_port -libp2p-metrics-port $libp2p_metrics_port -config-directory $folder -config-file $daemon -generate-genesis-proof true -block-producer-key $keyfile -log-json -run-snark-worker B62qp4UturELw4MmhAZhor8rwzaH1BBAivRnvdp1Yhkq6odhhFiT8uC -work-selection seq -log-level Trace &> $logfile &
+  CODA_PRIVKEY_PASS="naughty blue worm" $CODA daemon -peer "/ip4/127.0.0.1/tcp/3002/p2p/12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr" -client-port $client_port -rest-port $rest_port -external-port $ext_port -metrics-port $metrics_port -libp2p-metrics-port $libp2p_metrics_port -config-directory $folder -config-file $daemon -generate-genesis-proof true -block-producer-key $keyfile -log-json -snark-worker-fee "0.01" -run-snark-worker B62qp4UturELw4MmhAZhor8rwzaH1BBAivRnvdp1Yhkq6odhhFiT8uC -work-selection seq -log-level Trace &> $logfile &
   whale_pids[${i}]=$!
   whale_logfiles[${i}]=$logfile
   whale_clientport[${i}]=$client_port
@@ -190,7 +190,7 @@ for i in $(seq 1 $fish); do
   metrics_port=$(echo $fish_start_port + 3 + $i*5 | bc)
   libp2p_metrics_port=$(echo $fish_start_port + 4 + $i*5 | bc)
 
-  CODA_PRIVKEY_PASS="naughty blue worm" $CODA daemon -peer "/ip4/127.0.0.1/tcp/3002/p2p/12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr" -client-port $client_port -rest-port $rest_port -external-port $ext_port -metrics-port $metrics_port -libp2p-metrics-port $libp2p_metrics_port -config-directory $folder -config-file $daemon -generate-genesis-proof true -block-producer-key $keyfile -log-json -run-snark-worker B62qp4UturELw4MmhAZhor8rwzaH1BBAivRnvdp1Yhkq6odhhFiT8uC -work-selection seq -log-level Trace &> $logfile &
+  CODA_PRIVKEY_PASS="naughty blue worm" $CODA daemon -peer "/ip4/127.0.0.1/tcp/3002/p2p/12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr" -client-port $client_port -rest-port $rest_port -external-port $ext_port -metrics-port $metrics_port -libp2p-metrics-port $libp2p_metrics_port -config-directory $folder -config-file $daemon -generate-genesis-proof true -block-producer-key $keyfile -log-json -snark-worker-fee "0.01" -run-snark-worker B62qp4UturELw4MmhAZhor8rwzaH1BBAivRnvdp1Yhkq6odhhFiT8uC -work-selection seq -log-level Trace &> $logfile &
   fish_pids[${i}]=$!
   fish_logfiles[${i}]=$logfile
   fish_clientport[${i}]=$client_port

diff --git a/src/config/dev.mlh b/src/config/dev.mlh
@@ -6,7 +6,7 @@
 [%%import "/src/config/debug_level/some.mlh"]
 [%%import "/src/config/proof_level/check.mlh"]
 [%%import "/src/config/txpool_size.mlh"]
-[%%import "/src/config/account_creation_fee/high.mlh"]
+[%%import "/src/config/account_creation_fee/realistic.mlh"]
 [%%import "/src/config/amount_defaults/standard.mlh"]
 [%%import "/src/config/protocol_version/current.mlh"]
 [%%import "/src/config/supercharged_coinbase_factor/two.mlh"]