Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Gwyneth diff with reth #3

Open
wants to merge 150 commits into
base: v1.0.6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
9f6ec98
chore: forge init
Jul 2, 2024
e73fad0
forge install: forge-std
Jul 2, 2024
17bffac
Integrate taiko simplified
Jul 2, 2024
69c8ff7
remove node_modules
Jul 2, 2024
62be7b6
remove submodule
Jul 2, 2024
e19abba
remove empty .gitmodules
Jul 2, 2024
576ddfd
make protocol buildable
Jul 2, 2024
fe73ec9
fix missing file, causing a test issue
Jul 3, 2024
af3743d
Brecht cicd changes
Jul 3, 2024
346959e
add preconf from taiko-mono helder branch
Jul 3, 2024
a66ba4d
move sequencer registry check & forge fmt
Jul 4, 2024
98cf744
first block propose test
Jul 4, 2024
54461ce
remove console logs
Jul 4, 2024
6147bfe
add some proveBlock logic
Jul 4, 2024
2b2a36e
Test proving/verifying logic
Jul 4, 2024
ef000d9
add some tests
Jul 5, 2024
3f31d5c
remove comment
Jul 5, 2024
317107c
Merge pull request #18 from taikoxyz/blockHash_or_metaHash_in_transition
adaki2004 Jul 5, 2024
4d48262
rename var
Jul 5, 2024
9c75561
Merge pull request #17 from taikoxyz/first_simple_tests
Brechtpd Jul 5, 2024
227c9e6
Add deployment manual and script
Jul 8, 2024
67b2f4b
modify comment in MockSgxVerifier
Jul 8, 2024
dffc809
change anvil to reth-based private network
Jul 9, 2024
a090c06
Change config as Kurtosis PR
Jul 9, 2024
2fe94df
typo fix
Jul 10, 2024
5ac4a0b
update readme with local reth image deployment
Jul 10, 2024
c5e2838
Update everything (except core protocol) to lates, because of deps
Jul 11, 2024
19461a0
delete some unused contracts and bring over guardian prover
Jul 12, 2024
6f2b50e
Merge pull request #20 from taikoxyz/brought_over_latest_taiko_mono
adaki2004 Jul 15, 2024
9436b97
Merge pull request #19 from taikoxyz/anvil_shootup
adaki2004 Jul 15, 2024
c35c8e6
Merge pull request #15 from taikoxyz/gwyneth_preconf_mods
adaki2004 Jul 15, 2024
8d6c287
fix deployment issues caused by taiko-mon updates
Jul 15, 2024
81d2882
Adap multi-block proposals to gwyneth
Jul 15, 2024
bf9b9b9
change readme
Jul 15, 2024
5ff912e
Merge pull request #21 from taikoxyz/multiple_l2_blocks_in_one_L1_pro…
adaki2004 Jul 16, 2024
00f713c
initial draft of brecht issue desc.
Jul 17, 2024
3abed62
remuve some unncessary parts
Jul 17, 2024
0e9a241
fix pr comments & resolve build issues
Jul 18, 2024
ca4a6e6
fix or uncomment not relevant tests
Jul 19, 2024
93c26f7
add propose block script
Jul 19, 2024
6ba3443
add makefile and install script
Jul 19, 2024
f9a69a6
add contract deployments to setup
Jul 22, 2024
dfbbb6a
update sample dotenv
Jul 22, 2024
2520929
Merge remote-tracking branch 'origin/main' into gwynethV2-latest-reth
Brechtpd Jul 22, 2024
5a514da
Merge remote-tracking branch 'origin/gwynethV2' into gwynethV2-latest…
Brechtpd Jul 22, 2024
d6079da
Merge pull request #24 from taikoxyz/gwynethV2
Brechtpd Jul 22, 2024
33a509e
add proposeblock make command
Jul 23, 2024
7f58076
add propse CI worklfow
Jul 23, 2024
fa9f982
Integrate and make contracts compiling
Jul 23, 2024
fb8381c
fix ci script
Jul 23, 2024
853e2cd
move sync-only consuem and write to XChain
Jul 24, 2024
784f613
add xtransfer and token example
Jul 25, 2024
aed907b
meeting outcomes
Jul 25, 2024
4f649b3
Merge pull request #28 from taikoxyz/modify_erc20_xchain_version_inhe…
adaki2004 Jul 25, 2024
beb7199
Merge pull request #26 from taikoxyz/incorporate_booster_sample_contr…
adaki2004 Jul 25, 2024
78eccb1
Merge remote-tracking branch 'origin/gwyneth' into gwynethV2-latest-reth
Brechtpd Jul 26, 2024
6a24f73
wip exex integration
Brechtpd Jul 26, 2024
69ff57c
some fixes
Brechtpd Jul 27, 2024
058f59e
wip L2 full node
Brechtpd Aug 4, 2024
863740b
compile
CeciliaZ030 Aug 13, 2024
c1f27ba
Revert "compile"
CeciliaZ030 Aug 13, 2024
6451b5d
probably L2 node dummy payload working
Brechtpd Aug 15, 2024
738d9ea
payload built
Brechtpd Aug 17, 2024
e3240e4
valid payload
Brechtpd Aug 17, 2024
73101b9
cleanup
Brechtpd Aug 18, 2024
2832ddf
gwyneth node
CeciliaZ030 Aug 18, 2024
5fd6c2f
remove more stuff
Brechtpd Aug 18, 2024
22787f7
main compile
CeciliaZ030 Aug 18, 2024
434f82d
debug info and static ip
Aug 23, 2024
95787f5
use static 0.0.0.0 ip and the correctly modified (fork) kurtosis refe…
Aug 23, 2024
7125b8b
pr findings
Aug 26, 2024
eaa81f5
Merge pull request #35 from taikoxyz/gwynethV2-latest-reth
Brechtpd Aug 28, 2024
9c3c1cc
Merge pull request #33 from taikoxyz/l2_node_rpc_issue
adaki2004 Sep 2, 2024
e24642e
Merge branch 'gwyneth' into gwyneth-cecilia
CeciliaZ030 Sep 2, 2024
84f8bf8
default_gwyneth_payload_builder
CeciliaZ030 Sep 2, 2024
d64550a
clean diff
CeciliaZ030 Sep 6, 2024
4b1817d
fix payload builder
CeciliaZ030 Sep 7, 2024
7172a6d
exexe fullnode
CeciliaZ030 Sep 9, 2024
f00c1c7
clean up bin/reth
CeciliaZ030 Sep 9, 2024
dbe4f54
Revert "clean up bin/reth"
CeciliaZ030 Sep 9, 2024
354cf7e
clean up lib/reth again
CeciliaZ030 Sep 9, 2024
4af9564
clippy
CeciliaZ030 Sep 9, 2024
0512e82
SyncProvider in PayloadBuilderAttributes
CeciliaZ030 Sep 13, 2024
f4d4228
update
CeciliaZ030 Sep 13, 2024
463a97b
fix fmt
CeciliaZ030 Sep 13, 2024
c4f3308
more ;
CeciliaZ030 Sep 13, 2024
5a2522e
;
CeciliaZ030 Sep 13, 2024
cbbcfc4
update
CeciliaZ030 Sep 14, 2024
90f5ac2
Merge remote-tracking branch 'origin/gwyneth' into gwyneth-cecilia
CeciliaZ030 Sep 14, 2024
51bd848
dani's shit
CeciliaZ030 Sep 14, 2024
7db84b7
Merge pull request #42 from taikoxyz/gwyneth-cecilia
CeciliaZ030 Sep 14, 2024
e611317
l1_db
CeciliaZ030 Sep 14, 2024
9caa3b0
Merge tag 'v1.0.6' into gwyneth-cecilia
CeciliaZ030 Sep 15, 2024
5af74cc
delete duplicated config and handle
Sep 15, 2024
9dc325a
reolve merged conficts
CeciliaZ030 Sep 16, 2024
6005ff5
Merge remote-tracking branch 'origin/gwyneth' into gwyneth-cecilia
CeciliaZ030 Sep 16, 2024
58731cd
compiled SyncDatabse
CeciliaZ030 Sep 21, 2024
25a064a
post_block_balance_increments + ProviderError
CeciliaZ030 Sep 21, 2024
2134fc1
clippy & fmt
CeciliaZ030 Sep 21, 2024
79ee267
most tests passed
CeciliaZ030 Sep 23, 2024
22fee2b
most tests pass
CeciliaZ030 Sep 23, 2024
ee68e26
Merge pull request #43 from taikoxyz/1.0.6-update
Brechtpd Sep 23, 2024
04b8f42
update patch to git
CeciliaZ030 Sep 23, 2024
a42b1a7
fix more chain_id
CeciliaZ030 Sep 27, 2024
e5bcd94
prints
CeciliaZ030 Sep 27, 2024
af50cf9
execution_outcome.all_states() fixs blockhash
CeciliaZ030 Sep 27, 2024
9208f26
current_state
CeciliaZ030 Sep 27, 2024
462135b
Merge branch 'print-shit-out' into gwyneth-cecilia
CeciliaZ030 Sep 27, 2024
a0091f7
no extra println
CeciliaZ030 Sep 27, 2024
27cfd6b
force execution outcome to have chain_id
CeciliaZ030 Sep 27, 2024
4f1d86c
fmt
CeciliaZ030 Sep 30, 2024
1f7ea4e
update
CeciliaZ030 Oct 1, 2024
684054c
clippy & clean up
CeciliaZ030 Oct 1, 2024
b3f7718
clean up more
CeciliaZ030 Oct 1, 2024
88d055d
comments
CeciliaZ030 Oct 4, 2024
ce68b12
fix bench util
CeciliaZ030 Oct 4, 2024
71c7078
fix tx_env chain_id
CeciliaZ030 Oct 7, 2024
cfa0c55
rebase make install procedure to newest base
Oct 8, 2024
011d89f
rbuilder compat changes
Brechtpd Oct 8, 2024
b699a7f
Merge remote-tracking branch 'origin/gwyneth-cecilia' into rbuilderV3
Brechtpd Oct 8, 2024
a764b2f
fix updated packages giving small incompatibility issues
Brechtpd Oct 8, 2024
6bf500f
fix tx chain_id again
CeciliaZ030 Oct 9, 2024
34856df
rbuilder fixed db/rpc and fixes
Brechtpd Oct 9, 2024
7faee55
static blockscout ports
Oct 10, 2024
681003a
add rbuilder start after make install
Oct 10, 2024
7c010b2
cleanup
Brechtpd Oct 10, 2024
166cd4e
Merge remote-tracking branch 'origin/rbuilderV2' into rbuilderV3
Brechtpd Oct 10, 2024
c39bbbf
stream rbuilder logs into tmp/rbuilder.log
Oct 11, 2024
40ccc2a
Merge remote-tracking branch 'origin/rbuilderV2' into rbuilderV3
Brechtpd Oct 11, 2024
0b7ef07
add script for shoot up a second node
Oct 11, 2024
b98ecfa
Add Gwyneth instructions
Brechtpd Oct 11, 2024
b8caa86
Merge pull request #45 from taikoxyz/rbuilderV2
Brechtpd Oct 11, 2024
d2beb2f
Merge branch 'gwyneth-cecilia' into rbuilderV3
Brechtpd Oct 11, 2024
be2e95a
Merge pull request #46 from taikoxyz/rbuilderV3
Brechtpd Oct 11, 2024
f304454
Merge pull request #44 from taikoxyz/gwyneth-cecilia
Brechtpd Oct 11, 2024
b9f213f
Merge pull request #1 from taikoxyz/gwyneth
Brechtpd Oct 17, 2024
f230fcd
block building fixes
Brechtpd Oct 17, 2024
61f1826
add default env file for easy setup
Brechtpd Oct 17, 2024
e1f6420
Merge pull request #4 from taikoxyz/gwyneth-block-fixes
Brechtpd Oct 17, 2024
5e2729c
first trial
Oct 18, 2024
ca53bd3
some req changes
Oct 18, 2024
d7f4ece
fix compile error
Brechtpd Oct 21, 2024
34e62a3
necessary deployemnts for multiple rollups
Oct 22, 2024
da36de6
filter for propoer chainId
Oct 22, 2024
e31c08a
fix transactions on different chains
Brechtpd Oct 24, 2024
5f6d3a6
change ports
Oct 24, 2024
6476cb1
add readme and network_params
Oct 24, 2024
0b0cdda
Merge pull request #7 from taikoxyz/multiple_l2
Brechtpd Oct 24, 2024
f01de37
pull and use gwynethtaiko/rbuilder
Oct 25, 2024
c26278e
change script order
Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ concurrency:
name: bench
jobs:
iai:
runs-on:
group: Reth
runs-on: ubuntu-latest
# Only run benchmarks in merge groups and on main
if: github.event_name != 'pull_request'
steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
prepare-reth:
if: github.repository == 'paradigmxyz/reth'
timeout-minutes: 45
runs-on:
group: Reth
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: mkdir artifacts
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.network }}
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
strategy:
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/propose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Propose a block

