Skip to content

Commit e2663d7

Browse files
OlivierBBBOlivierBBB
committed
Merge branch 'master' into EIP-7823-and-7883---Osaka-MODEXP-changes
2 parents cb93152 + da4dcd9 commit e2663d7

File tree

49 files changed

+468
-699
lines changed

Some content is hidden

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

49 files changed

+468
-699
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@0d25749dc5e7ef6e0a75d551618248d4bad65ac6 # v1.1.27
18+
run: go install github.com/consensys/go-corset/cmd/go-corset@fb1aebd7f532e8940bc18feeedf3600d4bb5006f # v1.1.28
1919

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

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RLP_TXN_RCPT_OSAKA := rlptxrcpt/osaka
8484

8585
RLP_TXRCPT := rlptxrcpt
8686

87-
RLP_UTILS_CANCUN := rlputils/cancun
87+
RLP_UTILS_CANCUN := rlputils/cancun rlputils/cancun/maxlog.zkasm
8888

8989
ROM := rom
9090

@@ -109,7 +109,7 @@ TXN_DATA_CANCUN := txndata/cancun
109109
TXN_DATA_PRAGUE := txndata/prague
110110
TXN_DATA_OSAKA := txndata/osaka
111111

112-
WCP := wcp
112+
WCP := wcp/wcp.zkasm
113113

114114
LISPX := $(shell find * -name "*.lispX")
115115
# Warn about any lispX files

‎blake2fmodexpdata/london/lookups/blakemodexp_into_wcp.lisp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@
66
blake2fmodexpdata-into-wcp
77
;; target colums (in WCP)
88
(
9-
wcp.ARG_1_HI
10-
wcp.ARG_1_LO
11-
wcp.ARG_2_HI
12-
wcp.ARG_2_LO
9+
wcp.ARG_1
10+
wcp.ARG_2
1311
wcp.RES
1412
wcp.INST
1513
)
1614
;; source selector
1715
(blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag)
1816
;; source columns
1917
(
20-
0
2118
(prev blake2fmodexpdata.ID)
22-
0
2319
blake2fmodexpdata.ID
2420
1
2521
EVM_INST_LT

‎blockdata/cancun/lookups/blockdata_into_wcp.lisp‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
(blockdata-into-wcp :unchecked)
66
;; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
12-
wcp.RESULT
8+
wcp.ARG_1
9+
wcp.ARG_2
10+
wcp.RES
1311
wcp.INST
14-
)
12+
)
1513
;; source selector
1614
(blockdata-into-wcp-selector)
1715
;; source columns
1816
(
19-
blockdata.ARG_1_HI
20-
blockdata.ARG_1_LO
21-
blockdata.ARG_2_HI
22-
blockdata.ARG_2_LO
17+
(:: blockdata.ARG_1_HI blockdata.ARG_1_LO)
18+
(:: blockdata.ARG_2_HI blockdata.ARG_2_LO)
2319
blockdata.RES
2420
blockdata.EXO_INST
2521
))

‎blockdata/london/lookups/blockdata_into_wcp.lisp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
(blockdata-into-wcp :unchecked)
66
;; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
12-
wcp.RESULT
8+
wcp.ARG_1
9+
wcp.ARG_2
10+
wcp.RES
1311
wcp.INST
1412
)
1513
;; source selector
1614
(blockdata-into-wcp-selector)
1715
;; source columns
1816
(
19-
blockdata.ARG_1_HI
20-
blockdata.ARG_1_LO
21-
blockdata.ARG_2_HI
22-
blockdata.ARG_2_LO
17+
(:: blockdata.ARG_1_HI blockdata.ARG_1_LO)
18+
(:: blockdata.ARG_2_HI blockdata.ARG_2_LO)
2319
blockdata.RES
2420
blockdata.EXO_INST
2521
))

‎blockdata/paris/lookups/blockdata_into_wcp.lisp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
(blockdata-into-wcp :unchecked)
66
;; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
12-
wcp.RESULT
8+
wcp.ARG_1
9+
wcp.ARG_2
10+
wcp.RES
1311
wcp.INST
1412
)
1513
;; source selector
1614
(blockdata-into-wcp-selector)
1715
;; source columns
1816
(
19-
blockdata.ARG_1_HI
20-
blockdata.ARG_1_LO
21-
blockdata.ARG_2_HI
22-
blockdata.ARG_2_LO
17+
(:: blockdata.ARG_1_HI blockdata.ARG_1_LO)
18+
(:: blockdata.ARG_2_HI blockdata.ARG_2_LO)
2319
blockdata.RES
2420
blockdata.EXO_INST
2521
))

