Update to 0.39.0, move to internal CN (#70)

Update to 0.39.0, move to internal CN

.env

@@ -1,4 +1,4 @@
-NEOGO_VERSION=0.101.1
-AIO_VERSION=0.38.1
-HTTPGW_VERSION=0.27.5
-RESTGW_VERSION=0.5.0
+NEOGO_VERSION=0.104.0
+AIO_VERSION=0.39.0
+HTTPGW_VERSION=0.28.0
+RESTGW_VERSION=0.6.0

.gitignore

@@ -1,3 +1,4 @@
 # IDE
 .idea
 .vscode
+*~

Dockerfile

@@ -25,7 +25,6 @@ RUN apk add --no-cache \
 
 WORKDIR /
 
-COPY --from=neo-go /usr/bin/privnet-entrypoint.sh /usr/bin/privnet-entrypoint.sh
 COPY --from=neo-go /etc/ssl/certs /etc/ssl/certs
 COPY --from=neo-go /usr/bin/neo-go /usr/bin/neo-go
 COPY --from=neofs-cli /bin/neofs-cli /usr/bin/neofs-cli
@@ -42,11 +41,8 @@ COPY ./http/wallet.json /config/wallet-http.json
 COPY ./rest-gw/wallet.json /config/wallet-rest.json
 COPY ./ir/cli-cfg.yaml /config/cli-cfg-ir.yaml
 COPY ./ir/config.yaml /config/config-ir.yaml
-COPY ./vendor/locode_db /config/locode.db
-COPY ./vendor/morph_chain.gz /config/morph_chain.gz
-COPY ./morph/protocol.privnet.yml /config/protocol.privnet.yml
-COPY ./morph/node-wallet.json /config/node-wallet.json
-COPY ./morph/node-config.yaml /config/node-config.yaml
+COPY ./ir/node-wallet.json /config/node-wallet.json
+COPY ./ir/node-config.yaml /config/node-config.yaml
 COPY ./bin/ /config/bin
 
 COPY ./http/http.env /config/http.env

bin/init-aio.sh

@@ -22,30 +22,34 @@ while getopts d:h:r: option; do
   esac
 done
 
-export ACC=/config/morph_chain.gz
-
-/usr/bin/privnet-entrypoint.sh node --config-path /config --privnet &
-
-while [[ "$(curl -s -o /dev/null -w %{http_code} localhost:30333)" != "422" ]];
-do
-  sleep 2;
-done
-
 export NEOGO=/usr/bin/neo-go
 export WALLET=/config/node-wallet.json
 
-cd /config && ./bin/config.sh ContainerFee 0 && ./bin/config.sh ContainerAliasFee 0
-
 /usr/bin/neofs-ir --config /config/config-ir.yaml &
 
 while [[ -z "$(/usr/bin/neofs-cli control healthcheck --ir --endpoint localhost:16512 -c /config/cli-cfg-ir.yaml | grep 'Health status: READY')" ]];
 do
   sleep 2;
 done
 
+CONSADDR=$(jq -r .accounts[2].address "${WALLET}")
+SNADDR=$(jq -r  .accounts[0].address /config/wallet-sn.json)
+
+${NEOGO} wallet nep17 transfer \
+        --wallet-config /config/node-config.yaml \
+        -r http://localhost:30333 \
+        --from ${CONSADDR} --force \
+        --to ${SNADDR} \
+        --token GAS \
+        --amount 100
+
+sleep 2 # https://github.com/nspcc-dev/neo-go/issues/3244
+
 set -m
 /usr/bin/neofs-node --config /config/config-sn.yaml &
 
+cd /config # tick.sh and config.sh require this working directory
+
 while [[ -z "$(/usr/bin/neofs-cli control healthcheck --endpoint localhost:16513 -c /config/cli-cfg-sn.yaml | grep 'Network status: ONLINE')" ]];
 do
   ./bin/tick.sh
@@ -54,6 +58,8 @@ done
 
 set -a
 
+./bin/config.sh ContainerFee 0 && ./bin/config.sh ContainerAliasFee 0
+
 if [ $IS_START_HTTP = "true" ]; then
     . /config/http.env
     /usr/bin/neofs-http-gw &
@@ -68,7 +74,7 @@ if [ $IS_START_REST = "true" ]; then
     . /config/rest.env
     /usr/bin/neofs-rest-gw &
 
-    while [[ "$(curl -s -o /dev/null -w %{http_code} $REST_GW_LISTEN_ADDRESS)" != "404" ]];
+    while [[ "$(curl -s -o /dev/null -w %{http_code} $REST_GW_SERVER_LISTEN_ADDRESS)" != "404" ]];
     do
       sleep 1;
     done

docker-compose.yml

@@ -13,11 +13,6 @@ services:
       - "./http/http.env"
       - "./rest-gw/rest.env"
     volumes:
-      - ./vendor/locode_db:/config/locode_db
-      - ./vendor/morph_chain.gz:/config/morph_chain.gz
-      - ./morph/protocol.privnet.yml:/config/protocol.privnet.yml
-      - ./morph/node-wallet.json:/config/node-wallet.json
-      - ./morph/node-config.yaml:/config/node-config.yaml
       - ./sn/cli-cfg.yaml:/config/cli-cfg-sn.yaml
       - ./sn/wallet.json:/config/wallet-sn.json
       - ./sn/config.yaml:/config/config-sn.yaml

ir/config.yaml

@@ -6,9 +6,36 @@ wallet:
 without_mainnet: true
 
 morph:
-  endpoints:
-    - ws://localhost:30333/ws
   validators: 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
+  consensus:
+    magic: 15405
+    committee:
+      - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
+    storage:
+      type: boltdb
+      path: "/chain/morph.bolt"
+    time_per_block: 1s
+    max_traceable_blocks: 200000
+    seed_nodes:
+      - 127.0.0.1:20333
+    rpc:
+      listen:
+        - 127.0.0.1:30333
+    p2p:
+      dial_timeout: 3s
+      proto_tick_interval: 2s
+      listen:
+        - 127.0.0.1:20333
+      peers:
+        min: 0
+        max: 10
+        attempts: 5
+      ping:
+        interval: 30s
+        timeout: 90s
+    set_roles_in_genesis: true
+
+fschain_autodeploy: true
 
 timers:
   emit:  50
@@ -34,10 +61,6 @@ netmap_cleaner:
   enabled: true
   threshold: 3
 
-locode:
-  db:
-    path: /config/locode.db
-
 workers:
   netmap: 100
   balance: 100

rest-gw/rest.env

@@ -1,5 +1,5 @@
 REST_GW_WALLET_PATH=/config/wallet-rest.json
 REST_GW_WALLET_PASSPHRASE=one
 REST_GW_WALLET_ADDRESS=NPFCqWHfi9ixCJRu7DABRbVfXRbkSEr9Vo
-REST_GW_PEERS_0_ADDRESS=localhost:8080
-REST_GW_LISTEN_ADDRESS=0.0.0.0:8090
+REST_GW_POOL_PEERS_0_ADDRESS=localhost:8080
+REST_GW_SERVER_LISTEN_ADDRESS=0.0.0.0:8090