dev: cleaning (#1239)

* remove max fee from `to_starknet_transaction` * remove Error suffix * rename + add `EthereumBlockStore` * clean provider * fix tests * fix deno CI * update rust github action * update CI * update CI * comments + adjust hive test timings * fix naming to `block_hash_or_number`
kkrt-labs · Jun 26, 2024 · 80bbd9b · 80bbd9b
1 parent a451b94
commit 80bbd9b
Show file tree

Hide file tree

Showing 20 changed files with 311 additions and 269 deletions.
diff --git a/.github/workflows/deno_test.yml b/.github/workflows/deno_test.yml
@@ -0,0 +1,68 @@
+---
+name: deno test
+
+on:
+  workflow_call:
+
+jobs:
+  formatting:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: indexer
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+      - name: Run formatting
+        run: deno fmt --check indexer/
+
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+      # Checkout target branch and run tests
+      - name: Run Tests with Coverage on target branch
+        run: KAKAROT_ADDRESS=0x1 deno test --allow-env --coverage=cov_profile
+      - name: Generate Coverage Report on target branch
+        run: deno coverage cov_profile --html
+      - name: Install bc
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bc
+      - name: Extract coverage percentage from HTML for the target branch
+        run: |
+          cat cov_profile/html/index.html
+          coverage_percentage=$(grep -A 3 "<div class='fl pad1y space-right2'>" cov_profile/html/index.html | grep "<span class='strong'>" | awk -F'[<>]' '{gsub("%","",$3); print $3}')
+          echo $coverage_percentage > curr_coverage_percentage.txt
+      # Checkout base branch and run tests
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref }}
+          clean: false
+      - name: Run Tests with Coverage on base branch
+        run: KAKAROT_ADDRESS=0x1 deno test --allow-env --coverage=cov_profile_main
+      - name: Generate HTML report from for the base branch
+        run: deno coverage cov_profile_main --html
+      - name: Extract coverage percentage from HTML for the base branch
+        run: |
+          coverage_percentage_main=$(grep -A 3 "<div class='fl pad1y space-right2'>" cov_profile_main/html/index.html | grep "<span class='strong'>" | awk -F'[<>]' '{gsub("%","",$3); print $3}')
+          echo $coverage_percentage_main > coverage_percentage_main.txt
+      - name: Compare coverage percentage
+        run: |
+          previous_coverage=$(awk '{print $2}' coverage_percentage_main.txt)
+          echo "Previous coverage percentage was $previous_coverage%"
+          current_coverage=$(awk '{print $2}' curr_coverage_percentage.txt)
+          echo "Current coverage percentage is $current_coverage%"
+          change=$(echo "$previous_coverage - $current_coverage" | bc)
+          echo "Coverage change is $change%"
+          if (( $(echo "$change > 5.0" | bc -l) )); then
+            echo "Coverage dropped by more than 5%!"
+            exit 1
+          fi
diff --git a/.github/workflows/indexer_formatting.yml b/.github/workflows/indexer_formatting.yml
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -12,10 +12,10 @@ jobs:
     name: Spell check
     uses: ./.github/workflows/spell_check.yml
 
-  tests:
+  rust-tests:
     name: Rust tests
-    uses: ./.github/workflows/test.yml
+    uses: ./.github/workflows/rust_test.yml
 
-  indexer_formatting:
-    name: Deno formatting
-    uses: ./.github/workflows/indexer_formatting.yml
+  deno-tests:
+    name: Deno tests
+    uses: ./.github/workflows/deno_test.yml
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -14,6 +14,6 @@ jobs:
     name: Spell check
     uses: ./.github/workflows/spell_check.yml
 
-  indexer_formatting:
-    name: Deno formatting
-    uses: ./.github/workflows/indexer_formatting.yml
+  deno-tests:
+    name: Deno tests
+    uses: ./.github/workflows/deno_test.yml
diff --git a/.github/workflows/test.yml → .github/workflows/rust_test.yml b/.github/workflows/test.yml → .github/workflows/rust_test.yml
@@ -1,72 +1,19 @@
 ---
-name: test
+name: rust test
 
 on:
   workflow_call:
 
 jobs:
