From c06da9506269488850710db3703aeac38fac1f66 Mon Sep 17 00:00:00 2001
From: den <26140541+denishacquin@users.noreply.github.com>
Date: Thu, 29 Aug 2024 16:01:16 +0200
Subject: [PATCH 1/8] fix: 409 sim fe alow horizontal scroll when there is
 syntax error in the contract (#430)

* fix: layout issue when display syntax error

* fix: default value in watcher triggering error

---------

Co-authored-by: Den <den@Deniss-MacBook-Pro.local>
---
 .../src/components/Simulator/CodeEditor.vue   | 52 +++++++++----------
 .../Simulator/ConstructorParameters.vue       |  2 +-
 .../components/Simulator/ContractsPanel.vue   | 20 +++----
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/Simulator/CodeEditor.vue b/frontend/src/components/Simulator/CodeEditor.vue
index cae3aa5b4..a54c350ab 100644
--- a/frontend/src/components/Simulator/CodeEditor.vue
+++ b/frontend/src/components/Simulator/CodeEditor.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import { ref, shallowRef, watch, computed } from 'vue';
 import { pythonSyntaxDefinition } from '@/utils';
+import { ref, shallowRef, watch, computed, onMounted } from 'vue';
 import { useContractsStore, useUIStore } from '@/stores';
 import { type ContractFile } from '@/types';
 
@@ -16,33 +16,29 @@ const containerElement = ref<HTMLElement | null | undefined>(null);
 const editorRef = shallowRef<monaco.editor.IStandaloneCodeEditor | null>(null);
 const theme = computed(() => (uiStore.mode === 'light' ? 'vs' : 'vs-dark'));
 
-watch(
-  () => editorElement.value,
-  (newValue) => {
-    if (!editorRef.value && newValue) {
-      containerElement.value = editorElement.value?.parentNode?.parentElement;
-      monaco.languages.register({ id: 'python' });
-      monaco.languages.setMonarchTokensProvider(
-        'python',
-        pythonSyntaxDefinition,
-      );
-      editorRef.value = monaco.editor.create(editorElement.value!, {
-        value: props.contract.content || '',
-        language: 'python',
-        theme: theme.value,
-        automaticLayout: true,
-        formatOnPaste: true,
-        formatOnType: true,
-      });
-      editorRef.value.onDidChangeModelContent(() => {
-        contractStore.updateContractFile(props.contract.id!, {
-          content: editorRef.value?.getValue() || '',
-          updatedAt: new Date().toISOString(),
-        });
-      });
-    }
-  },
-);
+function initEditor() {
+  containerElement.value = editorElement.value?.parentElement;
+  monaco.languages.register({ id: 'python' });
+  monaco.languages.setMonarchTokensProvider('python', pythonSyntaxDefinition);
+  editorRef.value = monaco.editor.create(editorElement.value!, {
+    value: props.contract.content || '',
+    language: 'python',
+    theme: theme.value,
+    automaticLayout: true,
+    formatOnPaste: true,
+    formatOnType: true,
+  });
+  editorRef.value.onDidChangeModelContent(() => {
+    contractStore.updateContractFile(props.contract.id!, {
+      content: editorRef.value?.getValue() || '',
+      updatedAt: new Date().toISOString(),
+    });
+  });
+}
+
+onMounted(() => {
+  initEditor();
+});
 
 watch(
   () => uiStore.mode,
diff --git a/frontend/src/components/Simulator/ConstructorParameters.vue b/frontend/src/components/Simulator/ConstructorParameters.vue
index f27e6e645..1d730a730 100644
--- a/frontend/src/components/Simulator/ConstructorParameters.vue
+++ b/frontend/src/components/Simulator/ConstructorParameters.vue
@@ -119,7 +119,7 @@ const mapInputs = (inputs: { [k: string]: string }) =>
 watch(
   () => constructorInputs.value,
   (newValue) => {
-    setInputParams(newValue || {});
+    setInputParams(newValue || []);
   },
 );
 
diff --git a/frontend/src/components/Simulator/ContractsPanel.vue b/frontend/src/components/Simulator/ContractsPanel.vue
index d8a04fb13..d512559a2 100644
--- a/frontend/src/components/Simulator/ContractsPanel.vue
+++ b/frontend/src/components/Simulator/ContractsPanel.vue
@@ -84,20 +84,22 @@ const handleHorizontalScroll = (event: WheelEvent) => {
 
     <HomeTab v-show="showHome" />
 
-    <div
-      v-if="!!error"
-      class="left-O right-O absolute bottom-0 z-10 w-full bg-red-500 px-2 py-1 text-sm text-white"
-    >
-      {{ error }}
-    </div>
-
     <div
       v-for="contract in contracts"
       :key="contract.id"
-      class="relative flex h-full w-full"
+      class="relative flex h-full w-full flex-col overflow-hidden"
       v-show="contract.id === store.currentContractId"
     >
-      <CodeEditor :contract="contract" @run-debug="handleRunDebug" />
+      <div class="flex h-full w-full grow overflow-hidden">
+        <CodeEditor :contract="contract" @run-debug="handleRunDebug" />
+      </div>
+
+      <div
+        v-if="!!error"
+        class="w-full shrink-0 bg-red-500 px-2 py-1 text-sm text-white"
+      >
+        {{ error }}
+      </div>
     </div>
   </div>
 </template>

From 2c162209513ec4879e23e2690ec97e2fbe9cd0b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20D=C3=ADaz?=
 <49416765+AgustinRamiroDiaz@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:52:33 -0300
Subject: [PATCH 2/8] ci: gh action to validate pr title  (#429)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove conventional pre-commit hook

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* add conventional commit check for PR

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* disable labels

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat: check for PRs

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: handle staging branch

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

---------

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>
---
 .github/workflows/conventional-commit-pr.yml  | 16 ++++++++++++
 .../only-merge-release-branches-to-main.yml   | 26 +++++++++++++++++++
 .pre-commit-config.yaml                       |  6 -----
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/conventional-commit-pr.yml
 create mode 100644 .github/workflows/only-merge-release-branches-to-main.yml

diff --git a/.github/workflows/conventional-commit-pr.yml b/.github/workflows/conventional-commit-pr.yml
new file mode 100644
index 000000000..4d42d2b56
--- /dev/null
+++ b/.github/workflows/conventional-commit-pr.yml
@@ -0,0 +1,16 @@
+name: PR Conventional Commit Validation
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+    branches: [staging]
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Conventional Commit Validation
+        uses: ytanikin/PRConventionalCommits@1.2.0
+        with:
+          task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert"]'
+          add_label: "false"
diff --git a/.github/workflows/only-merge-release-branches-to-main.yml b/.github/workflows/only-merge-release-branches-to-main.yml
new file mode 100644
index 000000000..be740e7ad
--- /dev/null
+++ b/.github/workflows/only-merge-release-branches-to-main.yml
@@ -0,0 +1,26 @@
+name: Only merge release branches to main
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+    branches:
+      - main
+      - staging
+
+jobs:
+  validate-pr-source-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if source branch is a release branch
+        run: |
+          if [[ ${{ github.event.pull_request.base.ref }} == "staging" ]]; then
+              echo "Target branch is staging"
+              exit 0
+          fi
+          if [[ ${{ github.event.pull_request.head.ref }} =~ ^release/.*$ ]]; then
+              echo "Source branch is a release branch"
+              exit 0
+          else
+              echo "Source branch is not a release branch"
+              exit 1
+          fi
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7644bd324..28a687cdd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,12 +39,6 @@ repos:
         entry: sh -c "cd frontend && npm run format"
         language: system
         files: frontend
-  - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v3.4.0
-    hooks:
-      - id: conventional-pre-commit
-        stages: [commit-msg]
-        args: []
 
 default_install_hook_types:
   - pre-commit

From 32604163814065de10c5fd132f4c04c2b7e63fcf Mon Sep 17 00:00:00 2001
From: den <26140541+denishacquin@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:07:30 +0200
Subject: [PATCH 3/8] refactor: refactor services and clients (#419)

* refactor: convert rpc client to a hook instead of provide/inject

* refactor: web3 hook

* refactor: short address hook

* refactor: db hook

* fix: remove db version redundancy

* refactor: ws hook

* refactor: rpc client/hook

* refactor: input map hook, move useContractQueries to hooks index

* refactor: python syntax hook

* refactor: filename hook

* refactor: setup stores

* refactor: rename eth to wallet

* fix: wrong input mapping

* refactor: normalize naming for wallet methods

* fix: update omitted replace

* fix: replace updated method

* fix: consistently delete example contracts on reset storage

* fix: don't reload all example files when they already exist with a change

* fix: remove comment

* fix: allow id param on tx items

* fix: load opened files correctly from storage, remove some legacy code

* refactor: move shortenAddress to useWallet hook and simplify it's definition

* refactor: move python syntax to a constant

* refactor: web client

* refactor: wrap web3 methods

* fix: adapt implementations after web3 wallet wrapping

* fix: use lodash debounce instead of vue-debounce because of breaking deps in testing

* fix: wrong typing

---------

Co-authored-by: Den <den@Deniss-MacBook-Pro.local>
Co-authored-by: Den <den@deniss-mbp.home>
---
 frontend/package-lock.json                    | 15 ++--
 frontend/package.json                         |  2 +-
 frontend/src/App.vue                          |  3 +-
 frontend/src/{utils => clients}/rpc.ts        |  0
 frontend/src/clients/web3.ts                  | 38 +++++++++
 .../src/components/JsonViewer/json-viewer.vue |  2 +-
 .../src/components/Simulator/CodeEditor.vue   |  4 +-
 .../Simulator/ConstructorParameters.vue       | 12 ++-
 .../src/components/Simulator/ContractInfo.vue |  4 +-
 .../Simulator/ContractMethodItem.vue          |  9 ++-
 .../Simulator/ContractReadMethods.vue         |  2 +-
 .../Simulator/ContractWriteMethods.vue        |  2 +-
 .../components/Simulator/ContractsPanel.vue   |  2 +-
 .../components/Tutorial/TutorialContainer.vue |  2 -
 .../editor.ts => constants/pythonSyntax.ts}   |  4 +-
 frontend/src/hooks/index.ts                   |  8 ++
 frontend/src/hooks/useContractQueries.ts      | 34 ++++----
 frontend/src/{utils/db.ts => hooks/useDb.ts}  | 14 ++--
 frontend/src/hooks/useFileName.ts             | 13 ++++
 .../{utils/inputs.ts => hooks/useInputMap.ts} | 14 ++++
 frontend/src/hooks/useRpcClient.ts            |  6 ++
 frontend/src/hooks/useSetupStores.ts          | 71 +++++++++++++++++
 frontend/src/hooks/useWallet.ts               | 27 +++++++
 frontend/src/hooks/useWebSocketClient.ts      | 15 ++++
 frontend/src/main.ts                          |  3 -
 frontend/src/plugins/persistStore.ts          |  6 +-
 frontend/src/services/JsonRpcService.ts       |  2 +-
 frontend/src/stores/accounts.ts               | 12 +--
 frontend/src/stores/contracts.ts              | 26 +++----
 frontend/src/stores/node.ts                   | 24 +++---
 frontend/src/stores/transactions.ts           |  9 ++-
 frontend/src/types/store.ts                   |  1 +
 frontend/src/utils/accounts.ts                | 10 ---
 frontend/src/utils/address.ts                 |  8 --
 frontend/src/utils/index.ts                   |  9 ---
 frontend/src/utils/store.ts                   | 77 -------------------
 frontend/src/utils/transactions.ts            | 13 ----
 frontend/src/utils/ws.ts                      | 10 ---
 frontend/src/views/Simulator/RunDebugView.vue |  2 +-
 .../test/unit/services/JsonRpcService.test.ts |  2 +-
 .../unit/services/signTransaction.test.ts     | 26 +++----
 41 files changed, 295 insertions(+), 248 deletions(-)
 rename frontend/src/{utils => clients}/rpc.ts (100%)
 create mode 100644 frontend/src/clients/web3.ts
 rename frontend/src/{utils/editor.ts => constants/pythonSyntax.ts} (97%)
 rename frontend/src/{utils/db.ts => hooks/useDb.ts} (55%)
 create mode 100644 frontend/src/hooks/useFileName.ts
 rename frontend/src/{utils/inputs.ts => hooks/useInputMap.ts} (60%)
 create mode 100644 frontend/src/hooks/useRpcClient.ts
 create mode 100644 frontend/src/hooks/useSetupStores.ts
 create mode 100644 frontend/src/hooks/useWallet.ts
 create mode 100644 frontend/src/hooks/useWebSocketClient.ts
 delete mode 100644 frontend/src/utils/accounts.ts
 delete mode 100644 frontend/src/utils/address.ts
 delete mode 100644 frontend/src/utils/index.ts
 delete mode 100644 frontend/src/utils/store.ts
 delete mode 100644 frontend/src/utils/transactions.ts
 delete mode 100644 frontend/src/utils/ws.ts

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a0dbda9cc..e2f3c939c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,6 +23,7 @@
         "floating-vue": "^5.2.2",
         "hash-sum": "^2.0.0",
         "jump.js": "^1.0.2",
+        "lodash-es": "^4.17.21",
         "lucide-vue-next": "^0.424.0",
         "monaco-editor": "^0.47.0",
         "path": "^0.12.7",
@@ -36,7 +37,6 @@
         "vite-svg-loader": "^5.1.0",
         "vue": "^3.4.21",
         "vue-collapsed": "^1.3.4",
-        "vue-debounce": "^5.0.0",
         "vue-router": "^4.0.13",
         "vue3-spinners": "^1.2.2"
       },
@@ -5887,6 +5887,11 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -9434,14 +9439,6 @@
       "integrity": "sha512-sO9qQ8oC520SW6kqlls0iqDak53gsTVSrYylajgjmkt1c0vcgjsGSy1KzlDrbEx8pm02IEYhlUkU5hCYf8rwtg==",
       "dev": true
     },
-    "node_modules/vue-debounce": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/vue-debounce/-/vue-debounce-5.0.0.tgz",
-      "integrity": "sha512-heIPTbmFC6Hghhnwbfjw0nYRBYH+YFp/d9xGQ/rDRPUfU6NBIndbJz+i0pHVii4BXXRi1CaljT6H3fDSbbPMvg==",
-      "peerDependencies": {
-        "vue": ">= 3.0.0"
-      }
-    },
     "node_modules/vue-eslint-parser": {
       "version": "9.4.3",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 24430ddb5..644704eda 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,6 +35,7 @@
     "floating-vue": "^5.2.2",
     "hash-sum": "^2.0.0",
     "jump.js": "^1.0.2",
+    "lodash-es": "^4.17.21",
     "lucide-vue-next": "^0.424.0",
     "monaco-editor": "^0.47.0",
     "path": "^0.12.7",
@@ -48,7 +49,6 @@
     "vite-svg-loader": "^5.1.0",
     "vue": "^3.4.21",
     "vue-collapsed": "^1.3.4",
-    "vue-debounce": "^5.0.0",
     "vue-router": "^4.0.13",
     "vue3-spinners": "^1.2.2"
   },
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0cd628285..6ffce6c43 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -5,9 +5,10 @@ import Notification from '@/components/Notification.vue';
 import TutorialContainer from '@/components/Tutorial/TutorialContainer.vue';
 import { useUIStore } from '@/stores/ui';
 import { onBeforeMount } from 'vue';
-import { setupStores } from './utils';
+import { useSetupStores } from '@/hooks';
 
 const uiStore = useUIStore();
+const { setupStores } = useSetupStores();
 
 onBeforeMount(() => {
   uiStore.initialize();
diff --git a/frontend/src/utils/rpc.ts b/frontend/src/clients/rpc.ts
similarity index 100%
rename from frontend/src/utils/rpc.ts
rename to frontend/src/clients/rpc.ts
diff --git a/frontend/src/clients/web3.ts b/frontend/src/clients/web3.ts
new file mode 100644
index 000000000..477a8a536
--- /dev/null
+++ b/frontend/src/clients/web3.ts
@@ -0,0 +1,38 @@
+import { recoverTransactionAddress, toHex, toRlp } from 'viem';
+import {
+  generatePrivateKey as _generatePrivateKey,
+  privateKeyToAccount as _privateKeyToAccount,
+} from 'viem/accounts';
+import type {
+  TransactionSerializedLegacy,
+  RecoverTransactionAddressParameters,
+} from 'viem';
+import type { Address } from '@/types';
+
+export class Web3Client {
+  privateKeyToAccount(privateKey: Address) {
+    return _privateKeyToAccount(privateKey);
+  }
+
+  generatePrivateKey() {
+    return _generatePrivateKey();
+  }
+
+  encodeTransactionData(params: any[]) {
+    return toRlp(params.map((param) => toHex(param)));
+  }
+
+  recoverTransactionAddress(transaction: RecoverTransactionAddressParameters) {
+    return recoverTransactionAddress(transaction);
+  }
+
+  async signTransaction(
+    privateKey: Address,
+    data: Array<unknown>,
+    to?: Address,
+  ): Promise<TransactionSerializedLegacy> {
+    const account = this.privateKeyToAccount(privateKey);
+    const encodedData = this.encodeTransactionData(data);
+    return account.signTransaction({ data: encodedData, to, type: 'legacy' });
+  }
+}
diff --git a/frontend/src/components/JsonViewer/json-viewer.vue b/frontend/src/components/JsonViewer/json-viewer.vue
index 7faf0a572..43d89e94a 100644
--- a/frontend/src/components/JsonViewer/json-viewer.vue
+++ b/frontend/src/components/JsonViewer/json-viewer.vue
@@ -28,7 +28,7 @@
 <script>
 import JsonBox from './json-box.vue';
 import Clipboard from 'clipboard';
-import { debounce } from 'vue-debounce';
+import { debounce } from 'lodash-es';
 
 export default {
   name: 'JsonViewer',
diff --git a/frontend/src/components/Simulator/CodeEditor.vue b/frontend/src/components/Simulator/CodeEditor.vue
index a54c350ab..ea4fcb6d5 100644
--- a/frontend/src/components/Simulator/CodeEditor.vue
+++ b/frontend/src/components/Simulator/CodeEditor.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import { pythonSyntaxDefinition } from '@/utils';
 import { ref, shallowRef, watch, computed, onMounted } from 'vue';
 import { useContractsStore, useUIStore } from '@/stores';
 import { type ContractFile } from '@/types';
+import pythonSyntax from '@/constants/pythonSyntax';
 
 const uiStore = useUIStore();
 const contractStore = useContractsStore();
@@ -19,7 +19,7 @@ const theme = computed(() => (uiStore.mode === 'light' ? 'vs' : 'vs-dark'));
 function initEditor() {
   containerElement.value = editorElement.value?.parentElement;
   monaco.languages.register({ id: 'python' });
-  monaco.languages.setMonarchTokensProvider('python', pythonSyntaxDefinition);
+  monaco.languages.setMonarchTokensProvider('python', pythonSyntax);
   editorRef.value = monaco.editor.create(editorElement.value!, {
     value: props.contract.content || '',
     language: 'python',
diff --git a/frontend/src/components/Simulator/ConstructorParameters.vue b/frontend/src/components/Simulator/ConstructorParameters.vue
index 92e640380..e2b78bebc 100644
--- a/frontend/src/components/Simulator/ConstructorParameters.vue
+++ b/frontend/src/components/Simulator/ConstructorParameters.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useContractQueries, useInputMap } from '@/hooks';
 import { ref, computed, watch, onMounted } from 'vue';
 import PageSection from '@/components/Simulator/PageSection.vue';
 import { ArrowUpTrayIcon } from '@heroicons/vue/16/solid';
-import { InputTypesMap } from '@/utils';
 import EmptyListPlaceholder from '@/components/Simulator/EmptyListPlaceholder.vue';
 import GhostBtn from '../global/GhostBtn.vue';
 import { notify } from '@kyvg/vue3-notification';
@@ -13,6 +12,7 @@ import { type ContractMethod } from '@/types';
 
 const { contract, contractSchemaQuery, deployContract, isDeploying } =
   useContractQueries();
+const inputMap = useInputMap();
 
 const { data, isPending, isRefetching, isError } = contractSchemaQuery;
 const inputParams = ref<{ [k: string]: any }>({});
@@ -105,7 +105,11 @@ const toggleMode = () => {
 
 const mapInputs = (inputs: { [k: string]: string }) =>
   Object.keys(inputs || {})
-    .map((key) => ({ name: key, type: InputTypesMap[key], value: inputs[key] }))
+    .map((key) => ({
+      name: key,
+      type: inputs[key],
+      value: inputs[key],
+    }))
     .reduce((prev, curr) => {
       if (typeof curr.value === 'boolean') {
         prev = { ...prev, [curr.name]: curr.value ? 'True' : 'False' };
@@ -175,7 +179,7 @@ const hasConstructorInputs = computed(
         <template v-if="mode === 'form'">
           <div v-for="input in constructorInputs" :key="input">
             <component
-              :is="InputTypesMap[input.type]"
+              :is="inputMap.getComponent(input.type)"
               v-model="inputParams[input.name]"
               :name="input.name"
               :placeholder="input.name"
diff --git a/frontend/src/components/Simulator/ContractInfo.vue b/frontend/src/components/Simulator/ContractInfo.vue
index 21dfcdcc5..670b940a8 100644
--- a/frontend/src/components/Simulator/ContractInfo.vue
+++ b/frontend/src/components/Simulator/ContractInfo.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-import { useContractQueries } from '@/hooks/useContractQueries';
 import PageSection from '@/components/Simulator/PageSection.vue';
 import { CheckCircleIcon } from '@heroicons/vue/24/outline';
 import EmptyListPlaceholder from '@/components/Simulator/EmptyListPlaceholder.vue';
 import { PlusIcon } from '@heroicons/vue/16/solid';
-import { shortenAddress } from '@/utils';
 import { useNodeStore } from '@/stores';
+import { useWallet, useContractQueries } from '@/hooks';
 
 const nodeStore = useNodeStore();
+const { shortenAddress } = useWallet();
 
 defineProps<{
   showNewDeploymentButton: boolean;
diff --git a/frontend/src/components/Simulator/ContractMethodItem.vue b/frontend/src/components/Simulator/ContractMethodItem.vue
index 279952c23..01e594e1a 100644
--- a/frontend/src/components/Simulator/ContractMethodItem.vue
+++ b/frontend/src/components/Simulator/ContractMethodItem.vue
@@ -2,15 +2,16 @@
 import type { ContractMethod } from '@/types';
 import { onMounted, ref } from 'vue';
 import { Collapse } from 'vue-collapsed';
-import { InputTypesMap } from '@/utils';
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useInputMap } from '@/hooks';
 import { notify } from '@kyvg/vue3-notification';
 import { ChevronDownIcon } from '@heroicons/vue/16/solid';
-import { useEventTracking } from '@/hooks';
+import { useEventTracking, useContractQueries } from '@/hooks';
 
 const { callWriteMethod, callReadMethod, contract } = useContractQueries();
 const { trackEvent } = useEventTracking();
 
+const inputMap = useInputMap();
+
 const props = defineProps<{
   method: ContractMethod;
   methodType: 'read' | 'write';
@@ -116,7 +117,7 @@ onMounted(() => {
         <component
           v-for="input in method.inputs"
           :key="input.name"
-          :is="InputTypesMap[input.type]"
+          :is="inputMap.getComponent(input.type)"
           v-model="inputs[input.name]"
           :name="String(input.name)"
           :label="String(input.name)"
diff --git a/frontend/src/components/Simulator/ContractReadMethods.vue b/frontend/src/components/Simulator/ContractReadMethods.vue
index 6b2d69707..b51d8dc6c 100644
--- a/frontend/src/components/Simulator/ContractReadMethods.vue
+++ b/frontend/src/components/Simulator/ContractReadMethods.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useContractQueries } from '@/hooks';
 import { computed } from 'vue';
 import PageSection from '@/components/Simulator/PageSection.vue';
 import { type ContractMethod } from '@/types';
diff --git a/frontend/src/components/Simulator/ContractWriteMethods.vue b/frontend/src/components/Simulator/ContractWriteMethods.vue
index 1b165424a..945fd9828 100644
--- a/frontend/src/components/Simulator/ContractWriteMethods.vue
+++ b/frontend/src/components/Simulator/ContractWriteMethods.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useContractQueries } from '@/hooks';
 import { computed } from 'vue';
 import PageSection from '@/components/Simulator/PageSection.vue';
 import { type ContractMethod } from '@/types';
diff --git a/frontend/src/components/Simulator/ContractsPanel.vue b/frontend/src/components/Simulator/ContractsPanel.vue
index 87da981ce..d58db032c 100644
--- a/frontend/src/components/Simulator/ContractsPanel.vue
+++ b/frontend/src/components/Simulator/ContractsPanel.vue
@@ -6,7 +6,7 @@ import { useContractsStore } from '@/stores';
 import { computed } from 'vue';
 import HomeTab from './HomeTab.vue';
 import { useRouter, useRoute } from 'vue-router';
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useContractQueries } from '@/hooks';
 
 const store = useContractsStore();
 const router = useRouter();
diff --git a/frontend/src/components/Tutorial/TutorialContainer.vue b/frontend/src/components/Tutorial/TutorialContainer.vue
index 2caf6f4a8..8f226411e 100644
--- a/frontend/src/components/Tutorial/TutorialContainer.vue
+++ b/frontend/src/components/Tutorial/TutorialContainer.vue
@@ -10,8 +10,6 @@ const tutorialStore = useTutorialStore();
 const uiStore = useUIStore();
 const router = useRouter();
 
-tutorialStore.resetTutorialState();
-
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const steps = ref([
diff --git a/frontend/src/utils/editor.ts b/frontend/src/constants/pythonSyntax.ts
similarity index 97%
rename from frontend/src/utils/editor.ts
rename to frontend/src/constants/pythonSyntax.ts
index b8b5f43f8..e8f26d3d3 100644
--- a/frontend/src/utils/editor.ts
+++ b/frontend/src/constants/pythonSyntax.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-useless-escape */
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
-export const pythonSyntaxDefinition: monaco.languages.IMonarchLanguage = {
+const pythonSyntax: monaco.languages.IMonarchLanguage = {
   defaultToken: '',
   tokenPostfix: '.python',
 
@@ -213,3 +213,5 @@ export const pythonSyntaxDefinition: monaco.languages.IMonarchLanguage = {
     ],
   },
 };
+
+export default pythonSyntax;
diff --git a/frontend/src/hooks/index.ts b/frontend/src/hooks/index.ts
index 9582dd05c..55ceb3d8c 100644
--- a/frontend/src/hooks/index.ts
+++ b/frontend/src/hooks/index.ts
@@ -1,2 +1,10 @@
 export * from './useUniqueId';
 export * from './useEventTracking';
+export * from './useRpcClient';
+export * from './useWallet';
+export * from './useDb';
+export * from './useWebSocketClient';
+export * from './useInputMap';
+export * from './useContractQueries';
+export * from './useFileName';
+export * from './useSetupStores';
diff --git a/frontend/src/hooks/useContractQueries.ts b/frontend/src/hooks/useContractQueries.ts
index c35fa74e7..c05ea52db 100644
--- a/frontend/src/hooks/useContractQueries.ts
+++ b/frontend/src/hooks/useContractQueries.ts
@@ -1,6 +1,4 @@
-import { watch, ref, inject, computed } from 'vue';
-import { toHex, toRlp } from 'viem';
-import type { IJsonRpcService } from '@/services';
+import { watch, ref, computed } from 'vue';
 import { useQuery, useQueryClient } from '@tanstack/vue-query';
 import type { Address, TransactionItem } from '@/types';
 import {
@@ -8,21 +6,21 @@ import {
   useTransactionsStore,
   useAccountsStore,
 } from '@/stores';
-import { signTransaction } from '@/utils';
 import { useDebounceFn } from '@vueuse/core';
 import { notify } from '@kyvg/vue3-notification';
 import { useMockContractData } from './useMockContractData';
-import { useEventTracking } from '@/hooks';
+import { useEventTracking, useRpcClient, useWallet } from '@/hooks';
 
 const schema = ref<any>();
 
 export function useContractQueries() {
-  const $jsonRpc = inject<IJsonRpcService>('$jsonRpc'); // This could be done without inject/provide
+  const rpcClient = useRpcClient();
   const accountsStore = useAccountsStore();
   const transactionsStore = useTransactionsStore();
   const contractsStore = useContractsStore();
   const queryClient = useQueryClient();
   const { trackEvent } = useEventTracking();
+  const wallet = useWallet();
   const contract = computed(() => contractsStore.currentContract);
 
   const { mockContractId, mockContractSchema } = useMockContractData();
@@ -64,7 +62,7 @@ export function useContractQueries() {
       return mockContractSchema;
     }
 
-    const result = await $jsonRpc?.getContractSchema({
+    const result = await rpcClient.getContractSchema({
       code: contract.value?.content ?? '',
     });
 
@@ -91,16 +89,12 @@ export function useContractQueries() {
         throw new Error('Error Deploying the contract');
       }
       const constructorParamsAsString = JSON.stringify(constructorParams);
-      const data = toRlp([
-        toHex(contract.value?.content ?? ''),
-        toHex(constructorParamsAsString),
-      ]);
-
-      const signed = await signTransaction(
+      const data = [contract.value?.content ?? '', constructorParamsAsString];
+      const signed = await wallet.signTransaction(
         accountsStore.currentPrivateKey,
         data,
       );
-      const result = await $jsonRpc?.sendTransaction(signed);
+      const result = await rpcClient.sendTransaction(signed);
 
       if (result?.status === 'success') {
         const tx: TransactionItem = {
@@ -166,7 +160,7 @@ export function useContractQueries() {
       return mockContractSchema;
     }
 
-    const result = await $jsonRpc?.getDeployedContractSchema({
+    const result = await rpcClient.getDeployedContractSchema({
       address: deployedContract.value?.address ?? '',
     });
 
@@ -180,7 +174,7 @@ export function useContractQueries() {
 
   async function callReadMethod(method: string, methodArguments: string[]) {
     try {
-      const result = await $jsonRpc?.getContractState({
+      const result = await rpcClient.getContractState({
         contractAddress: address.value || '',
         method,
         methodArguments,
@@ -210,15 +204,15 @@ export function useContractQueries() {
         throw new Error('Error Deploying the contract');
       }
       const methodParamsAsString = JSON.stringify(params);
-      const data = toRlp([toHex(method), toHex(methodParamsAsString)]);
-
+      const data = [method, methodParamsAsString];
       const to = (address.value as Address) || null;
-      const signed = await signTransaction(
+
+      const signed = await wallet.signTransaction(
         accountsStore.currentPrivateKey,
         data,
         to,
       );
-      const result = await $jsonRpc?.sendTransaction(signed);
+      const result = await rpcClient.sendTransaction(signed);
 
       if (result?.status === 'success') {
         transactionsStore.addTransaction({
diff --git a/frontend/src/utils/db.ts b/frontend/src/hooks/useDb.ts
similarity index 55%
rename from frontend/src/utils/db.ts
rename to frontend/src/hooks/useDb.ts
index 3507bbd58..017418d15 100644
--- a/frontend/src/utils/db.ts
+++ b/frontend/src/hooks/useDb.ts
@@ -1,27 +1,23 @@
 import type { ContractFile, DeployedContract, TransactionItem } from '@/types';
 import Dexie, { type Table } from 'dexie';
 
-export class GenLayerSimulatorDB extends Dexie {
+class GenLayerSimulatorDB extends Dexie {
   contractFiles!: Table<ContractFile>;
   deployedContracts!: Table<DeployedContract>;
   transactions!: Table<TransactionItem>;
 
   constructor() {
     super('genLayerSimulatorDB');
-    this.version(2).stores({
-      contractFiles: 'id, name, content, example, updatedAt',
-      deployedContracts: '[contractId+address]',
-      defaultContractStates: '[contractId+address]',
-    });
 
     this.version(2).stores({
-      contractFiles: 'id', // Primary key and indexed props
+      contractFiles: 'id',
       deployedContracts: '[contractId+address]',
-      defaultContractStates: null,
       transactions:
         '++id, type, status, contractAddress, localContractId, txId',
     });
   }
 }
 
-export const db = new GenLayerSimulatorDB();
+export const useDb = () => {
+  return new GenLayerSimulatorDB();
+};
diff --git a/frontend/src/hooks/useFileName.ts b/frontend/src/hooks/useFileName.ts
new file mode 100644
index 000000000..902d59374
--- /dev/null
+++ b/frontend/src/hooks/useFileName.ts
@@ -0,0 +1,13 @@
+export const useFileName = () => {
+  function cleanupFileName(name: string) {
+    const tokens = name.split('.');
+    if (tokens.length > 0) {
+      return `${tokens[0]}.gpy`;
+    }
+    return `${name}.gpy`;
+  }
+
+  return {
+    cleanupFileName,
+  };
+};
diff --git a/frontend/src/utils/inputs.ts b/frontend/src/hooks/useInputMap.ts
similarity index 60%
rename from frontend/src/utils/inputs.ts
rename to frontend/src/hooks/useInputMap.ts
index 4b086a7ef..5d6d61898 100644
--- a/frontend/src/utils/inputs.ts
+++ b/frontend/src/hooks/useInputMap.ts
@@ -9,3 +9,17 @@ export const InputTypesMap: { [k: string]: any } = {
   float: FloatField,
   bool: BooleanField,
 };
+
+export const useInputMap = () => {
+  const getComponent = (type: string) => {
+    const component = InputTypesMap[type];
+
+    if (!component) {
+      throw new Error(`Component not found for input type: ${type}`);
+    }
+
+    return component;
+  };
+
+  return { getComponent };
+};
diff --git a/frontend/src/hooks/useRpcClient.ts b/frontend/src/hooks/useRpcClient.ts
new file mode 100644
index 000000000..a785f9d10
--- /dev/null
+++ b/frontend/src/hooks/useRpcClient.ts
@@ -0,0 +1,6 @@
+import { RpcClient } from '@/clients/rpc';
+import { JsonRpcService } from '@/services/JsonRpcService';
+
+export function useRpcClient() {
+  return new JsonRpcService(new RpcClient());
+}
diff --git a/frontend/src/hooks/useSetupStores.ts b/frontend/src/hooks/useSetupStores.ts
new file mode 100644
index 000000000..7ee06ea5d
--- /dev/null
+++ b/frontend/src/hooks/useSetupStores.ts
@@ -0,0 +1,71 @@
+import {
+  useAccountsStore,
+  useContractsStore,
+  useTransactionsStore,
+  useNodeStore,
+  useTutorialStore,
+} from '@/stores';
+import { useDb } from '@/hooks';
+import { v4 as uuidv4 } from 'uuid';
+import type { Address } from '@/types';
+
+export const useSetupStores = () => {
+  const setupStores = async () => {
+    const contractsStore = useContractsStore();
+    const accountsStore = useAccountsStore();
+    const transactionsStore = useTransactionsStore();
+    const nodeStore = useNodeStore();
+    const tutorialStore = useTutorialStore();
+    const db = useDb();
+    const contractFiles = await db.contractFiles.toArray();
+    const exampleFiles = contractFiles.filter((c) => c.example);
+
+    if (exampleFiles.length === 0) {
+      const contractsBlob = import.meta.glob(
+        '@/assets/examples/contracts/*.py',
+        {
+          query: '?raw',
+          import: 'default',
+        },
+      );
+      for (const key of Object.keys(contractsBlob)) {
+        const raw = await contractsBlob[key]();
+        const name = key.split('/').pop() || 'ExampleContract.py';
+        if (!contractFiles.some((c) => c.name === name)) {
+          const contract = {
+            id: uuidv4(),
+            name,
+            content: ((raw as string) || '').trim(),
+            example: true,
+          };
+          contractsStore.addContractFile(contract);
+        }
+      }
+    } else {
+      contractsStore.contracts = await db.contractFiles.toArray();
+    }
+
+    contractsStore.deployedContracts = await db.deployedContracts.toArray();
+    transactionsStore.transactions = await db.transactions.toArray();
+
+    contractsStore.getInitialOpenedFiles();
+    tutorialStore.resetTutorialState();
+    nodeStore.getValidatorsData();
+
+    if (accountsStore.privateKeys.length < 1) {
+      accountsStore.generateNewAccount();
+    } else {
+      accountsStore.privateKeys = localStorage.getItem(
+        'accountsStore.privateKeys',
+      )
+        ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
+            ',',
+          ) as Address[])
+        : [];
+    }
+  };
+
+  return {
+    setupStores,
+  };
+};
diff --git a/frontend/src/hooks/useWallet.ts b/frontend/src/hooks/useWallet.ts
new file mode 100644
index 000000000..62ead9192
--- /dev/null
+++ b/frontend/src/hooks/useWallet.ts
@@ -0,0 +1,27 @@
+import { Web3Client } from '@/clients/web3';
+
+export function useWallet() {
+  const web3 = new Web3Client();
+
+  function shortenAddress(address?: string) {
+    if (!address) {
+      return '';
+    }
+
+    const maxChars = 4;
+    const displayedChars = Math.min(Math.floor(address.length / 3), maxChars);
+
+    return (
+      address.slice(0, displayedChars) + '...' + address.slice(-displayedChars)
+    );
+  }
+
+  return {
+    privateKeyToAccount: web3.privateKeyToAccount,
+    generatePrivateKey: web3.generatePrivateKey,
+    encodeTransactionData: web3.encodeTransactionData,
+    recoverTransactionAddress: web3.recoverTransactionAddress,
+    signTransaction: web3.signTransaction,
+    shortenAddress,
+  };
+}
diff --git a/frontend/src/hooks/useWebSocketClient.ts b/frontend/src/hooks/useWebSocketClient.ts
new file mode 100644
index 000000000..1656105e7
--- /dev/null
+++ b/frontend/src/hooks/useWebSocketClient.ts
@@ -0,0 +1,15 @@
+import { io } from 'socket.io-client';
+
+export function useWebSocketClient() {
+  const webSocketClient = io(import.meta.env.VITE_WS_SERVER_URL);
+
+  webSocketClient.on('connect', () => {
+    console.log('webSocketClient.connect', webSocketClient.id);
+  });
+
+  webSocketClient.on('disconnect', () => {
+    console.log('webSocketClient.disconnnect', webSocketClient.id);
+  });
+
+  return webSocketClient;
+}
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 240c48dce..165557f72 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -5,8 +5,6 @@ import Notifications from '@kyvg/vue3-notification';
 import App from './App.vue';
 import router from './router';
 import { persistStorePlugin, TransactionsListenerPlugin } from '@/plugins';
-import { RpcClient } from '@/utils';
-import { JsonRpcService } from './services/JsonRpcService';
 import { VueSpinnersPlugin } from 'vue3-spinners';
 import registerGlobalComponents from '@/components/global/registerGlobalComponents';
 import { VueQueryPlugin } from '@tanstack/vue-query';
@@ -32,7 +30,6 @@ app.use(FloatingVue, {
   },
 });
 app.use(Notifications);
-app.provide('$jsonRpc', new JsonRpcService(new RpcClient()));
 app.use(VueSpinnersPlugin);
 app.use(TransactionsListenerPlugin, {
   interval: 5000,
diff --git a/frontend/src/plugins/persistStore.ts b/frontend/src/plugins/persistStore.ts
index 5a0564d49..e5445822e 100644
--- a/frontend/src/plugins/persistStore.ts
+++ b/frontend/src/plugins/persistStore.ts
@@ -1,8 +1,10 @@
 import type { ContractFile, DeployedContract } from '@/types';
-import { db, getContractFileName } from '@/utils';
 import { type PiniaPluginContext } from 'pinia';
+import { useDb, useFileName } from '@/hooks';
 
 const ENABLE_LOGS = false;
+const db = useDb();
+const { cleanupFileName } = useFileName();
 
 /**
  * Upserts a deployed contract into the database.
@@ -47,7 +49,7 @@ export function persistStorePlugin(context: PiniaPluginContext): void {
           case 'addContractFile':
             await db.contractFiles.add({
               ...(args[0] as ContractFile),
-              name: getContractFileName(args[0].name),
+              name: cleanupFileName(args[0].name),
             });
             break;
           case 'updateContractFile':
diff --git a/frontend/src/services/JsonRpcService.ts b/frontend/src/services/JsonRpcService.ts
index 747600f39..692a42b6f 100644
--- a/frontend/src/services/JsonRpcService.ts
+++ b/frontend/src/services/JsonRpcService.ts
@@ -1,4 +1,4 @@
-import type { IRpcClient } from '@/utils';
+import type { IRpcClient } from '@/clients/rpc';
 import type { IJsonRpcService } from './IJsonRpcService';
 import type {
   JsonRpcResult,
diff --git a/frontend/src/stores/accounts.ts b/frontend/src/stores/accounts.ts
index 3a0657847..d2acb7377 100644
--- a/frontend/src/stores/accounts.ts
+++ b/frontend/src/stores/accounts.ts
@@ -1,16 +1,16 @@
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
-import { getAccountFromPrivatekey, getPrivateKey } from '@/utils';
 import type { Address } from '@/types';
-import { shortenAddress } from '@/utils';
+import { useWallet } from '@/hooks';
 
 export const useAccountsStore = defineStore('accountsStore', () => {
   const key = localStorage.getItem('accountsStore.currentPrivateKey');
   const currentPrivateKey = ref<Address | null>(key ? (key as Address) : null);
+  const wallet = useWallet();
 
   const currentUserAddress = computed(() => {
     return currentPrivateKey.value
-      ? getAccountFromPrivatekey(currentPrivateKey.value).address
+      ? wallet.privateKeyToAccount(currentPrivateKey.value).address
       : '';
   });
 
@@ -23,14 +23,14 @@ export const useAccountsStore = defineStore('accountsStore', () => {
   );
 
   function generateNewAccount(): Address {
-    const privateKey = getPrivateKey();
+    const privateKey = wallet.generatePrivateKey();
     privateKeys.value = [...privateKeys.value, privateKey];
     setCurrentAccount(privateKey);
     return privateKey;
   }
 
   function accountFromPrivateKey(privateKey: Address) {
-    return getAccountFromPrivatekey(privateKey);
+    return wallet.privateKeyToAccount(privateKey);
   }
 
   function removeAccount(privateKey: Address) {
@@ -54,7 +54,7 @@ export const useAccountsStore = defineStore('accountsStore', () => {
       if (!currentPrivateKey.value) {
         return '';
       } else {
-        return shortenAddress(
+        return wallet.shortenAddress(
           accountFromPrivateKey(currentPrivateKey.value).address,
         );
       }
diff --git a/frontend/src/stores/contracts.ts b/frontend/src/stores/contracts.ts
index 79f2db9c6..2bc75c41e 100644
--- a/frontend/src/stores/contracts.ts
+++ b/frontend/src/stores/contracts.ts
@@ -1,12 +1,15 @@
 import type { ContractFile, DeployedContract } from '@/types';
-import { db, getContractFileName, setupStores } from '@/utils';
 import { defineStore } from 'pinia';
 import { ref, computed } from 'vue';
 import { notify } from '@kyvg/vue3-notification';
+import { useDb, useFileName, useSetupStores } from '@/hooks';
 
 export const useContractsStore = defineStore('contractsStore', () => {
   const contracts = ref<ContractFile[]>([]);
   const openedFiles = ref<string[]>([]);
+  const db = useDb();
+  const { setupStores } = useSetupStores();
+  const { cleanupFileName } = useFileName();
 
   const currentContractId = ref<string | undefined>(
     localStorage.getItem('contractsStore.currentContractId') || '',
@@ -30,7 +33,7 @@ export const useContractsStore = defineStore('contractsStore', () => {
     contract: ContractFile,
     atBeginning?: boolean,
   ): void {
-    const name = getContractFileName(contract.name);
+    const name = cleanupFileName(contract.name);
 
     if (atBeginning) {
       contracts.value.unshift({ ...contract, name });
@@ -44,9 +47,9 @@ export const useContractsStore = defineStore('contractsStore', () => {
     deployedContracts.value = [
       ...deployedContracts.value.filter((c) => c.contractId !== id),
     ];
-    openedFiles.value = [
-      ...openedFiles.value.filter((contractId) => contractId !== id),
-    ];
+    openedFiles.value = openedFiles.value.filter(
+      (contractId) => contractId !== id,
+    );
 
     if (currentContractId.value === id) {
       setCurrentContractId('');
@@ -64,7 +67,7 @@ export const useContractsStore = defineStore('contractsStore', () => {
     contracts.value = [
       ...contracts.value.map((c) => {
         if (c.id === id) {
-          const _name = getContractFileName(name || c.name);
+          const _name = cleanupFileName(name || c.name);
           const _content = content || c.content;
           return { ...c, name: _name, content: _content, updatedAt };
         }
@@ -123,7 +126,7 @@ export const useContractsStore = defineStore('contractsStore', () => {
   async function resetStorage(): Promise<void> {
     try {
       const idsToDelete = contracts.value
-        .filter((c) => c.example || (!c.example && !c.updatedAt))
+        .filter((c) => c.example)
         .map((c) => c.id);
 
       await db.deployedContracts
@@ -150,15 +153,6 @@ export const useContractsStore = defineStore('contractsStore', () => {
         currentContractId.value = '';
       }
 
-      localStorage.setItem(
-        'mainStore.currentContractId',
-        currentContractId.value || '',
-      );
-      localStorage.setItem(
-        'mainStore.openedFiles',
-        openedFiles.value.join(','),
-      );
-
       await setupStores();
     } catch (error) {
       console.error(error);
diff --git a/frontend/src/stores/node.ts b/frontend/src/stores/node.ts
index 7bae90d30..3bbf76325 100644
--- a/frontend/src/stores/node.ts
+++ b/frontend/src/stores/node.ts
@@ -1,18 +1,18 @@
-import type { IJsonRpcService } from '@/services';
 import type { NodeLog, NewValidatorDataModel, ValidatorModel } from '@/types';
-import { webSocketClient } from '@/utils';
 import { defineStore } from 'pinia';
-import { computed, inject, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useContractsStore } from './contracts';
 import { notify } from '@kyvg/vue3-notification';
+import { useRpcClient, useWebSocketClient } from '@/hooks';
 
 export const useNodeStore = defineStore('nodeStore', () => {
+  const rpcClient = useRpcClient();
+  const webSocketClient = useWebSocketClient();
   const logs = ref<NodeLog[]>([]);
   const listenWebsocket = ref<boolean>(true);
   const contractsStore = useContractsStore();
   const nodeProviders = ref<Record<string, string[]>>({});
   // state
-  const $jsonRpc = inject<IJsonRpcService>('$jsonRpc')!;
   const validators = ref<ValidatorModel[]>([]);
   const isLoadingValidatorData = ref<boolean>(true);
 
@@ -53,8 +53,8 @@ export const useNodeStore = defineStore('nodeStore', () => {
 
     try {
       const [validatorsResult, modelsResult] = await Promise.all([
-        $jsonRpc.getValidators(),
-        $jsonRpc.getProvidersAndModels(),
+        rpcClient.getValidators(),
+        rpcClient.getProvidersAndModels(),
       ]);
 
       if (validatorsResult?.status === 'success') {
@@ -90,7 +90,7 @@ export const useNodeStore = defineStore('nodeStore', () => {
       throw new Error('Please fill all the required fields');
     }
     const validatorConfig = JSON.parse(config || '{}');
-    const result = await $jsonRpc.updateValidator({
+    const result = await rpcClient.updateValidator({
       address: validator.address || '',
       stake,
       provider,
@@ -114,7 +114,7 @@ export const useNodeStore = defineStore('nodeStore', () => {
     if (validators.value.length === 1) {
       throw new Error('You must have at least one validator');
     }
-    const result = await $jsonRpc.deleteValidator({
+    const result = await rpcClient.deleteValidator({
       address: validator.address || '',
     });
     if (result?.status === 'success') {
@@ -129,7 +129,7 @@ export const useNodeStore = defineStore('nodeStore', () => {
   async function createNewValidator(newValidatorData: NewValidatorDataModel) {
     const { stake, provider, model, config } = newValidatorData;
     const validatorConfig = JSON.parse(config || '{}');
-    const result = await $jsonRpc.createValidator({
+    const result = await rpcClient.createValidator({
       stake,
       provider,
       model,
@@ -143,7 +143,7 @@ export const useNodeStore = defineStore('nodeStore', () => {
   }
 
   async function cloneValidator(validator: ValidatorModel) {
-    const result = await $jsonRpc.createValidator(validator);
+    const result = await rpcClient.createValidator(validator);
     if (result?.status === 'success') {
       validators.value.push(result.data);
     } else {
@@ -152,9 +152,7 @@ export const useNodeStore = defineStore('nodeStore', () => {
   }
 
   const contractsToDelete = computed(() =>
-    contractsStore.contracts.filter(
-      (c) => (c.example && !c.updatedAt) || (!c.example && !c.updatedAt),
-    ),
+    contractsStore.contracts.filter((c) => c.example),
   );
 
   const validatorsOrderedById = computed(() =>
diff --git a/frontend/src/stores/transactions.ts b/frontend/src/stores/transactions.ts
index 8f0929933..6e2590fbd 100644
--- a/frontend/src/stores/transactions.ts
+++ b/frontend/src/stores/transactions.ts
@@ -1,9 +1,10 @@
 import { defineStore } from 'pinia';
-import { computed, inject, ref } from 'vue';
-import type { IJsonRpcService } from '@/services';
+import { computed, ref } from 'vue';
 import type { TransactionItem } from '@/types';
+import { useRpcClient } from '@/hooks';
+
 export const useTransactionsStore = defineStore('transactionsStore', () => {
-  const $jsonRpc = inject<IJsonRpcService>('$jsonRpc');
+  const rpcClient = useRpcClient();
   const pendingTransactions = computed<TransactionItem[]>(() =>
     transactions.value.filter((t) => t.status === 'PENDING'),
   );
@@ -31,7 +32,7 @@ export const useTransactionsStore = defineStore('transactionsStore', () => {
   }
 
   async function getTransaction(txId: number) {
-    return $jsonRpc?.getTransactionById(txId);
+    return rpcClient.getTransactionById(txId);
   }
 
   function clearTransactionsForContract(contractId: string) {
diff --git a/frontend/src/types/store.ts b/frontend/src/types/store.ts
index 4614acd8f..490e33d2a 100644
--- a/frontend/src/types/store.ts
+++ b/frontend/src/types/store.ts
@@ -32,6 +32,7 @@ export interface NodeLog {
 }
 
 export interface TransactionItem {
+  id?: number;
   type: 'deploy' | 'method';
   status: string;
   contractAddress: string;
diff --git a/frontend/src/utils/accounts.ts b/frontend/src/utils/accounts.ts
deleted file mode 100644
index 205806c02..000000000
--- a/frontend/src/utils/accounts.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
-import type { Address } from '@/types';
-
-export const getAccountFromPrivatekey = (privateKey: Address) => {
-  return privateKeyToAccount(privateKey);
-};
-
-export const getPrivateKey = () => {
-  return generatePrivateKey();
-};
diff --git a/frontend/src/utils/address.ts b/frontend/src/utils/address.ts
deleted file mode 100644
index 731c9c59b..000000000
--- a/frontend/src/utils/address.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export function shortenAddress(address?: string) {
-  const prefix = address?.startsWith('0x') ? '0x' : '';
-  return (
-    `${prefix}${address?.replace('0x', '').substring(0, prefix ? 4 : 6)}...${address?.substring(
-      (address?.length || 4) - 4,
-    )}` || ''
-  );
-}
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
deleted file mode 100644
index 2cb629945..000000000
--- a/frontend/src/utils/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './rpc';
-export * from './ws';
-export * from './inputs';
-export * from './editor';
-export * from './db';
-export * from './store';
-export * from './address';
-export * from './accounts';
-export * from './transactions';
diff --git a/frontend/src/utils/store.ts b/frontend/src/utils/store.ts
deleted file mode 100644
index e333d19a6..000000000
--- a/frontend/src/utils/store.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import {
-  useAccountsStore,
-  useContractsStore,
-  useTransactionsStore,
-  useNodeStore,
-} from '@/stores';
-import { db } from './db';
-import { v4 as uuidv4 } from 'uuid';
-import type { Address } from '@/types';
-
-// for old version and local storage
-export const examplesNames = [
-  'football_prediction_market.py',
-  'llm_erc20.py',
-  'storage.py',
-  'user_storage.py',
-  'wizard_of_coin.py',
-];
-
-export const setupStores = async () => {
-  const contractsStore = useContractsStore();
-  const accountsStore = useAccountsStore();
-  const transactionsStore = useTransactionsStore();
-  const nodeStore = useNodeStore();
-  const contractFiles = await db.contractFiles.toArray();
-  const filteredFiles = contractFiles.filter(
-    (c) => (c.example && !c.updatedAt) || (!c.example && !c.updatedAt),
-  );
-
-  if (filteredFiles.length === 0) {
-    const contractsBlob = import.meta.glob('@/assets/examples/contracts/*.py', {
-      query: '?raw',
-      import: 'default',
-    });
-    for (const key of Object.keys(contractsBlob)) {
-      const raw = await contractsBlob[key]();
-      const name = key.split('/').pop() || 'ExampleContract.py';
-      if (!contractFiles.some((c) => c.name === name)) {
-        const contract = {
-          id: uuidv4(),
-          name,
-          content: ((raw as string) || '').trim(),
-          example: true,
-        };
-        contractsStore.addContractFile(contract);
-      }
-    }
-  } else {
-    contractsStore.contracts = await db.contractFiles.toArray();
-  }
-
-  contractsStore.getInitialOpenedFiles();
-  contractsStore.deployedContracts = await db.deployedContracts.toArray();
-  transactionsStore.transactions = await db.transactions.toArray();
-
-  nodeStore.getValidatorsData();
-
-  if (accountsStore.privateKeys.length < 1) {
-    accountsStore.generateNewAccount();
-  } else {
-    accountsStore.privateKeys = localStorage.getItem(
-      'accountsStore.privateKeys',
-    )
-      ? ((localStorage.getItem('accountsStore.privateKeys') || '').split(
-          ',',
-        ) as Address[])
-      : [];
-  }
-};
-
-export const getContractFileName = (name: string) => {
-  const tokens = name.split('.');
-  if (tokens.length > 0) {
-    return `${tokens[0]}.gpy`;
-  }
-  return `${name}.gpy`;
-};
diff --git a/frontend/src/utils/transactions.ts b/frontend/src/utils/transactions.ts
deleted file mode 100644
index def78807d..000000000
--- a/frontend/src/utils/transactions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { TransactionSerializedLegacy } from 'viem';
-import { getAccountFromPrivatekey } from './accounts';
-
-import type { Address } from '@/types';
-
-export async function signTransaction(
-  privateKey: Address,
-  data: Address,
-  to?: Address,
-): Promise<TransactionSerializedLegacy> {
-  const account = getAccountFromPrivatekey(privateKey);
-  return account.signTransaction({ data, to, type: 'legacy' });
-}
diff --git a/frontend/src/utils/ws.ts b/frontend/src/utils/ws.ts
deleted file mode 100644
index 30e1215cb..000000000
--- a/frontend/src/utils/ws.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { io } from 'socket.io-client';
-
-export const webSocketClient = io(import.meta.env.VITE_WS_SERVER_URL);
-webSocketClient.on('connect', () => {
-  console.log('webSocketClient.connect', webSocketClient.id);
-});
-
-webSocketClient.on('disconnect', () => {
-  console.log('webSocketClient.disconnnect', webSocketClient.id);
-});
diff --git a/frontend/src/views/Simulator/RunDebugView.vue b/frontend/src/views/Simulator/RunDebugView.vue
index d3b85b466..bf0bc3994 100644
--- a/frontend/src/views/Simulator/RunDebugView.vue
+++ b/frontend/src/views/Simulator/RunDebugView.vue
@@ -3,7 +3,7 @@ import ConstructorParameters from '@/components/Simulator/ConstructorParameters.
 import ContractReadMethods from '@/components/Simulator/ContractReadMethods.vue';
 import ContractWriteMethods from '@/components/Simulator/ContractWriteMethods.vue';
 import TransactionsList from '@/components/Simulator/TransactionsList.vue';
-import { useContractQueries } from '@/hooks/useContractQueries';
+import { useContractQueries } from '@/hooks';
 import MainTitle from '@/components/Simulator/MainTitle.vue';
 import { ref, watch } from 'vue';
 import { useContractsStore, useNodeStore } from '@/stores';
diff --git a/frontend/test/unit/services/JsonRpcService.test.ts b/frontend/test/unit/services/JsonRpcService.test.ts
index 277754f25..737abbf20 100644
--- a/frontend/test/unit/services/JsonRpcService.test.ts
+++ b/frontend/test/unit/services/JsonRpcService.test.ts
@@ -1,6 +1,6 @@
 import { JsonRpcService } from '../../../src/services/JsonRpcService';
 import { IJsonRpcService } from '../../../src/services/IJsonRpcService';
-import { IRpcClient } from '../../../src/utils/rpc';
+import { IRpcClient } from '../../../src/clients/rpc';
 import {
   CallContractFunctionResult,
   GetContractStateResult,
diff --git a/frontend/test/unit/services/signTransaction.test.ts b/frontend/test/unit/services/signTransaction.test.ts
index 83839583f..1cd3947a6 100644
--- a/frontend/test/unit/services/signTransaction.test.ts
+++ b/frontend/test/unit/services/signTransaction.test.ts
@@ -1,12 +1,9 @@
-import { recoverTransactionAddress, toHex, toRlp } from 'viem';
-import {
-  signTransaction,
-  getPrivateKey,
-  getAccountFromPrivatekey,
-} from '../../../src/utils';
+import { useWallet } from '../../../src/hooks/useWallet';
 import { describe, expect, it, vi, afterEach, beforeEach } from 'vitest';
 
 describe('SignTransaction', () => {
+  const wallet = useWallet();
+
   beforeEach(() => {
     //
   });
@@ -16,18 +13,17 @@ describe('SignTransaction', () => {
   });
 
   describe('signTransaction', () => {
-    const privateKey = getPrivateKey();
+    const privateKey = wallet.generatePrivateKey();
 
-    const data = {
-      to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
-      value: 1000000000000000000n,
-    };
+    const data = [
+      '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+      1000000000000000000n,
+    ];
 
     it('it should sign a transaction and verify', async () => {
-      const encodedData = toRlp([toHex(data.to), toHex(data.value)]);
-      const signedTransaction = await signTransaction(privateKey, encodedData);
-      const account = getAccountFromPrivatekey(privateKey);
-      const txAddress = await recoverTransactionAddress({
+      const signedTransaction = await wallet.signTransaction(privateKey, data);
+      const account = wallet.privateKeyToAccount(privateKey);
+      const txAddress = await wallet.recoverTransactionAddress({
         serializedTransaction: signedTransaction,
       });
       expect(txAddress).to.deep.equal(account.address);

From 8a107aa20b717519e79817499e55509aee0e1b12 Mon Sep 17 00:00:00 2001
From: Cristiam Da Silva <cristiam86@gmail.com>
Date: Mon, 2 Sep 2024 15:37:44 +0200
Subject: [PATCH 4/8] docs: updated contributing (#421)

* docs: updated contributing

* fix: grammar typo
---
 CONTRIBUTING.md | 118 +++++++++++++++---------------------------------
 1 file changed, 36 insertions(+), 82 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 323dfe0a4..e501c47c1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,85 +14,42 @@ Contributions to the GenLayer Simulator are welcome in several forms:
 
 Help us make the simulator better by testing and giving feedback:
 
-- First, install the simulator using the GenLayer [CLI](https://github.com/yeagerai/genlayer-simulator?tab=readme-ov-file#quick-install).
+- Start installing the simulator using the GenLayer [CLI](https://github.com/yeagerai/genlayer-simulator?tab=readme-ov-file#quick-install).
 - Try out the Simulator features and tell us what you think through our [feedback form](https://docs.google.com/forms/d/1IVNsZwm936kSNCiXmlAP8bgJnbik7Bqaoc3I6UYhr-o/viewform) or on our [Discord Channel](https://discord.gg/8Jm4v89VAu).
 - If you find any issues, please report them on our [GitHub issues page](https://github.com/yeagerai/genlayer-simulator/issues).
 
 ### Sharing New Ideas and Use Cases
 
-Have ideas for new features or usecases? We're eager to hear them! But first:
+Have ideas for new features or use cases? We're eager to hear them! But first:
 
 - Ensure you have the [Simulator installed](https://github.com/yeagerai/genlayer-simulator?tab=readme-ov-file#quick-install) first to explore existing use cases.
-- After you've familiarized yourself with the simulator, contribute your unique use case and share your ideas in our [Discord channel](https://discord.gg/8Jm4v89VAu).
+- After familiarizing yourself with the simulator, contribute your unique use case and share your ideas in our [Discord channel](https://discord.gg/8Jm4v89VAu).
 
-### Writing Code
+### Bug fixing and Feature development
 
-To contribute to feature development or bug fixes. Check our [issue tracker](https://github.com/yeagerai/genlayer-simulator/issues) for tasks labeled `help wanted`.
+#### 1. Set yourself up to start coding
 
-#### Setup Simulator manually
+- **1.1. Pick an issue**: Select one from the project GitHub repository [issue list](https://github.com/yeagerai/genlayer-simulator/issues) and assign it to yourself.
 
-###### Frontend
-
-We run ESLint and Prettier on the frontend code. To install the dependencies, run:
-
-```sh
-$ cd frontend
-$ npm install
-```
-
-##### Window One
-
-```sh
-$ cp .env.example .env
-$ docker compose up
-```
-
-##### Window Two
-
-1. Installing the Ollama model
+- **1.2. Create a branch**: create the branch that you will work on by using the link provided in the issue details page (right panel at the bottom - section "Development")
 
+- **1.3. Setup the Simulator locally**: launch the simulator's frontend and backend by running the docker compose command (Please note that you must have docker, node, and npm installed) 
+   
    ```sh
-   $ docker exec ollama ollama pull llama3
+   $ cp .env.example .env
+   $ docker compose up
    ```
 
-2. Setup your environment
-
-   - Linux / MacOS
-
-     ```sh
-     $ virtualenv .venv
-     $ source .venv/bin/activate
-     (.venv) $ pip install -r requirements.txt
-     (.venv) $ export PYTHONPATH="$(pwd)"
-     ```
-
-   - Windows (cmd)
-
-     ```sh
-     $ virtualenv .venv
-     $  .\.venv\Scripts\activate
-     (.venv) $ pip install -r requirements.txt
-     (.venv) $ set PYTHONPATH=%cd%
-     ```
-
-   - Windows (PowerShell)
-
-     ```sh
-     $ virtualenv .venv
-     $  .\.venv\Scripts\activate
-     (.venv) $ pip install -r requirements.txt
-     (.venv) $ $env:PYTHONPATH = (Get-Location).Path
-     ```
-
-3. Install [pre-commit](https://pre-commit.com) hooks (used for linting, testing, conventions)
+#### 2. Submit your solution
+- **2.1. Install [pre-commit](https://pre-commit.com) hooks**: this is used for linting, testing, and enforcing conventions.
 
    ```sh
    (.venv) $ pre-commit install
    ```
 
-   To see the configuration, check the `.pre-commit-config.yaml` file.
+   To look into the configuration details, check the `.pre-commit-config.yaml` file.
 
-   Some of our configurations are:
+   Some of the configurations applied are:
 
    - Python Black formatter
    - Python pytest for unit tests
@@ -100,34 +57,31 @@ $ docker compose up
    - Prettier for frontend code
    - [Conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) for commit messages
 
-4. Execute the Demo
-
+- **2.2. Black Formatter on Save File**: Configure IDE extensions to format your code with [Black](https://github.com/psf/black) before submitting it.
+- **2.3. Code solution**: implement the solution in the code.
+- **2.4. Pull Request**: Submit your changes through a pull request (PR). Fill the entire PR template and set the PR title as a valid conventional commit.
+- **2.5. Check PR and issue linking**: if the issue and the PR are not linked, you can do it manually in the right panel of the Pull Request details page.
+- **2.6. PR Validation and Testing**: Your PR will be automatically validated, analyzed, and tested. Please make sure all tests and validations pass before proceeding.
+- **2.7. Peer Review**: One or more core contributors will review your PR. They may suggest changes or improvements.
+- **2.8. Approval and Merge**: After approval from the reviewers, you can merge your PR with a squash and merge type of action.
+
+#### 3. Other considerations
+- **3.1. Small fixes don't require creating an issue**: significantly small issues can be submitted through a valid Pull Request without needing to create an issue.
+- **3.2. Run the frontend in dev mode**: to run the frontend separately from the backend and with hot reload enabled, first launch the backend without the frontend:
+   
    ```sh
-   (.venv) $ python scripts/debug_simulator.py
+   $ docker compose upjsonrpc webrequest ollama database-migration postgres
+   ```
+   Then launch the frontend in dev mode:
+   ```sh
+   $ cd frontend
+   $ npm install
+   $ npm run dev
    ```
-
 ### Improving Documentation
 
-To contribute to our docs, start by visiting our [Documentation Repository](https://github.com/yeagerai/genlayer-docs) to create new issues or contribute to existing issues.
-
-## Review Process
-
-We strive to maintain high-quality code and ensure that all contributions align with our goals. Here’s our process:
-
-- **Black Formatter on Save File**: Configure IDE extensions to format your code with [Black](https://github.com/psf/black) before submitting it.
-- **Pull Request**: Submit your changes through a pull request (PR).
-- **Automated Tests**: Your PR will automatically be tested. Ensure all tests pass to proceed.
-- **Peer Review**: One or more core contributors will review your PR. They may suggest changes or improvements.
-- **Approval and Merge**: After approval from the reviewers, your PR will be merged into the project.
-
-### PR Checks
-
-On PRs we have the following checks:
-
-- Backend end-to-end tests
-- Frontend unit tests
+To contribute to our docs, visit our [Documentation Repository](https://github.com/yeagerai/genlayer-docs) to create new issues or contribute to existing issues.
 
-These will be run automatically when you open a PR (and would need an approval from a maintainer if you are not a maintainer). If you modify your PR afterwards, you'll need to manually run the checks again by commenting `/test` on the PR.
 
 ## Community
 
@@ -136,4 +90,4 @@ Connect with the GenLayer community to discuss, collaborate, and share insights:
 - **[Discord Channel](https://discord.gg/8Jm4v89VAu)**: Our primary hub for discussions, support, and announcements.
 - **[Telegram Group](https://t.me/genlayer)**: For more informal chats and quick updates.
 
-Your continuous feedback drives better product development. Engage with us regularly to test, discuss, and improve the GenLayer Simulator.
+Your continuous feedback drives better product development. Please engage with us regularly to test, discuss, and improve the GenLayer Simulator.

From 03cb79fce17a9a20513034fd55a12fa3d33a4509 Mon Sep 17 00:00:00 2001
From: den <26140541+denishacquin@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:39:45 +0200
Subject: [PATCH 5/8] feat: 417 sim fe allow re ordering contract tabs by
 dragging them around (#434)

* feat: sortable tabs with anim

* feat: improve tab close UI

* refactor: split tabs component, fix opened file persistance

* feat: scroll to tab on load and on open file

---------

Co-authored-by: Den <den@Deniss-MacBook-Pro.local>
---
 frontend/package-lock.json                    | 148 ++++++++++++++++--
 frontend/package.json                         |   2 +
 .../src/components/Simulator/ContractTab.vue  |  27 +++-
 .../src/components/Simulator/ContractTabs.vue |  92 +++++++++++
 .../components/Simulator/ContractsPanel.vue   |  72 +--------
 .../src/components/Tutorial/TutorialStep.vue  |   2 +-
 frontend/src/plugins/persistStore.ts          |   6 +
 frontend/src/stores/contracts.ts              |  23 +++
 8 files changed, 288 insertions(+), 84 deletions(-)
 create mode 100644 frontend/src/components/Simulator/ContractTabs.vue

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e2f3c939c..3e09a4942 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16,6 +16,7 @@
         "@tailwindcss/container-queries": "^0.1.1",
         "@tanstack/vue-query": "^5.51.17",
         "@vueuse/core": "^10.11.0",
+        "@vueuse/integrations": "^11.0.3",
         "clipboard": "^2.0.11",
         "cross-env": "^7.0.3",
         "defu": "^6.1.4",
@@ -29,6 +30,7 @@
         "path": "^0.12.7",
         "pinia": "^2.1.7",
         "socket.io-client": "^4.7.5",
+        "sortablejs": "^1.15.3",
         "splitpanes": "^3.1.5",
         "tippy.js": "^6.3.7",
         "uuid": "^9.0.1",
@@ -2942,6 +2944,129 @@
         }
       }
     },
+    "node_modules/@vueuse/integrations": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-11.0.3.tgz",
+      "integrity": "sha512-w6CDisaxs19S5Fd+NPPLFaA3GoX5gxuxrbTTBu0EYap7oH13w75L6C/+7e9mcoF9akhcR6GyYajwVMQEjdapJg==",
+      "dependencies": {
+        "@vueuse/core": "11.0.3",
+        "@vueuse/shared": "11.0.3",
+        "vue-demi": ">=0.14.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "async-validator": "^4",
+        "axios": "^1",
+        "change-case": "^5",
+        "drauu": "^0.4",
+        "focus-trap": "^7",
+        "fuse.js": "^7",
+        "idb-keyval": "^6",
+        "jwt-decode": "^4",
+        "nprogress": "^0.2",
+        "qrcode": "^1.5",
+        "sortablejs": "^1",
+        "universal-cookie": "^7"
+      },
+      "peerDependenciesMeta": {
+        "async-validator": {
+          "optional": true
+        },
+        "axios": {
+          "optional": true
+        },
+        "change-case": {
+          "optional": true
+        },
+        "drauu": {
+          "optional": true
+        },
+        "focus-trap": {
+          "optional": true
+        },
+        "fuse.js": {
+          "optional": true
+        },
+        "idb-keyval": {
+          "optional": true
+        },
+        "jwt-decode": {
+          "optional": true
+        },
+        "nprogress": {
+          "optional": true
+        },
+        "qrcode": {
+          "optional": true
+        },
+        "sortablejs": {
+          "optional": true
+        },
+        "universal-cookie": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/core": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.0.3.tgz",
+      "integrity": "sha512-RENlh64+SYA9XMExmmH1a3TPqeIuJBNNB/63GT35MZI+zpru3oMRUA6cEFr9HmGqEgUisurwGwnIieF6qu3aXw==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "11.0.3",
+        "@vueuse/shared": "11.0.3",
+        "vue-demi": ">=0.14.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/metadata": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.0.3.tgz",
+      "integrity": "sha512-+FtbO4SD5WpsOcQTcC0hAhNlOid6QNLzqedtquTtQ+CRNBoAt9GuV07c6KNHK1wCmlq8DFPwgiLF2rXwgSHX5Q==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/shared": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.0.3.tgz",
+      "integrity": "sha512-0rY2m6HS5t27n/Vp5cTDsKTlNnimCqsbh/fmT2LgE+aaU42EMfXo8+bNX91W9I7DDmxfuACXMmrd7d79JxkqWA==",
+      "dependencies": {
+        "vue-demi": ">=0.14.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@vueuse/metadata": {
       "version": "10.11.0",
       "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.0.tgz",
@@ -3153,7 +3278,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/autoprefixer": {
       "version": "10.4.19",
@@ -3196,7 +3321,7 @@
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
       "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -3613,7 +3738,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -3945,7 +4070,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -4817,7 +4942,7 @@
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
       "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -4852,7 +4977,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -6110,7 +6235,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -6119,7 +6244,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -7356,7 +7481,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/ps-tree": {
       "version": "1.2.0",
@@ -7900,6 +8025,11 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/sortablejs": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.3.tgz",
+      "integrity": "sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 644704eda..c74671490 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -28,6 +28,7 @@
     "@tailwindcss/container-queries": "^0.1.1",
     "@tanstack/vue-query": "^5.51.17",
     "@vueuse/core": "^10.11.0",
+    "@vueuse/integrations": "^11.0.3",
     "clipboard": "^2.0.11",
     "cross-env": "^7.0.3",
     "defu": "^6.1.4",
@@ -41,6 +42,7 @@
     "path": "^0.12.7",
     "pinia": "^2.1.7",
     "socket.io-client": "^4.7.5",
+    "sortablejs": "^1.15.3",
     "splitpanes": "^3.1.5",
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.1",
diff --git a/frontend/src/components/Simulator/ContractTab.vue b/frontend/src/components/Simulator/ContractTab.vue
index 3a2d6e31e..cb7c1cd3b 100644
--- a/frontend/src/components/Simulator/ContractTab.vue
+++ b/frontend/src/components/Simulator/ContractTab.vue
@@ -1,19 +1,33 @@
 <script setup lang="ts">
-import { XMarkIcon, DocumentCheckIcon } from '@heroicons/vue/16/solid';
+import { DocumentCheckIcon } from '@heroicons/vue/16/solid';
 import { type ContractFile } from '@/types';
 import { HomeIcon } from '@heroicons/vue/24/solid';
+import { X } from 'lucide-vue-next';
+import { onMounted, ref, watch } from 'vue';
 
-defineProps<{
+const props = defineProps<{
   contract?: ContractFile;
   isHomeTab?: Boolean;
   isActive: Boolean;
 }>();
 
 const emit = defineEmits(['closeContract', 'selectContract']);
+
+const tab = ref<HTMLElement | null>(null);
+
+const tryScrollToTab = () => {
+  if (props.isActive) {
+    tab.value?.scrollIntoView();
+  }
+};
+
+onMounted(tryScrollToTab);
+watch(() => props.isActive, tryScrollToTab);
 </script>
 
 <template>
   <div
+    ref="tab"
     :class="[
       'group relative flex items-center border-r border-r-gray-200 font-semibold dark:border-r-zinc-900',
       !isActive &&
@@ -32,7 +46,7 @@ const emit = defineEmits(['closeContract', 'selectContract']);
 
     <template v-else>
       <button
-        class="flex flex-nowrap items-center gap-1 whitespace-nowrap p-2 pr-7"
+        class="flex flex-nowrap items-center gap-1 whitespace-nowrap p-2 pr-8"
         @click="emit('selectContract')"
         @click.middle="emit('closeContract')"
       >
@@ -45,14 +59,15 @@ const emit = defineEmits(['closeContract', 'selectContract']);
 
       <button
         :class="[
-          'absolute right-0 p-2',
+          'absolute right-2 rounded p-[3px] transition-colors hover:bg-gray-200 dark:hover:bg-zinc-500',
           isActive && 'opacity-50 hover:opacity-100',
-          !isActive && 'opacity-0 hover:!opacity-100 group-hover:opacity-50',
+          !isActive &&
+            'opacity-0 hover:!opacity-100 group-hover:opacity-70 dark:hover:text-gray-300',
         ]"
         @click="emit('closeContract')"
         @click.middle="emit('closeContract')"
       >
-        <XMarkIcon class="h-4 w-4" />
+        <X :size="12" :stroke-width="3" />
       </button>
     </template>
 
diff --git a/frontend/src/components/Simulator/ContractTabs.vue b/frontend/src/components/Simulator/ContractTabs.vue
new file mode 100644
index 000000000..4cdf07e24
--- /dev/null
+++ b/frontend/src/components/Simulator/ContractTabs.vue
@@ -0,0 +1,92 @@
+<script setup lang="ts">
+import { PlayIcon } from '@heroicons/vue/24/solid';
+import ContractTab from '@/components/Simulator/ContractTab.vue';
+import { useContractsStore } from '@/stores';
+import { computed } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { useSortable } from '@vueuse/integrations/useSortable';
+import { ref, nextTick } from 'vue';
+
+const store = useContractsStore();
+const router = useRouter();
+const route = useRoute();
+
+const handleRunDebug = () => {
+  router.push({ name: 'run-debug' });
+};
+
+const setCurrentContractTab = (id?: string) => {
+  store.setCurrentContractId(id);
+};
+
+const handleCloseContract = (id?: string) => {
+  store.closeFile(id || '');
+};
+
+const contracts = computed(() => {
+  return store.contracts.filter((contract) =>
+    store.openedFiles.includes(contract.id || ''),
+  );
+});
+
+const sortableContainer = ref<HTMLElement | null>(null);
+
+useSortable(sortableContainer, contracts.value, {
+  animation: 150,
+  onUpdate: (e: any) => {
+    nextTick(() => {
+      store.moveOpenedFile(e.oldIndex, e.newIndex);
+    });
+  },
+});
+
+const handleHorizontalScroll = (event: WheelEvent) => {
+  if (!event.shiftKey && event.currentTarget instanceof HTMLElement) {
+    event.preventDefault();
+    event.currentTarget.scrollLeft += event.deltaY;
+  }
+};
+
+const showHome = computed(() => store.currentContractId === '');
+</script>
+
+<template>
+  <nav
+    class="flex items-stretch justify-between border-b text-sm dark:border-zinc-700"
+  >
+    <div
+      class="no-scrollbar flex items-stretch justify-start overflow-x-auto"
+      @wheel.stop="handleHorizontalScroll"
+    >
+      <ContractTab
+        id="tutorial-welcome"
+        :isHomeTab="true"
+        :isActive="showHome"
+        @selectContract="setCurrentContractTab('')"
+      />
+
+      <div ref="sortableContainer" class="flex flex-row">
+        <ContractTab
+          v-for="contract in store.openedContracts"
+          :key="contract.id"
+          :contract="contract"
+          class="contract-item"
+          :id="`contract-item-${contract.id}`"
+          :isActive="contract.id === store.currentContractId"
+          @closeContract="handleCloseContract(contract.id)"
+          @selectContract="setCurrentContractTab(contract.id)"
+        />
+      </div>
+    </div>
+
+    <div>
+      <Btn
+        v-if="route.name !== 'run-debug' && store.currentContractId"
+        class="m-1 flex items-center !p-1"
+        @click="handleRunDebug"
+        v-tooltip="'Run and Debug'"
+        :icon="PlayIcon"
+      />
+    </div>
+  </nav>
+</template>
diff --git a/frontend/src/components/Simulator/ContractsPanel.vue b/frontend/src/components/Simulator/ContractsPanel.vue
index d58db032c..dcdb5bdef 100644
--- a/frontend/src/components/Simulator/ContractsPanel.vue
+++ b/frontend/src/components/Simulator/ContractsPanel.vue
@@ -1,96 +1,32 @@
 <script setup lang="ts">
-import { PlayIcon } from '@heroicons/vue/24/solid';
-import ContractTab from '@/components/Simulator/ContractTab.vue';
 import CodeEditor from '@/components/Simulator/CodeEditor.vue';
 import { useContractsStore } from '@/stores';
 import { computed } from 'vue';
 import HomeTab from './HomeTab.vue';
-import { useRouter, useRoute } from 'vue-router';
 import { useContractQueries } from '@/hooks';
+import ContractTabs from '@/components/Simulator/ContractTabs.vue';
 
 const store = useContractsStore();
-const router = useRouter();
-const route = useRoute();
 const { contractSchemaQuery } = useContractQueries();
 const { error } = contractSchemaQuery;
 
-const handleRunDebug = () => {
-  router.push({ name: 'run-debug' });
-};
-
-const setCurrentContractTab = (id?: string) => {
-  store.setCurrentContractId(id);
-};
-
-const handleCloseContract = (id?: string) => {
-  store.closeFile(id || '');
-};
-
-const contracts = computed(() => {
-  return store.contracts.filter((contract) =>
-    store.openedFiles.includes(contract.id || ''),
-  );
-});
-
 const showHome = computed(() => store.currentContractId === '');
-
-const handleHorizontalScroll = (event: WheelEvent) => {
-  if (!event.shiftKey && event.currentTarget instanceof HTMLElement) {
-    event.preventDefault();
-    event.currentTarget.scrollLeft += event.deltaY;
-  }
-};
 </script>
 
 <template>
   <div class="flex h-full w-full flex-col">
-    <nav
-      class="flex items-stretch justify-between border-b text-sm dark:border-zinc-700"
-    >
-      <div
-        class="no-scrollbar flex items-stretch justify-start overflow-x-auto"
-        @wheel.stop="handleHorizontalScroll"
-      >
-        <ContractTab
-          id="tutorial-welcome"
-          :isHomeTab="true"
-          :isActive="showHome"
-          @selectContract="setCurrentContractTab('')"
-        />
-
-        <ContractTab
-          v-for="contract in contracts"
-          :key="contract.id"
-          :contract="contract"
-          class="contract-item"
-          :id="`contract-item-${contract.id}`"
-          :isActive="contract.id === store.currentContractId"
-          @closeContract="handleCloseContract(contract.id)"
-          @selectContract="setCurrentContractTab(contract.id)"
-        />
-      </div>
-
-      <div>
-        <Btn
-          v-if="route.name !== 'run-debug' && store.currentContractId"
-          class="m-1 flex items-center !p-1"
-          @click="handleRunDebug"
-          v-tooltip="'Run and Debug'"
-          :icon="PlayIcon"
-        />
-      </div>
-    </nav>
+    <ContractTabs />
 
     <HomeTab v-show="showHome" />
 
     <div
-      v-for="contract in contracts"
+      v-for="contract in store.openedContracts"
       :key="contract.id"
       class="relative flex h-full w-full flex-col overflow-hidden"
       v-show="contract.id === store.currentContractId"
     >
       <div class="flex h-full w-full grow overflow-hidden">
-        <CodeEditor :contract="contract" @run-debug="handleRunDebug" />
+        <CodeEditor :contract="contract" />
       </div>
 
       <div
diff --git a/frontend/src/components/Tutorial/TutorialStep.vue b/frontend/src/components/Tutorial/TutorialStep.vue
index 6cb329b9b..7a14bfbd6 100644
--- a/frontend/src/components/Tutorial/TutorialStep.vue
+++ b/frontend/src/components/Tutorial/TutorialStep.vue
@@ -219,7 +219,7 @@ export default {
           jump(this.targetElement, jumpOptions);
         } else {
           // Use the native scroll by default if no scroll options has been defined
-          this.targetElement?.scrollIntoView({ behavior: 'smooth' });
+          this.targetElement?.scrollIntoView();
         }
       }
     },
diff --git a/frontend/src/plugins/persistStore.ts b/frontend/src/plugins/persistStore.ts
index e5445822e..d4294b357 100644
--- a/frontend/src/plugins/persistStore.ts
+++ b/frontend/src/plugins/persistStore.ts
@@ -88,6 +88,12 @@ export function persistStorePlugin(context: PiniaPluginContext): void {
               store.openedFiles.join(','),
             );
             break;
+          case 'moveOpenedFile':
+            localStorage.setItem(
+              'contractsStore.openedFiles',
+              store.openedFiles.join(','),
+            );
+            break;
           case 'addDeployedContract':
             await upsertDeployedContract(args[0] as DeployedContract);
             break;
diff --git a/frontend/src/stores/contracts.ts b/frontend/src/stores/contracts.ts
index 2bc75c41e..4af53c380 100644
--- a/frontend/src/stores/contracts.ts
+++ b/frontend/src/stores/contracts.ts
@@ -95,6 +95,14 @@ export const useContractsStore = defineStore('contractsStore', () => {
     }
   }
 
+  function moveOpenedFile(oldIndex: number, newIndex: number) {
+    const files = openedFiles.value;
+    const file = files[oldIndex];
+    files.splice(oldIndex, 1);
+    files.splice(newIndex, 0, file);
+    openedFiles.value = [...files];
+  }
+
   function addDeployedContract({
     contractId,
     address,
@@ -167,6 +175,19 @@ export const useContractsStore = defineStore('contractsStore', () => {
     return contracts.value.slice().sort((a, b) => a.name.localeCompare(b.name));
   });
 
+  const openedContracts = computed(() => {
+    return openedFiles.value.flatMap((contractId) => {
+      const contract = contracts.value.find(
+        (contract) => contract.id === contractId,
+      );
+      if (contract) {
+        return [contract];
+      } else {
+        return [];
+      }
+    });
+  });
+
   return {
     // state
     contracts,
@@ -177,6 +198,7 @@ export const useContractsStore = defineStore('contractsStore', () => {
     //getters
     currentContract,
     contractsOrderedByName,
+    openedContracts,
 
     //actions
     addContractFile,
@@ -189,5 +211,6 @@ export const useContractsStore = defineStore('contractsStore', () => {
     setCurrentContractId,
     resetStorage,
     getInitialOpenedFiles,
+    moveOpenedFile,
   };
 });

From a758a224abaed8c8ea41e6f7e48dc64314fb2419 Mon Sep 17 00:00:00 2001
From: den <26140541+denishacquin@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:00:21 +0200
Subject: [PATCH 6/8] test: 425 frontend unit testing (#426)

* refactor: convert rpc client to a hook instead of provide/inject

* refactor: web3 hook

* refactor: short address hook

* refactor: db hook

* fix: remove db version redundancy

* refactor: ws hook

* refactor: rpc client/hook

* refactor: input map hook, move useContractQueries to hooks index

* refactor: python syntax hook

* refactor: filename hook

* refactor: setup stores

* refactor: rename eth to wallet

* fix: wrong input mapping

* refactor: normalize naming for wallet methods

* fix: update omitted replace

* fix: replace updated method

* fix: consistently delete example contracts on reset storage

* fix: don't reload all example files when they already exist with a change

* fix: remove comment

* fix: allow id param on tx items

* build: allow @ path alias in tests

* fix: ts errors

* test: implement unit test for most hooks

* fix: move contract created event to only trigger when contract is actually created

* fix: move tests to the right place

* fix: use lodash debounce instead of vue-debounce because of breaking deps in testing

* test: transaction and ui store unit tests

* test: node store unit test

* test: accounts store unit test

* test: contract store unit test

* refactor: cleanup comments

* refactor: improve address shortening hook and update unit test

* test: add comments to not use the testing private keys

* refactor: cleanup comments

* fix: load opened files correctly from storage, remove some legacy code

* build: allow @ path alias in tests

* fix: ts errors

* test: implement unit test for most hooks

* fix: move contract created event to only trigger when contract is actually created

* fix: move tests to the right place

* fix: use lodash debounce instead of vue-debounce because of breaking deps in testing

* test: transaction and ui store unit tests

* test: node store unit test

* test: accounts store unit test

* test: contract store unit test

* refactor: cleanup comments

* refactor: improve address shortening hook and update unit test

* test: add comments to not use the testing private keys

* refactor: cleanup comments

* refactor: move shortenAddress to useWallet hook and simplify it's definition

* refactor: move python syntax to a constant

* refactor: web client

* test: adapt unit tests after merge

* refactor: wrap web3 methods

* fix: adapt implementations after web3 wallet wrapping

* fix: use lodash debounce instead of vue-debounce because of breaking deps in testing

* fix: wrong typing

* fix: update unit tests to match new web3 wrapper

---------

Co-authored-by: Den <den@Deniss-MacBook-Pro.local>
Co-authored-by: Den <den@deniss-mbp.home>
---
 frontend/src/hooks/useUniqueId.ts             |   9 +-
 .../src/views/Simulator/ContractsView.vue     |   8 +-
 frontend/test/pages/BasePage.ts               |   2 +-
 frontend/test/pages/ContractsPage.ts          |   2 +-
 frontend/test/pages/RunDebugPage.ts           |   2 +-
 frontend/test/pages/SettingsPage.ts           |   3 +-
 frontend/test/pages/TutorialPage.ts           |   2 +-
 .../test/unit/hooks/useEventTracking.test.ts  |  84 ++++++++
 frontend/test/unit/hooks/useFileName.test.ts  |  31 +++
 frontend/test/unit/hooks/useInputMap.test.ts  |  36 ++++
 frontend/test/unit/hooks/useRpcClient.test.ts |  26 +++
 frontend/test/unit/hooks/useUniqueId.test.ts  |  24 +++
 frontend/test/unit/hooks/useWallet.test.ts    |  73 +++++++
 .../unit/hooks/useWebSocketClient.test.ts     |  55 +++++
 .../test/unit/services/JsonRpcService.test.ts |  10 +-
 .../unit/services/signTransaction.test.ts     |  32 ---
 frontend/test/unit/stores/accounts.test.ts    | 110 ++++++++++
 frontend/test/unit/stores/contracts.test.ts   | 127 +++++++++++
 frontend/test/unit/stores/node.test.ts        | 197 ++++++++++++++++++
 .../test/unit/stores/transactions.test.ts     |  96 +++++++++
 frontend/test/unit/stores/ui.test.ts          |  71 +++++++
 frontend/tsconfig.app.json                    |   2 +-
 22 files changed, 953 insertions(+), 49 deletions(-)
 create mode 100644 frontend/test/unit/hooks/useEventTracking.test.ts
 create mode 100644 frontend/test/unit/hooks/useFileName.test.ts
 create mode 100644 frontend/test/unit/hooks/useInputMap.test.ts
 create mode 100644 frontend/test/unit/hooks/useRpcClient.test.ts
 create mode 100644 frontend/test/unit/hooks/useUniqueId.test.ts
 create mode 100644 frontend/test/unit/hooks/useWallet.test.ts
 create mode 100644 frontend/test/unit/hooks/useWebSocketClient.test.ts
 delete mode 100644 frontend/test/unit/services/signTransaction.test.ts
 create mode 100644 frontend/test/unit/stores/accounts.test.ts
 create mode 100644 frontend/test/unit/stores/contracts.test.ts
 create mode 100644 frontend/test/unit/stores/node.test.ts
 create mode 100644 frontend/test/unit/stores/transactions.test.ts
 create mode 100644 frontend/test/unit/stores/ui.test.ts

diff --git a/frontend/src/hooks/useUniqueId.ts b/frontend/src/hooks/useUniqueId.ts
index 3fc8ec36d..1f422cc93 100644
--- a/frontend/src/hooks/useUniqueId.ts
+++ b/frontend/src/hooks/useUniqueId.ts
@@ -1,6 +1,11 @@
 import { v4 as uuidv4 } from 'uuid';
 
-export function useUniqueId(prefix: string): string {
+export function useUniqueId(prefix?: string): string {
   const uid = uuidv4();
-  return `${prefix}-${uid}`;
+
+  if (prefix) {
+    return `${prefix}-${uid}`;
+  } else {
+    return uid;
+  }
 }
diff --git a/frontend/src/views/Simulator/ContractsView.vue b/frontend/src/views/Simulator/ContractsView.vue
index 9b00ce1a2..9102d8977 100644
--- a/frontend/src/views/Simulator/ContractsView.vue
+++ b/frontend/src/views/Simulator/ContractsView.vue
@@ -50,13 +50,13 @@ const handleSaveNewFile = (name: string) => {
     const id = uuidv4();
     store.addContractFile({ id, name, content: '' });
     store.openFile(id);
+
+    trackEvent('created_contract', {
+      contract_name: name,
+    });
   }
 
   showNewFileInput.value = false;
-
-  trackEvent('created_contract', {
-    contract_name: name,
-  });
 };
 </script>
 
diff --git a/frontend/test/pages/BasePage.ts b/frontend/test/pages/BasePage.ts
index 8958aae7a..bb7d4af79 100644
--- a/frontend/test/pages/BasePage.ts
+++ b/frontend/test/pages/BasePage.ts
@@ -1,4 +1,4 @@
-import { By, until, WebDriver, Locator } from 'selenium-webdriver';
+import { By, until, WebDriver, type Locator } from 'selenium-webdriver';
 
 export class BasePage {
   protected readonly driver: WebDriver;
diff --git a/frontend/test/pages/ContractsPage.ts b/frontend/test/pages/ContractsPage.ts
index 6abb1db52..1d68117b9 100644
--- a/frontend/test/pages/ContractsPage.ts
+++ b/frontend/test/pages/ContractsPage.ts
@@ -1,4 +1,4 @@
-import { By, Locator, until } from 'selenium-webdriver';
+import { By, type Locator, until } from 'selenium-webdriver';
 import { BasePage } from './BasePage';
 
 export class ContractsPage extends BasePage {
diff --git a/frontend/test/pages/RunDebugPage.ts b/frontend/test/pages/RunDebugPage.ts
index a0c2d5ef1..9f32187bf 100644
--- a/frontend/test/pages/RunDebugPage.ts
+++ b/frontend/test/pages/RunDebugPage.ts
@@ -1,4 +1,4 @@
-import { By, Locator } from 'selenium-webdriver';
+import { By, type Locator } from 'selenium-webdriver';
 import { BasePage } from './BasePage';
 
 export class RunDebugPage extends BasePage {
diff --git a/frontend/test/pages/SettingsPage.ts b/frontend/test/pages/SettingsPage.ts
index 8fd578c95..1b310b488 100644
--- a/frontend/test/pages/SettingsPage.ts
+++ b/frontend/test/pages/SettingsPage.ts
@@ -1,4 +1,5 @@
-import { By, Locator, WebElement, until, Select } from 'selenium-webdriver';
+import { By, type Locator, WebElement, until } from 'selenium-webdriver';
+import { Select } from 'selenium-webdriver/lib/select';
 import { BasePage } from './BasePage';
 import { expect } from 'chai';
 
diff --git a/frontend/test/pages/TutorialPage.ts b/frontend/test/pages/TutorialPage.ts
index 2e6602885..19089dccf 100644
--- a/frontend/test/pages/TutorialPage.ts
+++ b/frontend/test/pages/TutorialPage.ts
@@ -1,4 +1,4 @@
-import { By, Locator, WebElement } from 'selenium-webdriver';
+import { By, type Locator, WebElement } from 'selenium-webdriver';
 import { BasePage } from './BasePage';
 
 export class TutorialPage extends BasePage {
diff --git a/frontend/test/unit/hooks/useEventTracking.test.ts b/frontend/test/unit/hooks/useEventTracking.test.ts
new file mode 100644
index 000000000..3cd2e63d6
--- /dev/null
+++ b/frontend/test/unit/hooks/useEventTracking.test.ts
@@ -0,0 +1,84 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useEventTracking } from '@/hooks';
+
+const testEvent = 'called_read_method';
+const testProperties = { contract_name: 'test', method_name: 'test' };
+
+const trackPlausibleEventMock = vi.fn();
+
+vi.mock('v-plausible/vue', () => ({
+  usePlausible: vi.fn(() => ({
+    trackEvent: trackPlausibleEventMock,
+  })),
+}));
+
+describe('useEventTracking composable', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should log event tracking in development mode without calling trackPlausibleEvent', () => {
+    import.meta.env.MODE = 'development';
+    const consoleDebugSpy = vi
+      .spyOn(console, 'debug')
+      .mockImplementation(() => {}); // Mock to avoid console output
+
+    const { trackEvent } = useEventTracking();
+    trackEvent(testEvent, testProperties);
+
+    expect(consoleDebugSpy).toHaveBeenCalledWith(
+      'Track Event (blocked in dev mode)',
+      { name: testEvent, properties: testProperties },
+    );
+    expect(trackPlausibleEventMock).not.toHaveBeenCalled();
+    consoleDebugSpy.mockRestore();
+  });
+
+  it('should call trackPlausibleEvent in production mode', () => {
+    import.meta.env.MODE = 'production';
+    const consoleDebugSpy = vi
+      .spyOn(console, 'debug')
+      .mockImplementation(() => {}); // Mock to avoid console output
+
+    const { trackEvent } = useEventTracking();
+    trackEvent(testEvent, testProperties);
+
+    expect(consoleDebugSpy).toHaveBeenCalledWith('Track Event', {
+      name: testEvent,
+      properties: testProperties,
+    });
+    expect(trackPlausibleEventMock).toHaveBeenCalledWith(testEvent, {
+      props: testProperties,
+    });
+    consoleDebugSpy.mockRestore();
+  });
+
+  it('should log an error if tracking fails', () => {
+    import.meta.env.MODE = 'production';
+    const consoleErrorSpy = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => {}); // Mock to avoid console output
+    const consoleDebugSpy = vi
+      .spyOn(console, 'debug')
+      .mockImplementation(() => {}); // Mock to avoid console output
+
+    trackPlausibleEventMock.mockImplementationOnce(() => {
+      throw new Error('Mock error');
+    });
+
+    const { trackEvent } = useEventTracking();
+    trackEvent(testEvent, testProperties);
+
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      'Failed to track event',
+      expect.any(Error),
+    );
+    expect(consoleDebugSpy).toHaveBeenCalledWith('Track Event', {
+      name: testEvent,
+      properties: testProperties,
+    });
+
+    consoleErrorSpy.mockRestore();
+    consoleDebugSpy.mockRestore();
+  });
+});
diff --git a/frontend/test/unit/hooks/useFileName.test.ts b/frontend/test/unit/hooks/useFileName.test.ts
new file mode 100644
index 000000000..ff18455e0
--- /dev/null
+++ b/frontend/test/unit/hooks/useFileName.test.ts
@@ -0,0 +1,31 @@
+import { describe, it, expect } from 'vitest';
+import { useFileName } from '@/hooks';
+
+describe('useFileName composable', () => {
+  const { cleanupFileName } = useFileName();
+
+  it('should return the original name with ".gpy" when there is no period in the name', () => {
+    const result = cleanupFileName('example');
+    expect(result).toBe('example.gpy');
+  });
+
+  it('should replace the extension with ".gpy" if there is a period in the name', () => {
+    const result = cleanupFileName('document.txt');
+    expect(result).toBe('document.gpy');
+  });
+
+  it('should return ".gpy" if the name is just a period', () => {
+    const result = cleanupFileName('.');
+    expect(result).toBe('.gpy');
+  });
+
+  it('should handle names with multiple periods correctly', () => {
+    const result = cleanupFileName('archive.tar.gz');
+    expect(result).toBe('archive.gpy');
+  });
+
+  it('should return ".gpy" for an empty string', () => {
+    const result = cleanupFileName('');
+    expect(result).toBe('.gpy');
+  });
+});
diff --git a/frontend/test/unit/hooks/useInputMap.test.ts b/frontend/test/unit/hooks/useInputMap.test.ts
new file mode 100644
index 000000000..839e2daaf
--- /dev/null
+++ b/frontend/test/unit/hooks/useInputMap.test.ts
@@ -0,0 +1,36 @@
+import { describe, it, expect } from 'vitest';
+import { useInputMap } from '@/hooks';
+import StringField from '@/components/global/fields/StringField.vue';
+import IntegerField from '@/components/global/fields/IntegerField.vue';
+import FloatField from '@/components/global/fields/FloatField.vue';
+import BooleanField from '@/components/global/fields/BooleanField.vue';
+
+describe('useInputMap composable', () => {
+  const { getComponent } = useInputMap();
+
+  it('should return the correct component for type "string"', () => {
+    const component = getComponent('string');
+    expect(component).toBe(StringField);
+  });
+
+  it('should return the correct component for type "uint256"', () => {
+    const component = getComponent('uint256');
+    expect(component).toBe(IntegerField);
+  });
+
+  it('should return the correct component for type "float"', () => {
+    const component = getComponent('float');
+    expect(component).toBe(FloatField);
+  });
+
+  it('should return the correct component for type "bool"', () => {
+    const component = getComponent('bool');
+    expect(component).toBe(BooleanField);
+  });
+
+  it('should throw an error for an unknown type', () => {
+    expect(() => getComponent('unknown')).toThrowError(
+      'Component not found for input type: unknown',
+    );
+  });
+});
diff --git a/frontend/test/unit/hooks/useRpcClient.test.ts b/frontend/test/unit/hooks/useRpcClient.test.ts
new file mode 100644
index 000000000..423cb7cb2
--- /dev/null
+++ b/frontend/test/unit/hooks/useRpcClient.test.ts
@@ -0,0 +1,26 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useRpcClient } from '@/hooks';
+import { RpcClient } from '@/clients/rpc';
+import { JsonRpcService } from '@/services/JsonRpcService';
+
+vi.mock('@/clients/rpc', () => ({
+  RpcClient: vi.fn(),
+}));
+
+vi.mock('@/services/JsonRpcService', () => ({
+  JsonRpcService: vi.fn(),
+}));
+
+describe('useRpcClient', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should create a new JsonRpcService with a new RpcClient instance', () => {
+    useRpcClient();
+
+    expect(RpcClient).toHaveBeenCalledTimes(1);
+    expect(JsonRpcService).toHaveBeenCalledWith(expect.any(RpcClient));
+    expect(JsonRpcService).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/frontend/test/unit/hooks/useUniqueId.test.ts b/frontend/test/unit/hooks/useUniqueId.test.ts
new file mode 100644
index 000000000..104dc3c15
--- /dev/null
+++ b/frontend/test/unit/hooks/useUniqueId.test.ts
@@ -0,0 +1,24 @@
+import { describe, it, expect, vi } from 'vitest';
+import { useUniqueId } from '@/hooks';
+import { v4 as uuidv4 } from 'uuid';
+
+vi.mock('uuid', () => ({
+  v4: vi.fn(() => 'mocked-uuid'),
+}));
+
+describe('useUniqueId function', () => {
+  it('should generate a unique ID without prefix', () => {
+    const result = useUniqueId();
+
+    expect(uuidv4).toHaveBeenCalled();
+    expect(result).toBe('mocked-uuid');
+  });
+
+  it('should generate a unique ID with the correct prefix', () => {
+    const prefix = 'testPrefix';
+    const result = useUniqueId(prefix);
+
+    expect(uuidv4).toHaveBeenCalled();
+    expect(result).toBe(`${prefix}-mocked-uuid`);
+  });
+});
diff --git a/frontend/test/unit/hooks/useWallet.test.ts b/frontend/test/unit/hooks/useWallet.test.ts
new file mode 100644
index 000000000..0b5257f93
--- /dev/null
+++ b/frontend/test/unit/hooks/useWallet.test.ts
@@ -0,0 +1,73 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useWallet } from '@/hooks/useWallet';
+import { recoverTransactionAddress } from 'viem';
+
+const testPrivateKey =
+  '0x90efb1e7b1cedc8b4c9c6be652b93a1549e4cfa94d43f5918e60a9cd5f8cf479'; // ! NEVER USE THIS PRIVATE KEY
+const testAddress = '0x779769CEFAEEBF0f388F9Bc7072B08139084B8b0';
+const testData = [
+  '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+  1000000000000000000n,
+];
+const testSignedTransaction =
+  '0xf87e8080808080b5f4aa307837303939373937306335313831326463336130313063376430316235306530643137646337396338880de0b6b3a76400001ca09047ca41a2f96e45360ec4e84bd83e805cd3de564f235472e540acfe8fdb794ea077597cc9e359e6bf0889b476657f2f892f774d0d776a5a58776fb15975a97a26';
+
+describe('useWallet', () => {
+  const wallet = useWallet();
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should generate a private key of the right length', () => {
+    const result = wallet.generatePrivateKey();
+    expect(result).toHaveLength(testPrivateKey.length);
+  });
+
+  it('should convert a private key to an account', () => {
+    const result = wallet.privateKeyToAccount(testPrivateKey);
+    expect(result.address).toBe(testAddress);
+  });
+
+  it('it should sign a transaction and verify the signature and deduce the address', async () => {
+    const signedTransaction = await wallet.signTransaction(
+      testPrivateKey,
+      testData,
+    );
+    expect(signedTransaction).toBe(testSignedTransaction);
+
+    const account = wallet.privateKeyToAccount(testPrivateKey);
+    const txAddress = await recoverTransactionAddress({
+      serializedTransaction: signedTransaction,
+    });
+    expect(txAddress).to.deep.equal(account.address);
+  });
+
+  it('should shorten an Ethereum address correctly', () => {
+    const address = '0x1234567890abcdef1234567890abcdef12345678';
+    const result = wallet.shortenAddress(address);
+    expect(result).toBe('0x12...5678');
+  });
+
+  it('should shorten a non-Ethereum address correctly', () => {
+    const address = 'abcdef1234567890abcdef1234567890abcdef12';
+    const result = wallet.shortenAddress(address);
+    expect(result).toBe('abcd...ef12');
+  });
+
+  it('should return empty string for undefined input', () => {
+    const result = wallet.shortenAddress(undefined);
+    expect(result).toBe('');
+  });
+
+  it('should return empty string for empty string input', () => {
+    const result = wallet.shortenAddress('');
+    expect(result).toBe('');
+  });
+
+  it('should handle short addresses with prefix correctly', () => {
+    const address = '0x1234';
+    const result = wallet.shortenAddress(address);
+    expect(result).toBe('0x...34');
+  });
+});
diff --git a/frontend/test/unit/hooks/useWebSocketClient.test.ts b/frontend/test/unit/hooks/useWebSocketClient.test.ts
new file mode 100644
index 000000000..eb5be5b83
--- /dev/null
+++ b/frontend/test/unit/hooks/useWebSocketClient.test.ts
@@ -0,0 +1,55 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useWebSocketClient } from '@/hooks/useWebSocketClient';
+import { io, type Socket } from 'socket.io-client';
+
+const mockSocket: Partial<Socket> = {
+  id: 'mocked-socket-id',
+  on: vi.fn(),
+};
+
+vi.mock('socket.io-client', () => ({
+  io: vi.fn(() => mockSocket),
+}));
+
+describe('useWebSocketClient', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should create a WebSocket client with the correct URL', () => {
+    useWebSocketClient();
+    expect(io).toHaveBeenCalledWith(import.meta.env.VITE_WS_SERVER_URL);
+  });
+
+  it('should set up connect and disconnect event handlers', () => {
+    const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+    useWebSocketClient();
+
+    expect(mockSocket.on).toHaveBeenCalledWith('connect', expect.any(Function));
+    expect(mockSocket.on).toHaveBeenCalledWith(
+      'disconnect',
+      expect.any(Function),
+    );
+
+    const connectCallback = (mockSocket.on as any).mock.calls.find(
+      (call: any) => call[0] === 'connect',
+    )[1];
+    connectCallback();
+    expect(consoleLogSpy).toHaveBeenCalledWith(
+      'webSocketClient.connect',
+      mockSocket.id,
+    );
+
+    const disconnectCallback = (mockSocket.on as any).mock.calls.find(
+      (call: any) => call[0] === 'disconnect',
+    )[1];
+    disconnectCallback();
+    expect(consoleLogSpy).toHaveBeenCalledWith(
+      'webSocketClient.disconnnect',
+      mockSocket.id,
+    );
+
+    consoleLogSpy.mockRestore();
+  });
+});
diff --git a/frontend/test/unit/services/JsonRpcService.test.ts b/frontend/test/unit/services/JsonRpcService.test.ts
index 737abbf20..c418b842a 100644
--- a/frontend/test/unit/services/JsonRpcService.test.ts
+++ b/frontend/test/unit/services/JsonRpcService.test.ts
@@ -1,11 +1,11 @@
-import { JsonRpcService } from '../../../src/services/JsonRpcService';
-import { IJsonRpcService } from '../../../src/services/IJsonRpcService';
-import { IRpcClient } from '../../../src/clients/rpc';
-import {
+import { JsonRpcService } from '@/services/JsonRpcService';
+import type { IJsonRpcService } from '@/services/IJsonRpcService';
+import type { IRpcClient } from '@/clients/rpc';
+import type {
   CallContractFunctionResult,
   GetContractStateResult,
   JsonRPCResponse,
-} from '../../../src/types';
+} from '@/types';
 import { describe, expect, it, vi, afterEach, beforeEach } from 'vitest';
 
 describe('JsonRprService', () => {
diff --git a/frontend/test/unit/services/signTransaction.test.ts b/frontend/test/unit/services/signTransaction.test.ts
deleted file mode 100644
index 1cd3947a6..000000000
--- a/frontend/test/unit/services/signTransaction.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useWallet } from '../../../src/hooks/useWallet';
-import { describe, expect, it, vi, afterEach, beforeEach } from 'vitest';
-
-describe('SignTransaction', () => {
-  const wallet = useWallet();
-
-  beforeEach(() => {
-    //
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  describe('signTransaction', () => {
-    const privateKey = wallet.generatePrivateKey();
-
-    const data = [
-      '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
-      1000000000000000000n,
-    ];
-
-    it('it should sign a transaction and verify', async () => {
-      const signedTransaction = await wallet.signTransaction(privateKey, data);
-      const account = wallet.privateKeyToAccount(privateKey);
-      const txAddress = await wallet.recoverTransactionAddress({
-        serializedTransaction: signedTransaction,
-      });
-      expect(txAddress).to.deep.equal(account.address);
-    });
-  });
-});
diff --git a/frontend/test/unit/stores/accounts.test.ts b/frontend/test/unit/stores/accounts.test.ts
new file mode 100644
index 000000000..584ab1a85
--- /dev/null
+++ b/frontend/test/unit/stores/accounts.test.ts
@@ -0,0 +1,110 @@
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { useAccountsStore } from '@/stores';
+import { useWallet } from '@/hooks';
+
+const testKey1 =
+  '0x4104e41989791c1e1f3a889710d8c5509b98ee62e5fabced8a3f538f5afd392b'; // ! NEVER USE THIS PRIVATE KEY
+const testAddress1 = '0x858744E989D688C5f02ec2388342cc34Edf88a97';
+const testKey2 =
+  '0x90efb1e7b1cedc8b4c9c6be652b93a1549e4cfa94d43f5918e60a9cd5f8cf479'; // ! NEVER USE THIS PRIVATE KEY
+
+vi.mock('@/hooks', () => ({
+  useWallet: vi.fn(),
+  useShortAddress: vi.fn(),
+}));
+
+describe('useAccountsStore', () => {
+  let accountsStore: ReturnType<typeof useAccountsStore>;
+  const mockWallet = {
+    privateKeyToAccount: vi.fn(),
+    generatePrivateKey: vi.fn(),
+    shortenAddress: vi.fn(),
+  };
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    (useWallet as Mock).mockReturnValue(mockWallet);
+
+    // Mock localStorage
+    vi.stubGlobal('localStorage', {
+      getItem: vi.fn(),
+      setItem: vi.fn(),
+      removeItem: vi.fn(),
+    });
+
+    accountsStore = useAccountsStore();
+
+    mockWallet.privateKeyToAccount.mockClear();
+    mockWallet.generatePrivateKey.mockClear();
+    mockWallet.shortenAddress.mockClear();
+    (localStorage.getItem as Mock).mockClear();
+    (localStorage.getItem as Mock).mockClear();
+    (localStorage.removeItem as Mock).mockClear();
+  });
+
+  it('should generate a new account', () => {
+    const newPrivateKey = '0xnewkey';
+    mockWallet.generatePrivateKey.mockReturnValue(newPrivateKey);
+    const generatedKey = accountsStore.generateNewAccount();
+
+    expect(generatedKey).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;
+
+    accountsStore.removeAccount(testKey1);
+
+    expect(accountsStore.privateKeys).toEqual([testKey2]);
+    expect(accountsStore.currentPrivateKey).toBe(testKey2);
+  });
+
+  it('should throw error when removing the last account', () => {
+    accountsStore.privateKeys = [testKey1];
+
+    expect(() => accountsStore.removeAccount(testKey1)).toThrow(
+      'You need at least 1 account',
+    );
+  });
+
+  it('should handle errors in displayAddress computation', () => {
+    accountsStore.currentPrivateKey = '0xinvalidkey';
+
+    mockWallet.privateKeyToAccount.mockImplementation(() => {
+      throw new Error('Invalid private key');
+    });
+
+    const consoleSpy = vi.spyOn(console, 'error');
+    consoleSpy.mockImplementation(() => {});
+
+    expect(accountsStore.displayAddress).toBe('0x');
+
+    consoleSpy.mockRestore();
+  });
+
+  it('should set current account', () => {
+    const newPrivateKey = testKey2;
+    accountsStore.setCurrentAccount(newPrivateKey);
+
+    expect(accountsStore.currentPrivateKey).toBe(newPrivateKey);
+  });
+
+  it('should compute currentUserAddress correctly', () => {
+    const privateKey = testKey1;
+    const account = { address: testAddress1 };
+    accountsStore.currentPrivateKey = privateKey;
+    mockWallet.privateKeyToAccount.mockReturnValue(account);
+
+    expect(accountsStore.currentUserAddress).toBe(testAddress1);
+    expect(mockWallet.privateKeyToAccount).toHaveBeenCalledWith(privateKey);
+  });
+
+  it('should return an empty string for currentUserAddress when no private key is set', () => {
+    accountsStore.currentPrivateKey = null;
+    expect(accountsStore.currentUserAddress).toBe('');
+  });
+});
diff --git a/frontend/test/unit/stores/contracts.test.ts b/frontend/test/unit/stores/contracts.test.ts
new file mode 100644
index 000000000..848b2a0e7
--- /dev/null
+++ b/frontend/test/unit/stores/contracts.test.ts
@@ -0,0 +1,127 @@
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { useContractsStore } from '@/stores';
+import { useDb, useFileName, useSetupStores } from '@/hooks';
+import { notify } from '@kyvg/vue3-notification';
+
+const testContract = {
+  id: '03bf999b-9b2f-48f1-b1e8-52becccc6e87',
+  name: 'test.gpy',
+  content: 'print("hello")',
+  example: true,
+};
+
+const testDeployedContract = {
+  contractId: '03bf999b-9b2f-48f1-b1e8-52becccc6e87',
+  address: '0xBB3557F472b67BbBb8a138AaBbFE77bA1dFF909E',
+  defaultState: '{}',
+};
+
+vi.mock('@/hooks', () => ({
+  useDb: vi.fn(),
+  useFileName: vi.fn(),
+  useSetupStores: vi.fn(),
+}));
+
+vi.mock('@kyvg/vue3-notification', () => ({
+  notify: vi.fn(),
+}));
+
+describe('useContractsStore', () => {
+  let contractsStore: ReturnType<typeof useContractsStore>;
+  const mockDb = {
+    deployedContracts: {
+      where: vi.fn().mockReturnThis(),
+      anyOf: vi.fn().mockReturnThis(),
+      delete: vi.fn(),
+    },
+    contractFiles: {
+      where: vi.fn().mockReturnThis(),
+      anyOf: vi.fn().mockReturnThis(),
+      delete: vi.fn(),
+    },
+  };
+
+  const mockFileName = {
+    cleanupFileName: vi.fn(),
+  };
+
+  const mockSetupStores = {
+    setupStores: vi.fn(),
+  };
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    (useDb as Mock).mockReturnValue(mockDb);
+    (useFileName as Mock).mockReturnValue(mockFileName);
+    (useSetupStores as Mock).mockReturnValue(mockSetupStores);
+
+    contractsStore = useContractsStore();
+    vi.clearAllMocks();
+  });
+
+  it('should add a contract file', () => {
+    const newContract = testContract;
+    mockFileName.cleanupFileName.mockReturnValue(newContract.name);
+
+    contractsStore.addContractFile(newContract);
+    expect(contractsStore.contracts).toContainEqual(newContract);
+    expect(mockFileName.cleanupFileName).toHaveBeenCalledWith(newContract.name);
+  });
+
+  it('should remove a contract file', () => {
+    contractsStore.contracts = [testContract];
+    contractsStore.removeContractFile(testContract.id);
+
+    expect(contractsStore.contracts).not.toContainEqual(
+      expect.objectContaining({ id: testContract.id }),
+    );
+  });
+
+  it('should open and close files correctly', () => {
+    contractsStore.contracts = [testContract];
+
+    contractsStore.openFile(testContract.id);
+    expect(contractsStore.openedFiles).toContain(testContract.id);
+    expect(contractsStore.currentContractId).toBe(testContract.id);
+
+    contractsStore.closeFile(testContract.id);
+    expect(contractsStore.openedFiles).not.toContain(testContract.id);
+    expect(contractsStore.currentContractId).toBe('');
+  });
+
+  it('should add and remove deployed contracts', () => {
+    const deployedContract = {
+      contractId: '1',
+      address: '0x123',
+      defaultState: {},
+    };
+
+    contractsStore.addDeployedContract(testDeployedContract);
+    expect(contractsStore.deployedContracts).toContainEqual(
+      testDeployedContract,
+    );
+    expect(notify).toHaveBeenCalledWith({
+      title: 'Contract deployed',
+      type: 'success',
+    });
+
+    contractsStore.removeDeployedContract(testDeployedContract.contractId);
+    expect(contractsStore.deployedContracts).not.toContainEqual(
+      deployedContract,
+    );
+  });
+
+  it('should reset storage and delete contracts from the database', async () => {
+    const exampleContracts = [testContract];
+    contractsStore.contracts = exampleContracts;
+
+    await contractsStore.resetStorage();
+
+    expect(mockDb.deployedContracts.delete).toHaveBeenCalled();
+    expect(mockDb.contractFiles.delete).toHaveBeenCalled();
+    expect(mockSetupStores.setupStores).toHaveBeenCalled();
+    expect(contractsStore.contracts).toHaveLength(0);
+    expect(contractsStore.openedFiles).toHaveLength(0);
+  });
+});
diff --git a/frontend/test/unit/stores/node.test.ts b/frontend/test/unit/stores/node.test.ts
new file mode 100644
index 000000000..359a29426
--- /dev/null
+++ b/frontend/test/unit/stores/node.test.ts
@@ -0,0 +1,197 @@
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { useNodeStore } from '@/stores';
+import { useContractsStore } from '@/stores/contracts';
+import { useRpcClient, useWebSocketClient } from '@/hooks';
+import { notify } from '@kyvg/vue3-notification';
+import { type ValidatorModel, type NodeLog } from '@/types';
+
+const testValidator1: ValidatorModel = {
+  id: 1,
+  address: '0x123',
+  stake: 100,
+  provider: 'openai',
+  model: 'gpt-4',
+  config: '{}',
+  updated_at: new Date().toISOString(),
+};
+
+const testValidator2: ValidatorModel = {
+  id: 2,
+  address: '0x321',
+  stake: 200,
+  provider: 'ollama',
+  model: 'llama3',
+  config: '{}',
+  updated_at: new Date().toISOString(),
+};
+
+const testLog: NodeLog = {
+  date: new Date().toISOString(),
+  message: {
+    function: 'test_function',
+    trace_id: '123456',
+    response: {
+      status: 'success',
+      message: 'Test message',
+      data: {},
+    },
+  },
+  mock: false,
+};
+
+vi.mock('@/hooks', () => ({
+  useRpcClient: vi.fn(),
+  useWebSocketClient: vi.fn(),
+}));
+
+vi.mock('@/stores/contracts', () => ({
+  useContractsStore: vi.fn(),
+}));
+
+vi.mock('@kyvg/vue3-notification', () => ({
+  notify: vi.fn(),
+}));
+
+describe('useNodeStore', () => {
+  let nodeStore: ReturnType<typeof useNodeStore>;
+  const mockRpcClient = {
+    getValidators: vi.fn(),
+    getProvidersAndModels: vi.fn(),
+    updateValidator: vi.fn(),
+    deleteValidator: vi.fn(),
+    createValidator: vi.fn(),
+  };
+
+  const mockWebSocketClient = {
+    connected: false,
+    connect: vi.fn(),
+    on: vi.fn(),
+  };
+
+  const mockContractsStore = {
+    contracts: [{ id: 1, example: true }],
+  };
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    (useRpcClient as Mock).mockReturnValue(mockRpcClient);
+    (useWebSocketClient as Mock).mockReturnValue(mockWebSocketClient);
+    (useContractsStore as unknown as Mock).mockReturnValue(mockContractsStore);
+    nodeStore = useNodeStore();
+    mockRpcClient.getValidators.mockClear();
+    mockRpcClient.getProvidersAndModels.mockClear();
+    mockRpcClient.updateValidator.mockClear();
+    mockRpcClient.deleteValidator.mockClear();
+    mockRpcClient.createValidator.mockClear();
+    mockWebSocketClient.connect.mockClear();
+    mockWebSocketClient.on.mockClear();
+  });
+
+  it('should fetch validators data successfully', async () => {
+    mockRpcClient.getValidators.mockResolvedValue({
+      status: 'success',
+      data: [],
+    });
+    mockRpcClient.getProvidersAndModels.mockResolvedValue({
+      status: 'success',
+      data: {},
+    });
+
+    await nodeStore.getValidatorsData();
+
+    expect(mockRpcClient.getValidators).toHaveBeenCalled();
+    expect(mockRpcClient.getProvidersAndModels).toHaveBeenCalled();
+    expect(nodeStore.isLoadingValidatorData).toBe(false);
+  });
+
+  it('should handle error when fetching validators data', async () => {
+    const consoleErrorSpy = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => {}); // Mock to avoid console output
+    const testError = new Error('Network error');
+
+    mockRpcClient.getValidators.mockRejectedValue(testError);
+    await nodeStore.getValidatorsData();
+
+    expect(consoleErrorSpy).toHaveBeenCalledWith(testError);
+    expect(notify).toHaveBeenCalledWith({
+      title: 'Error',
+      text: 'Network error',
+      type: 'error',
+    });
+    expect(nodeStore.isLoadingValidatorData).toBe(false);
+  });
+
+  it('should create a new validator', async () => {
+    const newValidatorData = testValidator1;
+
+    mockRpcClient.createValidator.mockResolvedValue({
+      status: 'success',
+      data: newValidatorData,
+    });
+
+    await nodeStore.createNewValidator(newValidatorData);
+    expect(nodeStore.validators).to.deep.include(newValidatorData);
+  });
+
+  it('should update a validator', async () => {
+    const validator = testValidator1;
+    const newValidatorData = {
+      stake: 10000,
+      provider: 'provider2',
+      model: 'model2',
+      config: '{}',
+    };
+
+    nodeStore.validators = [testValidator1];
+
+    mockRpcClient.updateValidator.mockResolvedValue({
+      status: 'success',
+      data: { ...validator, ...newValidatorData },
+    });
+    await nodeStore.updateValidator(validator, newValidatorData);
+
+    expect(nodeStore.validators[0]).toEqual({
+      ...validator,
+      ...newValidatorData,
+    });
+  });
+
+  it('should delete a validator', async () => {
+    nodeStore.validators = [testValidator1, testValidator2];
+    mockRpcClient.deleteValidator.mockResolvedValue({ status: 'success' });
+
+    await nodeStore.deleteValidator(testValidator1);
+    expect(mockRpcClient.deleteValidator).toHaveBeenCalledWith({
+      address: testValidator1.address,
+    });
+    expect(nodeStore.validators).not.to.toContain(testValidator1);
+  });
+
+  it('should clear logs', () => {
+    nodeStore.logs = [testLog];
+    nodeStore.clearLogs();
+
+    expect(nodeStore.logs).toHaveLength(0);
+  });
+
+  it('should compute contractsToDelete', () => {
+    expect(nodeStore.contractsToDelete).toEqual([{ id: 1, example: true }]);
+  });
+
+  it('should compute validatorsOrderedById', () => {
+    nodeStore.validators = [testValidator2, testValidator1];
+    expect(nodeStore.validatorsOrderedById).toEqual([
+      testValidator1,
+      testValidator2,
+    ]);
+  });
+
+  it('should compute hasAtLeastOneValidator', () => {
+    nodeStore.validators = [];
+    expect(nodeStore.hasAtLeastOneValidator).toBe(false);
+    nodeStore.validators = [testValidator1];
+    expect(nodeStore.hasAtLeastOneValidator).toBe(true);
+  });
+});
diff --git a/frontend/test/unit/stores/transactions.test.ts b/frontend/test/unit/stores/transactions.test.ts
new file mode 100644
index 000000000..74d94b973
--- /dev/null
+++ b/frontend/test/unit/stores/transactions.test.ts
@@ -0,0 +1,96 @@
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { setActivePinia, createPinia } from 'pinia';
+import { useTransactionsStore } from '@/stores';
+import { useRpcClient } from '@/hooks';
+import { type TransactionItem } from '@/types';
+
+vi.mock('@/hooks', () => ({
+  useRpcClient: vi.fn(),
+}));
+
+const testTransaction: TransactionItem = {
+  type: 'deploy',
+  status: 'PENDING',
+  contractAddress: '0xAf4ec2548dBBdc43ab6dCFbD4EdcEedde3FEAFB5',
+  localContractId: '47490604-6ee9-4c0e-bf31-05d33197eedd',
+  txId: 140,
+};
+
+const updatedTransactionPayload = {
+  id: 140,
+  type: 'deploy',
+  status: 'FINALIZED',
+  contractAddress: '0xAf4ec2548dBBdc43ab6dCFbD4EdcEedde3FEAFB5',
+  localContractId: '47490604-6ee9-4c0e-bf31-05d33197eedd',
+};
+
+describe('useTransactionsStore', () => {
+  let transactionsStore: ReturnType<typeof useTransactionsStore>;
+  const mockRpcClient = {
+    getTransactionById: vi.fn(),
+  };
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    (useRpcClient as Mock).mockReturnValue(mockRpcClient);
+    transactionsStore = useTransactionsStore();
+    transactionsStore.transactions = [];
+    transactionsStore.processingQueue = [];
+    mockRpcClient.getTransactionById.mockClear();
+  });
+
+  it('should add a transaction', () => {
+    transactionsStore.addTransaction(testTransaction);
+    expect(transactionsStore.transactions).to.deep.include(testTransaction);
+  });
+
+  it('should remove an added transaction', () => {
+    transactionsStore.addTransaction(testTransaction);
+    expect(transactionsStore.transactions).to.deep.include(testTransaction);
+    transactionsStore.removeTransaction(testTransaction);
+    expect(transactionsStore.transactions).not.to.deep.include(testTransaction);
+  });
+
+  it('should update a transaction', () => {
+    transactionsStore.addTransaction(testTransaction);
+    transactionsStore.updateTransaction(updatedTransactionPayload);
+    expect(transactionsStore.transactions[0].status).toBe('FINALIZED');
+  });
+
+  it('should get a transaction by id using rpcClient', async () => {
+    const transactionId = 123;
+    const transactionData = { id: transactionId, status: 'PENDING' };
+    mockRpcClient.getTransactionById.mockResolvedValue(transactionData);
+
+    const result = await transactionsStore.getTransaction(transactionId);
+
+    expect(mockRpcClient.getTransactionById).toHaveBeenCalledWith(
+      transactionId,
+    );
+    expect(result).toEqual(transactionData);
+  });
+
+  it('should clear transactions for a specific contract', () => {
+    const tx1 = { ...testTransaction, txId: 1, localContractId: 'contract-1' };
+    const tx2 = { ...testTransaction, txId: 2, localContractId: 'contract-2' };
+
+    transactionsStore.addTransaction(tx1);
+    transactionsStore.addTransaction(tx2);
+
+    transactionsStore.processingQueue = [tx1];
+
+    transactionsStore.clearTransactionsForContract('contract-1');
+
+    expect(transactionsStore.transactions).toEqual([tx2]);
+    expect(transactionsStore.processingQueue).toEqual([]);
+  });
+
+  it('should compute pending transactions', () => {
+    const tx1 = { ...testTransaction, txId: 1, status: 'FINALIZED' };
+    const tx2 = { ...testTransaction, txId: 2, status: 'PENDING' };
+
+    transactionsStore.transactions = [tx1, tx2];
+
+    expect(transactionsStore.pendingTransactions).toEqual([tx2]);
+  });
+});
diff --git a/frontend/test/unit/stores/ui.test.ts b/frontend/test/unit/stores/ui.test.ts
new file mode 100644
index 000000000..70e939d93
--- /dev/null
+++ b/frontend/test/unit/stores/ui.test.ts
@@ -0,0 +1,71 @@
+import { setActivePinia, createPinia } from 'pinia';
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import { useUIStore } from '@/stores';
+
+describe('UI Store', () => {
+  let uiStore: ReturnType<typeof useUIStore>;
+
+  beforeEach(() => {
+    setActivePinia(createPinia());
+    uiStore = useUIStore();
+
+    vi.stubGlobal('localStorage', {
+      getItem: vi.fn(),
+      setItem: vi.fn(),
+    });
+
+    vi.spyOn(document.documentElement, 'setAttribute');
+  });
+
+  it('should initialize with correct mode from localStorage', () => {
+    (localStorage.getItem as Mock).mockReturnValue('light');
+    const store = useUIStore();
+    expect(store.mode).toBe('light');
+  });
+
+  it('should toggle mode from light to dark', () => {
+    uiStore.mode = 'light';
+    uiStore.toggleMode();
+    expect(uiStore.mode).toBe('dark');
+    expect(localStorage.setItem).toHaveBeenCalledWith(
+      'genLayer.ui-mode',
+      'dark',
+    );
+    expect(document.documentElement.setAttribute).toHaveBeenCalledWith(
+      'data-mode',
+      'dark',
+    );
+  });
+
+  it('should toggle mode from dark to light', () => {
+    uiStore.mode = 'dark';
+    uiStore.toggleMode();
+    expect(uiStore.mode).toBe('light');
+    expect(localStorage.setItem).toHaveBeenCalledWith(
+      'genLayer.ui-mode',
+      'light',
+    );
+    expect(document.documentElement.setAttribute).toHaveBeenCalledWith(
+      'data-mode',
+      'light',
+    );
+  });
+
+  it('should run the tutorial', () => {
+    uiStore.runTutorial();
+    expect(uiStore.showTutorial).toBe(true);
+  });
+
+  it('should initialize the store correctly', () => {
+    uiStore.mode = 'dark';
+    uiStore.initialize();
+    expect(localStorage.setItem).toHaveBeenCalledWith(
+      'genLayer.ui-mode',
+      'dark',
+    );
+    expect(document.documentElement.setAttribute).toHaveBeenCalledWith(
+      'data-mode',
+      'dark',
+    );
+  });
+});
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index 369da08b2..0959803c6 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"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "test"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "types": ["node", "jsdom"],

From 0733c4656fc8be1002ee1a2366474ace111102bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20D=C3=ADaz?=
 <49416765+AgustinRamiroDiaz@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:46:54 -0300
Subject: [PATCH 7/8] chore(backend): refactor database connector to use
 sqlalchemy (#420)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: migrate validators registry to sqlalchemy

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat(backend): init Flas-SQLAlchemy to inject sessions on each request

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: validatorsregistry tests + fixed behavior

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* refactor: decpouple pytest conftest

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat: refactor transactions processor to use SQLAlchemy

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: create sessions in consensus loop

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* refactor: improve dependency injection

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat: refactor contract_snapshot to use sqlalchemy

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat: use sqlalchemy in accounts manager

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* feat: use sqlalchemy in chain snapshot

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* chore: remove dbclient code

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* chore: use transactionstatus enum for objects

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* chore: merge transaction type from database

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix(tests): requirements.txt

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix(debug): vscode launch.json

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: tests

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix(be): sqlalchemy integrations

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix(backend): minor fix

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix merge conflict

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* chore: inject database handlers in cronjobs

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* remove unnecessary check

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* use taskgroup for easier reading

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* minor fix

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: dockerignore

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: trailing whitespace

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix tests

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: consensus data type

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix integration tests

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* configure pytest in vscode

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix clear db tables

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* chore: make contract snapshot use session

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

* fix: residue from merge conflict

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>

---------

Signed-off-by: Agustín Ramiro Díaz <agustin.ramiro.diaz@gmail.com>
---
 frontend/.dockerignore => .dockerignore       |  24 +--
 .../backend_integration_tests_pr.yml          |   2 +-
 .vscode/launch.json                           |  20 +++
 .vscode/settings.json                         |   5 +-
 CONTRIBUTING.md                               |   6 +-
 backend/consensus/base.py                     |  97 ++++++------
 backend/database_handler/accounts_manager.py  |  88 +++++------
 backend/database_handler/chain_snapshot.py    |  51 +++----
 backend/database_handler/contract_snapshot.py |  61 ++++----
 backend/database_handler/db_client.py         | 141 +----------------
 backend/database_handler/migration/README.md  |   4 +-
 backend/database_handler/models.py            |  47 +++---
 .../transactions_processor.py                 | 143 ++++++++++--------
 backend/database_handler/types.py             |   5 +-
 .../database_handler/validators_registry.py   | 101 ++++++-------
 backend/node/base.py                          |   2 +-
 backend/protocol_rpc/endpoints.py             |  17 ++-
 backend/protocol_rpc/requirements.txt         |   3 +-
 backend/protocol_rpc/server.py                |  31 +++-
 tests/common/response.py                      |  10 +-
 tests/db-sqlalchemy/Dockerfile                |  15 ++
 tests/db-sqlalchemy/README.md                 |  45 ++++++
 tests/db-sqlalchemy/accounts_manager_test.py  |  40 +++++
 tests/db-sqlalchemy/chain_snapshot_test.py    |  77 ++++++++++
 tests/db-sqlalchemy/conftest.py               |  44 ++++++
 tests/db-sqlalchemy/contract_snapshot_test.py |  60 ++++++++
 tests/db-sqlalchemy/docker-compose.yml        |  32 ++++
 tests/db-sqlalchemy/requirements.txt          |   8 +
 .../transactions_processor_test.py            |  67 ++++++++
 .../db-sqlalchemy/validators_registry_test.py |  64 ++++++++
 .../mocks/call_contract_function.py           |   6 +-
 31 files changed, 861 insertions(+), 455 deletions(-)
 rename frontend/.dockerignore => .dockerignore (53%)
 create mode 100644 tests/db-sqlalchemy/Dockerfile
 create mode 100644 tests/db-sqlalchemy/README.md
 create mode 100644 tests/db-sqlalchemy/accounts_manager_test.py
 create mode 100644 tests/db-sqlalchemy/chain_snapshot_test.py
 create mode 100644 tests/db-sqlalchemy/conftest.py
 create mode 100644 tests/db-sqlalchemy/contract_snapshot_test.py
 create mode 100644 tests/db-sqlalchemy/docker-compose.yml
 create mode 100644 tests/db-sqlalchemy/requirements.txt
 create mode 100644 tests/db-sqlalchemy/transactions_processor_test.py
 create mode 100644 tests/db-sqlalchemy/validators_registry_test.py

diff --git a/frontend/.dockerignore b/.dockerignore
similarity index 53%
rename from frontend/.dockerignore
rename to .dockerignore
index 1099809b6..cc2a0d5f9 100644
--- a/frontend/.dockerignore
+++ b/.dockerignore
@@ -3,18 +3,22 @@
 .git
 .dockerignore
 .gitignore
-.github/*
+.github/
 README.md
-Dockerfile
+
+docker/
+.venv/
+.vscode/
+.ollama/
 
 # Artifacts that will be built during image creation.
 # This should contain all files created during `yarn build`.
-dist
-node_modules
-npm-debug.log
-.DS_Store
+frontend/dist
+frontend/node_modules
+frontend/npm-debug.log
+frontend/.DS_Store
 
-src/assets/examples
-.nyc_output
-coverage
-vite.config.ts.timestamp-*
\ No newline at end of file
+frontend/src/assets/examples
+frontend/.nyc_output
+frontend/coverage
+frontend/vite.config.ts.timestamp-*
diff --git a/.github/workflows/backend_integration_tests_pr.yml b/.github/workflows/backend_integration_tests_pr.yml
index 07798a523..06a420c68 100644
--- a/.github/workflows/backend_integration_tests_pr.yml
+++ b/.github/workflows/backend_integration_tests_pr.yml
@@ -97,7 +97,7 @@ jobs:
           pip install -r requirements.test.txt
 
       - name: Run tests
-        run: pytest tests/integration/
+        run: pytest tests/integration/ -vv
 
       - name: Dump Docker Compose logs
         run: docker compose logs
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4e551b3cf..c751a34bf 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -32,6 +32,26 @@
         "host": "localhost"
       },
       "justMyCode": true
+    },
+    {
+      "name": "SQLAlchemy tests: Remote Attach",
+      "type": "debugpy",
+      "request": "attach",
+      "pathMappings": [
+        {
+          "localRoot": "${workspaceFolder}/backend",
+          "remoteRoot": "/app/backend"
+        },
+        {
+          "localRoot": "${workspaceFolder}/tests/db-sqlalchemy",
+          "remoteRoot": "/app"
+        }
+      ],
+      "connect": {
+        "port": 5678,
+        "host": "localhost"
+      },
+      "justMyCode": true
     }
   ],
   "compounds": [
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bbad87bd7..45455359c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,8 @@
 {
   "[vue]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "python.testing.pytestArgs": ["tests"],
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e501c47c1..fd48aa092 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,8 +33,8 @@ Have ideas for new features or use cases? We're eager to hear them! But first:
 
 - **1.2. Create a branch**: create the branch that you will work on by using the link provided in the issue details page (right panel at the bottom - section "Development")
 
-- **1.3. Setup the Simulator locally**: launch the simulator's frontend and backend by running the docker compose command (Please note that you must have docker, node, and npm installed) 
-   
+- **1.3. Setup the Simulator locally**: launch the simulator's frontend and backend by running the docker compose command (Please note that you must have docker, node, and npm installed)
+
    ```sh
    $ cp .env.example .env
    $ docker compose up
@@ -68,7 +68,7 @@ Have ideas for new features or use cases? We're eager to hear them! But first:
 #### 3. Other considerations
 - **3.1. Small fixes don't require creating an issue**: significantly small issues can be submitted through a valid Pull Request without needing to create an issue.
 - **3.2. Run the frontend in dev mode**: to run the frontend separately from the backend and with hot reload enabled, first launch the backend without the frontend:
-   
+
    ```sh
    $ docker compose upjsonrpc webrequest ollama database-migration postgres
    ```
diff --git a/backend/consensus/base.py b/backend/consensus/base.py
index 5db08d989..6d91eee94 100644
--- a/backend/consensus/base.py
+++ b/backend/consensus/base.py
@@ -4,18 +4,20 @@
 DEFAULT_VALIDATORS_COUNT = 5
 DEFAULT_CONSENSUS_SLEEP_TIME = 5
 
-import traceback
 import asyncio
-from backend.node.base import Node
-from backend.database_handler.db_client import DBClient
-from backend.database_handler.types import ConsensusData
+import traceback
+from sqlalchemy.orm import Session
+
 from backend.consensus.vrf import get_validators_for_transaction
 from backend.database_handler.chain_snapshot import ChainSnapshot
 from backend.database_handler.contract_snapshot import ContractSnapshot
+from backend.database_handler.db_client import DBClient
 from backend.database_handler.transactions_processor import (
     TransactionsProcessor,
     TransactionStatus,
 )
+from backend.database_handler.types import ConsensusData
+from backend.node.base import Node
 from backend.node.genvm.types import ExecutionMode, Vote
 from backend.protocol_rpc.message_handler.base import MessageHandler
 
@@ -24,11 +26,9 @@ class ConsensusAlgorithm:
     def __init__(
         self,
         dbclient: DBClient,
-        transactions_processor: TransactionsProcessor,
         msg_handler: MessageHandler,
     ):
         self.dbclient = dbclient
-        self.transactions_processor = transactions_processor
         self.msg_handler = msg_handler
         self.queues: dict[str, asyncio.Queue] = {}
 
@@ -40,16 +40,17 @@ def run_crawl_snapshot_loop(self):
 
     async def _crawl_snapshot(self):
         while True:
-            chain_snapshot = ChainSnapshot(self.dbclient)
-            pending_transactions = chain_snapshot.get_pending_transactions()
-            for transaction in pending_transactions:
-                contract_address = (
-                    transaction["to_address"] or DEPLOY_CONTRACTS_QUEUE_KEY
-                )
-
-                if contract_address not in self.queues:
-                    self.queues[contract_address] = asyncio.Queue()
-                await self.queues[contract_address].put(transaction)
+            with self.dbclient.get_session() as session:
+                chain_snapshot = ChainSnapshot(session)
+                pending_transactions = chain_snapshot.get_pending_transactions()
+                for transaction in pending_transactions:
+                    contract_address = (
+                        transaction["to_address"] or DEPLOY_CONTRACTS_QUEUE_KEY
+                    )
+
+                    if contract_address not in self.queues:
+                        self.queues[contract_address] = asyncio.Queue()
+                    await self.queues[contract_address].put(transaction)
             await asyncio.sleep(DEFAULT_CONSENSUS_SLEEP_TIME)
 
     def run_consensus_loop(self):
@@ -61,32 +62,38 @@ def run_consensus_loop(self):
     async def _run_consensus(self):
         asyncio.set_event_loop(asyncio.new_event_loop())
         # watch out! as ollama uses GPU resources and webrequest aka selenium uses RAM
+        # TODO: async sessions would be a good idea to not block the current thread
         while True:
-            if self.queues:
-                chain_snapshot = ChainSnapshot(self.dbclient)
-                tasks = []
-
-                for queue in self.queues.values():
-                    if not queue.empty():
+            try:
+                async with asyncio.TaskGroup() as tg:
+                    for queue in [q for q in self.queues.values() if not q.empty()]:
+                        # sessions cannot be shared between coroutines, we need to create a new session for each coroutine
+                        # https://docs.sqlalchemy.org/en/20/orm/session_basics.html#is-the-session-thread-safe-is-asyncsession-safe-to-share-in-concurrent-tasks
                         transaction = await queue.get()
-                        tasks.append(self.exec_transaction(transaction, chain_snapshot))
-
-                try:
-                    await asyncio.gather(*tasks)
-                except Exception as e:
-                    print("Error running consensus", e)
-                    print(traceback.format_exc())
+                        with self.dbclient.get_session() as session:
+                            tg.create_task(
+                                self.exec_transaction(
+                                    transaction,
+                                    TransactionsProcessor(session),
+                                    ChainSnapshot(session),
+                                    session,
+                                )
+                            )
+
+            except Exception as e:
+                print("Error running consensus", e)
+                print(traceback.format_exc())
             await asyncio.sleep(DEFAULT_CONSENSUS_SLEEP_TIME)
 
     async def exec_transaction(
         self,
         transaction: dict,
+        transactions_processor: TransactionsProcessor,
         snapshot: ChainSnapshot,
+        session: Session,
     ):
         if (
-            self.transactions_processor.get_transaction_by_id(transaction["id"])[
-                "status"
-            ]
+            transactions_processor.get_transaction_by_id(transaction["id"])["status"]
             != TransactionStatus.PENDING.value
         ):
             # This is a patch for a TOCTOU problem we have https://github.com/yeagerai/genlayer-simulator/issues/387
@@ -97,8 +104,8 @@ async def exec_transaction(
 
         print(" ~ ~ ~ ~ ~ EXECUTING TRANSACTION: ", transaction)
         # Update transaction status
-        self.transactions_processor.update_transaction_status(
-            transaction["id"], TransactionStatus.PROPOSING.value
+        transactions_processor.update_transaction_status(
+            transaction["id"], TransactionStatus.PROPOSING
         )
         # Select Leader and validators
         all_validators = snapshot.get_all_validators()
@@ -108,7 +115,7 @@ async def exec_transaction(
         num_validators = len(remaining_validators) + 1
 
         contract_address = transaction.get("to_address", None)
-        contract_snapshot = ContractSnapshot(contract_address, self.dbclient)
+        contract_snapshot = ContractSnapshot(contract_address, session)
 
         # Create Leader
         leader_node = Node(
@@ -126,8 +133,8 @@ async def exec_transaction(
         leader_receipt = await leader_node.exec_transaction(transaction)
         votes = {leader["address"]: leader_receipt.vote.value}
         # Update transaction status
-        self.transactions_processor.update_transaction_status(
-            transaction["id"], TransactionStatus.COMMITTING.value
+        transactions_processor.update_transaction_status(
+            transaction["id"], TransactionStatus.COMMITTING
         )
 
         # Create Validators
@@ -158,8 +165,9 @@ async def exec_transaction(
 
         for i in range(len(validation_results)):
             votes[f"{validator_nodes[i].address}"] = validation_results[i].vote.value
-        self.transactions_processor.update_transaction_status(
-            transaction["id"], TransactionStatus.REVEALING.value
+        transactions_processor.update_transaction_status(
+            transaction["id"],
+            TransactionStatus.REVEALING,
         )
 
         if (
@@ -168,8 +176,8 @@ async def exec_transaction(
         ):
             raise Exception("Consensus not reached")
 
-        self.transactions_processor.update_transaction_status(
-            transaction["id"], TransactionStatus.ACCEPTED.value
+        transactions_processor.update_transaction_status(
+            transaction["id"], TransactionStatus.ACCEPTED
         )
 
         final = False
@@ -178,7 +186,7 @@ async def exec_transaction(
             votes=votes,
             leader_receipt=leader_receipt,
             validators=validators_results,
-        ).to_json()
+        ).to_dict()
 
         # Register contract if it is a new contract
         if transaction["type"] == 1:
@@ -196,6 +204,7 @@ async def exec_transaction(
             contract_snapshot.update_contract_state(leader_receipt.contract_state)
 
         # Finalize transaction
-        self.transactions_processor.set_transaction_result(
-            transaction["id"], consensus_data
+        transactions_processor.set_transaction_result(
+            transaction["id"],
+            consensus_data,
         )
diff --git a/backend/database_handler/accounts_manager.py b/backend/database_handler/accounts_manager.py
index 9ac696efd..1c553d40b 100644
--- a/backend/database_handler/accounts_manager.py
+++ b/backend/database_handler/accounts_manager.py
@@ -1,87 +1,89 @@
 # consensus/services/transactions_db_service.py
 
-import json
-from enum import Enum
 from eth_account import Account
 from eth_account._utils.validation import is_valid_address
 
-from backend.database_handler.db_client import DBClient
+from .models import CurrentState
 from backend.database_handler.errors import AccountNotFoundError
 from backend.database_handler.transactions_processor import TransactionsProcessor
 
+from sqlalchemy.orm import Session
+
 
 class AccountsManager:
-    def __init__(
-        self, db_client: DBClient, transactions_processor: TransactionsProcessor
-    ):
-        self.db_client = db_client
+    def __init__(self, session: Session, transactions_processor: TransactionsProcessor):
+        self.session = session
         self.transactions_processor = transactions_processor
-        self.db_accounts_table = "current_state"
 
-    def _parse_account_data(self, account_data: dict) -> dict:
+    def _parse_account_data(self, account_data: CurrentState) -> dict:
         return {
-            "id": account_data["id"],
-            "data": account_data["data"],
-            "updated_at": account_data["updated_at"].isoformat(),
+            "id": account_data.id,
+            "data": account_data.data,
+            "updated_at": account_data.updated_at.isoformat(),
         }
 
     def create_new_account(self, balance: int = 0) -> Account:
         """
-        Used when generating intelligent contract's accounts or dending funds to a new account.
+        Used when generating intelligent contract's accounts or sending funds to a new account.
         Users should create their accounts client-side
         """
         account = Account.create()
-        self.register_new_account(account.address, balance)
+        self._create_new_account_with_address(account.address, balance)
         return account
 
+    def _create_new_account_with_address(self, address: str, balance: int = 0):
+        if not self.is_valid_address(address):
+            raise ValueError(f"Invalid address: {address}")
+        account_state = CurrentState(
+            id=address,
+            data={"balance": balance},
+        )
+        self.session.add(account_state)
+        self.session.commit()
+
     def is_valid_address(self, address: str) -> bool:
         return is_valid_address(address)
 
-    def get_account(self, account_address: str):
-        """Private method to retrieve if an account from the data base"""
-        condition = f"id = '{account_address}'"
-        account_data = self.db_client.get(self.db_accounts_table, condition)
-        return self._parse_account_data(account_data[0]) if account_data else None
+    def _get_account(self, account_address: str) -> CurrentState | None:
+        """Private method to retrieve an account from the data base"""
+        account = (
+            self.session.query(CurrentState)
+            .filter(CurrentState.id == account_address)
+            .one_or_none()
+        )
+        return account
 
-    def get_account_or_fail(self, account_address: str):
+    def get_account_or_fail(self, account_address: str) -> dict:
         """Private method to check if an account exists, and raise an error if not."""
-        account_data = self.get_account(account_address)
+        account_data = self._get_account(account_address)
         if not account_data:
             raise AccountNotFoundError(
                 account_address, f"Account {account_address} does not exist."
             )
-        return account_data
-
-    def register_new_account(self, address: str, balance: int) -> None:
-        account_state = {
-            "id": address,
-            "data": json.dumps({"balance": balance}),
-        }
-        self.db_client.insert(self.db_accounts_table, account_state)
+        return self._parse_account_data(account_data)
 
     def fund_account(self, account_address: str, amount: int):
         # account creation or balance update
-        account_data = self.get_account(account_address)
-        if account_data:
+        account = self._get_account(account_address)
+        if account is not None:
             # Account exists, update it
-            update_condition = f"id = {account_address}"
-            new_balance = account_data["data"]["balance"] + amount
-            updated_account_state = {
-                "data": json.dumps({"balance": new_balance}),
-            }
-
-            self.db_client.update(
-                self.db_accounts_table, updated_account_state, update_condition
-            )
+            # Dicts are mutable objects, we need to do something in order for SQLAlchemy to track their changes https://docs.sqlalchemy.org/en/20/orm/extensions/mutable.html
+            # In this case we are copying the dict, updating it and assigning it back to the object, which will trigger the change tracking
+            # I (Agustín Díaz) like this approach better than using `MutableDict` because it's more explicit than using the MutableDict class, and also doesn't leak the object to the rest of the code (which can be dangerous given that it's mutable)
+            new_data = account.data.copy()
+            new_data["balance"] += amount
+            account.data = new_data
+            self.session.commit()
+            print(account)
         else:
             # Account doesn't exist, create it
-            self.create_new_account(account_address, amount)
+            self._create_new_account_with_address(account_address, amount)
 
         # Record transaction
         transaction_data = {
-            "from_address": "NULL",
+            "from_address": None,
             "to_address": account_address,
-            "data": json.dumps({"action": "fund_account", "amount": amount}),
+            "data": {"action": "fund_account", "amount": amount},
             "value": amount,
             "type": 0,
         }
diff --git a/backend/database_handler/chain_snapshot.py b/backend/database_handler/chain_snapshot.py
index a03f021f4..33c2ed134 100644
--- a/backend/database_handler/chain_snapshot.py
+++ b/backend/database_handler/chain_snapshot.py
@@ -1,50 +1,37 @@
 # database_handler/chain_snapshot.py
 
-from backend.database_handler.db_client import DBClient
-from backend.database_handler.transactions_processor import TransactionStatus
+from typing import List
+from sqlalchemy.orm import Session
+
+from backend.database_handler.transactions_processor import (
+    TransactionStatus,
+    Transactions,
+)
+from .transactions_processor import TransactionsProcessor
 from backend.database_handler.validators_registry import ValidatorsRegistry
 
 
 class ChainSnapshot:
-    def __init__(self, dbclient: DBClient):
-        self.dbclient = dbclient
-        self.validators_registry = ValidatorsRegistry(dbclient)
-        self.db_transactions_table = "transactions"
+    def __init__(self, session: Session):
+        self.session = session
+        self.validators_registry = ValidatorsRegistry(session)
+        self.all_validators = self.validators_registry.get_all_validators()
         self.pending_transactions = self._load_pending_transactions()
-        self.all_validators = self._load_all_validators()
         self.num_validators = len(self.all_validators)
 
-    def _parse_transaction_data(self, transaction_data: dict) -> dict:
-        return {
-            "id": transaction_data["id"],
-            "status": transaction_data["status"],
-            "from_address": transaction_data["from_address"],
-            "to_address": transaction_data["to_address"],
-            "data": transaction_data["data"],
-            "consensus_data": transaction_data["consensus_data"],
-            "nonce": transaction_data["nonce"],
-            "value": float(transaction_data["value"]),
-            "type": transaction_data["type"],
-            "gaslimit": transaction_data["gaslimit"],
-            "created_at": transaction_data["created_at"].isoformat(),
-            "r": transaction_data["r"],
-            "v": transaction_data["v"],
-        }
-
-    def _load_pending_transactions(self):
+    def _load_pending_transactions(self) -> List[dict]:
         """Load and return the list of pending transactions from the database."""
-        pending_transactions = self.dbclient.get(
-            self.db_transactions_table, f"status = '{TransactionStatus.PENDING.value}'"
+
+        pending_transactions = (
+            self.session.query(Transactions)
+            .filter(Transactions.status == TransactionStatus.PENDING)
+            .all()
         )
         return [
-            self._parse_transaction_data(transaction)
+            TransactionsProcessor._parse_transaction_data(transaction)
             for transaction in pending_transactions
         ]
 
-    def _load_all_validators(self):
-        """Load and return the list of all validators from the database."""
-        return self.validators_registry.get_all_validators()
-
     def get_pending_transactions(self):
         """Return the list of pending transactions."""
         return self.pending_transactions
diff --git a/backend/database_handler/contract_snapshot.py b/backend/database_handler/contract_snapshot.py
index a862cc3d8..75c9b06e6 100644
--- a/backend/database_handler/contract_snapshot.py
+++ b/backend/database_handler/contract_snapshot.py
@@ -1,50 +1,53 @@
 # database_handler/contract_snapshot.py
-import json
-from backend.database_handler.db_client import DBClient
+from .models import CurrentState
+from sqlalchemy.orm import Session
 
 
 class ContractSnapshot:
-    def __init__(self, contract_address: str, dbclient: DBClient):
-        self.dbclient = dbclient
-        self.db_state_table = "current_state"
-        self.db_transactions_table = "transactions"
+    """
+    Warning: if you initialize this class with a contract_address:
+    - The contract_address must exist in the database.
+    - `self.contract_data`, `self.contract_code` and `self.cencoded_state` will be loaded from the database **only once** at initialization.
+    """
 
-        if not contract_address is None:
+    def __init__(self, contract_address: str, session: Session):
+        self.session = session
+
+        if contract_address is not None:
             self.contract_address = contract_address
 
             contract_account = self._load_contract_account()
-            self.contract_data = contract_account["data"]
+            self.contract_data = contract_account.data
             self.contract_code = self.contract_data["code"]
             self.encoded_state = self.contract_data["state"]
 
-    def _load_contract_account(self):
+    def _load_contract_account(self) -> CurrentState:
         """Load and return the current state of the contract from the database."""
-        # Use the `get` method which retrieves rows based on a condition
-        result = self.dbclient.get(
-            self.db_state_table, f"id = '{self.contract_address}'", limit=1
+
+        return (
+            self.session.query(CurrentState)
+            .filter(CurrentState.id == self.contract_address)
+            .one()
         )
-        if result:
-            return result[0]
-        return None
 
     def register_contract(self, contract: dict):
         """Register a new contract in the database."""
-        self.dbclient.update(
-            self.db_state_table,
-            {"data": json.dumps(contract["data"])},
-            f"id = '{contract["id"]}'",
+        current_contract = (
+            self.session.query(CurrentState).filter_by(id=contract["id"]).one()
         )
 
+        current_contract.data = contract["data"]
+        self.session.commit()
+
     def update_contract_state(self, new_state: str):
         """Update the state of the contract in the database."""
-        new_contract_nada = json.dumps(
-            {
-                "code": self.contract_data["code"],
-                "state": new_state,
-            }
-        )
-        self.dbclient.update(
-            self.db_state_table,
-            {"data": new_contract_nada},
-            f"id = '{self.contract_address}'",
+        new_contract_nada = {
+            "code": self.contract_data["code"],
+            "state": new_state,
+        }
+
+        contract = (
+            self.session.query(CurrentState).filter_by(id=self.contract_address).one()
         )
+        contract.data = new_contract_nada
+        self.session.commit()
diff --git a/backend/database_handler/db_client.py b/backend/database_handler/db_client.py
index 6144a803f..fd6514528 100644
--- a/backend/database_handler/db_client.py
+++ b/backend/database_handler/db_client.py
@@ -1,149 +1,24 @@
 # database/client.py
-import psycopg2
-from psycopg2 import pool, extras
 from os import environ
-import sqlalchemy as db
 
 from dotenv import load_dotenv
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session
 
 load_dotenv()
 
 
-def get_database_credentials(database: str) -> str:
-    """Retrieve the credentials for a specific database."""
-    # Validate database choice and set the appropriate database name
-    if database not in ["genlayer", "postgres"]:
-        raise ValueError("Invalid database specified")
-
-    db_name = get_db_name(database)
-    return f"dbname={db_name} user={environ.get('DBUSER')} password={environ.get('DBPASSWORD')} host={environ.get('DBHOST')}"
-
-
 def get_db_name(database: str) -> str:
     return "genlayer_state" if database == "genlayer" else database
 
 
 class DBClient:
     def __init__(self, database: str) -> None:
-        self.engine = db.create_engine(
-            f"postgresql+psycopg2://{environ.get('DBUSER')}:{environ.get('DBPASSWORD')}@{environ.get('DBHOST')}/{get_db_name(database)}"
+        self.engine = create_engine(
+            f"postgresql+psycopg2://{environ.get('DBUSER')}:{environ.get('DBPASSWORD')}@{environ.get('DBHOST')}/{get_db_name(database)}",
+            echo=True,
         )
 
-        """Initialize the DBClient with connection parameters."""
-        database_credentials = get_database_credentials(database)
-        self.connection_pool = pool.SimpleConnectionPool(1, 10, database_credentials)
-
-    def get_connection(self):
-        """Retrieve a connection from the connection pool."""
-        return self.connection_pool.getconn()
-
-    def release_connection(self, conn: psycopg2.extensions.connection) -> None:
-        """Return a connection to the pool."""
-        self.connection_pool.putconn(conn)
-
-    def clear_tables(self, tables: list) -> None:
-        """Remove all rows from a list of tables."""
-        for table in tables:
-            exists = self.execute_query(
-                f"SELECT 1 FROM pg_catalog.pg_database WHERE datname = '{table}'"
-            )
-            if exists:
-                self.execute_query(f"TRUNCATE TABLE {table} RESTART IDENTITY")
-
-    def execute_query(self, query: str, params=None) -> list:
-        """Execute a SQL query with optional parameters."""
-        conn = self.get_connection()
-        try:
-            with conn.cursor(cursor_factory=extras.DictCursor) as cursor:
-                cursor.execute(query, params)
-                conn.commit()
-                if cursor.description:
-                    return cursor.fetchall()  # Return results if any
-        except psycopg2.DatabaseError as e:
-            conn.rollback()  # Rollback on exceptions
-            print(f"Database error: {e}")
-            return None
-        finally:
-            self.release_connection(conn)
-
-    def count(self, table: str) -> int:
-        """Count the number of rows in a table."""
-        query = f"SELECT COUNT(*) FROM {table}"
-        return self.execute_query(query)[0][0]
-
-    def get(
-        self, table: str, condition: str = None, limit: int = None, offset: int = None
-    ) -> list:
-        """Retrieve rows from a table based on a condition."""
-        query = f"SELECT * FROM {table}"
-
-        # Append WHERE clause if condition is provided
-        if condition:
-            query += f" WHERE {condition}"
-
-        # Append OFFSET clause if offset is provided and is a positive integer
-        if offset is not None and offset >= 0:
-            query += f" OFFSET {offset}"
-
-        # Append LIMIT clause if limit is provided and is a positive integer
-        if limit is not None and limit > 0:
-            query += f" LIMIT {limit}"
-
-        return self.execute_query(query)
-
-    def insert(self, table: str, data_dict: dict, return_column: str = None) -> None:
-        """Insert a dictionary of data into a table."""
-        columns = []
-        placeholders = []
-        values = []
-
-        for key, value in data_dict.items():
-            columns.append(key)
-            if value == "CURRENT_TIMESTAMP":
-                placeholders.append("CURRENT_TIMESTAMP")  # Directly use SQL function
-            else:
-                placeholders.append("%s")
-                values.append(value)
-
-        columns_str = ", ".join(columns)
-        placeholders_str = ", ".join(placeholders)
-
-        query = f"INSERT INTO {table} ({columns_str}) VALUES ({placeholders_str})"
-        if return_column:
-            query += f" RETURNING {return_column}"
-        result = self.execute_query(query, values)
-        if result and return_column:
-            return result[0][0]
-
-    def update(self, table: str, data_dict: dict, condition: str) -> None:
-        """Update rows in a table based on a condition."""
-        set_clauses = []
-        values = []
-
-        for key, value in data_dict.items():
-            if value == "CURRENT_TIMESTAMP":
-                set_clauses.append(
-                    f"{key} = CURRENT_TIMESTAMP"
-                )  # Directly use SQL function
-            else:
-                set_clauses.append(f"{key} = %s")
-                values.append(value)
-
-        set_clause_str = ", ".join(set_clauses)
-
-        query = f"UPDATE {table} SET {set_clause_str} WHERE {condition}"
-        self.execute_query(query, values)
-
-    def remove(self, table: str, condition: str) -> None:
-        """Remove rows from a table based on a condition."""
-        query = f"DELETE FROM {table} WHERE {condition}"
-        self.execute_query(query)
-
-    def remove_all(self, table: str) -> None:
-        """Remove all rows from a table."""
-        query = f"DELETE FROM {table}"
-        self.execute_query(query)
-
-    def __del__(self) -> None:
-        """Close all connections in the pool on destruction of the instance."""
-        self.connection_pool.closeall()
+    def get_session(self) -> Session:
+        """Return a SQLAlchemy session."""
+        return Session(self.engine, expire_on_commit=False)
diff --git a/backend/database_handler/migration/README.md b/backend/database_handler/migration/README.md
index ae31a7b32..3c1594cc2 100644
--- a/backend/database_handler/migration/README.md
+++ b/backend/database_handler/migration/README.md
@@ -1,11 +1,13 @@
 ## Pre-requisites
 
 ### Window One
+
 1. Launch the simulator
 
 ### Window Two
+
 1. Set your virtual environment
-2. Pip install `pip install -r backend/database_handler/requirements.txt`
+2. Pip install `pip install -r backend/database_handler/migration/requirements.txt`
 3. Update the "models" at `models.py` with your preferences
 4. Set your current working directory to `backend/database_handler`
 5. Run `alembic revision --autogenerate -m "migration name here"` to generate the migration file
diff --git a/backend/database_handler/models.py b/backend/database_handler/models.py
index 720145756..194ff4c47 100644
--- a/backend/database_handler/models.py
+++ b/backend/database_handler/models.py
@@ -9,15 +9,29 @@
     Numeric,
     PrimaryKeyConstraint,
     String,
+    func,
     text,
 )
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, MappedAsDataclass
 import datetime
 import decimal
+import enum
 
 
-class Base(DeclarativeBase):
+class TransactionStatus(enum.Enum):
+    PENDING = "PENDING"
+    CANCELED = "CANCELED"
+    PROPOSING = "PROPOSING"
+    COMMITTING = "COMMITTING"
+    REVEALING = "REVEALING"
+    ACCEPTED = "ACCEPTED"
+    FINALIZED = "FINALIZED"
+    UNDETERMINED = "UNDETERMINED"
+
+
+# We map them to `DataClass`es in order to have better type hints https://docs.sqlalchemy.org/en/20/orm/dataclasses.html#declarative-dataclass-mapping
+class Base(MappedAsDataclass, DeclarativeBase):
     pass
 
 
@@ -28,7 +42,10 @@ class CurrentState(Base):
     id: Mapped[str] = mapped_column(String(255), primary_key=True)
     data: Mapped[dict] = mapped_column(JSONB)
     updated_at: Mapped[Optional[datetime.datetime]] = mapped_column(
-        DateTime(True), server_default=text("CURRENT_TIMESTAMP")
+        DateTime(True),
+        init=False,
+        server_default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
     )
 
 
@@ -39,20 +56,14 @@ class Transactions(Base):
         PrimaryKeyConstraint("id", name="transactions_pkey"),
     )
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
-    status: Mapped[Optional[str]] = mapped_column(
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, init=False)
+    status: Mapped[TransactionStatus] = mapped_column(
         Enum(
-            "PENDING",
-            "CANCELED",
-            "PROPOSING",
-            "COMMITTING",
-            "REVEALING",
-            "ACCEPTED",
-            "FINALIZED",
-            "UNDETERMINED",
+            TransactionStatus,
             name="transaction_status",
         ),
         server_default=text("'PENDING'::transaction_status"),
+        nullable=False,
     )
     from_address: Mapped[Optional[str]] = mapped_column(String(255))
     to_address: Mapped[Optional[str]] = mapped_column(String(255))
@@ -64,7 +75,7 @@ class Transactions(Base):
     type: Mapped[Optional[int]] = mapped_column(Integer)
     gaslimit: Mapped[Optional[int]] = mapped_column(BigInteger)
     created_at: Mapped[Optional[datetime.datetime]] = mapped_column(
-        DateTime(True), server_default=text("CURRENT_TIMESTAMP")
+        DateTime(True), server_default=func.current_timestamp(), init=False
     )
     r: Mapped[Optional[int]] = mapped_column(Integer)
     s: Mapped[Optional[int]] = mapped_column(Integer)
@@ -75,11 +86,11 @@ class TransactionsAudit(Base):
     __tablename__ = "transactions_audit"
     __table_args__ = (PrimaryKeyConstraint("id", name="transactions_audit_pkey"),)
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, init=False)
     transaction_id: Mapped[Optional[int]] = mapped_column(Integer)
     data: Mapped[Optional[dict]] = mapped_column(JSONB)
     created_at: Mapped[Optional[datetime.datetime]] = mapped_column(
-        DateTime(True), server_default=text("CURRENT_TIMESTAMP")
+        DateTime(True), server_default=func.current_timestamp(), init=False
     )
 
 
@@ -90,12 +101,12 @@ class Validators(Base):
         CheckConstraint("stake >= 0", name="stake_unsigned_int"),
     )
 
-    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, init=False)
     stake: Mapped[int] = mapped_column(Integer)
     config: Mapped[dict] = mapped_column(JSONB)
     address: Mapped[Optional[str]] = mapped_column(String(255))
     provider: Mapped[Optional[str]] = mapped_column(String(255))
     model: Mapped[Optional[str]] = mapped_column(String(255))
     created_at: Mapped[Optional[datetime.datetime]] = mapped_column(
-        DateTime(True), server_default=text("CURRENT_TIMESTAMP")
+        DateTime(True), server_default=func.current_timestamp(), init=False
     )
diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py
index 635729506..47605ec68 100644
--- a/backend/database_handler/transactions_processor.py
+++ b/backend/database_handler/transactions_processor.py
@@ -1,95 +1,108 @@
 # consensus/services/transactions_db_service.py
 
-import json
-from enum import Enum
+from .models import Transactions, TransactionsAudit
+from sqlalchemy.orm import Session
 
-from backend.database_handler.db_client import DBClient
-
-
-class TransactionStatus(Enum):
-    PENDING = "PENDING"
-    CANCELED = "CANCELED"
-    PROPOSING = "PROPOSING"
-    COMMITTING = "COMMITTING"
-    REVEALING = "REVEALING"
-    ACCEPTED = "ACCEPTED"
-    FINALIZED = "FINALIZED"
-    UNDETERMINED = "UNDETERMINED"
+from .models import TransactionStatus
 
 
 class TransactionsProcessor:
-    def __init__(self, db_client: DBClient):
-        self.db_client = db_client
-        self.db_transactions_table = "transactions"
-        self.db_audits_table = "transactions_audit"
+    def __init__(self, session: Session):
+        self.session = session
 
-    def _parse_transaction_data(self, transaction_data: dict) -> dict:
+    @staticmethod
+    def _parse_transaction_data(transaction_data: Transactions) -> dict:
         return {
-            "id": transaction_data["id"],
-            "from_address": transaction_data["from_address"],
-            "to_address": transaction_data["to_address"],
-            "data": transaction_data["data"],
-            "value": float(transaction_data["value"]),
-            "type": transaction_data["type"],
-            "status": transaction_data["status"],
-            "consensus_data": transaction_data["consensus_data"],
-            "gaslimit": transaction_data["nonce"],
-            "nonce": transaction_data["nonce"],
-            "r": transaction_data["r"],
-            "s": transaction_data["s"],
-            "v": transaction_data["v"],
-            "created_at": transaction_data["created_at"].isoformat(),
+            "id": transaction_data.id,
+            "from_address": transaction_data.from_address,
+            "to_address": transaction_data.to_address,
+            "data": transaction_data.data,
+            "value": float(transaction_data.value),
+            "type": transaction_data.type,
+            "status": transaction_data.status.value,
+            "consensus_data": transaction_data.consensus_data,
+            "gaslimit": transaction_data.nonce,
+            "nonce": transaction_data.nonce,
+            "r": transaction_data.r,
+            "s": transaction_data.s,
+            "v": transaction_data.v,
+            "created_at": transaction_data.created_at.isoformat(),
         }
 
     def insert_transaction(
-        self, from_address: str, to_address: str, data: dict, value: float, type: int
+        self,
+        from_address: str,
+        to_address: str,
+        data: dict,
+        value: float,
+        type: int,
     ) -> int:
         # Insert transaction into the transactions table
-        new_transaction = {
-            "from_address": from_address,
-            "to_address": to_address,
-            "data": json.dumps(data),
-            "value": value,
-            "type": type,
-            "status": TransactionStatus.PENDING.value,
-        }
-        transaction_id = self.db_client.insert(
-            self.db_transactions_table, new_transaction, return_column="id"
+        new_transaction = Transactions(
+            from_address=from_address,
+            to_address=to_address,
+            data=data,
+            value=value,
+            type=type,
+            status=TransactionStatus.PENDING,
+            consensus_data=None,  # Will be set when the transaction is finalized
+            # Future fields, unused for now
+            gaslimit=None,
+            input_data=None,
+            nonce=None,
+            r=None,
+            s=None,
+            v=None,
         )
 
+        self.session.add(new_transaction)
+
+        self.session.flush()  # SQLAlchemy will populate all the fields that are set by the database, like the id and created_at fields
+
         # Insert transaction audit record into the transactions_audit table
-        transaction_audit_record = {
-            "transaction_id": transaction_id,
-            "data": json.dumps(new_transaction),
-        }
-        self.db_client.insert(self.db_audits_table, transaction_audit_record)
+        transaction_audit_record = TransactionsAudit(
+            transaction_id=new_transaction.id,
+            data=self._parse_transaction_data(new_transaction),
+        )
+
+        self.session.add(transaction_audit_record)
 
-        return transaction_id
+        self.session.commit()
 
-    def get_transaction_by_id(self, transaction_id: int) -> dict:
-        condition = f"id = {transaction_id}"
-        transaction_data = self.db_client.get(self.db_transactions_table, condition)
-        if len(transaction_data) == 0:
+        return new_transaction.id
+
+    def get_transaction_by_id(self, transaction_id: int) -> dict | None:
+        transaction = (
+            self.session.query(Transactions).filter_by(id=transaction_id).one_or_none()
+        )
+
+        if transaction is None:
             return None
-        return self._parse_transaction_data(transaction_data[0])
+
+        return self._parse_transaction_data(transaction)
 
     def update_transaction_status(
         self, transaction_id: int, new_status: TransactionStatus
     ):
-        update_condition = f"id = {transaction_id}"
-        update_data = {"status": new_status}
-        print("Updating transaction status", transaction_id, new_status)
-        self.db_client.update(self.db_transactions_table, update_data, update_condition)
+
+        transaction = (
+            self.session.query(Transactions).filter_by(id=transaction_id).one()
+        )
+
+        transaction.status = new_status
+        self.session.commit()
 
     def set_transaction_result(self, transaction_id: int, consensus_data: dict):
-        update_condition = f"id = {transaction_id}"
-        update_data = {
-            "status": TransactionStatus.FINALIZED.value,
-            "consensus_data": consensus_data,
-        }
+        transaction = (
+            self.session.query(Transactions).filter_by(id=transaction_id).one()
+        )
+
+        transaction.status = TransactionStatus.FINALIZED
+        transaction.consensus_data = consensus_data
+
         print(
             "Updating transaction status",
             transaction_id,
             TransactionStatus.FINALIZED.value,
         )
-        self.db_client.update(self.db_transactions_table, update_data, update_condition)
+        self.session.commit()
diff --git a/backend/database_handler/types.py b/backend/database_handler/types.py
index baacc1404..98d2f280d 100644
--- a/backend/database_handler/types.py
+++ b/backend/database_handler/types.py
@@ -1,6 +1,6 @@
 import json
 from typing import Dict, List, Optional
-from dataclasses import dataclass, asdict, is_dataclass
+from dataclasses import dataclass
 from backend.node.genvm.types import Receipt
 
 
@@ -11,9 +11,6 @@ class ConsensusData:
     leader_receipt: Receipt
     validators: Optional[List] = None
 
-    def to_json(self):
-        return json.dumps(self.to_dict())
-
     def to_dict(self):
         return {
             "final": self.final,
diff --git a/backend/database_handler/validators_registry.py b/backend/database_handler/validators_registry.py
index 1c9d7f083..023418cee 100644
--- a/backend/database_handler/validators_registry.py
+++ b/backend/database_handler/validators_registry.py
@@ -1,17 +1,13 @@
 # consensus/domain/state.py
 
-import json
-from psycopg2.extras import Json
-from backend.database_handler import models
-from backend.database_handler.db_client import DBClient
+from sqlalchemy.orm import Session
 
+from .models import Validators
 from backend.errors.errors import ValidatorNotFound
 
-from sqlalchemy.orm import Session
-
 
 # the to_dict function lives in this module and not in models.py because it's on this layer of abstraction where we convert database objects to our custom data structures
-def to_dict(validator: models.Validators) -> dict:
+def to_dict(validator: Validators) -> dict:
     return {
         "id": validator.id,
         "address": validator.address,
@@ -24,38 +20,29 @@ def to_dict(validator: models.Validators) -> dict:
 
 
 class ValidatorsRegistry:
-    def __init__(self, db_client: DBClient):
-        self.db_client = db_client
+    def __init__(self, session: Session):
+        self.session = session
         self.db_validators_table = "validators"
 
-    def _parse_validator_data(self, validator_data: dict) -> dict:
-        return {
-            "id": validator_data["id"],
-            "address": validator_data["address"],
-            "stake": float(validator_data["stake"]),
-            "provider": validator_data["provider"],
-            "model": validator_data["model"],
-            "config": validator_data["config"],
-            "created_at": validator_data["created_at"].isoformat(),
-        }
-
     def _get_validator_or_fail(self, validator_address: str):
         """Private method to check if an account exists, and raise an error if not."""
 
-        with Session(self.db_client.engine) as session:
-            validator_data = (
-                session.query(models.Validators)
-                .filter_by(address=validator_address)
-                .first()
-            )
+        validator_data = (
+            self.session.query(Validators)
+            .filter(Validators.address == validator_address)
+            .one_or_none()
+        )
 
-        if not validator_data:
+        if validator_data is None:
             raise ValidatorNotFound(validator_address)
         return to_dict(validator_data)
 
+    def count_validators(self):
+        return self.session.query(Validators).count()
+
     def get_all_validators(self) -> list:
-        validators_data = self.db_client.get(self.db_validators_table)
-        return [self._parse_validator_data(validator) for validator in validators_data]
+        validators_data = self.session.query(Validators).all()
+        return [to_dict(validator) for validator in validators_data]
 
     def get_validator(self, validator_address: str) -> dict:
         return self._get_validator_or_fail(validator_address)
@@ -66,17 +53,19 @@ def create_validator(
         stake: int,
         provider: str,
         model: str,
-        config: json,
+        config: dict,
     ):
-        new_validator = {
-            "address": validator_address,
-            "stake": stake,
-            "provider": provider,
-            "model": model,
-            "config": Json(config),
-            "created_at": "CURRENT_TIMESTAMP",
-        }
-        self.db_client.insert(self.db_validators_table, new_validator)
+        new_validator = Validators(
+            address=validator_address,
+            stake=stake,
+            provider=provider,
+            model=model,
+            config=config,
+        )
+
+        self.session.add(new_validator)
+        self.session.commit()
+
         return self._get_validator_or_fail(validator_address)
 
     def update_validator(
@@ -85,25 +74,33 @@ def update_validator(
         stake: int,
         provider: str,
         model: str,
-        config: json,
+        config: dict,
     ):
         self._get_validator_or_fail(validator_address)
 
-        update_condition = f"address = '{validator_address}'"
-        validator = {
-            "stake": stake,
-            "provider": provider,
-            "model": model,
-            "config": Json(config),
-        }
+        validator = (
+            self.session.query(Validators)
+            .filter(Validators.address == validator_address)
+            .one()
+        )
 
-        self.db_client.update(self.db_validators_table, validator, update_condition)
-        return self._get_validator_or_fail(validator_address)
+        validator.stake = stake
+        validator.provider = provider
+        validator.model = model
+        validator.config = config
+
+        self.session.commit()
+
+        return to_dict(validator)
 
     def delete_validator(self, validator_address):
         self._get_validator_or_fail(validator_address)
-        delete_condition = f"address = '{validator_address}'"
-        self.db_client.remove(self.db_validators_table, delete_condition)
+
+        self.session.query(Validators).filter(
+            Validators.address == validator_address
+        ).delete()
+        self.session.commit()
 
     def delete_all_validators(self):
-        self.db_client.remove_all(self.db_validators_table)
+        self.session.query(Validators).delete()
+        self.session.commit()
diff --git a/backend/node/base.py b/backend/node/base.py
index 658fe4f7a..a11713035 100644
--- a/backend/node/base.py
+++ b/backend/node/base.py
@@ -77,7 +77,7 @@ def deploy_contract(
         return self.parse_transaction_execution_receipt(receipt)
 
     async def run_contract(
-        self, from_address: str, function_name: str, args: list
+        self, from_address: str, function_name: str, args: str
     ) -> dict:
         parsed_args = json.loads(args)
         receipt = await self.genvm.run_contract(
diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py
index 16eb0abc2..7ed54a2df 100644
--- a/backend/protocol_rpc/endpoints.py
+++ b/backend/protocol_rpc/endpoints.py
@@ -3,8 +3,10 @@
 import json
 from functools import partial
 from flask_jsonrpc import JSONRPC
+from sqlalchemy import Table
 
 from backend.database_handler.db_client import DBClient
+from backend.database_handler.models import Base
 from backend.protocol_rpc.configuration import GlobalConfiguration
 from backend.protocol_rpc.message_handler.base import MessageHandler
 from backend.database_handler.accounts_manager import AccountsManager
@@ -40,7 +42,13 @@ def ping() -> dict:
 
 
 def clear_db_tables(db_client: DBClient, tables: list) -> dict:
-    db_client.clear_tables(tables)
+    with db_client.get_session() as session:
+        for table_name in tables:
+            table = Table(
+                table_name, Base.metadata, autoload=True, autoload_with=session.bind
+            )
+            session.execute(table.delete())
+        session.commit()
 
 
 ####### ACCOUNTS ENDPOINTS #######
@@ -123,7 +131,6 @@ def get_contract_schema_for_code(
     return node.get_contract_schema(contract_code)
 
 
-####### VALIDATORS ENDPOINTS #######
 def get_providers_and_models(config: GlobalConfiguration) -> dict:
     default_config = get_default_config_for_providers_and_nodes()
     providers = get_providers()
@@ -263,7 +270,7 @@ def get_contract_state(
     if not accounts_manager.is_valid_address(contract_address):
         raise InvalidAddressError(contract_address)
 
-    contract_account = accounts_manager.get_account(contract_address)
+    contract_account = accounts_manager.get_account_or_fail(contract_address)
     node = Node(
         contract_snapshot=None,
         address="",
@@ -347,6 +354,10 @@ def send_raw_transaction(
     return result
 
 
+def count_validators(validators_registry: ValidatorsRegistry) -> dict:
+    return validators_registry.count_validators()
+
+
 def register_all_rpc_endpoints(
     jsonrpc: JSONRPC,
     msg_handler: MessageHandler,
diff --git a/backend/protocol_rpc/requirements.txt b/backend/protocol_rpc/requirements.txt
index f1c10d3c2..0ebb02b76 100644
--- a/backend/protocol_rpc/requirements.txt
+++ b/backend/protocol_rpc/requirements.txt
@@ -13,8 +13,9 @@ colorama==0.4.6
 debugpy==1.8.1
 aiohttp==3.9.3
 openai==1.16.1
-SQLAlchemy==2.0.31
+SQLAlchemy[asyncio]==2.0.31
 alembic==1.13.2
 eth-account==0.13.1
 eth-utils==4.1.1
 sentence-transformers==3.0.1
+Flask-SQLAlchemy==3.1.1
diff --git a/backend/protocol_rpc/server.py b/backend/protocol_rpc/server.py
index 00e60ec46..91dfc728d 100644
--- a/backend/protocol_rpc/server.py
+++ b/backend/protocol_rpc/server.py
@@ -1,38 +1,53 @@
 # backend/protocol_rpc/server.py
 
 import os
+from os import environ
 import threading
 import logging
 from flask import Flask
 from flask_jsonrpc import JSONRPC
 from flask_socketio import SocketIO
 from flask_cors import CORS
+from flask_sqlalchemy import SQLAlchemy
 from backend.protocol_rpc.configuration import GlobalConfiguration
 from backend.protocol_rpc.message_handler.base import MessageHandler
 from backend.protocol_rpc.endpoints import register_all_rpc_endpoints
 from dotenv import load_dotenv
 
-from backend.database_handler.db_client import DBClient
+from backend.database_handler.db_client import DBClient, get_db_name
 from backend.database_handler.transactions_processor import TransactionsProcessor
 from backend.database_handler.validators_registry import ValidatorsRegistry
 from backend.database_handler.accounts_manager import AccountsManager
 from backend.consensus.base import ConsensusAlgorithm
+from backend.database_handler.models import Base
 
 
 def create_app():
+
+    database_name_seed = "genlayer"
+    db_uri = f"postgresql+psycopg2://{environ.get('DBUSER')}:{environ.get('DBPASSWORD')}@{environ.get('DBHOST')}/{get_db_name(database_name_seed)}"
+    sqlalchemy_db = SQLAlchemy(
+        model_class=Base,
+        session_options={
+            "expire_on_commit": False
+        },  # recommended in https://docs.sqlalchemy.org/en/20/orm/session_basics.html#when-do-i-construct-a-session-when-do-i-commit-it-and-when-do-i-close-it
+    )
+
     app = Flask("jsonrpc_api")
+    app.config["SQLALCHEMY_DATABASE_URI"] = db_uri
+    app.config["SQLALCHEMY_ECHO"] = True
+    sqlalchemy_db.init_app(app)
+
     CORS(app, resources={r"/api/*": {"origins": "*"}}, intercept_exceptions=False)
     jsonrpc = JSONRPC(app, "/api", enable_web_browsable_api=True)
     socketio = SocketIO(app, cors_allowed_origins="*")
     msg_handler = MessageHandler(app, socketio)
-    genlayer_db_client = DBClient("genlayer")
-    transactions_processor = TransactionsProcessor(genlayer_db_client)
-    accounts_manager = AccountsManager(genlayer_db_client, transactions_processor)
-    validators_registry = ValidatorsRegistry(genlayer_db_client)
+    genlayer_db_client = DBClient(database_name_seed)
+    transactions_processor = TransactionsProcessor(sqlalchemy_db.session)
+    accounts_manager = AccountsManager(sqlalchemy_db.session, transactions_processor)
+    validators_registry = ValidatorsRegistry(sqlalchemy_db.session)
 
-    consensus = ConsensusAlgorithm(
-        genlayer_db_client, transactions_processor, msg_handler
-    )
+    consensus = ConsensusAlgorithm(genlayer_db_client, msg_handler)
     return (
         app,
         jsonrpc,
diff --git a/tests/common/response.py b/tests/common/response.py
index c25d656f1..3fc112cbc 100644
--- a/tests/common/response.py
+++ b/tests/common/response.py
@@ -1,15 +1,19 @@
 def assert_dict_struct(data, structure):
     if isinstance(structure, dict):
-        assert isinstance(data, dict)
+        assert_is_instance(data, dict)
         for key, value in structure.items():
             assert key in data
             assert_dict_struct(data[key], value)
     elif isinstance(structure, list):
-        assert isinstance(data, list)
+        assert_is_instance(data, list)
         for item in data:
             assert_dict_struct(item, structure[0])
     else:
-        isinstance(data, structure)
+        assert_is_instance(data, structure)
+
+
+def assert_is_instance(data, structure):
+    assert isinstance(data, structure), f"Expected {structure}, but got {data}"
 
 
 def assert_dict_exact(data, expected):
diff --git a/tests/db-sqlalchemy/Dockerfile b/tests/db-sqlalchemy/Dockerfile
new file mode 100644
index 000000000..2a89a08aa
--- /dev/null
+++ b/tests/db-sqlalchemy/Dockerfile
@@ -0,0 +1,15 @@
+FROM python:3.12-slim
+
+WORKDIR /app
+
+ENV TEST_PATH=tests/db-sqlalchemy
+
+COPY ${TEST_PATH}/requirements.txt .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY ${TEST_PATH} .
+
+COPY backend /app/backend
+
+CMD ["pytest", "-v"]
diff --git a/tests/db-sqlalchemy/README.md b/tests/db-sqlalchemy/README.md
new file mode 100644
index 000000000..e6e446ac9
--- /dev/null
+++ b/tests/db-sqlalchemy/README.md
@@ -0,0 +1,45 @@
+# SQLAlchemy integration tests
+
+## Why
+
+Integration tests allow us to rapidly catch runtime errors (very common in languages like Python) locally, prior to releases
+
+## What
+
+### What they are
+
+These tests test our integration with an actual `postgres` database. That's why this need its own environment by setting up a private postgres db just for testing
+
+These tests are standalone, they don't require the simulator to be up
+
+### What they are not
+
+We are not unit testing the module here because that requires a lot of mocking, which is not really valuable since the registry logic is pretty simple
+
+- most content online suggest connecting to a database, almost always suggesting in memory `sqlite` as in https://coderpad.io/blog/development/a-guide-to-database-unit-testing-with-pytest-and-sqlalchemy/
+  - we cannot go with this approach since the `JSONB` type of `postgres` is a custom `dialect`, and we are using it in most of our models. Maybe at some point `SQLAlchemy`'s' `JSONB` will be inter-compatible between `sqlite` and `postgres` :https://sqlite.org/draft/jsonb.html
+    https://github.com/miki725/alchemy-mock
+- mocking alternatives need to be mocked very precisely: this makes the tests ["white-boxed"](https://en.wikipedia.org/wiki/White-box_testing) which is not great because we wouldn't be testing behavior
+  - https://github.com/miki725/alchemy-mock
+
+## Usage
+
+These tests are expected to be run from the root of the repository
+
+```sh
+docker compose -f tests/db-sqlalchemy/docker-compose.yml --project-directory . up tests --build --force-recreate --always-recreate-deps
+```
+
+If your `postgres` database has information you want to clean, run
+
+```sh
+docker compose -f tests/db-sqlalchemy/docker-compose.yml --project-directory . down
+```
+
+## Future possible improvements
+
+- GitHub Action to test this in CI
+- Allow attaching debugger to the container
+- Review how to integrate the codebase in a more streamlined way
+  - at the moment we have our custom `requirements.txt`, which will probably get desyncronized at some point
+  - module management is also a bit manual, directories are manipulated for imports to resolve correctly
diff --git a/tests/db-sqlalchemy/accounts_manager_test.py b/tests/db-sqlalchemy/accounts_manager_test.py
new file mode 100644
index 000000000..c7992f0b6
--- /dev/null
+++ b/tests/db-sqlalchemy/accounts_manager_test.py
@@ -0,0 +1,40 @@
+from datetime import datetime
+import time
+from typing import Iterable
+
+import pytest
+from backend.database_handler.accounts_manager import AccountsManager
+from backend.database_handler.transactions_processor import TransactionsProcessor
+from sqlalchemy.orm import Session
+
+
+@pytest.fixture
+def accounts_manager(
+    session: Session, transactions_processor: TransactionsProcessor
+) -> Iterable[TransactionsProcessor]:
+    yield AccountsManager(session, transactions_processor)
+
+
+def test_accounts_manager(accounts_manager: AccountsManager):
+    address = "0x9F0e84243496AcFB3Cd99D02eA59673c05901501"
+    balance = 100
+    accounts_manager.fund_account(address, balance)
+
+    account_data = accounts_manager.get_account_or_fail(address)
+
+    assert account_data["id"] == address
+    assert account_data["data"]["balance"] == balance
+    first_updated_at = account_data["updated_at"]
+    assert datetime.fromisoformat(first_updated_at)
+
+    time.sleep(0.1)
+    extra_balance = 50
+    accounts_manager.fund_account(address, extra_balance)
+
+    account_data = accounts_manager.get_account_or_fail(address)
+
+    assert account_data["id"] == address
+    assert account_data["data"]["balance"] == balance + extra_balance
+    second_updated_at = account_data["updated_at"]
+    assert datetime.fromisoformat(second_updated_at)
+    assert first_updated_at < second_updated_at
diff --git a/tests/db-sqlalchemy/chain_snapshot_test.py b/tests/db-sqlalchemy/chain_snapshot_test.py
new file mode 100644
index 000000000..bf2f60356
--- /dev/null
+++ b/tests/db-sqlalchemy/chain_snapshot_test.py
@@ -0,0 +1,77 @@
+from sqlalchemy.orm import Session
+
+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
+
+
+def test_chain_snapshot(session: Session):
+    pending_transaction_1 = Transactions(
+        status=TransactionStatus.PENDING,
+        from_address="0x123",
+        to_address="0x456",
+        data="data",
+        consensus_data="consensus_data",
+        value=10,
+        type=0,
+        gaslimit=None,
+        input_data=None,
+        nonce=None,
+        r=None,
+        s=None,
+        v=None,
+    )
+
+    pending_transaction_2 = Transactions(
+        status=TransactionStatus.PENDING,
+        from_address="0x789",
+        to_address="0xabc",
+        data="data",
+        consensus_data="consensus_data",
+        value=20,
+        type=0,
+        gaslimit=None,
+        input_data=None,
+        nonce=None,
+        r=None,
+        s=None,
+        v=None,
+    )
+
+    finalized_transaction = Transactions(
+        status=TransactionStatus.FINALIZED,
+        from_address="0xdef",
+        to_address="0x123",
+        data="data",
+        consensus_data="consensus_data",
+        value=30,
+        type=0,
+        gaslimit=None,
+        input_data=None,
+        nonce=None,
+        r=None,
+        s=None,
+        v=None,
+    )
+
+    session.add(pending_transaction_1)
+    session.add(pending_transaction_2)
+    session.add(finalized_transaction)
+    session.commit()
+
+    chain_snapshot = ChainSnapshot(session)
+    pending_transactions = chain_snapshot.get_pending_transactions()
+
+    assert len(pending_transactions) == 2
+    pending_transactions.sort(key=lambda x: x["id"])
+
+    assert (
+        TransactionsProcessor._parse_transaction_data(pending_transaction_1)
+        == pending_transactions[0]
+    )
+
+    assert (
+        TransactionsProcessor._parse_transaction_data(pending_transaction_2)
+        == pending_transactions[1]
+    )
diff --git a/tests/db-sqlalchemy/conftest.py b/tests/db-sqlalchemy/conftest.py
new file mode 100644
index 000000000..247c27ecc
--- /dev/null
+++ b/tests/db-sqlalchemy/conftest.py
@@ -0,0 +1,44 @@
+import os
+from typing import Iterable
+
+import pytest
+from sqlalchemy import Engine, create_engine
+from sqlalchemy.orm import Session, sessionmaker
+
+from backend.database_handler.models import Base
+from backend.database_handler.transactions_processor import TransactionsProcessor
+
+import debugpy
+
+
+debugpy.listen(("0.0.0.0", 5678))
+if os.getenv("WAIT_FOR_DEBUGGER"):
+    # TODO: this is not printing anything
+    print("Waiting for debugger to attach...")
+    debugpy.wait_for_client()
+    print("Debugger attached")
+
+
+@pytest.fixture
+def engine() -> Iterable[Engine]:
+    postgres_url = os.getenv("POSTGRES_URL")
+    engine = create_engine(
+        postgres_url,
+        # echo=True # Uncomment this line to see the SQL queries
+    )
+    Base.metadata.create_all(engine)
+    yield engine
+    Base.metadata.drop_all(engine)
+
+
+@pytest.fixture
+def session(engine: Engine) -> Iterable[Session]:
+    session_maker = sessionmaker(bind=engine, expire_on_commit=False)
+    session = session_maker()
+    yield session
+    session.close()
+
+
+@pytest.fixture
+def transactions_processor(session: Session) -> Iterable[TransactionsProcessor]:
+    yield TransactionsProcessor(session)
diff --git a/tests/db-sqlalchemy/contract_snapshot_test.py b/tests/db-sqlalchemy/contract_snapshot_test.py
new file mode 100644
index 000000000..ae9541ed9
--- /dev/null
+++ b/tests/db-sqlalchemy/contract_snapshot_test.py
@@ -0,0 +1,60 @@
+from sqlalchemy.orm import Session
+
+from backend.database_handler.contract_snapshot import ContractSnapshot
+from backend.database_handler.models import CurrentState
+
+
+def test_contract_snapshot_with_contract(session: Session):
+    # Pre-load contract
+    contract_address = "0x123456"
+    contract_code = "code"
+    contract_state = "state"
+    contract = CurrentState(
+        id=contract_address, data={"code": contract_code, "state": contract_state}
+    )
+
+    session.add(contract)
+    session.commit()
+
+    # Test ContractSnapshot
+    contract_snapshot = ContractSnapshot(contract_address, session)
+
+    assert contract_snapshot.contract_address == contract_address
+    assert contract_snapshot.contract_data["code"] == contract_code
+    assert contract_snapshot.contract_data["state"] == contract_state
+
+    new_state = "new_state"
+    contract_snapshot.update_contract_state(new_state)
+
+    actual_contract = session.query(CurrentState).filter_by(id=contract_address).one()
+
+    assert actual_contract.data["state"] == new_state
+    assert actual_contract.data["code"] == contract_code
+
+
+def test_contract_snapshot_without_contract(session: Session):
+    contract_address = "0x123456"
+    contract_code = "code"
+    contract_state = "state"
+    contract = CurrentState(
+        id=contract_address, data={"code": contract_code, "state": contract_state}
+    )
+    session.add(contract)
+
+    contract_snapshot = ContractSnapshot(None, session)
+
+    assert "contract_address" not in contract_snapshot.__dict__
+    assert "contract_data" not in contract_snapshot.__dict__
+    assert "contract_code" not in contract_snapshot.__dict__
+
+    updated_data = {
+        "code": "new_code",
+        "state": "new_state",
+    }
+    updated_contract = {"id": contract_address, "data": updated_data}
+    contract_snapshot.register_contract(updated_contract)
+
+    actual_contract = session.query(CurrentState).filter_by(id=contract.id).one()
+
+    assert actual_contract.data == updated_data
+    assert actual_contract.id == contract_address
diff --git a/tests/db-sqlalchemy/docker-compose.yml b/tests/db-sqlalchemy/docker-compose.yml
new file mode 100644
index 000000000..f1bcc3a16
--- /dev/null
+++ b/tests/db-sqlalchemy/docker-compose.yml
@@ -0,0 +1,32 @@
+services:
+  postgrestest:
+    image: postgres:12.19-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    # Uncomment for debugging
+    # ports:
+    #   - 5432:5432
+    healthcheck:
+      test: pg_isready -U postgres -d postgres
+      interval: 1s
+      timeout: 1s
+      retries: 3
+    container_name: genlayer_simulator_postgres_db_tests
+
+  tests:
+    build:
+      context: ./
+      dockerfile: ./tests/db-sqlalchemy/Dockerfile
+    # Uncomment for debugging
+    # ports:
+    #   - 5678:5678
+    environment:
+    # Uncomment for debugging
+      # WAIT_FOR_DEBUGGER: true
+      POSTGRES_URL: postgresql+psycopg2://postgres:postgres@postgrestest:5432/postgres
+    depends_on:
+      postgrestest:
+        condition: service_healthy
+    container_name: genlayer_simulator_db_tests
diff --git a/tests/db-sqlalchemy/requirements.txt b/tests/db-sqlalchemy/requirements.txt
new file mode 100644
index 000000000..d3290bd70
--- /dev/null
+++ b/tests/db-sqlalchemy/requirements.txt
@@ -0,0 +1,8 @@
+SQLAlchemy==2.0.31
+pytest==8.2.1
+psycopg2-binary==2.9.9
+debugpy==1.8.5
+requests==2.32.3
+numpy==1.26.4
+eth-account==0.13.1
+python-dotenv==1.0.1
diff --git a/tests/db-sqlalchemy/transactions_processor_test.py b/tests/db-sqlalchemy/transactions_processor_test.py
new file mode 100644
index 000000000..3e395e771
--- /dev/null
+++ b/tests/db-sqlalchemy/transactions_processor_test.py
@@ -0,0 +1,67 @@
+import math
+from datetime import datetime
+
+from backend.database_handler.transactions_processor import (
+    TransactionsProcessor,
+    TransactionStatus,
+)
+
+
+def test_transactions_processor(transactions_processor: TransactionsProcessor):
+
+    from_address = "0x9F0e84243496AcFB3Cd99D02eA59673c05901501"
+    to_address = "0xAcec3A6d871C25F591aBd4fC24054e524BBbF794"
+    data = {"key": "value"}
+    value = 2.0
+    transaction_type = 1
+
+    actual_transaction_id = transactions_processor.insert_transaction(
+        from_address, to_address, data, value, transaction_type
+    )
+
+    actual_transaction = transactions_processor.get_transaction_by_id(
+        actual_transaction_id
+    )
+
+    assert actual_transaction["from_address"] == from_address
+    assert actual_transaction["to_address"] == to_address
+    assert actual_transaction["data"] == data
+    assert math.isclose(actual_transaction["value"], value)
+    assert actual_transaction["type"] == transaction_type
+    assert actual_transaction["status"] == TransactionStatus.PENDING.value
+    assert actual_transaction["id"] == actual_transaction_id
+    created_at = actual_transaction["created_at"]
+    assert datetime.fromisoformat(created_at)
+
+    new_status = TransactionStatus.ACCEPTED
+    transactions_processor.update_transaction_status(actual_transaction_id, new_status)
+
+    actual_transaction = transactions_processor.get_transaction_by_id(
+        actual_transaction_id
+    )
+
+    assert actual_transaction["status"] == new_status.value
+    assert actual_transaction["id"] == actual_transaction_id
+    assert actual_transaction["from_address"] == from_address
+    assert actual_transaction["to_address"] == to_address
+    assert actual_transaction["data"] == data
+    assert math.isclose(actual_transaction["value"], value)
+    assert actual_transaction["type"] == transaction_type
+    assert actual_transaction["created_at"] == created_at
+
+    consensus_data = {"result": "success"}
+    transactions_processor.set_transaction_result(actual_transaction_id, consensus_data)
+
+    actual_transaction = transactions_processor.get_transaction_by_id(
+        actual_transaction_id
+    )
+
+    assert actual_transaction["status"] == TransactionStatus.FINALIZED.value
+    assert actual_transaction["consensus_data"] == consensus_data
+    assert actual_transaction["id"] == actual_transaction_id
+    assert actual_transaction["from_address"] == from_address
+    assert actual_transaction["to_address"] == to_address
+    assert actual_transaction["data"] == data
+    assert math.isclose(actual_transaction["value"], value)
+    assert actual_transaction["type"] == transaction_type
+    assert actual_transaction["created_at"] == created_at
diff --git a/tests/db-sqlalchemy/validators_registry_test.py b/tests/db-sqlalchemy/validators_registry_test.py
new file mode 100644
index 000000000..1da7af743
--- /dev/null
+++ b/tests/db-sqlalchemy/validators_registry_test.py
@@ -0,0 +1,64 @@
+from datetime import datetime
+from typing import Iterable
+
+import pytest
+from sqlalchemy.orm import Session
+
+from backend.database_handler.validators_registry import ValidatorsRegistry
+
+
+@pytest.fixture
+def validators_registry(session: Session) -> Iterable[ValidatorsRegistry]:
+    yield ValidatorsRegistry(session)
+
+
+def test_validators_registry(validators_registry: ValidatorsRegistry):
+    validator_address = "0xabcdef"
+
+    stake = 1
+    provider = "ollama"
+    model = "llama3"
+    config = {}
+    actual_validator = validators_registry.create_validator(
+        validator_address, stake, provider, model, config
+    )
+    assert validators_registry.count_validators() == 1
+
+    assert actual_validator["stake"] == stake
+    assert actual_validator["provider"] == provider
+    assert actual_validator["model"] == model
+    assert actual_validator["config"] == config
+    created_at = actual_validator["created_at"]
+    validator_id = actual_validator["id"]
+    assert datetime.fromisoformat(created_at)
+
+    actual_validators = validators_registry.get_all_validators()
+
+    actual_validator = validators_registry.get_validator(validator_address)
+
+    assert actual_validators == [actual_validator]
+
+    new_stake = 2
+    new_provider = "ollama_new"
+    new_model = "llama3.1"
+    new_config = {"seed": 1, "key": {"array": [1, 2, 3]}}
+
+    actual_validator = validators_registry.update_validator(
+        validator_address, 2, new_provider, new_model, new_config
+    )
+
+    assert validators_registry.count_validators() == 1
+
+    assert validators_registry.get_validator(validator_address) == actual_validator
+
+    assert actual_validator["stake"] == new_stake
+    assert actual_validator["provider"] == new_provider
+    assert actual_validator["model"] == new_model
+    assert actual_validator["config"] == new_config
+    assert actual_validator["id"] == validator_id
+    assert actual_validator["created_at"] == created_at
+
+    validators_registry.delete_validator(validator_address)
+
+    assert len(validators_registry.get_all_validators()) == 0
+    assert validators_registry.count_validators() == 0
diff --git a/tests/integration/mocks/call_contract_function.py b/tests/integration/mocks/call_contract_function.py
index 5ba0d180d..8d264ea4d 100644
--- a/tests/integration/mocks/call_contract_function.py
+++ b/tests/integration/mocks/call_contract_function.py
@@ -10,7 +10,7 @@
                     "class_name": str,
                     "contract_state": str,
                     "eq_outputs": {"leader": dict},
-                    "error": str,
+                    "error": str | None,
                     "execution_result": str,
                     "gas_used": int,
                     "method": str,
@@ -19,7 +19,7 @@
                         "config": dict,
                         "model": str,
                         "provider": str,
-                        "stake": float,
+                        "stake": int,
                     },
                     "vote": str,
                 },
@@ -28,7 +28,7 @@
             },
             "created_at": str,
             "data": {
-                "function_args": list,
+                "function_args": str,  # TODO: can we make this a list?
                 "function_name": str,
             },
             "from_address": str,

From 35798e007d2e989a8014701e4af0d6c7092b7633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20D=C3=ADaz?=
 <49416765+AgustinRamiroDiaz@users.noreply.github.com>
Date: Wed, 4 Sep 2024 07:28:36 -0300
Subject: [PATCH 8/8] chore(github): update PR template (#457)

* fix(ci): gh action release (#431)

* chore(github): update PR template
---
 .github/pull_request_template.md        |  2 +-
 .github/workflows/release-from-main.yml | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index eec4c5a77..037097b5b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -32,7 +32,7 @@ Fixes #issue-number-here
 - [ ] I have tested this code
 - [ ] I have reviewed my own PR
 - [ ] I have created an issue for this PR
-- [ ] I have set the PR name to the issue name
+- [ ] I have set a descriptive PR title compliant with [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/)
 
 # Reviewing tips
 
diff --git a/.github/workflows/release-from-main.yml b/.github/workflows/release-from-main.yml
index f82923ec3..197d00ebb 100644
--- a/.github/workflows/release-from-main.yml
+++ b/.github/workflows/release-from-main.yml
@@ -9,19 +9,24 @@ jobs:
     runs-on: ubuntu-latest
     permissions: # As per https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#create-a-release
       contents: write
+      pull-requests: read
 
     steps:
       - uses: actions/checkout@v4
+      # We retrieve the original PR since the commit message is line wrapped
       # Depends on the following format from the commit message:
-      # Release vX.Y.Z ...
-      #
-      # Release notes here
-      # ...
+      # Release vX.Y.Z (#PR_NUMBER)
+      # ... body of the PR ...
       - name: Create release
         run: |
-          commit_msg=$(git log -1 --pretty=%B)
-          semver=$(echo $commit_msg | head -n -1 | awk '{print $2}')
-          echo $commit_msg | tail -n +3 > body.txt
+          commit_msg_head=$(git log -1 --pretty=%B | head -n 1)
+          echo $commit_msg_head
+          release_pr_number=$(echo $commit_msg_head | awk '{print $3}' | grep -oP '\(\#\K[0-9]+')
+          echo $release_pr_number
+          semver=$(echo $commit_msg_head | awk '{print $2}')
+          echo $semver
+          gh pr view $release_pr_number --json body --jq .body > body.txt
+          cat body.txt
           gh release create $semver --title $semver -F body.txt --prerelease
         # TODO: remove prerelease flag after testing            ^^^^^^^^^^^^
         env: