diff --git a/docker-compose/init-state.mjs b/docker-compose/init-state.mjs
index 7092e7414..f9b3a243c 100755
--- a/docker-compose/init-state.mjs
+++ b/docker-compose/init-state.mjs
@@ -9,7 +9,7 @@ import {
   encode,
   Encoding,
   Name,
-} from '@aeternity/aepp-sdk-next';
+} from '@aeternity/aepp-sdk';
 
 // TODO: remove after merging https://github.com/aeternity/ae_mdw/issues/1758
 try {
diff --git a/jest.config.js b/jest.config.js
index 696f07ac3..2b4667b93 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,6 @@
 const packagesToTranspile = [
   'lodash-es',
   'emoji-datasource-apple',
-  '@aeternity/aepp-sdk',
   '@aeternity/hd-wallet',
   'register-service-worker',
 ];
@@ -18,14 +17,6 @@ module.exports = {
   transformIgnorePatterns: [`node_modules/(?!(${packagesToTranspile.join('|')})/)`],
   moduleNameMapper: {
     '^.*\\.svg\\?icon-component$': '<rootDir>/config/jest/EmptySvg.vue',
-    // https://github.com/jestjs/jest/issues/10422
-    '^@swagger-api/apidom-reference/parse/parsers/binary$':
-      '@swagger-api/apidom-reference/cjs/parse/parsers/binary/index-browser.cjs',
-    '^@swagger-api/apidom-reference/(.*)/strategies/openapi-3-1$':
-      '@swagger-api/apidom-reference/cjs/$1/strategies/openapi-3-1/index.cjs',
-    '^@swagger-api/apidom-reference/dereference/strategies/openapi-3-1/selectors/(.*)$':
-      '@swagger-api/apidom-reference/cjs/dereference/strategies/openapi-3-1/selectors/$1/index.cjs',
-    '^@swagger-api/apidom-reference/(.*)$': '@swagger-api/apidom-reference/cjs/$1.cjs',
   },
   snapshotSerializers: ['jest-serializer-vue'],
   testMatch: ['**/tests/unit/**/*.spec.(js|jsx|ts|tsx)', '**/__tests__/*.(js|jsx|ts|tsx)'],
diff --git a/package-lock.json b/package-lock.json
index 9b548c84c..42e3307c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,8 +8,7 @@
       "name": "aepp-base",
       "version": "1.2.0",
       "dependencies": {
-        "@aeternity/aepp-sdk": "^11.0.1",
-        "@aeternity/aepp-sdk-next": "npm:@aeternity/aepp-sdk@^14.0.0",
+        "@aeternity/aepp-sdk": "^14.0.0",
         "@aeternity/bip39": "^0.1.0",
         "@aeternity/hd-wallet": "^0.2.0",
         "@aeternity/ledger-app-api": "^0.2.2",
@@ -29,8 +28,6 @@
         "rxjs-etc": "^10.6.2",
         "socket.io-client": "^4.7.5",
         "stream-browserify": "^3.0.0",
-        "swagger-client": "~3.19.7",
-        "util": "^0.12.5",
         "vee-validate": "^2.2.15",
         "vue": "^2.7.16",
         "vue-clickaway": "^2.2.2",
@@ -116,51 +113,7 @@
         "sha.js": "^2.4.11"
       }
     },
-    "node_modules/@aeternity/aepp-calldata/node_modules/base-x": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-5.0.0.tgz",
-      "integrity": "sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==",
-      "license": "MIT"
-    },
-    "node_modules/@aeternity/aepp-calldata/node_modules/bs58": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-6.0.0.tgz",
-      "integrity": "sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==",
-      "license": "MIT",
-      "dependencies": {
-        "base-x": "^5.0.0"
-      }
-    },
     "node_modules/@aeternity/aepp-sdk": {
-      "version": "11.0.1",
-      "license": "ISC",
-      "dependencies": {
-        "@aeternity/aepp-calldata": "^1.1.1",
-        "@aeternity/argon2-browser": "^0.1.2",
-        "@aeternity/blakejs": "^1.1.2",
-        "@aeternity/json-bigint": "^0.3.1",
-        "@aeternity/uuid": "^0.0.1",
-        "@babel/runtime-corejs3": "^7.17.2",
-        "@stamp/it": "^1.1.0",
-        "@stamp/required": "^1.0.1",
-        "aes-js": "^3.1.2",
-        "bignumber.js": "^9.0.2",
-        "bip32-path": "^0.4.2",
-        "bs58": "^4.0.1",
-        "buffer": "^6.0.3",
-        "cross-fetch": "^3.1.5",
-        "events": "^3.3.0",
-        "process": "^0.11.10",
-        "rlp": "^3.0.0",
-        "sha.js": "^2.4.11",
-        "swagger-client": "^3.18.4",
-        "tweetnacl": "^1.0.3",
-        "tweetnacl-auth": "^1.0.1",
-        "websocket": "^1.0.34"
-      }
-    },
-    "node_modules/@aeternity/aepp-sdk-next": {
-      "name": "@aeternity/aepp-sdk",
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-14.0.0.tgz",
       "integrity": "sha512-yZELmMe38uPTuBj18wDYwx7QHOH+wHuur0+W9ijwa3VdC31wZAvNFcsDUzLKmPA3cihhya9KDQyPvQJ72e1vEg==",
@@ -203,7 +156,7 @@
         "node": ">=18.19"
       }
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/@ledgerhq/devices": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/@ledgerhq/devices": {
       "version": "8.4.4",
       "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.4.4.tgz",
       "integrity": "sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==",
@@ -215,13 +168,13 @@
         "semver": "^7.3.5"
       }
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/@ledgerhq/errors": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/@ledgerhq/errors": {
       "version": "6.19.1",
       "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.19.1.tgz",
       "integrity": "sha512-75yK7Nnit/Gp7gdrJAz0ipp31CCgncRp+evWt6QawQEtQKYEDfGo10QywgrrBBixeRxwnMy1DP6g2oCWRf1bjw==",
       "license": "Apache-2.0"
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/@ledgerhq/hw-transport": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/@ledgerhq/hw-transport": {
       "version": "6.31.4",
       "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz",
       "integrity": "sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==",
@@ -233,34 +186,19 @@
         "events": "^3.3.0"
       }
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/@ledgerhq/logs": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/@ledgerhq/logs": {
       "version": "6.12.0",
       "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.12.0.tgz",
       "integrity": "sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA==",
       "license": "Apache-2.0"
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/base-x": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-5.0.0.tgz",
-      "integrity": "sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==",
-      "license": "MIT"
-    },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/bs58": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-6.0.0.tgz",
-      "integrity": "sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==",
-      "license": "MIT",
-      "dependencies": {
-        "base-x": "^5.0.0"
-      }
-    },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/eventemitter3": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
       "license": "MIT"
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/semver": {
+    "node_modules/@aeternity/aepp-sdk/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
       "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
@@ -272,10 +210,10 @@
         "node": ">=10"
       }
     },
-    "node_modules/@aeternity/aepp-sdk-next/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+    "node_modules/@aeternity/aepp-sdk/node_modules/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -293,10 +231,6 @@
         }
       }
     },
-    "node_modules/@aeternity/argon2-browser": {
-      "version": "0.1.2",
-      "license": "MIT"
-    },
     "node_modules/@aeternity/bip39": {
       "version": "0.1.0",
       "license": "ISC",
@@ -307,10 +241,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/@aeternity/blakejs": {
-      "version": "1.1.2",
-      "license": "CC0-1.0"
-    },
     "node_modules/@aeternity/hd-wallet": {
       "version": "0.2.0",
       "hasInstallScript": true,
@@ -323,13 +253,6 @@
         "tweetnacl-auth": "^1.0.1"
       }
     },
-    "node_modules/@aeternity/json-bigint": {
-      "version": "0.3.1",
-      "license": "MIT",
-      "dependencies": {
-        "bignumber.js": "^9.0.0"
-      }
-    },
     "node_modules/@aeternity/ledger-app-api": {
       "version": "0.2.2",
       "license": "Apache-2.0",
@@ -338,13 +261,6 @@
         "babel-runtime": "^6.26.0"
       }
     },
