From b1564666546ba501dfb3238a4e6b0f601616c108 Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Thu, 26 May 2022 17:26:25 +0300 Subject: [PATCH] [#179] Wallets for SN instead of keys Signed-off-by: Elizaveta Chichindaeva --- services/storage/01.key | 1 - services/storage/02.key | 1 - services/storage/03.key | 1 - services/storage/04.key | 1 - services/storage/docker-compose.yml | 24 +++++++++++++++-------- services/storage/wallet01.json | 30 +++++++++++++++++++++++++++++ services/storage/wallet02.json | 30 +++++++++++++++++++++++++++++ services/storage/wallet03.json | 30 +++++++++++++++++++++++++++++ services/storage/wallet04.json | 30 +++++++++++++++++++++++++++++ 9 files changed, 136 insertions(+), 12 deletions(-) delete mode 100644 services/storage/01.key delete mode 100644 services/storage/02.key delete mode 100644 services/storage/03.key delete mode 100644 services/storage/04.key create mode 100644 services/storage/wallet01.json create mode 100644 services/storage/wallet02.json create mode 100644 services/storage/wallet03.json create mode 100644 services/storage/wallet04.json diff --git a/services/storage/01.key b/services/storage/01.key deleted file mode 100644 index a61e3d0..0000000 --- a/services/storage/01.key +++ /dev/null @@ -1 +0,0 @@ -"'bIQ=Z D \ No newline at end of file diff --git a/services/storage/02.key b/services/storage/02.key deleted file mode 100644 index 3664775..0000000 --- a/services/storage/02.key +++ /dev/null @@ -1 +0,0 @@ -{WT 69sh4qA1) \ No newline at end of file diff --git a/services/storage/03.key b/services/storage/03.key deleted file mode 100644 index b540f12..0000000 --- a/services/storage/03.key +++ /dev/null @@ -1 +0,0 @@ -]˷:75B )F6Zk+} \ No newline at end of file diff --git a/services/storage/04.key b/services/storage/04.key deleted file mode 100644 index 9f8734d..0000000 --- a/services/storage/04.key +++ /dev/null @@ -1 +0,0 @@ -iptvw}!h% /Ia \ No newline at end of file diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index cf3320d..a30bb20 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -13,7 +13,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.71 volumes: - - ./01.key:/01.key + - ./wallet01.json:/wallet01.json - ./../../vendor/hosts:/etc/hosts - storage_s01:/storage - ./../../vendor/neofs-cli:/neofs-cli @@ -22,7 +22,9 @@ services: stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - - NEOFS_NODE_KEY=/01.key + - NEOFS_NODE_WALLET_PATH=./wallet01.json + - NEOFS_NODE_WALLET_ADDRESS=NejLbQpojKJWec4NQRMBhzsrmCyhXfGJJe + - NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081 @@ -46,7 +48,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.72 volumes: - - ./02.key:/02.key + - ./wallet02.json:/wallet02.json - ./../../vendor/hosts:/etc/hosts - storage_s02:/storage - ./../../vendor/neofs-cli:/neofs-cli @@ -55,7 +57,9 @@ services: stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - - NEOFS_NODE_KEY=/02.key + - NEOFS_NODE_WALLET_PATH=./wallet02.json + - NEOFS_NODE_WALLET_ADDRESS=NVXXy3hNTvwVEZa2dAibALyJB3Q86aiHvL + - NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081 @@ -79,7 +83,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.73 volumes: - - ./03.key:/03.key + - ./wallet03.json:/wallet03.json - ./../../vendor/hosts:/etc/hosts - storage_s03:/storage - ./../../vendor/neofs-cli:/neofs-cli @@ -88,7 +92,9 @@ services: stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - - NEOFS_NODE_KEY=/03.key + - NEOFS_NODE_WALLET_PATH=./wallet03.json + - NEOFS_NODE_WALLET_ADDRESS=NPTmih9X14Y7xLvmD6RVtDHdH1Y9qJwoTe + - NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081 @@ -112,7 +118,7 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.74 volumes: - - ./04.key:/04.key + - ./wallet04.json:/wallet04.json - ./../../vendor/hosts:/etc/hosts - storage_s04:/storage - ./../../vendor/neofs-cli:/neofs-cli @@ -122,7 +128,9 @@ services: stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: - - NEOFS_NODE_KEY=/04.key + - NEOFS_NODE_WALLET_PATH=./wallet04.json + - NEOFS_NODE_WALLET_ADDRESS=Ne2DAQbWvP1s7TbtFc7BStKMnjKJdBaVRm + - NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082 - NEOFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081 - NEOFS_GRPC_NUM=2 diff --git a/services/storage/wallet01.json b/services/storage/wallet01.json new file mode 100644 index 0000000..514767f --- /dev/null +++ b/services/storage/wallet01.json @@ -0,0 +1,30 @@ +{ + "version":"3.0", + "accounts":[ + { + "address":"NejLbQpojKJWec4NQRMBhzsrmCyhXfGJJe", + "key":"6PYSS8ccmBcttfcw2YJh8VcNSoeQbQLuJLQ7HoKeYF5roRmGs9LUvmKcWz", + "label":"", + "contract":{ + "script":"DCECK7QEHFDWB/+HHex+TNd3g4jg6mhJ2EzL2aqPMuFqgTFBVuezJw==", + "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/storage/wallet02.json b/services/storage/wallet02.json new file mode 100644 index 0000000..9c073de --- /dev/null +++ b/services/storage/wallet02.json @@ -0,0 +1,30 @@ +{ + "version":"3.0", + "accounts":[ + { + "address":"NVXXy3hNTvwVEZa2dAibALyJB3Q86aiHvL", + "key":"6PYXd9hxMYfaCkgeZp3q1RoMB921RQFkRxYftcacTJ2S7MUwnivrxi6Yk5", + "label":"", + "contract":{ + "script":"DCED/2W2rnkTSk3OnQ0504Uem6tO6Xq/hugeHFu8UM0oJq5BVuezJw==", + "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/storage/wallet03.json b/services/storage/wallet03.json new file mode 100644 index 0000000..c054a31 --- /dev/null +++ b/services/storage/wallet03.json @@ -0,0 +1,30 @@ +{ + "version":"3.0", + "accounts":[ + { + "address":"NPTmih9X14Y7xLvmD6RVtDHdH1Y9qJwoTe", + "key":"6PYXNeQzge9fWztVnWYRbr5Mh9q1y4npKVARHYGb484Hct1iNd3vXGR1kk", + "label":"", + "contract":{ + "script":"DCECrJIM198LYbKJBy5rlG4tpOGjG5qxxiG7R14w+kqxAsNBVuezJw==", + "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/storage/wallet04.json b/services/storage/wallet04.json new file mode 100644 index 0000000..cb4676d --- /dev/null +++ b/services/storage/wallet04.json @@ -0,0 +1,30 @@ +{ + "version":"3.0", + "accounts":[ + { + "address":"Ne2DAQbWvP1s7TbtFc7BStKMnjKJdBaVRm", + "key":"6PYWCsGWx8uSVYK94tvK7Ccit8x8Z3f3dHADTFTgLhT9NBXTBqBECL8AyC", + "label":"", + "contract":{ + "script":"DCEDjIYpWeVrQ+IPeRh8T+ngvHyMZsFgPmzw7H+Hq2sI3DVBVuezJw==", + "parameters":[ + { + "name":"parameter0", + "type":"Signature" + } + ], + "deployed":false + }, + "lock":false, + "isDefault":false + } + ], + "scrypt":{ + "n":16384, + "r":8, + "p":8 + }, + "extra":{ + "Tokens":null + } + }