From 885e46769cf87a00865e603f85551f3a57bc0818 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Tue, 30 Apr 2024 11:37:33 +0300 Subject: [PATCH 1/7] forkdiff wip --- .github/workflows/pages.yaml | 33 +++++++++++++ fork.yaml | 95 ++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 .github/workflows/pages.yaml create mode 100644 fork.yaml diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml new file mode 100644 index 000000000..28dcbd153 --- /dev/null +++ b/.github/workflows/pages.yaml @@ -0,0 +1,33 @@ +name: Build and publish forkdiff github-pages +permissions: + contents: write +on: + pull-request: + branches: + - main +jobs: + deploy: + concurrency: ci-${{ github.ref }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 1000 # make sure to fetch the old commit we diff against + + - name: Build forkdiff + uses: "docker://protolambda/forkdiff:latest" + with: + args: -repo=/github/workspace -fork=/github/workspace/fork.yaml -out=/github/workspace/index.html + + - name: Build pages + run: | + mkdir -p tmp/pages + mv index.html tmp/pages/index.html + touch tmp/pages/.nojekyll + + - name: Deploy + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: tmp/pages + clean: true \ No newline at end of file diff --git a/fork.yaml b/fork.yaml new file mode 100644 index 000000000..6c8db0663 --- /dev/null +++ b/fork.yaml @@ -0,0 +1,95 @@ +title: "astria-geth - go-ethereum fork diff overview" +footer: | + Fork-diff overview of [`astria-geth`](https://github.com/astriaorg/astria-geth), a fork of [`go-ethereum`](https://github.com/ethereum/go-ethereum). +base: + name: go-ethereum + url: https://github.com/ethereum/go-ethereum + hash: 916d6a441a866cb618ae826c220866de118899f7 +fork: + name: astria-geth + url: https://github.com/astriaorg/astria-geth + ref: refs/heads/main +def: + title: "astria-geth" + description: | + This is an overview of the changes in [`astria-geth`](https://github.com/astriaorg/astria-geth), + a fork of [`go-ethereum`](https://github.com/ethereum/go-ethereum), part of the Astria-stack. + + The Astria-stack architecture is modular, following the Consensus/Execution split of post-Merge Ethereum L1: + - [`astria-geth`](https://github.com/astriaorg/astria-geth) implements the Execution-Layer, with **minimal changes** for a secure Ethereum-equivalent application environment. + + Related [astria-stack specifications](https://github.com/astriaorg/astria/tree/main/specs): + sub: + - title: "Core modifications" + sub: + - title: "Execution API" + description: | + The execution implements the [execution apiֿ](https://github.com/astriaorg/astria/blob/main/specs/execution-api.md) of the shared sequencer. + Its procedures will be called from the [conductor](https://github.com/astriaorg/astria/blob/main/specs/conductor.md). It is responsible + for immediately executing lists of ordered transactions that come from the shared sequencer. + globs: + - "grpc/execution/*" + - "grpc/*" + - title: "Tx-pool" + description: | + Transactions ordering as set by the shared sequencer + globs: + - "core/txpool/blobpool/*" + - "core/txpool/*" + - "core/txpool/legacypool/*" + - title: "State-transition modifications" + description: "" + sub: + - title: "Deposit Transaction type" + description: | + `Deposit` transaction type enable changes to the rollup based on sequencer layer events + globs: + - "core/types/deposit_tx.go" + - "core/types/transaction.go" + - "core/state_transition.go" + - "core/types/receipt.go" + + - title: "Block-building modifications" + description: | + The block-building code implements changes to support shared sequencer transactions ordering. + Transactions are now being fethced from the `TxPool` based on the shared sequencer. + globs: + - "miner/*" + - title: "Node modifications" + description: Changes to the node configuration and services. + sub: + - title: Node config + globs: + - "node/config.go" + - "node/defaults.go" + - "node/grpcstack.go" + - "node/node.go" + - title: "CLI" + description: | + CLI changes to support grpc server. + globs: + - "cmd/utils/flags.go" + - "cmd/geth/main.go" + - "internal/flags/categories.go" + - "cmd/geth/config.go" + - title: "Chain Configuration" + sub: + - title: "Chain config" + description: | + Configuration changes for integrating the shared seuqnecer + globs: + - "params/config.go" + - "params/protocol_params.go" + - "core/genesis.go" + - "genesis.json" + - "core/blockchain.go" + - "eth/backend.go" + +# ignored globally, does not count towards line count +ignore: + - ".circleci/*" + - "*.sum" + - "go.mod" + - "fork.yaml" + - ".github/*" + - ".github/workflows/*" \ No newline at end of file From a6e51ba0a96b081fc0b50e284ae00eaebe67a3e1 Mon Sep 17 00:00:00 2001 From: quasystaty <121364949+quasystaty1@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:41:26 +0300 Subject: [PATCH 2/7] Update pages.yaml --- .github/workflows/pages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 28dcbd153..402f3eaac 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -2,7 +2,7 @@ name: Build and publish forkdiff github-pages permissions: contents: write on: - pull-request: + pull_request: branches: - main jobs: @@ -30,4 +30,4 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4 with: folder: tmp/pages - clean: true \ No newline at end of file + clean: true From 1f73e9bd0ab60ec691f91d6fbd83e8c2022b891b Mon Sep 17 00:00:00 2001 From: quasystaty Date: Wed, 1 May 2024 11:59:51 +0300 Subject: [PATCH 3/7] wip --- .github/workflows/pages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 28dcbd153..2b0efe679 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -2,7 +2,7 @@ name: Build and publish forkdiff github-pages permissions: contents: write on: - pull-request: + pull_request: branches: - main jobs: From 78a1b3d701a31729e3d6bfb7ce5ec25ec3818087 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Mon, 6 May 2024 10:58:53 +0300 Subject: [PATCH 4/7] fix: fix page deployment test --- .github/workflows/pages.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 2b0efe679..8f5796a3f 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -7,7 +7,6 @@ on: - main jobs: deploy: - concurrency: ci-${{ github.ref }} runs-on: ubuntu-latest steps: - name: Checkout @@ -18,16 +17,18 @@ jobs: - name: Build forkdiff uses: "docker://protolambda/forkdiff:latest" with: - args: -repo=/github/workspace -fork=/github/workspace/fork.yaml -out=/github/workspace/index.html + args: -repo=./ -fork=./fork.yaml -out=./index.html - name: Build pages run: | mkdir -p tmp/pages - mv index.html tmp/pages/index.html - touch tmp/pages/.nojekyll + mv ./index.html ./tmp/pages/index.html + touch ./tmp/pages/.nojekyll - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4 + uses: peaceiris/actions-gh-pages@v3 with: - folder: tmp/pages - clean: true \ No newline at end of file + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./tmp/pages + user_name: github-actions[bot] + user_email: 41898282+github-actions[bot]@users.noreply.github.com \ No newline at end of file From 89872057eb8d497b46ae42b816da0d751dcf7713 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Wed, 8 May 2024 20:59:34 +0300 Subject: [PATCH 5/7] ref points to branch --- .github/workflows/pages.yaml | 2 +- fork.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index ac1e8f2d5..bab262fd1 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -21,7 +21,7 @@ jobs: - name: Build pages run: | - mkdir -p tmp/pages + mkdir -p ./tmp/pages mv ./index.html ./tmp/pages/index.html touch ./tmp/pages/.nojekyll diff --git a/fork.yaml b/fork.yaml index 6c8db0663..d8330fa10 100644 --- a/fork.yaml +++ b/fork.yaml @@ -8,7 +8,7 @@ base: fork: name: astria-geth url: https://github.com/astriaorg/astria-geth - ref: refs/heads/main + ref: refs/heads/quasystaty1/forkdiff def: title: "astria-geth" description: | From eec951fbd1560676ef35b8a405f08f89e9661b15 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Sat, 11 May 2024 00:26:15 +0300 Subject: [PATCH 6/7] Address feedback --- .github/workflows/pages.yaml | 6 +++--- fork.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index bab262fd1..e618f5866 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -2,7 +2,7 @@ name: Build and publish forkdiff github-pages permissions: contents: write on: - pull_request: + push: branches: - main jobs: @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1000 # make sure to fetch the old commit we diff against @@ -37,4 +37,4 @@ jobs: # The GH actions bot is used by default if you didn't specify the two fields. # You can swap them out with your own user credentials. user_name: github-actions[bot] - user_email: 41898282+github-actions[bot]@users.noreply.github.com \ No newline at end of file + user_email: 41898282+github-actions[bot]@users.noreply.github.com diff --git a/fork.yaml b/fork.yaml index d8330fa10..4c4a7d730 100644 --- a/fork.yaml +++ b/fork.yaml @@ -8,7 +8,7 @@ base: fork: name: astria-geth url: https://github.com/astriaorg/astria-geth - ref: refs/heads/quasystaty1/forkdiff + ref: refs/heads/main def: title: "astria-geth" description: | @@ -92,4 +92,4 @@ ignore: - "go.mod" - "fork.yaml" - ".github/*" - - ".github/workflows/*" \ No newline at end of file + - ".github/workflows/*" From f15ed745088961bd5f4064fb510f5a9e85563e1b Mon Sep 17 00:00:00 2001 From: quasystaty Date: Sat, 11 May 2024 01:18:30 +0300 Subject: [PATCH 7/7] new lines --- .github/workflows/pages.yaml | 1 + fork.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index e618f5866..338793e70 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -38,3 +38,4 @@ jobs: # You can swap them out with your own user credentials. user_name: github-actions[bot] user_email: 41898282+github-actions[bot]@users.noreply.github.com + diff --git a/fork.yaml b/fork.yaml index 4c4a7d730..2c312efe9 100644 --- a/fork.yaml +++ b/fork.yaml @@ -93,3 +93,4 @@ ignore: - "fork.yaml" - ".github/*" - ".github/workflows/*" +