-    "node_modules/@aeternity/uuid": {
-      "version": "0.0.1",
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -5431,51 +5347,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@stamp/compose": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "@stamp/core": "^1.0.1",
-        "@stamp/is": "^1.0.0"
-      }
-    },
-    "node_modules/@stamp/core": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "@stamp/is": "^1.0.0"
-      }
-    },
-    "node_modules/@stamp/is": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/@stamp/it": {
-      "version": "1.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@stamp/compose": "^1.0.2",
-        "@stamp/core": "^1.0.1",
-        "@stamp/is": "^1.0.0",
-        "@stamp/shortcut": "^1.0.2"
-      }
-    },
-    "node_modules/@stamp/required": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "@stamp/compose": "^1.0.2",
-        "@stamp/core": "^1.0.1",
-        "@stamp/is": "^1.0.0"
-      }
-    },
-    "node_modules/@stamp/shortcut": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "@stamp/compose": "^1.0.2"
-      }
-    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "dev": true,
@@ -5487,286 +5358,6 @@
         "string.prototype.matchall": "^4.0.6"
       }
     },
-    "node_modules/@swagger-api/apidom-ast": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-0.89.0.tgz",
-      "integrity": "sha512-Rqfzqo8On7ddhmsKFWsCLsfCJRlOYbIM1itYnxpnj2wxrxQ8v0b91ecFU/Hs/NgDuncvbZYf7gD+71g0QAJrww==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-error": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.1.1",
-        "stampit": "^4.3.2",
-        "unraw": "^3.0.0"
-      }
-    },
-    "node_modules/@swagger-api/apidom-core": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-0.89.0.tgz",
-      "integrity": "sha512-GVjcvNEh1aPeWZHoVxPx9jMwff0nKPkKjuKyTOrMCCCGIO92J5o42qYxcerW4FTKlnpXvc2vObl0B5X5yh2jIA==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-ast": "^0.89.0",
-        "@swagger-api/apidom-error": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "minim": "~0.23.8",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.1.1",
-        "short-unique-id": "^5.0.2",
-        "stampit": "^4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-error": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-0.89.0.tgz",
-      "integrity": "sha512-e2xt6Mjf58yfotElZUvM1aglvlTGN8pcJR/kotNc+JmYBTw9gzB8mDjBya4z1Ze0Z++Cp2FMTVpd8n0QceQqKQ==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7"
-      }
-    },
-    "node_modules/@swagger-api/apidom-json-pointer": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.89.0.tgz",
-      "integrity": "sha512-42D4HG2hsBU3qYX2yKW743/4dGp0rKyjtal3s+Rdae46rQuqXOItU7PQLYyORpM4Pka6wTwAKlhnz3raYH4zPQ==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.89.0",
-        "@swagger-api/apidom-error": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.0.0"
-      }
-    },
-    "node_modules/@swagger-api/apidom-ns-json-schema-draft-4": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-0.89.0.tgz",
-      "integrity": "sha512-7gXy3BPLkS7p7dmz9Hbf7ia4lH0NAaW2i7GcQdpX48pAUTR0/7Y+BPd38sgRxIOpebReWxnoAcKAfkak/KCQ3A==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-ast": "^0.89.0",
-        "@swagger-api/apidom-core": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.1.1",
-        "stampit": "^4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-ns-openapi-3-0": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-0.89.0.tgz",
-      "integrity": "sha512-9kbGRhjt+cpN6eqrwJ3GktoEGLXP2/9wDTQIUiII8jpjSRDwX8fzKMCvaQgGU3Id0gIG3KFVscvv15Z+n8PHMw==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.89.0",
-        "@swagger-api/apidom-error": "^0.89.0",
-        "@swagger-api/apidom-ns-json-schema-draft-4": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.1.1",
-        "stampit": "^4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-ns-openapi-3-1": {
-      "version": "0.89.0",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.89.0.tgz",
-      "integrity": "sha512-QlmETSbV6XL+AutyEvXcw78paizZSFgGWsqxMJKj9nZgdh217dLvvt0V5vWdE5fK5p4hlzHfRR7kO0Ong8sGSw==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-ast": "^0.89.0",
-        "@swagger-api/apidom-core": "^0.89.0",
-        "@swagger-api/apidom-ns-openapi-3-0": "^0.89.0",
-        "@types/ramda": "~0.29.6",
-        "ramda": "~0.29.1",
-        "ramda-adjunct": "^4.1.1",
-        "stampit": "^4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-0.69.3.tgz",
-      "integrity": "sha512-dimoVsW4COR4TUTgOqTnXSZAIdYOepIudWOvca2fGOcXg85eBMS4xJlNHx1095Fm664y5y8DVxIYe1oLu9gjVA==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "axios": "=1.3.6",
-        "minimatch": "=7.4.3",
-        "process": "=0.11.10",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "stampit": "=4.3.2"
-      },
-      "optionalDependencies": {
-        "@swagger-api/apidom-json-pointer": "^0.69.3",
-        "@swagger-api/apidom-ns-asyncapi-2": "^0.69.3",
-        "@swagger-api/apidom-ns-openapi-3-0": "^0.69.3",
-        "@swagger-api/apidom-ns-openapi-3-1": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-json": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.69.3",
-        "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.69.3"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-ast": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-0.69.3.tgz",
-      "integrity": "sha512-orGw/gihk7RmorxibwalthDS58B7QaEBd31fK+/aFx6QqEO1tEO35F850BiL2B5C8TaK8C2Tey01AZTXCxYmfw==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@types/ramda": "=0.29.0",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "stampit": "=4.3.2",
-        "unraw": "=2.0.1"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-core": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-0.69.3.tgz",
-      "integrity": "sha512-EIQiJUuT/V9nGkHOYYFP0QNgAW7Y4QwrQzldDzy9ltcHbOKY3TNh/QzYvO0+HvKSv9W7u7WTMH/kaRaSsaZsGw==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-ast": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "minim": "=0.23.8",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "short-unique-id": "=4.4.4",
-        "stampit": "=4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-json-pointer": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.69.3.tgz",
-      "integrity": "sha512-VYXqLY8f2fkaS/d+vVQEMEOEZRXAgGm5tCMx4C7uaU+wC+SKPH/zTh+qElbkaXQr4nfLjbphBsHh31doCyBEjw==",
-      "optional": true,
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-ns-json-schema-draft-4": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-0.69.3.tgz",
-      "integrity": "sha512-/tMeoz1IHEblc3OwWC812NQFLITOnexjGVujG5Wvsr9ZnTkRb+0g7CbXuooujwfcEY+++o2+kCUgy4SBQFIIlQ==",
-      "optional": true,
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "stampit": "=4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-ns-openapi-3-0": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-0.69.3.tgz",
-      "integrity": "sha512-iScwP+SzX8SJMrgChZbdS60Ode/zXfesNaDA+HkNBLbfSrri4/C5FTB0gfWOG0gCGPq+1K5dHlgLrEgogfAARw==",
-      "optional": true,
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.69.3",
-        "@swagger-api/apidom-ns-json-schema-draft-4": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "stampit": "=4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@swagger-api/apidom-ns-openapi-3-1": {
-      "version": "0.69.3",
-      "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.69.3.tgz",
-      "integrity": "sha512-J+yIsTBTn7rzfj+vaCXRRdOCrL4kxwnS3P/h4lXb82EZnPU/EbJi+C0LK7O24/vXpeBVRr+OpDfnhpospanMJg==",
-      "optional": true,
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.7",
-        "@swagger-api/apidom-core": "^0.69.3",
-        "@swagger-api/apidom-ns-openapi-3-0": "^0.69.3",
-        "@types/ramda": "=0.29.0",
-        "ramda": "=0.29.0",
-        "ramda-adjunct": "=4.0.0",
-        "stampit": "=4.3.2"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/@types/ramda": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.29.0.tgz",
-      "integrity": "sha512-TY9eKsklU43CmAbFJPKDUyBjleZ4EFAkbJeQRF4e8byGkOw1CjDcwg5EGa0Bgf0Kgs9BE9OU4UzQWnQDHnvMtA==",
-      "dependencies": {
-        "types-ramda": "^0.29.1"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/minimatch": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.3.tgz",
-      "integrity": "sha512-5UB4yYusDtkRPbRiy1cqZ1IpGNcJCGlEMG17RKzPddpyiPKoCdwohbED8g4QXT0ewCt8LTkQXuljsUfQ3FKM4A==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/ramda": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.29.0.tgz",
-      "integrity": "sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ramda"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/ramda-adjunct": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/ramda-adjunct/-/ramda-adjunct-4.0.0.tgz",
-      "integrity": "sha512-W/NiJAlZdwZ/iUkWEQQgRdH5Szqqet1WoVH9cdqDVjFbVaZHuJfJRvsxqHhvq6tZse+yVbFatLDLdVa30wBlGQ==",
-      "engines": {
-        "node": ">=0.10.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ramda-adjunct"
-      },
-      "peerDependencies": {
-        "ramda": ">= 0.29.0"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/short-unique-id": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/short-unique-id/-/short-unique-id-4.4.4.tgz",
-      "integrity": "sha512-oLF1NCmtbiTWl2SqdXZQbo5KM1b7axdp0RgQLq8qCBBLoq+o3A5wmLrNM6bZIh54/a8BJ3l69kTXuxwZ+XCYuw==",
-      "bin": {
-        "short-unique-id": "bin/short-unique-id",
-        "suid": "bin/short-unique-id"
-      }
-    },
-    "node_modules/@swagger-api/apidom-reference/node_modules/unraw": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unraw/-/unraw-2.0.1.tgz",
-      "integrity": "sha512-tdOvLfRzHolwYcHS6HIX860MkK9LQ4+oLuNwFYL7bpgTEO64PZrcQxkisgwJYCfF8sKiWLwwu1c83DvMkbefIQ=="
-    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
       "dev": true,
@@ -6057,14 +5648,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/ramda": {
-      "version": "0.29.9",
-      "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.29.9.tgz",
-      "integrity": "sha512-X3yEG6tQCWBcUAql+RPC/O1Hm9BSU+MXu2wJnCETuAgUlrEDwTA1kIOdEEE4YXDtf0zfQLHa9CCE7WYp9kqPIQ==",
-      "dependencies": {
-        "types-ramda": "^0.29.6"
-      }
-    },
     "node_modules/@types/range-parser": {
       "version": "1.2.4",
       "dev": true,
@@ -8323,10 +7906,6 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/aes-js": {
-      "version": "3.1.2",
-      "license": "MIT"
-    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -8589,6 +8168,7 @@
     },
     "node_modules/argparse": {
       "version": "2.0.1",
+      "dev": true,
       "license": "Python-2.0"
     },
     "node_modules/aria-query": {
@@ -8664,6 +8244,7 @@
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/at-least-node": {
@@ -8716,6 +8297,7 @@
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8737,34 +8319,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/axios": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.6.tgz",
-      "integrity": "sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==",
-      "dependencies": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/axios/node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "node_modules/babel-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -9000,14 +8554,14 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/base-x": {
-      "version": "3.0.9",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-5.0.0.tgz",
+      "integrity": "sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==",
+      "license": "MIT"
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
@@ -9327,10 +8881,12 @@
       }
     },
     "node_modules/bs58": {
-      "version": "4.0.1",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-6.0.0.tgz",
+      "integrity": "sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==",
       "license": "MIT",
       "dependencies": {
-        "base-x": "^3.0.2"
+        "base-x": "^5.0.0"
       }
     },
     "node_modules/bser": {
@@ -9580,6 +9136,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -9634,9 +9191,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001572",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001572.tgz",
-      "integrity": "sha512-1Pbh5FLmn5y4+QhNyJE9j3/7dK44dGB83/ZMjv/qJk86TvDbjk0LosiZo0i0WB0Vx607qMX9jYrn1VLHCkN4rw==",
+      "version": "1.0.30001700",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "dev": true,
       "funding": [
         {
@@ -9651,7 +9208,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/canonicalize": {
       "version": "2.0.0",
@@ -10171,6 +9729,7 @@
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -10436,13 +9995,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "dev": true,
@@ -11710,13 +11262,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "dev": true,
@@ -12496,6 +12041,7 @@
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -12582,6 +12128,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -12619,6 +12166,7 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -13227,6 +12775,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.2.4"
       },
@@ -13238,6 +12787,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -14586,10 +14136,6 @@
       "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
       "dev": true
     },
-    "node_modules/fast-json-patch": {
-      "version": "3.1.1",
-      "license": "MIT"
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "dev": true,
@@ -14818,6 +14364,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,
       "funding": [
         {
           "type": "individual",
@@ -14835,6 +14382,7 @@
     },
     "node_modules/for-each": {
       "version": "0.3.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.3"
@@ -14889,23 +14437,6 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/form-data-encoder": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.9.0.tgz",
-      "integrity": "sha512-rahaRMkN8P8d/tgK/BLPX+WBVM27NbvdXBxqQujBtkDAIFspaRqN7Od7lfdGQA6KAD+f82fYCLBq1ipvcu8qLw=="
-    },
-    "node_modules/formdata-node": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
-      "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==",
-      "dependencies": {
-        "node-domexception": "1.0.0",
-        "web-streams-polyfill": "4.0.0-beta.3"
-      },
-      "engines": {
-        "node": ">= 12.20"
-      }
-    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "dev": true,
@@ -14999,6 +14530,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -15048,6 +14580,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
@@ -15222,6 +14755,7 @@
     },
     "node_modules/gopd": {
       "version": "1.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
@@ -15312,6 +14846,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -15321,6 +14856,7 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -15331,6 +14867,7 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -15341,6 +14878,7 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
@@ -15378,6 +14916,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
       "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -16303,20 +15842,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
       "dev": true,
@@ -16379,6 +15904,7 @@
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -16479,19 +16005,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "dev": true,
@@ -16606,13 +16119,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-port-reachable": {
       "version": "4.0.0",
       "dev": true,
@@ -16702,6 +16208,7 @@
     },
     "node_modules/is-typed-array": {
       "version": "1.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
@@ -20604,6 +20111,7 @@
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -21029,6 +20537,7 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash-es": {
@@ -21704,6 +21213,7 @@
     },
     "node_modules/mime-db": {
       "version": "1.51.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -21711,6 +21221,7 @@
     },
     "node_modules/mime-types": {
       "version": "2.1.34",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.51.0"
@@ -21801,17 +21312,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/minim": {
-      "version": "0.23.8",
-      "resolved": "https://registry.npmjs.org/minim/-/minim-0.23.8.tgz",
-      "integrity": "sha512-bjdr2xW1dBCMsMGGsUeqM4eFI60m94+szhxWys+B1ztIt6gWSfeGBdSVCIawezeHYLYn0j6zrsXdQS/JllBzww==",
-      "dependencies": {
-        "lodash": "^4.15.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "dev": true,
@@ -22135,26 +21635,9 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
     "node_modules/node-fetch": {
       "version": "2.6.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
@@ -22173,14 +21656,17 @@
     },
     "node_modules/node-fetch/node_modules/tr46": {
       "version": "0.0.3",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-fetch/node_modules/webidl-conversions": {
       "version": "3.0.1",
+      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/node-fetch/node_modules/whatwg-url": {
       "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
@@ -22792,6 +22278,7 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
       "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -24564,6 +24051,7 @@
     },
     "node_modules/punycode": {
       "version": "1.4.1",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/pure-rand": {
@@ -24596,6 +24084,7 @@
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
       "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
       "dependencies": {
         "side-channel": "^1.0.6"
       },
@@ -24631,30 +24120,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/ramda": {
-      "version": "0.29.1",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.29.1.tgz",
-      "integrity": "sha512-OfxIeWzd4xdUNxlWhgFazxsA/nl3mS4/jGZI5n00uWOoSSFRhC1b6gl6xvmzUamgmqELraWp0J/qqVlXYPDPyA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ramda"
-      }
-    },
-    "node_modules/ramda-adjunct": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ramda-adjunct/-/ramda-adjunct-4.1.1.tgz",
-      "integrity": "sha512-BnCGsZybQZMDGram9y7RiryoRHS5uwx8YeGuUeDKuZuvK38XO6JJfmK85BwRWAKFA6pZ5nZBO/HBFtExVaf31w==",
-      "engines": {
-        "node": ">=0.10.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ramda-adjunct"
-      },
-      "peerDependencies": {
-        "ramda": ">= 0.29.0"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "license": "MIT",
@@ -26053,6 +25518,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -26141,19 +25607,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/short-unique-id": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/short-unique-id/-/short-unique-id-5.0.3.tgz",
-      "integrity": "sha512-yhniEILouC0s4lpH0h7rJsfylZdca10W9mDJRAFh3EpcSUanCHGb0R7kcFOIUCZYSAPo0PUD5ZxWQdW0T4xaug==",
-      "bin": {
-        "short-unique-id": "bin/short-unique-id",
-        "suid": "bin/short-unique-id"
-      }
-    },
     "node_modules/side-channel": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
       "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
@@ -26705,11 +26163,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/stampit": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/stampit/-/stampit-4.3.2.tgz",
-      "integrity": "sha512-pE2org1+ZWQBnIxRPrBM2gVupkuDD0TTNIo1H6GdT/vO82NXli2z8lRE8cu/nBIHrcOCXFBAHpb9ZldrB2/qOA=="
-    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "dev": true,
@@ -27243,30 +26696,6 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/swagger-client": {
-      "version": "3.19.7",
-      "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.19.7.tgz",
-      "integrity": "sha512-5U4+tksrzVODZaLTtivzS9be6u7rX5ZSWFKDIYWsy8HCwt9FH1ANrrGpY1wDHydpOeaySbxMjMaqEM9cGWxOuQ==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.20.13",
-        "@swagger-api/apidom-core": ">=0.69.3 <1.0.0",
-        "@swagger-api/apidom-json-pointer": ">=0.69.3 <1.0.0",
-        "@swagger-api/apidom-ns-openapi-3-1": ">=0.69.3 <1.0.0",
-        "@swagger-api/apidom-reference": ">=0.69.3 <1.0.0",
-        "cookie": "~0.5.0",
-        "cross-fetch": "^3.1.5",
-        "deepmerge": "~4.3.0",
-        "fast-json-patch": "^3.0.0-1",
-        "form-data-encoder": "^1.4.3",
-        "formdata-node": "^4.0.0",
-        "is-plain-object": "^5.0.0",
-        "js-yaml": "^4.1.0",
-        "lodash": "^4.17.21",
-        "qs": "^6.10.2",
-        "traverse": "~0.6.6",
-        "url": "~0.11.0"
-      }
-    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -27732,10 +27161,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/traverse": {
-      "version": "0.6.6",
-      "license": "MIT"
-    },
     "node_modules/treeverse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz",
@@ -27752,11 +27177,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/ts-toolbelt": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz",
-      "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w=="
-    },
     "node_modules/tsconfig": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
@@ -28011,14 +27431,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "node_modules/types-ramda": {
-      "version": "0.29.6",
-      "resolved": "https://registry.npmjs.org/types-ramda/-/types-ramda-0.29.6.tgz",
-      "integrity": "sha512-VJoOk1uYNh9ZguGd3eZvqkdhD4hTGtnjRBUx5Zc0U9ftmnCgiWcSj/lsahzKunbiwRje1MxxNkEy1UdcXRCpYw==",
-      "dependencies": {
-        "ts-toolbelt": "^9.6.0"
-      }
-    },
     "node_modules/uint8array-tools": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.8.tgz",
@@ -28154,11 +27566,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/unraw": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unraw/-/unraw-3.0.0.tgz",
-      "integrity": "sha512-08/DA66UF65OlpUDIQtbJyrqTR0jTAlJ+jsnkQ4jxR7+K5g5YG1APZKQSMCE1vqqmD+2pv6+IdEjmopFatacvg=="
-    },
     "node_modules/untildify": {
       "version": "4.0.0",
       "dev": true,
@@ -28231,15 +27638,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/url": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
-      "dependencies": {
-        "punycode": "^1.4.1",
-        "qs": "^6.11.2"
-      }
-    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -28261,17 +27659,6 @@
         "node": ">=6.14.2"
       }
     },
