Update project to be compatible with compilation from Neo-Cli monorepo

docker-compose-eco-network/neo-cli/configs/config1.json → docker-compose-eco-network/Neo.CLI/configs/config1.json

@@ -11,7 +11,6 @@
     },
     "P2P": {
       "Port": 20333,
-      "WsPort": 10333,
       "MinDesiredConnections": 10,
       "MaxConnections": 40,
       "MaxConnectionsPerAddress": 10

docker-compose-eco-network/neo-cli/configs/config1RPC.json → docker-compose-eco-network/Neo.CLI/configs/config1RPC.json

@@ -11,7 +11,6 @@
     },
     "P2P": {
       "Port": 20337,
-      "WsPort": 10337,
       "MinDesiredConnections": 10,
       "MaxConnections": 40,
       "MaxConnectionsPerAddress": 10

docker-compose-eco-network/neo-cli/configs/config2.json → docker-compose-eco-network/Neo.CLI/configs/config2.json

@@ -11,7 +11,6 @@
     },
     "P2P": {
       "Port": 20334,
-      "WsPort": 10334,
       "MinDesiredConnections": 10,
       "MaxConnections": 40,
       "MaxConnectionsPerAddress": 10

docker-compose-eco-network/neo-cli/configs/config3.json → docker-compose-eco-network/Neo.CLI/configs/config3.json

@@ -11,7 +11,6 @@
     },
     "P2P": {
       "Port": 20335,
-      "WsPort": 10335,
       "MinDesiredConnections": 10,
       "MaxConnections": 40,
       "MaxConnectionsPerAddress": 10

docker-compose-eco-network/neo-cli/configs/config4.json → docker-compose-eco-network/Neo.CLI/configs/config4.json

@@ -11,7 +11,6 @@
     },
     "P2P": {
       "Port": 20336,
-      "WsPort": 10336,
       "MinDesiredConnections": 10,
       "MaxConnections": 40,
       "MaxConnectionsPerAddress": 10

docker-compose-eco-network/docker-compose.yml

@@ -11,7 +11,7 @@ networks:
 
 services:
 # ================================================================================
-# ================== OPEN CONTAINER WITH NEO-CLI CONSENSUS NODES AND RPC =========
+# ================== OPEN CONTAINER WITH Neo.CLI CONSENSUS NODES AND RPC =========
   eco-neo-csharp-node1-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-node1-running"
@@ -20,13 +20,13 @@ services:
       - "20333:20333"
       - "30333:30333"
     volumes:
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/config1.json:/opt/node/neo-cli/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/appLogConfig.json:/opt/node/neo-cli/Plugins/ApplicationLogs/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/rpcServer1.json:/opt/node/neo-cli/Plugins/RpcServer/config.json   
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/tokensTracker.json:/opt/node/neo-cli/Plugins/TokensTracker/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/dBFT.json:/opt/node/neo-cli/Plugins/DBFTPlugin/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/wallets/wallet1.json:/opt/node/neo-cli/wallet1.json
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node1:/opt/node/neo-cli/Logs/ConsensusService
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/config1.json:/opt/node/Neo.CLI/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/appLogConfig.json:/opt/node/Neo.CLI/Plugins/ApplicationLogs/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/rpcServer1.json:/opt/node/Neo.CLI/Plugins/RpcServer/config.json   
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/tokensTracker.json:/opt/node/Neo.CLI/Plugins/TokensTracker/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/dBFT.json:/opt/node/Neo.CLI/Plugins/DBFTPlugin/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/wallets/wallet1.json:/opt/node/Neo.CLI/wallet1.json
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node1:/opt/node/Neo.CLI/Logs/ConsensusService
     healthcheck:
       test:
         - CMD
@@ -55,13 +55,13 @@ services:
       - "20334:20334"
       - "30334:30334"
     volumes:
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/config2.json:/opt/node/neo-cli/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/appLogConfig.json:/opt/node/neo-cli/Plugins/ApplicationLogs/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/rpcServer2.json:/opt/node/neo-cli/Plugins/RpcServer/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/tokensTracker.json:/opt/node/neo-cli/Plugins/TokensTracker/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/dBFT.json:/opt/node/neo-cli/Plugins/DBFTPlugin/config.json    
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/wallets/wallet2.json:/opt/node/neo-cli/wallet2.json
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node2:/opt/node/neo-cli/Logs/ConsensusService
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/config2.json:/opt/node/Neo.CLI/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/appLogConfig.json:/opt/node/Neo.CLI/Plugins/ApplicationLogs/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/rpcServer2.json:/opt/node/Neo.CLI/Plugins/RpcServer/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/tokensTracker.json:/opt/node/Neo.CLI/Plugins/TokensTracker/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/dBFT.json:/opt/node/Neo.CLI/Plugins/DBFTPlugin/config.json    
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/wallets/wallet2.json:/opt/node/Neo.CLI/wallet2.json
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node2:/opt/node/Neo.CLI/Logs/ConsensusService
     healthcheck:
       test:
         - CMD
@@ -90,10 +90,10 @@ services:
       - "20335:20335"
       - "30335:30335"
     volumes:
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/config3.json:/opt/node/neo-cli/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/dBFT.json:/opt/node/neo-cli/Plugins/DBFTPlugin/config.json      
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/wallets/wallet3.json:/opt/node/neo-cli/wallet3.json
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node3:/opt/node/neo-cli/Logs/ConsensusService
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/config3.json:/opt/node/Neo.CLI/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/dBFT.json:/opt/node/Neo.CLI/Plugins/DBFTPlugin/config.json      
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/wallets/wallet3.json:/opt/node/Neo.CLI/wallet3.json
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node3:/opt/node/Neo.CLI/Logs/ConsensusService
     healthcheck:
       test:
         - CMD
@@ -122,10 +122,10 @@ services:
       - "20336:20336"
       - "30336:30336"
     volumes:
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/config4.json:/opt/node/neo-cli/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/dBFT.json:/opt/node/neo-cli/Plugins/DBFTPlugin/config.json      
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/wallets/wallet4.json:/opt/node/neo-cli/wallet4.json
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node4:/opt/node/neo-cli/Logs/ConsensusService         
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/config4.json:/opt/node/Neo.CLI/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/dBFT.json:/opt/node/Neo.CLI/Plugins/DBFTPlugin/config.json      
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/wallets/wallet4.json:/opt/node/Neo.CLI/wallet4.json
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-node4:/opt/node/Neo.CLI/Logs/ConsensusService         
     healthcheck:
       test:
         - CMD
@@ -154,21 +154,21 @@ services:
       - "20337:20337"
       - "30337:30337"
     volumes:
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/config1RPC.json:/opt/node/neo-cli/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/appLogConfig.json:/opt/node/neo-cli/Plugins/ApplicationLogs/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/rpcServer3.json:/opt/node/neo-cli/Plugins/RpcServer/config.json     
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/tokensTracker.json:/opt/node/neo-cli/Plugins/TokensTracker/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/statesDumper.json:/opt/node/neo-cli/Plugins/StatesDumper/config.json
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/getIncStorage.sh:/opt/getIncStorage.sh
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/dBFT.json:/opt/node/neo-cli/Plugins/DBFTPlugin/config.json      
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/wallets/walletRpc.json:/opt/node/neo-cli/walletRpc.json      
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc:/opt/node/neo-cli/Logs/ConsensusService
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/oracleService.json:/opt/node/neo-cli/Plugins/OracleService/config.json      
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-oraclehttps:/opt/node/neo-cli/Logs/OracleHttpsProtocol
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-oracleservice:/opt/node/neo-cli/Logs/OracleService
-      - $ECO_PWD/docker-compose-eco-network/neo-cli/configs/plugins/stateService.json:/opt/node/neo-cli/Plugins/StateService/config.json
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-verificationservice:/opt/node/neo-cli/Logs/VerificationService
-      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-verificationcontext:/opt/node/neo-cli/Logs/VerificationContext       
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/config1RPC.json:/opt/node/Neo.CLI/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/appLogConfig.json:/opt/node/Neo.CLI/Plugins/ApplicationLogs/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/rpcServer3.json:/opt/node/Neo.CLI/Plugins/RpcServer/config.json     
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/tokensTracker.json:/opt/node/Neo.CLI/Plugins/TokensTracker/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/statesDumper.json:/opt/node/Neo.CLI/Plugins/StatesDumper/config.json
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/getIncStorage.sh:/opt/getIncStorage.sh
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/dBFT.json:/opt/node/Neo.CLI/Plugins/DBFTPlugin/config.json      
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/wallets/walletRpc.json:/opt/node/Neo.CLI/walletRpc.json      
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc:/opt/node/Neo.CLI/Logs/ConsensusService
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/oracleService.json:/opt/node/Neo.CLI/Plugins/OracleService/config.json      
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-oraclehttps:/opt/node/Neo.CLI/Logs/OracleHttpsProtocol
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-oracleservice:/opt/node/Neo.CLI/Logs/OracleService
+      - $ECO_PWD/docker-compose-eco-network/Neo.CLI/configs/plugins/stateService.json:/opt/node/Neo.CLI/Plugins/StateService/config.json
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-verificationservice:/opt/node/Neo.CLI/Logs/VerificationService
+      - $ECO_PWD/docker-compose-eco-network/nodes-logs/logs-neocli-noderpc-verificationcontext:/opt/node/Neo.CLI/Logs/VerificationContext       
     depends_on:
       - eco-neo-csharp-node1-running
     healthcheck:
@@ -187,7 +187,7 @@ services:
         - private_net
         - inside_auto_heal
 
-# ================== OPEN CONTAINER WITH NEO-CLI CONSENSUS NODES AND RPC =========
+# ================== OPEN CONTAINER WITH Neo.CLI CONSENSUS NODES AND RPC =========
 # ================================================================================
 
 

docker-neo-csharp-node/Dockerfile

@@ -1,4 +1,5 @@
 # NEO csharp-nodes network simulator
+# https://hub.docker.com/_/microsoft-dotnet-aspnet/
 FROM mcr.microsoft.com/dotnet/aspnet:7.0.14-jammy
 
 LABEL maintainer="NeoResearch"

docker-neo-csharp-node/docker_build.sh

@@ -2,7 +2,7 @@
 set -e
 
 # This automatically downloads the client from specified NEO_CLI_URL NeoResearch
-NEO_CLI_VERSION="3.6.2-all-plugins"
+NEO_CLI_VERSION="3.6.2-all-plugins-monorepo-neocli"
 
 BASE_NAME="eco-neo-csharp-node"
 IMAGE_NAME="$BASE_NAME:$NEO_CLI_VERSION"

docker-neo-csharp-node/scripts/run.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 #
-# This script starts a neo-cli node
+# This script starts a Neo.CLI node
 
-#screen -L -dmS node1RPC expect /opt/start_rpc_node.sh /opt/node/neo-cli/
-#screen -L -dmS node2RPC expect /opt/start_rpc_node.sh /opt/node/neo-cli/
-#screen -L -dmS node1 expect /opt/start_consensus_node.sh /opt/node/neo-cli/ wallet1.json one callRPC
-#screen -L -dmS node2 expect /opt/start_consensus_node.sh /opt/node/neo-cli/ wallet2.json two 0
-#screen -L -dmS node3 expect /opt/start_consensus_node.sh /opt/node/neo-cli/ wallet3.json three 0
-#screen -L -dmS node4 expect /opt/start_consensus_node.sh /opt/node/neo-cli/ wallet4.json four 0
+#screen -L -dmS node1RPC expect /opt/start_rpc_node.sh /opt/node/Neo.CLI/
+#screen -L -dmS node2RPC expect /opt/start_rpc_node.sh /opt/node/Neo.CLI/
+#screen -L -dmS node1 expect /opt/start_consensus_node.sh /opt/node/Neo.CLI/ wallet1.json one callRPC
+#screen -L -dmS node2 expect /opt/start_consensus_node.sh /opt/node/Neo.CLI/ wallet2.json two 0
+#screen -L -dmS node3 expect /opt/start_consensus_node.sh /opt/node/Neo.CLI/ wallet3.json three 0
+#screen -L -dmS node4 expect /opt/start_consensus_node.sh /opt/node/Neo.CLI/ wallet4.json four 0
 
 # wait for everybody
 echo "COMECOU AGORA" > /testes.log
@@ -39,39 +39,39 @@ echo $IP_SERVER3 >> /testes.log
 echo $IP_SERVER4 >> /testes.log
 
 #Since files provided by docker-compose are shared locally it is better to copy before changing
-#cp /opt/node/neo-cli/protocolNeoCompiler.json /opt/node/neo-cli/protocol.json
+#cp /opt/node/Neo.CLI/protocolNeoCompiler.json /opt/node/Neo.CLI/protocol.json
 
-sed -i -e "s/eco-neo-csharp-node1-running/$IP_SERVER1/g" /opt/node/neo-cli/config.json
-sed -i -e "s/eco-neo-csharp-node2-running/$IP_SERVER2/g" /opt/node/neo-cli/config.json
-sed -i -e "s/eco-neo-csharp-node3-running/$IP_SERVER3/g" /opt/node/neo-cli/config.json
-sed -i -e "s/eco-neo-csharp-node4-running/$IP_SERVER4/g" /opt/node/neo-cli/config.json
+sed -i -e "s/eco-neo-csharp-node1-running/$IP_SERVER1/g" /opt/node/Neo.CLI/config.json
+sed -i -e "s/eco-neo-csharp-node2-running/$IP_SERVER2/g" /opt/node/Neo.CLI/config.json
+sed -i -e "s/eco-neo-csharp-node3-running/$IP_SERVER3/g" /opt/node/Neo.CLI/config.json
+sed -i -e "s/eco-neo-csharp-node4-running/$IP_SERVER4/g" /opt/node/Neo.CLI/config.json
 
 #Trying to normally all dockers
 #sleep 1
 
 
 if [[ ${IS_ORACLE} = "0" ]]; then
 	echo "Deleting Oracle"
-	rm /opt/node/neo-cli/Plugins/OracleService.dll
+	rm /opt/node/Neo.CLI/Plugins/OracleService.dll
 	sleep 1
 fi
 
 if [[ ${IS_RPC_SERVER} = "0" ]]; then
 	echo "Deleting RPCServer"
-	rm /opt/node/neo-cli/Plugins/RpcServer.dll
-	rm /opt/node/neo-cli/Plugins/TokensTracker.dll
-	rm /opt/node/neo-cli/Plugins/ApplicationLogs.dll
-	rm /opt/node/neo-cli/Plugins/StateService.dll	
+	rm /opt/node/Neo.CLI/Plugins/RpcServer.dll
+	rm /opt/node/Neo.CLI/Plugins/TokensTracker.dll
+	rm /opt/node/Neo.CLI/Plugins/ApplicationLogs.dll
+	rm /opt/node/Neo.CLI/Plugins/StateService.dll	
 	sleep 1
 fi
 
 if [[ ${IS_RPC_CLIENT} = "0" ]]; then
 	echo "Deleting RpcClient"
-	rm /opt/node/neo-cli/Plugins/RpcClient.dll
+	rm /opt/node/Neo.CLI/Plugins/RpcClient.dll
 	sleep 1
 fi
 
-echo "LAUNCHING neo-cli...";
+echo "LAUNCHING Neo.CLI...";
 screen -L -dmS node /opt/start_node.sh
 
 service cron restart

docker-neo-csharp-node/scripts/start_node.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-(cd /opt/node/neo-cli/; dotnet neo-cli.dll)
+(cd /opt/node/Neo.CLI/; dotnet neo-cli.dll)