From ebc0f96b2f007d618999aeacfecd51f6b1e05029 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 14 May 2021 16:01:37 +0300 Subject: [PATCH] [#76] Update neo-go and contracts to N3 testnet RC2 version Signed-off-by: Alex Vanin --- .env | 10 +++++----- bin/config.sh | 2 +- bin/deposit.sh | 2 +- services/chain/node-wallet.json | 18 +++++++++--------- services/chain/protocol.privnet.yml | 1 + services/ir/.ir.env | 16 ++++++++-------- services/morph_chain/node-wallet.json | 18 +++++++++--------- services/morph_chain/protocol.privnet.yml | 1 + services/storage/.storage.env | 8 ++++---- wallets/wallet.json | 6 +++--- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/.env b/.env index 8af4ffa..c7d596e 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.7.0/devenv_mainchain_notary_disabled.gz" -NEOGO_VERSION=0.94.1 +CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.8.0/devenv_mainchain_notary_disabled.gz" +NEOGO_VERSION=0.95.0 # NeoGo sidechain -MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.7.0/devenv_sidechain.gz" +MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.8.0/devenv_sidechain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.19.0 +IR_VERSION=0.19.0-25-ge1e4a61b IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.19.0 +NODE_VERSION=0.19.0-25-ge1e4a61b NODE_IMAGE=nspccdev/neofs-storage # HTTP Gate diff --git a/bin/config.sh b/bin/config.sh index 74b6117..4bf3319 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -45,4 +45,4 @@ ${NEOGO} contract invokefunction \ -a ${ADDR} \ -r http://morph_chain.${LOCAL_DOMAIN}:30333 \ ${NEOFS_IR_CONTRACTS_NETMAP} \ -newEpoch int:$((EPOCH+1)) -- ${ADDR} +newEpoch int:$((EPOCH+1)) -- ${ADDR}:Global diff --git a/bin/deposit.sh b/bin/deposit.sh index 018ff32..349dd26 100755 --- a/bin/deposit.sh +++ b/bin/deposit.sh @@ -23,4 +23,4 @@ ${NEOGO} contract invokefunction \ ${NEOFS_IR_CONTRACTS_NEOFS} \ deposit ${LESH} \ int:${DEPOSIT} \ -bytes: -- ${LESH} +bytes: -- ${LESH}:Global diff --git a/services/chain/node-wallet.json b/services/chain/node-wallet.json index 2fcf9fd..181bfaf 100644 --- a/services/chain/node-wallet.json +++ b/services/chain/node-wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NTh9TnZTstvAePEYWDGLLxidBikJE24uTo", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "Nhfg3TbpwogLvDGVvAvqyThbsHgoSUKwtn", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBdHR2qg==", + "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBVuezJw==", "parameters": [ { "name": "parameter0", @@ -19,11 +19,11 @@ "isdefault": false }, { - "address": "NgEisvCqr2h8wpRxQb7bVPWUZdbVCY8Uo6", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "NVTiAjNgagDkTr5HTzDmQP9kPwPHN5BgVq", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEF7zmyl", + "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEGe0Nw6", "parameters": [ { "name": "parameter0", @@ -44,11 +44,11 @@ "isdefault": false }, { - "address": "NNudMSGzEoktFzdYGYoNb3bzHzbmM1genF", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUF7zmyl", + "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUGe0Nw6", "parameters": [ { "name": "parameter0", diff --git a/services/chain/protocol.privnet.yml b/services/chain/protocol.privnet.yml index a9e36b5..81f4e2f 100644 --- a/services/chain/protocol.privnet.yml +++ b/services/chain/protocol.privnet.yml @@ -1,5 +1,6 @@ ProtocolConfiguration: Magic: 56753 + MaxTraceableBlocks: 200000 SecondsPerBlock: 15 MemPoolSize: 50000 StandbyCommittee: diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 6914557..8488dea 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -34,14 +34,14 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4 NEOFS_IR_EMIT_STORAGE_AMOUNT=100000000 NEOFS_IR_NETMAP_CLEANER_ENABLED=true -NEOFS_IR_CONTRACTS_NETMAP=2bba4d50397cf5a940fc44e2a4ca6e9f9ba6e485 -NEOFS_IR_CONTRACTS_BALANCE=fc2806708bd47aac9a7281d192b48734744964a3 -NEOFS_IR_CONTRACTS_CONTAINER=ef3c00e70627c9074cdb8cbbabd47589ea3ef5a7 -NEOFS_IR_CONTRACTS_NEOFS=d7c67aee3a03e215d400765c0a56470d4e4cd246 -NEOFS_IR_CONTRACTS_AUDIT=0172fc1ed977a6e37f261d1727f675ccb05360db -NEOFS_IR_CONTRACTS_PROXY=ebfe0c83f418b6e81b6ab9564f4d24be86572fd5 -NEOFS_IR_CONTRACTS_PROCESSING=8f03930ca983a3b6f9ffb43ae8b2147edd456019 -NEOFS_IR_CONTRACTS_REPUTATION=01f82a9808ed522b43148ac302f338202c876daf +NEOFS_IR_CONTRACTS_NETMAP=f08bf0d63bebad4be0e07c94cdf6fcd783a69a3f +NEOFS_IR_CONTRACTS_BALANCE=dbd80d328730f4b1f61a61d5e224fc259cfa43fd +NEOFS_IR_CONTRACTS_CONTAINER=b02ca40cede22a2feb6cdcf951d48223f586525a +NEOFS_IR_CONTRACTS_NEOFS=008b43d3de8741b896015f79ac0fbfa4055b4574 +NEOFS_IR_CONTRACTS_AUDIT=ff3a192ec551021dcac63a3f1dc01fefe5aec241 +NEOFS_IR_CONTRACTS_PROXY=6937e3edfd6801958a0bd7875dcdcc17c5a86af3 +NEOFS_IR_CONTRACTS_PROCESSING=5daa677f966a87913838df0a511981ade30c88a4 +NEOFS_IR_CONTRACTS_REPUTATION=a0c48efa9eaed7705d717789b9b66ad037d7b60c # Amount of alphabetic contracts in network, 7 by default. # Limited by the number of letters in Glagolitic. diff --git a/services/morph_chain/node-wallet.json b/services/morph_chain/node-wallet.json index 2fcf9fd..181bfaf 100644 --- a/services/morph_chain/node-wallet.json +++ b/services/morph_chain/node-wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NTh9TnZTstvAePEYWDGLLxidBikJE24uTo", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "Nhfg3TbpwogLvDGVvAvqyThbsHgoSUKwtn", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBdHR2qg==", + "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBVuezJw==", "parameters": [ { "name": "parameter0", @@ -19,11 +19,11 @@ "isdefault": false }, { - "address": "NgEisvCqr2h8wpRxQb7bVPWUZdbVCY8Uo6", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "NVTiAjNgagDkTr5HTzDmQP9kPwPHN5BgVq", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEF7zmyl", + "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEGe0Nw6", "parameters": [ { "name": "parameter0", @@ -44,11 +44,11 @@ "isdefault": false }, { - "address": "NNudMSGzEoktFzdYGYoNb3bzHzbmM1genF", - "key": "6PYL8Gnjsz4RBKX18jx5ZAQTDH7PKkZwEVjPKEkjNzCDNFE6TKZwaFLibL", + "address": "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", "label": "", "contract": { - "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUF7zmyl", + "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUGe0Nw6", "parameters": [ { "name": "parameter0", diff --git a/services/morph_chain/protocol.privnet.yml b/services/morph_chain/protocol.privnet.yml index b743dea..0ccd6a4 100644 --- a/services/morph_chain/protocol.privnet.yml +++ b/services/morph_chain/protocol.privnet.yml @@ -1,5 +1,6 @@ ProtocolConfiguration: Magic: 15405 + MaxTraceableBlocks: 200000 SecondsPerBlock: 1 MemPoolSize: 50000 StandbyCommittee: diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 434b20f..f709989 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -46,22 +46,22 @@ NEOFS_MAINCHAIN_RPC_ENDPOINT=http://morph_chain:30333 # Accounting section ## Address of Balance smart contract ## Default: empty (invalid) -NEOFS_ACCOUNTING_SCRIPTHASH=fc2806708bd47aac9a7281d192b48734744964a3 +NEOFS_ACCOUNTING_SCRIPTHASH=dbd80d328730f4b1f61a61d5e224fc259cfa43fd # Container section ## Address of Container smart contract ## Default: empty (invalid) -NEOFS_CONTAINER_SCRIPTHASH=ef3c00e70627c9074cdb8cbbabd47589ea3ef5a7 +NEOFS_CONTAINER_SCRIPTHASH=b02ca40cede22a2feb6cdcf951d48223f586525a # Netmap section ## Address of Netmap smart contract ## Default: empty (invalid) -NEOFS_NETMAP_SCRIPTHASH=2bba4d50397cf5a940fc44e2a4ca6e9f9ba6e485 +NEOFS_NETMAP_SCRIPTHASH=f08bf0d63bebad4be0e07c94cdf6fcd783a69a3f # Reputation section ## Address of Reputation smart contract ## Default: empty (invalid) -NEOFS_REPUTATION_SCRIPTHASH=01f82a9808ed522b43148ac302f338202c876daf +NEOFS_REPUTATION_SCRIPTHASH=a0c48efa9eaed7705d717789b9b66ad037d7b60c # Object section ## Worker pool capacity of API Object.Put client calls diff --git a/wallets/wallet.json b/wallets/wallet.json index 5d9dd30..ce68d60 100644 --- a/wallets/wallet.json +++ b/wallets/wallet.json @@ -2,11 +2,11 @@ "version": "3.0", "accounts": [ { - "address": "NVUzCUvrbuWadAm6xBoyZ2U7nCmS9QBZtb", - "key": "6PYLKJhiSub5imt6WCVy6Quxtd9xu176omev1vWYovzkAQCTSQabAAQXii", + "address": "NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM", + "key": "6PYP7YrwGnLuu4WYQbEe3WJiC44aKmqwqawLsp7H3oh5vocS9xTv2ZfTp3", "label": "", "contract": { - "script": "DCEDGmxvu98CyjUXRfqGubpalFLXhaxPf8K3VIyipGxPz0pBdHR2qg==", + "script": "DCEDGmxvu98CyjUXRfqGubpalFLXhaxPf8K3VIyipGxPz0pBVuezJw==", "parameters": [ { "name": "parameter0",