-    "node_modules/util": {
-      "version": "0.12.5",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "license": "MIT"
@@ -28814,14 +28201,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
-      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/webextension-polyfill": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.12.0.tgz",
@@ -29354,6 +28733,7 @@
     },
     "node_modules/which-typed-array": {
       "version": "1.1.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
diff --git a/package.json b/package.json
index b3889ebbb..06fc6a8c5 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,7 @@
     "i18n:report": "vue-i18n-extract report --vueFiles './src/**/*.?(js|vue)' --languageFiles './src/locales/**/*.json'"
   },
   "dependencies": {
-    "@aeternity/aepp-sdk": "^11.0.1",
-    "@aeternity/aepp-sdk-next": "npm:@aeternity/aepp-sdk@^14.0.0",
+    "@aeternity/aepp-sdk": "^14.0.0",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
     "@aeternity/ledger-app-api": "^0.2.2",
@@ -40,8 +39,6 @@
     "rxjs-etc": "^10.6.2",
     "socket.io-client": "^4.7.5",
     "stream-browserify": "^3.0.0",
-    "swagger-client": "~3.19.7",
-    "util": "^0.12.5",
     "vee-validate": "^2.2.15",
     "vue": "^2.7.16",
     "vue-clickaway": "^2.2.2",
diff --git a/src/components/AeInputAccount.vue b/src/components/AeInputAccount.vue
index 1d87fa3a9..296bbea5c 100644
--- a/src/components/AeInputAccount.vue
+++ b/src/components/AeInputAccount.vue
@@ -57,7 +57,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import { isAddressValid } from '@aeternity/aepp-sdk-next';
+import { isAddressValid } from '@aeternity/aepp-sdk';
 import { AENS_DOMAIN } from '../lib/constants';
 import withFormatting from '../lib/withFormatting';
 import removeSpacesOnCopy from '../directives/removeSpacesOnCopy';
diff --git a/src/components/AeInputName.js b/src/components/AeInputName.js
index b9d38827a..4eea9e4cb 100644
--- a/src/components/AeInputName.js
+++ b/src/components/AeInputName.js
@@ -1,4 +1,4 @@
-import { isNameValid } from '@aeternity/aepp-sdk-next';
+import { isNameValid } from '@aeternity/aepp-sdk';
 import withFormatting from '../lib/withFormatting';
 import { AENS_DOMAIN } from '../lib/constants';
 import AeInput from './AeInput.vue';
diff --git a/src/components/mobile/ConfirmTransactionSignModal.vue b/src/components/mobile/ConfirmTransactionSignModal.vue
index 9bbee4373..eaea6cd43 100644
--- a/src/components/mobile/ConfirmTransactionSignModal.vue
+++ b/src/components/mobile/ConfirmTransactionSignModal.vue
@@ -31,7 +31,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import { Tag, isAuctionName } from '@aeternity/aepp-sdk-next';
+import { Tag, isAuctionName } from '@aeternity/aepp-sdk';
 import Page from '../Page.vue';
 import Guide from '../Guide.vue';
 import AeFraction from '../AeFraction.vue';
diff --git a/src/components/mobile/details-fields.js b/src/components/mobile/details-fields.js
index 95b28cba1..79cfd1857 100644
--- a/src/components/mobile/details-fields.js
+++ b/src/components/mobile/details-fields.js
@@ -1,4 +1,4 @@
-import { decode, Encoding } from '@aeternity/aepp-sdk-next';
+import { decode, Encoding } from '@aeternity/aepp-sdk';
 import { i18n } from '../../store/plugins/ui/languages';
 import DetailsRawData from './DetailsRawData.vue';
 import DetailsAddress from './DetailsAddress.vue';
diff --git a/src/lib/airGap.js b/src/lib/airGap.js
index 7a2b68fa8..dc4a33bb6 100644
--- a/src/lib/airGap.js
+++ b/src/lib/airGap.js
@@ -1,4 +1,4 @@
-import { decode, encode, Encoding } from '@aeternity/aepp-sdk-next';
+import { decode, encode, Encoding } from '@aeternity/aepp-sdk';
 import { decode as rlpDecode, encode as rlpEncode } from 'rlp';
 
 function encodeBase58Check(data) {
diff --git a/src/lib/sdkWallet.js b/src/lib/sdkWallet.js
new file mode 100644
index 000000000..c8fbddef7
--- /dev/null
+++ b/src/lib/sdkWallet.js
@@ -0,0 +1,260 @@
+import {
+  MemoryAccount,
+  AeSdkWallet,
+  Node,
+  BrowserWindowMessageConnection,
+  WALLET_TYPE,
+  RpcRejectedByUserError,
+  RpcNoNetworkById,
+  RpcNotAuthorizeError,
+  encode,
+  Encoding,
+  SUBSCRIPTION_TYPES,
+} from '@aeternity/aepp-sdk';
+
+function isRejectedByUserError(error) {
+  return ['Rejected by user', 'Cancelled by user'].includes(error.message);
+}
+
+class AccountStore extends MemoryAccount {
+  #store;
+
+  constructor(address, store) {
+    super(encode(Buffer.alloc(32), Encoding.AccountSecretKey));
+    this.address = address;
+    this.#store = store;
+  }
+
+  async #switchAccount() {
+    const initialAccountIdx = this.#store.state.accounts.activeIdx;
+    const requiredAccountIdx = this.#store.state.accounts.list.findIndex(
+      ({ address }) => address === this.address,
+    );
+    await this.#store.dispatch('accounts/setActiveIdx', requiredAccountIdx);
+    return () => this.#store.dispatch('accounts/setActiveIdx', initialAccountIdx);
+  }
+
+  async sign(data, { signal } = {}) {
+    const restore = await this.#switchAccount();
+    try {
+      return await this.#store.dispatch('accounts/sign', { data, signal });
+    } catch (error) {
+      if (isRejectedByUserError(error)) throw new RpcRejectedByUserError();
+      throw error;
+    } finally {
+      await restore();
+    }
+  }
+
+  async signTransaction(transaction, { signal } = {}) {
+    const restore = await this.#switchAccount();
+    try {
+      return await this.#store.dispatch('accounts/signTransaction', { transaction, signal });
+    } catch (error) {
+      if (isRejectedByUserError(error)) throw new RpcRejectedByUserError();
+      throw error;
+    } finally {
+      await restore();
+    }
+  }
+}
+
+function setupNodeWatch(store, sdk) {
+  return store.watch(
+    (_state, { node }) => node,
+    (node) => {
+      sdk.pool = new Map([['node', node]]);
+      sdk.selectNode('node');
+    },
+    { immediate: true },
+  );
+}
+
+function setupAccountsWatch(store, sdk, host, aeppId) {
+  const getAccessibleAddresses = () =>
+    store.getters.getApp(host)?.permissions.accessToAccounts ?? [];
+  const getCurrentAddress = () => store.getters['accounts/active'].address;
+
+  const unwatchAppAddresses = store.watch(
+    () => getAccessibleAddresses(),
+    (addresses) => {
+      sdk.accounts = Object.fromEntries(
+        addresses.map((address) => [address, new AccountStore(address, store)]),
+      );
+      if (addresses.length) {
+        const address = getCurrentAddress();
+        sdk.selectAccount(sdk.accounts[address] ? address : addresses[0]);
+      } else sdk._pushAccountsToApps();
+    },
+    { immediate: true },
+  );
+
+  let accountAccessPromise;
+  function ensureCurrentAccountAccess() {
+    async function ensureCurrentAccountAccessPure() {
+      if (getAccessibleAddresses().includes(getCurrentAddress())) return;
+
+      const controller = new AbortController();
+      const unsubscribe = store.watch(
+        () => [getCurrentAddress(), getAccessibleAddresses()],
+        ([address, allowed]) => allowed.includes(address) && controller.abort(),
+      );
+      try {
+        await store.dispatch('modals/open', {
+          name: 'confirmAccountAccess',
+          signal: controller.signal,
+          appHost: host,
+        });
+      } catch (error) {
+        if (error.message === 'Modal aborted') return;
+        throw error;
+      } finally {
+        unsubscribe();
+      }
+
+      const accountAddress = getCurrentAddress();
+      if (!getAccessibleAddresses().includes(accountAddress)) {
+        store.commit('toggleAccessToAccount', { appHost: host, accountAddress });
+      }
+    }
+
+    accountAccessPromise ??= ensureCurrentAccountAccessPure().finally(() => {
+      accountAccessPromise = null;
+    });
+    return accountAccessPromise;
+  }
+
+  const unwatchCurrentAddress = store.watch(
+    () => getCurrentAddress(),
+    async (address) => {
+      if (getAccessibleAddresses().includes(address)) {
+        sdk.selectAccount(address);
+        return;
+      }
+      const client = sdk._getClient(aeppId);
+      if (client.addressSubscription.size === 0) return;
+      ensureCurrentAccountAccess();
+    },
+    { immediate: true },
+  );
+
+  return [
+    ensureCurrentAccountAccess,
+    () => [unwatchAppAddresses, unwatchCurrentAddress].forEach((unwatch) => unwatch()),
+  ];
+}
+
+function setupConnection(target, sdk) {
+  const connection = new BrowserWindowMessageConnection({ target });
+  const aeppId = sdk.addRpcClient(connection);
+  sdk.shareWalletInfo(aeppId);
+  const intervalId = setInterval(() => sdk.shareWalletInfo(aeppId), 3000);
+  return [
+    aeppId,
+    () => {
+      clearInterval(intervalId);
+      if (sdk._clients.has(aeppId)) sdk.removeRpcClient(aeppId);
+    },
+  ];
+}
+
+export default (store, target, host) => {
+  let aeppInfo;
+  let authAeppId;
+  let ensureCurrentAccountAccess;
+  let unbindConnection;
+  let unbindAccounts;
+
+  function ensureAuthorized(aeppId, origin) {
+    const originHost = new URL(origin).host;
+    host ??= originHost;
+    if (originHost === host && aeppId === authAeppId) return;
+    throw new RpcNotAuthorizeError();
+  }
+
+  function confirmAction(action) {
+    const res = confirm(`Aepp "${aeppInfo.name}" at ${origin} is requesting ${action}`);
+    if (res === false) throw new RpcRejectedByUserError();
+  }
+
+  const sdk = new AeSdkWallet({
+    id: window.origin,
+    type: WALLET_TYPE.window,
+    name: 'Base Aepp',
+    onConnection: (aeppId, params, origin) => {
+      ensureAuthorized(aeppId, origin);
+      aeppInfo = params;
+      [ensureCurrentAccountAccess, unbindAccounts] = setupAccountsWatch(store, sdk, host, aeppId);
+    },
+    onSubscription: (aeppId, params, origin) => {
+      ensureAuthorized(aeppId, origin);
+      if (params.type === SUBSCRIPTION_TYPES.subscribe) void ensureCurrentAccountAccess();
+    },
+    onAskAccounts: async (aeppId, _params, origin) => {
+      ensureAuthorized(aeppId, origin);
+      try {
+        await ensureCurrentAccountAccess();
+      } catch (error) {
+        if (isRejectedByUserError(error)) throw new RpcRejectedByUserError();
+        throw error;
+      }
+    },
+    onAskToSelectNetwork: async (aeppId, parameters, origin) => {
+      ensureAuthorized(aeppId, origin);
+
+      function switchToNetwork({ name, url, networkId }) {
+        const details = [url, networkId].filter(Boolean).join(', ');
+        confirmAction(`a network switch to ${name} (${details})`);
+        store.commit('setSdkUrl', url);
+      }
+
+      if (parameters.networkId) {
+        const network = (
+          await Promise.allSettled(
+            store.getters.networks.map(async (network) => ({
+              ...network,
+              networkId: await new Node(network.url, { retryCount: 0 }).getNetworkId(),
+            })),
+          )
+        )
+          .filter(({ status }) => status === 'fulfilled')
+          .map(({ value }) => value)
+          .find(({ networkId }) => networkId === parameters.networkId);
+        if (network == null) throw new RpcNoNetworkById(parameters.networkId);
+        switchToNetwork(network);
+        return;
+      }
+
+      const network = store.getters.networks.find(
+        ({ url }) => new URL(url).toString() === new URL(parameters.nodeUrl).toString(),
+      );
+      if (network) {
+        switchToNetwork(network);
+        return;
+      }
+
+      const networkId = await new Node(parameters.nodeUrl, { retryCount: 0 }).getNetworkId();
+      confirmAction(`a network switch to ${parameters.nodeUrl} (${networkId})`);
+      store.commit('addNetwork', {
+        name: `By ${host}`,
+        url: parameters.nodeUrl,
+      });
+      store.commit('setSdkUrl', parameters.nodeUrl);
+    },
+    onDisconnect: (aeppId, params) => {
+      unbindConnection();
+      unbindAccounts();
+      [authAeppId, unbindConnection] = setupConnection(target, sdk);
+    },
+  });
+
+  const unbindNodeWatch = setupNodeWatch(store, sdk);
+
+  [authAeppId, unbindConnection] = setupConnection(target, sdk);
+
+  return () => {
+    unbindConnection();
+    unbindAccounts?.();
+    unbindNodeWatch();
+  };
+};
diff --git a/src/lib/spendTxFees.js b/src/lib/spendTxFees.js
index 9a8c2afbc..872579b0e 100644
--- a/src/lib/spendTxFees.js
+++ b/src/lib/spendTxFees.js
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { buildTx, unpackTx, Tag } from '@aeternity/aepp-sdk-next';
+import { buildTx, unpackTx, Tag } from '@aeternity/aepp-sdk';
 import { MAGNITUDE, MAGNITUDE_MICRO } from './constants';
 
 const STUB_ADDRESS = 'ak_enAPooFqpTQKkhJmU47J16QZu9HbPQQPwWBVeGnzDbDnv9dxp';
