Skip to content

Commit 15aa249

Browse files
Merge branch 'master' into 780-eip-7951-precompile-for-secp256r1-curve-support
2 parents ee70747 + 7f8b4e9 commit 15aa249

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+109
-273
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Install Go Corset
1717
shell: bash
18-
run: go install github.com/consensys/go-corset/cmd/go-corset@93c23f239542f79c1db60eb5b8250ab20e30f046 # v1.1.23
18+
run: go install github.com/consensys/go-corset/cmd/go-corset@0d25749dc5e7ef6e0a75d551618248d4bad65ac6 # v1.1.27
1919

2020
- name: Build all forks
2121
run: make -B all

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ EC_DATA_LONDON := ecdata/london
3535

3636
EC_DATA_OSAKA := ecdata/osaka
3737

38-
EUC := euc
38+
EUC := euc/euc.zkasm
3939

4040
EXP := exp/exp.zkasm
4141

blockdata/cancun/lookups/blockdata_into_euc.lisp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
(blockdata-into-euc :unchecked)
55
;; target columns
66
(
7-
euc.IOMF
87
euc.DIVIDEND
98
euc.DIVISOR
109
euc.QUOTIENT
@@ -13,7 +12,6 @@
1312
(blockdata-into-euc-selector)
1413
;; source columns
1514
(
16-
1
1715
blockdata.ARG_1_LO
1816
blockdata.ARG_2_LO
1917
blockdata.RES

blockdata/cancun/processing/blobbasefee/common.lisp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@
1111
(defun (curr-BLOBBASEFEE-hi) (curr-data-hi))
1212
(defun (curr-BLOBBASEFEE-lo) (curr-data-lo))
1313

14-
(defconstraint blobbasefee-value
15-
(:guard (blobbasefee-precondition))
16-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
17-
(begin (eq! (curr-BLOBBASEFEE-hi) 0)
18-
(eq! (curr-BLOBBASEFEE-lo) LINEA_BLOB_BASE_FEE))) ;;TODO: surely this won't work for blockchain ref tests
19-
2014
(defconstraint blobbasefee-bound
2115
(:guard (blobbasefee-precondition))
2216
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23-
(wcp-call-to-GEQ 0 DATA_HI DATA_LO 0 0))
17+
(wcp-call-to-GEQ 0 DATA_HI DATA_LO 0 0))

blockdata/cancun/processing/blobbasefee/linea.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
(:guard (* (blobbasefee-precondition) BLOB_BASE_FEE_ENABLE))
77
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
88
(begin (eq! (curr-BLOBBASEFEE-hi) 0)
9-
(eq! (curr-BLOBBASEFEE-lo) LINEA_BLOB_BASE_FEE))) ;;TODO: surely this won't work for blockchain ref tests
9+
(eq! (curr-BLOBBASEFEE-lo) LINEA_BLOB_BASE_FEE)))

blockdata/london/lookups/blockdata_into_euc.lisp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
(blockdata-into-euc :unchecked)
55
;; target columns
66
(
7-
euc.IOMF
87
euc.DIVIDEND
98
euc.DIVISOR
109
euc.QUOTIENT
@@ -13,7 +12,6 @@
1312
(blockdata-into-euc-selector)
1413
;; source columns
1514
(
16-
1
1715
blockdata.ARG_1_LO
1816
blockdata.ARG_2_LO
1917
blockdata.RES

blockdata/paris/lookups/blockdata_into_euc.lisp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
(blockdata-into-euc :unchecked)
55
;; target columns
66
(
7-
euc.IOMF
87
euc.DIVIDEND
98
euc.DIVISOR
109
euc.QUOTIENT
@@ -13,7 +12,6 @@
1312
(blockdata-into-euc-selector)
1413
;; source columns
1514
(
16-
1
1715
blockdata.ARG_1_LO
1816
blockdata.ARG_2_LO
1917
blockdata.RES

blsdata/cancun/generalities/constraining_address_sum.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
(* 16 (is_map_fp_to_g1))
1111
(* 17 (is_map_fp2_to_g2))))
1212

13-
(defconstraint stamp-constancy ()
13+
(defconstraint stamp-constancy-address-sum ()
1414
(stamp-constancy STAMP (address_sum)))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(module blsdata)
22

3-
(defconstraint vanishing-values ()
3+
(defconstraint vanishing-values-ct ()
44
(if-zero (flag_sum)
55
(begin (vanishes! CT_MAX)
66
(vanishes! CT)
@@ -9,4 +9,4 @@
99
(defconstraint ct-increment ()
1010
(if-eq-else CT CT_MAX
1111
(vanishes! (next CT))
12-
(eq! (next CT) (+ 1 CT))))
12+
(eq! (next CT) (+ 1 CT))))

blsdata/cancun/generalities/setting_index.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(module blsdata)
22

3-
(defconstraint vanishing-values ()
3+
(defconstraint vanishing-values-index ()
44
(if-zero (flag_sum)
55
(begin (vanishes! INDEX_MAX)
66
(vanishes! INDEX)
@@ -19,4 +19,4 @@
1919
(defconstraint final-row (:domain {-1})
2020
(if-not-zero (flag_sum)
2121
(begin (eq! (is_result) 1)
22-
(eq! INDEX INDEX_MAX))))
22+
(eq! INDEX INDEX_MAX))))

0 commit comments

Comments
 (0)