node split: proposal building

activation/activation.go

@@ -749,7 +749,10 @@ func (b *Builder) PublishActivationTx(ctx context.Context, sig *signing.EdSigner
 		)
 		size, err := b.broadcast(ctx, atx)
 		if err == nil {
-			b.logger.Info("atx published", log.ZShortStringer("atx_id", atx.ID()), zap.Int("size", size))
+			b.logger.Info("atx published",
+				log.ZShortStringer("atx_id", atx.ID()),
+				zap.Stringer("coinbase", b.Coinbase()),
+				zap.Int("size", size))
 			break
 		}
 

activation_service_poc/config.standalone.client.json

@@ -10,9 +10,10 @@
     "logging": {
         "trtl": "WARN",
         "beacon": "ERROR",
-        "proposalBuilder": "ERROR",
-        "atxBuilder": "DEBUG",
-        "hare": "DEBUG"
+        "proposalBuilder": "DEBUG",
+        "atxBuilder": "ERROR",
+        "hare": "ERROR",
+        "nodeServiceClient": "ERROR"
     },
     "main": {
         "node-service-address": "http://0.0.0.0:9099",

activation_service_poc/config.standalone.node-service.json

@@ -12,13 +12,18 @@
         "trtl": "WARN",
         "beacon": "ERROR",
         "proposalBuilder": "ERROR",
-        "hare": "DEBUG"
+        "hare": "ERROR"
     },
     "hare3": {
         "enable": true
     },
     "main": {
         "data-folder": "/tmp/spacemesh-node-service",
         "filelock": "/tmp/spacemesh-node-service/node.lock"
+    },
+    "smeshing": {
+        "smeshing-opts": {
+            "smeshing-opts-datadir": "/tmp/spacemesh-node-service/post-data"
+        }
     }
 }

activation_service_poc/docker-compose.yml

@@ -12,12 +12,15 @@ services:
 
   node-service:
     image: ${IMAGE}
-    command: ["-c", "/config.json", "--smeshing-opts-datadir", "/tmp/spacemesh-node-post"]
+    command: ["-c", "/config.json" ]
     volumes:
       - /tmp/spacemesh-node-service:/tmp/spacemesh-node-service
       - ./config.standalone.node-service.json:/config.json
     networks:
       - spacemesh-net
+    ports:
+      - 9092:9092
+      - 9093:9093
 
 networks:
   spacemesh-net:

activation_service_poc/start.sh

@@ -7,8 +7,9 @@ cd activation_service_poc
 export IMAGE=$(docker images | head -n 2 | tail -n 1 | awk '{print $3}')
 
 TIME=$(date -u -d '2 minutes' "+%Y-%m-%dT%H:%M:%S%:z")
-jq ".genesis.\"genesis-time\" |= \"$TIME\"" config.standalone.client.json
-jq ".genesis.\"genesis-time\" |= \"$TIME\"" config.standalone.node-service.json
+for file in config.standalone.client.json config.standalone.node-service.json;do
+  jq ".genesis.\"genesis-time\" |= \"$TIME\"" "$file" > temp.json && mv temp.json "$file"
+done
 
-rm -rf /tmp/spacemesh*
+rm -rf /tmp/space*
 docker compose up

api/node/client/client.go

@@ -4,6 +4,7 @@
 	"bytes"
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -133,22 +134,30 @@
 		externalRef0.HareIter(round.Iter),
 		externalRef0.HareRound(round.Round))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("get hare message: %w", err)
 	}
-	if resp.StatusCode != http.StatusOK {
+	switch resp.StatusCode {
+	case http.StatusOK:
+		bytes, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return nil, fmt.Errorf("read all: %w", err)
+		}
+		return bytes, nil
+
+	case http.StatusNoContent:
+		// no message to return, special case, return nil,nil
+		// and the caller should assume there's no message to process,
+		// therefore hare probably terminated.
+		return nil, nil
+	default:
 		return nil, fmt.Errorf("unexpected status: %s", resp.Status)
 	}
-	bytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("read all: %w", err)
-	}
-	return bytes, nil
 }
 
 func (s *NodeService) TotalWeight(ctx context.Context, layer types.LayerID) (uint64, error) {
 	resp, err := s.client.GetHareTotalWeightLayer(ctx, uint32(layer))
 	if err != nil {
-		return 0, err
+		return 0, fmt.Errorf("get total weight: %w", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		return 0, fmt.Errorf("unexpected status: %s", resp.Status)
@@ -163,7 +172,7 @@
 func (s *NodeService) MinerWeight(ctx context.Context, layer types.LayerID, node types.NodeID) (uint64, error) {
 	resp, err := s.client.GetHareWeightNodeIdLayer(ctx, node.String(), uint32(layer))
 	if err != nil {
-		return 0, err
+		return 0, fmt.Errorf("get miner weight: %w", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		return 0, fmt.Errorf("unexpected status: %s", resp.Status)
@@ -179,7 +188,7 @@
 	v := types.Beacon{}
 	resp, err := s.client.GetHareBeaconEpoch(ctx, externalRef0.EpochID(epoch))
 	if err != nil {
-		return v, err
+		return v, fmt.Errorf("get hare beacon: %w", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		return v, fmt.Errorf("unexpected status: %s", resp.Status)
@@ -191,3 +200,41 @@
 	copy(v[:], bytes)
 	return v, nil
 }
+
+func (s *NodeService) Proposal(ctx context.Context, layer types.LayerID, node types.NodeID) (
+	*types.Proposal, uint64, error,
+) {
+	resp, err := s.client.GetProposalLayerNode(ctx, externalRef0.LayerID(layer), node.String())
+	if err != nil {
+		return nil, 0, fmt.Errorf("get proposal layer: %w", err)
+	}
+	switch resp.StatusCode {
+	case http.StatusOK:
+	case http.StatusNoContent:
+		// special case - no error but also no proposal, means
+		// we're no eligibile this epoch with this node ID
+		return nil, 0, nil
+	default:
+		return nil, 0, fmt.Errorf("unexpected status: %s", resp.Status)
+	}
+
+	bytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, 0, fmt.Errorf("read all: %w", err)
+	}
+
+	prop := types.Proposal{}
+	err = codec.Decode(bytes, &prop)
+	if err != nil {
+		return nil, 0, fmt.Errorf("decode proposal: %w", err)
+	}
+	atxNonce := resp.Header.Get("X-Spacemesh-Atx-Nonce")
+	if atxNonce == "" {
+		return nil, 0, errors.New("missing atx nonce")
+	}
+	nonce, err := strconv.ParseUint(atxNonce, 10, 64)
+	if err != nil {
+		return nil, 0, fmt.Errorf("nonce parse: %w", err)
+	}
+	return &prop, nonce, nil
+}