proto: Add ignored to comment code block

.github/actions/yarn-nm-install/action.yml

@@ -59,7 +59,6 @@ runs:
       if: inputs.enable-corepack == 'true'
       shell: bash
       working-directory: ${{ inputs.cwd }}
-      #  echo tmp corepack enable, enable corepack, and echo inputs.enable-corepack value:
       run: corepack enable
 
     - name: ⚙️ Expose yarn config as "$GITHUB_OUTPUT"

.lefthook.yml

@@ -9,7 +9,9 @@ pre-commit:
           - name: golangci-lint
             run: golangci-lint run
           - name: gotestsum
-            run: gotestsum --format testname $(go list ./... | grep -v -E "so/grpc_test|so/tree")
+            env:
+              GOFLAGS: "-tags=lightspark"
+            run: gotestsum --format testname $(go list ./... | grep -v -E "so/grpc_test|so/grpc_test_internal|so/tree")
     - name: frost
       glob: "signer/**"
       root: "signer/"

.mise.lock

@@ -1,4 +1,4 @@
-[tools.atlas]
+[[tools.atlas]]
 version = "0.35.0"
 backend = "aqua:ariga/atlas"
 
@@ -7,43 +7,43 @@ checksum = "sha256:86db4b4abee45969c06fe4a0a34674c853df316ac3a59ae8d07e296ac6ce3
 size = 93071218
 url = "https://release.ariga.io/atlas/atlas-darwin-arm64-v0.35.0"
 
-[tools.go]
-version = "1.24.6"
+[[tools.go]]
+version = "1.25.1"
 backend = "core:go"
 
 [tools.go.platforms.macos-arm64]
-checksum = "sha256:4e29202c49573b953be7cc3500e1f8d9e66ddd12faa8cf0939a4951411e09a2a"
-size = 76293244
-url = "https://dl.google.com/go/go1.24.6.darwin-arm64.tar.gz"
+checksum = "sha256:68deebb214f39d542e518ebb0598a406ab1b5a22bba8ec9ade9f55fb4dd94a6c"
+size = 57906702
+url = "https://dl.google.com/go/go1.25.1.darwin-arm64.tar.gz"
 
-[tools.golangci-lint]
-version = "2.2.2"
+[[tools.golangci-lint]]
+version = "2.4.0"
 backend = "aqua:golangci/golangci-lint"
 
-[tools.golangci-lint.platforms.macos-arm64]
-checksum = "sha256:d84d94d042c0d495fd1746f3d18948a75de163b17a14e8de3ef840928dd2df74"
-size = 13585670
-url = "https://github.com/golangci/golangci-lint/releases/download/v2.2.2/golangci-lint-2.2.2-darwin-arm64.tar.gz"
+[tools.golangci-lint.platforms.linux-x64]
+checksum = "sha256:fae792524c04424c0ac369f5b8076f04b45cf29fc945a370e55d369a8dc11840"
+size = 14126779
+url = "https://github.com/golangci/golangci-lint/releases/download/v2.4.0/golangci-lint-2.4.0-linux-amd64.tar.gz"
 
-[tools.gotestsum]
-version = "1.12.0"
+[[tools.gotestsum]]
+version = "1.13.0"
 backend = "aqua:gotestyourself/gotestsum"
 
 [tools.gotestsum.platforms.macos-arm64]
-checksum = "sha256:c5ffdc9054644c4db365de2197a12d21eff48b88a9ad20e3e0c29346802d0b41"
-size = 2252304
-url = "https://github.com/gotestyourself/gotestsum/releases/download/v1.12.0/gotestsum_1.12.0_darwin_arm64.tar.gz"
+checksum = "sha256:509cb27aef747f48faf9bce424f59dcf79572c905204b990ee935bbfcc7fa0e9"
+size = 2472317
+url = "https://github.com/gotestyourself/gotestsum/releases/download/v1.13.0/gotestsum_1.13.0_darwin_arm64.tar.gz"
 