-  test-deno:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.x
-      # Checkout target branch and run tests
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - name: Run Tests with Coverage on target branch
-        run: KAKAROT_ADDRESS=0x1 deno test --allow-env --coverage=cov_profile
-      - name: Generate Coverage Report on target branch
-        run: deno coverage cov_profile --html
-      - name: Install bc
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y bc
-      - name: Extract coverage percentage from HTML for the target branch
-        run: |
-          cat cov_profile/html/index.html
-          coverage_percentage=$(grep -A 3 "<div class='fl pad1y space-right2'>" cov_profile/html/index.html | grep "<span class='strong'>" | awk -F'[<>]' '{gsub("%","",$3); print $3}')
-          echo $coverage_percentage > curr_coverage_percentage.txt
-      # Checkout base branch and run tests
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.base_ref }}
-          clean: false
-      - name: Run Tests with Coverage on base branch
-        run: KAKAROT_ADDRESS=0x1 deno test --allow-env --coverage=cov_profile_main
-      - name: Generate HTML report from for the base branch
-        run: deno coverage cov_profile_main --html
-      - name: Extract coverage percentage from HTML for the base branch
-        run: |
-          coverage_percentage_main=$(grep -A 3 "<div class='fl pad1y space-right2'>" cov_profile_main/html/index.html | grep "<span class='strong'>" | awk -F'[<>]' '{gsub("%","",$3); print $3}')
-          echo $coverage_percentage_main > coverage_percentage_main.txt
-      - name: Compare coverage percentage
-        run: |
-          previous_coverage=$(awk '{print $2}' coverage_percentage_main.txt)
-          echo "Previous coverage percentage was $previous_coverage%"
-          current_coverage=$(awk '{print $2}' curr_coverage_percentage.txt)
-          echo "Current coverage percentage is $current_coverage%"
-          change=$(echo "$previous_coverage - $current_coverage" | bc)
-          echo "Coverage change is $change%"
-          if (( $(echo "$change > 5.0" | bc -l) )); then
-            echo "Coverage dropped by more than 5%!"
-            exit 1
-          fi
-
-  test-rust:
+  test:
     runs-on: ubuntu-latest-16-cores
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - name: Setup rust env
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          components: llvm-tools-preview, rustfmt, clippy
-          override: true
+          components: rustfmt, clippy
           toolchain: 1.76.0
       - name: Retrieve cached dependencies
         uses: Swatinem/rust-cache@v2

diff --git a/docker/hive/Dockerfile b/docker/hive/Dockerfile
@@ -142,7 +142,7 @@ ENV ALLOW_NET=""
 ### Port 8545: https://github.com/ethereum/hive/blob/master/simulators/ethereum/rpc/helper.go#L50
 ENV KAKAROT_RPC_URL=0.0.0.0:8545
 ENV STARKNET_NETWORK=http://localhost:5050
-ENV RUST_LOG=kakarot_rpc=info
+ENV RUST_LOG=info
 ENV MAX_FELTS_IN_CALLDATA=30000
 ENV TRANSACTION_MAX_RETRIES=10
 ENV MAX_LOGS=10000

diff --git a/docker/hive/start.sh b/docker/hive/start.sh
@@ -47,14 +47,14 @@ echo "Launching mongo..."
 mongod --bind_ip 0.0.0.0 --noauth &
 ## DNA
 echo "Launching DNA..."
-starknet start --rpc=http://localhost:5050 --wait-for-rpc --head-refresh-interval-ms=500 --data=/data &
+starknet start --rpc=http://localhost:5050 --wait-for-rpc --head-refresh-interval-ms=300 --data=/data &
 # ## Indexer
 echo "Launching indexer..."
 sink-mongo run /usr/src/app/code/indexer/src/main.ts &
 
 ### 3.5. Await the Indexer to be healthy
 echo "Waiting for the indexer to start..."
-sleep 8
+sleep 9
 
 # 4. Start the Kakarot RPC service
 echo "Launching Kakarot RPC..."

diff --git a/src/bin/hive_chain.rs b/src/bin/hive_chain.rs
@@ -61,7 +61,7 @@ async fn main() -> eyre::Result<()> {
 
         for transaction in body.transactions {
             let signer = transaction.recover_signer().ok_or_eyre("failed to recover signer")?;
-            let starknet_tx = to_starknet_transaction(&transaction, signer, u64::MAX, 0)?;
+            let starknet_tx = to_starknet_transaction(&transaction, signer, 0)?;
 
             let nonce = match &starknet_tx {
                 BroadcastedInvokeTransaction::V1(starknet_tx) => starknet_tx.nonce,