From e97d28073a8b09eb3a109fb3324619f973cfa311 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 13 Sep 2024 16:45:35 +0200
Subject: [PATCH] fix ethers6

---
 libs/remix-simulator/src/methods/accounts.ts     |  5 +++++
 libs/remix-simulator/src/methods/transactions.ts | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/remix-simulator/src/methods/accounts.ts b/libs/remix-simulator/src/methods/accounts.ts
index 6c99565455..c28818c8e6 100644
--- a/libs/remix-simulator/src/methods/accounts.ts
+++ b/libs/remix-simulator/src/methods/accounts.ts
@@ -76,6 +76,7 @@ export class Web3Accounts {
 
   methods (): Record<string, unknown> {
     return {
+      eth_requestAccounts: this.eth_requestAccounts.bind(this),
       eth_accounts: this.eth_accounts.bind(this),
       eth_getBalance: this.eth_getBalance.bind(this),
       eth_sign: this.eth_sign.bind(this),
@@ -85,6 +86,10 @@ export class Web3Accounts {
     }
   }
 
+  eth_requestAccounts (_payload, cb) {
+    return cb(null, Object.keys(this.accounts))
+  }
+
   eth_accounts (_payload, cb) {
     return cb(null, Object.keys(this.accounts))
   }
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index 714852f693..d2bf5f6b2b 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -308,7 +308,6 @@ export class Transactions {
 
       const txBlock = this.vmContext.blockByTxHash[receipt.transactionHash]
       const tx = this.vmContext.txByHash[receipt.transactionHash]
-
       // TODO: params to add later
       const r: Record<string, unknown> = {
         blockHash: bytesToHex(txBlock.hash()),
@@ -322,11 +321,10 @@ export class Transactions {
         input: receipt.input,
         nonce: bigIntToHex(tx.nonce),
         transactionIndex: this.TX_INDEX,
-        value: bigIntToHex(tx.value)
-        // "value":"0xf3dbb76162000" // 4290000000000000
-        // "v": "0x25", // 37
-        // "r": "0x1b5e176d927f8e9ab405058b2d2457392da3e20f328b16ddabcebc33eaac5fea",
-        // "s": "0x4ba69724e8f69de52f0125ad8b3c5c2cef33019bac3249e2c0a2192766d1721c"
+        value: bigIntToHex(tx.value),
+        v: bigIntToHex(tx.v),
+        r: bigIntToHex(tx.r),
+        s: bigIntToHex(tx.s)
       }
 
       if (receipt.to) {