-[tools.lefthook]
-version = "1.11.14"
+[[tools.lefthook]]
+version = "2.0.0"
 backend = "aqua:evilmartians/lefthook"
 
 [tools.lefthook.platforms.macos-arm64]
-checksum = "sha256:b9c68fabb3c9b71b18335fb886317ae068e0d4a8640f40ae21720fcbae130579"
-size = 5286540
-url = "https://github.com/evilmartians/lefthook/releases/download/v1.11.14/lefthook_1.11.14_MacOS_arm64.gz"
+checksum = "sha256:0cf763fb55c05de17f7a7842fc9fd7044f1b7d1542129c1b2b8ae27c5769afb9"
+size = 5747200
+url = "https://github.com/evilmartians/lefthook/releases/download/v2.0.0/lefthook_2.0.0_MacOS_arm64.gz"
 
-[tools.node]
+[[tools.node]]
 version = "20.19.0"
 backend = "core:node"
 
@@ -52,42 +52,62 @@ checksum = "sha256:c016cd1975a264a29dc1b07c6fbe60d5df0a0c2beb4113c0450e3d998d1a0
 size = 41487879
 url = "https://nodejs.org/dist/v20.19.0/node-v20.19.0-darwin-arm64.tar.gz"
 
-[tools.protoc]
+[[tools.protoc]]
 version = "29.3"
 backend = "aqua:protocolbuffers/protobuf/protoc"
 
+[tools.protoc.platforms.linux-x64]
+checksum = "blake3:e69b7d6f33637cccd4e4cf4839b3d799ed02ae436e0eb555b0816b85cf341fb1"
+size = 3288836
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v29.3/protoc-29.3-linux-x86_64.zip"
+
 [tools.protoc.platforms.macos-arm64]
 checksum = "blake3:c5796cef7cf2c50cfc889d1cd821170c3d9158972175d46062879ff3757e42a4"
 size = 2290929
 url = "https://github.com/protocolbuffers/protobuf/releases/download/v29.3/protoc-29.3-osx-aarch_64.zip"
 
-[tools.protoc-gen-go]
+[[tools.protoc-gen-go]]
 version = "1.36.6"
 backend = "aqua:protocolbuffers/protobuf-go/protoc-gen-go"
 
+[tools.protoc-gen-go.platforms.linux-x64]
+checksum = "blake3:404ea4268ed7ca4a4e2229ca6787558abf8b9fa6e1fb1052b13bec638a3f08fe"
+size = 2389291
+url = "https://github.com/protocolbuffers/protobuf-go/releases/download/v1.36.6/protoc-gen-go.v1.36.6.linux.amd64.tar.gz"
+
 [tools.protoc-gen-go.platforms.macos-arm64]
 checksum = "blake3:63a7dcee5c191e2527ec2f4da9e98cc97e8ef8b21beb97057e4aefbdd22f7286"
 size = 2283775
 url = "https://github.com/protocolbuffers/protobuf-go/releases/download/v1.36.6/protoc-gen-go.v1.36.6.darwin.arm64.tar.gz"
 
-[tools.protoc-gen-go-grpc]
+[[tools.protoc-gen-go-grpc]]
 version = "1.5.1"
 backend = "aqua:grpc/grpc-go/protoc-gen-go-grpc"
 
+[tools.protoc-gen-go-grpc.platforms.linux-x64]
+checksum = "blake3:197739132f0408f017d0c83773ac1ace85c0572473fdd658ec6e4ccbf20e0552"
+size = 4859466
+url = "https://github.com/grpc/grpc-go/releases/download/cmd/protoc-gen-go-grpc/v1.5.1/protoc-gen-go-grpc.v1.5.1.linux.amd64.tar.gz"
+
 [tools.protoc-gen-go-grpc.platforms.macos-arm64]
 checksum = "blake3:3c668207565d23ea2cf006d699207e3a804ebb929a534bd38a3b4ff4e941e00c"
 size = 4565944
 url = "https://github.com/grpc/grpc-go/releases/download/cmd/protoc-gen-go-grpc/v1.5.1/protoc-gen-go-grpc.v1.5.1.darwin.arm64.tar.gz"
 
