fix: merge master

.github/workflows/beekeeper.yml

@@ -11,7 +11,7 @@ env:
   K3S_VERSION: "v1.22.17+k3s1"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
-  SETUP_CONTRACT_IMAGE_TAG: "1.0.4"
+  SETUP_CONTRACT_IMAGE_TAG: "2.0.7"
   BEELOCAL_BRANCH: "main"
   BEEKEEPER_BRANCH: "master"
   BEEKEEPER_METRICS_ENABLED: false

Dockerfile

@@ -8,7 +8,7 @@ COPY . ./
 
 RUN make binary
 
-FROM debian:11.5-slim
+FROM debian:12.4-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Dockerfile.goreleaser

@@ -1,4 +1,4 @@
-FROM debian:11.5-slim
+FROM debian:12.4-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Dockerfile.scratch

@@ -1,4 +1,4 @@
-FROM debian:11.5-slim
+FROM debian:12.4-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

cmd/bee/cmd/cmd.go

@@ -22,70 +22,69 @@ import (
 )
 
 const (
-	optionNameDataDir                    = "data-dir"
-	optionNameCacheCapacity              = "cache-capacity"
-	optionNameDBOpenFilesLimit           = "db-open-files-limit"
-	optionNameDBBlockCacheCapacity       = "db-block-cache-capacity"
-	optionNameDBWriteBufferSize          = "db-write-buffer-size"
-	optionNameDBDisableSeeksCompaction   = "db-disable-seeks-compaction"
-	optionNamePassword                   = "password"
-	optionNamePasswordFile               = "password-file"
-	optionNameAPIAddr                    = "api-addr"
-	optionNameP2PAddr                    = "p2p-addr"
-	optionNameNATAddr                    = "nat-addr"
-	optionNameP2PWSEnable                = "p2p-ws-enable"
-	optionNameDebugAPIEnable             = "debug-api-enable"
-	optionNameDebugAPIAddr               = "debug-api-addr"
-	optionNameBootnodes                  = "bootnode"
-	optionNameNetworkID                  = "network-id"
-	optionWelcomeMessage                 = "welcome-message"
-	optionCORSAllowedOrigins             = "cors-allowed-origins"
-	optionNameTracingEnabled             = "tracing-enable"
-	optionNameTracingEndpoint            = "tracing-endpoint"
-	optionNameTracingHost                = "tracing-host"
-	optionNameTracingPort                = "tracing-port"
-	optionNameTracingServiceName         = "tracing-service-name"
-	optionNameVerbosity                  = "verbosity"
-	optionNamePaymentThreshold           = "payment-threshold"
-	optionNamePaymentTolerance           = "payment-tolerance-percent"
-	optionNamePaymentEarly               = "payment-early-percent"
-	optionNameResolverEndpoints          = "resolver-options"
-	optionNameBootnodeMode               = "bootnode-mode"
-	optionNameClefSignerEnable           = "clef-signer-enable"
-	optionNameClefSignerEndpoint         = "clef-signer-endpoint"
-	optionNameClefSignerEthereumAddress  = "clef-signer-ethereum-address"
-	optionNameSwapEndpoint               = "swap-endpoint" // deprecated: use rpc endpoint instead
-	optionNameBlockchainRpcEndpoint      = "blockchain-rpc-endpoint"
-	optionNameSwapFactoryAddress         = "swap-factory-address"
-	optionNameSwapLegacyFactoryAddresses = "swap-legacy-factory-addresses"
-	optionNameSwapInitialDeposit         = "swap-initial-deposit"
-	optionNameSwapEnable                 = "swap-enable"
-	optionNameChequebookEnable           = "chequebook-enable"
-	optionNameSwapDeploymentGasPrice     = "swap-deployment-gas-price"
-	optionNameFullNode                   = "full-node"
-	optionNamePostageContractAddress     = "postage-stamp-address"
-	optionNamePostageContractStartBlock  = "postage-stamp-start-block"
-	optionNamePriceOracleAddress         = "price-oracle-address"
-	optionNameRedistributionAddress      = "redistribution-address"
-	optionNameStakingAddress             = "staking-address"
-	optionNameBlockTime                  = "block-time"
-	optionWarmUpTime                     = "warmup-time"
-	optionNameMainNet                    = "mainnet"
-	optionNameRetrievalCaching           = "cache-retrieval"
-	optionNameDevReserveCapacity         = "dev-reserve-capacity"
-	optionNameResync                     = "resync"
-	optionNamePProfBlock                 = "pprof-profile"
-	optionNamePProfMutex                 = "pprof-mutex"
-	optionNameStaticNodes                = "static-nodes"
-	optionNameAllowPrivateCIDRs          = "allow-private-cidrs"
-	optionNameSleepAfter                 = "sleep-after"
-	optionNameRestrictedAPI              = "restricted"
-	optionNameTokenEncryptionKey         = "token-encryption-key"
-	optionNameAdminPasswordHash          = "admin-password"
-	optionNameUsePostageSnapshot         = "use-postage-snapshot"
-	optionNameStorageIncentivesEnable    = "storage-incentives-enable"
-	optionNameStateStoreCacheCapacity    = "statestore-cache-capacity"
-	optionNameTargetNeighborhood         = "target-neighborhood"
+	optionNameDataDir                   = "data-dir"
+	optionNameCacheCapacity             = "cache-capacity"
+	optionNameDBOpenFilesLimit          = "db-open-files-limit"
+	optionNameDBBlockCacheCapacity      = "db-block-cache-capacity"
+	optionNameDBWriteBufferSize         = "db-write-buffer-size"
+	optionNameDBDisableSeeksCompaction  = "db-disable-seeks-compaction"
+	optionNamePassword                  = "password"
+	optionNamePasswordFile              = "password-file"
+	optionNameAPIAddr                   = "api-addr"
+	optionNameP2PAddr                   = "p2p-addr"
+	optionNameNATAddr                   = "nat-addr"
+	optionNameP2PWSEnable               = "p2p-ws-enable"
+	optionNameDebugAPIEnable            = "debug-api-enable"
+	optionNameDebugAPIAddr              = "debug-api-addr"
+	optionNameBootnodes                 = "bootnode"
+	optionNameNetworkID                 = "network-id"
+	optionWelcomeMessage                = "welcome-message"
+	optionCORSAllowedOrigins            = "cors-allowed-origins"
+	optionNameTracingEnabled            = "tracing-enable"
+	optionNameTracingEndpoint           = "tracing-endpoint"
+	optionNameTracingHost               = "tracing-host"
+	optionNameTracingPort               = "tracing-port"
+	optionNameTracingServiceName        = "tracing-service-name"
+	optionNameVerbosity                 = "verbosity"
+	optionNamePaymentThreshold          = "payment-threshold"
+	optionNamePaymentTolerance          = "payment-tolerance-percent"
+	optionNamePaymentEarly              = "payment-early-percent"
+	optionNameResolverEndpoints         = "resolver-options"
+	optionNameBootnodeMode              = "bootnode-mode"
+	optionNameClefSignerEnable          = "clef-signer-enable"
+	optionNameClefSignerEndpoint        = "clef-signer-endpoint"
+	optionNameClefSignerEthereumAddress = "clef-signer-ethereum-address"
+	optionNameSwapEndpoint              = "swap-endpoint" // deprecated: use rpc endpoint instead
+	optionNameBlockchainRpcEndpoint     = "blockchain-rpc-endpoint"
+	optionNameSwapFactoryAddress        = "swap-factory-address"
+	optionNameSwapInitialDeposit        = "swap-initial-deposit"
+	optionNameSwapEnable                = "swap-enable"
+	optionNameChequebookEnable          = "chequebook-enable"
+	optionNameSwapDeploymentGasPrice    = "swap-deployment-gas-price"
+	optionNameFullNode                  = "full-node"
+	optionNamePostageContractAddress    = "postage-stamp-address"
+	optionNamePostageContractStartBlock = "postage-stamp-start-block"
+	optionNamePriceOracleAddress        = "price-oracle-address"
+	optionNameRedistributionAddress     = "redistribution-address"
+	optionNameStakingAddress            = "staking-address"
+	optionNameBlockTime                 = "block-time"
+	optionWarmUpTime                    = "warmup-time"
+	optionNameMainNet                   = "mainnet"
+	optionNameRetrievalCaching          = "cache-retrieval"
+	optionNameDevReserveCapacity        = "dev-reserve-capacity"
+	optionNameResync                    = "resync"
+	optionNamePProfBlock                = "pprof-profile"
+	optionNamePProfMutex                = "pprof-mutex"
+	optionNameStaticNodes               = "static-nodes"
+	optionNameAllowPrivateCIDRs         = "allow-private-cidrs"
+	optionNameSleepAfter                = "sleep-after"
+	optionNameRestrictedAPI             = "restricted"
+	optionNameTokenEncryptionKey        = "token-encryption-key"
+	optionNameAdminPasswordHash         = "admin-password"
+	optionNameUsePostageSnapshot        = "use-postage-snapshot"
+	optionNameStorageIncentivesEnable   = "storage-incentives-enable"
+	optionNameStateStoreCacheCapacity   = "statestore-cache-capacity"
+	optionNameTargetNeighborhood        = "target-neighborhood"
 )
 
 // nolint:gochecknoinits
