From 0878ebf6fc615fa29186738fb551b3a2b8604c46 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Thu, 19 Dec 2024 03:24:51 -0300
Subject: [PATCH 01/30] feat: new metamask rpc endpoints

---
 backend/database_handler/accounts_manager.py  |   4 +-
 .../transactions_processor.py                 |  52 +++++++-
 backend/protocol_rpc/endpoints.py             | 119 +++++++++++++++++-
 3 files changed, 171 insertions(+), 4 deletions(-)

diff --git a/backend/database_handler/accounts_manager.py b/backend/database_handler/accounts_manager.py
index 4b2838eac..9a08ea97a 100644
--- a/backend/database_handler/accounts_manager.py
+++ b/backend/database_handler/accounts_manager.py
@@ -1,7 +1,7 @@
 # consensus/services/transactions_db_service.py
 
 from eth_account import Account
-from eth_account._utils.validation import is_valid_address
+from eth_utils import is_address
 
 from .models import CurrentState
 from backend.database_handler.errors import AccountNotFoundError
@@ -38,7 +38,7 @@ def create_new_account_with_address(self, address: str):
         self.session.commit()
 
     def is_valid_address(self, address: str) -> bool:
-        return is_valid_address(address)
+        return is_address(address)
 
     def get_account(self, account_address: str) -> CurrentState | None:
         """Private method to retrieve an account from the data base"""
diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 75cec867e..d414baae8 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -4,7 +4,7 @@
 
 from .models import Transactions
 from sqlalchemy.orm import Session
-from sqlalchemy import or_, and_
+from sqlalchemy import or_, and_, desc
 
 from .models import TransactionStatus
 from eth_utils import to_bytes, keccak, is_address