-[tools.protoc-gen-validate]
+[[tools.protoc-gen-validate]]
 version = "1.2.1"
 backend = "aqua:bufbuild/protoc-gen-validate"
 
+[tools.protoc-gen-validate.platforms.linux-x64]
+checksum = "sha256:e7a1d7256184dc6824e8f8e4b672b1281013e321579daffd19b2e3e90b6f7d9f"
+size = 13452368
+url = "https://github.com/bufbuild/protoc-gen-validate/releases/download/v1.2.1/protoc-gen-validate_1.2.1_linux_amd64.tar.gz"
+
 [tools.protoc-gen-validate.platforms.macos-arm64]
 checksum = "sha256:44dfd7778a49febdfb088dacee835b5d649218b5277bdd7c98e2a1f8eb328b34"
 size = 13557390
 url = "https://github.com/bufbuild/protoc-gen-validate/releases/download/v1.2.1/protoc-gen-validate_1.2.1_darwin_arm64.tar.gz"
 
-[tools.rust]
-version = "1.85.0"
+[[tools.rust]]
+version = "1.90.0"
 backend = "core:rust"

.mise.toml

@@ -1,15 +1,15 @@
 [tools]
 atlas = "0.35.0"
-go = "1.24.6"
-golangci-lint = "2.2.2"
-gotestsum = "1.12.0"
+go = "1.25.1"
+golangci-lint = "2.4.0"
+gotestsum = "1.13.0"
 lefthook = "latest"
 node = "20.19.0"
 protoc = "29.3"
 protoc-gen-go = "1.36.6"
 protoc-gen-go-grpc = "1.5.1"
 protoc-gen-validate = "1.2.1"
-rust = "1.85.0"
+rust = { version = "latest", profile = "minimal" }
 
 [env]
 MISE_NODE_COREPACK = true
