Merge pull request #96 from weaveVM/dev

merge: dev to main

Author: allnil

.github/workflows/gcp-docker.yml

@@ -75,11 +75,11 @@ jobs:
           push: false                  # Do not push in this step
           load: true                   # Load the image into Docker cache
           tags: |
-            wevm:local
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }}
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
-          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
-          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }},mode=max
+            wvm:local
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.get-tag.outputs.short_ref }}
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }}
+          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }}
+          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }},mode=max
 
       # 8. Test Docker Image Using Local Tag
       - name: Test Docker
@@ -100,12 +100,12 @@ jobs:
         with:
           push: true                   # Enable pushing
           tags: |
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }}
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
-          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
-          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }},mode=max
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.get-tag.outputs.short_ref }}
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }}
+          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }}
+          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wvm:${{ steps.tag.outputs.tag }},mode=max
 
       # 10. Clean Up Local Docker Tags (Optional)
       - name: Remove Local Tag
         if: always()                   # Run regardless of previous step outcomes
-        run: docker rmi wevm:local || true
+        run: docker rmi wvm:local || true

Dockerfile

@@ -34,7 +34,7 @@ RUN cargo chef cook --profile $BUILD_PROFILE --features "$FEATURES" --recipe-pat
 COPY . .
 RUN cd /app/wvm-apps/wvm-exexed
 WORKDIR /app/wvm-apps/wvm-exexed
-RUN cargo build --profile $BUILD_PROFILE --features "$FEATURES" --locked --bin reth
+RUN cargo build --profile $BUILD_PROFILE --features "$FEATURES" --bin reth
 
 # ARG is not resolved in COPY so we have to hack around it by copying the
 # binary to a temporary location

book/run/config.md

@@ -125,7 +125,7 @@ max_blocks = 500000
 # The maximum number of state changes to keep in memory before the execution stage commits.
 max_changes = 5000000
 # The maximum cumulative amount of gas to process before the execution stage commits.
-max_cumulative_gas = 15000000000000 # WVM: 300_000_000 * 50_000_000
+max_cumulative_gas = 25000000000000 # WVM: 500_000_000 * 50_000_000
 # The maximum time spent on blocks processing before the execution stage commits.
 max_duration = '10m'
 ```

crates/chainspec/src/constants.rs

@@ -2,8 +2,8 @@ use crate::spec::DepositContract;
 use alloy_primitives::{address, b256};
 
 /// Gas per transaction not creating a contract.
-/// WVM: Raised from 21k to 500_000k
-pub const MIN_TRANSACTION_GAS: u64 = 500_000u64;
+/// WVM: Raised from 21k to 500_000_000
+pub const MIN_TRANSACTION_GAS: u64 = 500_000_000u64;
 /// Deposit contract address: `0x00000000219ab540356cbb839cbe05303d7705fa`
 pub(crate) const MAINNET_DEPOSIT_CONTRACT: DepositContract = DepositContract::new(
     address!("00000000219ab540356cbb839cbe05303d7705fa"),

crates/ethereum/evm/src/lib.rs

@@ -74,7 +74,7 @@ impl ConfigureEvmEnv for EthEvmConfig {
             transact_to: TxKind::Call(contract),
             // Explicitly set nonce to None so revm does not do any nonce checks
             nonce: None,
-            // WVM: 300_000_000 gas limit
+            // WVM: 500_000_000 gas limit
             gas_limit: *ETHEREUM_BLOCK_GAS_LIMIT,
             value: U256::ZERO,
             data,

crates/primitives-traits/src/constants/mod.rs

@@ -47,13 +47,8 @@ pub const BEACON_NONCE: u64 = 0u64;
 /// See <https://github.com/paradigmxyz/reth/issues/3233>.
 /// WVM: we set 300kk gas limit
 pub const ETHEREUM_BLOCK_GAS_LIMIT: LazyCell<u64> = LazyCell::new(|| {
-    let env_gas_limit = std::env::var("ETHEREUM_BLOCK_GAS_LIMIT");
-    if let Ok(gas_limit) = env_gas_limit {
-        gas_limit.as_str().parse::<u64>().unwrap()
-    } else {
-        300_000_000
-    }
-}); // WVM: 300_000_000 gas limit
+    500_000_000
+}); // WVM: 500_000_000 gas limit
 
 /// The minimum tx fee below which the txpool will reject the transaction.
 ///
@@ -66,14 +61,19 @@ pub const ETHEREUM_BLOCK_GAS_LIMIT: LazyCell<u64> = LazyCell::new(|| {
 /// significant harm in leaving this setting as is.
 // pub const MIN_PROTOCOL_BASE_FEE: u64 = 7;
 
-pub static MIN_PROTOCOL_BASE_FEE: LazyLock<AtomicU64> = LazyLock::new(|| AtomicU64::new(7));
+// WVM: min base fee 7 => 500k
+pub static MIN_PROTOCOL_BASE_FEE: LazyLock<AtomicU64> = LazyLock::new(|| AtomicU64::new(500_000u64));
 
 pub(crate) static WVM_FEE_MANAGER: LazyLock<Arc<WvmFeeManager>> = LazyLock::new(|| {
     let fee = WvmFee::new(Some(Box::new(move |price| {
         let original_price = price as f64 / 1_000_000_000f64;
         let lowest_possible_gas_price_in_gwei =
             raw_calculate_lowest_possible_gas_price(original_price, *ETHEREUM_BLOCK_GAS_LIMIT);
-        let to_wei = lowest_possible_gas_price_in_gwei * 1e9;
+        let mut to_wei = lowest_possible_gas_price_in_gwei * 1e9;
+        // WVM: minimum fee check
+        if to_wei < 500_000f64 {
+            to_wei = 500_000f64;
+        }
         MIN_PROTOCOL_BASE_FEE.store(to_wei as u64, SeqCst);
         Ok(())
     })));