From 7f9416a2675c788d298fd03aced16febc3526a94 Mon Sep 17 00:00:00 2001 From: Yilun Date: Thu, 8 Jan 2026 23:11:30 -0800 Subject: [PATCH 1/2] bump net version number Signed-off-by: Yilun --- cmd/nknd/commands/root.go | 2 +- lnode/message.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/nknd/commands/root.go b/cmd/nknd/commands/root.go index e70de6df5..e660a914d 100644 --- a/cmd/nknd/commands/root.go +++ b/cmd/nknd/commands/root.go @@ -47,7 +47,7 @@ import ( ) const ( - NetVersionNum = 34 // This will be removed later + NetVersionNum = 35 // This will be removed later ) // rootCmd represents the base command when called without any subcommands diff --git a/lnode/message.go b/lnode/message.go index f9a388092..8dc00262d 100644 --- a/lnode/message.go +++ b/lnode/message.go @@ -69,7 +69,7 @@ func (localNode *LocalNode) remoteMessageRouted(remoteMessage *nnetnode.RemoteMe msgBody := &pbmsg.Bytes{} err = proto.Unmarshal(remoteMessage.Msg.Message, msgBody) if err != nil { - log.Debugf("Error unmarshal byte msg: %v", err) + log.Errorf("Error unmarshal byte msg: %v", err) return nil, nil, nil, false } @@ -77,50 +77,50 @@ func (localNode *LocalNode) remoteMessageRouted(remoteMessage *nnetnode.RemoteMe unsignedMsg := &pb.UnsignedMessage{} err = proto.Unmarshal(msgBody.Data, signedMsg) if err != nil { - log.Debugf("Error unmarshal byte msg data: %v", err) + log.Errorf("Error unmarshal byte msg data: %v", err) return nil, nil, nil, false } err = proto.Unmarshal(signedMsg.Message, unsignedMsg) if err != nil { - log.Debugf("Error unmarshal signed unsigned msg: %v", err) + log.Errorf("Error unmarshal signed unsigned msg: %v", err) return nil, nil, nil, false } err = checkMessageType(unsignedMsg.MessageType) if err != nil { - log.Debugf("Error checking message type: %v", err) + log.Errorf("Error checking message type: %v", err) return nil, nil, nil, false } err = checkMessageSigned(unsignedMsg.MessageType, len(signedMsg.Signature) > 0) if err != nil { - log.Debugf("Error checking signed: %v", err) + log.Errorf("Error checking signed: %v", err) return nil, nil, nil, false } err = checkMessageRoutingType(unsignedMsg.MessageType, remoteMessage.Msg.RoutingType) if err != nil { - log.Debugf("Error checking routing type: %v", err) + log.Errorf("Error checking routing type: %v", err) return nil, nil, nil, false } if len(signedMsg.Signature) > 0 { if remoteMessage.Msg.RoutingType != pbmsg.RoutingType_DIRECT { - log.Debugf("Signature is only allowed on direct message") + log.Errorf("Signature is only allowed on direct message") return nil, nil, nil, false } pubKey := senderNode.GetPubKey() if pubKey == nil { - log.Debugf("Neighbor public key is nil") + log.Errorf("Neighbor public key is nil") return nil, nil, nil, false } hash := sha256.Sum256(signedMsg.Message) err = crypto.Verify(pubKey, hash[:], signedMsg.Signature) if err != nil { - log.Debugf("Verify signature error: %v", err) + log.Errorf("Verify signature error: %v", err) return nil, nil, nil, false } } From ed550da880532dfb66df85c4410333bb9590667e Mon Sep 17 00:00:00 2001 From: Yilun Date: Thu, 8 Jan 2026 23:21:37 -0800 Subject: [PATCH 2/2] update docker build Signed-off-by: Yilun --- Makefile | 16 ++++++++-------- docker/Dockerfile | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e239771be..239194707 100644 --- a/Makefile +++ b/Makefile @@ -101,17 +101,17 @@ test: .PHONY: docker docker: - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=amd64 BUILD_DIR=. BIN_DIR=." --build-arg base="amd64/" -t nknorg/nkn:latest-amd64 . - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm GOARM=6 BUILD_DIR=. BIN_DIR=." --build-arg base="arm32v6/" -t nknorg/nkn:latest-arm32v6 . - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm64 BUILD_DIR=. BIN_DIR=." --build-arg base="arm64v8/" -t nknorg/nkn:latest-arm64v8 . + docker build --platform linux/amd64 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=amd64 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-amd64 . + docker build --platform linux/arm/v6 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm GOARM=6 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-arm32v6 . + docker build --platform linux/arm64 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm64 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-arm64v8 . .PHONY: docker_publish docker_publish: docker push nknorg/nkn:latest-amd64 docker push nknorg/nkn:latest-arm32v6 docker push nknorg/nkn:latest-arm64v8 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create nknorg/nkn:latest nknorg/nkn:latest-amd64 nknorg/nkn:latest-arm32v6 nknorg/nkn:latest-arm64v8 --amend - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-amd64 --os linux --arch amd64 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm32v6 --os linux --arch arm - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm64v8 --os linux --arch arm64 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push -p nknorg/nkn:latest + docker manifest create nknorg/nkn:latest nknorg/nkn:latest-amd64 nknorg/nkn:latest-arm32v6 nknorg/nkn:latest-arm64v8 --amend + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-amd64 --os linux --arch amd64 + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm32v6 --os linux --arch arm --variant v6 + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm64v8 --os linux --arch arm64 --variant v8 + docker manifest push nknorg/nkn:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index ba9cf355e..c94abeeaf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,12 +1,11 @@ -ARG base -FROM golang:1.19-alpine as builder +FROM golang:1.23-alpine AS builder RUN apk add make git curl ADD . /nkn WORKDIR /nkn ARG build_args RUN make $build_args -FROM ${base}alpine:latest +FROM alpine:latest RUN apk --no-cache add ca-certificates COPY --from=builder /nkn/nknd /nkn/ COPY --from=builder /nkn/nknc /nkn/