Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ BASTION_VERSION=10
BASTION_IMAGE=debian

#NEOGO
NEOGO_VERSION=0.113.0
NEOGO_VERSION=0.114.0
NEOGO_IMAGE=nspccdev/neo-go
NEO_GO_PLATFORM=linux-amd64
NEO_GO_URL="https://github.com/nspcc-dev/neo-go/releases/download/v${NEOGO_VERSION}/neo-go-${NEO_GO_PLATFORM}"

# NeoFS InnerRing nodes
IR_VERSION=0.49.1
IR_VERSION=0.50.2
IR_IMAGE=nspccdev/neofs-ir
IR_NUMBER_OF_NODES=1

# NeoFS Storage nodes
NODE_VERSION=0.49.1
NODE_VERSION=0.50.2
NODE_IMAGE=nspccdev/neofs-storage

# REST Gate
Expand All @@ -34,17 +34,17 @@ S3_GW_IMAGE=nspccdev/neofs-s3-gw
#S3_GW_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-gw-${S3_GW_PLATFORM}

# NeoFS CLI binary
NEOFS_CLI_VERSION=v0.49.1
NEOFS_CLI_VERSION=v0.50.2
NEOFS_CLI_URL="https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_CLI_VERSION}/neofs-cli-linux-amd64"
#NEOFS_CLI_PATH=/path/to/neofs-cli-binary

# NeoFS ADM tool binary
NEOFS_ADM_VERSION=v0.49.1
NEOFS_ADM_VERSION=v0.50.2
NEOFS_ADM_URL="https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-linux-amd64"
#NEOFS_ADM_PATH=/path/to/neofs-adm-binary

# Compiled NeoFS Smart Contracts
NEOFS_CONTRACTS_VERSION=v0.23.0
NEOFS_CONTRACTS_VERSION=v0.25.1
NEOFS_CONTRACTS_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/${NEOFS_CONTRACTS_VERSION}/neofs-contract-${NEOFS_CONTRACTS_VERSION}.tar.gz"
#NEOFS_CONTRACTS_PATH=/path/to/unpacked/neofs-contracts-dir

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ up/basic: up/bootstrap
# Start bootstrap services
.PHONY: up/bootstrap
up/bootstrap: check_nodes get vendor/hosts
@echo "NEOFS_IR_CONTRACTS_NEOFS="`./vendor/neo-go contract calc-hash -s NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM --in vendor/contracts/neofs/contract.nef -m vendor/contracts/neofs/manifest.json | grep -Eo '[a-fA-F0-9]{40}'` > services/ir${IR_NUMBER_OF_NODES}/.ir.env
@echo "NEOFS_IR_MAINNET_CONTRACTS_NEOFS="`./vendor/neo-go contract calc-hash -s NbUgTSFvPmsRxmGeWpuuGeJUoRoi6PErcM --in vendor/contracts/neofs/contract.nef -m vendor/contracts/neofs/manifest.json | grep -Eo '[a-fA-F0-9]{40}'` > services/ir${IR_NUMBER_OF_NODES}/.ir.env
@for svc in $(START_BOOTSTRAP); do \
echo "$@ for service: $${svc}"; \
docker compose -f services/$${svc}/docker-compose.yml up -d 2>&1 | tee -a docker-compose.err; \
Expand Down
4 changes: 2 additions & 2 deletions bin/contractDeploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ NEOGO="${NEOGO:-./vendor/neo-go}"

CONFIG="${CONFIG:-./wallets/config.yml}"

CONTRACT_ADDR=$(${NEOGO} util convert "${NEOFS_IR_CONTRACTS_NEOFS}" \
CONTRACT_ADDR=$(${NEOGO} util convert "${NEOFS_IR_MAINNET_CONTRACTS_NEOFS}" \
| 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_MAINNET_CONTRACTS_NEOFS}")

keys=$(${NEOGO} wallet dump-keys -w services/ir${IR_NUMBER_OF_NODES}/alphabet/az.json \
| awk -v RS=':' 'END {print $0}' \
Expand Down
4 changes: 2 additions & 2 deletions bin/deposit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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_MAINNET_CONTRACTS_NEOFS}" \
| 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_MAINNET_CONTRACTS_NEOFS}")

# Make deposit
# shellcheck disable=SC2086
Expand Down
6 changes: 1 addition & 5 deletions services/ir1/cfg/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ prometheus:
address: :9090 # Endpoint for application prometheus metrics; disabled by default
shutdown_timeout: 30s # Timeout for metrics HTTP server graceful shutdown

# Toggling the sidechain-only mode
without_mainnet: false

# Neo main chain RPC settings
mainnet:
enabled: true # Enable connection to mainchain; by default, 'false', run application in single chain environment
endpoints: # List of websocket RPC endpoints in mainchain; ignore if mainchain is disabled
- ws://main-chain:30333/ws

Expand Down Expand Up @@ -60,8 +58,6 @@ fschain:
timeout: 90s
set_roles_in_genesis: true

fschain_autodeploy: true

# Network time settings
timers:
collect_basic_income:
Expand Down
6 changes: 1 addition & 5 deletions services/ir4/cfg/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ prometheus:
address: :9090 # Endpoint for application prometheus metrics; disabled by default
shutdown_timeout: 30s # Timeout for metrics HTTP server graceful shutdown

# Toggling the sidechain-only mode
without_mainnet: false

# Neo main chain RPC settings
mainnet:
enabled: true # Enable connection to mainchain; by default, 'false', run application in single chain environment
endpoints: # List of websocket RPC endpoints in mainchain; ignore if mainchain is disabled
- ws://main-chain:30333/ws

Expand Down Expand Up @@ -54,8 +52,6 @@ fschain:
- ":20333"
set_roles_in_genesis: true

fschain_autodeploy: true

# Network time settings
timers:
collect_basic_income:
Expand Down
6 changes: 1 addition & 5 deletions services/ir7/cfg/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ prometheus:
address: :9090 # Endpoint for application prometheus metrics; disabled by default
shutdown_timeout: 30s # Timeout for metrics HTTP server graceful shutdown

# Toggling the sidechain-only mode
without_mainnet: false

# Neo main chain RPC settings
mainnet:
enabled: true # Enable connection to mainchain; by default, 'false', run application in single chain environment
endpoints: # List of websocket RPC endpoints in mainchain; ignore if mainchain is disabled
- ws://main-chain:30333/ws

Expand Down Expand Up @@ -60,8 +58,6 @@ fschain:
- ":20333"
set_roles_in_genesis: true

fschain_autodeploy: true

# Network time settings
timers:
collect_basic_income:
Expand Down