diff --git a/src/pages/aens/AuctionBid.vue b/src/pages/aens/AuctionBid.vue
index eac0acb3a..473e766be 100644
--- a/src/pages/aens/AuctionBid.vue
+++ b/src/pages/aens/AuctionBid.vue
@@ -75,7 +75,7 @@
 import { pick, debounce } from 'lodash-es';
 import BigNumber from 'bignumber.js';
 import { mapGetters } from 'vuex';
-import { Name } from '@aeternity/aepp-sdk-next';
+import { Name } from '@aeternity/aepp-sdk';
 import { MAGNITUDE } from '../../lib/constants';
 import blocksToRelativeTime from '../../filters/blocksToRelativeTime';
 import Page from '../../components/Page.vue';
diff --git a/src/pages/aens/AuctionDetails.vue b/src/pages/aens/AuctionDetails.vue
index f03ffe1a5..2013d2059 100644
--- a/src/pages/aens/AuctionDetails.vue
+++ b/src/pages/aens/AuctionDetails.vue
@@ -41,7 +41,7 @@
 <script>
 import BigNumber from 'bignumber.js';
 import { pick } from 'lodash-es';
-import { produceNameId } from '@aeternity/aepp-sdk-next';
+import { produceNameId } from '@aeternity/aepp-sdk';
 import blocksToRelativeTime from '../../filters/blocksToRelativeTime';
 import Page from '../../components/Page.vue';
 import AeSpinner from '../../components/AeSpinner.vue';
