[TrueCloudLab#1] Update core images

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>

.env

@@ -14,12 +14,12 @@ NEOGO_VERSION=0.99.4
 NEOGO_IMAGE=nspccdev/neo-go
 
 # FrostFS InnerRing nodes
-IR_VERSION=0.34.0
+IR_VERSION=e3554425
-IR_IMAGE=nspccdev/neofs-ir
+IR_IMAGE=truecloudlab/frostfs-ir
 
 # FrostFS Storage nodes
-NODE_VERSION=0.34.0
+NODE_VERSION=e3554425
-NODE_IMAGE=nspccdev/neofs-storage
+NODE_IMAGE=truecloudlab/frostfs-storage
 
 # NATS Server
 NATS_VERSION=2.7.2
@@ -46,12 +46,12 @@ LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.
 #LOCODE_DB_PATH=/path/to/locode_db
 
 # FrostFS CLI binary
-FROSTFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.34.0/neofs-cli-amd64.tar.gz
+FROSTFS_CLI_URL=https://http.t5.fs.neo.org/AQgse8bPCZx4zScMuAKxowJdZPbKHp8NDcp15o6VUNmk/DjKaXEXVmVunGgu2pMvpqZmzZ2omNxTQHx3sUYEz1s1b
 #FROSTFS_CLI_PATH=/path/to/frostfs-cli-binary
 
 # FrostFS ADM tool binary
-FROSTFS_ADM_VERSION=v0.34.0
+FROSTFS_ADM_VERSION=e3554425
-FROSTFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${FROSTFS_ADM_VERSION}/neofs-adm-amd64.tar.gz
+FROSTFS_ADM_URL=https://http.t5.fs.neo.org/AQgse8bPCZx4zScMuAKxowJdZPbKHp8NDcp15o6VUNmk/JAqZZR6Rh7QL6NrJc9cbALNrUJenGD2VK6Mjdjsa7tzF
 #FROSTFS_ADM_PATH=/path/to/frostfs-adm-binary
 
 # Compiled FrostFS Smart Contracts

bin/config.sh

@@ -14,7 +14,7 @@ NEOGO="${NEOGO:-docker exec main_chain neo-go}"
 WALLET="${WALLET:-services/chain/node-wallet.json}"
 CONFIG_IMG="${CONFIG_IMG:-/wallets/config.yml}"
 
-NETMAP_ADDR=$(bin/resolve.sh netmap.neofs) || die "Failed to resolve 'netmap.neofs' domain name"
+NETMAP_ADDR=$(bin/resolve.sh netmap.frostfs) || die "Failed to resolve 'netmap.frostfs' domain name"
 
 # FrostFS configuration record: variable type [string|int|etc],
 # key is a string and value is a constant of given type

bin/deposit.sh

@@ -18,11 +18,11 @@ DEPOSIT="${1:-50}"
 # Internal variables
 ADDR=$(jq -r .accounts[0].address < "${WALLET}" \
 	|| die "Cannot get address from wallet: ${WALLET}")
-CONTRACT_ADDR=$(${NEOGO} util convert "${NEOFS_IR_CONTRACTS_NEOFS}" \
+CONTRACT_ADDR=$(${NEOGO} util convert "${NEOFS_IR_CONTRACTS_FROSTFS}" \
 	| grep 'LE ScriptHash to Address' \
 	| awk '{print $5}' \
 	| grep -oP "[A-z0-9]+" \
-	|| die "Cannot parse contract address: ${NEOFS_IR_CONTRACTS_NEOFS}")
+	|| die "Cannot parse contract address: ${NEOFS_IR_CONTRACTS_FROSTFS}")
 
 # Make deposit
 # shellcheck disable=SC2086

bin/tick.sh

@@ -25,7 +25,7 @@ fi
 SIDECHAIN_PROTO="${SIDECHAIN_PROTO:-services/morph_chain/protocol.privnet.yml}"
 BLOCK_DURATION=$(grep SecondsPerBlock < "$SIDECHAIN_PROTO" | awk '{print $2}') \
 	|| die "Cannot fetch block duration"
-NETMAP_ADDR=$(bin/resolve.sh netmap.neofs) || die "Cannot resolve netmap.neofs"
+NETMAP_ADDR=$(bin/resolve.sh netmap.frostfs) || die "Cannot resolve netmap.frostfs"
 
 # Fetch current epoch value
 EPOCH=$(${NEOGO} contract testinvokefunction \

services/ir/.ir.env

@@ -30,7 +30,8 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4
 NEOFS_IR_EMIT_STORAGE_AMOUNT=1000000000
 NEOFS_IR_NETMAP_CLEANER_ENABLED=true
 
-NEOFS_IR_CONTRACTS_NEOFS=f5dba2f67baa3cbb5595f0a7e46adf564ec9407a
+NEOFS_IR_CONTRACTS_FROSTFS=f5dba2f67baa3cbb5595f0a7e46adf564ec9407a
+NEOFS_IR_CONTRACTS_FROSTFSID=1943e9bb78a0fe2fe0c95fd2677eec2da6aa4aa5
 NEOFS_IR_CONTRACTS_PROCESSING=332016219b9eb48348fb12694409dbefe29bdf30
 
 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

services/ir/artifacts.mk

@@ -33,7 +33,7 @@ get.cli:
 ifeq (${FROSTFS_CLI_PATH},)
 	@echo "⇒ Download FrostFS CLI binary from ${FROSTFS_CLI_URL}"
 	@curl \
-		-sSL "${FROSTFS_CLI_URL}" \
+		-ksSL "${FROSTFS_CLI_URL}" \
 		-o ${FROSTFS_CLI_ARCHIVE_FILE} 
 	@tar -xvf ${FROSTFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \
 		mv ./vendor/{} ${FROSTFS_CLI_FILE}

services/morph_chain/artifacts.mk

@@ -25,7 +25,7 @@ get.adm:
 
 ifeq (${FROSTFS_ADM_PATH},)
 	@echo "⇒ Download FrostFS ADM binary from ${FROSTFS_ADM_URL}"
-	@curl -sSL ${FROSTFS_ADM_URL} -o ${FROSTFS_ADM_ARCHIVE}
+	@curl -skSL ${FROSTFS_ADM_URL} -o ${FROSTFS_ADM_ARCHIVE}
 	@tar -xvf ${FROSTFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \
 		mv ./vendor/{} ${FROSTFS_ADM_DEST}
 	@rm ${FROSTFS_ADM_ARCHIVE}