Updated the staker tooling

aionnetwork · Jan 24, 2020 · a15bb81 · a15bb81
1 parent 6090159
commit a15bb81
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 7 deletions.
diff --git a/tooling/README.md b/tooling/README.md
@@ -9,13 +9,13 @@ The script will:
  * and then shut down the kernel.
 Once the script has finished running, the custom network is unity ready to be used for testing purposes.
 
-# Launching the staker
+# Launching the block signer
 
-After the kernel setup is ready (after running the bootstrap script), the user can boot up the node and run the staker script.
+After the kernel setup is ready (after running the bootstrap script), the user can boot up the node and run the block signer script.
 
-The staker can be used directly from the terminal by launching `./launchStaker.sh` in the `externalStaker` folder.
+The staker can be used directly from the terminal by launching `./launchBlockSigner.sh` in the `blockSigner` folder.
 
-The script will run the staker using the custom network default settings.
+The script will run the blockSigner app using the custom network default settings.
 
-<!--For more details regarding the external staker, please read the `README.md` in the `externalStaker` folder.-->
+<!--For more details regarding the blockSigner, please read the README.md in https://github.com/aionnetwork/block_signer-->
 
diff --git a/tooling/blockSigner/block_signer.jar b/tooling/blockSigner/block_signer.jar
diff --git a/tooling/externalStaker/launchStaker.sh → tooling/blockSigner/launchBlockSigner.sh b/tooling/externalStaker/launchStaker.sh → tooling/blockSigner/launchBlockSigner.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x
 
 echo
 echo "Launching external staker..."
@@ -9,8 +8,10 @@ SIGNING_ADDRESS_PRIVATE_KEY="0xcc76648ce8798bc18130bc9d637995e5c42a922ebeab78795
 COINBASE_ADDRESS="0xa02df9004be3c4a20aeb50c459212412b1d0a58da3e1ac70ba74dde6b4accf4b"
 NODE_IP="127.0.0.1"
 NODE_PORT="8545"
+NETWORK="amity"
+VERBOSE="false"
 
-java -cp "external_staker.jar:lib/*" org.aion.staker.ExternalStaker $SIGNING_ADDRESS_PRIVATE_KEY $COINBASE_ADDRESS $NODE_IP $NODE_PORT
+java -jar block_signer.jar $SIGNING_ADDRESS_PRIVATE_KEY $COINBASE_ADDRESS $NETWORK $NODE_IP $NODE_PORT $VERBOSE
 
 echo
 echo "Shutting down the external staker..."

diff --git a/tooling/externalStaker/external_staker.jar b/tooling/externalStaker/external_staker.jar
diff --git a/tooling/externalStaker/lib/commons-codec-1.11.jar b/tooling/externalStaker/lib/commons-codec-1.11.jar
diff --git a/tooling/externalStaker/lib/ed25519.jar b/tooling/externalStaker/lib/ed25519.jar
diff --git a/tooling/externalStaker/lib/gson-2.8.5.jar b/tooling/externalStaker/lib/gson-2.8.5.jar
diff --git a/tooling/externalStaker/lib/modUtil.jar b/tooling/externalStaker/lib/modUtil.jar
diff --git a/tooling/externalStaker/lib/node-test-harness.jar b/tooling/externalStaker/lib/node-test-harness.jar
diff --git a/tooling/externalStaker/lib/offline-signer.jar b/tooling/externalStaker/lib/offline-signer.jar
diff --git a/tooling/externalStaker/lib/org-aion-avm-api.jar b/tooling/externalStaker/lib/org-aion-avm-api.jar
diff --git a/tooling/externalStaker/lib/org-aion-avm-userlib.jar b/tooling/externalStaker/lib/org-aion-avm-userlib.jar