diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0f09d0651..82647d414 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,46 +1,41 @@ -name: Cargo Tests +name: Espresso Cargo Tests on: pull_request: - branches: - - main - push: - branches: - - main jobs: tests: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly - - run: rustup toolchain install stable --profile minimal - - uses: Swatinem/rust-cache@v2 - - name: Install SP1 toolchain - run: | + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + with: + version: nightly + - run: rustup toolchain install stable --profile minimal + - uses: Swatinem/rust-cache@v2 + - name: Install SP1 toolchain + run: | curl -L https://sp1.succinct.xyz | bash ~/.sp1/bin/sp1up ~/.sp1/bin/cargo-prove prove --version source ~/.bashrc - - name: Install just - uses: extractions/setup-just@v3 + - name: Install just + uses: extractions/setup-just@v3 - - name: Test - run: just tests - env: - L2_NODE_RPC: ${{ secrets.L2_NODE_RPC }} # TODO: set proper RPCs in secret to run the tests - L1_RPC: ${{ secrets.L1_RPC }} - L1_BEACON_RPC: ${{ secrets.L1_BEACON_RPC }} - L2_RPC: ${{ secrets.L2_RPC }} - REPO_OWNER: ${{ github.repository_owner }} - REPO_NAME: ${{ github.event.repository.name }} - PR_NUMBER: ${{ github.event.pull_request.number }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - POST_TO_GITHUB: ${{ github.event_name == 'pull_request' }} + - name: Test + run: just tests + env: + L2_NODE_RPC: ${{ secrets.L2_NODE_RPC }} # TODO: set proper RPCs in secret to run the tests + L1_RPC: ${{ secrets.L1_RPC }} + L1_BEACON_RPC: ${{ secrets.L1_BEACON_RPC }} + L2_RPC: ${{ secrets.L2_RPC }} + REPO_OWNER: ${{ github.repository_owner }} + REPO_NAME: ${{ github.event.repository.name }} + PR_NUMBER: ${{ github.event.pull_request.number }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + POST_TO_GITHUB: ${{ github.event_name == 'pull_request' }} diff --git a/Cargo.lock b/Cargo.lock index a0f6e5848..0f4c9bc5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6592,7 +6592,7 @@ dependencies = [ [[package]] name = "kona-cli" version = "0.3.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6612,7 +6612,7 @@ dependencies = [ [[package]] name = "kona-client" version = "1.0.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6634,8 +6634,8 @@ dependencies = [ "kona-proof-interop", "kona-protocol", "kona-registry", - "kona-std-fpvm 0.2.0 (git+https://github.com/celo-org/kona?rev=b0ea596)", - "kona-std-fpvm-proc 0.2.0 (git+https://github.com/celo-org/kona?rev=b0ea596)", + "kona-std-fpvm 0.2.0 (git+https://github.com/EspressoSystems/kona?rev=ee5865f)", + "kona-std-fpvm-proc 0.2.0 (git+https://github.com/EspressoSystems/kona?rev=ee5865f)", "lru 0.16.2", "op-alloy-consensus", "op-alloy-rpc-types-engine", @@ -6651,7 +6651,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6672,7 +6672,7 @@ dependencies = [ [[package]] name = "kona-disc" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-rlp", "backon", @@ -6691,7 +6691,7 @@ dependencies = [ [[package]] name = "kona-driver" version = "0.4.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-evm", @@ -6712,7 +6712,7 @@ dependencies = [ [[package]] name = "kona-engine" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6750,7 +6750,7 @@ dependencies = [ [[package]] name = "kona-executor" version = "0.4.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6774,7 +6774,7 @@ dependencies = [ [[package]] name = "kona-genesis" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6794,7 +6794,7 @@ dependencies = [ [[package]] name = "kona-gossip" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6827,7 +6827,7 @@ dependencies = [ [[package]] name = "kona-hardforks" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6838,7 +6838,7 @@ dependencies = [ [[package]] name = "kona-host" version = "1.0.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6856,7 +6856,7 @@ dependencies = [ "ark-ff 0.5.0", "async-trait", "clap", - "kona-cli 0.3.2 (git+https://github.com/celo-org/kona?rev=b0ea596)", + "kona-cli 0.3.2 (git+https://github.com/EspressoSystems/kona?rev=ee5865f)", "kona-client", "kona-derive", "kona-driver", @@ -6869,7 +6869,7 @@ dependencies = [ "kona-protocol", "kona-providers-alloy", "kona-registry", - "kona-std-fpvm 0.2.0 (git+https://github.com/celo-org/kona?rev=b0ea596)", + "kona-std-fpvm 0.2.0 (git+https://github.com/EspressoSystems/kona?rev=ee5865f)", "op-alloy-network", "op-alloy-rpc-types-engine", "reqwest 0.12.24", @@ -6886,7 +6886,7 @@ dependencies = [ [[package]] name = "kona-interop" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6908,12 +6908,12 @@ dependencies = [ [[package]] name = "kona-macros" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" [[package]] name = "kona-mpt" version = "0.3.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6925,7 +6925,7 @@ dependencies = [ [[package]] name = "kona-peers" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6948,7 +6948,7 @@ dependencies = [ [[package]] name = "kona-preimage" version = "0.3.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-primitives", "async-channel", @@ -6962,7 +6962,7 @@ dependencies = [ [[package]] name = "kona-proof" version = "0.3.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6999,7 +6999,7 @@ dependencies = [ [[package]] name = "kona-proof-interop" version = "0.2.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7031,7 +7031,7 @@ dependencies = [ [[package]] name = "kona-protocol" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -7061,7 +7061,7 @@ dependencies = [ [[package]] name = "kona-providers-alloy" version = "0.3.3" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7092,7 +7092,7 @@ dependencies = [ [[package]] name = "kona-registry" version = "0.4.5" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-chains", "alloy-eips", @@ -7111,7 +7111,7 @@ dependencies = [ [[package]] name = "kona-rpc" version = "0.3.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7141,7 +7141,7 @@ dependencies = [ [[package]] name = "kona-sources" version = "0.1.2" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7183,7 +7183,7 @@ dependencies = [ [[package]] name = "kona-std-fpvm" version = "0.2.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "async-trait", "buddy_system_allocator", @@ -7207,10 +7207,10 @@ dependencies = [ [[package]] name = "kona-std-fpvm-proc" version = "0.2.0" -source = "git+https://github.com/celo-org/kona?rev=b0ea596#b0ea596426bbe44439b970e2e9d0212fc2fe5800" +source = "git+https://github.com/EspressoSystems/kona?rev=ee5865f#ee5865f9559a040fa4ece0bbb62006a7581520ac" dependencies = [ "cfg-if", - "kona-std-fpvm 0.2.0 (git+https://github.com/celo-org/kona?rev=b0ea596)", + "kona-std-fpvm 0.2.0 (git+https://github.com/EspressoSystems/kona?rev=ee5865f)", "proc-macro2", "quote", "syn 2.0.109", diff --git a/Cargo.toml b/Cargo.toml index 61421fd59..16d20535b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -236,19 +236,19 @@ p256 = { git = "https://github.com/sp1-patches/elliptic-curves", tag = "patch-p2 k256 = { git = "https://github.com/sp1-patches/elliptic-curves", tag = "patch-k256-13.4-sp1-5.0.0" } [patch."https://github.com/op-rs/kona"] -kona-mpt = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-derive = { git = "https://github.com/celo-org/kona", rev = "b0ea596", default-features = false } -kona-driver = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-preimage = { git = "https://github.com/celo-org/kona", rev = "b0ea596", features = [ +kona-mpt = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-derive = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", default-features = false } +kona-driver = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-preimage = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", features = [ "rkyv", "serde", ] } -kona-executor = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-proof = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-client = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-host = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-providers-alloy = { git = "https://github.com/celo-org/kona", rev = "b0ea596" } -kona-rpc = { git = "https://github.com/celo-org/kona", rev = "b0ea596", default-features = false } -kona-protocol = { git = "https://github.com/celo-org/kona", rev = "b0ea596", default-features = false } -kona-registry = { git = "https://github.com/celo-org/kona", rev = "b0ea596", default-features = false } -kona-genesis = { git = "https://github.com/celo-org/kona", rev = "b0ea596", default-features = false } +kona-executor = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-proof = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-client = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-host = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-providers-alloy = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f" } +kona-rpc = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", default-features = false } +kona-protocol = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", default-features = false } +kona-registry = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", default-features = false } +kona-genesis = { git = "https://github.com/EspressoSystems/kona", rev = "ee5865f", default-features = false } \ No newline at end of file