From e4547f3ab392897570fe94ebf6c63714352d4478 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 14 Jun 2023 18:27:05 +0200
Subject: [PATCH] fix types

---
 libs/remix-simulator/src/vm-context.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
index 68544112e5..62122a61c9 100644
--- a/libs/remix-simulator/src/vm-context.ts
+++ b/libs/remix-simulator/src/vm-context.ts
@@ -90,7 +90,7 @@ class StateManagerCommonStorageDump extends DefaultStateManager {
 
 export interface CustomEthersStateManagerOpts {
   provider: string | ethers.providers.StaticJsonRpcProvider | ethers.providers.JsonRpcProvider
-  blockTag: bigint | 'earliest',
+  blockTag: string,
   /**
    * A {@link Trie} instance
    */
@@ -111,7 +111,7 @@ class CustomEthersStateManager extends StateManagerCommonStorageDump {
       throw new Error(`valid JsonRpcProvider or url required; got ${opts.provider}`)
     }
 
-    this.blockTag = opts.blockTag === 'earliest' ? opts.blockTag : bigIntToHex(opts.blockTag)
+    this.blockTag = opts.blockTag
 
     /*
      * For a custom StateManager implementation adopt these
@@ -152,7 +152,7 @@ class CustomEthersStateManager extends StateManagerCommonStorageDump {
   copy(): CustomEthersStateManager {
     const newState = new CustomEthersStateManager({
       provider: this.provider,
-      blockTag: BigInt(this.blockTag),
+      blockTag: this.blockTag,
       trie: this._trie.copy(false),
     })
     return newState
@@ -309,11 +309,17 @@ export class VMContext {
       if (this.blockNumber === 'latest') {
         const provider = new ethers.providers.StaticJsonRpcProvider(this.nodeUrl)
         block = await provider.getBlockNumber()
+        stateManager = new CustomEthersStateManager({
+          provider: this.nodeUrl,
+          blockTag: '0x' + block.toString(16)
+        })
+      } else {
+        stateManager = new CustomEthersStateManager({
+          provider: this.nodeUrl,
+          blockTag: '0x' + this.blockNumber.toString(16)
+        })
       }
-      stateManager = new CustomEthersStateManager({
-        provider: this.nodeUrl,
-        blockTag: BigInt(block)
-      })
+      
     } else
       stateManager = new StateManagerCommonStorageDump()