From 587a6b3eec4d8c1c0c9708b473d021698ea6c42f Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Sat, 13 Aug 2022 15:22:45 +0300 Subject: [PATCH] [#197] ir: Support `neofs-adm` Signed-off-by: Pavel Karpy --- README.md | 6 ++++++ services/ir/{wallet01.json => az.json} | 0 services/ir/{wallet01.key => az.key} | 0 services/ir/contract.json | 30 ++++++++++++++++++++++++++ services/ir/docker-compose.yml | 4 ++-- services/morph_chain/node-wallet.json | 18 +++++----------- 6 files changed, 43 insertions(+), 15 deletions(-) rename services/ir/{wallet01.json => az.json} (100%) rename services/ir/{wallet01.key => az.key} (100%) create mode 100644 services/ir/contract.json diff --git a/README.md b/README.md index 60de945..b620273 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,12 @@ You can find more information on each service in `docs` directory. Maybe you will find the answer for your question in [F.A.Q.](docs/faq.md) +## Using NeoFS Admin Tool in `dev-env` + +Devenv supports NeoFS network management via [neofs-adm](https://github.com/nspcc-dev/neofs-node/tree/master/cmd/neofs-adm). +`services/ir` contains the Alphabet wallet in a proper format, specify it +with `--alphabet-wallets` flag. + ## Notable make targets `make help` will print the brief description of available targets. Here we diff --git a/services/ir/wallet01.json b/services/ir/az.json similarity index 100% rename from services/ir/wallet01.json rename to services/ir/az.json diff --git a/services/ir/wallet01.key b/services/ir/az.key similarity index 100% rename from services/ir/wallet01.key rename to services/ir/az.key diff --git a/services/ir/contract.json b/services/ir/contract.json new file mode 100644 index 0000000..310b77b --- /dev/null +++ b/services/ir/contract.json @@ -0,0 +1,30 @@ +{ + "version": "3.0", + "accounts": [ + { + "address": "Nhfg3TbpwogLvDGVvAvqyThbsHgoSUKwtn", + "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", + "label": "", + "contract": { + "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBVuezJw==", + "parameters": [ + { + "name": "parameter0", + "type": "Signature" + } + ], + "deployed": false + }, + "lock": false, + "isDefault": false + } + ], + "scrypt": { + "n": 16384, + "r": 8, + "p": 8 + }, + "extra": { + "Tokens": null + } +} diff --git a/services/ir/docker-compose.yml b/services/ir/docker-compose.yml index 5265bbe..929b99a 100644 --- a/services/ir/docker-compose.yml +++ b/services/ir/docker-compose.yml @@ -15,8 +15,8 @@ services: ipv4_address: ${IPV4_PREFIX}.61 stop_signal: SIGKILL volumes: - - ./wallet01.json:/wallet.json - - ./wallet01.key:/wallet01.key + - ./az.json:/wallet.json + - ./az.key:/wallet01.key - ./../../vendor/hosts:/etc/hosts - ./../../vendor/locode_db:/locode/db - ./../../vendor/neofs-cli:/neofs-cli diff --git a/services/morph_chain/node-wallet.json b/services/morph_chain/node-wallet.json index ec0976f..8e88b43 100644 --- a/services/morph_chain/node-wallet.json +++ b/services/morph_chain/node-wallet.json @@ -5,7 +5,7 @@ { "address": "Nhfg3TbpwogLvDGVvAvqyThbsHgoSUKwtn", "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", - "label": "", + "label": "single", "contract": { "script": "DCECs2Ir9AF73+MXxYrtX0x1PyBrfbiWBG+n13S7xL9/jcJBVuezJw==", "parameters": [ @@ -21,23 +21,15 @@ "isDefault": false }, { - "address": "NVTiAjNgagDkTr5HTzDmQP9kPwPHN5BgVq", + "address": "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP", "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", - "label": "", + "label": "consensus", "contract": { - "script": "EwwhAhA6f33QFlWFl/eWDSfFFqQ5T9loueZRVetLAT5AQEBuDCECp7xV/oaE4BGXaNEEujB5W9zIZhnoZK3SYVZyPtGFzWIMIQKzYiv0AXvf4xfFiu1fTHU/IGt9uJYEb6fXdLvEv3+NwgwhA9kMB99j5pDOd5EuEKtRrMlEtmhgI3tgjE+PgwnnHuaZFEGe0Nw6", + "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUGe0Nw6", "parameters": [ { "name": "parameter0", "type": "Signature" - }, - { - "name": "parameter1", - "type": "Signature" - }, - { - "name": "parameter2", - "type": "Signature" } ], "deployed": false @@ -49,7 +41,7 @@ { "address": "NfgHwwTi3wHAS8aFAN243C5vGbkYDpqLHP", "key": "6PYM8VdX2BSm7BSXKzV4Fz6S3R9cDLLWNrD9nMjxW352jEv3fsC8N3wNLY", - "label": "", + "label": "committee", "contract": { "script": "EQwhArNiK/QBe9/jF8WK7V9MdT8ga324lgRvp9d0u8S/f43CEUGe0Nw6", "parameters": [