@@ -356,3 +356,53 @@ def set_transaction_timestamp_accepted(
             transaction.timestamp_accepted = timestamp_accepted
         else:
             transaction.timestamp_accepted = int(time.time())
+
+
+    def get_highest_nonce(self) -> int:
+        transaction = (
+            self.session.query(Transactions)
+            .order_by(desc(Transactions.nonce))
+            .first()
+        )
+        if transaction is None:
+            return 0
+        return transaction.nonce
+
+
+    def get_transactions_for_block(self, block_number: int, include_full_tx: bool) -> dict:
+        transactions = (
+            self.session.query(Transactions)
+            .filter(Transactions.nonce == block_number)
+            .all()
+        )
+
+        if not transactions:
+            return None
+
+        block_hash = transactions[0].hash
+        parent_hash = "0x" + "0" * 64  # Placeholder for parent block hash
+        timestamp = transactions[0].timestamp_accepted or int(time.time())
+
+        if include_full_tx:
+            transaction_data = [
+                self._parse_transaction_data(tx) for tx in transactions
+            ]
+        else:
+            transaction_data = [tx.hash for tx in transactions]
+
+        block_details = {
+            "number": hex(block_number),
+            "hash": block_hash,
+            "parentHash": parent_hash,
+            "nonce": "0x" + "0" * 16,
+            "transactions": transaction_data,
+            "timestamp": hex(int(timestamp)),
+            "miner": "0x" + "0" * 40,
+            "difficulty": "0x1",
+            "gasUsed": "0x0",
+            "gasLimit": "0x0",
+            "size": "0x0",
+            "extraData": "0x",
+        }
+
+        return block_details
\ No newline at end of file
diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index b312d3abb..ba0f13c9e 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -52,6 +52,7 @@
 import base64
 
 
+
 ####### HELPER ENDPOINTS #######
 def ping() -> str:
     return "OK"
@@ -365,7 +366,7 @@ def get_balance(
 
 
 def get_transaction_count(
-    transactions_processor: TransactionsProcessor, address: str
+    transactions_processor: TransactionsProcessor, address: str, block: str
 ) -> int:
     return transactions_processor.get_transaction_count(address)
 
@@ -527,6 +528,102 @@ def set_transaction_appeal(
 def set_finality_window_time(consensus: ConsensusAlgorithm, time: int) -> None:
     consensus.set_finality_window_time(time)
 
+def get_chain_id() -> str:
+    return hex(61_999)
+
+def get_net_version() -> str:
+    return "61999"
+
+def get_block_number(transactions_processor: TransactionsProcessor) -> str:
+    transaction_count = transactions_processor.get_highest_nonce()
+    return hex(transaction_count)
+
+def get_block_by_number(
+        transactions_processor: TransactionsProcessor, block_number: str, full_tx: bool
+) -> dict | None:
+    try:
+        block_number_int = int(block_number, 16)
+    except ValueError:
+        raise JSONRPCError(f"Invalid block number format: {block_number}")
+
+    block_details = transactions_processor.get_transactions_for_block(
+        block_number_int, include_full_tx=full_tx
+    )
+
+    if not block_details:
+        raise JSONRPCError(f"Block not found for number: {block_number}")
+
+    return block_details
+
+
+def get_gas_price() -> str:
+    gas_price_in_wei = 20 * 10**9
+    return hex(gas_price_in_wei)
+
+def get_transaction_receipt(
+        transactions_processor: TransactionsProcessor,
+        transaction_hash: str,
+) -> dict | None:
+
+    transaction = transactions_processor.get_transaction_by_hash(transaction_hash)
+
+    if not transaction:
+        return None
+
+    receipt = {
+        "transactionHash": transaction_hash,
+        "transactionIndex": hex(0),
+        "blockHash": transaction_hash,
+        "blockNumber": hex(transaction.get("block_number", 0)),
+        "from": transaction.get("from_address"),
+        "to": transaction.get("to_address") if transaction.get("to_address") else None,
+        "cumulativeGasUsed": hex(transaction.get("gas_used", 21000)),
+        "gasUsed": hex(transaction.get("gas_used", 21000)),
+        "contractAddress": transaction.get("contract_address") if transaction.get("contract_address") else None,
+        "logs": transaction.get("logs", []),
+        "logsBloom": "0x" + "00" * 256,
+        "status": hex(1 if transaction.get("status", True) else 0),
+    }
+
+    return receipt
+
+def get_block_by_hash(
+        transactions_processor: TransactionsProcessor,
+        transaction_hash: str,
+        full_tx: bool = False,
+) -> dict | None:
+
+    transaction = transactions_processor.get_transaction_by_hash(transaction_hash)
+
+    if not transaction:
+        return None
+
+    block_details = {
+        "hash": transaction_hash,
+        "parentHash": "0x" + "00" * 32,
+        "number": hex(transaction.get("block_number", 0)),
+        "timestamp": hex(transaction.get("timestamp", 0)),
+        "nonce": "0x" + "00" * 8,
+        "transactionsRoot": "0x" + "00" * 32,
+        "stateRoot": "0x" + "00" * 32,
+        "receiptsRoot": "0x" + "00" * 32,
+        "miner": "0x" + "00" * 20,
+        "difficulty": "0x1",
+        "totalDifficulty": "0x1",
+        "size": "0x0",
+        "extraData": "0x",
+        "gasLimit": hex(transaction.get("gas_limit", 8000000)),
+        "gasUsed": hex(transaction.get("gas_used", 21000)),
+        "logsBloom": "0x" + "00" * 256,
+        "transactions": [],
+    }
+
+    if full_tx:
+        block_details["transactions"].append(transaction)
+    else:
+        block_details["transactions"].append(transaction_hash)
+
+    return block_details
 
 def register_all_rpc_endpoints(
     jsonrpc: JSONRPC,
@@ -655,3 +752,23 @@ def register_all_rpc_endpoints(
         partial(set_finality_window_time, consensus),
         method_name="sim_setFinalityWindowTime",
     )
+    register_rpc_endpoint(get_chain_id, method_name="eth_chainId")
+    register_rpc_endpoint(get_net_version, method_name="net_version")
+    register_rpc_endpoint(
+        partial(get_block_number, transactions_processor),
+        method_name="eth_blockNumber",
+    )
+    register_rpc_endpoint(
+        partial(get_block_by_number, transactions_processor),
+        method_name="eth_getBlockByNumber",
+    )
+    register_rpc_endpoint(get_gas_price, method_name="eth_gasPrice")
+    register_rpc_endpoint(
+        partial(get_transaction_receipt, transactions_processor),
+        method_name="eth_getTransactionReceipt",
+    )
+    register_rpc_endpoint(
+        partial(get_block_by_hash, transactions_processor),
+        method_name="eth_getBlockByHash",
+    )
+

From 52a01a258edefe18f9e77a731b58933b01913a87 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Fri, 20 Dec 2024 06:22:05 -0300
Subject: [PATCH 02/30] feat: adding wallet to frontend and improving backend

---
 .../transactions_processor.py                 |  4 +-
 backend/protocol_rpc/endpoints.py             |  5 +-
 .../components/Simulator/AccountSelect.vue    | 28 +++++++---
 .../Simulator/ContractMethodItem.vue          | 13 +----
 frontend/src/global.d.ts                      |  7 +++
 frontend/src/hooks/useGenlayer.ts             | 14 +++--
 frontend/src/stores/accounts.ts               | 56 +++++++++++++++----
 frontend/tsconfig.app.json                    |  2 +-
 8 files changed, 89 insertions(+), 40 deletions(-)
 create mode 100644 frontend/src/global.d.ts

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 186beee23..02db47f1f 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -368,10 +368,10 @@ def set_transaction_appeal_failed(self, transaction_hash: str, appeal_failed: in
         transaction.appeal_failed = appeal_failed
 
 
-    def get_highest_nonce(self) -> int:
+    def get_highest_timestamp(self) -> int:
         transaction = (
             self.session.query(Transactions)
-            .order_by(desc(Transactions.nonce))
+            .order_by(desc(Transactions.timestamp_accepted))
             .first()
         )
         if transaction is None:
diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index e9a133a78..c98be39c6 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -389,6 +389,9 @@ async def call(
     from_address = params["from"] if "from" in params else None
     data = params["data"]
 
+    if from_address is None:
+        return base64.b64encode(b'\x00' * 31 + b'\x01').decode("ascii")  # Example: Return '1' as a uint256
+
     if from_address and not accounts_manager.is_valid_address(from_address):
         raise InvalidAddressError(from_address)
 
@@ -536,7 +539,7 @@ def get_net_version() -> str:
     return "61999"
 
 def get_block_number(transactions_processor: TransactionsProcessor) -> str:
-    transaction_count = transactions_processor.get_highest_nonce()
+    transaction_count = transactions_processor.get_highest_timestamp()
     return hex(transaction_count)
 
 def get_block_by_number(
diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index 03cbc71c8..1f3a01404 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -27,6 +27,10 @@ const handleCreateNewAccount = async () => {
     });
   }
 };
+
+const connectMetaMask = async () => {
+  await store.fetchMetaMaskAccount();
+};
 </script>
 
 <template>
@@ -38,27 +42,33 @@ const handleCreateNewAccount = async () => {
 
     <template #popper>
       <div class="divide-y divide-gray-200 dark:divide-gray-800">
+        <AccountItem
+            v-if="store.walletAddress"
+            :account="{ address: store.walletAddress }"
+            :active="store.isWalletSelected"
+            :canDelete="false"
+            v-close-popper
+        />
         <AccountItem
           v-for="privateKey in store.privateKeys"
           :key="privateKey"
           :privateKey="privateKey"
           :account="createAccount(privateKey)"
-          :active="privateKey === store.currentPrivateKey"
+          :active="privateKey === store.currentPrivateKey && !store.isWalletSelected"
           :canDelete="true"
           v-close-popper
         />
       </div>
 
       <div
-        class="flex w-full border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
+          class="flex w-full border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
       >
-        <Btn
-          @click="handleCreateNewAccount"
-          secondary
-          class="w-full"
-          :icon="PlusIcon"
-          >New account</Btn
-        >
+        <Btn @click="handleCreateNewAccount" secondary class="w-full" :icon="PlusIcon">
+          New account
+        </Btn>
+        <Btn @click="connectMetaMask" secondary class="w-full">
+          Connect MetaMask
+        </Btn>
       </div>
     </template>
   </Dropdown>
diff --git a/frontend/src/components/Simulator/ContractMethodItem.vue b/frontend/src/components/Simulator/ContractMethodItem.vue
index 4e5511fc3..2b5767137 100644
--- a/frontend/src/components/Simulator/ContractMethodItem.vue
+++ b/frontend/src/components/Simulator/ContractMethodItem.vue
@@ -21,16 +21,15 @@ const props = defineProps<{
 
 const isExpanded = ref(false);
 const isCalling = ref(false);
-const responseMessage = ref('');
+const responseMessage = ref();
 
 const calldataArguments = ref<ArgData>({ args: [], kwargs: {} });
 
 const handleCallReadMethod = async () => {
-  responseMessage.value = '';
   isCalling.value = true;
 
   try {
-    const result = await callReadMethod(
+    responseMessage.value = await callReadMethod(
       props.name,
       unfoldArgsData({
         args: calldataArguments.value.args,
@@ -38,14 +37,6 @@ const handleCallReadMethod = async () => {
       }),
     );
 
-    let repr: string;
-    if (typeof result === 'string') {
-      const val = Uint8Array.from(atob(result), (c) => c.charCodeAt(0));
-      responseMessage.value = calldata.toString(calldata.decode(val));
-    } else {
-      responseMessage.value = '<unknown>';
-    }
-
     trackEvent('called_read_method', {
       contract_name: contract.value?.name || '',
       method_name: props.name,
diff --git a/frontend/src/global.d.ts b/frontend/src/global.d.ts
new file mode 100644
index 000000000..832846d5d
--- /dev/null
+++ b/frontend/src/global.d.ts
@@ -0,0 +1,7 @@
+// global.d.ts
+interface Window {
+    ethereum?: {
+        isMetaMask?: boolean;
+        request: (args: { method: string; params?: unknown[] }) => Promise<unknown>;
+    };
+}
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index e9812c104..c2ab8aac4 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -14,17 +14,21 @@ export function useGenlayer() {
   }
 
   watch(
-    () => accountsStore.currentUserAddress,
-    () => {
-      initClient();
-    },
+      [
+        () => accountsStore.currentUserAddress,
+        () => accountsStore.isWalletSelected,
+        () => accountsStore.walletAddress,
+      ],
+      () => {
+        initClient();
+      },
   );
 
   function initClient() {
     client = createClient({
       chain: simulator,
       endpoint: import.meta.env.VITE_JSON_RPC_SERVER_URL,
-      account: createAccount(accountsStore.currentPrivateKey || undefined),
+      accountOrAddress: accountsStore.isWalletSelected ? accountsStore.walletAddress : createAccount(accountsStore.currentPrivateKey || undefined),
     });
   }
 
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index ab4079ea5..cc3aa1d4d 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { Address } from '@/types';
 import { createAccount, generatePrivateKey } from 'genlayer-js';
 import type { Account } from 'genlayer-js/types';
@@ -9,20 +9,45 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   const key = localStorage.getItem('accountsStore.currentPrivateKey');
   const currentPrivateKey = ref<Address | null>(key ? (key as Address) : null);
   const currentUserAddress = computed(() =>
-    currentPrivateKey.value
-      ? createAccount(currentPrivateKey.value).address
-      : '',
+      currentPrivateKey.value
+          ? createAccount(currentPrivateKey.value).address
+          : '',
   );
   const { shorten } = useShortAddress();
 
   const privateKeys = ref<Address[]>(
-    localStorage.getItem('accountsStore.privateKeys')
-      ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-          ',',
-        ) as Address[])
-      : [],
+      localStorage.getItem('accountsStore.privateKeys')
+          ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
+              ',',
+          ) as Address[])
+          : [],
   );
 
+  const walletAddress = ref<Address | undefined>(undefined);
+  const isWalletSelected = ref<boolean>(false);
+
+  async function fetchMetaMaskAccount() {
+    if (window.ethereum) {
+      //@ts-ignore
+      const accounts = await window.ethereum.request({
+        method: 'eth_requestAccounts',
+      });
+
+      //@ts-ignore
+      walletAddress.value = accounts[0] || null;
+      //@ts-ignore
+      setCurrentAccount()
+    }
+  }
+
+  if (window.ethereum) {
+    //@ts-ignore
+    window.ethereum.on('accountsChanged', (accounts: string[]) => {
+      //@ts-ignore
+      walletAddress.value = accounts[0] || null;
+    });
+  }
+
   function generateNewAccount(): Address {
     const privateKey = generatePrivateKey();
     privateKeys.value = [...privateKeys.value, privateKey];
@@ -42,12 +67,18 @@ export const useAccountsStore = defineStore('accountsStore', () => {
     }
   }
 
-  function setCurrentAccount(privateKey: Address) {
-    currentPrivateKey.value = privateKey;
+  function setCurrentAccount(privateKey: Address | undefined) {
+    if( privateKey ) {
+      currentPrivateKey.value = privateKey
+    }
+    isWalletSelected.value = !privateKey;
   }
 
   const displayAddress = computed(() => {
     try {
+      if (walletAddress.value) {
+        return shorten(walletAddress.value);
+      }
       if (!currentPrivateKey.value) {
         return '';
       } else {
@@ -63,6 +94,9 @@ export const useAccountsStore = defineStore('accountsStore', () => {
     currentUserAddress,
     currentPrivateKey,
     privateKeys,
+    walletAddress,
+    isWalletSelected,
+    fetchMetaMaskAccount,
     generateNewAccount,
     removeAccount,
     setCurrentAccount,
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index 0959803c6..24368090b 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -1,6 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "test"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "test", "src/global.d.ts"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "types": ["node", "jsdom"],

From 609624ff25e920e0f84bf0b37870cae9249a8d20 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Fri, 20 Dec 2024 22:46:06 -0300
Subject: [PATCH 03/30] fix: removing ts-ignore

---
 frontend/src/global.d.ts          |  7 +++++--
 frontend/src/hooks/useGenlayer.ts |  2 +-
 frontend/src/stores/accounts.ts   | 14 ++++----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/frontend/src/global.d.ts b/frontend/src/global.d.ts
index 832846d5d..2d37c0d2b 100644
--- a/frontend/src/global.d.ts
+++ b/frontend/src/global.d.ts
@@ -2,6 +2,9 @@
 interface Window {
     ethereum?: {
         isMetaMask?: boolean;
-        request: (args: { method: string; params?: unknown[] }) => Promise<unknown>;
-    };
+        request: (args: { method: string; params?: unknown[] }) => Promise<Array>;
+        on: (method: string, callback: Function) => {
+
+        }
+    }
 }
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index c2ab8aac4..c78afbdce 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -28,7 +28,7 @@ export function useGenlayer() {
     client = createClient({
       chain: simulator,
       endpoint: import.meta.env.VITE_JSON_RPC_SERVER_URL,
-      accountOrAddress: accountsStore.isWalletSelected ? accountsStore.walletAddress : createAccount(accountsStore.currentPrivateKey || undefined),
+      account: accountsStore.isWalletSelected ? accountsStore.walletAddress : createAccount(accountsStore.currentPrivateKey || undefined),
     });
   }
 
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index cc3aa1d4d..18bfc3ca1 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia';
 import { computed, ref, watch } from 'vue';
 import type { Address } from '@/types';
 import { createAccount, generatePrivateKey } from 'genlayer-js';
-import type { Account } from 'genlayer-js/types';
 import { useShortAddress } from '@/hooks';
 
 export const useAccountsStore = defineStore('accountsStore', () => {
@@ -28,23 +27,18 @@ export const useAccountsStore = defineStore('accountsStore', () => {
 
   async function fetchMetaMaskAccount() {
     if (window.ethereum) {
-      //@ts-ignore
       const accounts = await window.ethereum.request({
         method: 'eth_requestAccounts',
       });
 
-      //@ts-ignore
-      walletAddress.value = accounts[0] || null;
-      //@ts-ignore
+      walletAddress.value = accounts[0];
       setCurrentAccount()
     }
   }
 
   if (window.ethereum) {
-    //@ts-ignore
     window.ethereum.on('accountsChanged', (accounts: string[]) => {
-      //@ts-ignore
-      walletAddress.value = accounts[0] || null;
+      walletAddress.value = accounts[0] as Address;
     });
   }
 
@@ -63,11 +57,11 @@ export const useAccountsStore = defineStore('accountsStore', () => {
     privateKeys.value = privateKeys.value.filter((k) => k !== privateKey);
 
     if (currentPrivateKey.value === privateKey) {
-      setCurrentAccount(privateKeys.value[0] || null);
+      setCurrentAccount(privateKeys.value[0]);
     }
   }
 
-  function setCurrentAccount(privateKey: Address | undefined) {
+  function setCurrentAccount(privateKey?: Address) {
     if( privateKey ) {
       currentPrivateKey.value = privateKey
     }

From 61f5ea35d65285108def766a5e74c5e1c5135476 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 15:22:57 -0300
Subject: [PATCH 04/30] test: window ethereum coverage

---
 frontend/test/unit/stores/accounts.test.ts | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/frontend/test/unit/stores/accounts.test.ts b/frontend/test/unit/stores/accounts.test.ts
index 624af4f27..3ae79de0b 100644
--- a/frontend/test/unit/stores/accounts.test.ts
+++ b/frontend/test/unit/stores/accounts.test.ts
@@ -113,3 +113,41 @@ describe('useAccountsStore', () => {
     expect(accountsStore.currentUserAddress).toBe('');
   });
 });
+
+describe('fetchMetaMaskAccount', () => {
+  let accountsStore: ReturnType<typeof useAccountsStore>;
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    accountsStore = useAccountsStore();
+
+    // Mock `window.ethereum`
+    vi.stubGlobal('window', {
+      ethereum: {
+        request: vi.fn(),
+        on: vi.fn(),
+      },
+    });
+  });
+
+  it('should fetch the MetaMask account and set walletAddress', async () => {
+    const testAccount = '0x1234567890abcdef1234567890abcdef12345678';
+    (window?.ethereum?.request as Mock).mockResolvedValueOnce([testAccount]);
+
+    await accountsStore.fetchMetaMaskAccount();
+
+    expect(window?.ethereum?.request).toHaveBeenCalledWith({
+      method: 'eth_requestAccounts',
+    });
+    expect(accountsStore.walletAddress).toBe(testAccount);
+    expect(accountsStore.isWalletSelected).toBe(true);
+  });
+
+  it('should not set walletAddress if window.ethereum is undefined', async () => {
+    vi.stubGlobal('window', {}); // Remove ethereum from window object
+
+    await accountsStore.fetchMetaMaskAccount();
+
+    expect(accountsStore.walletAddress).toBe(undefined);
+  });
+});

From b737596f4d38d911ae0d35189ae135846ee8b66c Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 15:33:59 -0300
Subject: [PATCH 05/30] fix: precommit lint transactions processor

---
 backend/database_handler/transactions_processor.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 02db47f1f..740a0621f 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -379,7 +379,9 @@ def get_highest_timestamp(self) -> int:
         return transaction.nonce
 
 
-    def get_transactions_for_block(self, block_number: int, include_full_tx: bool) -> dict:
+    def get_transactions_for_block(
+            self, block_number: int, include_full_tx: bool
+    ) -> dict:
         transactions = (
             self.session.query(Transactions)
             .filter(Transactions.nonce == block_number)
@@ -394,9 +396,7 @@ def get_transactions_for_block(self, block_number: int, include_full_tx: bool) -
         timestamp = transactions[0].timestamp_accepted or int(time.time())
 
         if include_full_tx:
-            transaction_data = [
-                self._parse_transaction_data(tx) for tx in transactions
-            ]
+            transaction_data = [self._parse_transaction_data(tx) for tx in transactions]
         else:
             transaction_data = [tx.hash for tx in transactions]
 
@@ -415,4 +415,4 @@ def get_transactions_for_block(self, block_number: int, include_full_tx: bool) -
             "extraData": "0x",
         }
 
-        return block_details
\ No newline at end of file
+        return block_details

From 17494904002b4277e5ff1050db4ce68fb9863ae5 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 15:40:29 -0300
Subject: [PATCH 06/30] fix: precommit lint endpoints

---
 .../transactions_processor.py                 |  2 +-
 backend/protocol_rpc/endpoints.py             | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 740a0621f..87190d32d 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -380,7 +380,7 @@ def get_highest_timestamp(self) -> int:
 
 
     def get_transactions_for_block(
-            self, block_number: int, include_full_tx: bool
+        self, block_number: int, include_full_tx: bool
     ) -> dict:
         transactions = (
             self.session.query(Transactions)
diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index c98be39c6..6b38914b0 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -390,7 +390,9 @@ async def call(
     data = params["data"]
 
     if from_address is None:
-        return base64.b64encode(b'\x00' * 31 + b'\x01').decode("ascii")  # Example: Return '1' as a uint256
+        return base64.b64encode(b'\x00' * 31 + b'\x01').decode(
+            "ascii"
+        )  # Return '1' as a uint256
 
     if from_address and not accounts_manager.is_valid_address(from_address):
         raise InvalidAddressError(from_address)
@@ -543,7 +545,7 @@ def get_block_number(transactions_processor: TransactionsProcessor) -> str:
     return hex(transaction_count)
 
 def get_block_by_number(
-        transactions_processor: TransactionsProcessor, block_number: str, full_tx: bool
+    transactions_processor: TransactionsProcessor, block_number: str, full_tx: bool
 ) -> dict | None:
     try:
         block_number_int = int(block_number, 16)
@@ -565,8 +567,8 @@ def get_gas_price() -> str:
     return hex(gas_price_in_wei)
 
 def get_transaction_receipt(
-        transactions_processor: TransactionsProcessor,
-        transaction_hash: str,
+    transactions_processor: TransactionsProcessor,
+    transaction_hash: str,
 ) -> dict | None:
 
     transaction = transactions_processor.get_transaction_by_hash(transaction_hash)
@@ -583,7 +585,11 @@ def get_transaction_receipt(
         "to": transaction.get("to_address") if transaction.get("to_address") else None,
         "cumulativeGasUsed": hex(transaction.get("gas_used", 21000)),
         "gasUsed": hex(transaction.get("gas_used", 21000)),
-        "contractAddress": transaction.get("contract_address") if transaction.get("contract_address") else None,
+        "contractAddress": (
+            transaction.get("contract_address")
+            if transaction.get("contract_address")
+            else None
+        ),
         "logs": transaction.get("logs", []),
         "logsBloom": "0x" + "00" * 256,
         "status": hex(1 if transaction.get("status", True) else 0),
@@ -592,9 +598,9 @@ def get_transaction_receipt(
     return receipt
 
 def get_block_by_hash(
-        transactions_processor: TransactionsProcessor,
-        transaction_hash: str,
-        full_tx: bool = False,
+    transactions_processor: TransactionsProcessor,
+    transaction_hash: str,
+    full_tx: bool = False,
 ) -> dict | None:
 
     transaction = transactions_processor.get_transaction_by_hash(transaction_hash)

From 31e30a931556aa4a9f813b3bcd45ff41189f6d85 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 15:59:46 -0300
Subject: [PATCH 07/30] fix: lint on vue files

---
 backend/protocol_rpc/endpoints.py             |  2 +-
 .../components/Simulator/AccountSelect.vue    | 19 ++++++++++------
 frontend/src/global.d.ts                      | 12 +++++-----
 frontend/src/hooks/useGenlayer.ts             | 20 +++++++++--------
 frontend/src/stores/accounts.ts               | 22 +++++++++----------
 5 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 6b38914b0..6ca186da6 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -390,7 +390,7 @@ async def call(
     data = params["data"]
 
     if from_address is None:
-        return base64.b64encode(b'\x00' * 31 + b'\x01').decode(
+        return base64.b64encode(b"\x00' * 31 + b'\x01").decode(
             "ascii"
         )  # Return '1' as a uint256
 
diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index 1f3a01404..ecc8f33f1 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -43,11 +43,11 @@ const connectMetaMask = async () => {
     <template #popper>
       <div class="divide-y divide-gray-200 dark:divide-gray-800">
         <AccountItem
-            v-if="store.walletAddress"
-            :account="{ address: store.walletAddress }"
-            :active="store.isWalletSelected"
-            :canDelete="false"
-            v-close-popper
+          v-if="store.walletAddress"
+          :account="{ address: store.walletAddress }"
+          :active="store.isWalletSelected"
+          :canDelete="false"
+          v-close-popper
         />
         <AccountItem
           v-for="privateKey in store.privateKeys"
@@ -61,9 +61,14 @@ const connectMetaMask = async () => {
       </div>
 
       <div
-          class="flex w-full border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
+        class="flex w-full border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
       >
-        <Btn @click="handleCreateNewAccount" secondary class="w-full" :icon="PlusIcon">
+        <Btn
+          @click="handleCreateNewAccount"
+          secondary
+          class="w-full"
+          :icon="PlusIcon"
+        >
           New account
         </Btn>
         <Btn @click="connectMetaMask" secondary class="w-full">
diff --git a/frontend/src/global.d.ts b/frontend/src/global.d.ts
index 2d37c0d2b..96960102e 100644
--- a/frontend/src/global.d.ts
+++ b/frontend/src/global.d.ts
@@ -1,10 +1,8 @@
 // global.d.ts
 interface Window {
-    ethereum?: {
-        isMetaMask?: boolean;
-        request: (args: { method: string; params?: unknown[] }) => Promise<Array>;
-        on: (method: string, callback: Function) => {
-
-        }
-    }
+  ethereum?: {
+    isMetaMask?: boolean;
+    request: (args: { method: string; params?: unknown[] }) => Promise<Array>;
+    on: (method: string, callback: Function) => {};
+  };
 }
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index c78afbdce..b72e873ec 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -14,21 +14,23 @@ export function useGenlayer() {
   }
 
   watch(
-      [
-        () => accountsStore.currentUserAddress,
-        () => accountsStore.isWalletSelected,
-        () => accountsStore.walletAddress,
-      ],
-      () => {
-        initClient();
-      },
+    [
+      () => accountsStore.currentUserAddress,
+      () => accountsStore.isWalletSelected,
+      () => accountsStore.walletAddress,
+    ],
+    () => {
+      initClient();
+    },
   );
 
   function initClient() {
     client = createClient({
       chain: simulator,
       endpoint: import.meta.env.VITE_JSON_RPC_SERVER_URL,
-      account: accountsStore.isWalletSelected ? accountsStore.walletAddress : createAccount(accountsStore.currentPrivateKey || undefined),
+      account: accountsStore.isWalletSelected
+        ? accountsStore.walletAddress
+        : createAccount(accountsStore.currentPrivateKey || undefined),
     });
   }
 
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 18bfc3ca1..4c188046e 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -8,18 +8,18 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   const key = localStorage.getItem('accountsStore.currentPrivateKey');
   const currentPrivateKey = ref<Address | null>(key ? (key as Address) : null);
   const currentUserAddress = computed(() =>
-      currentPrivateKey.value
-          ? createAccount(currentPrivateKey.value).address
-          : '',
+    currentPrivateKey.value
+      ? createAccount(currentPrivateKey.value).address
+      : '',
   );
   const { shorten } = useShortAddress();
 
   const privateKeys = ref<Address[]>(
-      localStorage.getItem('accountsStore.privateKeys')
-          ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-              ',',
-          ) as Address[])
-          : [],
+    localStorage.getItem('accountsStore.privateKeys')
+       ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
+           ',',
+         ) as Address[])
+       : [],
   );
 
   const walletAddress = ref<Address | undefined>(undefined);
@@ -32,7 +32,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       });
 
       walletAddress.value = accounts[0];
-      setCurrentAccount()
+      setCurrentAccount();
     }
   }
 
@@ -62,8 +62,8 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   }
 
   function setCurrentAccount(privateKey?: Address) {
-    if( privateKey ) {
-      currentPrivateKey.value = privateKey
+    if (privateKey) {
+      currentPrivateKey.value = privateKey;
     }
     isWalletSelected.value = !privateKey;
   }

From 5f44f6486392a86bef3f466775996acdd9257d97 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 16:39:32 -0300
Subject: [PATCH 08/30] fix: fixing spaces (lint)

---
 backend/database_handler/transactions_processor.py  | 2 --
 backend/protocol_rpc/endpoints.py                   | 7 +++++--
 frontend/src/components/Simulator/AccountSelect.vue | 4 +++-
 frontend/src/stores/accounts.ts                     | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 87190d32d..e1326ed35 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -367,7 +367,6 @@ def set_transaction_appeal_failed(self, transaction_hash: str, appeal_failed: in
         )
         transaction.appeal_failed = appeal_failed
 
-
     def get_highest_timestamp(self) -> int:
         transaction = (
             self.session.query(Transactions)
@@ -378,7 +377,6 @@ def get_highest_timestamp(self) -> int:
             return 0
         return transaction.nonce
 
-
     def get_transactions_for_block(
         self, block_number: int, include_full_tx: bool
     ) -> dict:
diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 6ca186da6..ad8b53c32 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -53,7 +53,6 @@
 import base64
 
 
-
 ####### HELPER ENDPOINTS #######
 def ping() -> str:
     return "OK"
@@ -537,13 +536,16 @@ def set_finality_window_time(consensus: ConsensusAlgorithm, time: int) -> None:
 def get_chain_id() -> str:
     return hex(61_999)
 
+
 def get_net_version() -> str:
     return "61999"
 
+
 def get_block_number(transactions_processor: TransactionsProcessor) -> str:
     transaction_count = transactions_processor.get_highest_timestamp()
     return hex(transaction_count)
 
+
 def get_block_by_number(
     transactions_processor: TransactionsProcessor, block_number: str, full_tx: bool
 ) -> dict | None:
@@ -566,6 +568,7 @@ def get_gas_price() -> str:
     gas_price_in_wei = 20 * 10**9
     return hex(gas_price_in_wei)
 
+
 def get_transaction_receipt(
     transactions_processor: TransactionsProcessor,
     transaction_hash: str,
@@ -597,6 +600,7 @@ def get_transaction_receipt(
 
     return receipt
 
+
 def get_block_by_hash(
     transactions_processor: TransactionsProcessor,
     transaction_hash: str,
@@ -812,4 +816,3 @@ def register_all_rpc_endpoints(
         partial(get_block_by_hash, transactions_processor),
         method_name="eth_getBlockByHash",
     )
-
diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index ecc8f33f1..432eea6d1 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -54,7 +54,9 @@ const connectMetaMask = async () => {
           :key="privateKey"
           :privateKey="privateKey"
           :account="createAccount(privateKey)"
-          :active="privateKey === store.currentPrivateKey && !store.isWalletSelected"
+          :active="
+            privateKey === store.currentPrivateKey && !store.isWalletSelected
+          "
           :canDelete="true"
           v-close-popper
         />
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 4c188046e..02293e567 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -16,10 +16,10 @@ export const useAccountsStore = defineStore('accountsStore', () => {
 
   const privateKeys = ref<Address[]>(
     localStorage.getItem('accountsStore.privateKeys')
-       ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-           ',',
-         ) as Address[])
-       : [],
+      ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
+          ',',
+        ) as Address[])
+      : [],
   );
 
   const walletAddress = ref<Address | undefined>(undefined);

From b8a5e8807a3dc38a4b76322848b7ccccfc4ecd1d Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 16:42:32 -0300
Subject: [PATCH 09/30] fix: fixing spaces (lint)

---
 backend/protocol_rpc/endpoints.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index ad8b53c32..2eaa21947 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -532,6 +532,7 @@ def set_transaction_appeal(
 
 def set_finality_window_time(consensus: ConsensusAlgorithm, time: int) -> None:
     consensus.set_finality_window_time(time)
+    
 
 def get_chain_id() -> str:
     return hex(61_999)
@@ -639,6 +640,7 @@ def get_block_by_hash(
 
     return block_details
 
+
 def get_contract(consensus_service: ConsensusService, contract_name: str) -> dict:
     """
     Get contract instance by name

From a9e82153138fffd36842f3ca3df8df97dc55fdd1 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Mon, 23 Dec 2024 16:44:30 -0300
Subject: [PATCH 10/30] fix: fixing spaces (lint)

---
 backend/protocol_rpc/endpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 2eaa21947..8bd51aa1c 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -532,7 +532,7 @@ def set_transaction_appeal(
 
 def set_finality_window_time(consensus: ConsensusAlgorithm, time: int) -> None:
     consensus.set_finality_window_time(time)
-    
+
 
 def get_chain_id() -> str:
     return hex(61_999)

From 076dc544b939761241c0588a6e862306074ff1d7 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 9 Jan 2025 00:36:25 +0100
Subject: [PATCH 11/30] chore: updated genlayer-js dependency

---
 frontend/package-lock.json | 8 ++++----
 frontend/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fa1081198..937e49b44 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,7 +23,7 @@
         "defu": "^6.1.4",
         "dexie": "^4.0.4",
         "floating-vue": "^5.2.2",
-        "genlayer-js": "^0.4.6",
+        "genlayer-js": "^0.5.0",
         "hash-sum": "^2.0.0",
         "jump.js": "^1.0.2",
         "lodash-es": "^4.17.21",
@@ -5547,9 +5547,9 @@
       }
     },
     "node_modules/genlayer-js": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/genlayer-js/-/genlayer-js-0.4.7.tgz",
-      "integrity": "sha512-vp+7spuVaX7vflZd2q7qmaYgi5Cf7S/h4lAoVhAkFdyAsDStvhtwCdJGcZDt+U77AWxo3I1mUMXz0sk9ER3JXQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/genlayer-js/-/genlayer-js-0.5.0.tgz",
+      "integrity": "sha512-sW3seeKEG3TxnWbU7FzFBWMwm3oOjoktbtYg8I95uQTP74PInn7rxjYt9wea3M3VxnZnkEFu4f1bOMEIFWwAqg==",
       "dependencies": {
         "eslint-plugin-import": "^2.30.0",
         "typescript-parsec": "^0.3.4",
diff --git a/frontend/package.json b/frontend/package.json
index d453f6c3a..60f2a4a03 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,7 +35,7 @@
     "defu": "^6.1.4",
     "dexie": "^4.0.4",
     "floating-vue": "^5.2.2",
-    "genlayer-js": "^0.4.6",
+    "genlayer-js": "^0.5.0",
     "hash-sum": "^2.0.0",
     "jump.js": "^1.0.2",
     "lodash-es": "^4.17.21",

From acc22b13f76525c3d14bd0092acfa32ac3c89264 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 9 Jan 2025 02:41:37 +0100
Subject: [PATCH 12/30] refactor: unified account management for local and
 metamas + fixed account selection

---
 .../src/components/Simulator/AccountItem.vue  |  18 +-
 .../components/Simulator/AccountSelect.vue    |  36 ++--
 frontend/src/hooks/useContractQueries.ts      |  17 +-
 frontend/src/hooks/useGenlayer.ts             |  26 +--
 frontend/src/hooks/useSetupStores.ts          |   9 -
 frontend/src/plugins/persistStore.ts          |  34 +--
 frontend/src/stores/accounts.ts               | 195 ++++++++++++++----
 7 files changed, 217 insertions(+), 118 deletions(-)

diff --git a/frontend/src/components/Simulator/AccountItem.vue b/frontend/src/components/Simulator/AccountItem.vue
index 1f35cf569..bf371a925 100644
--- a/frontend/src/components/Simulator/AccountItem.vue
+++ b/frontend/src/components/Simulator/AccountItem.vue
@@ -1,15 +1,14 @@
 <script setup lang="ts">
-import { useAccountsStore } from '@/stores';
+import { useAccountsStore, type AccountInfo } from '@/stores';
 import { notify } from '@kyvg/vue3-notification';
-import { PowerCircle } from 'lucide-vue-next';
+import { PowerCircle, Wallet } from 'lucide-vue-next';
 import { ref } from 'vue';
 import CopyTextButton from '../global/CopyTextButton.vue';
 import { TrashIcon, CheckCircleIcon } from '@heroicons/vue/16/solid';
-import type { Account } from 'genlayer-js/types';
 const store = useAccountsStore();
 
 const setCurentAddress = () => {
-  store.setCurrentAccount(props.privateKey);
+  store.setCurrentAccount(props.account as AccountInfo);
   notify({
     title: 'Active account changed',
     type: 'success',
@@ -18,7 +17,7 @@ const setCurentAddress = () => {
 
 const deleteAddress = () => {
   try {
-    store.removeAccount(props.privateKey);
+    store.removeAccount(props.account as AccountInfo);
     notify({
       title: 'Account deleted',
       type: 'success',
@@ -35,8 +34,7 @@ const deleteAddress = () => {
 
 const props = defineProps<{
   active?: Boolean;
-  account: Account;
-  privateKey: `0x${string}`;
+  account: AccountInfo;
   canDelete?: Boolean;
 }>();
 
@@ -65,6 +63,12 @@ const showConfirmDelete = ref(false);
         {{ account.address }}
       </span>
 
+      <Wallet
+        v-if="account.type === 'metamask'"
+        class="h-4 w-4 text-orange-500"
+        v-tooltip="'MetaMask Account'"
+      />
+
       <div
         class="flex flex-row items-center gap-1 opacity-0 group-hover:opacity-100"
       >
diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index 432eea6d1..5f3a12911 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { useAccountsStore } from '@/stores';
 import AccountItem from '@/components/Simulator/AccountItem.vue';
 import { Dropdown } from 'floating-vue';
@@ -6,10 +6,15 @@ import { Wallet } from 'lucide-vue-next';
 import { PlusIcon } from '@heroicons/vue/16/solid';
 import { notify } from '@kyvg/vue3-notification';
 import { useEventTracking } from '@/hooks';
-import { createAccount } from 'genlayer-js';
+import { computed } from 'vue';
+
 const store = useAccountsStore();
 const { trackEvent } = useEventTracking();
 
+const hasMetaMaskAccount = computed(() =>
+  store.accounts.some((account) => account.type === 'metamask'),
+);
+
 const handleCreateNewAccount = async () => {
   const privateKey = store.generateNewAccount();
 
@@ -43,21 +48,11 @@ const connectMetaMask = async () => {
     <template #popper>
       <div class="divide-y divide-gray-200 dark:divide-gray-800">
         <AccountItem
-          v-if="store.walletAddress"
-          :account="{ address: store.walletAddress }"
-          :active="store.isWalletSelected"
-          :canDelete="false"
-          v-close-popper
-        />
-        <AccountItem
-          v-for="privateKey in store.privateKeys"
-          :key="privateKey"
-          :privateKey="privateKey"
-          :account="createAccount(privateKey)"
-          :active="
-            privateKey === store.currentPrivateKey && !store.isWalletSelected
-          "
-          :canDelete="true"
+          v-for="account in store.accounts"
+          :key="account.privateKey"
+          :account="account"
+          :active="account.address === store.currentUserAccount?.address"
+          :canDelete="account.type === 'local'"
           v-close-popper
         />
       </div>
@@ -73,7 +68,12 @@ const connectMetaMask = async () => {
         >
           New account
         </Btn>
-        <Btn @click="connectMetaMask" secondary class="w-full">
+        <Btn
+          v-if="!hasMetaMaskAccount"
+          @click="connectMetaMask"
+          secondary
+          class="w-full"
+        >
           Connect MetaMask
         </Btn>
       </div>
diff --git a/frontend/src/hooks/useContractQueries.ts b/frontend/src/hooks/useContractQueries.ts
index 0da25e623..61351c455 100644
--- a/frontend/src/hooks/useContractQueries.ts
+++ b/frontend/src/hooks/useContractQueries.ts
@@ -11,11 +11,7 @@ import { notify } from '@kyvg/vue3-notification';
 import { useMockContractData } from './useMockContractData';
 import { useEventTracking, useGenlayer } from '@/hooks';
 import * as calldata from '@/calldata';
-import type {
-  Address,
-  TransactionHash,
-  ContractSchema,
-} from 'genlayer-js/types';
+import type { Account, Address, TransactionHash } from 'genlayer-js/types';
 
 const schema = ref<any>();
 
@@ -102,7 +98,7 @@ export function useContractQueries() {
     isDeploying.value = true;
 
     try {
-      if (!contract.value || !accountsStore.currentPrivateKey) {
+      if (!contract.value || !accountsStore.currentUserAccount) {
         throw new Error('Error Deploying the contract');
       }
 
@@ -110,6 +106,7 @@ export function useContractQueries() {
       const code_bytes = new TextEncoder().encode(code);
 
       const result = await genlayer.client?.deployContract({
+        account: accountsStore.currentUserAccount as Account,
         code: code_bytes as any as string, // FIXME: code should accept both bytes and string in genlayer-js
         args: args.args,
         leaderOnly,
@@ -143,6 +140,7 @@ export function useContractQueries() {
         type: 'error',
         title: 'Error deploying contract',
       });
+      console.error('Error Deploying the contract', error);
       throw new Error('Error Deploying the contract');
     }
   }
@@ -209,11 +207,16 @@ export function useContractQueries() {
     leaderOnly: boolean;
   }) {
     try {
-      if (!accountsStore.currentPrivateKey) {
+      if (!accountsStore.currentUserAccount) {
         throw new Error('Error writing to contract');
       }
+      console.log(
+        '🚀 ~ useContractQueries ~ accountsStore.currentUserAccount:',
+        accountsStore.currentUserAccount,
+      );
 
       const result = await genlayer.client?.writeContract({
+        account: accountsStore.currentUserAccount as Account,
         address: address.value as Address,
         functionName: method,
         args: args.args,
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index b72e873ec..da1df97a1 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -1,6 +1,6 @@
 import { simulator } from 'genlayer-js/chains';
-import { createClient, createAccount } from 'genlayer-js';
-import type { GenLayerClient } from 'genlayer-js/types';
+import { createClient } from 'genlayer-js';
+import type { Account, GenLayerClient } from 'genlayer-js/types';
 import { watch } from 'vue';
 import { useAccountsStore } from '@/stores';
 
@@ -13,24 +13,20 @@ export function useGenlayer() {
     initClient();
   }
 
-  watch(
-    [
-      () => accountsStore.currentUserAddress,
-      () => accountsStore.isWalletSelected,
-      () => accountsStore.walletAddress,
-    ],
-    () => {
-      initClient();
-    },
-  );
+  watch([() => accountsStore.currentUserAccount?.address], () => {
+    initClient();
+  });
 
   function initClient() {
+    const clientAccount =
+      accountsStore.currentUserAccount?.type === 'local'
+        ? (accountsStore.currentUserAccount as Account)
+        : accountsStore.currentUserAccount?.address;
+
     client = createClient({
       chain: simulator,
       endpoint: import.meta.env.VITE_JSON_RPC_SERVER_URL,
-      account: accountsStore.isWalletSelected
-        ? accountsStore.walletAddress
-        : createAccount(accountsStore.currentPrivateKey || undefined),
+      account: clientAccount,
     });
   }
 
diff --git a/frontend/src/hooks/useSetupStores.ts b/frontend/src/hooks/useSetupStores.ts
index 878eaec32..4a1bd42e8 100644
--- a/frontend/src/hooks/useSetupStores.ts
+++ b/frontend/src/hooks/useSetupStores.ts
@@ -7,7 +7,6 @@ import {
 } from '@/stores';
 import { useDb, useGenlayer, useTransactionListener } from '@/hooks';
 import { v4 as uuidv4 } from 'uuid';
-import type { Address } from '@/types';
 
 export const useSetupStores = () => {
   const setupStores = async () => {
@@ -60,14 +59,6 @@ export const useSetupStores = () => {
 
     if (accountsStore.privateKeys.length < 1) {
       accountsStore.generateNewAccount();
-    } else {
-      accountsStore.privateKeys = localStorage.getItem(
-        'accountsStore.privateKeys',
-      )
-        ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-            ',',
-          ) as Address[])
-        : [];
     }
 
     genlayer.initClient();
diff --git a/frontend/src/plugins/persistStore.ts b/frontend/src/plugins/persistStore.ts
index 535987dd7..dc376312e 100644
--- a/frontend/src/plugins/persistStore.ts
+++ b/frontend/src/plugins/persistStore.ts
@@ -113,23 +113,23 @@ export function persistStorePlugin(context: PiniaPluginContext): void {
           default:
             break;
         }
-      } else if (store.$id === 'accountsStore') {
-        switch (name) {
-          case 'generateNewAccount':
-          case 'removeAccount':
-          case 'setCurrentAccount':
-            localStorage.setItem(
-              'accountsStore.privateKeys',
-              store.privateKeys.join(','),
-            );
-            localStorage.setItem(
-              'accountsStore.currentPrivateKey',
-              store.currentPrivateKey,
-            );
-            break;
-          default:
-            break;
-        }
+        // } else if (store.$id === 'accountsStore') {
+        //   switch (name) {
+        //     case 'generateNewAccount':
+        //     case 'removeAccount':
+        //     case 'setCurrentAccount':
+        //       localStorage.setItem(
+        //         'accountsStore.privateKeys',
+        //         store.privateKeys.join(','),
+        //       );
+        //       localStorage.setItem(
+        //         'accountsStore.currentPrivateKey',
+        //         store.currentPrivateKey,
+        //       );
+        //       break;
+        //     default:
+        //       break;
+        //   }
       } else if (store.$id === 'transactionsStore') {
         switch (name) {
           case 'addTransaction':
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 02293e567..bc15af597 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -1,95 +1,200 @@
 import { defineStore } from 'pinia';
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import type { Address } from '@/types';
 import { createAccount, generatePrivateKey } from 'genlayer-js';
 import { useShortAddress } from '@/hooks';
 
+export interface AccountInfo {
+  type: 'local' | 'metamask';
+  address: Address;
+  privateKey?: Address; // Only for local accounts
+}
+
 export const useAccountsStore = defineStore('accountsStore', () => {
-  const key = localStorage.getItem('accountsStore.currentPrivateKey');
-  const currentPrivateKey = ref<Address | null>(key ? (key as Address) : null);
-  const currentUserAddress = computed(() =>
-    currentPrivateKey.value
-      ? createAccount(currentPrivateKey.value).address
-      : '',
-  );
   const { shorten } = useShortAddress();
 
-  const privateKeys = ref<Address[]>(
-    localStorage.getItem('accountsStore.privateKeys')
-      ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-          ',',
-        ) as Address[])
-      : [],
-  );
+  // Store all accounts (both local and MetaMask)
+  const accounts = ref<AccountInfo[]>([]);
+  const selectedAccount = ref<AccountInfo | null>(null);
 
-  const walletAddress = ref<Address | undefined>(undefined);
-  const isWalletSelected = ref<boolean>(false);
+  // Initialize local accounts from localStorage
+  const storedKeys = localStorage.getItem('accountsStore.privateKeys');
+  if (storedKeys) {
+    const privateKeys = storedKeys.split(',') as Address[];
+    accounts.value = privateKeys.map((key) => ({
+      type: 'local',
+      address: createAccount(key).address,
+      privateKey: key,
+    }));
+
+    // Set initial selected account if stored
+    const storedSelectedKey = localStorage.getItem(
+      'accountsStore.currentPrivateKey',
+    );
+    if (storedSelectedKey) {
+      selectedAccount.value =
+        accounts.value.find((acc) => acc.privateKey === storedSelectedKey) ||
+        null;
+    }
+  }
 
   async function fetchMetaMaskAccount() {
     if (window.ethereum) {
-      const accounts = await window.ethereum.request({
+      const ethAccounts = await window.ethereum.request({
         method: 'eth_requestAccounts',
       });
 
-      walletAddress.value = accounts[0];
-      setCurrentAccount();
+      const metamaskAccount: AccountInfo = {
+        type: 'metamask',
+        address: ethAccounts[0] as Address,
+      };
+
+      // Update or add MetaMask account
+      const existingMetaMaskIndex = accounts.value.findIndex(
+        (acc) => acc.type === 'metamask',
+      );
+      if (existingMetaMaskIndex >= 0) {
+        accounts.value[existingMetaMaskIndex] = metamaskAccount;
+      } else {
+        accounts.value.push(metamaskAccount);
+      }
+
+      setCurrentAccount(metamaskAccount);
     }
   }
 
   if (window.ethereum) {
-    window.ethereum.on('accountsChanged', (accounts: string[]) => {
-      walletAddress.value = accounts[0] as Address;
+    window.ethereum.on('accountsChanged', (newAccounts: string[]) => {
+      if (newAccounts.length > 0) {
+        const metamaskAccount: AccountInfo = {
+          type: 'metamask',
+          address: newAccounts[0] as Address,
+        };
+
+        const existingMetaMaskIndex = accounts.value.findIndex(
+          (acc) => acc.type === 'metamask',
+        );
+        if (existingMetaMaskIndex >= 0) {
+          accounts.value[existingMetaMaskIndex] = metamaskAccount;
+        }
+
+        if (selectedAccount.value?.type === 'metamask') {
+          setCurrentAccount(metamaskAccount);
+        }
+      }
     });
   }
 
   function generateNewAccount(): Address {
     const privateKey = generatePrivateKey();
-    privateKeys.value = [...privateKeys.value, privateKey];
-    setCurrentAccount(privateKey);
+    const newAccount: AccountInfo = {
+      type: 'local',
+      address: createAccount(privateKey).address,
+      privateKey,
+    };
+
+    accounts.value.push(newAccount);
+    setCurrentAccount(newAccount);
+
+    const storedKeys = localStorage.getItem('accountsStore.privateKeys');
+    if (storedKeys) {
+      localStorage.setItem(
+        'accountsStore.privateKeys',
+        [...storedKeys.split(','), privateKey].join(','),
+      );
+    } else {
+      localStorage.setItem('accountsStore.privateKeys', privateKey);
+    }
     return privateKey;
   }
 
-  function removeAccount(privateKey: Address) {
-    if (privateKeys.value.length <= 1) {
-      throw new Error('You need at least 1 account');
+  function removeAccount(accountToRemove: AccountInfo) {
+    if (
+      accounts.value.filter((acc) => acc.type === 'local').length <= 1 &&
+      accountToRemove.type === 'local'
+    ) {
+      throw new Error('You need at least 1 local account');
     }
 
-    privateKeys.value = privateKeys.value.filter((k) => k !== privateKey);
+    accounts.value = accounts.value.filter((acc) =>
+      acc.type === 'metamask'
+        ? acc.address !== accountToRemove.address
+        : acc.privateKey !== accountToRemove.privateKey,
+    );
 
-    if (currentPrivateKey.value === privateKey) {
-      setCurrentAccount(privateKeys.value[0]);
+    if (selectedAccount.value === accountToRemove) {
+      const firstLocalAccount = accounts.value.find(
+        (acc) => acc.type === 'local',
+      );
+      if (firstLocalAccount) {
+        setCurrentAccount(firstLocalAccount);
+      }
     }
   }
 
-  function setCurrentAccount(privateKey?: Address) {
-    if (privateKey) {
-      currentPrivateKey.value = privateKey;
+  function setCurrentAccount(account: AccountInfo | null) {
+    selectedAccount.value = account;
+
+    // Persist local account selection to localStorage
+    if (account?.type === 'local' && account.privateKey) {
+      localStorage.setItem(
+        'accountsStore.currentPrivateKey',
+        account.privateKey,
+      );
+    } else {
+      // Clear stored private key if no local account is selected
+      localStorage.removeItem('accountsStore.currentPrivateKey');
     }
-    isWalletSelected.value = !privateKey;
   }
 
   const displayAddress = computed(() => {
+    if (!selectedAccount.value) return '';
     try {
-      if (walletAddress.value) {
-        return shorten(walletAddress.value);
-      }
-      if (!currentPrivateKey.value) {
-        return '';
-      } else {
-        return shorten(createAccount(currentPrivateKey.value).address);
-      }
+      return shorten(selectedAccount.value.address);
     } catch (err) {
       console.error(err);
       return '0x';
     }
   });
 
+  const currentUserAccount = computed(() => {
+    if (!selectedAccount.value) return undefined;
+
+    if (
+      selectedAccount.value.type === 'local' &&
+      selectedAccount.value.privateKey
+    ) {
+      return createAccount(selectedAccount.value.privateKey);
+    }
+
+    if (selectedAccount.value.type === 'metamask') {
+      // For MetaMask accounts, return a minimal account interface with just the address
+      return {
+        address: selectedAccount.value.address,
+        type: 'metamask',
+      };
+    }
+
+    return undefined;
+  });
+
+  const currentUserAddress = computed(() =>
+    selectedAccount.value ? selectedAccount.value.address : '',
+  );
+
+  // For backwards compatibility and persistence
+  const privateKeys = computed(() =>
+    accounts.value
+      .filter((acc) => acc.type === 'local')
+      .map((acc) => acc.privateKey!),
+  );
+
   return {
+    accounts,
+    selectedAccount,
+    currentUserAccount,
     currentUserAddress,
-    currentPrivateKey,
     privateKeys,
-    walletAddress,
-    isWalletSelected,
     fetchMetaMaskAccount,
     generateNewAccount,
     removeAccount,

From 20b83f0482df6519f8e2945f388565b581c93495 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Thu, 9 Jan 2025 10:34:46 -0300
Subject: [PATCH 13/30] fix: changing block number from nonce to timestamp

---
 backend/database_handler/transactions_processor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index e1326ed35..2bd6b58aa 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -375,14 +375,14 @@ def get_highest_timestamp(self) -> int:
         )
         if transaction is None:
             return 0
-        return transaction.nonce
+        return transaction.timestamp_accepted
 
     def get_transactions_for_block(
         self, block_number: int, include_full_tx: bool
     ) -> dict:
         transactions = (
             self.session.query(Transactions)
-            .filter(Transactions.nonce == block_number)
+            .filter(Transactions.timestamp_accepted == block_number)
             .all()
         )
 

From 1849613ad1c68257b6bb1891b319a0fc70909416 Mon Sep 17 00:00:00 2001
From: Edinaldo Junior <epsjunior@icloud.com>
Date: Thu, 9 Jan 2025 10:52:17 -0300
Subject: [PATCH 14/30] fix: adding constant over hardcoded chainid

---
 backend/protocol_rpc/endpoints.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 2c9a95dce..0f8818a1a 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -44,7 +44,7 @@
     TransactionAddressFilter,
     TransactionsProcessor,
 )
-from backend.node.base import Node
+from backend.node.base import Node, SIMULATOR_CHAIN_ID
 from backend.node.types import ExecutionMode, ExecutionResultStatus
 from backend.consensus.base import ConsensusAlgorithm
 
@@ -537,11 +537,11 @@ def set_finality_window_time(consensus: ConsensusAlgorithm, time: int) -> None:
 
 
 def get_chain_id() -> str:
-    return hex(61_999)
+    return hex(SIMULATOR_CHAIN_ID)
 
 
 def get_net_version() -> str:
-    return "61999"
+    return str(SIMULATOR_CHAIN_ID)
 
 
 def get_block_number(transactions_processor: TransactionsProcessor) -> str:

From 39177c0bd945aa358484dfcd8a79b14b1fed7be0 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Wed, 15 Jan 2025 11:16:57 +0100
Subject: [PATCH 15/30] fix: docker compose duplicated items

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ead06f59c..05265ec96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -203,7 +203,6 @@ services:
       - ./hardhat/test:/app/test
       - ./hardhat/hardhat.config.js:/app/hardhat.config.js
       - ./hardhat/deploy:/app/deploy
-      - ./hardhat/scripts:/app/scripts
       - hardhat_artifacts:/app/artifacts
       - hardhat_cache:/app/cache
       - hardhat_deployments:/app/deployments

From 71be2d01956371ff8517abdc060847ceb978e6b3 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 10:24:55 +0100
Subject: [PATCH 16/30] fix: accounts store unified structure

---
 .../components/Simulator/AccountSelect.vue    |   6 +-
 frontend/src/hooks/useContractQueries.ts      |  12 +-
 frontend/src/hooks/useGenlayer.ts             |   8 +-
 frontend/src/hooks/useSetupStores.ts          |   2 +-
 frontend/src/plugins/persistStore.ts          |  36 +++---
 frontend/src/stores/accounts.ts               | 107 +++++++-----------
 6 files changed, 69 insertions(+), 102 deletions(-)

diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index 5f3a12911..d05c53c85 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -16,9 +16,9 @@ const hasMetaMaskAccount = computed(() =>
 );
 
 const handleCreateNewAccount = async () => {
-  const privateKey = store.generateNewAccount();
+  const address = store.generateNewAccount();
 
-  if (privateKey) {
+  if (address) {
     notify({
       title: 'New Account Created',
       type: 'success',
@@ -51,7 +51,7 @@ const connectMetaMask = async () => {
           v-for="account in store.accounts"
           :key="account.privateKey"
           :account="account"
-          :active="account.address === store.currentUserAccount?.address"
+          :active="account.address === store.selectedAccount?.address"
           :canDelete="account.type === 'local'"
           v-close-popper
         />
diff --git a/frontend/src/hooks/useContractQueries.ts b/frontend/src/hooks/useContractQueries.ts
index 61351c455..317e5b914 100644
--- a/frontend/src/hooks/useContractQueries.ts
+++ b/frontend/src/hooks/useContractQueries.ts
@@ -98,7 +98,7 @@ export function useContractQueries() {
     isDeploying.value = true;
 
     try {
-      if (!contract.value || !accountsStore.currentUserAccount) {
+      if (!contract.value || !accountsStore.selectedAccount) {
         throw new Error('Error Deploying the contract');
       }
 
@@ -106,7 +106,7 @@ export function useContractQueries() {
       const code_bytes = new TextEncoder().encode(code);
 
       const result = await genlayer.client?.deployContract({
-        account: accountsStore.currentUserAccount as Account,
+        account: accountsStore.selectedAccount as Account,
         code: code_bytes as any as string, // FIXME: code should accept both bytes and string in genlayer-js
         args: args.args,
         leaderOnly,
@@ -207,16 +207,12 @@ export function useContractQueries() {
     leaderOnly: boolean;
   }) {
     try {
-      if (!accountsStore.currentUserAccount) {
+      if (!accountsStore.selectedAccount) {
         throw new Error('Error writing to contract');
       }
-      console.log(
-        '🚀 ~ useContractQueries ~ accountsStore.currentUserAccount:',
-        accountsStore.currentUserAccount,
-      );
 
       const result = await genlayer.client?.writeContract({
-        account: accountsStore.currentUserAccount as Account,
+        account: accountsStore.selectedAccount as Account,
         address: address.value as Address,
         functionName: method,
         args: args.args,
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index da1df97a1..9d49b1dda 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -13,15 +13,15 @@ export function useGenlayer() {
     initClient();
   }
 
-  watch([() => accountsStore.currentUserAccount?.address], () => {
+  watch([() => accountsStore.selectedAccount?.address], () => {
     initClient();
   });
 
   function initClient() {
     const clientAccount =
-      accountsStore.currentUserAccount?.type === 'local'
-        ? (accountsStore.currentUserAccount as Account)
-        : accountsStore.currentUserAccount?.address;
+      accountsStore.selectedAccount?.type === 'local'
+        ? (accountsStore.selectedAccount as Account)
+        : accountsStore.selectedAccount?.address;
 
     client = createClient({
       chain: simulator,
diff --git a/frontend/src/hooks/useSetupStores.ts b/frontend/src/hooks/useSetupStores.ts
index 4a1bd42e8..22ff3587d 100644
--- a/frontend/src/hooks/useSetupStores.ts
+++ b/frontend/src/hooks/useSetupStores.ts
@@ -57,7 +57,7 @@ export const useSetupStores = () => {
     nodeStore.getValidatorsData();
     nodeStore.getProvidersData();
 
-    if (accountsStore.privateKeys.length < 1) {
+    if (accountsStore.accounts.length < 1) {
       accountsStore.generateNewAccount();
     }
 
diff --git a/frontend/src/plugins/persistStore.ts b/frontend/src/plugins/persistStore.ts
index dc376312e..723ab4943 100644
--- a/frontend/src/plugins/persistStore.ts
+++ b/frontend/src/plugins/persistStore.ts
@@ -1,6 +1,7 @@
 import type { ContractFile, DeployedContract } from '@/types';
 import { type PiniaPluginContext } from 'pinia';
 import { useDb, useFileName } from '@/hooks';
+import type { AccountInfo } from '@/stores/accounts';
 
 const ENABLE_LOGS = false;
 const db = useDb();
@@ -113,23 +114,24 @@ export function persistStorePlugin(context: PiniaPluginContext): void {
           default:
             break;
         }
-        // } else if (store.$id === 'accountsStore') {
-        //   switch (name) {
-        //     case 'generateNewAccount':
-        //     case 'removeAccount':
-        //     case 'setCurrentAccount':
-        //       localStorage.setItem(
-        //         'accountsStore.privateKeys',
-        //         store.privateKeys.join(','),
-        //       );
-        //       localStorage.setItem(
-        //         'accountsStore.currentPrivateKey',
-        //         store.currentPrivateKey,
-        //       );
-        //       break;
-        //     default:
-        //       break;
-        //   }
+      } else if (store.$id === 'accountsStore') {
+        switch (name) {
+          case 'generateNewAccount':
+          case 'removeAccount':
+            localStorage.setItem(
+              'accountsStore.accounts',
+              JSON.stringify(store.accounts),
+            );
+            break;
+          case 'setCurrentAccount':
+            localStorage.setItem(
+              'accountsStore.currentAccount',
+              JSON.stringify(store.currentAccount),
+            );
+            break;
+          default:
+            break;
+        }
       } else if (store.$id === 'transactionsStore') {
         switch (name) {
           case 'addTransaction':
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index bc15af597..e56f8b501 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -17,7 +17,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   const accounts = ref<AccountInfo[]>([]);
   const selectedAccount = ref<AccountInfo | null>(null);
 
-  // Initialize local accounts from localStorage
+  // Migrate from old storage to new storage
   const storedKeys = localStorage.getItem('accountsStore.privateKeys');
   if (storedKeys) {
     const privateKeys = storedKeys.split(',') as Address[];
@@ -26,16 +26,40 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       address: createAccount(key).address,
       privateKey: key,
     }));
+    localStorage.removeItem('accountsStore.privateKeys');
+    localStorage.removeItem('accountsStore.currentPrivateKey');
+    localStorage.removeItem('accountsStore.accounts');
+    _initAccountsLocalStorage();
+  }
+
+  // Initialize accounts from localStorage
+  const storedAccounts = JSON.parse(
+    localStorage.getItem('accountsStore.accounts') || '[]',
+  );
+  if (storedAccounts.length === 0) {
+    generateNewAccount();
+    _initAccountsLocalStorage();
+  } else {
+    accounts.value = storedAccounts;
+  }
 
-    // Set initial selected account if stored
-    const storedSelectedKey = localStorage.getItem(
-      'accountsStore.currentPrivateKey',
+  // Initialize selected account from localStorage
+  const storedSelectedAccount = JSON.parse(
+    localStorage.getItem('accountsStore.currentAccount') || 'null',
+  );
+  setCurrentAccount(
+    storedSelectedAccount ? storedSelectedAccount : accounts.value[0],
+  );
+
+  function _initAccountsLocalStorage() {
+    localStorage.setItem(
+      'accountsStore.accounts',
+      JSON.stringify(accounts.value),
+    );
+    localStorage.setItem(
+      'accountsStore.currentAccount',
+      JSON.stringify(accounts.value[0]),
     );
-    if (storedSelectedKey) {
-      selectedAccount.value =
-        accounts.value.find((acc) => acc.privateKey === storedSelectedKey) ||
-        null;
-    }
   }
 
   async function fetchMetaMaskAccount() {
@@ -85,7 +109,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
     });
   }
 
-  function generateNewAccount(): Address {
+  function generateNewAccount(): AccountInfo {
     const privateKey = generatePrivateKey();
     const newAccount: AccountInfo = {
       type: 'local',
@@ -95,17 +119,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
 
     accounts.value.push(newAccount);
     setCurrentAccount(newAccount);
-
-    const storedKeys = localStorage.getItem('accountsStore.privateKeys');
-    if (storedKeys) {
-      localStorage.setItem(
-        'accountsStore.privateKeys',
-        [...storedKeys.split(','), privateKey].join(','),
-      );
-    } else {
-      localStorage.setItem('accountsStore.privateKeys', privateKey);
-    }
-    return privateKey;
+    return newAccount;
   }
 
   function removeAccount(accountToRemove: AccountInfo) {
@@ -116,35 +130,20 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       throw new Error('You need at least 1 local account');
     }
 
-    accounts.value = accounts.value.filter((acc) =>
-      acc.type === 'metamask'
-        ? acc.address !== accountToRemove.address
-        : acc.privateKey !== accountToRemove.privateKey,
+    accounts.value = accounts.value.filter(
+      (acc) => acc.address !== accountToRemove.address,
     );
 
     if (selectedAccount.value === accountToRemove) {
       const firstLocalAccount = accounts.value.find(
         (acc) => acc.type === 'local',
       );
-      if (firstLocalAccount) {
-        setCurrentAccount(firstLocalAccount);
-      }
+      setCurrentAccount(firstLocalAccount || null);
     }
   }
 
   function setCurrentAccount(account: AccountInfo | null) {
     selectedAccount.value = account;
-
-    // Persist local account selection to localStorage
-    if (account?.type === 'local' && account.privateKey) {
-      localStorage.setItem(
-        'accountsStore.currentPrivateKey',
-        account.privateKey,
-      );
-    } else {
-      // Clear stored private key if no local account is selected
-      localStorage.removeItem('accountsStore.currentPrivateKey');
-    }
   }
 
   const displayAddress = computed(() => {
@@ -157,44 +156,14 @@ export const useAccountsStore = defineStore('accountsStore', () => {
     }
   });
 
-  const currentUserAccount = computed(() => {
-    if (!selectedAccount.value) return undefined;
-
-    if (
-      selectedAccount.value.type === 'local' &&
-      selectedAccount.value.privateKey
-    ) {
-      return createAccount(selectedAccount.value.privateKey);
-    }
-
-    if (selectedAccount.value.type === 'metamask') {
-      // For MetaMask accounts, return a minimal account interface with just the address
-      return {
-        address: selectedAccount.value.address,
-        type: 'metamask',
-      };
-    }
-
-    return undefined;
-  });
-
   const currentUserAddress = computed(() =>
     selectedAccount.value ? selectedAccount.value.address : '',
   );
 
-  // For backwards compatibility and persistence
-  const privateKeys = computed(() =>
-    accounts.value
-      .filter((acc) => acc.type === 'local')
-      .map((acc) => acc.privateKey!),
-  );
-
   return {
     accounts,
     selectedAccount,
-    currentUserAccount,
     currentUserAddress,
-    privateKeys,
     fetchMetaMaskAccount,
     generateNewAccount,
     removeAccount,

From e2aab86cd986dfa2a4a27ab46bbc9744f65d4ed3 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 10:30:27 +0100
Subject: [PATCH 17/30] fix: method signature

---
 backend/protocol_rpc/endpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 0f8818a1a..03559ba51 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -551,7 +551,7 @@ def get_block_number(transactions_processor: TransactionsProcessor) -> str:
 
 def get_block_by_number(
     transactions_processor: TransactionsProcessor, block_number: str, full_tx: bool
-) -> dict | None:
+) -> dict:
     try:
         block_number_int = int(block_number, 16)
     except ValueError:

From 98ce0dd9cec294ae4637e5371ecf3f0dce683d75 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 14:34:35 +0100
Subject: [PATCH 18/30] fix: local accounts working

---
 frontend/src/hooks/useContractQueries.ts | 15 +++++++--------
 frontend/src/hooks/useGenlayer.ts        | 15 +++++++--------
 frontend/src/plugins/persistStore.ts     | 10 +++++-----
 frontend/src/stores/accounts.ts          |  9 +++------
 frontend/src/stores/transactions.ts      |  3 ++-
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/frontend/src/hooks/useContractQueries.ts b/frontend/src/hooks/useContractQueries.ts
index 317e5b914..1c1849156 100644
--- a/frontend/src/hooks/useContractQueries.ts
+++ b/frontend/src/hooks/useContractQueries.ts
@@ -11,12 +11,13 @@ import { notify } from '@kyvg/vue3-notification';
 import { useMockContractData } from './useMockContractData';
 import { useEventTracking, useGenlayer } from '@/hooks';
 import * as calldata from '@/calldata';
-import type { Account, Address, TransactionHash } from 'genlayer-js/types';
+import type { Address, TransactionHash } from 'genlayer-js/types';
 
 const schema = ref<any>();
 
 export function useContractQueries() {
   const genlayer = useGenlayer();
+  const genlayerClient = computed(() => genlayer.client.value);
   const accountsStore = useAccountsStore();
   const transactionsStore = useTransactionsStore();
   const contractsStore = useContractsStore();
@@ -64,7 +65,7 @@ export function useContractQueries() {
     }
 
     try {
-      const result = await genlayer.client?.getContractSchemaForCode(
+      const result = await genlayerClient.value?.getContractSchemaForCode(
         contract.value?.content ?? '',
       );
 
@@ -105,8 +106,7 @@ export function useContractQueries() {
       const code = contract.value?.content ?? '';
       const code_bytes = new TextEncoder().encode(code);
 
-      const result = await genlayer.client?.deployContract({
-        account: accountsStore.selectedAccount as Account,
+      const result = await genlayerClient.value?.deployContract({
         code: code_bytes as any as string, // FIXME: code should accept both bytes and string in genlayer-js
         args: args.args,
         leaderOnly,
@@ -166,7 +166,7 @@ export function useContractQueries() {
       return mockContractSchema;
     }
 
-    const result = await genlayer.client?.getContractSchema(
+    const result = await genlayerClient.value?.getContractSchema(
       deployedContract.value?.address ?? '',
     );
 
@@ -181,7 +181,7 @@ export function useContractQueries() {
     },
   ) {
     try {
-      const result = await genlayer.client?.readContract({
+      const result = await genlayerClient.value?.readContract({
         address: address.value as Address,
         functionName: method,
         args: args.args,
@@ -211,8 +211,7 @@ export function useContractQueries() {
         throw new Error('Error writing to contract');
       }
 
-      const result = await genlayer.client?.writeContract({
-        account: accountsStore.selectedAccount as Account,
+      const result = await genlayerClient.value?.writeContract({
         address: address.value as Address,
         functionName: method,
         args: args.args,
diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index 9d49b1dda..b9ec5f07d 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -1,15 +1,14 @@
 import { simulator } from 'genlayer-js/chains';
-import { createClient } from 'genlayer-js';
-import type { Account, GenLayerClient } from 'genlayer-js/types';
-import { watch } from 'vue';
+import { createClient, createAccount } from 'genlayer-js';
+import type { GenLayerClient } from 'genlayer-js/types';
+import { ref, watch } from 'vue';
 import { useAccountsStore } from '@/stores';
 
-let client: GenLayerClient<typeof simulator> | null = null;
-
 export function useGenlayer() {
   const accountsStore = useAccountsStore();
+  const client = ref<GenLayerClient<typeof simulator> | null>(null);
 
-  if (!client) {
+  if (!client.value) {
     initClient();
   }
 
@@ -20,10 +19,10 @@ export function useGenlayer() {
   function initClient() {
     const clientAccount =
       accountsStore.selectedAccount?.type === 'local'
-        ? (accountsStore.selectedAccount as Account)
+        ? createAccount(accountsStore.selectedAccount?.privateKey)
         : accountsStore.selectedAccount?.address;
 
-    client = createClient({
+    client.value = createClient({
       chain: simulator,
       endpoint: import.meta.env.VITE_JSON_RPC_SERVER_URL,
       account: clientAccount,
diff --git a/frontend/src/plugins/persistStore.ts b/frontend/src/plugins/persistStore.ts
index 723ab4943..4e0d9698c 100644
--- a/frontend/src/plugins/persistStore.ts
+++ b/frontend/src/plugins/persistStore.ts
@@ -1,7 +1,7 @@
 import type { ContractFile, DeployedContract } from '@/types';
 import { type PiniaPluginContext } from 'pinia';
 import { useDb, useFileName } from '@/hooks';
-import type { AccountInfo } from '@/stores/accounts';
+import { toRaw } from 'vue';
 
 const ENABLE_LOGS = false;
 const db = useDb();
@@ -118,15 +118,15 @@ export function persistStorePlugin(context: PiniaPluginContext): void {
         switch (name) {
           case 'generateNewAccount':
           case 'removeAccount':
+          case 'fetchMetaMaskAccount':
+          case 'setCurrentAccount':
             localStorage.setItem(
               'accountsStore.accounts',
-              JSON.stringify(store.accounts),
+              JSON.stringify(toRaw(store.accounts)),
             );
-            break;
-          case 'setCurrentAccount':
             localStorage.setItem(
               'accountsStore.currentAccount',
-              JSON.stringify(store.currentAccount),
+              JSON.stringify(toRaw(store.selectedAccount)),
             );
             break;
           default:
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index e56f8b501..2f26aeba2 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -21,11 +21,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   const storedKeys = localStorage.getItem('accountsStore.privateKeys');
   if (storedKeys) {
     const privateKeys = storedKeys.split(',') as Address[];
-    accounts.value = privateKeys.map((key) => ({
-      type: 'local',
-      address: createAccount(key).address,
-      privateKey: key,
-    }));
+    accounts.value = privateKeys.map(createAccount);
     localStorage.removeItem('accountsStore.privateKeys');
     localStorage.removeItem('accountsStore.currentPrivateKey');
     localStorage.removeItem('accountsStore.accounts');
@@ -111,9 +107,10 @@ export const useAccountsStore = defineStore('accountsStore', () => {
 
   function generateNewAccount(): AccountInfo {
     const privateKey = generatePrivateKey();
+    const newAccountAddress = createAccount(privateKey).address;
     const newAccount: AccountInfo = {
       type: 'local',
-      address: createAccount(privateKey).address,
+      address: newAccountAddress,
       privateKey,
     };
 
diff --git a/frontend/src/stores/transactions.ts b/frontend/src/stores/transactions.ts
index 38b18a274..1b2f2ffe9 100644
--- a/frontend/src/stores/transactions.ts
+++ b/frontend/src/stores/transactions.ts
@@ -7,6 +7,7 @@ import { useContractsStore } from '@/stores';
 
 export const useTransactionsStore = defineStore('transactionsStore', () => {
   const genlayer = useGenlayer();
+  const genlayerClient = genlayer.client.value;
   const webSocketClient = useWebSocketClient();
   const transactions = ref<TransactionItem[]>([]);
   const contractsStore = useContractsStore();
@@ -53,7 +54,7 @@ export const useTransactionsStore = defineStore('transactionsStore', () => {
   }
 
   async function getTransaction(hash: TransactionHash) {
-    return genlayer.client?.getTransaction({ hash });
+    return genlayerClient?.getTransaction({ hash });
   }
 
   async function refreshPendingTransactions() {

From 540f56608fc3cbc4c7366e714a2a5e1dc257d592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Ramiro=20D=C3=ADaz?=
 <agustin.ramiro.diaz@gmail.com>
Date: Thu, 16 Jan 2025 11:32:52 -0300
Subject: [PATCH 19/30] fix transaction endpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>
---
 .../transactions_processor.py                 |  1 +
 tests/db-sqlalchemy/README.md                 |  7 +++
 tests/db-sqlalchemy/chain_snapshot_test.py    |  6 ++
 tests/db-sqlalchemy/requirements.txt          |  1 +
 .../transactions_processor_test.py            | 63 +++++++++++++++++--
 5 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 2bd6b58aa..af736311e 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -370,6 +370,7 @@ def set_transaction_appeal_failed(self, transaction_hash: str, appeal_failed: in
     def get_highest_timestamp(self) -> int:
         transaction = (
             self.session.query(Transactions)
+            .filter(Transactions.timestamp_accepted.isnot(None))
             .order_by(desc(Transactions.timestamp_accepted))
             .first()
         )
diff --git a/tests/db-sqlalchemy/README.md b/tests/db-sqlalchemy/README.md
index fcda69be3..4648a4e8e 100644
--- a/tests/db-sqlalchemy/README.md
+++ b/tests/db-sqlalchemy/README.md
@@ -1,3 +1,10 @@
+# TODO
+
+Some of these tests are not working
+
+- [ ] Fix them
+- [ ] Create a GitHub Action to run them in CI
+
 # SQLAlchemy integration tests
 
 ## Why
diff --git a/tests/db-sqlalchemy/chain_snapshot_test.py b/tests/db-sqlalchemy/chain_snapshot_test.py
index ec8d67d06..f74d1a3e4 100644
--- a/tests/db-sqlalchemy/chain_snapshot_test.py
+++ b/tests/db-sqlalchemy/chain_snapshot_test.py
@@ -23,6 +23,8 @@ def test_chain_snapshot(session: Session):
         s=None,
         v=None,
         leader_only=False,
+        ghost_contract_address=None,
+        appeal_failed=0,
         # triggered_by_hash=None,
     )
 
@@ -42,6 +44,8 @@ def test_chain_snapshot(session: Session):
         s=None,
         v=None,
         leader_only=False,
+        ghost_contract_address=None,
+        appeal_failed=0,
         # triggered_by_hash="0xdef",
     )
 
@@ -61,6 +65,8 @@ def test_chain_snapshot(session: Session):
         s=None,
         v=None,
         leader_only=False,
+        ghost_contract_address=None,
+        appeal_failed=0,
         # triggered_by_hash=None,
     )
 
diff --git a/tests/db-sqlalchemy/requirements.txt b/tests/db-sqlalchemy/requirements.txt
index d3290bd70..f0c509130 100644
--- a/tests/db-sqlalchemy/requirements.txt
+++ b/tests/db-sqlalchemy/requirements.txt
@@ -6,3 +6,4 @@ requests==2.32.3
 numpy==1.26.4
 eth-account==0.13.1
 python-dotenv==1.0.1
+web3==7.5.0
diff --git a/tests/db-sqlalchemy/transactions_processor_test.py b/tests/db-sqlalchemy/transactions_processor_test.py
index cd12346e1..01b954a82 100644
--- a/tests/db-sqlalchemy/transactions_processor_test.py
+++ b/tests/db-sqlalchemy/transactions_processor_test.py
@@ -1,10 +1,31 @@
+from sqlalchemy.orm import Session
+import pytest
+from unittest.mock import patch, MagicMock
+import os
 import math
 from datetime import datetime
 
-from backend.database_handler.transactions_processor import (
-    TransactionsProcessor,
-    TransactionStatus,
-)
+from backend.database_handler.chain_snapshot import ChainSnapshot
+from backend.database_handler.models import Transactions
+from backend.database_handler.transactions_processor import TransactionStatus
+from backend.database_handler.transactions_processor import TransactionsProcessor
+
+
+@pytest.fixture(autouse=True)
+def mock_env_and_web3():
+    with patch.dict(
+        os.environ,
+        {
+            "HARDHAT_PORT": "8545",
+            "HARDHAT_URL": "http://localhost",
+            "HARDHAT_PRIVATE_KEY": "0x0123456789",
+        },
+    ), patch("web3.Web3.HTTPProvider"), patch(
+        "web3.Web3.eth.accounts",
+        new_callable=MagicMock,
+        return_value=["0x0000000000000000000000000000000000000000"],
+    ):
+        yield
 
 
 def test_transactions_processor(transactions_processor: TransactionsProcessor):
@@ -98,3 +119,37 @@ def test_transactions_processor(transactions_processor: TransactionsProcessor):
     assert math.isclose(actual_transaction["value"], value)
     assert actual_transaction["type"] == transaction_type
     assert actual_transaction["created_at"] == created_at
+
+
+def test_get_highest_timestamp(transactions_processor: TransactionsProcessor):
+    # Initially should return 0 when no transactions exist
+    assert transactions_processor.get_highest_timestamp() == 0
+
+    # Create some transactions with different timestamps
+    from_address = "0x9F0e84243496AcFB3Cd99D02eA59673c05901501"
+    to_address = "0xAcec3A6d871C25F591aBd4fC24054e524BBbF794"
+    data = {"key": "value"}
+
+    # First transaction with timestamp 1000
+    tx1_hash = transactions_processor.insert_transaction(
+        from_address, to_address, data, 1.0, 1, 0, True
+    )
+    transactions_processor.session.commit()
+    assert transactions_processor.get_highest_timestamp() == 0
+    transactions_processor.set_transaction_timestamp_accepted(tx1_hash, 1000)
+
+    # Second transaction with timestamp 2000
+    tx2_hash = transactions_processor.insert_transaction(
+        from_address, to_address, data, 1.0, 1, 1, True
+    )
+    transactions_processor.set_transaction_timestamp_accepted(tx2_hash, 2000)
+
+    # Third transaction with no timestamp (should be ignored)
+    transactions_processor.insert_transaction(
+        from_address, to_address, data, 1.0, 1, 2, True
+    )
+
+    transactions_processor.session.commit()
+
+    # Should return the highest timestamp (2000)
+    assert transactions_processor.get_highest_timestamp() == 2000

From ef082f0565396906a08e672fd21438ae6763af11 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 18:25:10 +0100
Subject: [PATCH 20/30] chore: added type for GenLayerJS hook

---
 frontend/src/hooks/useGenlayer.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/hooks/useGenlayer.ts b/frontend/src/hooks/useGenlayer.ts
index b9ec5f07d..18b6b67c0 100644
--- a/frontend/src/hooks/useGenlayer.ts
+++ b/frontend/src/hooks/useGenlayer.ts
@@ -1,10 +1,15 @@
 import { simulator } from 'genlayer-js/chains';
 import { createClient, createAccount } from 'genlayer-js';
 import type { GenLayerClient } from 'genlayer-js/types';
-import { ref, watch } from 'vue';
+import { ref, watch, type Ref } from 'vue';
 import { useAccountsStore } from '@/stores';
 
-export function useGenlayer() {
+type UseGenlayerReturn = {
+  client: Ref<GenLayerClient<typeof simulator> | null>;
+  initClient: () => void;
+};
+
+export function useGenlayer(): UseGenlayerReturn {
   const accountsStore = useAccountsStore();
   const client = ref<GenLayerClient<typeof simulator> | null>(null);
 

From 66801b71f8dfb227fb950fd676570334af330125 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 18:25:48 +0100
Subject: [PATCH 21/30] fix: remove metamask account on disconnect

---
 frontend/src/stores/accounts.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 2f26aeba2..cc0180938 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -101,7 +101,20 @@ export const useAccountsStore = defineStore('accountsStore', () => {
         if (selectedAccount.value?.type === 'metamask') {
           setCurrentAccount(metamaskAccount);
         }
+      } else {
+        accounts.value = accounts.value.filter(
+          (acc) => acc.type !== 'metamask',
+        );
+        setCurrentAccount(accounts.value[0]);
       }
+      localStorage.setItem(
+        'accountsStore.accounts',
+        JSON.stringify(accounts.value),
+      );
+      localStorage.setItem(
+        'accountsStore.currentAccount',
+        JSON.stringify(selectedAccount.value),
+      );
     });
   }
 

From 47fb292a15209d51dd40645d38420ae6e2573ef4 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Thu, 16 Jan 2025 18:31:59 +0100
Subject: [PATCH 22/30] test: commented failing tests to allow build

---
 frontend/test/unit/stores/accounts.test.ts | 148 ++++++++++-----------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/frontend/test/unit/stores/accounts.test.ts b/frontend/test/unit/stores/accounts.test.ts
index 3ae79de0b..f037fe9f4 100644
--- a/frontend/test/unit/stores/accounts.test.ts
+++ b/frontend/test/unit/stores/accounts.test.ts
@@ -2,13 +2,13 @@ import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
 import { useAccountsStore } from '@/stores';
 import { useGenlayer } from '@/hooks';
-import { generatePrivateKey, createAccount } from 'genlayer-js';
+// import { generatePrivateKey, createAccount } from 'genlayer-js';
 
 const testKey1 =
   '0xb69426b0f5838a514b263868978faaa53057ac83c5ccad6b7fddbc051b052c6a'; // ! NEVER USE THIS PRIVATE KEY
 const testAddress1 = '0x0200E9994260fe8D40107E01101F807B2e7A29Da';
-const testKey2 =
-  '0x483b7a9b979289a227095c22229028a5debe04d6d1c8434d8bd5b48f78544263'; // ! NEVER USE THIS PRIVATE KEY
+// const testKey2 =
+//   '0x483b7a9b979289a227095c22229028a5debe04d6d1c8434d8bd5b48f78544263'; // ! NEVER USE THIS PRIVATE KEY
 
 vi.mock('@/hooks', () => ({
   useGenlayer: vi.fn(),
@@ -54,100 +54,100 @@ describe('useAccountsStore', () => {
     const generatedKey = accountsStore.generateNewAccount();
 
     expect(generatedKey).toBe(newPrivateKey);
-    expect(accountsStore.privateKeys).toContain(newPrivateKey);
-    expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
+    // expect(accountsStore.privateKeys).toContain(newPrivateKey);
+    // expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
   });
 
-  it('should remove an account and default to existing one', () => {
-    accountsStore.privateKeys = [testKey1, testKey2];
-    accountsStore.currentPrivateKey = testKey1;
+  // it('should remove an account and default to existing one', () => {
+  //   accountsStore.privateKeys = [testKey1, testKey2];
+  //   accountsStore.currentPrivateKey = testKey1;
 
-    accountsStore.removeAccount(testKey1);
+  //   accountsStore.removeAccount(testKey1);
 
-    expect(accountsStore.privateKeys).toEqual([testKey2]);
-    expect(accountsStore.currentPrivateKey).toBe(testKey2);
-  });
+  //   expect(accountsStore.privateKeys).toEqual([testKey2]);
+  //   expect(accountsStore.currentPrivateKey).toBe(testKey2);
+  // });
 
-  it('should throw error when removing the last account', () => {
-    accountsStore.privateKeys = [testKey1];
+  // it('should throw error when removing the last account', () => {
+  //   accountsStore.privateKeys = [testKey1];
 
-    expect(() => accountsStore.removeAccount(testKey1)).toThrow(
-      'You need at least 1 account',
-    );
-  });
+  //   expect(() => accountsStore.removeAccount(testKey1)).toThrow(
+  //     'You need at least 1 account',
+  //   );
+  // });
 
-  it('should handle errors in displayAddress computation', () => {
-    accountsStore.currentPrivateKey = '0xinvalidkey';
+  // it('should handle errors in displayAddress computation', () => {
+  //   accountsStore.currentPrivateKey = '0xinvalidkey';
 
-    (createAccount as Mock).mockImplementation(() => {
-      throw new Error('Invalid private key');
-    });
+  //   (createAccount as Mock).mockImplementation(() => {
+  //     throw new Error('Invalid private key');
+  //   });
 
-    const consoleSpy = vi.spyOn(console, 'error');
-    consoleSpy.mockImplementation(() => {});
+  //   const consoleSpy = vi.spyOn(console, 'error');
+  //   consoleSpy.mockImplementation(() => {});
 
-    expect(accountsStore.displayAddress).toBe('0x');
+  //   expect(accountsStore.displayAddress).toBe('0x');
 
-    consoleSpy.mockRestore();
-    (createAccount as Mock).mockRestore();
-  });
+  //   consoleSpy.mockRestore();
+  //   (createAccount as Mock).mockRestore();
+  // });
 
-  it('should set current account', () => {
-    const newPrivateKey = testKey2;
-    accountsStore.setCurrentAccount(newPrivateKey);
+  // it('should set current account', () => {
+  //   const newPrivateKey = testKey2;
+  //   accountsStore.setCurrentAccount(newPrivateKey);
 
-    expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
-  });
+  //   expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
+  // });
 
-  it('should compute currentUserAddress correctly', () => {
-    const privateKey = testKey1;
-    const account = { address: testAddress1 };
-    accountsStore.currentPrivateKey = privateKey;
+  // it('should compute currentUserAddress correctly', () => {
+  //   const privateKey = testKey1;
+  //   const account = { address: testAddress1 };
+  //   accountsStore.currentPrivateKey = privateKey;
 
-    expect(accountsStore.currentUserAddress).toBe(testAddress1);
-    expect(createAccount).toHaveBeenCalledWith(privateKey);
-  });
+  //   expect(accountsStore.currentUserAddress).toBe(testAddress1);
+  //   expect(createAccount).toHaveBeenCalledWith(privateKey);
+  // });
 
-  it('should return an empty string for currentUserAddress when no private key is set', () => {
-    accountsStore.currentPrivateKey = null;
-    expect(accountsStore.currentUserAddress).toBe('');
-  });
+  // it('should return an empty string for currentUserAddress when no private key is set', () => {
+  //   accountsStore.currentPrivateKey = null;
+  //   expect(accountsStore.currentUserAddress).toBe('');
+  // });
 });
 
-describe('fetchMetaMaskAccount', () => {
-  let accountsStore: ReturnType<typeof useAccountsStore>;
+// describe('fetchMetaMaskAccount', () => {
+//   let accountsStore: ReturnType<typeof useAccountsStore>;
 
-  beforeEach(() => {
-    setActivePinia(createPinia());
-    accountsStore = useAccountsStore();
+//   beforeEach(() => {
+//     setActivePinia(createPinia());
+//     accountsStore = useAccountsStore();
 
-    // Mock `window.ethereum`
-    vi.stubGlobal('window', {
-      ethereum: {
-        request: vi.fn(),
-        on: vi.fn(),
-      },
-    });
-  });
+//     // Mock `window.ethereum`
+//     vi.stubGlobal('window', {
+//       ethereum: {
+//         request: vi.fn(),
+//         on: vi.fn(),
+//       },
+//     });
+//   });
 
-  it('should fetch the MetaMask account and set walletAddress', async () => {
-    const testAccount = '0x1234567890abcdef1234567890abcdef12345678';
-    (window?.ethereum?.request as Mock).mockResolvedValueOnce([testAccount]);
+//   it('should fetch the MetaMask account and set walletAddress', async () => {
+//     const testAccount = '0x1234567890abcdef1234567890abcdef12345678';
+//     (window?.ethereum?.request as Mock).mockResolvedValueOnce([testAccount]);
 
-    await accountsStore.fetchMetaMaskAccount();
+//     await accountsStore.fetchMetaMaskAccount();
 
-    expect(window?.ethereum?.request).toHaveBeenCalledWith({
-      method: 'eth_requestAccounts',
-    });
-    expect(accountsStore.walletAddress).toBe(testAccount);
-    expect(accountsStore.isWalletSelected).toBe(true);
-  });
+//     expect(window?.ethereum?.request).toHaveBeenCalledWith({
+//       method: 'eth_requestAccounts',
+//     });
+//     expect(accountsStore.walletAddress).toBe(testAccount);
+//     expect(accountsStore.isWalletSelected).toBe(true);
+//   });
 
-  it('should not set walletAddress if window.ethereum is undefined', async () => {
-    vi.stubGlobal('window', {}); // Remove ethereum from window object
+//   it('should not set walletAddress if window.ethereum is undefined', async () => {
+//     vi.stubGlobal('window', {}); // Remove ethereum from window object
 
-    await accountsStore.fetchMetaMaskAccount();
+//     await accountsStore.fetchMetaMaskAccount();
 
-    expect(accountsStore.walletAddress).toBe(undefined);
-  });
-});
+//     expect(accountsStore.walletAddress).toBe(undefined);
+//   });
+// });

From d847f8d486b963045017ae36fc5b56195a05b897 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Fri, 17 Jan 2025 00:42:56 +0100
Subject: [PATCH 23/30] fis: account store tests

---
 frontend/test/unit/stores/accounts.test.ts | 192 ++++++++++++---------
 1 file changed, 111 insertions(+), 81 deletions(-)

diff --git a/frontend/test/unit/stores/accounts.test.ts b/frontend/test/unit/stores/accounts.test.ts
index f037fe9f4..e5738c704 100644
--- a/frontend/test/unit/stores/accounts.test.ts
+++ b/frontend/test/unit/stores/accounts.test.ts
@@ -1,14 +1,13 @@
 import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
-import { useAccountsStore } from '@/stores';
+import { useAccountsStore, type AccountInfo } from '@/stores';
 import { useGenlayer } from '@/hooks';
-// import { generatePrivateKey, createAccount } from 'genlayer-js';
 
 const testKey1 =
   '0xb69426b0f5838a514b263868978faaa53057ac83c5ccad6b7fddbc051b052c6a'; // ! NEVER USE THIS PRIVATE KEY
 const testAddress1 = '0x0200E9994260fe8D40107E01101F807B2e7A29Da';
-// const testKey2 =
-//   '0x483b7a9b979289a227095c22229028a5debe04d6d1c8434d8bd5b48f78544263'; // ! NEVER USE THIS PRIVATE KEY
+const testKey2 =
+  '0x483b7a9b979289a227095c22229028a5debe04d6d1c8434d8bd5b48f78544263'; // ! NEVER USE THIS PRIVATE KEY
 
 vi.mock('@/hooks', () => ({
   useGenlayer: vi.fn(),
@@ -50,104 +49,135 @@ describe('useAccountsStore', () => {
   });
 
   it('should generate a new account', () => {
-    const newPrivateKey = testKey1;
-    const generatedKey = accountsStore.generateNewAccount();
+    const newAccount = accountsStore.generateNewAccount();
 
-    expect(generatedKey).toBe(newPrivateKey);
-    // expect(accountsStore.privateKeys).toContain(newPrivateKey);
-    // expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
+    expect(newAccount).toEqual({
+      type: 'local',
+      address: testAddress1,
+      privateKey: testKey1,
+    });
+    expect(accountsStore.accounts).toContainEqual(newAccount);
+    expect(accountsStore.selectedAccount).toEqual(newAccount);
   });
 
-  // it('should remove an account and default to existing one', () => {
-  //   accountsStore.privateKeys = [testKey1, testKey2];
-  //   accountsStore.currentPrivateKey = testKey1;
-
-  //   accountsStore.removeAccount(testKey1);
-
-  //   expect(accountsStore.privateKeys).toEqual([testKey2]);
-  //   expect(accountsStore.currentPrivateKey).toBe(testKey2);
-  // });
+  it('should remove an account and default to existing one', () => {
+    const account1 = {
+      type: 'local' as const,
+      address: testAddress1,
+      privateKey: testKey1,
+    } as AccountInfo;
+    const account2 = {
+      type: 'local' as const,
+      address: '0x456',
+      privateKey: testKey2,
+    } as AccountInfo;
+    accountsStore.accounts = [account1, account2];
+    accountsStore.selectedAccount = account1;
+
+    accountsStore.removeAccount(account1);
+
+    expect(accountsStore.accounts).toEqual([account2]);
+    expect(accountsStore.selectedAccount).toEqual(account2);
+  });
 
-  // it('should throw error when removing the last account', () => {
-  //   accountsStore.privateKeys = [testKey1];
+  it('should throw error when removing the last local account', () => {
+    const account1 = {
+      type: 'local' as const,
+      address: testAddress1,
+      privateKey: testKey1,
+    } as AccountInfo;
+    accountsStore.accounts = [account1];
+
+    expect(() => accountsStore.removeAccount(account1)).toThrow(
+      'You need at least 1 local account',
+    );
+  });
 
-  //   expect(() => accountsStore.removeAccount(testKey1)).toThrow(
-  //     'You need at least 1 account',
-  //   );
-  // });
+  it('should handle errors in displayAddress computation', () => {
+    const invalidAccount = {
+      type: 'local' as const,
+      address: '0xinvalid',
+      privateKey: '0xinvalidkey',
+    } as AccountInfo;
+    accountsStore.selectedAccount = invalidAccount;
 
-  // it('should handle errors in displayAddress computation', () => {
-  //   accountsStore.currentPrivateKey = '0xinvalidkey';
+    const consoleSpy = vi.spyOn(console, 'error');
+    consoleSpy.mockImplementation(() => {});
 
-  //   (createAccount as Mock).mockImplementation(() => {
-  //     throw new Error('Invalid private key');
-  //   });
+    expect(accountsStore.displayAddress).toBe('0x');
 
-  //   const consoleSpy = vi.spyOn(console, 'error');
-  //   consoleSpy.mockImplementation(() => {});
+    consoleSpy.mockRestore();
+  });
 
-  //   expect(accountsStore.displayAddress).toBe('0x');
+  it('should set current account', () => {
+    const account2 = {
+      type: 'local' as const,
+      address: '0x456',
+      privateKey: testKey2,
+    } as AccountInfo;
+    accountsStore.setCurrentAccount(account2);
 
-  //   consoleSpy.mockRestore();
-  //   (createAccount as Mock).mockRestore();
-  // });
+    expect(accountsStore.selectedAccount).toEqual(account2);
+  });
 
-  // it('should set current account', () => {
-  //   const newPrivateKey = testKey2;
-  //   accountsStore.setCurrentAccount(newPrivateKey);
+  it('should compute currentUserAddress correctly', () => {
+    const account1 = {
+      type: 'local' as const,
+      address: testAddress1,
+      privateKey: testKey1,
+    } as AccountInfo;
+    accountsStore.selectedAccount = account1;
 
-  //   expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
-  // });
+    expect(accountsStore.currentUserAddress).toBe(testAddress1);
+  });
 
-  // it('should compute currentUserAddress correctly', () => {
-  //   const privateKey = testKey1;
-  //   const account = { address: testAddress1 };
-  //   accountsStore.currentPrivateKey = privateKey;
+  it('should return an empty string for currentUserAddress when no account is selected', () => {
+    accountsStore.selectedAccount = null;
+    expect(accountsStore.currentUserAddress).toBe('');
+  });
+});
 
-  //   expect(accountsStore.currentUserAddress).toBe(testAddress1);
-  //   expect(createAccount).toHaveBeenCalledWith(privateKey);
-  // });
+describe('fetchMetaMaskAccount', () => {
+  let accountsStore: ReturnType<typeof useAccountsStore>;
 
-  // it('should return an empty string for currentUserAddress when no private key is set', () => {
-  //   accountsStore.currentPrivateKey = null;
-  //   expect(accountsStore.currentUserAddress).toBe('');
-  // });
-});
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    accountsStore = useAccountsStore();
 
-// describe('fetchMetaMaskAccount', () => {
-//   let accountsStore: ReturnType<typeof useAccountsStore>;
+    // Mock `window.ethereum`
+    vi.stubGlobal('window', {
+      ethereum: {
+        request: vi.fn(),
+        on: vi.fn(),
+      },
+    });
+  });
 
-//   beforeEach(() => {
-//     setActivePinia(createPinia());
-//     accountsStore = useAccountsStore();
+  it('should fetch the MetaMask account and set it as selected', async () => {
+    const testAccount = '0x1234567890abcdef1234567890abcdef12345678';
+    (window?.ethereum?.request as Mock).mockResolvedValueOnce([testAccount]);
 
-//     // Mock `window.ethereum`
-//     vi.stubGlobal('window', {
-//       ethereum: {
-//         request: vi.fn(),
-//         on: vi.fn(),
-//       },
-//     });
-//   });
+    await accountsStore.fetchMetaMaskAccount();
 
-//   it('should fetch the MetaMask account and set walletAddress', async () => {
-//     const testAccount = '0x1234567890abcdef1234567890abcdef12345678';
-//     (window?.ethereum?.request as Mock).mockResolvedValueOnce([testAccount]);
+    expect(window?.ethereum?.request).toHaveBeenCalledWith({
+      method: 'eth_requestAccounts',
+    });
 
-//     await accountsStore.fetchMetaMaskAccount();
+    const expectedMetaMaskAccount = {
+      type: 'metamask',
+      address: testAccount,
+    };
 
-//     expect(window?.ethereum?.request).toHaveBeenCalledWith({
-//       method: 'eth_requestAccounts',
-//     });
-//     expect(accountsStore.walletAddress).toBe(testAccount);
-//     expect(accountsStore.isWalletSelected).toBe(true);
-//   });
+    expect(accountsStore.accounts).toContainEqual(expectedMetaMaskAccount);
+    expect(accountsStore.selectedAccount).toEqual(expectedMetaMaskAccount);
+  });
 
-//   it('should not set walletAddress if window.ethereum is undefined', async () => {
-//     vi.stubGlobal('window', {}); // Remove ethereum from window object
+  it('should not modify accounts if window.ethereum is undefined', async () => {
+    vi.stubGlobal('window', {}); // Remove ethereum from window object
+    const initialAccounts = [...accountsStore.accounts];
 
-//     await accountsStore.fetchMetaMaskAccount();
+    await accountsStore.fetchMetaMaskAccount();
 
-//     expect(accountsStore.walletAddress).toBe(undefined);
-//   });
-// });
+    expect(accountsStore.accounts).toEqual(initialAccounts);
+  });
+});

From d04d8a2aead00e653af731ee827f7f4d9938f086 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Fri, 17 Jan 2025 01:01:14 +0100
Subject: [PATCH 24/30] fix: account tests

---
 frontend/src/hooks/useShortAddress.ts      |  2 +-
 frontend/src/stores/accounts.ts            | 13 +++++++++++--
 frontend/test/unit/stores/accounts.test.ts |  4 +---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/hooks/useShortAddress.ts b/frontend/src/hooks/useShortAddress.ts
index d8e5fb76f..9c93eae34 100644
--- a/frontend/src/hooks/useShortAddress.ts
+++ b/frontend/src/hooks/useShortAddress.ts
@@ -1,7 +1,7 @@
 export const useShortAddress = () => {
   function shorten(address?: string) {
     if (!address) {
-      return '';
+      return '0x';
     }
 
     const maxChars = 4;
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index cc0180938..2341c2d26 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -144,7 +144,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       (acc) => acc.address !== accountToRemove.address,
     );
 
-    if (selectedAccount.value === accountToRemove) {
+    if (selectedAccount.value?.address === accountToRemove.address) {
       const firstLocalAccount = accounts.value.find(
         (acc) => acc.type === 'local',
       );
@@ -157,7 +157,16 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   }
 
   const displayAddress = computed(() => {
-    if (!selectedAccount.value) return '';
+    if (!selectedAccount.value) return '0x';
+    if (selectedAccount.value.address.startsWith('0x')) {
+      if (selectedAccount.value.address.length !== 42) {
+        return '0x';
+      }
+    }
+    if (selectedAccount.value.address.length !== 40) {
+      return '0x';
+    }
+
     try {
       return shorten(selectedAccount.value.address);
     } catch (err) {
diff --git a/frontend/test/unit/stores/accounts.test.ts b/frontend/test/unit/stores/accounts.test.ts
index e5738c704..a48731a43 100644
--- a/frontend/test/unit/stores/accounts.test.ts
+++ b/frontend/test/unit/stores/accounts.test.ts
@@ -11,9 +11,7 @@ const testKey2 =
 
 vi.mock('@/hooks', () => ({
   useGenlayer: vi.fn(),
-  useShortAddress: vi.fn(() => ({
-    shorten: vi.fn(),
-  })),
+  useShortAddress: vi.fn(() => ({})),
 }));
 
 vi.mock('genlayer-js', () => ({

From d30f112dfb2a13fe66e83282c44ddfb8340262e4 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Fri, 17 Jan 2025 01:06:00 +0100
Subject: [PATCH 25/30] fix: transactions tests

---
 frontend/src/stores/transactions.ts            | 2 +-
 frontend/test/unit/stores/transactions.test.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/stores/transactions.ts b/frontend/src/stores/transactions.ts
index 1b2f2ffe9..41a50a8cc 100644
--- a/frontend/src/stores/transactions.ts
+++ b/frontend/src/stores/transactions.ts
@@ -7,7 +7,7 @@ import { useContractsStore } from '@/stores';
 
 export const useTransactionsStore = defineStore('transactionsStore', () => {
   const genlayer = useGenlayer();
-  const genlayerClient = genlayer.client.value;
+  const genlayerClient = genlayer.client?.value;
   const webSocketClient = useWebSocketClient();
   const transactions = ref<TransactionItem[]>([]);
   const contractsStore = useContractsStore();
diff --git a/frontend/test/unit/stores/transactions.test.ts b/frontend/test/unit/stores/transactions.test.ts
index fa1d0fba8..3f13b6715 100644
--- a/frontend/test/unit/stores/transactions.test.ts
+++ b/frontend/test/unit/stores/transactions.test.ts
@@ -58,7 +58,9 @@ describe('useTransactionsStore', () => {
 
   beforeEach(() => {
     setActivePinia(createPinia());
-    (useGenlayer as Mock).mockReturnValue({ client: mockGenlayerClient });
+    (useGenlayer as Mock).mockReturnValue({
+      client: { value: mockGenlayerClient },
+    });
     (useDb as Mock).mockReturnValue(mockDb);
     transactionsStore = useTransactionsStore();
     transactionsStore.transactions = [];

From 2cac1628eb701514ac29f65d62a36f16930bbf29 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Fri, 17 Jan 2025 13:19:42 +0100
Subject: [PATCH 26/30] fix: show sorten address

---
 frontend/src/stores/accounts.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 2341c2d26..6706b7fa7 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -162,8 +162,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       if (selectedAccount.value.address.length !== 42) {
         return '0x';
       }
-    }
-    if (selectedAccount.value.address.length !== 40) {
+    } else if (selectedAccount.value.address.length !== 40) {
       return '0x';
     }
 

From e07e893a1c8bca1416bb65beb357071318152911 Mon Sep 17 00:00:00 2001
From: Den <den@Deniss-MacBook-Pro.local>
Date: Mon, 20 Jan 2025 14:35:06 +0700
Subject: [PATCH 27/30] fix: button spacing

---
 frontend/src/components/Simulator/AccountSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Simulator/AccountSelect.vue b/frontend/src/components/Simulator/AccountSelect.vue
index d05c53c85..3022015f1 100644
--- a/frontend/src/components/Simulator/AccountSelect.vue
+++ b/frontend/src/components/Simulator/AccountSelect.vue
@@ -58,7 +58,7 @@ const connectMetaMask = async () => {
       </div>
 
       <div
-        class="flex w-full border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
+        class="flex w-full flex-row gap-1 border-t border-gray-300 bg-gray-200 p-1 dark:border-gray-600 dark:bg-gray-800"
       >
         <Btn
           @click="handleCreateNewAccount"

From 429d1c884e50c234c0c3cc9577e54934336e24c3 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Mon, 20 Jan 2025 16:46:02 +0100
Subject: [PATCH 28/30] fix: handling error connecting metamask

---
 frontend/src/stores/accounts.ts | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 6706b7fa7..726b70719 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -3,6 +3,7 @@ import { computed, ref } from 'vue';
 import type { Address } from '@/types';
 import { createAccount, generatePrivateKey } from 'genlayer-js';
 import { useShortAddress } from '@/hooks';
+import { notify } from '@kyvg/vue3-notification';
 
 export interface AccountInfo {
   type: 'local' | 'metamask';
@@ -59,28 +60,34 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   }
 
   async function fetchMetaMaskAccount() {
-    if (window.ethereum) {
-      const ethAccounts = await window.ethereum.request({
-        method: 'eth_requestAccounts',
+    if (!window.ethereum) {
+      notify({
+        title: 'MetaMask is not installed',
+        type: 'error',
       });
+      return;
+    }
 
-      const metamaskAccount: AccountInfo = {
-        type: 'metamask',
-        address: ethAccounts[0] as Address,
-      };
+    const ethAccounts = await window.ethereum.request({
+      method: 'eth_requestAccounts',
+    });
 
-      // Update or add MetaMask account
-      const existingMetaMaskIndex = accounts.value.findIndex(
-        (acc) => acc.type === 'metamask',
-      );
-      if (existingMetaMaskIndex >= 0) {
-        accounts.value[existingMetaMaskIndex] = metamaskAccount;
-      } else {
-        accounts.value.push(metamaskAccount);
-      }
+    const metamaskAccount: AccountInfo = {
+      type: 'metamask',
+      address: ethAccounts[0] as Address,
+    };
 
-      setCurrentAccount(metamaskAccount);
+    // Update or add MetaMask account
+    const existingMetaMaskIndex = accounts.value.findIndex(
+      (acc) => acc.type === 'metamask',
+    );
+    if (existingMetaMaskIndex >= 0) {
+      accounts.value[existingMetaMaskIndex] = metamaskAccount;
+    } else {
+      accounts.value.push(metamaskAccount);
     }
+
+    setCurrentAccount(metamaskAccount);
   }
 
   if (window.ethereum) {

From 437bb94b5fe82d9825cd6a020f90228f36edd2ea Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Tue, 21 Jan 2025 11:30:26 +0100
Subject: [PATCH 29/30] fix: disable nonce check as a workaraund for metamask
 not sending the nonce

---
 backend/database_handler/transactions_processor.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 00fdcb230..83702c23a 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -133,10 +133,12 @@ def insert_transaction(
     ) -> str:
         current_nonce = self.get_transaction_count(from_address)
 
-        if nonce != current_nonce:
-            raise Exception(
-                f"Unexpected nonce. Provided: {nonce}, expected: {current_nonce}"
-            )
+        # Follow up: https://github.com/MetaMask/metamask-extension/issues/29787
+        # to uncomment this check
+        # if nonce != current_nonce:
+        #     raise Exception(
+        #         f"Unexpected nonce. Provided: {nonce}, expected: {current_nonce}"
+        #     )
 
         transaction_hash = self._generate_transaction_hash(
             from_address, to_address, data, value, type, nonce

From 228830b8cd7bd7fe5abced0d112e54303ba4e073 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Tue, 21 Jan 2025 12:54:06 +0100
Subject: [PATCH 30/30] fix: set nonce manually on inserting transaction

---
 backend/database_handler/transactions_processor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 83702c23a..fb406e31b 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -141,7 +141,7 @@ def insert_transaction(
         #     )
 
         transaction_hash = self._generate_transaction_hash(
-            from_address, to_address, data, value, type, nonce
+            from_address, to_address, data, value, type, current_nonce
         )
         ghost_contract_address = None