@@ -277,7 +276,6 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameSwapEndpoint, "", "swap blockchain endpoint") // deprecated: use rpc endpoint instead
 	cmd.Flags().String(optionNameBlockchainRpcEndpoint, "", "rpc blockchain endpoint")
 	cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory addresses")
-	cmd.Flags().StringSlice(optionNameSwapLegacyFactoryAddresses, nil, "legacy swap factory addresses")
 	cmd.Flags().String(optionNameSwapInitialDeposit, "0", "initial deposit if deploying a new chequebook")
 	cmd.Flags().Bool(optionNameSwapEnable, false, "enable swap")
 	cmd.Flags().Bool(optionNameChequebookEnable, true, "enable chequebook")

cmd/bee/cmd/db.go

@@ -26,7 +26,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const optionNameValidation = "validate"
+const (
+	optionNameValidation     = "validate"
+	optionNameValidationPin  = "validate-pin"
+	optionNameCollectionPin  = "pin"
+	optionNameOutputLocation = "output"
+)
 
 func (c *command) initDBCmd() {
 	cmd := &cobra.Command{
@@ -40,6 +45,7 @@ func (c *command) initDBCmd() {
 	dbInfoCmd(cmd)
 	dbCompactCmd(cmd)
 	dbValidateCmd(cmd)
+	dbValidatePinsCmd(cmd)
 
 	c.root.AddCommand(cmd)
 }
@@ -166,6 +172,61 @@ func dbCompactCmd(cmd *cobra.Command) {
 	cmd.AddCommand(c)
 }
 
+func dbValidatePinsCmd(cmd *cobra.Command) {
+	c := &cobra.Command{
+		Use:   "validate-pin",
+		Short: "Validates pin collection chunks with sharky store.",
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			v, err := cmd.Flags().GetString(optionNameVerbosity)
+			if err != nil {
+				return fmt.Errorf("get verbosity: %w", err)
+			}
+			v = strings.ToLower(v)
+			logger, err := newLogger(cmd, v)
+			if err != nil {
+				return fmt.Errorf("new logger: %w", err)
+			}
+
+			dataDir, err := cmd.Flags().GetString(optionNameDataDir)
+			if err != nil {
+				return fmt.Errorf("get data-dir: %w", err)
+			}
+			if dataDir == "" {
+				return errors.New("no data-dir provided")
+			}
+
+			providedPin, err := cmd.Flags().GetString(optionNameCollectionPin)
+			if err != nil {
+				return fmt.Errorf("read pin option: %w", err)
+			}
+
+			outputLoc, err := cmd.Flags().GetString(optionNameOutputLocation)
+			if err != nil {
+				return fmt.Errorf("read location option: %w", err)
+			}
+
+			localstorePath := path.Join(dataDir, "localstore")
+
+			err = storer.ValidatePinCollectionChunks(context.Background(), localstorePath, providedPin, outputLoc, &storer.Options{
+				Logger:          logger,
+				RadiusSetter:    noopRadiusSetter{},
+				Batchstore:      new(postage.NoOpBatchStore),
+				ReserveCapacity: node.ReserveCapacity,
+			})
+			if err != nil {
+				return fmt.Errorf("localstore: %w", err)
+			}
+
+			return nil
+		},
+	}
+	c.Flags().String(optionNameDataDir, "", "data directory")
+	c.Flags().String(optionNameVerbosity, "info", "verbosity level")
+	c.Flags().String(optionNameCollectionPin, "", "only validate given pin")
+	c.Flags().String(optionNameOutputLocation, "", "location and name of the output file")
+	cmd.AddCommand(c)
+}
+
 func dbValidateCmd(cmd *cobra.Command) {
 	c := &cobra.Command{
 		Use:   "validate",

cmd/bee/cmd/deploy.go

@@ -71,14 +71,7 @@ func (c *command) initDeployCmd() error {
 			defer swapBackend.Close()
 			defer transactionMonitor.Close()
 
-			chequebookFactory, err := node.InitChequebookFactory(
-				logger,
-				swapBackend,
-				chainID,
-				transactionService,
-				factoryAddress,
-				nil,
-			)
+			chequebookFactory, err := node.InitChequebookFactory(logger, swapBackend, chainID, transactionService, factoryAddress)
 			if err != nil {
 				return err
 			}

cmd/bee/cmd/start.go

@@ -313,7 +313,6 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		BootnodeMode:                  bootNode,
 		BlockchainRpcEndpoint:         blockchainRpcEndpoint,
 		SwapFactoryAddress:            c.config.GetString(optionNameSwapFactoryAddress),
-		SwapLegacyFactoryAddresses:    c.config.GetStringSlice(optionNameSwapLegacyFactoryAddresses),
 		SwapInitialDeposit:            c.config.GetString(optionNameSwapInitialDeposit),
 		SwapEnable:                    c.config.GetBool(optionNameSwapEnable),
 		ChequebookEnable:              c.config.GetBool(optionNameChequebookEnable),

go.mod

@@ -9,9 +9,9 @@ require (
 	github.com/casbin/casbin/v2 v2.35.0
 	github.com/coreos/go-semver v0.3.0
 	github.com/ethereum/go-ethereum v1.13.4
-	github.com/ethersphere/go-price-oracle-abi v0.1.0
-	github.com/ethersphere/go-storage-incentives-abi v0.6.0
-	github.com/ethersphere/go-sw3-abi v0.4.0
+	github.com/ethersphere/go-price-oracle-abi v0.2.0
+	github.com/ethersphere/go-storage-incentives-abi v0.6.2
+	github.com/ethersphere/go-sw3-abi v0.6.5
 	github.com/ethersphere/langos v1.0.0
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/gogo/protobuf v1.3.2

go.sum

@@ -238,12 +238,12 @@ github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1
 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
 github.com/ethereum/go-ethereum v1.13.4 h1:25HJnaWVg3q1O7Z62LaaI6S9wVq8QCw3K88g8wEzrcM=
 github.com/ethereum/go-ethereum v1.13.4/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q=
-github.com/ethersphere/go-price-oracle-abi v0.1.0 h1:yg/hK8nETNvk+GEBASlbakMFv/CVp7HXiycrHw1pRV8=
-github.com/ethersphere/go-price-oracle-abi v0.1.0/go.mod h1:sI/Qj4/zJ23/b1enzwMMv0/hLTpPNVNacEwCWjo6yBk=
-github.com/ethersphere/go-storage-incentives-abi v0.6.0 h1:lfGViU/wJg/CyXlntNvTQpqQ2A4QYGLJ7jo+Pw+H+a4=
-github.com/ethersphere/go-storage-incentives-abi v0.6.0/go.mod h1:SXvJVtM4sEsaSKD0jc1ClpDLw8ErPoROZDme4Wrc/Nc=
-github.com/ethersphere/go-sw3-abi v0.4.0 h1:T3ANY+ktWrPAwe2U0tZi+DILpkHzto5ym/XwV/Bbz8g=
-github.com/ethersphere/go-sw3-abi v0.4.0/go.mod h1:BmpsvJ8idQZdYEtWnvxA8POYQ8Rl/NhyCdF0zLMOOJU=
+github.com/ethersphere/go-price-oracle-abi v0.2.0 h1:wtIcYLgNZHY4BjYwJCnu93SvJdVAZVvBaKinspyyHvQ=
+github.com/ethersphere/go-price-oracle-abi v0.2.0/go.mod h1:sI/Qj4/zJ23/b1enzwMMv0/hLTpPNVNacEwCWjo6yBk=
+github.com/ethersphere/go-storage-incentives-abi v0.6.2 h1:lcVylu+KRUEOUvytP6ofcyTwTE7UmfE2oJPC4jpVjSo=
+github.com/ethersphere/go-storage-incentives-abi v0.6.2/go.mod h1:SXvJVtM4sEsaSKD0jc1ClpDLw8ErPoROZDme4Wrc/Nc=
+github.com/ethersphere/go-sw3-abi v0.6.5 h1:M5dcIe1zQYvGpY2K07UNkNU9Obc4U+A1fz68Ho/Q+XE=
+github.com/ethersphere/go-sw3-abi v0.6.5/go.mod h1:BmpsvJ8idQZdYEtWnvxA8POYQ8Rl/NhyCdF0zLMOOJU=
 github.com/ethersphere/langos v1.0.0 h1:NBtNKzXTTRSue95uOlzPN4py7Aofs0xWPzyj4AI1Vcc=
 github.com/ethersphere/langos v1.0.0/go.mod h1:dlcN2j4O8sQ+BlCaxeBu43bgr4RQ+inJ+pHwLeZg5Tw=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=

packaging/bee.yaml

@@ -60,8 +60,6 @@ password-file: /var/lib/bee/password
 # blockchain-rpc-endpoint: ""
 ## swap factory address
 # swap-factory-address: ""
-## legacy swap factory addresses
-# swap-legacy-factory-addresses: ""
 ## initial deposit if deploying a new chequebook (default 0)
 # swap-initial-deposit: 0
 ## gas price in wei to use for deployment and funding (default "")

packaging/docker/README.md

@@ -12,7 +12,7 @@ Set all configuration variables inside `.env`
 If you want to run node in full mode, set `BEE_FULL_NODE=true`
 
 Bee requires an Ethereum endpoint to function. Obtain a free Infura account and set:
-- `BEE_BLOCKCHAIN_RPC_ENDPOINT=wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
+- `BEE_BLOCKCHAIN_RPC_ENDPOINT=wss://sepolia.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
 
 Set bee password by either setting `BEE_PASSWORD` or `BEE_PASSWORD_FILE`
 
@@ -30,7 +30,7 @@ Start it with
 docker-compose up -d
 ```
 
-From logs find URL line with `on goerli you can get both goerli eth and goerli bzz from` and prefund your node
+From logs find URL line with `on sepolia you can get both sepolia eth and sepolia bzz from` and prefund your node
 ```
 docker-compose logs -f bee-1
 ```

packaging/homebrew-amd64/bee.yaml

@@ -60,8 +60,6 @@ password-file: /usr/local/var/lib/swarm-bee/password
 # blockchain-rpc-endpoint: ""
 ## swap factory address
 # swap-factory-address: ""
-## legacy swap factory addresses
-# swap-legacy-factory-addresses: ""
 ## initial deposit if deploying a new chequebook (default 0)
 # swap-initial-deposit: 0
 ## gas price in wei to use for deployment and funding (default "")

packaging/homebrew-arm64/bee.yaml

@@ -60,8 +60,6 @@ password-file: /opt/homebrew/var/lib/swarm-bee/password
 # blockchain-rpc-endpoint: ""
 ## swap factory address
 # swap-factory-address: ""
-## legacy swap factory addresses
-# swap-legacy-factory-addresses: ""
 ## initial deposit if deploying a new chequebook (default 0)
 # swap-initial-deposit: 0
 ## gas price in wei to use for deployment and funding (default "")

packaging/scoop/bee.yaml

@@ -50,8 +50,6 @@ password-file: ./password
 # blockchain-rpc-endpoint: ""
 ## swap factory address
 # swap-factory-address: ""
-## legacy swap factory addresses
-# swap-legacy-factory-addresses: ""
 ## initial deposit if deploying a new chequebook (default 0)
 # swap-initial-deposit: 0
 ## gas price in wei to use for deployment and funding (default "")

pkg/api/api.go

@@ -783,7 +783,7 @@ func (p *putterSessionWrapper) Done(ref swarm.Address) error {
 }
 
 func (p *putterSessionWrapper) Cleanup() error {
-	return errors.Join(p.PutterSession.Cleanup(), p.save())
+	return p.PutterSession.Cleanup()
 }
 
 func (s *Service) getStamper(batchID []byte) (postage.Stamper, func() error, error) {