From 9f05ed3d0f3c6d0868753e05aedaf0ad86eaafa9 Mon Sep 17 00:00:00 2001 From: alexvanin Date: Fri, 24 Jul 2020 17:46:29 +0300 Subject: [PATCH] Update neofs-node to v0.11.0 This commit: - removes unused .drone.yml, - updates neofs-node and neofs-cli up to v0.11.0, - updates chain dumps. --- .drone.yml | 38 ----------------------- .env | 18 +++++------ services/chain/artifacts.mk | 2 +- services/chain/protocol.privnet.yml | 1 + services/ir/.ir.env | 7 ++++- services/morph_chain/artifacts.mk | 2 +- services/morph_chain/protocol.privnet.yml | 1 + services/storage/.storage.env | 12 ++----- 8 files changed, 22 insertions(+), 59 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 796240f..0000000 --- a/.drone.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -kind: pipeline -type: docker -name: testenv-images - -steps: -- name: neogo - image: docker:19.03.5 - volumes: - - name: docker_sock - path: /var/run/docker.sock - environment: - PASSWORD: - from_secret: docker_passwd - NEOGO_REPO_PATH: 'https://github.com/nspcc-dev/neo-go.git' - NEOGO_REPO_TAG: 'master-2.x' - NEOGO_IMG_REPO: 'registry.nspcc.ru/docker-local/neo-go' - NEOGO_DOCKER_TAG: '' - NEOGO_REGISTRY_USER: 'admin' - commands: - - apk add --update git make - - git clone $NEOGO_REPO_PATH neo-go && cd neo-go && git checkout $NEOGO_REPO_TAG - - NEOGO_DOCKER_TAG="${NEOGO_DOCKER_TAG:-`make version`}" - - docker build --no-cache -t $NEOGO_IMG_REPO:$NEOGO_DOCKER_TAG ./ - - docker login registry.nspcc.ru -u $NEOGO_REGISTRY_USER -p "$PASSWORD" - - docker push $NEOGO_IMG_REPO:$NEOGO_DOCKER_TAG - -# no triggers added in this pipeline for now, because the -# only trigger for it is the developer's will - -# host volume mount requires a repository to be `trusted` -# in drone; this option enables in repository settings -# by admin user -volumes: - - name: docker_sock - host: - path: /var/run/docker.sock - diff --git a/.env b/.env index 23fe7bc..ac405a4 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ IPV4_PREFIX=192.168.123 # NeoGo privnet CHAIN_VERSION=10 -NEOGO_VERSION=0.90.0-pre-667-gace877ab +NEOGO_VERSION=0.90.1-pre-2-g59be6bcd # NeoGo sidechain MORPH_CHAIN_VERSION=100 @@ -13,9 +13,9 @@ NGINX_VERSION=1.18 FS_VERSION=v0.0.1-32-g7186-dirty-localtest # NeoFS Services -NODE_VERSION=0.10.0 -IR_VERSION=0.10.0 -NEOFS_CLI_VERSION=0.9.0 +NODE_VERSION=0.11.0 +IR_VERSION=0.11.0 +NEOFS_CLI_VERSION=0.11.0 # NeoFS Core NEOFS_LOGGER_LEVEL=info @@ -41,9 +41,9 @@ NEOFS_MORPH_EVENT_ENDPOINT=ws://morph_chain.localtest.nspcc.ru:30333/ws NEOFS_MORPH_DIAL_TIMEOUT=10s NEOFS_MORPH_EVENT_DIAL_TIMEOUT=10s -NEOFS_MORPH_NETMAP_SCRIPT_HASH=2008810f7d7c50ae6624f644432494d98ff91690 -NEOFS_MORPH_BALANCE_SCRIPT_HASH=b326524bf35004fd37dda5018d6d83e76d350fdc -NEOFS_MORPH_NEOFSID_SCRIPT_HASH=6247a44416805fad3b94669df92b0a261868577f -NEOFS_MORPH_CONTAINER_SCRIPT_HASH=82766c536f8dc1dc247476603b07b5b99b9d3cff -NEOFS_MORPH_AUDIT_SCRIPT_HASH=bf2cfb59afa13d5d519dcd2268a57b6c136855f2 +NEOFS_MORPH_NETMAP_SCRIPT_HASH=bf104146cf95fc70029bb3a51d75653c9fa37b69 +NEOFS_MORPH_BALANCE_SCRIPT_HASH=1aeefe1d0dfade49740fff779c02cd4a0538ffb1 +NEOFS_MORPH_NEOFSID_SCRIPT_HASH=ae9e252fa22c35e43f61bcdae2b4dfe0985ba68e +NEOFS_MORPH_CONTAINER_SCRIPT_HASH=9d2ca84d7fb88213c4baced5a6ed4dc402309039 +NEOFS_MORPH_AUDIT_SCRIPT_HASH=a9a9424d5507f81fbf7829aa8d92d6fe149bace1 NEOFS_MORPH_REPUTATION_SCRIPT_HASH=cd5059641c18bb979173e63b23d4c9b42b0485c3 diff --git a/services/chain/artifacts.mk b/services/chain/artifacts.mk index 6c0ba0f..d67962c 100644 --- a/services/chain/artifacts.mk +++ b/services/chain/artifacts.mk @@ -7,7 +7,7 @@ get.chain: ifeq (${CHAIN_PATH},) @echo "⇒ Download blockchain dump VERSION=${CHAIN_VERSION}" @curl \ - -sS "https://fs.neo.org/dist/chain.gz" \ + -sS "https://cdn.fs.neo.org/5iZZi4HzXpk3xjHa2ahi8RCrVae74Q7487ns5ms7S2EF/cfa4e687-30c7-4456-abe8-02cfc131c6b1" \ -o ./vendor/chain.gz else @echo "⇒ Copy local archive ${CHAIN_PATH}" diff --git a/services/chain/protocol.privnet.yml b/services/chain/protocol.privnet.yml index fefa7c5..94e870b 100644 --- a/services/chain/protocol.privnet.yml +++ b/services/chain/protocol.privnet.yml @@ -25,6 +25,7 @@ ApplicationConfiguration: MinPeers: 0 RPC: Enabled: true + MaxGasInvoke: 10 EnableCORSWorkaround: false Port: 30333 Prometheus: diff --git a/services/ir/.ir.env b/services/ir/.ir.env index ca2fe7b..a5814d5 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -1,7 +1,12 @@ NEOFS_IR_LOGGER_LEVEL=debug NEOFS_IR_METRICS_ENABLED=true NEOFS_IR_PPROF_ENABLED=true +NEOFS_IR_MAINNET_ENDPOINT_CLIENT=http://main_chain.localtest.nspcc.ru:30333 +NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION=ws://main_chain.localtest.nspcc.ru:30333/ws NEOFS_IR_MORPH_ENDPOINT_CLIENT=http://morph_chain.localtest.nspcc.ru:30333 NEOFS_IR_MORPH_ENDPOINT_NOTIFICATION=ws://morph_chain.localtest.nspcc.ru:30333/ws -NEOFS_IR_CONTRACTS_NETMAP=2008810f7d7c50ae6624f644432494d98ff91690 NEOFS_IR_TIMERS_EPOCH=30s + +NEOFS_IR_CONTRACTS_NETMAP=bf104146cf95fc70029bb3a51d75653c9fa37b69 +NEOFS_IR_CONTRACTS_BALANCE=1aeefe1d0dfade49740fff779c02cd4a0538ffb1 +NEOFS_IR_CONTRACTS_NEOFS=467e9045b5893b9d217f2b3d60bee69b3bb37872 diff --git a/services/morph_chain/artifacts.mk b/services/morph_chain/artifacts.mk index 4c399be..57c876a 100644 --- a/services/morph_chain/artifacts.mk +++ b/services/morph_chain/artifacts.mk @@ -7,7 +7,7 @@ get.morph_chain: ifeq (${MORPH_CHAIN_PATH},) @echo "⇒ Download morph chain dump VERSION=${MORPH_CHAIN_VERSION}" @curl \ - -sS "https://fs.neo.org/dist/morph_chain.gz" \ + -sS "https://cdn.fs.neo.org/5iZZi4HzXpk3xjHa2ahi8RCrVae74Q7487ns5ms7S2EF/8c3f3cba-8426-48b2-8493-c09da7539681" \ -o ./vendor/morph_chain.gz else @echo "⇒ Copy local archive ${MORPH_CHAIN_PATH}" diff --git a/services/morph_chain/protocol.privnet.yml b/services/morph_chain/protocol.privnet.yml index 708315d..9ad7ae2 100644 --- a/services/morph_chain/protocol.privnet.yml +++ b/services/morph_chain/protocol.privnet.yml @@ -25,6 +25,7 @@ ApplicationConfiguration: MinPeers: 0 RPC: Enabled: true + MaxGasInvoke: 10 EnableCORSWorkaround: false Port: 30333 Prometheus: diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 752a801..45e4aca 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -4,14 +4,8 @@ NEOFS_NODE_OPTIONS_0=/Location:NorthAmerica/Country:US/City:NewYork NEOFS_NODE_OPTIONS_1=/Capacity:45 NEOFS_NODE_OPTIONS_2=/Price:20.5 -NEOFS_STORAGE_BLOB_DRIVER=fsbucket -NEOFS_STORAGE_BLOB_DIRECTORY=/storage/blob -NEOFS_STORAGE_META_PATH=/storage/meta -NEOFS_STORAGE_DHT_PATH=/storage/dht -NEOFS_STORAGE_CONTAINERS_PATH=/storage/containers -NEOFS_STORAGE_KEEPER_PATH=/storage/keeper -NEOFS_STORAGE_STORAGE-GROUP_PATH=/storage/sg -NEOFS_STORAGE_JOURNAL_PATH=/storage/journal +NEOFS_FSBUCKET_DIRECTORY=/storage/blob +NEOFS_BOLTBUCKET_PATH=/storage/meta NEOFS_REPLICATION_TIMEOUTS_TRANSPORT_PUT=300s NEOFS_REPLICATION_TIMEOUTS_TRANSPORT_GET=300s @@ -32,7 +26,7 @@ NEOFS_OBJECT_DIAL_TIMEOUT=60s NEOFS_OBJECT_STORAGE_CAPACITY=0 NEOFS_PLACEMENT_WEIGHT_INHERITANCE_ENABLED=true -NEOFS_STORAGE_BLOB_TREE_ENABLED=true +NEOFS_FSBUCKET_TREE_ENABLED=true # INFRA-50 NEOFS_INNERRING_TIMERS_EPOCH=300s NEOFS_GOSSIP_SIMPLIFIED_MODE_ENABLED=false