Merge branch 'master' into typo/fixes-v15

Author: ivokub

.github/workflows/pr.yml

@@ -33,7 +33,7 @@ jobs:
 
   test:
     needs: staticcheck
-    runs-on: ubuntu-latest-128
+    runs-on: gha-runner-scale-set-ubuntu-24-amd64-xxl
     permissions: 
       pull-requests: write
     steps:
@@ -65,9 +65,9 @@ jobs:
       run: |
         set -euo pipefail
         go test -json -v -p 4 -short -timeout=30m ./... 2>&1 | gotestfmt -hide=all | tee /tmp/gotest.log
-        go test -json -v -p 4 -tags=release_checks,solccheck . 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
-        go test -json -v -p 4 -tags=prover_checks ./test/... 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
-        go test -json -v -p 4 -tags=prover_checks ./examples/... 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
+        go test -json -v -p 4 -timeout=30m -tags=release_checks,solccheck . 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
+        go test -json -v -p 4 -timeout=30m -tags=prover_checks ./test/... 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
+        go test -json -v -p 4 -timeout=30m -tags=prover_checks ./examples/... 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
         go test -json -v -run=NONE -fuzz=FuzzIntcomp -fuzztime=30s ./internal/backend/ioutils 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
 
 

.github/workflows/push.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         go-version: [1.23.x]
-        os: [ubuntu-latest-128, windows-latest, macos-latest]
+        os: [gha-runner-scale-set-ubuntu-24-amd64-xxl, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     needs:
       - staticcheck
@@ -54,7 +54,7 @@ jobs:
         go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest
         go install github.com/ethereum/go-ethereum/cmd/[email protected]
     - name: install solc deps
-      if: startsWith(matrix.os, 'ubuntu') == true
+      if: startsWith(matrix.os, 'gha-runner-scale-set-ubuntu') == true
       run: |
         go install github.com/consensys/[email protected]
         sudo add-apt-repository ppa:ethereum/ethereum
@@ -63,11 +63,11 @@ jobs:
 
     - name: Test (windows / mac)
       # on macOS CI / Windows CI we avoid running the std/ tests (they are run on ubuntu CI)
-      if: startsWith(matrix.os, 'ubuntu') == false
+      if: startsWith(matrix.os, 'gha-runner-scale-set-ubuntu') == false
       run: |
         go test -tags=release_checks -v -timeout=60m .
     - name: Test (ubuntu - race and solc)
-      if: startsWith(matrix.os, 'ubuntu') == true
+      if: startsWith(matrix.os, 'gha-runner-scale-set-ubuntu') == true
       run: |
         go test -v -p 4 -short -timeout=30m ./...
         go test -v -p 4 -timeout=120m -tags=release_checks ./std/math/emulated/...

backend/plonk/bls12-377/prove.go

@@ -77,8 +77,16 @@ func (builder *builder[E]) MulAcc(a, b, c frontend.Variable) frontend.Variable {
 	// results fits, _a is mutated without performing a new memalloc
 	builder.mbuf2 = builder.mbuf2[:0]
 	builder.add([]expr.LinearExpression[E]{_a, builder.mbuf1}, false, 0, &builder.mbuf2)
-	_a = _a[:0]
-	if len(builder.mbuf2) <= cap(_a) {
+
+	// if we can add the multiplication term to the accumulator LE (by having sufficient capacity)
+	// then we append directly into _a. However, _a can also be the hardcoded linear expressions corresponding
+	// to zero or one constant. Now, we we would append into those then we would modify the underlying slice
+	// thus modifying the constant themselves. This leads to undefined behaviour.
+	//
+	// So, in addition to only checking the capacity we also check that the underlying slices are different.
+	// to avoid using unsafe.Pointer, we check the address of the first elements.
+	if len(builder.mbuf2) <= cap(_a) && &(_a[0]) != &(builder.cstZero()[0]) && &(_a[0]) != &(builder.cstOne()[0]) {
+		_a = _a[:0]
 		// it fits, no mem alloc
 		_a = append(_a, builder.mbuf2...)
 	} else {
@@ -408,6 +416,31 @@ func (builder *builder[E]) Or(_a, _b frontend.Variable) frontend.Variable {
 	builder.AssertIsBoolean(a)
 	builder.AssertIsBoolean(b)
 
+	_aC, aConstant := builder.constantValue(a)
+	_bC, bConstant := builder.constantValue(b)
+
+	if aConstant && bConstant {
+		if builder.cs.IsOne(_aC) || builder.cs.IsOne(_bC) {
+			return builder.cstOne()
+		}
+		return builder.cstZero()
+	}
+
+	// if one input is constant, ensure we put it in b
+	if aConstant {
+		a, b = b, a
+		_bC = _aC
+		bConstant = aConstant
+	}
+
+	if bConstant {
+		if builder.cs.IsOne(_bC) {
+			return builder.cstOne()
+		} else {
+			return a
+		}
+	}
+
 	// the formulation used is for easing up the conversion to sparse r1cs
 	res := builder.newInternalVariable()
 	builder.MarkBoolean(res)