fix: hive (#1381)

* add clap * fix hive chain * add clap to hive genesis * and now we pray * add asdf and pray * missing \ * fix nonce issue in hive genesis * add pool configuration update for hive * remove optional on compat * add relayer private key * start the relayer * lint * add null block hash * fix ts * fix isKakarotTransaction * fix toTypedEthTx * fix slicing * missed that * correctly slice * fixes hive test youpie * lint transaction.ts * ignore failing tests * add pool maintenance task * ignore one last test * add clap * fix hive chain * add clap to hive genesis * and now we pray * add asdf and pray * missing \ * fix nonce issue in hive genesis * add pool configuration update for hive * remove optional on compat * add relayer private key * start the relayer * lint * add null block hash * fix ts * fix isKakarotTransaction * fix toTypedEthTx * fix slicing * missed that * correctly slice * fixes hive test youpie * lint transaction.ts * ignore failing tests * add pool maintenance task * ignore one last test * lint * lint * comment
kkrt-labs · Sep 27, 2024 · c64812e · c64812e
1 parent 166c596
commit c64812e
Show file tree

Hide file tree

Showing 27 changed files with 745 additions and 482 deletions.
diff --git a/.github/workflows/rust_test.yml b/.github/workflows/rust_test.yml
@@ -62,145 +62,144 @@ jobs:
         run: ./scripts/make_with_env.sh katana-genesis
       - name: Test code
         run: make test
-# We skip the hive tests for now, will be fixed in the next PR.
 
-#  # Inspired by Reth CI.
-#  # <https://github.com/paradigmxyz/reth/blob/027d50fc105fd527dca0bf56fe51b7240f119e66/.github/workflows/hive.yml>
-#  hive-prepare:
-#    runs-on: ubuntu-latest-16-cores
-#    timeout-minutes: 45
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v2
-#      - run: mkdir artifacts
-#      - name: Build Hive
-#        uses: docker/build-push-action@v4
-#        with:
-#          push: false
-#          tags: hive
-#          context: .
-#          file: ./docker/hive/Dockerfile
-#          platforms: linux/amd64
-#          build-args: |
-#            GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-#            APIBARA_STARKNET_BIN_DIR=ns4qwsl6fgbv7mxhxpnaqhd66wnic8i6
-#            APIBARA_SINK_BIN_DIR=81f00xxzyxs6ih6376cw0qbznf6cl6bn
-#          outputs: type=docker,dest=./artifacts/kakarot_image.tar
-#      - name: Checkout hive tests
-#        uses: actions/checkout@v4
-#        with:
-#          repository: kkrt-labs/hive
-#          ref: master
-#          path: hivetests
-#      - name: Set up Go
-#        uses: actions/setup-go@v5
-#        with:
-#          go-version: "1.22"
-#      - name: Compile hive
-#        run: |
-#          cd hivetests
-#          go build hive.go
-#          mv ./hive ../artifacts/
-#      - name: Upload artifacts
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: artifacts
-#          path: ./artifacts
-#
-#  hive-test:
-#    runs-on: ubuntu-latest-16-cores
-#    timeout-minutes: 45
-#    needs: hive-prepare
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        sim: [ethereum/rpc]
-#        include:
-#          - sim: ethereum/rpc-compat
-#            include:
-#              - debug_getRawReceipts
-#              - debug_getRawTransaction/get-tx$
-#              - debug_getRawBlock/get-invalid-number$
-#              - eth_blockNumber/simple-test$
-#              - eth_call/call-simple-contract$
-#              - eth_call/call-simple-transfer$
-#              - eth_chainId/get-chain-id$
-#              - eth_estimateGas/estimate-simple-contract$
-#              - eth_estimateGas/estimate-simple-transfer$
-#              - eth_getBalance/get-balance$
-#              - eth_getBlockByHash/get-block-by-empty-hash$
-#              - eth_getBlockByHash/get-block-by-notfound-hash$
-#              - eth_getBlockByNumber/get-finalized$
-#              - eth_getBlockByNumber/get-latest$
-#              - eth_getBlockByNumber/get-safe$
-#              - eth_getBlockByNumber/get-block-notfound$
-#              - eth_getBlockByNumber/get-block-n$
-#              - eth_getBlockReceipts/get-block-receipts-0$
-#              - eth_getBlockReceipts/get-block-receipts-earliest$
-#              - eth_getBlockReceipts/get-block-receipts-empty$
-#              - eth_getBlockReceipts/get-block-receipts-latest$
-#              - eth_getBlockReceipts/get-block-receipts-future$
-#              - eth_getBlockReceipts/get-block-receipts-n$
-#              - eth_getBlockReceipts/get-block-receipts-not-found$
-#              - eth_getBlockTransactionCountByNumber/get-block-n$
-#              - eth_getBlockTransactionCountByNumber/get-genesis$
-#              - eth_getCode/get-code$
-#              - eth_getStorage/get-storage$
-#              - eth_getTransactionByBlockNumberAndIndex/get-block-n$
-#              - eth_getTransactionByHash/get-access-list$
-#              - eth_getTransactionByHash/get-dynamic-fee$
-#              - eth_getTransactionByHash/get-empty-tx$
-#              - eth_getTransactionByHash/get-legacy-create$
-#              - eth_getTransactionByHash/get-legacy-input$
-#              - eth_getTransactionByHash/get-legacy-tx$
-#              - eth_getTransactionByHash/get-notfound-tx$
-#              - eth_getTransactionReceipt/get-access-list$
-#              - eth_getTransactionReceipt/get-dynamic-fee$
-#              - eth_getTransactionReceipt/get-empty-tx$
-#              - eth_getTransactionReceipt/get-legacy-receipt$
-#              - eth_getTransactionReceipt/get-notfound-tx$
-#              - eth_getTransactionReceipt/get-legacy-contract$
-#              - eth_getTransactionReceipt/get-legacy-input$
-#              - eth_sendRawTransaction/send-access-list-transaction$
-#              - eth_sendRawTransaction/send-dynamic-fee-access-list-transaction$
-#              - eth_sendRawTransaction/send-dynamic-fee-transaction$
-#              - eth_sendRawTransaction/send-legacy-transaction$
-#              - eth_getTransactionCount/get-account-nonce$
-#              - eth_syncing/check-syncing$
-#    steps:
-#      - name: Download artifacts
-#        uses: actions/download-artifact@v4
-#        with:
-#          name: artifacts
-#          path: /tmp
-#      - name: Load Docker image
-#        run: |
-#          docker load --input /tmp/kakarot_image.tar
-#          docker image ls -a
-#      - name: Move hive binary
-#        run: |
-#          mv /tmp/hive /usr/local/bin
-#          chmod +x /usr/local/bin/hive
-#      - name: Checkout hive tests
-#        uses: actions/checkout@v4
-#        with:
-#          repository: kkrt-labs/hive
-#          ref: master
-#          path: hivetests
-#      - name: Run ${{ matrix.sim }} simulator
-#        run: |
-#          cd hivetests
-#          hive --sim "${{ matrix.sim }}$" --sim.limit "/${{join(matrix.include, '|')}}" --client kakarot
-#      - name: Print logs
-#        if: always()
-#        run: |
-#          cd hivetests
-#          echo "Logs:"
-#          cat workspace/logs/*.log
-#          echo "Kakarot logs:"
-#          cat workspace/logs/kakarot/*.log
-#          echo "Details logs:"
-#          cat workspace/logs/details/*.log
+  # Inspired by Reth CI.
+  # <https://github.com/paradigmxyz/reth/blob/027d50fc105fd527dca0bf56fe51b7240f119e66/.github/workflows/hive.yml>
+  hive-prepare:
+    runs-on: ubuntu-latest-16-cores
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - run: mkdir artifacts
+      - name: Build Hive
+        uses: docker/build-push-action@v4
+        with:
+          push: false
+          tags: hive
+          context: .
+          file: ./docker/hive/Dockerfile
+          platforms: linux/amd64
+          build-args: |
+            GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+            APIBARA_STARKNET_BIN_DIR=ns4qwsl6fgbv7mxhxpnaqhd66wnic8i6
+            APIBARA_SINK_BIN_DIR=81f00xxzyxs6ih6376cw0qbznf6cl6bn
+          outputs: type=docker,dest=./artifacts/kakarot_image.tar
+      - name: Checkout hive tests
+        uses: actions/checkout@v4
+        with:
+          repository: kkrt-labs/hive
+          ref: master
+          path: hivetests
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+      - name: Compile hive
+        run: |
+          cd hivetests
+          go build hive.go
+          mv ./hive ../artifacts/
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts
+          path: ./artifacts
+
+  hive-test:
+    runs-on: ubuntu-latest-16-cores
+    timeout-minutes: 45
+    needs: hive-prepare
+    strategy:
+      fail-fast: false
+      matrix:
+        sim: [ethereum/rpc]
+        include:
+          - sim: ethereum/rpc-compat
+            include:
+              - debug_getRawReceipts
+              - debug_getRawTransaction/get-tx$
+              - debug_getRawBlock/get-invalid-number$
+              - eth_blockNumber/simple-test$
+              - eth_call/call-simple-contract$
+              - eth_call/call-simple-transfer$
+              - eth_chainId/get-chain-id$
+              - eth_estimateGas/estimate-simple-contract$
+              - eth_estimateGas/estimate-simple-transfer$
+              - eth_getBalance/get-balance$
+              - eth_getBlockByHash/get-block-by-empty-hash$
+              - eth_getBlockByHash/get-block-by-notfound-hash$
+              - eth_getBlockByNumber/get-finalized$
+              - eth_getBlockByNumber/get-latest$
+              - eth_getBlockByNumber/get-safe$
+              - eth_getBlockByNumber/get-block-notfound$
+              - eth_getBlockByNumber/get-block-n$
+              - eth_getBlockReceipts/get-block-receipts-0$
+              - eth_getBlockReceipts/get-block-receipts-earliest$
+              - eth_getBlockReceipts/get-block-receipts-empty$
+              - eth_getBlockReceipts/get-block-receipts-latest$
+              - eth_getBlockReceipts/get-block-receipts-future$
+              - eth_getBlockReceipts/get-block-receipts-n$
+              - eth_getBlockReceipts/get-block-receipts-not-found$
+              - eth_getBlockTransactionCountByNumber/get-block-n$
+              - eth_getBlockTransactionCountByNumber/get-genesis$
+              - eth_getCode/get-code$
+              - eth_getStorage/get-storage$
+              - eth_getTransactionByBlockNumberAndIndex/get-block-n$
+              - eth_getTransactionByHash/get-access-list$
+              - eth_getTransactionByHash/get-dynamic-fee$
+              - eth_getTransactionByHash/get-empty-tx$
+              - eth_getTransactionByHash/get-legacy-create$
+              - eth_getTransactionByHash/get-legacy-input$
+              - eth_getTransactionByHash/get-legacy-tx$
+              - eth_getTransactionByHash/get-notfound-tx$
+              - eth_getTransactionReceipt/get-access-list$
+              - eth_getTransactionReceipt/get-dynamic-fee$
+              - eth_getTransactionReceipt/get-empty-tx$
+              - eth_getTransactionReceipt/get-legacy-receipt$
+              - eth_getTransactionReceipt/get-notfound-tx$
+              - eth_getTransactionReceipt/get-legacy-contract$
+              - eth_getTransactionReceipt/get-legacy-input$
+              - eth_sendRawTransaction/send-access-list-transaction$
+              - eth_sendRawTransaction/send-dynamic-fee-access-list-transaction$
+              - eth_sendRawTransaction/send-dynamic-fee-transaction$
+              - eth_sendRawTransaction/send-legacy-transaction$
+              - eth_getTransactionCount/get-account-nonce$
+              - eth_syncing/check-syncing$
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: artifacts
+          path: /tmp
+      - name: Load Docker image
+        run: |
+          docker load --input /tmp/kakarot_image.tar
+          docker image ls -a
+      - name: Move hive binary
+        run: |
+          mv /tmp/hive /usr/local/bin
+          chmod +x /usr/local/bin/hive
+      - name: Checkout hive tests
+        uses: actions/checkout@v4
+        with:
+          repository: kkrt-labs/hive
+          ref: master
+          path: hivetests
+      - name: Run ${{ matrix.sim }} simulator
+        run: |
+          cd hivetests
+          hive --sim "${{ matrix.sim }}$" --sim.limit "/${{join(matrix.include, '|')}}" --client kakarot
+      - name: Print logs
+        if: always()
+        run: |
+          cd hivetests
+          echo "Logs:"
+          cat workspace/logs/*.log
+          echo "Kakarot logs:"
+          cat workspace/logs/kakarot/*.log
+          echo "Details logs:"
+          cat workspace/logs/details/*.log
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -81,7 +81,8 @@ reth-rpc-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.
 reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false }
 reth-testing-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false, optional = true }
 reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false }
-reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false, optional = true }
+reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.7", default-features = false }
 revm-inspectors = "0.7.4"
 
 # Error
@@ -165,6 +166,7 @@ katana-primitives = { git = 'https://github.com/dojoengine/dojo', rev = "7ff6593
   "serde",
 ], optional = true }
 mockall = { version = "0.13.0", default-features = false, optional = true }
+clap = { version = "4.5.17", optional = true }
 
 
 starknet_api = { version = "0.13.0-rc.0", optional = true }
@@ -181,8 +183,6 @@ tempfile = "3.8"
 
 [features]
 testing = [
-  "reth-testing-utils",
-  "reth-rpc-types-compat",
   "alloy-json-abi",
   "alloy-primitives",
   "alloy-signer-local",
@@ -195,6 +195,7 @@ testing = [
   "mockall",
   "rand",
   "rayon",
+  "reth-testing-utils",
   "rstest",
   "serde_with",
   "strum",
@@ -208,6 +209,7 @@ testing = [
   "revm-primitives",
   "starknet-crypto",
 ]
+binaries = ["clap"]
 hive = []
 arbitrary = ["rand", "dep:arbitrary"]
 
@@ -217,8 +219,8 @@ required-features = ["testing"]
 
 [[bin]]
 name = "hive_genesis"
-required-features = ["testing"]
+required-features = ["testing", "binaries"]
 
 [[bin]]
 name = "hive_chain"
-required-features = ["testing"]
+required-features = ["testing", "binaries"]
diff --git a/docker/hive/Dockerfile b/docker/hive/Dockerfile
@@ -77,7 +77,18 @@ COPY . .
 # Similar to `make setup` but we remove the `make build-sol` step
 # which uses docker to build the experimental solidity contracts.
 # Using docker in docker is not supported in the current setup.
-RUN chmod +x ./scripts/extract_abi.sh \
+
+# Install asdf for multiple scarb versions
+RUN git clone --depth 1 https://github.com/asdf-vm/asdf.git "$HOME/.asdf" && \
+    echo ". $HOME/.asdf/asdf.sh" >> "$HOME/.bashrc" && \
+    echo ". $HOME/.asdf/asdf.sh" >> "$HOME/.profile"
+
+SHELL ["/bin/bash", "-c"]
+RUN source "$HOME/.asdf/asdf.sh" && asdf plugin add scarb && asdf install scarb 0.7.0  && asdf install scarb 2.6.5
+
+RUN --mount=type=cache,target=/root/.cache \
+    source "$HOME/.asdf/asdf.sh" \
+    && chmod +x ./scripts/extract_abi.sh \
     && git submodule update --init --recursive \
     && cd lib/kakarot && make setup && make build \
     && mv build/ssj/contracts_Cairo1Helpers.contract_class.json build/cairo1_helpers.json && rm -fr build/ssj && cd ../.. \
@@ -115,9 +126,9 @@ COPY --from=compiler /usr/src/compiler/.kakarot/artifacts /usr/src/rpc/.kakarot/
 RUN cargo build \
     --features hive --release --target-dir /usr/src/rpc/target && \
     cargo build \
-    --bin hive_genesis --release --features testing --target-dir /usr/src/rpc/target && \
+    --bin hive_genesis --release --features "testing,binaries" --target-dir /usr/src/rpc/target && \
     cargo build \
-    --bin hive_chain --release --features testing --target-dir /usr/src/rpc/target
+    --bin hive_chain --release --features "testing,binaries" --target-dir /usr/src/rpc/target
 
 FROM ubuntu:24.10 as base
 # Install any necessary dependencies