diff --git a/Cargo.lock b/Cargo.lock index b39a1152..f9774868 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2742,7 +2742,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "ecdsa", "elliptic-curve", @@ -3301,13 +3301,13 @@ dependencies = [ [[package]] name = "openvm" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "bytemuck", "getrandom 0.2.16", "getrandom 0.3.3", "num-bigint 0.4.6", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-platform 1.3.0", "openvm-rv32im-guest 1.3.0", "serde", @@ -3355,7 +3355,7 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-macros-common 1.3.0", "quote", @@ -3381,14 +3381,14 @@ dependencies = [ [[package]] name = "openvm-algebra-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "halo2curves-axiom 0.7.0", "num-bigint 0.4.6", "once_cell", "openvm-algebra-complex-macros 1.3.0", "openvm-algebra-moduli-macros 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-rv32im-guest 1.3.0", "serde-big-array", "strum_macros 0.26.4", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "openvm-algebra-moduli-macros" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "num-bigint 0.4.6", "num-prime", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "openvm-bigint-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-platform 1.3.0", "strum_macros 0.26.4", @@ -3593,7 +3593,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "proc-macro2", "quote", @@ -3652,7 +3652,7 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "ecdsa", "elliptic-curve", @@ -3661,7 +3661,7 @@ dependencies = [ "once_cell", "openvm 1.3.0", "openvm-algebra-guest 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-ecc-sw-macros 1.3.0", "openvm-rv32im-guest 1.3.0", "serde", @@ -3681,7 +3681,7 @@ dependencies = [ [[package]] name = "openvm-ecc-sw-macros" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-macros-common 1.3.0", "quote", @@ -3765,7 +3765,7 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-platform 1.3.0", ] @@ -3795,7 +3795,7 @@ dependencies = [ [[package]] name = "openvm-macros-common" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "syn 2.0.101", ] @@ -3920,7 +3920,7 @@ dependencies = [ [[package]] name = "openvm-pairing" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "group 0.13.0", "halo2curves-axiom 0.7.0", @@ -3932,7 +3932,7 @@ dependencies = [ "openvm-algebra-complex-macros 1.3.0", "openvm-algebra-guest 1.3.0", "openvm-algebra-moduli-macros 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-ecc-guest 1.3.0", "openvm-ecc-sw-macros 1.3.0", "openvm-pairing-guest 1.3.0", @@ -3997,7 +3997,7 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "halo2curves-axiom 0.7.0", "hex-literal", @@ -4008,7 +4008,7 @@ dependencies = [ "openvm 1.3.0", "openvm-algebra-guest 1.3.0", "openvm-algebra-moduli-macros 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-ecc-guest 1.3.0", "rand 0.8.5", "serde", @@ -4042,10 +4042,10 @@ dependencies = [ [[package]] name = "openvm-platform" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "libm", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-rv32im-guest 1.3.0", ] @@ -4122,9 +4122,9 @@ dependencies = [ [[package]] name = "openvm-rv32im-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "p3-field 0.1.0", "strum_macros 0.26.4", ] @@ -4202,7 +4202,7 @@ dependencies = [ [[package]] name = "openvm-sha2" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-sha256-guest 1.3.0", "sha2 0.10.9", @@ -4253,7 +4253,7 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" version = "1.3.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "openvm-platform 1.3.0", ] @@ -4387,7 +4387,7 @@ dependencies = [ [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422#4973d38cb3f2e14ebdd59e03802e65bb657ee422" +source = "git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0#5368d4756993fc1e51092499a816867cf4808de0" dependencies = [ "ecdsa", "elliptic-curve", @@ -5415,7 +5415,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5435,7 +5435,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5453,7 +5453,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "convert_case 0.7.1", "proc-macro2", @@ -5464,7 +5464,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-eips 1.0.20", "alloy-primitives", @@ -5474,7 +5474,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -5486,7 +5486,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5501,7 +5501,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5523,7 +5523,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5541,7 +5541,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-evm", "alloy-primitives", @@ -5554,7 +5554,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5570,7 +5570,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5582,7 +5582,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "once_cell", @@ -5595,7 +5595,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5623,7 +5623,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-primitives", "derive_more 2.0.1", @@ -5633,7 +5633,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5641,6 +5641,7 @@ dependencies = [ "alloy-genesis", "alloy-primitives", "alloy-serde 1.0.20", + "auto_impl", "derive_more 2.0.1", "once_cell", "reth-chainspec", @@ -5657,7 +5658,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5672,6 +5673,7 @@ dependencies = [ "reth-scroll-chainspec", "reth-scroll-forks", "reth-scroll-primitives", + "reth-storage-api", "revm 26.0.1", "revm-primitives 20.0.0", "revm-scroll", @@ -5685,7 +5687,7 @@ dependencies = [ [[package]] name = "reth-scroll-forks" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-chains", "alloy-primitives", @@ -5699,7 +5701,7 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5716,7 +5718,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-primitives", "reth-trie-common", @@ -5725,7 +5727,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-primitives", "derive_more 2.0.1", @@ -5736,7 +5738,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5758,7 +5760,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-eips 1.0.20", "alloy-primitives", @@ -5774,7 +5776,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -5796,7 +5798,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5812,7 +5814,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5828,7 +5830,7 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "zstd", ] @@ -6615,7 +6617,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "sbv-core" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "sbv-helpers", "sbv-kv", @@ -6628,7 +6630,7 @@ dependencies = [ [[package]] name = "sbv-helpers" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "tracing", ] @@ -6636,7 +6638,7 @@ dependencies = [ [[package]] name = "sbv-kv" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "auto_impl", "hashbrown 0.15.4", @@ -6646,7 +6648,7 @@ dependencies = [ [[package]] name = "sbv-precompile" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "openvm-ecc-guest 1.3.0", "openvm-pairing", @@ -6657,7 +6659,7 @@ dependencies = [ [[package]] name = "sbv-primitives" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -6691,7 +6693,7 @@ dependencies = [ [[package]] name = "sbv-trie" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#9901155469efbe42e2f1fbd4178f4919f3255613" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=chore%2Fopenvm-1.3#a4d0e2302ffd3ecbeef29e16ddeb361084358f7b" dependencies = [ "alloy-rlp", "alloy-trie", @@ -6706,7 +6708,7 @@ dependencies = [ [[package]] name = "scroll-alloy-consensus" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -6722,7 +6724,7 @@ dependencies = [ [[package]] name = "scroll-alloy-evm" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-consensus", "alloy-eips 1.0.20", @@ -6740,7 +6742,7 @@ dependencies = [ [[package]] name = "scroll-alloy-hardforks" version = "1.5.0" -source = "git+https://github.com/scroll-tech/reth?rev=aad1706d3deaf50e0b92a1d005f7228ac52082f8#aad1706d3deaf50e0b92a1d005f7228ac52082f8" +source = "git+https://github.com/scroll-tech/reth?rev=090d7950d169abbfb896875a7b1ff3f8ca356ac8#090d7950d169abbfb896875a7b1ff3f8ca356ac8" dependencies = [ "alloy-hardforks", "auto_impl", @@ -6821,7 +6823,7 @@ dependencies = [ name = "scroll-zkvm-chunk-circuit" version = "0.5.0" dependencies = [ - "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm 1.3.0", "openvm-algebra-complex-macros 1.3.0", "openvm-algebra-guest 1.3.0", @@ -6831,7 +6833,7 @@ dependencies = [ "openvm-pairing", "openvm-pairing-guest 1.3.0", "openvm-rv32im-guest 1.3.0", - "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "rkyv", "sbv-precompile", "scroll-zkvm-types-chunk", @@ -6843,6 +6845,7 @@ name = "scroll-zkvm-integration" version = "0.5.0" dependencies = [ "alloy-primitives", + "base64", "cargo_metadata 0.20.0", "chrono", "eyre", @@ -6867,6 +6870,7 @@ dependencies = [ "scroll-zkvm-prover", "scroll-zkvm-types", "scroll-zkvm-verifier", + "serde", "serde_json", "sha2 0.10.9", "snark-verifier-sdk", @@ -6985,7 +6989,7 @@ dependencies = [ "alloy-primitives", "itertools 0.14.0", "openvm 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-rv32im-guest 1.3.0", "revm-precompile 21.0.0 (git+https://github.com/scroll-tech/revm?branch=feat%2Freth-v74)", "rkyv", @@ -7005,7 +7009,7 @@ dependencies = [ "getrandom 0.2.16", "itertools 0.14.0", "openvm 1.3.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=4973d38cb3f2e14ebdd59e03802e65bb657ee422)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=5368d4756993fc1e51092499a816867cf4808de0)", "openvm-rv32im-guest 1.3.0", "rkyv", "scroll-zkvm-types-base", diff --git a/Cargo.toml b/Cargo.toml index d15c296a..a40a0433 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,20 +26,20 @@ version = "0.5.0" [workspace.dependencies] # openvm guest libs -openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422" } -openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-sha2 = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422" } -openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-p256 = { git = "https://github.com/openvm-org/openvm.git", package = "p256", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", features = ["std"] } -openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", features = ["std"] } -openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422" } -openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } -openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422", default-features = false } +openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0" } +openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-sha2 = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0" } +openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-p256 = { git = "https://github.com/openvm-org/openvm.git", package = "p256", rev = "5368d4756993fc1e51092499a816867cf4808de0", features = ["std"] } +openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256", rev = "5368d4756993fc1e51092499a816867cf4808de0", features = ["std"] } +openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0" } +openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } +openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0", default-features = false } # openvm guest libs openvm-build = { git = "https://github.com/openvm-org/openvm.git", tag = "v1.2.1-rc.1", default-features = false } @@ -64,7 +64,7 @@ sbv-kv = { git = "https://github.com/scroll-tech/stateless-block-verifier", bran sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3" } sbv-precompile = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3" } -scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth", rev = "aad1706d3deaf50e0b92a1d005f7228ac52082f8", default-features = false } +scroll-alloy-evm = { git = "https://github.com/scroll-tech/reth", rev = "090d7950d169abbfb896875a7b1ff3f8ca356ac8", default-features = false } alloy-primitives = { version = "1.2", default-features = false, features = ["std", "map-hashbrown", "map-fxhash", "rkyv"] } diff --git a/bundle.zip b/bundle.zip new file mode 100644 index 00000000..7b20c424 Binary files /dev/null and b/bundle.zip differ diff --git a/crates/circuits/batch-circuit/batch_exe_commit.rs b/crates/circuits/batch-circuit/batch_exe_commit.rs index b5595100..81af9c3d 100644 --- a/crates/circuits/batch-circuit/batch_exe_commit.rs +++ b/crates/circuits/batch-circuit/batch_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [173805396, 1243397274, 1635463771, 787232164, 57491829, 161204565, 866161262, 1813585880]; +pub const COMMIT: [u32; 8] = [929447834, 820187407, 1209145919, 270864530, 1042645838, 1882891518, 1322197458, 1528101909]; diff --git a/crates/circuits/bundle-circuit/bundle_exe_commit.rs b/crates/circuits/bundle-circuit/bundle_exe_commit.rs index 6f0d37ee..3dc8f72c 100644 --- a/crates/circuits/bundle-circuit/bundle_exe_commit.rs +++ b/crates/circuits/bundle-circuit/bundle_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [992613181, 1688971896, 479445636, 206599123, 396943442, 1557239147, 481575146, 757994261]; +pub const COMMIT: [u32; 8] = [656901663, 1847532670, 51169052, 1776352742, 669705513, 1444764618, 1562590178, 774429438]; diff --git a/crates/circuits/bundle-circuit/digest_1 b/crates/circuits/bundle-circuit/digest_1 index 48984647..d53e6751 100644 Binary files a/crates/circuits/bundle-circuit/digest_1 and b/crates/circuits/bundle-circuit/digest_1 differ diff --git a/crates/circuits/chunk-circuit/.cargo/config.toml b/crates/circuits/chunk-circuit/.cargo/config.toml index 976bc742..e6e4f106 100644 --- a/crates/circuits/chunk-circuit/.cargo/config.toml +++ b/crates/circuits/chunk-circuit/.cargo/config.toml @@ -1,3 +1,3 @@ [patch.crates-io] -k256 = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422" } -p256 = { git = "https://github.com/openvm-org/openvm.git", rev = "4973d38cb3f2e14ebdd59e03802e65bb657ee422" } +k256 = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0" } +p256 = { git = "https://github.com/openvm-org/openvm.git", rev = "5368d4756993fc1e51092499a816867cf4808de0" } diff --git a/crates/circuits/chunk-circuit/chunk_exe_commit.rs b/crates/circuits/chunk-circuit/chunk_exe_commit.rs index a08b16f8..af7e9bef 100644 --- a/crates/circuits/chunk-circuit/chunk_exe_commit.rs +++ b/crates/circuits/chunk-circuit/chunk_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [203016858, 503038698, 949948540, 1451391779, 1211328446, 907710104, 1213472024, 1288489367]; +pub const COMMIT: [u32; 8] = [1071419318, 13542696, 228098146, 1154682103, 1049712254, 1415629403, 1604860768, 985830407]; diff --git a/crates/integration/Cargo.toml b/crates/integration/Cargo.toml index b312a10d..3b8cd56e 100644 --- a/crates/integration/Cargo.toml +++ b/crates/integration/Cargo.toml @@ -23,9 +23,11 @@ openvm-native-transpiler = { workspace = true, default-features = false } openvm-transpiler = { workspace = true, default-features = false } alloy-primitives.workspace = true +base64.workspace = true cargo_metadata.workspace = true eyre.workspace = true rayon.workspace = true +serde.workspace = true vm-zstd = { workspace = true, features = ["zstd"] } chrono = "0.4" diff --git a/crates/integration/src/utils/mod.rs b/crates/integration/src/utils/mod.rs index 2e7f5d01..b9ad94d7 100644 --- a/crates/integration/src/utils/mod.rs +++ b/crates/integration/src/utils/mod.rs @@ -85,8 +85,7 @@ impl From<&BatchHeaderV> for LastHeader { fn from(value: &BatchHeaderV) -> Self { match value { BatchHeaderV::V6(h) => h.into(), - BatchHeaderV::V7(h) => h.into(), - BatchHeaderV::V8(h) => h.into(), + BatchHeaderV::V7_8(h) => h.into(), } } } @@ -293,7 +292,7 @@ pub fn build_batch_task( ForkName::EuclidV2 => { use scroll_zkvm_types::batch::BatchHeaderV7; let _ = x + z; - BatchHeaderV::V7(BatchHeaderV7 { + BatchHeaderV::V7_8(BatchHeaderV7 { version: last_header.version, batch_index: last_header.batch_index + 1, parent_batch_hash: last_header.batch_hash, @@ -303,7 +302,7 @@ pub fn build_batch_task( ForkName::Feynman => { use scroll_zkvm_types::batch::BatchHeaderV8; let _ = x + z; - BatchHeaderV::V8(BatchHeaderV8 { + BatchHeaderV::V7_8(BatchHeaderV8 { version: last_header.version, batch_index: last_header.batch_index + 1, parent_batch_hash: last_header.batch_hash, diff --git a/crates/integration/tests/bundle_circuit.rs b/crates/integration/tests/bundle_circuit.rs index d886e97b..385aa88c 100644 --- a/crates/integration/tests/bundle_circuit.rs +++ b/crates/integration/tests/bundle_circuit.rs @@ -1,3 +1,4 @@ +use openvm_sdk::commit::AppExecutionCommit; use sbv_primitives::B256; use scroll_zkvm_integration::{ ProverTester, prove_verify_multi, prove_verify_single_evm, @@ -10,6 +11,7 @@ use scroll_zkvm_integration::{ }; use scroll_zkvm_prover::{ AsRootProof, BatchProof, ChunkProof, IntoEvmProof, + setup::{read_app_config, read_app_exe}, task::{bundle::BundleProvingTask, chunk::ChunkProvingTask}, utils::{read_json_deep, write_json}, }; @@ -31,6 +33,70 @@ fn load_recent_batch_proofs() -> eyre::Result { Ok(task) } +#[test] +fn print_vks() -> eyre::Result<()> { + #[derive(Default, Debug, serde::Serialize)] + struct VKDump { + pub chunk_vk: String, + pub batch_vk: String, + pub bundle_vk: String, + } + let [chunk_vk, batch_vk, bundle_vk] = ["chunk", "batch", "bundle"].map(|circuit| { + let dev_mode = true; + let (path_app_exe, path_app_config) = if dev_mode { + ( + format!("../../crates/circuits/{circuit}-circuit/openvm/app.vmexe").into(), + format!("../../crates/circuits/{circuit}-circuit/openvm.toml").into(), + ) + } else { + let version = "0.5.0"; + ( + format!("../../{version}/{circuit}/app.vmexe").into(), + format!("../../{version}/{circuit}/openvm.toml").into(), + ) + }; + + let config = scroll_zkvm_prover::ProverConfig { + path_app_exe, + path_app_config, + ..Default::default() + }; + + let app_exe = read_app_exe(&config.path_app_exe).unwrap(); + let app_config = read_app_config(&config.path_app_config).unwrap(); + let sdk = openvm_sdk::Sdk::new(); + let app_pk = sdk.app_keygen(app_config).unwrap(); + let app_committed_exe = sdk + .commit_app_exe(app_pk.app_fri_params(), app_exe) + .unwrap(); + let commits = AppExecutionCommit::compute( + &app_pk.app_vm_pk.vm_config, + &app_committed_exe, + &app_pk.leaf_committed_exe, + ); + + let exe = commits.app_exe_commit.to_u32_digest(); + let leaf = commits.app_vm_commit.to_u32_digest(); + + let app_vk = scroll_zkvm_types::types_agg::ProgramCommitment { exe, leaf }.serialize(); + + use base64::{Engine, prelude::BASE64_STANDARD}; + let app_vk = BASE64_STANDARD.encode(app_vk); + println!("{circuit}: {app_vk}"); + app_vk + }); + + let dump = VKDump { + chunk_vk, + batch_vk, + bundle_vk, + }; + + let f = std::fs::File::create("openVmVk.json")?; + serde_json::to_writer(f, &dump)?; + Ok(()) +} + #[test] fn setup_prove_verify() -> eyre::Result<()> { BundleProverTester::setup()?; diff --git a/crates/prover/src/task/batch.rs b/crates/prover/src/task/batch.rs index 656cf17c..26c85828 100644 --- a/crates/prover/src/task/batch.rs +++ b/crates/prover/src/task/batch.rs @@ -25,16 +25,14 @@ use crate::{ #[serde(untagged)] pub enum BatchHeaderV { V6(BatchHeaderV6), - V7(BatchHeaderV7), - V8(BatchHeaderV8), + V7_8(BatchHeaderV7), } impl From for ReferenceHeader { fn from(value: BatchHeaderV) -> Self { match value { BatchHeaderV::V6(h) => ReferenceHeader::V6(h), - BatchHeaderV::V7(h) => ReferenceHeader::V7(h), - BatchHeaderV::V8(h) => ReferenceHeader::V8(h), + BatchHeaderV::V7_8(h) => ReferenceHeader::V7(h), } } } @@ -43,8 +41,7 @@ impl BatchHeaderV { pub fn batch_hash(&self) -> B256 { match self { BatchHeaderV::V6(h) => h.batch_hash(), - BatchHeaderV::V7(h) => h.batch_hash(), - BatchHeaderV::V8(h) => h.batch_hash(), + BatchHeaderV::V7_8(h) => h.batch_hash(), } } @@ -57,15 +54,15 @@ impl BatchHeaderV { pub fn must_v7_header(&self) -> &BatchHeaderV7 { match self { - BatchHeaderV::V7(h) => h, - _ => panic!("try to pick v7 header"), + BatchHeaderV::V7_8(h) => h, + _ => panic!("try to pick other header"), } } pub fn must_v8_header(&self) -> &BatchHeaderV8 { match self { - BatchHeaderV::V8(h) => h, - _ => panic!("try to pick v8 header"), + BatchHeaderV::V7_8(h) => h, + _ => panic!("try to pick other header"), } } } @@ -120,35 +117,28 @@ impl ProvingTask for BatchProvingTask { ::from_slice(self.blob_bytes.as_slice()) .challenge_digest(versioned_hash) } - BatchHeaderV::V7(_) => { - assert_eq!( - fork_name, - ForkName::EuclidV2, - "hardfork mismatch for da-codec@v7 header: found={fork_name:?}, expected={:?}", - ForkName::EuclidV2, - ); - let padded_blob_bytes = { - let mut padded_blob_bytes = self.blob_bytes.to_vec(); - padded_blob_bytes.resize(N_BLOB_BYTES, 0); - padded_blob_bytes - }; - ::from_slice(padded_blob_bytes.as_slice()) - .challenge_digest(versioned_hash) - } - BatchHeaderV::V8(_) => { - assert_eq!( - fork_name, - ForkName::Feynman, - "hardfork mismatch for da-codec@v8 header: found={fork_name:?}, expected={:?}", - ForkName::Feynman, - ); + BatchHeaderV::V7_8(_) => { let padded_blob_bytes = { let mut padded_blob_bytes = self.blob_bytes.to_vec(); padded_blob_bytes.resize(N_BLOB_BYTES, 0); padded_blob_bytes }; - ::from_slice(padded_blob_bytes.as_slice()) - .challenge_digest(versioned_hash) + + match fork_name { + ForkName::EuclidV2 => { + ::from_slice(padded_blob_bytes.as_slice()) + .challenge_digest(versioned_hash) + } + ForkName::Feynman => { + ::from_slice(padded_blob_bytes.as_slice()) + .challenge_digest(versioned_hash) + } + f => unreachable!( + "hardfork mismatch for da-codec@v7 header: found={}, expected={:?}", + f, + [ForkName::EuclidV2, ForkName::Feynman], + ), + } } }; @@ -174,7 +164,11 @@ impl ProvingTask for BatchProvingTask { kzg_proof: kzg_proof.into_inner(), }; - let reference_header = self.batch_header.clone().into(); + let reference_header = match fork_name { + ForkName::EuclidV1 => ReferenceHeader::V6(*self.batch_header.must_v6_header()), + ForkName::EuclidV2 => ReferenceHeader::V7(*self.batch_header.must_v7_header()), + ForkName::Feynman => ReferenceHeader::V8(*self.batch_header.must_v8_header()), + }; let witness = BatchWitness { fork_name, @@ -246,52 +240,21 @@ impl From<&BatchProvingTask> for BatchInfo { ); (h.parent_batch_hash, Default::default(), Default::default()) } - BatchHeaderV::V7(h) => { - assert_eq!( - fork_name, - ForkName::EuclidV2, - "hardfork mismatch for da-codec@v7 header: found={fork_name:?}, expected={:?}", - ForkName::EuclidV2, - ); - ( - h.parent_batch_hash, - task.chunk_proofs - .first() - .expect("at least one chunk in batch") - .metadata - .chunk_info - .prev_msg_queue_hash, - task.chunk_proofs - .last() - .expect("at least one chunk in batch") - .metadata - .chunk_info - .post_msg_queue_hash, - ) - } - BatchHeaderV::V8(h) => { - assert_eq!( - fork_name, - ForkName::Feynman, - "hardfork mismatch for da-codec@v8 header: found={fork_name:?}, expected={:?}", - ForkName::Feynman, - ); - ( - h.parent_batch_hash, - task.chunk_proofs - .first() - .expect("at least one chunk in batch") - .metadata - .chunk_info - .prev_msg_queue_hash, - task.chunk_proofs - .last() - .expect("at least one chunk in batch") - .metadata - .chunk_info - .post_msg_queue_hash, - ) - } + BatchHeaderV::V7_8(h) => ( + h.parent_batch_hash, + task.chunk_proofs + .first() + .expect("at least one chunk in batch") + .metadata + .chunk_info + .prev_msg_queue_hash, + task.chunk_proofs + .last() + .expect("at least one chunk in batch") + .metadata + .chunk_info + .post_msg_queue_hash, + ), }; let batch_hash = task.batch_header.batch_hash(); diff --git a/crates/prover/src/task/mod.rs b/crates/prover/src/task/mod.rs index af76770e..179c0ef2 100644 --- a/crates/prover/src/task/mod.rs +++ b/crates/prover/src/task/mod.rs @@ -35,11 +35,7 @@ impl ProvingTask for UniversalProvingTask { } for proof in &self.aggregated_proofs { - let streams = if self.fork_name() >= ForkName::Feynman { - proof.proofs[0].write() - } else { - proof.write() - }; + let streams = proof.proofs[0].write(); for s in &streams { stdin.write_field(s); } diff --git a/download-release.sh b/download-release.sh index 254fae8d..8644ee91 100644 --- a/download-release.sh +++ b/download-release.sh @@ -1,7 +1,7 @@ #!/bin/bash # release version -SCROLL_ZKVM_VERSION=0.5.0 +SCROLL_ZKVM_VERSION=0.5.2 if [ -z "${SCROLL_ZKVM_VERSION}" ]; then echo "SCROLL_ZKVM_VERSION not set" exit 1 diff --git a/release.sh b/release.sh index 0e70fe25..752af673 100644 --- a/release.sh +++ b/release.sh @@ -1,8 +1,8 @@ #!/bin/bash # release version -SCROLL_ZKVM_TESTRUN_DIR=`realpath .output/bundle-tests-20250703_1141191` -SCROLL_ZKVM_VERSION=0.5.0rc0 +SCROLL_ZKVM_TESTRUN_DIR=`realpath .output/bundle-tests-20250722_234931/` +SCROLL_ZKVM_VERSION=0.5.2 if [ -z "${SCROLL_ZKVM_VERSION}" ]; then echo "SCROLL_ZKVM_VERSION not set" exit 1