on:
push:
branches:
- gwyneth
- gwyneth/**
pull_request:
branches:
- gwyneth
- gwyneth/**

jobs:
build-and-test:
runs-on: ubuntu-latest

env:
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Docker
uses: docker/setup-buildx-action@v2

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y curl apt-transport-https software-properties-common

# Install Docker
if ! command -v docker &> /dev/null
then
curl -fsSL https://get.docker.com -o get-docker.sh
sh get-docker.sh
fi

# Start Docker service
sudo systemctl start docker
sudo systemctl enable docker

# Check Docker installation
docker --version

# Install Kurtosis
if ! command -v kurtosis &> /dev/null
then
curl -fsSL https://kurtosis-public.s3.amazonaws.com/cli/cli-installer.sh | bash
fi

# Check Kurtosis installation
kurtosis version

# Install Forge
if ! command -v forge &> /dev/null
then
curl -L https://foundry.paradigm.xyz | bash
source ~/.bashrc
foundryup
fi

# Check Forge installation
forge --version

# Run setup_deps.sh which installs Docker, checks Docker daemon, installs Kurtosis, and extracts RPC port
./scripts/setup_deps.sh

- name: Run Forge Script
run: |
# Read the RPC port from the temporary file
RPC_PORT=$(cat /tmp/kurtosis_rpc_port)

# Run the forge foundry script using the PRIVATE_KEY from GitHub Secrets
FORGE_COMMAND="forge script --rpc-url http://127.0.0.1:$RPC_PORT scripts/L2_txn_simulation/ProposeBlock.s.sol -vvvv --broadcast --private-key $PRIVATE_KEY --legacy"
echo "Running forge foundry script..."
eval $FORGE_COMMAND
echo "Forge script execution completed."
9 changes: 3 additions & 6 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.network }} (${{ matrix.partition }}/2)
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
strategy:
Expand All @@ -45,8 +44,7 @@ jobs:

state:
name: Ethereum state tests
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_LOG: info,sync=error
RUST_BACKTRACE: 1
Expand All @@ -70,8 +68,7 @@ jobs:

doc:
name: doc tests (${{ matrix.network }})
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
timeout-minutes: 30
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ jwttoken/
crates/storage/libmdbx-rs/mdbx-sys/libmdbx/cmake-build-debug

# Rust bug report
rustc-ice-*
rustc-ice-*

packages/protocol/broadcast/**
Loading
Loading