fix --payloadless mode for execution builder in remote ledger model

Author: zhangchiqing

cmd/execution_builder.go

@@ -941,16 +941,16 @@ func (exeNode *ExecutionNode) LoadExecutionStateLedger(
 	module.ReadyDoneAware,
 	error,
 ) {
+	// Ledger selection is two independent choices passed to the factory:
+	//   - --payloadless picks the payloadless vs. full ledger (this branch).
+	//   - --ledger-service-addr (Config.LedgerServiceAddr), when set, means this
+	//     node connects to a remote ledger service rather than running a local
+	//     ledger; the factory then returns a gRPC client instead of a local one.
+	// Combined: payloadless + remote address -> remote payloadless client;
+	// payloadless + no address -> local payloadless ledger; likewise for full mode.
 	if exeNode.exeConf.payloadless {
 		// Payloadless mode. ValidateFlags enforces --enable-storehouse,
 		// so the storehouse is the value source for reads.
-		//
-		// The factory call mirrors the full-mode call below: same Config,
-		// same triggerCheckpoint. Today the factory body is a placeholder
-		// (no WAL, no checkpoint load) — see TODOs at
-		// ledgerfactory.NewPayloadlessLedger. When the WAL/checkpoint
-		// pieces land, only the factory body changes; this call site stays
-		// the same.
 		pl, err := ledgerfactory.NewPayloadlessLedger(ledgerfactory.Config{
 			LedgerServiceAddr:     exeNode.exeConf.ledgerServiceAddr,
 			LedgerMaxRequestSize:  exeNode.exeConf.ledgerMaxRequestSize,
@@ -1501,11 +1501,16 @@ func (exeNode *ExecutionNode) LoadBootstrapper(node *NodeConfig) error {
 		// HasRootCheckpointV7 guard keeps a re-entry after an interrupted
 		// bootstrap from hitting ConvertCheckpointV6ToV7's "output exists" check.
 		//
+		// Only nodes running a local payloadless ledger need this: a node using a
+		// remote ledger service (ledgerServiceAddr set) never reads its local trie
+		// dir, and the remote ledger service performs its own V7 bootstrap. Skipping
+		// the conversion avoids a needless full-forest load on remote-ledger nodes.
+		//
 		// TODO: ConvertCheckpointV6ToV7 reads the entire V6 forest into memory
 		// before emitting V7, a memory/time spike at first boot for mainnet-scale
 		// root checkpoints. A future optimization is to convert subtrie-by-subtrie
 		// without loading the whole forest.
-		if exeNode.exeConf.payloadless {
+		if exeNode.exeConf.payloadless && exeNode.exeConf.ledgerServiceAddr == "" {
 			triedir := exeNode.exeConf.triedir
 			hasV7Root, err := wal.HasRootCheckpointV7(triedir)
 			if err != nil {

integration/localnet/builder/bootstrap.go

@@ -483,9 +483,15 @@ func prepareExecutionService(container testnet.ContainerConfig, i int, n int) Se
 		service.Volumes = append(service.Volumes,
 			fmt.Sprintf("%s:/trie:z", trieDir),
 		)
-		if payloadless {
-			service.Command = append(service.Command, "--payloadless")
-		}
+	}
+
+	// In payloadless mode, both remote-ledger and local-ledger execution nodes
+	// must run payloadless. The flag selects the payloadless committer, state
+	// checker, and ledger client. A remote-ledger node missing this flag would
+	// build a full ledger.LedgerService client and fail against a payloadless
+	// ledger service with "unknown service ledger.LedgerService".
+	if payloadless {
+		service.Command = append(service.Command, "--payloadless")
 	}
 
 	// Payloadless mode requires storehouse to store the actual payloads