Merge pull request #18 from CityOfZion/wallet-jsons

Upgraded to NEP-6 JSON wallets (using neo-cli 2.5.2)

.gitignore

@@ -1,2 +1,3 @@
 neo-privnet.wallet
 neo-privnet.wif
+*.zip

Dockerfile

@@ -38,19 +38,19 @@ RUN unzip -d /opt/node4 /opt/neo-cli.zip
 
 ADD ./configs/config1.json /opt/node1/neo-cli/config.json
 ADD ./configs/protocol.json /opt/node1/neo-cli/protocol.json
-ADD ./wallets/wallet1.db3 /opt/node1/neo-cli/
+ADD ./wallets/wallet1.json /opt/node1/neo-cli/
 
 ADD ./configs/config2.json /opt/node2/neo-cli/config.json
 ADD ./configs/protocol.json /opt/node2/neo-cli/protocol.json
-ADD ./wallets/wallet2.db3 /opt/node2/neo-cli/
+ADD ./wallets/wallet2.json /opt/node2/neo-cli/
 
 ADD ./configs/config3.json /opt/node3/neo-cli/config.json
 ADD ./configs/protocol.json /opt/node3/neo-cli/protocol.json
-ADD ./wallets/wallet3.db3 /opt/node3/neo-cli/
+ADD ./wallets/wallet3.json /opt/node3/neo-cli/
 
 ADD ./configs/config4.json /opt/node4/neo-cli/config.json
 ADD ./configs/protocol.json /opt/node4/neo-cli/protocol.json
-ADD ./wallets/wallet4.db3 /opt/node4/neo-cli/
+ADD ./wallets/wallet4.json /opt/node4/neo-cli/
 
 # Upload scripts
 ADD ./scripts/run.sh /opt/

README.md

@@ -96,10 +96,10 @@ Note: all four must be copied.
 
 The following will copy each wallet from the docker image to the current working directory.
 
-    docker cp neo-privnet:/opt/node1/neo-cli/wallet1.db3 .
-    docker cp neo-privnet:/opt/node2/neo-cli/wallet2.db3 .
-    docker cp neo-privnet:/opt/node3/neo-cli/wallet3.db3 .
-    docker cp neo-privnet:/opt/node4/neo-cli/wallet4.db3 .
+    docker cp neo-privnet:/opt/node1/neo-cli/wallet1.json .
+    docker cp neo-privnet:/opt/node2/neo-cli/wallet2.json .
+    docker cp neo-privnet:/opt/node3/neo-cli/wallet3.json .
+    docker cp neo-privnet:/opt/node4/neo-cli/wallet4.json .
 
 ## Wallet Passwords
 

docker_build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # To use a newer neo-cli version, just update this variable:
-NEO_CLI_VERSION="2.4.1"
+NEO_CLI_VERSION="2.5.2"
 
 # Definition of standard neo-cli filenames and URL based on the version
 NEO_CLI_ZIPFN="neo-release-${NEO_CLI_VERSION}.zip"

scripts/run.sh

@@ -3,10 +3,10 @@
 # This script starts four consensus and waits forever
 #
 
-screen -dmS node1 expect /opt/start_consensus_node.sh /opt/node1/neo-cli/ wallet1.db3 one
-screen -dmS node2 expect /opt/start_consensus_node.sh /opt/node2/neo-cli/ wallet2.db3 two
-screen -dmS node3 expect /opt/start_consensus_node.sh /opt/node3/neo-cli/ wallet3.db3 three
-screen -dmS node4 expect /opt/start_consensus_node.sh /opt/node4/neo-cli/ wallet4.db3 four
+screen -dmS node1 expect /opt/start_consensus_node.sh /opt/node1/neo-cli/ wallet1.json one
+screen -dmS node2 expect /opt/start_consensus_node.sh /opt/node2/neo-cli/ wallet2.json two
+screen -dmS node3 expect /opt/start_consensus_node.sh /opt/node3/neo-cli/ wallet3.json three
+screen -dmS node4 expect /opt/start_consensus_node.sh /opt/node4/neo-cli/ wallet4.json four
 
 sleep infinity
 

wallets/wallet1.json

