From 6eea314a7ba98abff43cc7cfbed01ee19464bd3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 12:24:11 +0200 Subject: [PATCH 1/2] chore(deps): bump github.com/go-git/go-git/v5 from 5.19.0 to 5.19.1 (#590) Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.19.0 to 5.19.1. - [Release notes](https://github.com/go-git/go-git/releases) - [Changelog](https://github.com/go-git/go-git/blob/main/HISTORY.md) - [Commits](https://github.com/go-git/go-git/compare/v5.19.0...v5.19.1) --- updated-dependencies: - dependency-name: github.com/go-git/go-git/v5 dependency-version: 5.19.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8c39368f..5f9e2e91 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/ethersphere/ethproxy v0.0.5 github.com/ethersphere/node-funder v0.3.0 github.com/go-git/go-billy/v5 v5.9.0 - github.com/go-git/go-git/v5 v5.19.0 + github.com/go-git/go-git/v5 v5.19.1 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/ipshipyard/p2p-forge v0.7.0 diff --git a/go.sum b/go.sum index 8393d992..81201835 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,8 @@ github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmm github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.19.0 h1:+WkVUQZSy/F1Gb13udrMKjIM2PrzsNfDKFSfo5tkMtc= -github.com/go-git/go-git/v5 v5.19.0/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= +github.com/go-git/go-git/v5 v5.19.1 h1:nX27AnaU43/K5bKktKwgBmR9lawoYVe1Ckg0rgzzN00= +github.com/go-git/go-git/v5 v5.19.1/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= From 6d6ea64de1ac4e7c6b6a5e0870821bb61d6b39cc Mon Sep 17 00:00:00 2001 From: Calin Martinconi Date: Wed, 27 May 2026 14:10:49 +0300 Subject: [PATCH 2/2] feat(config): wire --bzz-token-address through bee config --- config/config.yaml | 1 + config/local.yaml | 1 + pkg/config/bee.go | 1 + pkg/orchestration/k8s/helpers.go | 1 + pkg/orchestration/node.go | 1 + 5 files changed, 5 insertions(+) diff --git a/config/config.yaml b/config/config.yaml index 6d90d4f2..e63595c6 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -95,6 +95,7 @@ bee-configs: blockchain-rpc-endpoint: "ws://geth-swap.bee-playground.svc.swarm1.local:8546" bootnode-mode: false bootnodes: "" + bzz-token-address: "0x6aab14fe9cccd64a502d23842d916eb5321c26e7" cache-capacity: 1000000 chequebook-enable: true cors-allowed-origins: "" diff --git a/config/local.yaml b/config/local.yaml index 3b641bd7..47cbd456 100644 --- a/config/local.yaml +++ b/config/local.yaml @@ -153,6 +153,7 @@ bee-configs: blockchain-rpc-endpoint: "ws://geth-swap:8546" bootnode-mode: false bootnodes: "" + bzz-token-address: "0x6aab14fe9cccd64a502d23842d916eb5321c26e7" cache-capacity: 20000 chequebook-enable: true cors-allowed-origins: "" diff --git a/pkg/config/bee.go b/pkg/config/bee.go index 34366479..f2941f92 100644 --- a/pkg/config/bee.go +++ b/pkg/config/bee.go @@ -25,6 +25,7 @@ type BeeConfig struct { BlockTime *uint64 `yaml:"block-time"` BootnodeMode *bool `yaml:"bootnode-mode"` Bootnodes *string `yaml:"bootnodes"` + BzzTokenAddress *string `yaml:"bzz-token-address"` CacheCapacity *uint64 `yaml:"cache-capacity"` ChequebookEnable *bool `yaml:"chequebook-enable"` CORSAllowedOrigins *string `yaml:"cors-allowed-origins"` diff --git a/pkg/orchestration/k8s/helpers.go b/pkg/orchestration/k8s/helpers.go index e763be69..e76b4912 100644 --- a/pkg/orchestration/k8s/helpers.go +++ b/pkg/orchestration/k8s/helpers.go @@ -24,6 +24,7 @@ block-time: {{ .BlockTime }} blockchain-rpc-endpoint: {{.BlockchainRPCEndpoint}} bootnode-mode: {{.BootnodeMode}} bootnode: {{.Bootnodes}} +bzz-token-address: {{.BzzTokenAddress}} cache-capacity: {{.CacheCapacity}} chequebook-enable: {{.ChequebookEnable}} cors-allowed-origins: {{.CORSAllowedOrigins}} diff --git a/pkg/orchestration/node.go b/pkg/orchestration/node.go index 20bdce74..1455f028 100644 --- a/pkg/orchestration/node.go +++ b/pkg/orchestration/node.go @@ -84,6 +84,7 @@ type Config struct { BlockTime uint64 // chain block time BootnodeMode bool // cause the node to always accept incoming connections Bootnodes string // initial nodes to connect to + BzzTokenAddress string // bzz token contract address CacheCapacity uint64 // cache capacity in chunks, multiply by 4096 (MaxChunkSize) to get approximate capacity in bytes ChequebookEnable bool // enable chequebook CORSAllowedOrigins string // origins with CORS headers enabled