@@ -26,9 +26,12 @@ spark-cli-dev-mainnet = { dir = "{{config_root}}/sdks/js", run = 'yarn install &
 spark-cli-loadtest = { dir = "{{config_root}}/sdks/js", run = 'yarn install && yarn build:packages && cd examples/spark-cli && yarn build && yarn run cli:loadtest' }
 test-go = { dir = "{{config_root}}/spark", run = 'mise test-unit-with-postgres' }
 test-grpc = { dir = "{{config_root}}/spark", run = 'mise test-grpc' }
+test-grpc-minikube = { dir = "{{config_root}}/spark", run = 'mise test-grpc-minikube' }
 test-js = { dir = "{{config_root}}/sdks/js", run = 'yarn install && yarn test' }
 test-js-integration = { dir = "{{config_root}}/sdks/js", run = 'yarn install && yarn test:integration' }
+test-js-integration-minikube = { dir = "{{config_root}}/sdks/js", run = 'MINIKUBE_IP=$(minikube ip) yarn install && yarn test:integration' }
 test-js-integration-ssp = { dir = "{{config_root}}/sdks/js", run = 'yarn install && yarn test:integration:ssp' }
+test-js-integration-ssp-minikube = { dir = "{{config_root}}/sdks/js", run = 'MINIKUBE_IP=$(minikube ip) yarn install && yarn test:integration:ssp' }
 
 [tasks.money-dev]
 description = "Send regtest BTC on dev to <address> [amount (default=0.0001)]"
@@ -56,6 +59,42 @@ run = """kubectl --context minikube -n bitcoin exec regtest-bitcoind-0 -- \
     sendtoaddress {{arg(name="addr")}} {{arg(name="amount", default="0.0001")}}
     """
 
+[tasks.mine-mk]
+description = "Mine <blocks> to <address>"
+usage = '''
+arg "<blocks>" "amount of blocks to mine" default="5"
+arg "<addr>" "the l1 address to generate to"
+'''
+run = """kubectl --context minikube -n bitcoin exec regtest-bitcoind-0 -- \
+  bitcoin-cli \
+    -conf=/etc/bitcoin/bitcoin.conf \
+    -datadir=/data \
+    generatetoaddress {{arg(name="blocks", default="5")}} {{arg(name="addr")}}
+    """
+
+[tasks.get-address-mk]
+description = "gets a new l1 address"
+run = """kubectl --context minikube -n bitcoin exec regtest-bitcoind-0 -- \
+  bitcoin-cli \
+    -conf=/etc/bitcoin/bitcoin.conf \
+    -datadir=/data \
+    getnewaddress
+    """
+
+[tasks.broadcast-tx-mk]
+description = "Broadcast a <txn>"
+usage = '''
+arg "<hex>" "raw transaction hex"
+'''
+run = """kubectl --context minikube -n bitcoin exec regtest-bitcoind-0 -- \
+  bitcoin-cli \
+    -conf=/etc/bitcoin/bitcoin.conf \
+    -datadir=/data \
+    sendrawtransaction {{arg(name="hex")}}
+    """
+
 [settings]
 activate_aggressive = true
 disable_backends = ["asdf"]
+experimental = true
+lockfile = true

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS builder-go
+FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS builder-go
 
 ARG TARGETOS TARGETARCH
 ARG DEBUG=0
@@ -37,7 +37,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.13 && \
 
 
 # (1) create rust env with cargo chef crate
-FROM --platform=$BUILDPLATFORM rust:1.84-slim-bookworm AS chef
+FROM --platform=$BUILDPLATFORM rust:1.90-slim-bookworm AS chef
 WORKDIR /signer
 RUN cargo install cargo-chef
 

Makefile

@@ -18,6 +18,15 @@ spark/proto/%/%.pb.go: $(PROTO_DIR)/%.proto
 		--go-grpc_opt=paths=source_relative \
 		--validate_out="lang=go,paths=source_relative:$(dir $@)" \
 		$<
+	@if [ "$(notdir $<)" = "spark_ssp_internal.proto" ]; then \
+		echo "Adding build tag 'lightspark' to spark_ssp_internal generated files"; \
+		for file in $(dir $@)*.pb.go $(dir $@)*_grpc.pb.go $(dir $@)*.pb.validate.go; do \
+			if [ -f "$$file" ] && ! head -n1 "$$file" | grep -q "//go:build"; then \
+				printf '//go:build lightspark\n\n%s\n' "$$(cat "$$file")" > "$$file.tmp" && mv "$$file.tmp" "$$file"; \
+			fi \
+		done \
+	fi
+
 # Default target
 all: $(GO_OUT) copy-protos
 

README.md

@@ -105,6 +105,37 @@ mise lint
 golangci-lint run
 ```
 
+## Logging
+
+We use [Zap](https://github.com/uber-go/zap) for logging in the SO. Here are some best practices:
+- Zap includes APIs both for structured logging (with key-value pairs) and unstructured logging
+  (with `fmt`-style formatting), called "Sugared" and "Unsugared" respectively. Since we index
+  structured attribute keys in our logging backend, they should be reserved for common attributes
+  that we want searchable. For example:
+    - `error`: we use this for logging all errors (through `zap.Error`).
+    - `identity_public_key`: we use this for logging the identity of the public key that is making
+      a particular request.
+  It should _not_ be used for logging one-off attributes that don't have a clear purpose or common
+  meaning across the codebase, i.e. `count`, `value`, etc. Use unstructured logging for those. If
+  you're unsure, err towards unstructured logging.
+- Converting between `zap.Logger` and `zap.SugaredLogger` is easy and cheap. Use `Logger.Sugar()`
+  to go from `zap.Logger` to `zap.SugaredLogger`, and `SugaredLogger.Desugar()` to go the other way.
+- Most places in the codebase have a `zap.Logger` injected into the `Context` with common fields
+  already present. This includes all requests, tasks, and most other major components (i.e.
+  chainwatcher). Use `logging.GetLoggerFromContext` to get the logger instance from the context.
+- Structured and unstructured logging can be mixed for a given log message. For example, the
+  following example is perfectly acceptable:
+```go
+	logger := logging.GetLoggerFromContext(ctx)
+    ...
+    logger.With(zap.Error(err)).Sugar().Infof("Failed to broadcast node tx for node %s", node.ID)
+
+```
+- Be mindful with what you log. Be extremely selective on logs that are logged on every request
+  (i.e. logs in middleware). Logs that describe regular execution are discouraged, instead logs
+  should be reserved for important events (abnormalities or errors). This is especially true
+  on high-traffic endpoints (i.e. read endpoints).
+
 ## Run tests
 
 ### Unit tests

protos/gossip.proto

@@ -26,6 +26,10 @@ message GossipMessage {
         GossipMessageFinalizeExtendLeaf finalize_extend_leaf = 10;
         GossipMessageRollbackUtxoSwap rollback_utxo_swap = 11;
         GossipMessageDepositCleanup deposit_cleanup = 12;
+        GossipMessagePreimage preimage = 13;
+        GossipMessageFinalizeRenewRefundTimelock finalize_refund_timelock = 14;
+        GossipMessageFinalizeRenewNodeTimelock finalize_node_timelock = 15;
+        GossipMessageSettleSwapKeyTweak settle_swap_key_tweak = 16;
     }
 }
 
@@ -71,6 +75,15 @@ message GossipMessageFinalizeExtendLeaf {
     repeated spark_internal.TreeNode internal_nodes = 1;
 }
 
+message GossipMessageFinalizeRenewRefundTimelock {
+  spark_internal.TreeNode node = 1;
+}
+
+message GossipMessageFinalizeRenewNodeTimelock {
+  spark_internal.TreeNode split_node = 1;
+  spark_internal.TreeNode node = 2;
+}
+
 // Rollback UTXO swap is called when Create UTXO swap transaction failed to
 // fully complete. This reverts the state back to before the swap, allowing the
 // user to initiate the UTXO swap again.
@@ -86,3 +99,15 @@ message GossipMessageRollbackUtxoSwap {
 message GossipMessageDepositCleanup {
     string tree_id = 1;
 }
+
+message GossipMessagePreimage {
+    bytes preimage = 1;
+    bytes payment_hash = 2;
+}
+
+// SettleSwapKeyTweak is called in Swap V3 flow when a counter transfer is
+// created to settle both primary and counter transfer key tweaks atomically in the
+// same DB transaction.
+message GossipMessageSettleSwapKeyTweak {
+    string counter_transfer_id = 1;
+}

protos/mock.proto

@@ -7,8 +7,6 @@ import "google/protobuf/empty.proto";
 
 service MockService {
     rpc clean_up_preimage_share(CleanUpPreimageShareRequest) returns (google.protobuf.Empty) {}
-    rpc interrupt_transfer(InterruptTransferRequest) returns (google.protobuf.Empty) {}
-    rpc interrupt_coop_exit(InterruptCoopExitRequest) returns (google.protobuf.Empty) {}
     rpc update_nodes_status(UpdateNodesStatusRequest) returns (google.protobuf.Empty) {}
     // Triggers the execution of a scheduled task immediately by name. Used by hermetic tests
     rpc trigger_task(TriggerTaskRequest) returns (google.protobuf.Empty) {}
@@ -18,15 +16,6 @@ message CleanUpPreimageShareRequest {
     bytes payment_hash = 1;
 }
 
-message InterruptTransferRequest {
-    enum InterruptTransferAction {
-        NONE = 0;
-        INTERRUPT = 1;
-        RESUME = 2;
-    }
-    InterruptTransferAction action = 1;
-}
-
 message UpdateNodesStatusRequest {
     repeated string node_ids = 1;
     string status = 2;
@@ -36,13 +25,3 @@ message UpdateNodesStatusRequest {
 message TriggerTaskRequest {
     string task_name = 1;
 }
-
-message InterruptCoopExitRequest {
-    enum InterruptCoopExitAction {
-        NONE      = 0;
-        INTERRUPT = 1;
-        RESUME    = 2;
-    }
-    InterruptCoopExitAction action           = 1;
-    string                  target_operator  = 2; // optional, defaults to MockAction.TargetOperatorID
-}