From 63a8505c11268be035de75c48e59566a631cf46e Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 2 Mar 2021 19:47:45 +0300 Subject: [PATCH] Update neofs-node to v0.17.0 This updates includes neo-go update to v0.94.0 that triggered wallet and address changes. Also neofs-node configuration expanded with notary related values. Signed-off-by: Alex Vanin --- .env | 10 ++++----- services/chain/node-wallet.json | 18 ++++++++-------- services/ir/.ir.env | 25 ++++++++++++----------- services/morph_chain/node-wallet.json | 18 ++++++++-------- services/morph_chain/protocol.privnet.yml | 6 ++++++ services/storage/.storage.env | 6 +++--- wallets/wallet.json | 6 +++--- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/.env b/.env index 90310d4..91d6a0e 100644 --- a/.env +++ b/.env @@ -3,18 +3,18 @@ LOCAL_DOMAIN=neofs.devenv IPV4_PREFIX=192.168.130 # NeoGo privnet -CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.4.0/devenv_mainchain.gz" -NEOGO_VERSION=0.93.0 +CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.5.1/devenv_mainchain.gz" +NEOGO_VERSION=0.94.0 # NeoGo sidechain -MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.4.0/devenv_sidechain.gz" +MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.5.1/devenv_sidechain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.16.0 +IR_VERSION=0.17.0 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.16.0 +NODE_VERSION=0.17.0 NODE_IMAGE=nspccdev/neofs-storage # HTTP Gate diff --git a/services/chain/node-wallet.json b/services/chain/node-wallet.json index 1612925..2fcf9fd 100644 --- a/services/chain/node-wallet.json +++ b/services/chain/node-wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NTh9TnZTstvAePEYWDGLLxidBikJE24uTo", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=", + "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBdHR2qg==", "parameters": [ { "name": "parameter0", @@ -19,11 +19,11 @@ "isdefault": false }, { - "address": "NUVPACMnKFhpuHjsRjhUvXz1XhqfGZYVtY", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NgEisvCqr2h8wpRxQb7bVPWUZdbVCY8Uo6", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBE43vrw==", + "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEF7zmyl", "parameters": [ { "name": "parameter0", @@ -44,11 +44,11 @@ "isdefault": false }, { - "address": "NVNvVRW5Q5naSx2k2iZm7xRgtRNGuZppAK", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NNudMSGzEoktFzdYGYoNb3bzHzbmM1genF", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEQtBE43vrw==", + "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUF7zmyl", "parameters": [ { "name": "parameter0", diff --git a/services/ir/.ir.env b/services/ir/.ir.env index eb9c8ae..e2704f1 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -19,22 +19,23 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4 NEOFS_IR_EMIT_STORAGE_AMOUNT=100000000 NEOFS_IR_NETMAP_CLEANER_ENABLED=true -NEOFS_IR_CONTRACTS_NETMAP=4d8f451cbf2a2c4ec10aeecedac5246db49db6bd -NEOFS_IR_CONTRACTS_BALANCE=75742c78b8da5672edad46f83c5db2270c06614d -NEOFS_IR_CONTRACTS_CONTAINER=1aa07a159e598b7ae32cc2b943411f22959a6ccf -NEOFS_IR_CONTRACTS_NEOFS=005a4906ec233a3b677dad9fd7033ad8653f579d -NEOFS_IR_CONTRACTS_AUDIT=a08892a059c3ddadd3498f0336e01388df03af7e +NEOFS_IR_CONTRACTS_NETMAP=fbf9cd97c4c04cbf26cad1b3f07c7905a3192121 +NEOFS_IR_CONTRACTS_BALANCE=46b3f451a4b34730f82299091962cb29d826dc52 +NEOFS_IR_CONTRACTS_CONTAINER=c64a0216604354adb7ecbd7965775b20c83d61b3 +NEOFS_IR_CONTRACTS_NEOFS=1078523e56279461899c2759253f8298a468e5ce +NEOFS_IR_CONTRACTS_AUDIT=097981782f475fcd4ac26e55227366fe1dd5a746 +NEOFS_IR_CONTRACTS_PROXY=9f3553a1c6ec7692b7f7b95722534bebb94a07b9 # Amount of alphabetic contracts in network, 7 by default. # Limited by the number of letters in Glagolitic. #NEOFS_IR_CONTRACTS_ALPHABET_AMOUNT=3 -NEOFS_IR_CONTRACTS_ALPHABET_AZ=c22ec393723c72aaaec1ce4c1a83a8480de09092 -NEOFS_IR_CONTRACTS_ALPHABET_BUKY=c7a46472340642207268e38dcf7ff3873debc34b -NEOFS_IR_CONTRACTS_ALPHABET_VEDI=8c06231687aad096a9192b7992ae0c434f1d6b3b -NEOFS_IR_CONTRACTS_ALPHABET_GLAGOLI=dd1d4d2fe3d5a29de2142bfee249c6361c210ae3 -NEOFS_IR_CONTRACTS_ALPHABET_DOBRO=896e3b28155bf46eb058941f3479bb94fff27f3c -NEOFS_IR_CONTRACTS_ALPHABET_YEST=354ca013f6dab665dc6c56509939d211952aae81 -NEOFS_IR_CONTRACTS_ALPHABET_ZHIVETE=3623a2094e5163a426edeee70eb11582764a771b +NEOFS_IR_CONTRACTS_ALPHABET_AZ=f3cd47942b3cb3c1c03868cd1c2e8ff9a1c5499d +NEOFS_IR_CONTRACTS_ALPHABET_BUKY=7ce4cf7e05ae844ed6b75ef1ce8eb6564362a49e +NEOFS_IR_CONTRACTS_ALPHABET_VEDI=dd42a19885e00bb40b358bacd71548719402ddc7 +NEOFS_IR_CONTRACTS_ALPHABET_GLAGOLI=3f0f599e7546fe6227d0c154a6426d069c1f672d +NEOFS_IR_CONTRACTS_ALPHABET_DOBRO=15ccc39c5adf92aa1981e963b5e7601a476cd895 +NEOFS_IR_CONTRACTS_ALPHABET_YEST=6e5ed974e1f31b442c3c31f780bb40f82a2efa8f +NEOFS_IR_CONTRACTS_ALPHABET_ZHIVETE=38aa61d701fe7bac2ae8005516750ff54107a995 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms diff --git a/services/morph_chain/node-wallet.json b/services/morph_chain/node-wallet.json index 1612925..2fcf9fd 100644 --- a/services/morph_chain/node-wallet.json +++ b/services/morph_chain/node-wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NbTiM6h8r99kpRtb428XcsUk1TzKed2gTc", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NTh9TnZTstvAePEYWDGLLxidBikJE24uTo", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcILQZVEDXg=", + "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBdHR2qg==", "parameters": [ { "name": "parameter0", @@ -19,11 +19,11 @@ "isdefault": false }, { - "address": "NUVPACMnKFhpuHjsRjhUvXz1XhqfGZYVtY", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NgEisvCqr2h8wpRxQb7bVPWUZdbVCY8Uo6", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFAtBE43vrw==", + "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEF7zmyl", "parameters": [ { "name": "parameter0", @@ -44,11 +44,11 @@ "isdefault": false }, { - "address": "NVNvVRW5Q5naSx2k2iZm7xRgtRNGuZppAK", - "key": "6PYN7LvaWqBNw7Xb7a52LSbPnP91kyuzYi3HncGvQwQoYAY2W8DncTgpux", + "address": "NNudMSGzEoktFzdYGYoNb3bzHzbmM1genF", + "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", "label": "", "contract": { - "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEQtBE43vrw==", + "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUF7zmyl", "parameters": [ { "name": "parameter0", diff --git a/services/morph_chain/protocol.privnet.yml b/services/morph_chain/protocol.privnet.yml index 81e31a1..0fa20cf 100644 --- a/services/morph_chain/protocol.privnet.yml +++ b/services/morph_chain/protocol.privnet.yml @@ -10,6 +10,7 @@ ProtocolConfiguration: VerifyBlocks: true VerifyTransactions: true StateRootInHeader: false + P2PSigExtensions: true ApplicationConfiguration: DBConfiguration: @@ -30,6 +31,11 @@ ApplicationConfiguration: EnableCORSWorkaround: false MaxGasInvoke: 15 Port: 30333 + P2PNotary: + Enabled: true + UnlockWallet: + Path: "./wallets/node-wallet.json" + Password: "one" Prometheus: Enabled: true Port: 20001 diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 0f7eee0..3e2d3d9 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -1,9 +1,9 @@ NEOFS_MORPH_RPC_ENDPOINT=http://morph_chain:30333 NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph_chain:30333/ws -NEOFS_ACCOUNTING_SCRIPTHASH=75742c78b8da5672edad46f83c5db2270c06614d -NEOFS_CONTAINER_SCRIPTHASH=1aa07a159e598b7ae32cc2b943411f22959a6ccf -NEOFS_NETMAP_SCRIPTHASH=4d8f451cbf2a2c4ec10aeecedac5246db49db6bd +NEOFS_ACCOUNTING_SCRIPTHASH=46b3f451a4b34730f82299091962cb29d826dc52 +NEOFS_CONTAINER_SCRIPTHASH=c64a0216604354adb7ecbd7965775b20c83d61b3 +NEOFS_NETMAP_SCRIPTHASH=fbf9cd97c4c04cbf26cad1b3f07c7905a3192121 NEOFS_BOOTSTRAP_PERIODIC_ENABLED=true diff --git a/wallets/wallet.json b/wallets/wallet.json index e007d95..5d9dd30 100644 --- a/wallets/wallet.json +++ b/wallets/wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NTrezR3C4X8aMLVg7vozt5wguyNfFhwuFx", - "key": "6PYWrvsPU47vJTeoLUht12pHUQunPBgaR7JEbx7MpuAuNP8CHHyH9hbqqk", + "address": "NVUzCUvrbuWadAm6xBoyZ2U7nCmS9QBZtb", + "key": "6PYLKJhiSub5imt6WCVy6Quxtd9xu176omev1vWYovzkAQCTSQabAAQXii", "label": "", "contract": { - "script": "DCEDGmxvu98CyjUXRfqGubpalFLXhaxPf8K3VIyipGxPz0oLQZVEDXg=", + "script": "DCEDGmxvu98CyjUXRfqGubpalFLXhaxPf8K3VIyipGxPz0pBdHR2qg==", "parameters": [ { "name": "parameter0",