From b6b6da6279a0e8cb6a3278d0645798fe6ddb1b01 Mon Sep 17 00:00:00 2001 From: CryptoTuga Date: Sun, 6 Jan 2019 19:43:53 +0000 Subject: [PATCH] Adding support for neo-cli v2.9.3 (#147) * support neocli 2.9.3 * change SimplePlugin version --- .env | 6 ++--- privnet/change_neo-cli_node_version.sh | 2 +- privnet/configs/v2.7.6.1/config-windows.json | 24 ------------------- privnet/configs/v2.7.6.1/config1.json | 23 ------------------ privnet/configs/v2.7.6.1/config2.json | 23 ------------------ privnet/configs/v2.7.6.1/config3.json | 23 ------------------ privnet/configs/v2.7.6.1/config4.json | 23 ------------------ privnet/configs/v2.8.0/config-windows.json | 24 ------------------- privnet/configs/v2.9.0/config-windows.json | 24 ------------------- privnet/configs/v2.9.3/config1.json | 24 +++++++++++++++++++ privnet/configs/v2.9.3/config2.json | 24 +++++++++++++++++++ privnet/configs/v2.9.3/config3.json | 24 +++++++++++++++++++ privnet/configs/v2.9.3/config4.json | 24 +++++++++++++++++++ .../{v2.7.6.1 => v2.9.3}/protocol.json | 0 14 files changed, 100 insertions(+), 168 deletions(-) delete mode 100644 privnet/configs/v2.7.6.1/config-windows.json delete mode 100644 privnet/configs/v2.7.6.1/config1.json delete mode 100644 privnet/configs/v2.7.6.1/config2.json delete mode 100644 privnet/configs/v2.7.6.1/config3.json delete mode 100644 privnet/configs/v2.7.6.1/config4.json delete mode 100644 privnet/configs/v2.8.0/config-windows.json delete mode 100644 privnet/configs/v2.9.0/config-windows.json create mode 100644 privnet/configs/v2.9.3/config1.json create mode 100644 privnet/configs/v2.9.3/config2.json create mode 100644 privnet/configs/v2.9.3/config3.json create mode 100644 privnet/configs/v2.9.3/config4.json rename privnet/configs/{v2.7.6.1 => v2.9.3}/protocol.json (100%) diff --git a/.env b/.env index 03333e1..05fd169 100644 --- a/.env +++ b/.env @@ -6,11 +6,11 @@ SEED_SERVER=neo-cli-privatenet-1 HOST_NAME=localhost # neo-cli version -# Other supported versions: 2.9.0, 2.8.0, 2.7.6.1 -NODE1_NEO_CLI_VERSION=2.8.0 +# Other supported versions: 2.9.3, 2.9.2, 2.9.0, 2.8.0, 2.7.6.1 +NODE1_NEO_CLI_VERSION=2.9.0 NODE2_NEO_CLI_VERSION=2.7.6.1 NODE3_NEO_CLI_VERSION=2.8.0 -NODE4_NEO_CLI_VERSION=2.9.0 +NODE4_NEO_CLI_VERSION=2.9.3 # neo-cli bootstrap chain # Supported versions are: _genesis, _4kBlocks diff --git a/privnet/change_neo-cli_node_version.sh b/privnet/change_neo-cli_node_version.sh index 1e5926d..90e887c 100755 --- a/privnet/change_neo-cli_node_version.sh +++ b/privnet/change_neo-cli_node_version.sh @@ -11,7 +11,7 @@ docker exec -it $CONTAINER bash -c 'apt-get install wget unzip -y' docker exec -it $CONTAINER bash -c 'mv /opt/node/neo-cli/ /opt/node/neo-cli_old' docker exec -it $CONTAINER bash -c "wget -O /opt/neo-cli.zip https://github.com/neo-project/neo-cli/releases/download/v$NEO_CLI_VERSION/neo-cli-linux-x64.zip || echo \"Error downloading neo-cli\" && exit" docker exec -it $CONTAINER bash -c 'unzip -q -d /opt/node /opt/neo-cli.zip' -docker exec -it $CONTAINER bash -c "wget -O /opt/SimplePolicy.zip https://github.com/neo-project/neo-plugins/releases/download/v2.9.0/SimplePolicy.zip || echo \"Error downloading neo-plugins\" && exit" +docker exec -it $CONTAINER bash -c "wget -O /opt/SimplePolicy.zip https://github.com/neo-project/neo-plugins/releases/download/v2.9.3/SimplePolicy.zip || echo \"Error downloading neo-plugins\" && exit" docker exec -it $CONTAINER bash -c 'unzip -q -d /opt/node/neo-cli /opt/SimplePolicy.zip' docker exec -it $CONTAINER bash -c 'rm -fr /opt/node/neo-cli/Index_0000DDB1' docker exec -it $CONTAINER bash -c 'rm -fr /opt/node/neo-cli/Chain_0000DDB1' diff --git a/privnet/configs/v2.7.6.1/config-windows.json b/privnet/configs/v2.7.6.1/config-windows.json deleted file mode 100644 index aaae8c9..0000000 --- a/privnet/configs/v2.7.6.1/config-windows.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain", - "Notifications": "Notifications" - }, - "P2P": { - "Port": 20333, - "WsPort": 10333 - }, - "RPC": { - "Port": 30333, - "SslCert": "", - "SslCertPassword": "" - }, - "DataDirectoryPath": "ChainTestNet", - "CertCachePath": "Certs", - "NodePort": 20333, - "WsPort": 20334, - "UriPrefix": [ "https://localhost:20332" ], - "SslCert": "", - "SslCertPassword": "", - } -} diff --git a/privnet/configs/v2.7.6.1/config1.json b/privnet/configs/v2.7.6.1/config1.json deleted file mode 100644 index fe14094..0000000 --- a/privnet/configs/v2.7.6.1/config1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain_{0}", - "ApplicationLogs": "ApplicationLogs_{0}" - }, - "P2P": { - "Port": 20333, - "WsPort": 10333 - }, - "RPC": { - "Port": 30333, - "SslCert": "", - "SslCertPassword": "" - }, - "UnlockWallet": { - "Path": "", - "Password": "", - "StartConsensus": false, - "IsActive": false - } - } -} \ No newline at end of file diff --git a/privnet/configs/v2.7.6.1/config2.json b/privnet/configs/v2.7.6.1/config2.json deleted file mode 100644 index 3b82109..0000000 --- a/privnet/configs/v2.7.6.1/config2.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain_{0}", - "ApplicationLogs": "ApplicationLogs_{0}" - }, - "P2P": { - "Port": 20334, - "WsPort": 10334 - }, - "RPC": { - "Port": 30334, - "SslCert": "", - "SslCertPassword": "" - }, - "UnlockWallet": { - "Path": "", - "Password": "", - "StartConsensus": false, - "IsActive": false - } - } -} \ No newline at end of file diff --git a/privnet/configs/v2.7.6.1/config3.json b/privnet/configs/v2.7.6.1/config3.json deleted file mode 100644 index a8e613e..0000000 --- a/privnet/configs/v2.7.6.1/config3.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain_{0}", - "ApplicationLogs": "ApplicationLogs_{0}" - }, - "P2P": { - "Port": 20335, - "WsPort": 10335 - }, - "RPC": { - "Port": 30335, - "SslCert": "", - "SslCertPassword": "" - }, - "UnlockWallet": { - "Path": "", - "Password": "", - "StartConsensus": false, - "IsActive": false - } - } -} \ No newline at end of file diff --git a/privnet/configs/v2.7.6.1/config4.json b/privnet/configs/v2.7.6.1/config4.json deleted file mode 100644 index 2a255bb..0000000 --- a/privnet/configs/v2.7.6.1/config4.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain_{0}", - "ApplicationLogs": "ApplicationLogs_{0}" - }, - "P2P": { - "Port": 20336, - "WsPort": 10336 - }, - "RPC": { - "Port": 30336, - "SslCert": "", - "SslCertPassword": "" - }, - "UnlockWallet": { - "Path": "", - "Password": "", - "StartConsensus": false, - "IsActive": false - } - } -} \ No newline at end of file diff --git a/privnet/configs/v2.8.0/config-windows.json b/privnet/configs/v2.8.0/config-windows.json deleted file mode 100644 index aaae8c9..0000000 --- a/privnet/configs/v2.8.0/config-windows.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain", - "Notifications": "Notifications" - }, - "P2P": { - "Port": 20333, - "WsPort": 10333 - }, - "RPC": { - "Port": 30333, - "SslCert": "", - "SslCertPassword": "" - }, - "DataDirectoryPath": "ChainTestNet", - "CertCachePath": "Certs", - "NodePort": 20333, - "WsPort": 20334, - "UriPrefix": [ "https://localhost:20332" ], - "SslCert": "", - "SslCertPassword": "", - } -} diff --git a/privnet/configs/v2.9.0/config-windows.json b/privnet/configs/v2.9.0/config-windows.json deleted file mode 100644 index aaae8c9..0000000 --- a/privnet/configs/v2.9.0/config-windows.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ApplicationConfiguration": { - "Paths": { - "Chain": "Chain", - "Notifications": "Notifications" - }, - "P2P": { - "Port": 20333, - "WsPort": 10333 - }, - "RPC": { - "Port": 30333, - "SslCert": "", - "SslCertPassword": "" - }, - "DataDirectoryPath": "ChainTestNet", - "CertCachePath": "Certs", - "NodePort": 20333, - "WsPort": 20334, - "UriPrefix": [ "https://localhost:20332" ], - "SslCert": "", - "SslCertPassword": "", - } -} diff --git a/privnet/configs/v2.9.3/config1.json b/privnet/configs/v2.9.3/config1.json new file mode 100644 index 0000000..23159a4 --- /dev/null +++ b/privnet/configs/v2.9.3/config1.json @@ -0,0 +1,24 @@ +{ + "ApplicationConfiguration": { + "Paths": { + "Chain": "Chain_{0}", + "Index": "Index_{0}" + }, + "P2P": { + "Port": 20333, + "WsPort": 10333 + }, + "RPC": { + "BindAddress": "0.0.0.0", + "Port": 30333, + "SslCert": "", + "SslCertPassword": "" + }, + "UnlockWallet": { + "Path": "", + "Password": "", + "StartConsensus": false, + "IsActive": false + } + } + } \ No newline at end of file diff --git a/privnet/configs/v2.9.3/config2.json b/privnet/configs/v2.9.3/config2.json new file mode 100644 index 0000000..53555b9 --- /dev/null +++ b/privnet/configs/v2.9.3/config2.json @@ -0,0 +1,24 @@ +{ + "ApplicationConfiguration": { + "Paths": { + "Chain": "Chain_{0}", + "Index": "Index_{0}" + }, + "P2P": { + "Port": 20334, + "WsPort": 10334 + }, + "RPC": { + "BindAddress": "0.0.0.0", + "Port": 30334, + "SslCert": "", + "SslCertPassword": "" + }, + "UnlockWallet": { + "Path": "", + "Password": "", + "StartConsensus": false, + "IsActive": false + } + } + } \ No newline at end of file diff --git a/privnet/configs/v2.9.3/config3.json b/privnet/configs/v2.9.3/config3.json new file mode 100644 index 0000000..fa3123c --- /dev/null +++ b/privnet/configs/v2.9.3/config3.json @@ -0,0 +1,24 @@ +{ + "ApplicationConfiguration": { + "Paths": { + "Chain": "Chain_{0}", + "Index": "Index_{0}" + }, + "P2P": { + "Port": 20335, + "WsPort": 10335 + }, + "RPC": { + "BindAddress": "0.0.0.0", + "Port": 30335, + "SslCert": "", + "SslCertPassword": "" + }, + "UnlockWallet": { + "Path": "", + "Password": "", + "StartConsensus": false, + "IsActive": false + } + } + } \ No newline at end of file diff --git a/privnet/configs/v2.9.3/config4.json b/privnet/configs/v2.9.3/config4.json new file mode 100644 index 0000000..d3b827e --- /dev/null +++ b/privnet/configs/v2.9.3/config4.json @@ -0,0 +1,24 @@ +{ + "ApplicationConfiguration": { + "Paths": { + "Chain": "Chain_{0}", + "Index": "Index_{0}" + }, + "P2P": { + "Port": 20336, + "WsPort": 10336 + }, + "RPC": { + "BindAddress": "0.0.0.0", + "Port": 30336, + "SslCert": "", + "SslCertPassword": "" + }, + "UnlockWallet": { + "Path": "", + "Password": "", + "StartConsensus": false, + "IsActive": false + } + } + } \ No newline at end of file diff --git a/privnet/configs/v2.7.6.1/protocol.json b/privnet/configs/v2.9.3/protocol.json similarity index 100% rename from privnet/configs/v2.7.6.1/protocol.json rename to privnet/configs/v2.9.3/protocol.json