.env

@@ -8,27 +8,23 @@ BASTION_VERSION=10
 BASTION_IMAGE=debian
 
 # NeoGo privnet
-NEOGO_VERSION=0.104.0
+NEOGO_VERSION=0.106.3
 NEOGO_IMAGE=nspccdev/neo-go
 
 # FrostFS InnerRing nodes
-IR_VERSION=0.42.9
+IR_VERSION=0.44.4
 IR_IMAGE=git.frostfs.info/truecloudlab/frostfs-ir
 
 # FrostFS Storage nodes
-NODE_VERSION=0.42.9
+NODE_VERSION=0.44.4
 NODE_IMAGE=git.frostfs.info/truecloudlab/frostfs-storage
 
 # HTTP Gate
-HTTP_GW_VERSION=0.30.2
+HTTP_GW_VERSION=0.32.0
 HTTP_GW_IMAGE=truecloudlab/frostfs-http-gw
 
-# REST Gate
-REST_GW_VERSION=c9c85e90
-REST_GW_IMAGE=truecloudlab/frostfs-rest-gw
-
 # S3 Gate
-S3_GW_VERSION=0.31.0-rc.4
+S3_GW_VERSION=0.32.0
 S3_GW_IMAGE=truecloudlab/frostfs-s3-gw
 
 # Lifecycler
@@ -44,13 +40,11 @@ FROSTFS_CLI_URL=https://git.frostfs.info/TrueCloudLab/frostfs-node/releases/down
 #FROSTFS_CLI_PATH=/path/to/frostfs-cli-binary
 
 # FrostFS ADM tool binary
-FROSTFS_ADM_VERSION=498f9955ea
 FROSTFS_ADM_URL=https://git.frostfs.info/TrueCloudLab/frostfs-node/releases/download/v${NODE_VERSION}/frostfs-adm
 #FROSTFS_ADM_PATH=/path/to/frostfs-adm-binary
 
 # Compiled FrostFS Smart Contracts
-FROSTFS_CONTRACTS_VERSION=694daebb19
+FROSTFS_CONTRACTS_URL=https://git.frostfs.info/TrueCloudLab/frostfs-contract/releases/download/v0.21.1/frostfs-contract-v0.21.1.tar.gz
-FROSTFS_CONTRACTS_URL=https://git.frostfs.info/TrueCloudLab/frostfs-contract/releases/download/v0.19.2/frostfs-contract-v0.19.2.tar.gz
 #FROSTFS_CONTRACTS_PATH=/path/to/unpacked/frostfs-contracts-dir
 
 # Jaeger tracing

.services

@@ -2,5 +2,4 @@
 # Will start from top to bottom and stop in reverse
 http_gate
 s3_gate
-rest_gate
 s3_lifecycler

Makefile

@@ -85,6 +85,8 @@ up/bootstrap: get vendor/hosts
 		echo "Transfer GAS to wallet $${f}" \
 		&& ./vendor/frostfs-adm -c frostfs-adm.yml morph refill-gas --storage-wallet $${f} --gas 10.0 \
 		|| die "Failed to transfer GAS to alphabet wallets"; \
+		echo "Register storage wallet $${f} in proxy contract" \
+		&& ./vendor/frostfs-adm morph proxy-add-account --config frostfs-adm.yml --account=`docker container exec morph_chain neo-go wallet dump-keys -w /wallets/storage/$${f##*/} | head -1 | awk '{print $1}'` || die "Couldn't set storage allet as proxy wallet"
 		done
 	@echo "Create frostfsid subject for ./wallets/wallet.json"; \
 	if [ -n "$$(./vendor/frostfs-adm -c frostfs-adm.yml morph frostfsid list-subjects --namespace '')" ]; then \

services/morph_chain/docker-compose.yml

@@ -20,6 +20,10 @@ services:
     - ./../../vendor/hosts:/etc/hosts
     - ./../../wallets/wallet.json:/wallets/wallet.json
     - ./../s3_gate/wallet.json:/wallets/s3-wallet.json
+    - ./../storage/wallet01.json:/wallets/storage/wallet01.json
+    - ./../storage/wallet02.json:/wallets/storage/wallet02.json
+    - ./../storage/wallet03.json:/wallets/storage/wallet03.json
+    - ./../storage/wallet04.json:/wallets/storage/wallet04.json
     - chains:/chains
 
 networks:

services/morph_chain/protocol.privnet.yml

@@ -11,6 +11,7 @@ ProtocolConfiguration:
   VerifyTransactions: true
   StateRootInHeader: true
   P2PSigExtensions: true
+  Hardforks: {}
 
 ApplicationConfiguration:
   SkipBlockVerification: false

services/rest_gate/.env

@@ -1 +0,0 @@
-../../.env

services/rest_gate/.hosts

@@ -1 +0,0 @@
-IPV4_PREFIX.83 rest.LOCAL_DOMAIN

services/rest_gate/.int_test.env

@@ -1 +0,0 @@
-../../.int_test.env

services/rest_gate/cfg/config.yml

@@ -1,12 +0,0 @@
-prometheus:
-  enabled: true
-  address: :9090
-
-server:
-  # The IP and port to listen on.
-  listen-address: 0.0.0.0:8090
-
-# Wallet settings
-wallet:
-  path: /wallet.json # Path to wallet
-  passphrase: one # Password to decrypt wallet

services/rest_gate/docker-compose.yml

@@ -1,32 +0,0 @@
----
-
-services:
-  rest_gate:
-    image: ${REST_GW_IMAGE}:${REST_GW_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: rest
-    container_name: rest_gate
-    restart: on-failure
-    networks:
-      rest_gate_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.83
-    volumes:
-      - ./wallet.json:/wallet.json
-      - ./../../vendor/hosts:/etc/hosts
-      - ./cfg:/etc/frostfs/rest
-    stop_signal: SIGTERM
-    stop_grace_period: 15s
-    env_file: [ ".env", ".int_test.env" ]
-    command: [ "frostfs-rest-gw", "--config", "/etc/frostfs/rest/config.yml" ]
-    environment:
-      - REST_GW_POOL_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
-      - REST_GW_POOL_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080
-      - REST_GW_POOL_PEERS_2_ADDRESS=s03.${LOCAL_DOMAIN}:8080
-      - REST_GW_POOL_PEERS_3_ADDRESS=s04.${LOCAL_DOMAIN}:8080
-
-networks:
-  rest_gate_int:
-  internet:
-    external: true
-    name: basenet_internet

services/rest_gate/wallet.json

@@ -1,30 +0,0 @@
-{
-  "version": "3.0",
-  "accounts": [
-    {
-      "address": "NPFCqWHfi9ixCJRu7DABRbVfXRbkSEr9Vo",
-      "key": "6PYTAGjdaeicUDPqGv9mmgwb9kTwimWJJmmfNqJSDGH9qM79zSRcL9oHiB",
-      "label": "REST Gateway",
-      "contract": {
-        "script": "DCECcuPzZCZ2VyDsm2jKEOMnU6xEWO2bF1dvOvBWTDFYB1ZBVuezJw==",
-        "parameters": [
-          {
-            "name": "parameter0",
-            "type": "Signature"
-          }
-        ],
-        "deployed": false
-      },
-      "lock": false,
-      "isDefault": false
-    }
-  ],
-  "scrypt": {
-    "n": 16384,
-    "r": 8,
-    "p": 8
-  },
-  "extra": {
-    "Tokens": null
-  }
-}