From aabce099ed517a7966522e2803e142a06445b8cc Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 14:03:18 +0100
Subject: [PATCH 01/37] fix encoding boolean

---
 libs/remix-lib/src/execution/txHelper.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-lib/src/execution/txHelper.ts b/libs/remix-lib/src/execution/txHelper.ts
index f3c78930b1..18074bfa27 100644
--- a/libs/remix-lib/src/execution/txHelper.ts
+++ b/libs/remix-lib/src/execution/txHelper.ts
@@ -14,10 +14,10 @@ export function encodeParams (funABI, args) {
   if (funABI.inputs && funABI.inputs.length) {
     for (let i = 0; i < funABI.inputs.length; i++) {
       const type = funABI.inputs[i].type
-      // "false" will be converting to `false` and "true" will be working
-      // fine as abiCoder assume anything in quotes as `true`
-      if (type === 'bool' && args[i] === 'false') {
-        args[i] = false
+      if (type === 'bool') {
+        if (args[i] === false || args[i] === 'false' || args[i] === '0' || args[i] === 0) args[i] = false
+        else if (args[i] === true || args[i] === 'true' || args[i] === '1' || args[i] === 1) args[i] = true   
+        else throw new Error(`provided value for boolean is invalid: ${args[i]}`)    
       }
       types.push(type.indexOf('tuple') === 0 ? makeFullTypeDefinition(funABI.inputs[i]) : type)
       if (args.length < types.length) {

From 3d5aa369dfcbfd3f686bf57cc841c42cfa49c44f Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 7 Nov 2023 12:15:01 +0100
Subject: [PATCH 02/37] language btn style changes

---
 .../home-tab/src/lib/components/homeTablangOptions.tsx    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
index 9dfaa7f44e..dd8b1153af 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
@@ -26,14 +26,14 @@ export function LanguageOptions({ plugin }: { plugin: any }) {
 
   return (
     <>
-      <div className={langOptions !== 'fr' ? `d-flex align-items-center justify-content-end mr-2` : `d-flex align-items-center justify-content-end mr-3`}>
+      <div style={{position: 'absolute', right: "1rem", paddingTop: "0.4rem"}}>
         <Dropdown>
-          <Dropdown.Toggle title={langOptions} id="languagedropdown" size="sm">
+          <Dropdown.Toggle title={langOptions} id="languagedropdown" size="sm" style={{backgroundColor: 'var(--secondary)'}}>
             {langOptions}
           </Dropdown.Toggle>
-          <Dropdown.Menu className="dropdown-menu langSelector" style={{ minWidth: '2rem', backgroundColor: 'var(--body-bg)'}}>
+          <Dropdown.Menu className="dropdown-menu langSelector" style={{ paddingTop: "0px", paddingBottom: "0px", minWidth: 'fit-content', backgroundColor: 'var(--body-bg)'}}>
             {['EN', 'ES', 'FR', 'IT', 'ZH'].map((lang, index) => (
-              <DropdownItem as={'span'} className="p-2" onClick={() =>
+              <DropdownItem as={'span'} className={langOptions === lang ? "border border-primary px-2" : "px-2"} onClick={() =>
               {
                 changeLanguage(lang.toLowerCase())
                 setLangOptions(lang)

From 677bbfb742663222a4f831fbae6fc73554e41a6f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 3 Nov 2023 16:49:27 +0100
Subject: [PATCH 03/37] add more type for safety

---
 .../src/app/providers/abstract-provider.tsx         | 13 +++++++++----
 .../src/app/providers/injected-provider.tsx         |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/remix-ide/src/app/providers/abstract-provider.tsx b/apps/remix-ide/src/app/providers/abstract-provider.tsx
index a5185b6129..ea4cc5e281 100644
--- a/apps/remix-ide/src/app/providers/abstract-provider.tsx
+++ b/apps/remix-ide/src/app/providers/abstract-provider.tsx
@@ -14,11 +14,15 @@ export type JsonDataResult = {
   id: number
   jsonrpc: string // version
   result?: any
-  error?: any
+  error?: {
+    code: number,
+    message: string
+    data?: string
+  }
   errorData?: any
 }
 
-export type RejectRequest = (error: Error) => void
+export type RejectRequest = (error: JsonDataResult) => void
 export type SuccessRequest = (data: JsonDataResult) => void
 
 export interface IProvider {
@@ -98,7 +102,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
   sendAsync(data: JsonDataRequest): Promise<JsonDataResult> {
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
-      if (!this.provider) return reject(new Error('provider node set'))
+      if (!this.provider) return reject({jsonrpc: '2.0', id: data.id, error: { message: 'provider node set', code: -32603 } } as JsonDataResult)
       this.sendAsyncInternal(data, resolve, reject)
     })
   }
@@ -128,7 +132,8 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
         if (error && error.message && error.message.includes('net_version') && error.message.includes('SERVER_ERROR')) {
           this.switchAway(true)
         }
-        reject(error)
+        error.code = -32603
+        reject({jsonrpc: '2.0', error, id: data.id})
       }
     } else {
       const result = data.method === 'net_listening' ? 'canceled' : []
diff --git a/apps/remix-ide/src/app/providers/injected-provider.tsx b/apps/remix-ide/src/app/providers/injected-provider.tsx
index a4273e0f31..36c7e35774 100644
--- a/apps/remix-ide/src/app/providers/injected-provider.tsx
+++ b/apps/remix-ide/src/app/providers/injected-provider.tsx
@@ -80,7 +80,7 @@ export abstract class InjectedProvider extends Plugin implements IProvider {
       this.call('notification', 'toast', 'No injected provider (e.g Metamask) has been found.')
       return resolve({
         jsonrpc: '2.0',
-        error: 'no injected provider found',
+        error: { message: 'no injected provider found', code: -32603 },
         id: data.id
       })
     }
@@ -89,7 +89,7 @@ export abstract class InjectedProvider extends Plugin implements IProvider {
       if (web3Provider.request) resultData = await web3Provider.request({method: data.method, params: data.params})
       else if (web3Provider.send) resultData = await web3Provider.send(data.method, data.params)
       else {
-        resolve({jsonrpc: '2.0', error: 'provider not valid', id: data.id})
+        resolve({jsonrpc: '2.0', error: { message: 'provider not valid', code: -32603 }, id: data.id})
         return
       }
       if (resultData) {
@@ -98,7 +98,7 @@ export abstract class InjectedProvider extends Plugin implements IProvider {
         }
         resolve({jsonrpc: '2.0', result: resultData, id: data.id})
       } else {
-        resolve({jsonrpc: '2.0', error: 'no return data provided', id: data.id})
+        resolve({jsonrpc: '2.0', result: null, id: data.id})
       }
     } catch (error) {
       if (error.data && error.data.originalError && error.data.originalError.data) {

From 1e9049d42f92fc06123d624e65140b672ceb62b2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Sat, 4 Nov 2023 21:48:16 +0100
Subject: [PATCH 04/37] fix wallet connect

---
 apps/remix-ide/src/blockchain/blockchain.tsx  | 18 +++++++---
 .../src/services/WalletConnectRemixClient.ts  | 33 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/blockchain.tsx b/apps/remix-ide/src/blockchain/blockchain.tsx
index fa210bb8fb..69e9035526 100644
--- a/apps/remix-ide/src/blockchain/blockchain.tsx
+++ b/apps/remix-ide/src/blockchain/blockchain.tsx
@@ -940,12 +940,20 @@ export class Blockchain extends Plugin {
 
       cb(null, txResult, address, returnValue)
     } catch (error) {
-      if (this.isInjectedWeb3()) {
-        const errorMessage = error.innerError ? error.innerError.message : error.message
-        const errorData = error.innerError ? error.innerError.data : error.data
+      const buildError = async (errorMessage, errorData) => {
         const compiledContracts = await this.call('compilerArtefacts', 'getAllContractDatas')
-        const injectedError = txExecution.checkError({ errorMessage, errorData }, compiledContracts)
-        cb(injectedError.message)
+        return txExecution.checkError({ errorMessage, errorData }, compiledContracts)
+      }
+      let errorMessage
+      let errorData
+      if (error.innerError) {
+        errorMessage = error.innerError.message
+        errorData = error.innerError.data
+        cb((await buildError(errorMessage, errorData)).message)
+      } else if (error.message || error.data) {
+        errorMessage = error.message
+        errorData = error.data     
+        cb((await buildError(errorMessage, errorData)).message)
       } else 
         cb(error)
     }
diff --git a/apps/walletconnect/src/services/WalletConnectRemixClient.ts b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
index 6f8b494d00..2332c48c9b 100644
--- a/apps/walletconnect/src/services/WalletConnectRemixClient.ts
+++ b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
@@ -106,25 +106,40 @@ export class WalletConnectRemixClient extends PluginClient {
 
         if (provider.isMetaMask) {
           return new Promise((resolve) => {
-            provider.sendAsync(data, (err, response) => {
-              if (err) {
-                console.error(err)
-                return resolve({jsonrpc: '2.0', result: [], id: data.id})
+            provider.sendAsync(data, (error, response) => {
+              if (error) {
+                if (error.data && error.data.originalError && error.data.originalError.data) {
+                  resolve({
+                    jsonrpc: '2.0',
+                    error: error.data.originalError,
+                    id: data.id
+                  })
+                } else if (error.data && error.data.message) {
+                  resolve({
+                    jsonrpc: '2.0',
+                    error: error.data && error.data,
+                    id: data.id
+                  })
+                } else {
+                  resolve({
+                    jsonrpc: '2.0',
+                    error,
+                    id: data.id
+                  })
+                }                
               }
               return resolve(response)
             })
           })
         } else {
           const message = await provider.request(data)
-
           return {jsonrpc: '2.0', result: message, id: data.id}
         }
       }
     } else {
-      console.error(
-        `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
-      )
-      return {jsonrpc: '2.0', result: [], id: data.id}
+      const err = `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
+      console.error(err)
+      return {jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id}
     }
   }
 

From 49ec740771a551df391f035efb4c349cc893797a Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 6 Nov 2023 10:16:03 +0100
Subject: [PATCH 05/37] return error from gasEstimate if EvmError

---
 apps/remix-ide/src/app/tabs/web3-provider.js     | 2 +-
 libs/remix-simulator/src/methods/transactions.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/web3-provider.js b/apps/remix-ide/src/app/tabs/web3-provider.js
index 1d4655667b..89b7528739 100644
--- a/apps/remix-ide/src/app/tabs/web3-provider.js
+++ b/apps/remix-ide/src/app/tabs/web3-provider.js
@@ -64,7 +64,7 @@ export class Web3ProviderModule extends Plugin {
             try {
               resultFn(null, await provider.sendAsync(payload))
             } catch (e) {
-              resultFn(e.message)
+              resultFn(e.error ? new Error(e.error) : new Error(e))
             }
           } else {
             reject(new Error('User denied permission'))
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index 25c751ed4d..bdf26bfbc3 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -159,6 +159,9 @@ export class Transactions {
     processTx(this.txRunnerInstance, payload, true, (error, value: VMexecutionResult) => {
       if (error) return cb(error)
       const result: RunTxResult = value.result
+      if (result.execResult && result.execResult.exceptionError && result.execResult.exceptionError.errorType === 'EvmError') {
+        return cb(result.execResult.exceptionError.error)
+      }
       if ((result as any).receipt?.status === '0x0' || (result as any).receipt?.status === 0) {
         try {
           const msg = `0x${result.execResult.returnValue.toString('hex') || '0'}`

From a9a9f0934d37d44ec446ed0ac187f349eb237344 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 6 Nov 2023 11:17:50 +0100
Subject: [PATCH 06/37] fix e2e test

---
 apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
index fc3253614d..2c99c0a6d9 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
@@ -132,7 +132,7 @@ module.exports = {
       .click('*[data-id="testTabCheckAllTests"]')
       .clickElementAtPosition('.singleTestLabel', 1)
       .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-      .waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'revert Deploy Failed', 120000)
+      .waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'contract deployment failed: revert', 120000)
   },
 
   'Should fail when parameters are passed to method in test contract #group3': function (browser: NightwatchBrowser) {

From 3028b9faf342c4e713c1fa8d1540e5d3c85070ad Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 6 Nov 2023 13:31:07 +0100
Subject: [PATCH 07/37] fix printing context values

---
 libs/remix-ui/terminal/src/lib/components/Context.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/components/Context.tsx b/libs/remix-ui/terminal/src/lib/components/Context.tsx
index 1f06c16e2e..12adc81886 100644
--- a/libs/remix-ui/terminal/src/lib/components/Context.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Context.tsx
@@ -47,7 +47,7 @@ const Context = ({opts, provider}: {opts; provider: string}) => {
       <div>
         <span>
           <span className="remix_ui_terminal_tx">
-            [block:{block} txIndex:{i}]
+            [block:{block.toString()} txIndex:{i.toString()}]
           </span>
           <div className="remix_ui_terminal_txItem">
             <span className="remix_ui_terminal_txItemTitle">from:</span> {from}
@@ -76,7 +76,7 @@ const Context = ({opts, provider}: {opts; provider: string}) => {
       <div>
         <span>
           <span className="remix_ui_terminal_tx">
-            [block:{block} txIndex:{i}]
+            [block:{block.toString()} txIndex:{i.toString()}]
           </span>
           <div className="remix_ui_terminal_txItem">
             <span className="remix_ui_terminal_txItemTitle">from:</span> {from}

From d4850df36256b8a00019014c3e0c287fe25c34d6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 10:29:56 +0100
Subject: [PATCH 08/37] add try/catch and increase polling interval

---
 .../src/services/WalletConnectRemixClient.ts         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/walletconnect/src/services/WalletConnectRemixClient.ts b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
index 2332c48c9b..bdbf84efcf 100644
--- a/apps/walletconnect/src/services/WalletConnectRemixClient.ts
+++ b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
@@ -59,7 +59,9 @@ export class WalletConnectRemixClient extends PluginClient {
       ]
       const {publicClient} = configureChains(this.chains, [
         w3mProvider({projectId: PROJECT_ID})
-      ])
+      ], {
+        pollingInterval: 5000
+      })
 
       this.wagmiConfig = createConfig({
         autoConnect: false,
@@ -132,8 +134,12 @@ export class WalletConnectRemixClient extends PluginClient {
             })
           })
         } else {
-          const message = await provider.request(data)
-          return {jsonrpc: '2.0', result: message, id: data.id}
+          try {
+            const message = await provider.request(data)
+            return {jsonrpc: '2.0', result: message, id: data.id}
+          } catch (e) {
+            return {jsonrpc: '2.0', error: { message: e.message, code: -32603 }, id: data.id}
+          }
         }
       }
     } else {

From b0e44b875987a2b63eae096f54d9343e29d46139 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 10:49:57 +0100
Subject: [PATCH 09/37] fix spamming the network

---
 .../walletconnect/src/services/WalletConnectRemixClient.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/walletconnect/src/services/WalletConnectRemixClient.ts b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
index bdbf84efcf..b28cf448f7 100644
--- a/apps/walletconnect/src/services/WalletConnectRemixClient.ts
+++ b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
@@ -24,6 +24,7 @@ export class WalletConnectRemixClient extends PluginClient {
   chains: Chain[]
   currentChain: number
   internalEvents: EventManager
+  connected: boolean
 
   constructor() {
     super()
@@ -76,13 +77,15 @@ export class WalletConnectRemixClient extends PluginClient {
 
   subscribeToEvents() {
     this.wagmiConfig.subscribe((event) => {
-      if (event.status === 'connected') {
+      if (event.status === 'connected' && !this.connected) {
+        this.connected = true
         this.emit('accountsChanged', [event.data.account])
         if (this.currentChain !== event.data.chain.id) {
           this.currentChain = event.data.chain.id
           this.emit('chainChanged', event.data.chain.id)
         }
-      } else if (event.status === 'disconnected') {
+      } else if (event.status === 'disconnected' && this.connected) {
+        this.connected = false
         this.emit('accountsChanged', [])
         this.emit('chainChanged', 0)
         this.currentChain = 0

From 8c9093603c6416ea7efb93ea4f37f8b91edf4076 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 12:56:20 +0100
Subject: [PATCH 10/37] fix event subscribing walletconnect

---
 .../src/services/WalletConnectRemixClient.ts       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/walletconnect/src/services/WalletConnectRemixClient.ts b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
index b28cf448f7..0a4ccc0046 100644
--- a/apps/walletconnect/src/services/WalletConnectRemixClient.ts
+++ b/apps/walletconnect/src/services/WalletConnectRemixClient.ts
@@ -24,7 +24,7 @@ export class WalletConnectRemixClient extends PluginClient {
   chains: Chain[]
   currentChain: number
   internalEvents: EventManager
-  connected: boolean
+  currentAcount: string
 
   constructor() {
     super()
@@ -77,16 +77,18 @@ export class WalletConnectRemixClient extends PluginClient {
 
   subscribeToEvents() {
     this.wagmiConfig.subscribe((event) => {
-      if (event.status === 'connected' && !this.connected) {
-        this.connected = true
-        this.emit('accountsChanged', [event.data.account])
+      if (event.status === 'connected') {
+        if (event.data.account !== this.currentAcount) {
+          this.currentAcount = event.data.account
+          this.emit('accountsChanged', [event.data.account])          
+        }
         if (this.currentChain !== event.data.chain.id) {
           this.currentChain = event.data.chain.id
           this.emit('chainChanged', event.data.chain.id)
         }
-      } else if (event.status === 'disconnected' && this.connected) {
-        this.connected = false
+      } else if (event.status === 'disconnected') {
         this.emit('accountsChanged', [])
+        this.currentAcount = ''
         this.emit('chainChanged', 0)
         this.currentChain = 0
       }

From 8d1e0c70cea41b4f616777fee2c570cac71dd1a0 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 13:14:11 +0100
Subject: [PATCH 11/37] contine polling if contract address not available

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index 0ddd2fdc3d..cd4a42ae38 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -175,16 +175,22 @@ export class TxRunnerWeb3 {
   }
 }
 
-async function tryTillReceiptAvailable (txhash, web3) {
+async function tryTillReceiptAvailable (txhash: string, web3: Web3) {
   try {
     const receipt = await web3.eth.getTransactionReceipt(txhash)
-    if (receipt) return receipt
+    if (receipt) {
+      if (!receipt.to && !receipt.contractAddress) {
+        // this is a contract creation and the receipt doesn't contain a contract address. we have to keep polling...
+        console.log('this is a contract creation and the receipt does nott contain a contract address. we have to keep polling...')
+      } else
+        return receipt
+    }
   } catch (e) {}
   await pause()
   return await tryTillReceiptAvailable(txhash, web3)
 }
 
-async function tryTillTxAvailable (txhash, web3) {
+async function tryTillTxAvailable (txhash: string, web3: Web3) {
   try {
     const tx = await web3.eth.getTransaction(txhash)
     if (tx && tx.blockHash) return tx

From d41b491f1b271bd74524c63a605ab5288b578823 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 19:39:47 +0530
Subject: [PATCH 12/37] publish libs

---
 libs/ghaction-helper/package.json    | 11 +++++------
 libs/remix-analyzer/package.json     | 10 +++++-----
 libs/remix-astwalker/package.json    |  8 ++++----
 libs/remix-debug/package.json        | 14 +++++++-------
 libs/remix-lib/package.json          |  6 +++---
 libs/remix-simulator/package.json    |  8 ++++----
 libs/remix-solidity/package.json     |  8 ++++----
 libs/remix-tests/package.json        | 12 ++++++------
 libs/remix-url-resolver/package.json |  4 ++--
 libs/remix-ws-templates/package.json |  6 +++---
 libs/remixd/package.json             |  2 +-
 11 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index 317bde707e..689c029e4b 100644
--- a/libs/ghaction-helper/package.json
+++ b/libs/ghaction-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Solidity Tests GitHub Action Helper",
   "main": "src/index.js",
   "scripts": {
@@ -19,18 +19,17 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "devDependencies": {
-    "@remix-project/remix-solidity": "^0.5.19",
+    "@remix-project/remix-solidity": "^0.5.20",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.33",
+    "@remix-project/remix-simulator": "^0.2.34",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220"
-}
-
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+}
\ No newline at end of file
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index c1934128e8..0631a05426 100644
--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.42",
+  "version": "0.5.43",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "scripts": {
     "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.63",
-    "@remix-project/remix-lib": "^0.5.40",
+    "@remix-project/remix-astwalker": "^0.0.64",
+    "@remix-project/remix-lib": "^0.5.41",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
     "ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
     "typescript": "^3.7.5"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220",
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "main": "./src/index.js"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index b0ed444540..9d856d9ef5 100644
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.40",
+    "@remix-project/remix-lib": "^0.5.41",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
@@ -53,6 +53,6 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220",
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index 4061d3349b..19a2820590 100644
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.33",
+  "version": "0.5.34",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.63",
-    "@remix-project/remix-lib": "^0.5.40",
-    "@remix-project/remix-simulator": "^0.2.33",
-    "@remix-project/remix-solidity": "^0.5.19",
+    "@remix-project/remix-astwalker": "^0.0.64",
+    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-simulator": "^0.2.34",
+    "@remix-project/remix-solidity": "^0.5.20",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "color-support": "^1.1.3",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220",
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 7e357fd524..6dfb82d812 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.40",
+  "version": "0.5.41",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -53,6 +53,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220",
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index 62a74be1e0..9763250259 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -22,7 +22,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.40",
+    "@remix-project/remix-lib": "^0.5.41",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -68,6 +68,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220",
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index bc2626e33b..b5bd63c2c4 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.40",
+    "@remix-project/remix-lib": "^0.5.41",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethers": "^5.4.2",
@@ -57,5 +57,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220"
-}
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+}
\ No newline at end of file
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index a33fc54f27..1b69bb4d0a 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.40",
-    "@remix-project/remix-simulator": "^0.2.33",
-    "@remix-project/remix-solidity": "^0.5.19",
+    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-simulator": "^0.2.34",
+    "@remix-project/remix-solidity": "^0.5.20",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -78,5 +78,5 @@
     "typescript": "^3.3.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220"
-}
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+}
\ No newline at end of file
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index a1d94cf587..277d1ecc9c 100644
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -40,5 +40,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220"
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index 6523ea1f7e..3d66d35cfe 100644
--- a/libs/remix-ws-templates/package.json
+++ b/libs/remix-ws-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-ws-templates",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Create a Remix IDE workspace using different templates",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -24,5 +24,5 @@
     "ethers": "^5.4.2",
     "web3": "^4.1.1"
   },
-  "gitHead": "b6db2a29c223e423c70f06b87d9b245e26f0b220"
-}
+  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+}
\ No newline at end of file
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index 97f6db5506..a0e5ca54fd 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.18",
+  "version": "0.6.19",
   "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
   "main": "index.js",
   "types": "./index.d.ts",

From fe72baed62602d5b2ca7dad60e6f1af09d46c0f4 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 19:58:59 +0530
Subject: [PATCH 13/37] fix deps

---
 libs/remix-lib/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 6dfb82d812..78b1d8e1b5 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -19,6 +19,7 @@
   "dependencies": {
     "@ethereumjs/util": "^8.0.5",
     "async": "^2.1.2",
+    "create-hash": "^1.2.0",
     "ethers": "^5.7.2",
     "ethjs-util": "^0.1.6",
     "events": "^3.0.0",
@@ -55,4 +56,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
   "types": "./src/index.d.ts"
-}
\ No newline at end of file
+}

From dea8bc945240881c4cf8708b76e220b406d208e7 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 20:02:04 +0530
Subject: [PATCH 14/37] re-release with dep

---
 libs/ghaction-helper/package.json    |  8 ++++----
 libs/remix-analyzer/package.json     |  8 ++++----
 libs/remix-astwalker/package.json    |  6 +++---
 libs/remix-debug/package.json        | 12 ++++++------
 libs/remix-lib/package.json          |  6 +++---
 libs/remix-simulator/package.json    |  6 +++---
 libs/remix-solidity/package.json     |  6 +++---
 libs/remix-tests/package.json        | 10 +++++-----
 libs/remix-url-resolver/package.json |  4 ++--
 libs/remix-ws-templates/package.json |  4 ++--
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index 689c029e4b..7e9e24c024 100644
--- a/libs/ghaction-helper/package.json
+++ b/libs/ghaction-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Solidity Tests GitHub Action Helper",
   "main": "src/index.js",
   "scripts": {
@@ -19,17 +19,17 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "devDependencies": {
-    "@remix-project/remix-solidity": "^0.5.20",
+    "@remix-project/remix-solidity": "^0.5.21",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.34",
+    "@remix-project/remix-simulator": "^0.2.35",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
 }
\ No newline at end of file
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index 0631a05426..60d4abc7a0 100644
--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.43",
+  "version": "0.5.44",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "scripts": {
     "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.64",
-    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-astwalker": "^0.0.65",
+    "@remix-project/remix-lib": "^0.5.42",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
     "ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
     "typescript": "^3.7.5"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "main": "./src/index.js"
 }
\ No newline at end of file
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index 9d856d9ef5..3b23f8d00e 100644
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-lib": "^0.5.42",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
@@ -53,6 +53,6 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index 19a2820590..4d766f7204 100644
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.34",
+  "version": "0.5.35",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.64",
-    "@remix-project/remix-lib": "^0.5.41",
-    "@remix-project/remix-simulator": "^0.2.34",
-    "@remix-project/remix-solidity": "^0.5.20",
+    "@remix-project/remix-astwalker": "^0.0.65",
+    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-simulator": "^0.2.35",
+    "@remix-project/remix-solidity": "^0.5.21",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "color-support": "^1.1.3",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 78b1d8e1b5..52022aa3eb 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.41",
+  "version": "0.5.42",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -54,6 +54,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index 9763250259..d495b5524a 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.34",
+  "version": "0.2.35",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -22,7 +22,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-lib": "^0.5.42",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -68,6 +68,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0",
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index b5bd63c2c4..4a55570635 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.20",
+  "version": "0.5.21",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.41",
+    "@remix-project/remix-lib": "^0.5.42",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethers": "^5.4.2",
@@ -57,5 +57,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
 }
\ No newline at end of file
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index 1b69bb4d0a..cfe3edc427 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.34",
+  "version": "0.2.35",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.41",
-    "@remix-project/remix-simulator": "^0.2.34",
-    "@remix-project/remix-solidity": "^0.5.20",
+    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-simulator": "^0.2.35",
+    "@remix-project/remix-solidity": "^0.5.21",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -78,5 +78,5 @@
     "typescript": "^3.3.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
 }
\ No newline at end of file
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index 277d1ecc9c..f112b4fa87 100644
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -40,5 +40,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index 3d66d35cfe..ec38695b07 100644
--- a/libs/remix-ws-templates/package.json
+++ b/libs/remix-ws-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-ws-templates",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Create a Remix IDE workspace using different templates",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -24,5 +24,5 @@
     "ethers": "^5.4.2",
     "web3": "^4.1.1"
   },
-  "gitHead": "8d1e0c70cea41b4f616777fee2c570cac71dd1a0"
+  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
 }
\ No newline at end of file

From 8e77a6aa72d9877e205da321edd6208d04228243 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 20:11:24 +0530
Subject: [PATCH 15/37] fix dep

---
 libs/remix-lib/package.json       | 3 ++-
 libs/remix-simulator/package.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 52022aa3eb..d8b0328a73 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -24,6 +24,7 @@
     "ethjs-util": "^0.1.6",
     "events": "^3.0.0",
     "from-exponential": "1.1.1",
+    "rlp": "^3.0.0",
     "solc": "^0.7.4",
     "string-similarity": "^4.0.4",
     "web3": "^4.1.1",
@@ -56,4 +57,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
-}
\ No newline at end of file
+}
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index d495b5524a..a566ec9a17 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -34,6 +34,7 @@
     "express": "^4.16.3",
     "express-ws": "^4.0.0",
     "merge": "^1.2.0",
+    "rlp": "^3.0.0",
     "string-similarity": "^4.0.4",
     "time-stamp": "^2.0.0",
     "web3": "^4.1.1",
@@ -70,4 +71,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
-}
\ No newline at end of file
+}

From d3d6f8926d0f4780d0caabfedc0ec1145d3ca095 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 20:22:38 +0530
Subject: [PATCH 16/37] fix build libs

---
 libs/remix-lib/package.json                      | 2 +-
 libs/remix-lib/src/hash.ts                       | 2 +-
 libs/remix-simulator/package.json                | 2 +-
 libs/remix-simulator/src/methods/transactions.ts | 2 +-
 libs/remix-simulator/src/vm-context.ts           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index d8b0328a73..e611abe43c 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -57,4 +57,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-lib/src/hash.ts b/libs/remix-lib/src/hash.ts
index 624154be99..47334c1ce6 100644
--- a/libs/remix-lib/src/hash.ts
+++ b/libs/remix-lib/src/hash.ts
@@ -158,7 +158,7 @@ export const ripemd160FromArray = function(a: number[], padded: boolean): Buffer
  * @param a The input data
  */
 export const rlphash = function(a: Input): Buffer {
-  return keccak(encode(a))
+  return keccak(Buffer.from(encode(a)))
 }
 
 /**
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index a566ec9a17..88fade749e 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -71,4 +71,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
   "types": "./src/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index bdf26bfbc3..bbec179438 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -158,7 +158,7 @@ export class Transactions {
     this.vmContext.web3().flagNextAsDoNotRecordEvmSteps()
     processTx(this.txRunnerInstance, payload, true, (error, value: VMexecutionResult) => {
       if (error) return cb(error)
-      const result: RunTxResult = value.result
+      const result: any = value.result
       if (result.execResult && result.execResult.exceptionError && result.execResult.exceptionError.errorType === 'EvmError') {
         return cb(result.execResult.exceptionError.error)
       }
diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
index 224dbb96e5..fa9df3ef37 100644
--- a/libs/remix-simulator/src/vm-context.ts
+++ b/libs/remix-simulator/src/vm-context.ts
@@ -74,7 +74,7 @@ class StateManagerCommonStorageDump extends DefaultStateManager {
             const value = decode(val.value)
             storage['0x' + val.key.toString('hex')] = {
               key: this.keyHashes[val.key.toString('hex')],
-              value: '0x' + value.toString('hex')
+              value: '0x' + value.toString()
             }
           })
           stream.on('end', () => {

From 2f6f7be485419d62cc2a6e54846e5a72a2a3066f Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 21:12:50 +0530
Subject: [PATCH 17/37] fix simulator test

---
 libs/remix-simulator/src/vm-context.ts | 4 ++--
 package.json                           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
index fa9df3ef37..09665db83d 100644
--- a/libs/remix-simulator/src/vm-context.ts
+++ b/libs/remix-simulator/src/vm-context.ts
@@ -71,10 +71,10 @@ class StateManagerCommonStorageDump extends DefaultStateManager {
           const stream = trie.createReadStream()
 
           stream.on('data', (val) => {
-            const value = decode(val.value)
+            const value: any = decode(val.value)
             storage['0x' + val.key.toString('hex')] = {
               key: this.keyHashes[val.key.toString('hex')],
-              value: '0x' + value.toString()
+              value: '0x' + value.toString('hex')
             }
           })
           stream.on('end', () => {
diff --git a/package.json b/package.json
index 4de15f70dc..a76c676963 100644
--- a/package.json
+++ b/package.json
@@ -155,6 +155,7 @@
     "commander": "^9.4.1",
     "core-js": "^3.6.5",
     "cors": "^2.8.5",
+    "create-hash": "^1.2.0",
     "deep-equal": "^1.0.1",
     "document-register-element": "1.13.1",
     "eslint-config-prettier": "^8.5.0",

From 4b08ac9f5659b32ca418f7894cfbb7cc0cd5ff04 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 21:58:12 +0530
Subject: [PATCH 18/37] add rlp dep

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index a76c676963..3e112ac628 100644
--- a/package.json
+++ b/package.json
@@ -201,6 +201,7 @@
     "react-tabs": "^3.2.2",
     "react-zoom-pan-pinch": "^3.0.2",
     "regenerator-runtime": "0.13.7",
+    "rlp": "^3.0.0",
     "remark-gfm": "^3.0.1",
     "rss-parser": "^3.12.0",
     "signale": "^1.4.0",

From 847d4ddd62acf1b7deb84f9fef5f11c13951deed Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 7 Nov 2023 22:01:08 +0530
Subject: [PATCH 19/37] release with deps

---
 libs/ghaction-helper/package.json    |  8 ++++----
 libs/remix-analyzer/package.json     |  8 ++++----
 libs/remix-astwalker/package.json    |  6 +++---
 libs/remix-debug/package.json        | 12 ++++++------
 libs/remix-lib/package.json          |  4 ++--
 libs/remix-simulator/package.json    |  6 +++---
 libs/remix-solidity/package.json     |  6 +++---
 libs/remix-tests/package.json        | 10 +++++-----
 libs/remix-url-resolver/package.json |  4 ++--
 libs/remix-ws-templates/package.json |  4 ++--
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index 7e9e24c024..f825171b3c 100644
--- a/libs/ghaction-helper/package.json
+++ b/libs/ghaction-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Solidity Tests GitHub Action Helper",
   "main": "src/index.js",
   "scripts": {
@@ -19,17 +19,17 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "devDependencies": {
-    "@remix-project/remix-solidity": "^0.5.21",
+    "@remix-project/remix-solidity": "^0.5.22",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.35",
+    "@remix-project/remix-simulator": "^0.2.36",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
 }
\ No newline at end of file
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index 60d4abc7a0..b6dead62cf 100644
--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.44",
+  "version": "0.5.45",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "scripts": {
     "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.65",
-    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-astwalker": "^0.0.66",
+    "@remix-project/remix-lib": "^0.5.43",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
     "ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
     "typescript": "^3.7.5"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
   "main": "./src/index.js"
 }
\ No newline at end of file
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index 3b23f8d00e..d83c595abb 100644
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-lib": "^0.5.43",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
@@ -53,6 +53,6 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index 4d766f7204..a55aa36b65 100644
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.35",
+  "version": "0.5.36",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.65",
-    "@remix-project/remix-lib": "^0.5.42",
-    "@remix-project/remix-simulator": "^0.2.35",
-    "@remix-project/remix-solidity": "^0.5.21",
+    "@remix-project/remix-astwalker": "^0.0.66",
+    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-simulator": "^0.2.36",
+    "@remix-project/remix-solidity": "^0.5.22",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "color-support": "^1.1.3",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index e611abe43c..21c6d9a646 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.42",
+  "version": "0.5.43",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -55,6 +55,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index 88fade749e..61e85c53e0 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -22,7 +22,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-lib": "^0.5.43",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20",
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index 4a55570635..8de07033de 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.21",
+  "version": "0.5.22",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.42",
+    "@remix-project/remix-lib": "^0.5.43",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethers": "^5.4.2",
@@ -57,5 +57,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
 }
\ No newline at end of file
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index cfe3edc427..cd76e6f5a7 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.42",
-    "@remix-project/remix-simulator": "^0.2.35",
-    "@remix-project/remix-solidity": "^0.5.21",
+    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-simulator": "^0.2.36",
+    "@remix-project/remix-solidity": "^0.5.22",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -78,5 +78,5 @@
     "typescript": "^3.3.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
 }
\ No newline at end of file
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index f112b4fa87..c21d81ac0f 100644
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -40,5 +40,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index ec38695b07..de4bc0c320 100644
--- a/libs/remix-ws-templates/package.json
+++ b/libs/remix-ws-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-ws-templates",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Create a Remix IDE workspace using different templates",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -24,5 +24,5 @@
     "ethers": "^5.4.2",
     "web3": "^4.1.1"
   },
-  "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20"
+  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
 }
\ No newline at end of file

From 93781b736f12c24ff54d42845cfe5fc8e219e943 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 21:27:40 +0100
Subject: [PATCH 20/37] fix using toBN

---
 libs/remix-ui/run-tab/src/lib/components/mainnet.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx b/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
index 06fc44ebd8..0b0dd30153 100644
--- a/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
@@ -26,8 +26,7 @@ export function MainnetPrompt(props: MainnetProps) {
 
   const onMaxFeeChange = (value: string) => {
     const maxFee = value
-    // @ts-ignore
-    if (toBN(props.network.lastBlock.baseFeePerGas).gt(toBN(toWei(maxFee, 'Gwei')))) {
+    if (toBigInt(props.network.lastBlock.baseFeePerGas) > toBigInt(toWei(maxFee, 'Gwei'))) {
       setTransactionFee(intl.formatMessage({id: 'udapp.transactionFeeText'}))
       props.updateGasPriceStatus(false)
       props.updateConfirmSettings(true)

From 266b0a220358cee6b90c3149df6dee566949d93f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Nov 2023 21:37:01 +0100
Subject: [PATCH 21/37] fix text

---
 libs/remix-ui/run-tab/src/lib/components/mainnet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx b/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
index 0b0dd30153..6020f568be 100644
--- a/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
@@ -27,7 +27,7 @@ export function MainnetPrompt(props: MainnetProps) {
   const onMaxFeeChange = (value: string) => {
     const maxFee = value
     if (toBigInt(props.network.lastBlock.baseFeePerGas) > toBigInt(toWei(maxFee, 'Gwei'))) {
-      setTransactionFee(intl.formatMessage({id: 'udapp.transactionFeeText'}))
+      setTransactionFee(intl.formatMessage({id: 'udapp.transactionFee'}))
       props.updateGasPriceStatus(false)
       props.updateConfirmSettings(true)
       return

From 3cde19b3b376e43eabe5d02fc7f2f32fc5b82294 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Wed, 8 Nov 2023 14:37:06 +0530
Subject: [PATCH 22/37] bump dev version to 0.38.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e112ac628..964974f5d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.37.0-dev",
+  "version": "0.38.0-dev",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "keywords": [

From 8e3a0c85905ab063c3cdd3dcbd9f06bb612f8c88 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 12:08:17 +0100
Subject: [PATCH 23/37] set checkRevertBeforeSending to false

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index cd4a42ae38..64526758ea 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -81,7 +81,7 @@ export class TxRunnerWeb3 {
       )
     } else {
       try {
-        const res = await this.getWeb3().eth.sendTransaction(tx)
+        const res = await this.getWeb3().eth.sendTransaction(tx, null, { checkRevertBeforeSending: false })
         cb(null, res.transactionHash)
       } catch (e)  {
         console.log(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `)

From fa88415dfbe16bf9136926b566e605aa6058053b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 12:08:58 +0100
Subject: [PATCH 24/37] setting the type on network that doesn't support type
 create bugs.

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index 64526758ea..914c40fa52 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -23,7 +23,7 @@ export class TxRunnerWeb3 {
       // this is to avoid the following issue: https://github.com/MetaMask/metamask-extension/issues/11824
       tx.type = '0x2'
     } else {
-      tx.type = '0x1'
+      // tx.type = '0x1'
     }
     if (txFee) {
       if (txFee.baseFeePerGas) {

From a8a10036d37ff9df575351d3703b954ecd954e50 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 13:17:46 +0100
Subject: [PATCH 25/37] set 0x0 as defaultTransactionType

---
 apps/remix-ide/src/blockchain/execution-context.js | 3 +++
 libs/ghaction-helper/src/methods.ts                | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js
index 97f8e09d65..7c33bb4f27 100644
--- a/apps/remix-ide/src/blockchain/execution-context.js
+++ b/apps/remix-ide/src/blockchain/execution-context.js
@@ -7,12 +7,14 @@ const _paq = window._paq = window._paq || []
 
 let web3
 
+const config  = { defaultTransactionType: '0x0' }
 if (typeof window !== 'undefined' && typeof window.ethereum !== 'undefined') {
   var injectedProvider = window.ethereum
   web3 = new Web3(injectedProvider)
 } else {
   web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'))
 }
+web3.eth.setConfig(config)
 
 /*
   trigger contextChanged, web3EndpointChanged
@@ -59,6 +61,7 @@ export class ExecutionContext {
   }
 
   setWeb3 (context, web3) {
+    web3.setConfig(config)
     this.customWeb3[context] = web3
   }
 
diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts
index b6558f4eb0..9bfa470033 100644
--- a/libs/ghaction-helper/src/methods.ts
+++ b/libs/ghaction-helper/src/methods.ts
@@ -11,12 +11,14 @@ const providerConfig = {
   blockNumber: global.blockNumber || null
 }
 
+const config  = { defaultTransactionType: '0x0' }
 global.remixProvider = new Provider(providerConfig)
 global.remixProvider.init()
 global.web3Provider = new ethers.providers.Web3Provider(global.remixProvider)
 global.provider = global.web3Provider
 global.ethereum = global.web3Provider
 global.web3 = new Web3(global.web3Provider)
+global.web3.eth.setConfig(config)
 
 const isFactoryOptions = (signerOrOptions: any) => {
   if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false

From 523d3fee5f32342c522a56ba04f9c11cfd4048c5 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 13:37:48 +0100
Subject: [PATCH 26/37] fix block number

---
 libs/remix-ui/terminal/src/lib/components/Table.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/components/Table.tsx b/libs/remix-ui/terminal/src/lib/components/Table.tsx
index 35dd5d47ea..25055662ee 100644
--- a/libs/remix-ui/terminal/src/lib/components/Table.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Table.tsx
@@ -75,8 +75,8 @@ const showTable = (opts, showTableHash) => {
               <FormattedMessage id="terminal.blockNumber" />
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableContractAddress${opts.hash}`} data-shared={`pair_${opts.hash}`}>
-              {opts.blockNumber}
-              <CopyToClipboard content={opts.blockNumber} />
+              {opts.blockNumber.toString()}
+              <CopyToClipboard content={opts.blockNumber.toString()} />
             </td>
           </tr>
         ) : null}

From 2167c2716ed291098cc7b75dba6b9bd3e629a250 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 1 Nov 2023 16:34:53 +0100
Subject: [PATCH 27/37] Test create semaphore template and test 2 compile
 options

---
 .../src/app/components/compileBtn.tsx         | 19 ++++---
 apps/remix-ide-e2e/src/tests/circom.test.ts   | 55 +++++++++++++++++++
 2 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 apps/remix-ide-e2e/src/tests/circom.test.ts

diff --git a/apps/circuit-compiler/src/app/components/compileBtn.tsx b/apps/circuit-compiler/src/app/components/compileBtn.tsx
index 30f0b2890c..50eb6e1f13 100644
--- a/apps/circuit-compiler/src/app/components/compileBtn.tsx
+++ b/apps/circuit-compiler/src/app/components/compileBtn.tsx
@@ -9,20 +9,21 @@ export function CompileBtn () {
 
   return (
     <CustomTooltip
-        placement="auto"
-        tooltipId="overlay-tooltip-compile"
-        tooltipText={
-          <div className="text-left">
-            <div>
-              <b>Ctrl+S</b> to compile {appState.filePath}
-            </div>
+      placement="auto"
+      tooltipId="overlay-tooltip-compile"
+      tooltipText={
+        <div className="text-left">
+          <div>
+            <b>Ctrl+S</b> to compile {appState.filePath}
           </div>
-        }
-      >
+        </div>
+      }
+    >
       <button
         className="btn btn-primary btn-block d-block w-100 text-break mb-1 mt-3"
         onClick={() => { compileCircuit(plugin, appState) }}
         disabled={(appState.filePath === "") || (appState.status === "compiling") || (appState.status === "generating")}
+        data-id="compile_circuit_btn"
       >
         <div className="d-flex align-items-center justify-content-center">
           <RenderIf condition={appState.status === 'compiling'}>
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
new file mode 100644
index 0000000000..4ff6f6f564
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -0,0 +1,55 @@
+'use strict'
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+module.exports = {
+  '@disabled': true,
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+
+  'Should create semaphore workspace template #group1 #group2': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacecreate"]')
+      .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
+      .click('select[id="wstemplate"]')
+      .click('select[id="wstemplate"] option[value=semaphore]')
+      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
+      .pause(100)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcircuits"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcircuits/semaphore.circom"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/run_setup.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtemplates"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtemplates/groth16_verifier.sol.ejs"]')
+  },
+  'Should compile a simple circuit using editor play button #group1': function (browser: NightwatchBrowser) {
+    browser
+      .click('[data-id="treeViewLitreeViewItemcircuits/simple.circom"]')
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .click('[data-id="play-editor"]')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+  },
+  'Should compile a simple circuit using compile button in circom plugin #group2': function (browser: NightwatchBrowser) {
+    browser
+      .click('[data-id="treeViewLitreeViewItemcircuits/simple.circom"]')
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementPresent('button[data-id="compile_circuit_btn"]', 60000)
+      .waitForElementVisible('button[data-id="compile_circuit_btn"]')
+      .click('button[data-id="compile_circuit_btn"]')
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .end()
+  }
+}

From 3303aac1df35566dbeb63a7a21be48aafb296d8d Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Thu, 2 Nov 2023 15:16:49 +0100
Subject: [PATCH 28/37] Enable compiling a circuit with ctrl + s

---
 .../src/app/components/r1csBtn.tsx            |  1 +
 .../src/app/components/witness.tsx            |  6 ++-
 .../src/app/components/witnessToggler.tsx     |  2 +-
 apps/remix-ide-e2e/src/tests/circom.test.ts   | 47 +++++++++++++++++--
 .../src/lib/api/compiler-api.ts               |  2 +
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/apps/circuit-compiler/src/app/components/r1csBtn.tsx b/apps/circuit-compiler/src/app/components/r1csBtn.tsx
index 324c61e28a..f2b9b2407f 100644
--- a/apps/circuit-compiler/src/app/components/r1csBtn.tsx
+++ b/apps/circuit-compiler/src/app/components/r1csBtn.tsx
@@ -12,6 +12,7 @@ export function R1CSBtn () {
       className="btn btn-secondary btn-block d-block w-100 text-break mb-1 mt-2"
       onClick={() => { generateR1cs(plugin, appState) }}
       disabled={(appState.filePath === "") || (appState.status === "compiling") || (appState.status === "generating") || (appState.status === "computing")}
+      data-id="generate_r1cs_btn"
     >
       <CustomTooltip
         placement="auto"
diff --git a/apps/circuit-compiler/src/app/components/witness.tsx b/apps/circuit-compiler/src/app/components/witness.tsx
index 587e8765d4..d4a28fc2fd 100644
--- a/apps/circuit-compiler/src/app/components/witness.tsx
+++ b/apps/circuit-compiler/src/app/components/witness.tsx
@@ -26,14 +26,16 @@ export function WitnessSection ({ plugin, signalInputs, status }: {plugin: Circo
                   <label className="circuit_inner_label form-check-label" htmlFor="circuitPrimeSelector">
                     <FormattedMessage id="circuit.signalInput" /> { input }
                   </label>
-                  <input className="form-control m-0 txinput" placeholder={input} name={input} onChange={handleSignalInput} />
+                  <input className="form-control m-0 txinput" placeholder={input} name={input} onChange={handleSignalInput} data-id={`circuit_input_${input}`} />
                 </div>
               ))
             }
             <button
               className="btn btn-sm btn-secondary"
               onClick={() => { computeWitness(plugin, status, witnessValues) }}
-              disabled={(status === "compiling") || (status === "generating") || (status === "computing")}>
+              disabled={(status === "compiling") || (status === "generating") || (status === "computing")}
+              data-id="compute_witness_btn"
+            >
               <RenderIf condition={status === 'computing'}>
                 <i className="fas fa-sync fa-spin mr-2" aria-hidden="true"></i>
               </RenderIf>
diff --git a/apps/circuit-compiler/src/app/components/witnessToggler.tsx b/apps/circuit-compiler/src/app/components/witnessToggler.tsx
index 3910b01c1b..60027c2ebe 100644
--- a/apps/circuit-compiler/src/app/components/witnessToggler.tsx
+++ b/apps/circuit-compiler/src/app/components/witnessToggler.tsx
@@ -11,7 +11,7 @@ export function WitnessToggler ({ children }: { children: JSX.Element }) {
 
   return (
     <div>
-      <div className="d-flex circuit_config_section justify-content-between" onClick={toggleConfigurations}>
+      <div className="d-flex circuit_config_section justify-content-between" onClick={toggleConfigurations} data-id="witness_toggler">
         <div className="d-flex">
           <label className="mt-1 circuit_config_section">
             <FormattedMessage id="circuit.computeWitness" />
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 4ff6f6f564..fcbed671c2 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -8,7 +8,7 @@ module.exports = {
     init(browser, done)
   },
 
-  'Should create semaphore workspace template #group1 #group2': function (browser: NightwatchBrowser) {
+  'Should create semaphore workspace template #group1 #group2 #group3': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
       .click('*[data-id="workspacesMenuDropdown"]')
@@ -36,6 +36,23 @@ module.exports = {
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
   },
+  'Should compute a witness for a simple circuit #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementVisible('[data-id="witness_toggler"]')
+      .click('[data-id="witness_toggler"]')
+      .waitForElementVisible('[data-id="compute_witness_btn"]')
+      .waitForElementVisible('[data-id="circuit_input_a"]')
+      .waitForElementVisible('[data-id="circuit_input_b"]')
+      .setValue('[data-id="circuit_input_a"]', '1')
+      .setValue('[data-id="circuit_input_b"]', '2')
+      .click('[data-id="compute_witness_btn"]')
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wtn"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wtn"]')
+  },
   'Should compile a simple circuit using compile button in circom plugin #group2': function (browser: NightwatchBrowser) {
     browser
       .click('[data-id="treeViewLitreeViewItemcircuits/simple.circom"]')
@@ -43,13 +60,37 @@ module.exports = {
       .waitForElementVisible('[data-path="Semaphore - 1/circuits/simple.circom"]')
       .clickLaunchIcon('circuit-compiler')
       .frame(0)
-      .waitForElementPresent('button[data-id="compile_circuit_btn"]', 60000)
+      .waitForElementPresent('button[data-id="compile_circuit_btn"]')
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
       .click('button[data-id="compile_circuit_btn"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
-      .end()
+  },
+  'Should generate R1CS for a simple circuit #group2': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementPresent('button[data-id="generate_r1cs_btn"]')
+      .waitForElementVisible('button[data-id="generate_r1cs_btn"]')
+      .click('button[data-id="generate_r1cs_btn"]')
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.r1cs"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.r1cs"]')
+  },
+  'Should compile a simple circuit using CTRL + S from the editor #group3': function (browser: NightwatchBrowser) {
+    browser
+      .click('[data-id="treeViewLitreeViewItemcircuits/simple.circom"]')
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .perform(function () {
+        const actions = this.actions({async: true})
+
+        return actions.keyDown(this.Keys.CONTROL).sendKeys('s')
+      })
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
   }
 }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts
index e27cc7aa55..e20134f331 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts
@@ -345,6 +345,8 @@ export const CompilerApiMixin = (Base) => class extends Base {
           if(await this.getAppParameter('hardhat-compilation')) this.compileTabLogic.runCompiler('hardhat')
           else if(await this.getAppParameter('truffle-compilation')) this.compileTabLogic.runCompiler('truffle')
           else this.compileTabLogic.runCompiler(undefined)
+        } else if (this.currentFile && this.currentFile.endsWith('.circom')) {
+          await this.call('circuit-compiler', 'compile', this.currentFile)
         }
       }
     }

From 9f68552f48014d8459c8bc94ec1478c48f7a797c Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Thu, 2 Nov 2023 16:14:15 +0100
Subject: [PATCH 29/37] Add tests for hide warnings and auto compile options

---
 .../src/app/components/feedback.tsx           |  6 +-
 .../src/app/components/options.tsx            |  4 +-
 apps/remix-ide-e2e/src/tests/circom.test.ts   | 90 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/apps/circuit-compiler/src/app/components/feedback.tsx b/apps/circuit-compiler/src/app/components/feedback.tsx
index 3d7a6b94f1..b4c9367699 100644
--- a/apps/circuit-compiler/src/app/components/feedback.tsx
+++ b/apps/circuit-compiler/src/app/components/feedback.tsx
@@ -21,7 +21,7 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
     <div>
       <div className="circuit_errors_box py-4">
         <RenderIf condition={ (typeof feedback === "string") && showException }>
-          <div className="circuit_feedback error alert alert-danger">
+          <div className="circuit_feedback error alert alert-danger" data-id="circuit_feedback">
             <span> { feedback } </span>
             <div className="close" data-id="renderer" onClick={handleCloseException}>
               <i className="fas fa-times"></i>
@@ -39,12 +39,12 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
               Array.isArray(feedback) && feedback.map((response, index) => (
                 <div key={index} onClick={() => handleOpenError(response)}>
                   <RenderIf condition={response.type === 'Error'}>
-                    <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-danger`}>
+                    <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-danger`} data-id="circuit_feedback">
                       <FeedbackAlert message={response.message} location={ response.labels[0] ? response.labels[0].message + ` ${filePathToId[response.labels[0].file_id]}:${response.labels[0].range.start}:${response.labels[0].range.end}` : null} />
                     </div>
                   </RenderIf>
                   <RenderIf condition={(response.type === 'Warning') && !hideWarnings}>
-                    <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-warning`}>
+                    <div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-warning`} data-id="circuit_feedback">
                       <FeedbackAlert message={response.message} location={null} />
                     </div>
                   </RenderIf>
diff --git a/apps/circuit-compiler/src/app/components/options.tsx b/apps/circuit-compiler/src/app/components/options.tsx
index 6275caba6d..adf083ae2f 100644
--- a/apps/circuit-compiler/src/app/components/options.tsx
+++ b/apps/circuit-compiler/src/app/components/options.tsx
@@ -14,7 +14,7 @@ export function CompileOptions ({autoCompile, hideWarnings, setCircuitAutoCompil
           checked={autoCompile}
           id="autoCompileCircuit"
         />
-        <label className="form-check-label custom-control-label" htmlFor="autoCompileCircuit">
+        <label className="form-check-label custom-control-label" htmlFor="autoCompileCircuit" data-id="auto_compile_circuit_checkbox_input">
           <FormattedMessage id="circuit.autoCompile" />
         </label>
       </div>
@@ -27,7 +27,7 @@ export function CompileOptions ({autoCompile, hideWarnings, setCircuitAutoCompil
           title="Hide warnings"
           checked={hideWarnings}
         />
-        <label className="form-check-label custom-control-label" htmlFor="hideCircuitWarnings">
+        <label className="form-check-label custom-control-label" htmlFor="hideCircuitWarnings" data-id="hide_circuit_warnings_checkbox_input">
           <FormattedMessage id="solidity.hideWarnings" />
         </label>
       </div>
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index fcbed671c2..2e91aaee0a 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -8,7 +8,7 @@ module.exports = {
     init(browser, done)
   },
 
-  'Should create semaphore workspace template #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+  'Should create semaphore workspace template #group1 #group2 #group3 #group4': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
       .click('*[data-id="workspacesMenuDropdown"]')
@@ -92,5 +92,93 @@ module.exports = {
       })
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
+  },
+  'Should display warnings for compiled circuit without pragma version #group4': function (browser: NightwatchBrowser) {
+    browser
+      .addFile('circuits/warning.circom', { content: warningCircuit })
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/warning.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/warning.circom"]')
+      .click('[data-id="treeViewLitreeViewItemcircuits/warning.circom"]')
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementPresent('button[data-id="compile_circuit_btn"]')
+      .waitForElementVisible('button[data-id="compile_circuit_btn"]')
+      .click('button[data-id="compile_circuit_btn"]')
+      .waitForElementPresent('[data-id="circuit_feedback"]')
+      .assert.hasClass('[data-id="circuit_feedback"]', 'alert-warning')
+      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
+  },
+  'Should hide/show warnings for compiled circuit #group4': function (browser: NightwatchBrowser) {
+    browser
+      .click('[data-id="hide_circuit_warnings_checkbox_input"]')
+      .waitForElementNotPresent('[data-id="circuit_feedback"]')
+      .click('[data-id="hide_circuit_warnings_checkbox_input"]')
+      .waitForElementVisible('[data-id="circuit_feedback"]')
+      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
+  },
+  'Should display error for invalid circuit #group4': function (browser: NightwatchBrowser) {
+    browser
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .addFile('circuits/error.circom', { content: errorCircuit })
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/error.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/error.circom"]')
+      .click('[data-id="treeViewLitreeViewItemcircuits/error.circom"]')
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementPresent('button[data-id="compile_circuit_btn"]')
+      .waitForElementVisible('button[data-id="compile_circuit_btn"]')
+      .click('button[data-id="compile_circuit_btn"]')
+      .waitForElementPresent('[data-id="circuit_feedback"]')
+      .assert.hasClass('[data-id="circuit_feedback"]', 'alert-danger')
+      .waitForElementContainsText('[data-id="circuit_feedback"]', 'No main specified in the project structure')
+  },
+  'Should auto compile circuit #group4': function (browser: NightwatchBrowser) {
+    browser
+      .click('[data-id="auto_compile_circuit_checkbox_input"]')
+      .frameParent()
+      .setEditorValue(validCircuit, function () {
+        browser
+          .frame(0)
+          .waitForElementNotPresent('[data-id="circuit_feedback"]')
+          .frameParent()
+          .clickLaunchIcon('filePanel')
+          .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/error.wasm"]')
+      })
   }
 }
+
+const warningCircuit = `
+template Multiplier2() {
+  signal input a;
+  signal input b;
+  signal output c;
+  c <== a*b;
+}
+
+component main = Multiplier2();
+`
+
+const errorCircuit = `
+pragma circom 2.0.0;
+
+template Multiplier2() {
+    signal input a;
+    signal input b;
+    signal output c;
+    c <== a*b;
+ }
+`
+
+const validCircuit = `
+pragma circom 2.0.0;
+
+template Multiplier2() {
+    signal input a;
+    signal input b;
+    signal output c;
+    c <== a*b;
+ }
+
+ component main = Multiplier2();
+`

From 2b65b9083647628718c82d2a42d8ff5e7ce6e3f8 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 3 Nov 2023 10:57:19 +0100
Subject: [PATCH 30/37] Wait for warning visible

---
 apps/remix-ide-e2e/src/tests/circom.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 2e91aaee0a..61bbc4800d 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -105,6 +105,7 @@ module.exports = {
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
       .click('button[data-id="compile_circuit_btn"]')
       .waitForElementPresent('[data-id="circuit_feedback"]')
+      .waitForElementVisible('[data-id="circuit_feedback"]')
       .assert.hasClass('[data-id="circuit_feedback"]', 'alert-warning')
       .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
   },

From 81ffc0c34d92bcd760f4de4cf7d1aa095365050c Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 3 Nov 2023 11:07:38 +0100
Subject: [PATCH 31/37] Pause for comilation report in e2e

---
 apps/remix-ide-e2e/src/tests/circom.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 61bbc4800d..e748e2e48d 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -104,7 +104,7 @@ module.exports = {
       .waitForElementPresent('button[data-id="compile_circuit_btn"]')
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
       .click('button[data-id="compile_circuit_btn"]')
-      .waitForElementPresent('[data-id="circuit_feedback"]')
+      .pause(1000)
       .waitForElementVisible('[data-id="circuit_feedback"]')
       .assert.hasClass('[data-id="circuit_feedback"]', 'alert-warning')
       .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')

From eeb1183a777531a2e9ebbf8c38f0c90f5aaa6708 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 3 Nov 2023 11:27:58 +0100
Subject: [PATCH 32/37] Ensure circuit is compiled even with warnings

---
 apps/remix-ide-e2e/src/tests/circom.test.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index e748e2e48d..60e3cebcec 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -104,7 +104,13 @@ module.exports = {
       .waitForElementPresent('button[data-id="compile_circuit_btn"]')
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
       .click('button[data-id="compile_circuit_btn"]')
-      .pause(1000)
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/warning.wasm"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/warning.wasm"]')
+      .clickLaunchIcon('circuit-compiler')
+      .frame(0)
+      .waitForElementPresent('[data-id="circuit_feedback"]')
       .waitForElementVisible('[data-id="circuit_feedback"]')
       .assert.hasClass('[data-id="circuit_feedback"]', 'alert-warning')
       .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')

From f5a4405c0571d9ad18b2b66da956dcc64f3a1bf0 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 8 Nov 2023 13:50:21 +0100
Subject: [PATCH 33/37] separate condition

---
 apps/circuit-compiler/src/app/components/container.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/circuit-compiler/src/app/components/container.tsx b/apps/circuit-compiler/src/app/components/container.tsx
index 854ac3d611..51f583293c 100644
--- a/apps/circuit-compiler/src/app/components/container.tsx
+++ b/apps/circuit-compiler/src/app/components/container.tsx
@@ -70,7 +70,7 @@ export function Container () {
                 <WitnessSection plugin={circuitApp.plugin} signalInputs={circuitApp.appState.signalInputs} status={circuitApp.appState.status} />
               </WitnessToggler>
             </RenderIf>
-            <RenderIf condition={circuitApp.appState.status !== 'compiling' && circuitApp.appState.status !== 'computing' && circuitApp.appState.status !== 'generating'}>
+            <RenderIf condition={(circuitApp.appState.status !== 'compiling') && (circuitApp.appState.status !== 'computing') && (circuitApp.appState.status !== 'generating')}>
               <CompilerFeedback feedback={circuitApp.appState.feedback} filePathToId={circuitApp.appState.filePathToId} openErrorLocation={handleOpenErrorLocation} hideWarnings={circuitApp.appState.hideWarnings} />
             </RenderIf>
           </div>

From a715aa38d865f878fcbb5086db07b840a7c15359 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 8 Nov 2023 14:43:22 +0100
Subject: [PATCH 34/37] Fixed event emiiting and e2e

---
 .../src/app/services/circomPluginClient.ts    | 18 +++++----
 apps/remix-ide-e2e/src/tests/circom.test.ts   | 39 +++++++------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
index 8cf855d5ff..e97609fbac 100644
--- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts
+++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -32,7 +32,7 @@ export class CircomPluginClient extends PluginClient {
     this.internalEvents.emit('circom_activated')
   }
 
-  async parse(path: string, fileContent?: string): Promise<CompilerReport[]> {
+  async parse(path: string, fileContent?: string): Promise<[CompilerReport[], Record<string, string>]> {
     if (!fileContent) {
       // @ts-ignore
       fileContent = await this.call('fileManager', 'readFile', path)
@@ -45,7 +45,7 @@ export class CircomPluginClient extends PluginClient {
 
     try {
       const result: CompilerReport[] = JSON.parse(parsedOutput.report())
-      const mapReportFilePathToId = {}
+      const mapReportFilePathToId: Record<string, string> = {}
 
       if (result.length === 0) {
         // @ts-ignore
@@ -101,10 +101,8 @@ export class CircomPluginClient extends PluginClient {
           await this.call('editor', 'clearErrorMarkers', [path])
         }
       }
-      
-  
-      this.internalEvents.emit('circuit_parsing_done', result, mapReportFilePathToId)
-      return result
+
+      return [result, mapReportFilePathToId]
     } catch (e) {
       throw new Error(e)
     }
@@ -112,7 +110,7 @@ export class CircomPluginClient extends PluginClient {
 
   async compile(path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_compiling_start')
-    const parseErrors = await this.parse(path)
+    const [parseErrors, filePathToId] = await this.parse(path)
 
     if (parseErrors && (parseErrors.length > 0)) {
       if (parseErrors[0].type === 'Error') {
@@ -121,6 +119,8 @@ export class CircomPluginClient extends PluginClient {
       } else if (parseErrors[0].type === 'Warning') {
         this.internalEvents.emit('circuit_parsing_warning', parseErrors)
       }
+    } else {
+      this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
     }
     if (compilationConfig) {
       const { prime, version } = compilationConfig
@@ -160,7 +160,7 @@ export class CircomPluginClient extends PluginClient {
 
   async generateR1cs (path: string, compilationConfig?: CompilationConfig): Promise<void> {
     this.internalEvents.emit('circuit_generating_r1cs_start')
-    const parseErrors = await this.parse(path)
+    const [parseErrors, filePathToId] = await this.parse(path)
 
     if (parseErrors && (parseErrors.length > 0)) {
       if (parseErrors[0].type === 'Error') {
@@ -169,6 +169,8 @@ export class CircomPluginClient extends PluginClient {
       } else if (parseErrors[0].type === 'Warning') {
         this.internalEvents.emit('circuit_parsing_warning', parseErrors)
       }
+    } else {
+      this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)
     }
     if (compilationConfig) {
       const { prime, version } = compilationConfig
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
index 60e3cebcec..0cad3052f3 100644
--- a/apps/remix-ide-e2e/src/tests/circom.test.ts
+++ b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -95,25 +95,19 @@ module.exports = {
   },
   'Should display warnings for compiled circuit without pragma version #group4': function (browser: NightwatchBrowser) {
     browser
-      .addFile('circuits/warning.circom', { content: warningCircuit })
-      .waitForElementPresent('[data-path="Semaphore - 1/circuits/warning.circom"]')
-      .waitForElementVisible('[data-path="Semaphore - 1/circuits/warning.circom"]')
-      .click('[data-id="treeViewLitreeViewItemcircuits/warning.circom"]')
+      .click('[data-id="treeViewLitreeViewItemcircuits/simple.circom"]')
+      .waitForElementPresent('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .waitForElementVisible('[data-path="Semaphore - 1/circuits/simple.circom"]')
+      .setEditorValue(warningCircuit)
       .clickLaunchIcon('circuit-compiler')
       .frame(0)
       .waitForElementPresent('button[data-id="compile_circuit_btn"]')
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
       .click('button[data-id="compile_circuit_btn"]')
-      .frameParent()
-      .clickLaunchIcon('filePanel')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/warning.wasm"]')
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/warning.wasm"]')
-      .clickLaunchIcon('circuit-compiler')
-      .frame(0)
       .waitForElementPresent('[data-id="circuit_feedback"]')
       .waitForElementVisible('[data-id="circuit_feedback"]')
       .assert.hasClass('[data-id="circuit_feedback"]', 'alert-warning')
-      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
+      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/simple.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
   },
   'Should hide/show warnings for compiled circuit #group4': function (browser: NightwatchBrowser) {
     browser
@@ -121,17 +115,12 @@ module.exports = {
       .waitForElementNotPresent('[data-id="circuit_feedback"]')
       .click('[data-id="hide_circuit_warnings_checkbox_input"]')
       .waitForElementVisible('[data-id="circuit_feedback"]')
-      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/warning.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
+      .waitForElementContainsText('[data-id="circuit_feedback"]', 'File circuits/simple.circom does not include pragma version. Assuming pragma version (2, 1, 5)')
   },
   'Should display error for invalid circuit #group4': function (browser: NightwatchBrowser) {
     browser
       .frameParent()
-      .clickLaunchIcon('filePanel')
-      .addFile('circuits/error.circom', { content: errorCircuit })
-      .waitForElementPresent('[data-path="Semaphore - 1/circuits/error.circom"]')
-      .waitForElementVisible('[data-path="Semaphore - 1/circuits/error.circom"]')
-      .click('[data-id="treeViewLitreeViewItemcircuits/error.circom"]')
-      .clickLaunchIcon('circuit-compiler')
+      .setEditorValue(errorCircuit)
       .frame(0)
       .waitForElementPresent('button[data-id="compile_circuit_btn"]')
       .waitForElementVisible('button[data-id="compile_circuit_btn"]')
@@ -144,14 +133,12 @@ module.exports = {
     browser
       .click('[data-id="auto_compile_circuit_checkbox_input"]')
       .frameParent()
-      .setEditorValue(validCircuit, function () {
-        browser
-          .frame(0)
-          .waitForElementNotPresent('[data-id="circuit_feedback"]')
-          .frameParent()
-          .clickLaunchIcon('filePanel')
-          .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/error.wasm"]')
-      })
+      .setEditorValue(validCircuit)
+      .frame(0)
+      .waitForElementNotPresent('[data-id="circuit_feedback"]')
+      .frameParent()
+      .clickLaunchIcon('filePanel')
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple.wasm"]')
   }
 }
 

From 048791717d9f4a483336990c13f1ebfed8d256bd Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 15:08:18 +0100
Subject: [PATCH 35/37] fix fee calculation

---
 libs/remix-lib/src/execution/txRunnerWeb3.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index 914c40fa52..a7f1cce7ac 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -2,7 +2,7 @@
 import { EventManager } from '../eventManager'
 import type { Transaction as InternalTransaction } from './txRunner'
 import Web3 from 'web3'
-import {toBigInt} from 'web3-utils'
+import {toBigInt, toHex} from 'web3-utils'
 
 export class TxRunnerWeb3 {
   event
@@ -27,11 +27,11 @@ export class TxRunnerWeb3 {
     }
     if (txFee) {
       if (txFee.baseFeePerGas) {
-        tx.maxPriorityFeePerGas = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxPriorityFee, 'gwei'))
-        tx.maxFeePerGas = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxFee, 'gwei'))
+        tx.maxPriorityFeePerGas = toHex(BigInt(this.getWeb3().utils.toWei(txFee.maxPriorityFee, 'gwei')))
+        tx.maxFeePerGas = toHex(BigInt(this.getWeb3().utils.toWei(txFee.maxFee, 'gwei')))
         tx.type = '0x2'
       } else {
-        tx.gasPrice = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.gasPrice, 'gwei'))
+        tx.gasPrice = toHex(BigInt(this.getWeb3().utils.toWei(txFee.gasPrice, 'gwei')))
         tx.type = '0x1'
       }
     }

From d3385adac27a9166128b2bae309c39dc95144d96 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 15:41:43 +0100
Subject: [PATCH 36/37] use BigInt before toHex

---
 libs/remix-simulator/src/methods/transactions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index bbec179438..088ad3bf8f 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -268,7 +268,7 @@ export class Transactions {
         blockHash: '0x' + txBlock.hash().toString('hex'),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(receipt.gas),
+        gas: toHex(BigInt(receipt.gas)),
         chainId: '0xd05',
         // 'gasPrice': '2000000000000', // 0x123
         gasPrice: '0x4a817c800', // 20000000000
@@ -317,7 +317,7 @@ export class Transactions {
         blockHash: '0x' + txBlock.hash().toString('hex'),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(receipt.gas),
+        gas: toHex(BigInt(receipt.gas)),
         chainId: '0xd05',
         // 'gasPrice': '2000000000000', // 0x123
         gasPrice: '0x4a817c800', // 20000000000
@@ -362,7 +362,7 @@ export class Transactions {
         blockHash: '0x' + txBlock.hash().toString('hex'),
         blockNumber: bigIntToHex(txBlock.header.number),
         from: receipt.from,
-        gas: toHex(receipt.gas),
+        gas: toHex(BigInt(receipt.gas)),
         // 'gasPrice': '2000000000000', // 0x123
         chainId: '0xd05',
         gasPrice: '0x4a817c800', // 20000000000

From ad26f1dcebacaac2c05275108a743e632ba3186b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Nov 2023 16:25:38 +0100
Subject: [PATCH 37/37] fix logging calls

---
 libs/remix-ui/terminal/src/lib/components/Context.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/components/Context.tsx b/libs/remix-ui/terminal/src/lib/components/Context.tsx
index 12adc81886..197d022750 100644
--- a/libs/remix-ui/terminal/src/lib/components/Context.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Context.tsx
@@ -47,7 +47,7 @@ const Context = ({opts, provider}: {opts; provider: string}) => {
       <div>
         <span>
           <span className="remix_ui_terminal_tx">
-            [block:{block.toString()} txIndex:{i.toString()}]
+            [block:{block.toString()} txIndex:{i ? i.toString() : '-'}]
           </span>
           <div className="remix_ui_terminal_txItem">
             <span className="remix_ui_terminal_txItemTitle">from:</span> {from}
@@ -76,7 +76,7 @@ const Context = ({opts, provider}: {opts; provider: string}) => {
       <div>
         <span>
           <span className="remix_ui_terminal_tx">
-            [block:{block.toString()} txIndex:{i.toString()}]
+            [block:{block.toString()} txIndex:{i ? i.toString() : '-'}]
           </span>
           <div className="remix_ui_terminal_txItem">
             <span className="remix_ui_terminal_txItemTitle">from:</span> {from}