Merge branch 'master' into stamp-funder

Author: gacevicljubisa

cmd/beekeeper/cmd/check.go

@@ -120,29 +120,27 @@ func (c *command) initCheckCmd() error {
 				}
 				chk = beekeeper.NewActionMiddleware(tracer, chk, checkName)
 
-				if checkConfig.Timeout != nil {
-					ctx, cancel = context.WithTimeout(ctx, *checkConfig.Timeout)
-					defer cancel()
-				}
+				checkCtx, cancelCheck := createChildContext(ctx, checkConfig.Timeout)
+				defer cancelCheck()
 
 				c.log.Infof("running check: %s", checkName)
 
 				ch := make(chan error, 1)
 				go func() {
-					ch <- chk.Run(ctx, cluster, o)
+					ch <- chk.Run(checkCtx, cluster, o)
 					close(ch)
 				}()
 
 				select {
-				case <-ctx.Done():
-					deadline, ok := ctx.Deadline()
+				case <-checkCtx.Done():
+					deadline, ok := checkCtx.Deadline()
 					if ok {
-						return fmt.Errorf("running check %s: %w: deadline %v", checkName, ctx.Err(), deadline)
+						return fmt.Errorf("running check %s: %w: deadline %v", checkName, checkCtx.Err(), deadline)
 					}
-					return fmt.Errorf("running check %s: %w", checkName, ctx.Err())
+					return fmt.Errorf("check %s failed due to: %w", checkName, checkCtx.Err())
 				case err = <-ch:
 					if err != nil {
-						return fmt.Errorf("running check %s: %w", checkName, err)
+						return fmt.Errorf("check %s failed with error: %w", checkName, err)
 					}
 					c.log.Infof("%s check completed successfully", checkName)
 				}
@@ -164,3 +162,10 @@ func (c *command) initCheckCmd() error {
 
 	return nil
 }
+
+func createChildContext(ctx context.Context, timeout *time.Duration) (context.Context, context.CancelFunc) {
+	if timeout != nil {
+		return context.WithTimeout(ctx, *timeout)
+	}
+	return context.WithCancel(ctx)
+}

config/config.yaml

@@ -212,7 +212,7 @@ checks:
       max-pathname-length: 64
       postage-amount: 1000
       postage-depth: 17
-    timeout: 5m
+    timeout: 30m
     type: manifest
   networkavailability:
     options:
@@ -348,7 +348,7 @@ checks:
       insufficient-amount: 102400
       contract-addr: "0xfc28330f1ecE0ef2371B724E0D19c1EE60B728b2"
       private-key: "4663c222787e30c1994b59044aa5045377a6e79193a8ead88293926b535c722d"
-      geth-url: "http://geth-swap.bee-playground.testnet.internal"
+      geth-url: "http://geth-swap.bee-playground.svc.swarm1.local:8545"
       geth-chain-id: 12345
   withdraw:
     options:

config/local.yaml

@@ -204,7 +204,7 @@ checks:
       max-pathname-length: 64
       postage-amount: 1000
       postage-depth: 17
-    timeout: 5m
+    timeout: 30m
     type: manifest
   ci-pingpong:
     options:

config/public-testnet.yaml

@@ -47,8 +47,13 @@ bee-configs:
   sepolia:
     _inherit: ""
     bootnodes: "/dnsaddr/testnet.ethswarm.org"
+    full-node: true
 
 checks:
+  pt-pingpong:
+    options:
+    timeout: 30m
+    type: pingpong
   pt-retrieval:
     options:
       chunks-per-node: 3
@@ -76,7 +81,7 @@ checks:
       max-pathname-length: 64
       postage-amount: 140000000
       postage-depth: 17
-    timeout: 5m
+    timeout: 30m
     type: manifest
   pt-pss:
     options:
@@ -146,6 +151,7 @@ checks:
       postage-amount: 140000000
       postage-depth: 20
       postage-label: feed-label
+    timeout: 30m
     type: feed
   pt-feed-availability:
     options:

pkg/bee/api/api.go

@@ -34,6 +34,8 @@ const (
 	swarmSocSignatureHeader     = "Swarm-Soc-Signature"
 	swarmFeedIndexHeader        = "Swarm-Feed-Index"
 	swarmFeedIndexNextHeader    = "Swarm-Feed-Index-Next"
+	swarmIndexDocumentHeader    = "Swarm-Index-Document"
+	swarmErrorDocumentHeader    = "Swarm-Error-Document"
 )
 
 var userAgent = "beekeeper/" + beekeeper.Version
@@ -340,6 +342,10 @@ type UploadOptions struct {
 	BatchID           string
 	Direct            bool
 	ActHistoryAddress swarm.Address
+
+	// Dirs
+	IndexDocument string
+	ErrorDocument string
 }
 
 type DownloadOptions struct {

pkg/bee/api/dirs.go

@@ -30,6 +30,13 @@ func (s *DirsService) Upload(ctx context.Context, data io.Reader, size int64, o
 	header.Set("swarm-collection", "True")
 	header.Set(postageStampBatchHeader, o.BatchID)
 
+	if o.IndexDocument != "" {
+		header.Set(swarmIndexDocumentHeader, o.IndexDocument)
+	}
+	if o.ErrorDocument != "" {
+		header.Set(swarmErrorDocumentHeader, o.ErrorDocument)
+	}
+
 	err = s.client.requestWithHeader(ctx, http.MethodPost, "/"+apiVersion+"/bzz", header, data, &resp)
 
 	return