@@ -0,0 +1 @@
+{"name":"wallet1","version":"1.0","scrypt":{"n":16384,"r":8,"p":8},"accounts":[{"address":"AKkkumHbBipZ46UMZJoFynJMXzSRnBvKcs","label":null,"isDefault":false,"lock":false,"key":"6PYLmjBYJ4wQTCEfqvnznGJwZeW9pfUcV5m5oreHxqryUgqKpTRAFt9L8Y","contract":{"script":"2102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2ac","parameters":[{"name":"parameter0","type":"Signature"}],"deployed":false},"extra":null},{"address":"AZ81H31DMWzbSnFDLFkzh9vHwaDLayV7fU","label":null,"isDefault":false,"lock":false,"key":"6PYLmjBYJ4wQTCEfqvnznGJwZeW9pfUcV5m5oreHxqryUgqKpTRAFt9L8Y","contract":{"script":"532102103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406e2102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd622102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc22103d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee69954ae","parameters":[{"name":"parameter0","type":"Signature"},{"name":"parameter1","type":"Signature"},{"name":"parameter2","type":"Signature"}],"deployed":false},"extra":null}],"extra":null}

wallets/wallet2.json

@@ -0,0 +1 @@
+{"name":"wallet2","version":"1.0","scrypt":{"n":16384,"r":8,"p":8},"accounts":[{"address":"AWLYWXB8C9Lt1nHdDZJnC5cpYJjgRDLk17","label":null,"isDefault":false,"lock":false,"key":"6PYXHjPaNvW8YknSXaKsTWjf9FRxo1s4naV2jdmSQEgzaqKGX368rndN3L","contract":{"script":"2102103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406eac","parameters":[{"name":"parameter0","type":"Signature"}],"deployed":false},"extra":null},{"address":"AZ81H31DMWzbSnFDLFkzh9vHwaDLayV7fU","label":null,"isDefault":false,"lock":false,"key":"6PYXHjPaNvW8YknSXaKsTWjf9FRxo1s4naV2jdmSQEgzaqKGX368rndN3L","contract":{"script":"532102103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406e2102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd622102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc22103d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee69954ae","parameters":[{"name":"parameter0","type":"Signature"},{"name":"parameter1","type":"Signature"},{"name":"parameter2","type":"Signature"}],"deployed":false},"extra":null}],"extra":null}

wallets/wallet3.json

@@ -0,0 +1 @@
+{"name":"wallet3","version":"1.0","scrypt":{"n":16384,"r":8,"p":8},"accounts":[{"address":"AR3uEnLUdfm1tPMJmiJQurAXGL7h3EXQ2F","label":null,"isDefault":false,"lock":false,"key":"6PYX86vYiHfUbpD95hfN1xgnvcSxy5skxfWYKu3ztjecxk6ikYs2kcWbeh","contract":{"script":"2103d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee699ac","parameters":[{"name":"parameter0","type":"Signature"}],"deployed":false},"extra":null},{"address":"AZ81H31DMWzbSnFDLFkzh9vHwaDLayV7fU","label":null,"isDefault":false,"lock":false,"key":"6PYX86vYiHfUbpD95hfN1xgnvcSxy5skxfWYKu3ztjecxk6ikYs2kcWbeh","contract":{"script":"532102103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406e2102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd622102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc22103d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee69954ae","parameters":[{"name":"parameter0","type":"Signature"},{"name":"parameter1","type":"Signature"},{"name":"parameter2","type":"Signature"}],"deployed":false},"extra":null}],"extra":null}

wallets/wallet4.json

@@ -0,0 +1 @@
+{"name":"wallet4","version":"1.0","scrypt":{"n":16384,"r":8,"p":8},"accounts":[{"address":"AJmjUqf1jDenxYpuNS4i2NxD9FQYieDpBF","label":null,"isDefault":false,"lock":false,"key":"6PYRXVwHSqFSukL3CuXxdQ75VmsKpjeLgQLEjt83FrtHf1gCVphHzdD4nc","contract":{"script":"2102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62ac","parameters":[{"name":"parameter0","type":"Signature"}],"deployed":false},"extra":null},{"address":"AZ81H31DMWzbSnFDLFkzh9vHwaDLayV7fU","label":null,"isDefault":false,"lock":false,"key":"6PYRXVwHSqFSukL3CuXxdQ75VmsKpjeLgQLEjt83FrtHf1gCVphHzdD4nc","contract":{"script":"532102103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406e2102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd622102b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc22103d90c07df63e690ce77912e10ab51acc944b66860237b608c4f8f8309e71ee69954ae","parameters":[{"name":"parameter0","type":"Signature"},{"name":"parameter1","type":"Signature"},{"name":"parameter2","type":"Signature"}],"deployed":false},"extra":null}],"extra":null}