From 13deba1fb63fef81d19339fca7f4b87f2073074e Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Thu, 14 Aug 2025 15:14:52 +0300 Subject: [PATCH 1/2] env: Upgrade NeoFS to v0.48.3 Signed-off-by: Leonard Lyubich --- .env | 10 +++++----- services/ir1/cfg/config.yml | 6 ------ services/ir4/cfg/config.yml | 6 ------ services/ir7/cfg/config.yml | 6 ------ 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 1ff6e05..c94171d 100644 --- a/.env +++ b/.env @@ -14,12 +14,12 @@ 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.47.0 +IR_VERSION=0.48.3 IR_IMAGE=nspccdev/neofs-ir IR_NUMBER_OF_NODES=1 # NeoFS Storage nodes -NODE_VERSION=0.47.0 +NODE_VERSION=0.48.3 NODE_IMAGE=nspccdev/neofs-storage # REST Gate @@ -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.47.0 +NEOFS_CLI_VERSION=v0.48.3 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.47.0 +NEOFS_ADM_VERSION=v0.48.3 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.20.0 +NEOFS_CONTRACTS_VERSION=v0.23.0 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 diff --git a/services/ir1/cfg/config.yml b/services/ir1/cfg/config.yml index ae19cfd..cd8b854 100644 --- a/services/ir1/cfg/config.yml +++ b/services/ir1/cfg/config.yml @@ -78,16 +78,10 @@ timers: emit: storage: amount: 1000000000 # Fixed8 value of sidechain GAS emitted to all storage nodes once per GAS emission cycle; disabled by default - -# Audit settings -audit: - pdp: - max_sleep_interval: 100ms # Maximum timeout between object.RangeHash requests to the storage node # Settlement settings settlement: basic_income_rate: 100000000 # Optional: override basic income rate value from network config; applied only in debug mode - audit_fee: 100000 # Optional: override audit fee value from network config; applied only in debug mode experimental: chain_meta_data: true # Optional: allows creating containers with metadata handled via FS chain diff --git a/services/ir4/cfg/config.yml b/services/ir4/cfg/config.yml index 6d2dfa5..deb7dfd 100644 --- a/services/ir4/cfg/config.yml +++ b/services/ir4/cfg/config.yml @@ -73,15 +73,9 @@ emit: storage: amount: 1000000000 # Fixed8 value of sidechain GAS emitted to all storage nodes once per GAS emission cycle; disabled by default -# Audit settings -audit: - pdp: - max_sleep_interval: 100ms # Maximum timeout between object.RangeHash requests to the storage node - # Settlement settings settlement: basic_income_rate: 100000000 # Optional: override basic income rate value from network config; applied only in debug mode - audit_fee: 100000 # Optional: override audit fee value from network config; applied only in debug mode experimental: chain_meta_data: true # Optional: allows creating containers with metadata handled via FS chain diff --git a/services/ir7/cfg/config.yml b/services/ir7/cfg/config.yml index b2f88a6..428899d 100644 --- a/services/ir7/cfg/config.yml +++ b/services/ir7/cfg/config.yml @@ -79,15 +79,9 @@ emit: storage: amount: 1000000000 # Fixed8 value of sidechain GAS emitted to all storage nodes once per GAS emission cycle; disabled by default -# Audit settings -audit: - pdp: - max_sleep_interval: 100ms # Maximum timeout between object.RangeHash requests to the storage node - # Settlement settings settlement: basic_income_rate: 100000000 # Optional: override basic income rate value from network config; applied only in debug mode - audit_fee: 100000 # Optional: override audit fee value from network config; applied only in debug mode experimental: chain_meta_data: true # Optional: allows creating containers with metadata handled via FS chain From 4b3871ee73d026a737700399f18c38edce19732a Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Thu, 14 Aug 2025 15:19:12 +0300 Subject: [PATCH 2/2] Makefile: Drop `update.audit_fee` target It affects nothing in used NeoFS version. Audit is completely gone, see https://github.com/nspcc-dev/neofs-node/releases/tag/v0.48.0. Signed-off-by: Leonard Lyubich --- docs/ir.md | 1 - neofs_config.mk | 4 ---- 2 files changed, 5 deletions(-) diff --git a/docs/ir.md b/docs/ir.md index a09b4fc..f841547 100644 --- a/docs/ir.md +++ b/docs/ir.md @@ -55,7 +55,6 @@ $ make help ... Targets: ... -update.audit_fee Update audit fee per result in fixed 12 (make update.audit_fee val=100) update.basic_income_rate Update basic income rate in fixed 12 (make update.basic_income_rate val=1000) update.container_fee Update container fee per alphabet node in fixed 12 (make update.container_fee val=500) update.eigen_trust_iterations Update amount of EigenTrust iterations (make update.eigen_trust_iterations val=2) diff --git a/neofs_config.mk b/neofs_config.mk index c672b5d..27ba738 100644 --- a/neofs_config.mk +++ b/neofs_config.mk @@ -6,10 +6,6 @@ update.epoch_duration: update.max_object_size: @./bin/config.sh MaxObjectSize $(val) -# Update audit fee per result in fixed 12 (make update.audit_fee val=100) -update.audit_fee: - @./bin/config.sh AuditFee $(val) - # Update container fee per alphabet node in fixed 12 (make update.container_fee val=500) update.container_fee: @./bin/config.sh ContainerFee $(val)