diff --git a/src/pages/aens/NameDetails.vue b/src/pages/aens/NameDetails.vue
index e8098fdf7..1e560e001 100644
--- a/src/pages/aens/NameDetails.vue
+++ b/src/pages/aens/NameDetails.vue
@@ -31,7 +31,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex';
-import { produceNameId } from '@aeternity/aepp-sdk-next';
+import { produceNameId } from '@aeternity/aepp-sdk';
 import prefixedAmount from '../../filters/prefixedAmount';
 import Page from '../../components/Page.vue';
 import DetailsList from '../../components/mobile/DetailsList.vue';
@@ -99,12 +99,14 @@ export default {
       const requiredAccountIdx = this.$store.state.accounts.list.findIndex(
         ({ address }) => address === this.details.owner,
       );
-      if (initialAccountIdx !== requiredAccountIdx) {
-        this.$store.commit('accounts/setActiveIdx', requiredAccountIdx);
-      }
-      await this.$store.dispatch('names/updatePointer', { name: this.name, address: this.address });
-      if (initialAccountIdx !== requiredAccountIdx) {
-        this.$store.commit('accounts/setActiveIdx', initialAccountIdx);
+      await this.$store.dispatch('accounts/setActiveIdx', requiredAccountIdx);
+      try {
+        await this.$store.dispatch('names/updatePointer', {
+          name: this.name,
+          address: this.address,
+        });
+      } finally {
+        await this.$store.dispatch('accounts/setActiveIdx', initialAccountIdx);
       }
     },
     async goToTransactionDetails() {
diff --git a/src/pages/aens/NameList.vue b/src/pages/aens/NameList.vue
index e05697ffd..786b8ac6a 100644
--- a/src/pages/aens/NameList.vue
+++ b/src/pages/aens/NameList.vue
@@ -41,7 +41,7 @@
 import { mapState } from 'vuex';
 import BigNumber from 'bignumber.js';
 import { uniq } from 'lodash-es';
-import { isNameValid, isAuctionName, Node } from '@aeternity/aepp-sdk-next';
+import { isNameValid, isAuctionName, Node } from '@aeternity/aepp-sdk';
 import Page from '../../components/Page.vue';
 import NameListHeader from '../../components/mobile/NameListHeader.vue';
 import AeCard from '../../components/AeCard.vue';
diff --git a/src/pages/aens/NameNew.vue b/src/pages/aens/NameNew.vue
index 7f4ac3b01..a28060730 100644
--- a/src/pages/aens/NameNew.vue
+++ b/src/pages/aens/NameNew.vue
@@ -39,7 +39,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { Name, isAuctionName } from '@aeternity/aepp-sdk-next';
+import { Name, isAuctionName } from '@aeternity/aepp-sdk';
 import { handleUnknownError, isNotFoundError } from '../../lib/utils';
 import { i18n } from '../../store/plugins/ui/languages';
 import Page from '../../components/Page.vue';
diff --git a/src/pages/aens/NameTransfer.vue b/src/pages/aens/NameTransfer.vue
index 5a629613c..e801e8cc8 100644
--- a/src/pages/aens/NameTransfer.vue
+++ b/src/pages/aens/NameTransfer.vue
@@ -51,7 +51,7 @@
 <script>
 import { mapState, mapGetters } from 'vuex';
 import { defer } from 'lodash-es';
-import { Name } from '@aeternity/aepp-sdk-next';
+import { Name } from '@aeternity/aepp-sdk';
 import { handleUnknownError, getAddressByNameEntry } from '../../lib/utils';
 import Page from '../../components/Page.vue';
 import Guide from '../../components/Guide.vue';
diff --git a/src/pages/mobile/AppBrowser.vue b/src/pages/mobile/AppBrowser.vue
index d7de2e1fb..73bb83522 100644
--- a/src/pages/mobile/AppBrowser.vue
+++ b/src/pages/mobile/AppBrowser.vue
@@ -41,7 +41,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import BrowserWindowMessageConnection from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-window-message';
+import sdkWallet from '../../lib/sdkWallet';
 import { PROTOCOLS_ALLOWED, PROTOCOL_DEFAULT } from '../../lib/constants';
 import UrlForm from '../../components/mobile/UrlForm.vue';
 import ButtonPlain from '../../components/ButtonPlain.vue';
@@ -92,23 +92,14 @@ export default {
     }),
   },
   async mounted() {
-    const sdk = await this.$store.state.sdk;
-
-    const connection = BrowserWindowMessageConnection({ target: this.$refs.iframe.contentWindow });
-    sdk.addRpcClient(connection);
-    const shareWalletInfoInterval = setInterval(
-      () => sdk.shareWalletInfo(connection.sendMessage.bind(connection)),
-      3000,
-    );
-
+    const unbind = sdkWallet(this.$store, this.$refs.iframe.contentWindow, this.host);
     const handler = () => {
       this.showMenu = false;
     };
     window.addEventListener('blur', handler);
     this.$once('hook:destroyed', () => {
       window.removeEventListener('blur', handler);
-      clearInterval(shareWalletInfoInterval);
-      Object.keys(sdk.rpcClients).forEach((id) => sdk.removeRpcClient(id));
+      unbind();
     });
   },
   methods: {
diff --git a/src/pages/mobile/RedeemBalance.vue b/src/pages/mobile/RedeemBalance.vue
index 70b320092..4a52dbb1f 100644
--- a/src/pages/mobile/RedeemBalance.vue
+++ b/src/pages/mobile/RedeemBalance.vue
@@ -31,7 +31,7 @@
 <script>
 import { pick } from 'lodash-es';
 import BigNumber from 'bignumber.js';
-import { encode, Encoding, MemoryAccount, transferFunds } from '@aeternity/aepp-sdk-next';
+import { encode, Encoding, MemoryAccount, transferFunds } from '@aeternity/aepp-sdk';
 import { handleUnknownError } from '../../lib/utils';
 import AeSpinner from '../../components/AeSpinner.vue';
 import Page from '../../components/Page.vue';
diff --git a/src/store/index.js b/src/store/index.js
index 0c233f764..f09268027 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,7 +11,6 @@ import accountsModule from './modules/accounts';
 import runMigrations from './migrations';
 import persistState from './plugins/persistState';
 import remoteConnection from './plugins/remoteConnection';
-import initSdk from './plugins/initSdk';
 import sdk from './plugins/sdk';
 import registerServiceWorker from './plugins/registerServiceWorker';
 import reverseIframe from './plugins/reverseIframe';
@@ -50,6 +49,7 @@ export default new Vuex.Store({
           list: list.map(({ address, source }) => {
             switch (source.type) {
               case 'hd-wallet':
+              case 'hd-wallet-desktop':
                 return {
                   address,
                   source: pick(source, ['type', 'idx']),
@@ -79,7 +79,6 @@ export default new Vuex.Store({
             }),
       }),
     ),
-    initSdk,
     sdk,
     ...(RUNNING_IN_POPUP
       ? []
@@ -88,7 +87,7 @@ export default new Vuex.Store({
           registerServiceWorker,
           reverseIframe,
           ...(ENV_MOBILE_DEVICE ? [] : [syncLedgerAccounts]),
-          ...(RUNNING_IN_FRAME ? [unlockWalletIfNotEncrypted] : []),
+          ...(RUNNING_IN_FRAME || !ENV_MOBILE_DEVICE ? [unlockWalletIfNotEncrypted] : []),
         ]),
   ],
 
diff --git a/src/store/modules/accounts/airGap.js b/src/store/modules/accounts/airGap.js
index f11f36c58..b4b060974 100644
--- a/src/store/modules/accounts/airGap.js
+++ b/src/store/modules/accounts/airGap.js
@@ -1,4 +1,4 @@
-import { encode, Encoding } from '@aeternity/aepp-sdk-next';
+import { encode, Encoding } from '@aeternity/aepp-sdk';
 import { getDesktopRemoteSignAction } from './utils';
 import {
   getPublicKeyByResponseUrl,
@@ -102,12 +102,9 @@ export default {
           );
         },
 
-        async signTransaction(
-          { rootState: { sdk }, rootGetters, dispatch },
-          { transaction, signal },
-        ) {
+        async signTransaction({ rootGetters, dispatch }, { transaction, signal }) {
           const requestUrl = generateSignRequestUrl(
-            sdk.getNetworkId(),
+            await rootGetters.node.getNetworkId(),
             transaction,
             rootGetters['accounts/active'].source.publicKey,
           );
diff --git a/src/store/modules/accounts/hdWallet.js b/src/store/modules/accounts/hdWallet.js
index 25c923a8a..f527c0aa4 100644
--- a/src/store/modules/accounts/hdWallet.js
+++ b/src/store/modules/accounts/hdWallet.js
@@ -9,7 +9,7 @@ import {
   decode,
   Encoding,
   MemoryAccount,
-} from '@aeternity/aepp-sdk-next';
+} from '@aeternity/aepp-sdk';
 import BigNumber from 'bignumber.js';
 import { MAGNITUDE } from '../../../lib/constants';
 import {
diff --git a/src/store/modules/accounts/index.js b/src/store/modules/accounts/index.js
index 161bdd30c..68316c496 100644
--- a/src/store/modules/accounts/index.js
+++ b/src/store/modules/accounts/index.js
@@ -67,6 +67,11 @@ export default {
   },
 
   actions: {
+    setActiveIdx({ commit, state }, activeIdx) {
+      if (state.activeIdx === activeIdx) return;
+      commit('setActiveIdx', activeIdx);
+    },
+
     sign({ getters: { active, getModule }, dispatch }, { data, signal }) {
       return dispatch(`${getModule(active).name}/sign`, { data, signal });
     },
diff --git a/src/store/modules/accounts/ledger.js b/src/store/modules/accounts/ledger.js
index 13d86a0d4..603365540 100644
--- a/src/store/modules/accounts/ledger.js
+++ b/src/store/modules/accounts/ledger.js
@@ -1,6 +1,6 @@
 import TransportWebUSB from '@ledgerhq/hw-transport-webusb';
 import Ae from '@aeternity/ledger-app-api';
-import { buildTx, decode, Tag } from '@aeternity/aepp-sdk-next';
+import { buildTx, decode, Tag } from '@aeternity/aepp-sdk';
 import { i18n } from '../../plugins/ui/languages';
 import { swallowModalAborted } from '../../plugins/ui/modals';
 import { RUNNING_IN_FRAME } from '../../../lib/constants';
@@ -123,10 +123,7 @@ export default {
           throw new Error('Not implemented yet');
         },
 
-        async signTransaction(
-          { rootGetters, dispatch, rootState: { sdk } },
-          { transaction, signal },
-        ) {
+        async signTransaction({ rootGetters, dispatch }, { transaction, signal }) {
           await dispatch('ensureCurrentAccountAvailable');
 
           const signatureHex = await dispatch('request', {
@@ -134,7 +131,7 @@ export default {
             args: [
               rootGetters['accounts/active'].source.idx,
               decode(transaction),
-              sdk.getNetworkId(),
+              await rootGetters.node.getNetworkId(),
             ],
             signal,
           });
diff --git a/src/store/plugins/initSdk.js b/src/store/plugins/initSdk.js
deleted file mode 100644
index 544f93223..000000000
--- a/src/store/plugins/initSdk.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import { isEqual } from 'lodash-es';
-import { handleUnknownError } from '../../lib/utils';
-
-export default (store) => {
-  const createSdk = async (network) => {
-    const [{
-      Ae, ChainNode, Transaction, Contract, Aens, Node,
-    }, {
-      default: WalletRPC,
-    }] = (await Promise.all([
-      import(/* webpackChunkName: "sdk" */ '@aeternity/aepp-sdk'),
-      import(/* webpackChunkName: "sdk" */ '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/wallet-rpc'),
-    ]));
-
-    class App {
-      constructor(host) {
-        this.host = host;
-      }
-
-      async #ensureCurrentAccountAccessPure() {
-        const accessToAccounts = store.getters.getApp(this.host)?.permissions.accessToAccounts ?? [];
-        if (accessToAccounts.includes(store.getters['accounts/active'].address)) return;
-
-        const controller = new AbortController();
-        const unsubscribe = store.watch(
-          (_state, getters) => getters['accounts/active'].address,
-          (address) => accessToAccounts.includes(address) && controller.abort(),
-        );
-        try {
-          await store.dispatch(
-            'modals/open',
-            { name: 'confirmAccountAccess', signal: controller.signal, appHost: this.host },
-          );
-        } catch (error) {
-          if (error.message === 'Modal aborted') return;
-          throw error;
-        } finally {
-          unsubscribe();
-        }
-
-        const { address: accountAddress } = store.getters['accounts/active'];
-        if (!accessToAccounts.includes(accountAddress)) {
-          store.commit('toggleAccessToAccount', { appHost: this.host, accountAddress });
-        }
-      }
-
-      ensureCurrentAccountAccess() {
-        this.accountAccessPromise ??= this.#ensureCurrentAccountAccessPure().finally(() => {
-          delete this.accountAccessPromise;
-        });
-        return this.accountAccessPromise;
-      }
-    }
-
-    const apps = {};
-
-    const methods = {
-      getApp(host) {
-        if (!apps[host]) apps[host] = new App(host);
-        return apps[host];
-      },
-      async address(...args) {
-        if (args[args.length - 1] instanceof App) {
-          await args[args.length - 1].ensureCurrentAccountAccess();
-        }
-        return store.getters['accounts/active'].address;
-      },
-      sign: (data, { signal }) => store.dispatch('accounts/sign', { data, signal }),
-      signTransaction: (transaction, { signal }) => store.dispatch('accounts/signTransaction', { transaction, signal }),
-    };
-
-    const acceptCb = (_, { accept }) => accept();
-    const sdk = await Ae.compose(ChainNode, Transaction, Contract, Aens, WalletRPC, { methods })({
-      nodes: [{
-        name: network.name,
-        instance: await Node({ url: network.url, ignoreVersion: true }),
-      }],
-      name: 'Base Aepp',
-      onConnection: acceptCb,
-      async onSubscription(_, { accept }, origin) {
-        const activeAccount = await this.address(this.getApp(origin));
-        accept({
-          accounts: {
-            current: { [activeAccount]: {} },
-            connected: Object.fromEntries(
-              store.state.accounts.list
-                .filter(({ address }) => address !== activeAccount)
-                .map(({ address }) => [address, {}]),
-            ),
-          },
-        });
-      },
-      async onSign(_, { accept }) {
-        accept(null, {
-          onAccount: { sign: () => {}, address: () => {} },
-        });
-      },
-      onMessageSign: acceptCb,
-      onAskAccounts: acceptCb,
-      onDisconnect() {
-        Object.keys(this.rpcClients).forEach((id) => this.removeRpcClient(id));
-      },
-    });
-    // TODO: remove after updating sdk
-    sdk.Ae.defaults.verify = false;
-
-    // backported fix https://github.com/aeternity/aepp-sdk-js/pull/1980
-    const { getWalletInfo } = sdk;
-    sdk.getWalletInfo = () => {
-      const { origin, ...info } = getWalletInfo.call(sdk);
-      return {
-        ...info,
-        origin: 'file://' === info.origin ? '*' : info.origin,
-      };
-    }
-
-    sdk.selectNode(network.name);
-    return sdk;
-  };
-
-  const recreateSdk = async () => {
-    const { currentNetwork } = store.getters;
-    if (store.state.sdk && !store.state.sdk.then) store.state.sdk.destroyInstance();
-    const sdkPromise = createSdk(currentNetwork);
-    const sdkThenable = { then: sdkPromise.then.bind(sdkPromise) };
-    store.commit('setSdk', sdkThenable);
-    const sdk = await sdkThenable.then((s) => s, (error) => {
-      handleUnknownError(error);
-      return null;
-    });
-    if (sdkThenable.then === store.state.sdk.then) store.commit('setSdk', sdk);
-    else if (sdk) sdk.destroyInstance();
-  };
-
-  let lastNetwork;
-
-  store.watch(
-    ({ onLine }, { currentNetwork }) => ({ ...currentNetwork, onLine }),
-    async (currentNetwork) => {
-      if (isEqual(currentNetwork, lastNetwork)) return;
-      lastNetwork = currentNetwork;
-      await recreateSdk();
-    },
-    { immediate: true },
-  );
-
-  let syncAccountsPromise = Promise.resolve();
-
-  store.watch(
-    ({ sdk, accounts: { list } }) => [sdk, list],
-    async ([sdk, list]) => {
-      syncAccountsPromise = (async () => {
-        if (sdk == null) return;
-        await sdk;
-        store.commit('setSdkAccounts', list);
-      })();
-      await syncAccountsPromise;
-    },
-  );
-
-  store.watch(
-    (_state, getters) => getters['accounts/active']?.address,
-    async (address) => {
-      await store.state.sdk;
-      await syncAccountsPromise;
-      store.commit('selectSdkAccount', address);
-    },
-  );
-};
diff --git a/src/store/plugins/reverseIframe.js b/src/store/plugins/reverseIframe.js
index 93b16d586..287e51f77 100644
--- a/src/store/plugins/reverseIframe.js
+++ b/src/store/plugins/reverseIframe.js
@@ -1,4 +1,5 @@
-import BrowserWindowMessageConnection from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-window-message';
+import { defer } from 'lodash-es';
+import sdkWallet from '../../lib/sdkWallet';
 import { RUNNING_IN_FRAME } from '../../lib/constants';
 
 const modals = {
@@ -7,18 +8,8 @@ const modals = {
   confirmSign: true,
 };
 
-export default (store) => {
+export default async (store) => {
   if (!RUNNING_IN_FRAME) return;
-  const unsubscribe = store.watch(
-    ({ sdk }, getters) => [sdk && !sdk.then && getters['accounts/active'], sdk],
-    ([ready, sdk]) => {
-      if (!ready) return;
-      const connection = BrowserWindowMessageConnection({ target: window.parent });
-      sdk.addRpcClient(connection);
-      sdk.shareWalletInfo(connection.sendMessage.bind(connection));
-      unsubscribe();
-    },
-  );
 
   store.registerModule('modals', {
     namespaced: true,
@@ -34,4 +25,19 @@ export default (store) => {
       },
     },
   });
+
+  await new Promise((resolve) => {
+    const unsubscribe = store.watch(
+      (_store, getters) => getters['accounts/active'],
+      async (ready) => {
+        if (!ready) return;
+        await new Promise((resolve) => defer(resolve));
+        unsubscribe();
+        resolve();
+      },
+      { immediate: true },
+    );
+  });
+
+  sdkWallet(store, window.parent);
 };
diff --git a/src/store/plugins/sdk.js b/src/store/plugins/sdk.js
index 5e1e1f61e..73ae8fbc0 100644
--- a/src/store/plugins/sdk.js
+++ b/src/store/plugins/sdk.js
@@ -1,5 +1,5 @@
 import { isPlainObject, camelCase } from 'lodash-es';
-import { Node, Middleware as MiddlewareOriginal, AeSdkMethods, AccountBase } from '@aeternity/aepp-sdk-next';
+import { Node, Middleware as MiddlewareOriginal, AeSdkMethods, AccountBase } from '@aeternity/aepp-sdk';
 
 class Middleware extends MiddlewareOriginal {
   async sendOperationRequest(args, spec) {
diff --git a/src/store/plugins/ui/names.js b/src/store/plugins/ui/names.js
index b5de24755..e65f41a31 100644
--- a/src/store/plugins/ui/names.js
+++ b/src/store/plugins/ui/names.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { isAddressValid, Name, produceNameId } from '@aeternity/aepp-sdk-next';
+import { isAddressValid, Name, produceNameId } from '@aeternity/aepp-sdk';
 import { getAddressByNameEntry, isAensName } from '../../../lib/utils';
 
 export default (store) => {
@@ -127,8 +127,8 @@ export default (store) => {
 
         commit('setOwned', names);
       },
-      setDefault({ rootState: { sdk }, commit }, { name, address }) {
-        commit('setDefault', { name, address, networkId: sdk.getNetworkId() });
+      async setDefault({ rootGetters: { node }, commit }, { name, address }) {
+        commit('setDefault', { name, address, networkId: await node.getNetworkId() });
       },
       async updatePointer({
         rootGetters, state, commit, dispatch,
diff --git a/src/store/plugins/ui/veeValidate.js b/src/store/plugins/ui/veeValidate.js
index ae1ae5c90..6af05dbde 100644
--- a/src/store/plugins/ui/veeValidate.js
+++ b/src/store/plugins/ui/veeValidate.js
@@ -5,7 +5,7 @@ import {
 } from 'vee-validate/dist/rules.esm';
 import BigNumber from 'bignumber.js';
 import { debounce } from 'lodash-es';
-import { isAddressValid } from '@aeternity/aepp-sdk-next';
+import { isAddressValid } from '@aeternity/aepp-sdk';
 import { validateMnemonic } from '@aeternity/bip39';
 import { i18n } from './languages';
 import {
diff --git a/src/store/utils.js b/src/store/utils.js
index 9d0cf7051..19f53ac6d 100644
--- a/src/store/utils.js
+++ b/src/store/utils.js
@@ -1,5 +1,5 @@
 import { derivePathFromKey, getKeyPair } from '@aeternity/hd-wallet/src/hd-key';
-import { encode, Encoding } from '@aeternity/aepp-sdk-next';
+import { encode, Encoding } from '@aeternity/aepp-sdk';
 
 export const genRandomBuffer = (size) => {
   const key = new ArrayBuffer(size);
diff --git a/tests/e2e/specs/__image_snapshots__/Deep links Get address returns #0.png b/tests/e2e/specs/__image_snapshots__/Deep links Get address returns #0.png
new file mode 100644
index 000000000..aa1732a92
Binary files /dev/null and b/tests/e2e/specs/__image_snapshots__/Deep links Get address returns #0.png differ
diff --git a/tests/e2e/specs/__image_snapshots__/Deep links Sign raw data signs #0.png b/tests/e2e/specs/__image_snapshots__/Deep links Sign raw data signs #0.png
new file mode 100644
index 000000000..2ac209a06
Binary files /dev/null and b/tests/e2e/specs/__image_snapshots__/Deep links Sign raw data signs #0.png differ
diff --git a/tests/e2e/specs/deep-links.cy.js b/tests/e2e/specs/deep-links.cy.js
index d7ed96c91..9fd2dbdac 100644
--- a/tests/e2e/specs/deep-links.cy.js
+++ b/tests/e2e/specs/deep-links.cy.js
@@ -1,4 +1,4 @@
-import { verify } from '@aeternity/aepp-sdk-next';
+import { verify } from '@aeternity/aepp-sdk';
 
 describe('Deep links', () => {
   const signer = 'ak_2ujJ8N4GdKapdE2a7aEy4Da3pfPdV7EtJdaA7BUpJ8uqgkQdEB';
diff --git a/tests/e2e/specs/transfer/sign-transaction.cy.js b/tests/e2e/specs/transfer/sign-transaction.cy.js
index d20529a6f..b8960f1e2 100644
--- a/tests/e2e/specs/transfer/sign-transaction.cy.js
+++ b/tests/e2e/specs/transfer/sign-transaction.cy.js
@@ -8,7 +8,7 @@ import {
   Encoding,
   ORACLE_TTL_TYPES,
   oracleQueryId,
-} from '@aeternity/aepp-sdk-next';
+} from '@aeternity/aepp-sdk';
 
 describe('Sign transaction', () => {
   const nonce = 1;
diff --git a/tests/e2e/utils.js b/tests/e2e/utils.js
index 6448d1ddf..0ca7411f7 100644
--- a/tests/e2e/utils.js
+++ b/tests/e2e/utils.js
@@ -1,4 +1,4 @@
-import { AeSdk, Node, MemoryAccount } from '@aeternity/aepp-sdk-next';
+import { AeSdk, Node, MemoryAccount } from '@aeternity/aepp-sdk';
 
 export const aeSdk = new AeSdk({
   nodes: [
diff --git a/vue.config.js b/vue.config.js
index 8447e6053..d38fc8fd1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,7 +22,6 @@ module.exports = {
       fallback: {
         stream: require.resolve('stream-browserify'),
         buffer: require.resolve('buffer/'),
-        util: require.resolve('util/'),
       },
     },
     plugins: [new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] })],