diff --git a/crates/scroll/consensus/src/validation.rs b/crates/scroll/consensus/src/validation.rs index 552b9b63e81..0761cc0db35 100644 --- a/crates/scroll/consensus/src/validation.rs +++ b/crates/scroll/consensus/src/validation.rs @@ -331,12 +331,12 @@ fn validate_against_parent_gas_limit( return if header.gas_limit() > parent.gas_limit() { Err(ConsensusError::GasLimitInvalidIncrease { parent_gas_limit: parent.gas_limit(), - child_gas_limit: parent.gas_limit(), + child_gas_limit: header.gas_limit(), }) } else { Err(ConsensusError::GasLimitInvalidDecrease { parent_gas_limit: parent.gas_limit(), - child_gas_limit: parent.gas_limit(), + child_gas_limit: header.gas_limit(), }) } } diff --git a/crates/scroll/node/tests/assets/genesis.json b/crates/scroll/node/tests/assets/genesis.json index 6f1737c9a93..9730581b3ef 100644 --- a/crates/scroll/node/tests/assets/genesis.json +++ b/crates/scroll/node/tests/assets/genesis.json @@ -23,7 +23,7 @@ "nonce": "0x0", "timestamp": "0x0", "extraData": "0x00", - "gasLimit": "0x1c9c380", + "gasLimit": "0x1312d00", "difficulty": "0x0", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0x0000000000000000000000000000000000000000", @@ -105,4 +105,4 @@ } }, "number": "0x0" -} \ No newline at end of file +} diff --git a/crates/scroll/openvm-compat/Cargo.lock b/crates/scroll/openvm-compat/Cargo.lock index 181403b1e02..b31ebc89ee4 100644 --- a/crates/scroll/openvm-compat/Cargo.lock +++ b/crates/scroll/openvm-compat/Cargo.lock @@ -1821,6 +1821,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", + "rand 0.8.5", ] [[package]] @@ -1910,6 +1911,18 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "nums" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3c74f925fb8cfc49a8022f2afce48a0683b70f9e439885594e84c5edbf5b01" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", + "rand 0.8.5", +] + [[package]] name = "nybbles" version = "0.4.4" @@ -1953,8 +1966,8 @@ dependencies = [ [[package]] name = "openvm" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.2.0#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.4.0" +source = "git+https://github.com/openvm-org/openvm.git?tag=v1.4.0#39ee587f0f73646e3753cb2aa5f34885d4efffe0" dependencies = [ "bytemuck", "num-bigint", @@ -1990,7 +2003,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.2.0#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +source = "git+https://github.com/openvm-org/openvm.git?tag=v1.4.0#39ee587f0f73646e3753cb2aa5f34885d4efffe0" dependencies = [ "proc-macro2", "quote", @@ -1999,10 +2012,9 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.2.0#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.4.0" +source = "git+https://github.com/openvm-org/openvm.git?tag=v1.4.0#39ee587f0f73646e3753cb2aa5f34885d4efffe0" dependencies = [ - "getrandom 0.2.16", "libm", "openvm-custom-insn", "openvm-rv32im-guest", @@ -2010,10 +2022,11 @@ dependencies = [ [[package]] name = "openvm-rv32im-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.2.0#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.4.0" +source = "git+https://github.com/openvm-org/openvm.git?tag=v1.4.0#39ee587f0f73646e3753cb2aa5f34885d4efffe0" dependencies = [ "openvm-custom-insn", + "p3-field", "strum_macros 0.26.4", ] @@ -2029,6 +2042,36 @@ dependencies = [ "sha2", ] +[[package]] +name = "p3-field" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" +dependencies = [ + "itertools 0.14.0", + "num-bigint", + "num-integer", + "num-traits", + "nums", + "p3-maybe-rayon", + "p3-util", + "rand 0.8.5", + "serde", + "tracing", +] + +[[package]] +name = "p3-maybe-rayon" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" + +[[package]] +name = "p3-util" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=539bbc84085efb609f4f62cb03cf49588388abdb#539bbc84085efb609f4f62cb03cf49588388abdb" +dependencies = [ + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.7.5"