‎blockhash/lookups/blockhash_into_wcp.lisp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@
44
blockhash-into-wcp-lex
55
;; target columns
66
(
7-
wcp.ARGUMENT_1_HI
8-
wcp.ARGUMENT_1_LO
9-
wcp.ARGUMENT_2_HI
10-
wcp.ARGUMENT_2_LO
7+
wcp.ARG_1
8+
wcp.ARG_2
119
wcp.INST
12-
wcp.RESULT
10+
wcp.RES
1311
)
1412
;; source selector
1513
(blockhash-into-wcp-selector)
1614
;; source columns
1715
(
18-
blockhash.preprocessing/EXO_ARG_1_HI
19-
blockhash.preprocessing/EXO_ARG_1_LO
20-
blockhash.preprocessing/EXO_ARG_2_HI
21-
blockhash.preprocessing/EXO_ARG_2_LO
16+
(:: blockhash.preprocessing/EXO_ARG_1_HI blockhash.preprocessing/EXO_ARG_1_LO)
17+
(:: blockhash.preprocessing/EXO_ARG_2_HI blockhash.preprocessing/EXO_ARG_2_LO)
2218
blockhash.preprocessing/EXO_INST
2319
blockhash.preprocessing/EXO_RES
2420
)

‎blsdata/cancun/lookups/blsdata_into_wcp.lisp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
(defun (blsdata-into-wcp-activation-flag)
22
blsdata.WCP_FLAG)
33

4-
(deflookup
4+
(defclookup
55
blsdata-into-wcp
66
; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
12-
wcp.RESULT
8+
wcp.ARG_1
9+
wcp.ARG_2
10+
wcp.RES
1311
wcp.INST
1412
)
13+
; source selector
14+
(blsdata-into-wcp-activation-flag)
1515
; source columns
1616
(
17-
(* blsdata.WCP_ARG1_HI (blsdata-into-wcp-activation-flag))
18-
(* blsdata.WCP_ARG1_LO (blsdata-into-wcp-activation-flag))
19-
(* blsdata.WCP_ARG2_HI (blsdata-into-wcp-activation-flag))
20-
(* blsdata.WCP_ARG2_LO (blsdata-into-wcp-activation-flag))
21-
(* blsdata.WCP_RES (blsdata-into-wcp-activation-flag))
22-
(* blsdata.WCP_INST (blsdata-into-wcp-activation-flag))
17+
(:: blsdata.WCP_ARG1_HI blsdata.WCP_ARG1_LO)
18+
(:: blsdata.WCP_ARG2_HI blsdata.WCP_ARG2_LO)
19+
blsdata.WCP_RES
20+
blsdata.WCP_INST
2321
))
2422

2523

‎blsdata/prague/lookups/blsdata_into_wcp.lisp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
(defun (blsdata-into-wcp-activation-flag)
22
blsdata.WCP_FLAG)
33

4-
(deflookup
4+
(defclookup
55
blsdata-into-wcp
66
; target columns
77
(
8-
wcp.ARGUMENT_1_HI
9-
wcp.ARGUMENT_1_LO
10-
wcp.ARGUMENT_2_HI
11-
wcp.ARGUMENT_2_LO
12-
wcp.RESULT
8+
wcp.ARG_1
9+
wcp.ARG_2
10+
wcp.RES
1311
wcp.INST
1412
)
13+
; source selector
14+
(blsdata-into-wcp-activation-flag)
1515
; source columns
1616
(
17-
(* blsdata.WCP_ARG1_HI (blsdata-into-wcp-activation-flag))
18-
(* blsdata.WCP_ARG1_LO (blsdata-into-wcp-activation-flag))
19-
(* blsdata.WCP_ARG2_HI (blsdata-into-wcp-activation-flag))
20-
(* blsdata.WCP_ARG2_LO (blsdata-into-wcp-activation-flag))
21-
(* blsdata.WCP_RES (blsdata-into-wcp-activation-flag))
22-
(* blsdata.WCP_INST (blsdata-into-wcp-activation-flag))
17+
(:: blsdata.WCP_ARG1_HI blsdata.WCP_ARG1_LO)
18+
(:: blsdata.WCP_ARG2_HI blsdata.WCP_ARG2_LO)
19+
blsdata.WCP_RES
20+
blsdata.WCP_INST
2321
))
2422

2523

‎constants/evm.zkasm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
const EVM_INST_ADD = 0x01
66
const EVM_INST_SUB = 0x03
77
const EVM_INST_SIGNEXTEND = 0x0b
8+
const EVM_INST_LT = 0x10
9+
const EVM_INST_GT = 0x11
10+
const EVM_INST_SLT = 0x12
11+
const EVM_INST_SGT = 0x13
12+
const EVM_INST_EQ = 0x14
13+
const EVM_INST_ISZERO = 0x15
814
const EVM_INST_AND = 0x16
915
const EVM_INST_OR = 0x17
1016
const EVM_INST_XOR = 0x18
@@ -19,6 +25,13 @@ const EVM_INST_CALL = 0xF1
1925
const EVM_INST_CALLCODE = 0xF2
2026
const EVM_INST_CREATE2 = 0xF5
2127

28+
;; =============================================================================
29+
;; Wcp
30+
;; =============================================================================
31+
32+
const WCP_INST_GEQ = 0x0E
33+
const WCP_INST_LEQ = 0x0F
34+
2235
;; =============================================================================
2336
;; Gas
2437
;; =============================================================================

0 commit comments

Comments
 (0)