Merge pull request #75 from bitfinity-network/fix/estimate-gas-api

fix: estimate-gas-api

Author: Yasir

.github/workflows/build-test.yml

@@ -1,36 +1,36 @@
-name: "Build Test"
+name: 'Build Test'
 
 on:
   pull_request:
     branches: [main]
     paths-ignore:
-      - "**/README.md"
+      - '**/README.md'
   push:
     branches: [main]
     tags:
-      - "v*"
+      - 'v*'
     paths-ignore:
-      - "**/README.md"
+      - '**/README.md'
 
 jobs:
   build-test:
     if: ${{github.ref_type != 'tag'}}
-    name: "Build and Test"
+    name: 'Build and Test'
     uses: bitfinity-network/ci-wf/.github/workflows/build-n-test.yml@main
     with:
       runs-on: ubuntu-latest
-      container-image: ghcr.io/bitfinity-network/ic-dev-base:rust1.72-dfx0.15
-      git-fetch-depth: "0"
+      container-image: ghcr.io/bitfinity-network/ic-dev-base:rust1.73-dfx0.15
+      git-fetch-depth: '0'
       skip-test: false
       audit-allow-warnings: true
-      cargo-clippy-extra-args: "-- -D warnings"
+      cargo-clippy-extra-args: '-- -D warnings'
       enable-target-cache: true
       test-script: |
         export RUST_BACKTRACE="full"
         ./scripts/test.sh
         ./scripts/build.sh
         ./scripts/dfx_test.sh
-      
+
     secrets:
       gh_login: ${{ secrets.GH_PKG_LOGIN }}
       gh_token: ${{ secrets.GH_PKG_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
             os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             bin: register-evm-agent
-            
+
           - release_for: Windows-x86_64
             os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -55,7 +55,7 @@ jobs:
             os: macos-latest
             target: x86_64-apple-darwin
             bin: register-evm-agent
-          
+
           - release_for: MacOS-M1
             os: macos-latest
             target: aarch64-apple-darwin
@@ -72,14 +72,14 @@ jobs:
           target: ${{ matrix.platform.target }}
           command: build
           strip: true
-          args: "--release -p register_evm_agent"
+          args: '--release -p register_evm_agent'
 
       - name: Prepare artifact files
         run: |
           mkdir -p ./target/artifact
           mv target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }} ./target/artifact/${{ matrix.platform.bin }}
-      
-      - name: "Uploading artifact"
+
+      - name: 'Uploading artifact'
         uses: actions/upload-artifact@v3
         with:
           if-no-files-found: error
@@ -92,25 +92,25 @@ jobs:
     needs: [release-binaries]
     runs-on: ubuntu-latest
     steps:
-      - name: "Artifact Linux"
+      - name: 'Artifact Linux'
         uses: actions/download-artifact@v3
         with:
           name: Linux-x86_64
           path: ./linux
-          
-      - name: "Artifact MacOs"
+
+      - name: 'Artifact MacOs'
         uses: actions/download-artifact@v3
         with:
           name: MacOS-x86_64
           path: ./macos
 
-      - name: "Artifact MacOs M1"
+      - name: 'Artifact MacOs M1'
         uses: actions/download-artifact@v3
         with:
           name: MacOS-M1
           path: ./macos-m1
-      
-      - name: "Artifact Windows"
+
+      - name: 'Artifact Windows'
         uses: actions/download-artifact@v3
         with:
           name: Windows-x86_64

src/did/src/gas.rs

@@ -0,0 +1,40 @@
+use candid::CandidType;
+use serde::{Deserialize, Serialize};
+
+use crate::transaction::AccessList;
+use crate::{Bytes, H160, U256};
+
+#[derive(Debug, Clone, Default, Eq, PartialEq, Serialize, CandidType, Deserialize)]
+/// The `estimate_gas` method parameters
+pub struct EstimateGasRequest {
+    pub from: Option<H160>,
+    pub to: Option<H160>,
+    #[serde(rename = "gasPrice", default, skip_serializing_if = "Option::is_none")]
+    pub gas_price: Option<U256>,
+    /// EIP-1559 Max base fee the caller is willing to pay
+    #[serde(
+        rename = "maxFeePerGas",
+        default,
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub max_fee_per_gas: Option<U256>,
+    /// EIP-1559 Priority fee the caller is paying to the block author
+    #[serde(
+        rename = "maxPriorityFeePerGas",
+        default,
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub max_priority_fee_per_gas: Option<U256>,
+    pub gas: Option<U256>,
+    pub value: Option<U256>,
+    pub data: Option<Bytes>,
+    pub nonce: Option<U256>,
+    #[serde(rename = "chainId", default, skip_serializing_if = "Option::is_none")]
+    pub chain_id: Option<U256>,
+    #[serde(
+        rename = "accessList",
+        default,
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub access_list: Option<AccessList>,
+}

src/did/src/lib.rs

@@ -8,6 +8,7 @@ pub mod bytes;
 pub mod codec;
 pub mod constant;
 pub mod error;
+pub mod gas;
 pub mod hash;
 pub mod ic;
 pub mod integer;
@@ -24,6 +25,7 @@ pub use block::Block;
 use candid::{CandidType, Deserialize};
 pub use error::{ExitFatal, HaltError};
 pub use fees::FeeHistory;
+pub use gas::*;
 pub use hash::{H160, H256, H64};
 pub use integer::{U256, U64};
 pub use mint_order_exemption::MintOrderExemptionUserData;

src/evm-canister-client/src/client.rs

@@ -2,7 +2,8 @@ use candid::Principal;
 use did::block::{BlockResult, ExeResult};
 use did::error::Result;
 use did::{
-    BasicAccount, Block, BlockNumber, Bytes, Transaction, TransactionReceipt, H160, H256, U256,
+    BasicAccount, Block, BlockNumber, Bytes, EstimateGasRequest, Transaction, TransactionReceipt,
+    H160, H256, U256,
 };
 use ic_canister_client::{CanisterClient, CanisterClientResult};
 
@@ -329,29 +330,15 @@ impl<C: CanisterClient> EvmCanisterClient<C> {
     ///
     /// # Arguments
     ///
-    /// * `from` - The address of the caller
-    /// * `to` - The address of the contract to call
-    /// * `gas_limit` - The gas limit for the call
-    /// * `value` - The value to send to the contract
-    /// * `input` - The data to send to the contract
-    ///
+    /// * `request` - The request to estimate the gas for the call
     /// # Returns
     ///
     /// The estimated gas for the call
     pub async fn eth_estimate_gas(
         &self,
-        from: H160,
-        to: Option<H160>,
-        gas_limit: u64,
-        value: U256,
-        input: Bytes,
+        request: EstimateGasRequest,
     ) -> CanisterClientResult<EvmResult<U256>> {
-        self.client
-            .query(
-                "eth_estimate_gas",
-                (from, to, gas_limit, value, gas_limit, input),
-            )
-            .await
+        self.client.query("eth_estimate_gas", (request,)).await
     }
 
     /// Get the transaction count at a given block hash