Merge pull request #106 from qubic/dev

Merge dev into main

Author: LINCKODE

.github/workflows/tx-body-digest.yaml

@@ -0,0 +1,50 @@
+name: Test branch and deploy to Github Container Registry
+
+on:
+  push:
+    branches:
+      - 'tx-body-digest'
+
+jobs:
+  test:
+    name: "Perform GO tests"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        go-version: [ '1.22.x' ]
+
+    steps:
+      - name: "Git checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup go environment"
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{matrix.go-version}}
+          cache: false
+
+      - name: "Perform tests"
+        run: 'go test ./...'
+
+  publish:
+    name: "Build package and deploy to Github Container Registry"
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - name: "Git checkout"
+        uses: actions/checkout@v4
+
+      - name: "Log into Github Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: "ghcr.io"
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+
+      - name: "Build package"
+        run: 'docker build . --tag ghcr.io/qubic/qubic-archiver:${{github.ref_name}}'
+
+      - name: "Publish package"
+        run: 'docker push ghcr.io/qubic/qubic-archiver:${{github.ref_name}}'

go.mod

@@ -7,10 +7,9 @@ require (
 	github.com/cloudflare/circl v1.5.0
 	github.com/cockroachdb/pebble v1.1.2
 	github.com/google/go-cmp v0.6.0
-	github.com/google/martian v2.1.0+incompatible
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0
 	github.com/pkg/errors v0.9.1
-	github.com/qubic/go-node-connector v0.10.2
+	github.com/qubic/go-node-connector v0.11.0
 	github.com/qubic/go-schnorrq v1.0.1
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0

go.sum

@@ -148,7 +148,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -235,8 +234,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/qubic/go-node-connector v0.10.2 h1:GRa+HI7JABJXn2rC/MSh2VgGpGBpNdqtS/Z0MZsUkhM=
-github.com/qubic/go-node-connector v0.10.2/go.mod h1:jLbmYx2GUh8Ctk5zULFepgho7yoGZXrU8/tMk+fcuEc=
+github.com/qubic/go-node-connector v0.11.0 h1:7gNoMN1UnODiuLRs4fjdxS4/d3Qc3+FjJJKUByH1BP0=
+github.com/qubic/go-node-connector v0.11.0/go.mod h1:jLbmYx2GUh8Ctk5zULFepgho7yoGZXrU8/tMk+fcuEc=
 github.com/qubic/go-schnorrq v1.0.1 h1:F0R/BQVf+O7Bp57NGJmc3uXlqsaIzerg/1bmU4jMLLE=
 github.com/qubic/go-schnorrq v1.0.1/go.mod h1:j2qw/zHiyjH9GAScAAETWpZk6iELbjYnzIg7CQwc5wM=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

main.go

@@ -50,9 +50,10 @@ func run() error {
 			IdleTimeout        time.Duration `conf:"default:15s"`
 		}
 		Qubic struct {
-			NodePort           string        `conf:"default:21841"`
-			StorageFolder      string        `conf:"default:store"`
-			ProcessTickTimeout time.Duration `conf:"default:5s"`
+			NodePort                      string        `conf:"default:21841"`
+			StorageFolder                 string        `conf:"default:store"`
+			ProcessTickTimeout            time.Duration `conf:"default:5s"`
+			DisableTransactionStatusAddon bool          `conf:"default:false"`
 			ArbitratorIdentity string        `conf:"default:AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"`
 		}
 		Store struct {
@@ -183,7 +184,7 @@ func run() error {
 		return errors.Wrapf(err, "getting arbitrator public key from [%s]", cfg.Qubic.ArbitratorIdentity)
 	}
 
-	proc := processor.NewProcessor(p, ps, cfg.Qubic.ProcessTickTimeout, arbitratorPubKey)
+	proc := processor.NewProcessor(p, ps, cfg.Qubic.ProcessTickTimeout, arbitratorPubKey, cfg.Qubic.DisableTransactionStatusAddon)
 	procErrors := make(chan error, 1)
 
 	// Start the service listening for requests.

processor/processor.go

@@ -30,14 +30,16 @@ type Processor struct {
 	ps                 *store.PebbleStore
 	arbitratorPubKey   [32]byte
 	processTickTimeout time.Duration
+	disableStatusAddon bool
 }
 
-func NewProcessor(p *qubic.Pool, ps *store.PebbleStore, processTickTimeout time.Duration, arbitratorPubKey [32]byte) *Processor {
+func NewProcessor(p *qubic.Pool, ps *store.PebbleStore, processTickTimeout time.Duration, arbitratorPubKey [32]byte, disableStatusAddon bool) *Processor {
 	return &Processor{
 		pool:               p,
 		ps:                 ps,
 		processTickTimeout: processTickTimeout,
 		arbitratorPubKey:   arbitratorPubKey,
+		disableStatusAddon: disableStatusAddon,
 	}
 }
 
@@ -98,7 +100,7 @@ func (p *Processor) processOneByOne() error {
 	}
 
 	val := validator.New(client, p.ps, p.arbitratorPubKey)
-	err = val.ValidateTick(ctx, tickInfo.InitialTick, nextTick.TickNumber)
+	err = val.ValidateTick(ctx, tickInfo.InitialTick, nextTick.TickNumber, p.disableStatusAddon)
 	if err != nil {
 		return errors.Wrapf(err, "validating tick %d", nextTick.TickNumber)
 	}