From ef77f728d6515d1b8d812e7745d17f5b63dd18cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren?= <hello@soerenschwert.de>
Date: Thu, 14 Nov 2024 20:42:59 -0600
Subject: [PATCH] Update everything to @nimiq/core@next

---
 client/package.json                           |   2 +-
 client/src/Observable.ts                      |   2 +-
 client/src/PublicRequest.ts                   |   9 +-
 client/yarn.lock                              |  30 +++++-
 demos/DerivePolygonAddress.html               |   4 +-
 demos/Export.html                             |   6 +-
 demos/LanguagePicker.html                     |   2 +-
 demos/LoginFile.html                          |   2 +-
 demos/PasswordInput.html                      |   2 +-
 demos/RemoveKey.html                          |   4 +-
 demos/SignTransaction.html                    |   4 +-
 demos/setup.html                              |   2 +-
 karma.conf.coverage.js                        |   5 +-
 karma.conf.js                                 |   5 +-
 package.json                                  |   2 +-
 serve.js                                      |   3 +-
 src/common.js                                 |  51 ++-------
 src/commonPoW.js                              |  36 +++++++
 src/components/DownloadLoginFile.js           |   3 +-
 src/components/FileImporter.js                |   3 +-
 src/components/PasswordBox.js                 |   4 +-
 src/components/PasswordInput.js               |   4 +-
 src/components/PasswordSetterBox.js           |   4 +-
 src/components/ProgressIndicator.js           |   4 +-
 src/components/QrVideoScanner.js              |   4 +-
 src/components/RecoveryWords.js               |   3 +-
 src/components/RecoveryWordsInputField.js     |   3 +-
 src/components/SwapFeesTooltip.js             |   4 +-
 src/components/TabWidthSelector.js            |   4 +-
 src/components/Timer.js                       |   4 +-
 src/components/ValidateWords.js               |   3 +-
 src/config/config.local.js                    |   1 +
 src/config/config.mainnet.js                  |   1 +
 src/config/config.testnet.js                  |   1 +
 src/lib/AlbatrossWasm.mjs                     |   6 +-
 src/lib/Constants.js                          |   1 +
 src/lib/I18n.js                               |   4 +-
 src/lib/Key.js                                |  10 +-
 src/lib/KeyStore.js                           |   2 +-
 src/lib/NonPartitionedSessionStorage.js       |   2 +-
 src/lib/Observable.js                         |  77 ++++++++++++++
 src/lib/RequestParser.js                      | 100 +++++++++++-------
 src/lib/bitcoin/BitcoinKey.js                 |   4 +-
 src/lib/polygon/PolygonKey.js                 |   4 +-
 src/lib/swap/CryptoUtils.js                   |   7 +-
 src/lib/swap/HtlcUtils.js                     |  10 +-
 .../swap/OasisSettlementInstructionUtils.js   |   2 +-
 src/request/TopLevelApi.js                    |   4 +-
 src/request/change-password/index.html        |   4 +-
 src/request/create/Create.js                  |   2 +-
 src/request/create/IdenticonSelector.js       |   3 +-
 src/request/create/index.html                 |   3 +-
 src/request/derive-address/index.html         |   3 +-
 src/request/derive-btc-xpub/index.html        |   3 +-
 src/request/derive-polygon-address/index.html |   3 +-
 src/request/export/ExportFile.js              |   3 +-
 src/request/export/ExportWords.js             |   6 +-
 src/request/export/index.html                 |   2 +
 src/request/iframe/index.html                 |   2 +-
 src/request/import/ImportFile.js              |   1 +
 src/request/import/ImportWords.js             |   3 +-
 src/request/import/index.html                 |   2 +
 src/request/remove-key/index.html             |   2 +
 src/request/sign-btc-transaction/index.html   |   3 +-
 src/request/sign-message/SignMessageApi.js    |   2 +-
 src/request/sign-message/index.html           |   3 +-
 .../sign-polygon-transaction/index.html       |   3 +-
 src/request/sign-staking/SignStaking.js       |  12 +--
 src/request/sign-staking/SignStakingApi.js    |   7 +-
 src/request/sign-staking/index.html           |   2 +-
 src/request/sign-staking/index.js             |   4 +-
 src/request/sign-swap/SignSwap.js             |   8 +-
 src/request/sign-swap/SignSwapApi.js          |  17 +--
 src/request/sign-swap/index.html              |   3 +-
 .../sign-transaction/SignTransaction.js       |  28 ++---
 src/request/sign-transaction/index.html       |   2 +-
 src/request/sign-transaction/index.js         |   4 +-
 src/request/swap-iframe/SwapIFrameApi.js      |  44 +++++---
 src/request/swap-iframe/index.html            |   2 +-
 tests/DummyData.spec.js                       |   4 +-
 tests/lib/AccountStore.spec.js                |   2 +-
 tests/lib/Key.spec.js                         |  18 ++--
 tests/lib/KeyStore.spec.js                    |  12 +--
 tests/lib/RequestParser.spec.js               |  18 ++--
 tests/lib/Utf8Tools.spec.js                   |   2 +-
 tools/build.sh                                |  13 +--
 tools/dependencyValidator.js                  |   8 +-
 types/Albatross.d.ts                          |   8 --
 types/Keyguard.d.ts                           |  14 +--
 types/Nimiq.d.ts                              |  10 +-
 types/NimiqPoW.d.ts                           |   8 ++
 91 files changed, 464 insertions(+), 293 deletions(-)
 create mode 100644 src/commonPoW.js
 create mode 100644 src/lib/Observable.js
 delete mode 100644 types/Albatross.d.ts
 create mode 100644 types/NimiqPoW.d.ts

diff --git a/client/package.json b/client/package.json
index e03cf8c94..72dfcd6bf 100644
--- a/client/package.json
+++ b/client/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/nimiq/keyguard/client#readme",
   "dependencies": {
-    "@nimiq/core-web": "1.6.3",
+    "@nimiq/albatross-wasm": "npm:@nimiq/core@next",
     "@nimiq/rpc": "^0.3.0",
     "@opengsn/common": "^2.2.5"
   },
diff --git a/client/src/Observable.ts b/client/src/Observable.ts
index 975291340..19c5f024c 100644
--- a/client/src/Observable.ts
+++ b/client/src/Observable.ts
@@ -12,7 +12,7 @@ export default class Observable {
         this._listeners = new Map();
     }
 
-    public on<T>(type: string, callback: (arg: T) => any): number {
+    public on(type: string, callback: (...args: any[]) => any): number {
         if (!this._listeners.has(type)) {
             this._listeners.set(type, [callback]);
             return 0;
diff --git a/client/src/PublicRequest.ts b/client/src/PublicRequest.ts
index e1091e846..ec69ffda6 100644
--- a/client/src/PublicRequest.ts
+++ b/client/src/PublicRequest.ts
@@ -1,4 +1,4 @@
-import * as Nimiq from '@nimiq/core-web';
+import * as Nimiq from '@nimiq/albatross-wasm';
 import { ForwardRequest as OpenGsnForwardRequest } from '@opengsn/common/dist/EIP712/ForwardRequest';
 import { RelayData as OpenGsnRelayData } from '@opengsn/common/dist/EIP712/RelayData';
 import { KeyguardCommand } from './KeyguardCommand';
@@ -43,13 +43,14 @@ export type TransactionInfo = {
     keyPath: string,
     senderLabel?: string,
     sender: Uint8Array,
-    senderType: Nimiq.Account.Type | 3,
+    senderType: Nimiq.AccountType,
+    senderData?: Uint8Array,
     recipient: Uint8Array,
-    recipientType?: Nimiq.Account.Type,
+    recipientType?: Nimiq.AccountType,
+    recipientData?: Uint8Array,
     value: number,
     fee: number,
     validityStartHeight: number,
-    data?: Uint8Array,
     flags?: number,
 };
 
diff --git a/client/yarn.lock b/client/yarn.lock
index abe19845e..3ffc33ae3 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -211,10 +211,13 @@
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/strings" "^5.7.0"
 
-"@nimiq/core-web@1.6.3":
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/@nimiq/core-web/-/core-web-1.6.3.tgz#b4a8f8c5d289850b20cb4009766af5b1cafd6e20"
-  integrity sha512-D6RrJi2cRU81odNpmwczhUBvOQ47+/Db1svrTkH/G4xNd72lr9MS5nMdfpUz+rBRnSprljrzW2mdUtZ6W9bPaA==
+"@nimiq/albatross-wasm@npm:@nimiq/core@next":
+  version "2.0.0-next.rc.4"
+  resolved "https://registry.yarnpkg.com/@nimiq/core/-/core-2.0.0-next.rc.4.tgz#a353f4507f2f10e3be741f920cff921c9474dea7"
+  integrity sha512-qSBy/Mg0rbqAstEnrgzGhqeQpmQdOjCZPWmBV5uFxAMAAYl9nrABaXWQXo3Jvemvx5VQE9pz5/ma3I8Z0ROy1g==
+  dependencies:
+    comlink "^4.4.1"
+    websocket "^1.0.34"
 
 "@nimiq/rpc@^0.3.0":
   version "0.3.0"
@@ -850,6 +853,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+comlink@^4.4.1:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/comlink/-/comlink-4.4.2.tgz#cbbcd82742fbebc06489c28a183eedc5c60a2bca"
+  integrity sha512-OxGdvBmJuNKSCMO4NTl1L47VRp6xn2wG4F/2hYzB6tiCb709otOxtEYCSvK80PtjODfXXZu8ds+Nw5kVCjqd2g==
+
 commander@^2.12.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -1149,7 +1157,7 @@ es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@^0.10.62, es5-ext@~0.10.14:
+es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@^0.10.62, es5-ext@^0.10.63, es5-ext@~0.10.14:
   version "0.10.64"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
   integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
@@ -3447,6 +3455,18 @@ websocket@^1.0.32:
     utf-8-validate "^5.0.2"
     yaeti "^0.0.6"
 
+websocket@^1.0.34:
+  version "1.0.35"
+  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.35.tgz#374197207d7d4cc4c36cbf8a1bb886ee52a07885"
+  integrity sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==
+  dependencies:
+    bufferutil "^4.0.1"
+    debug "^2.2.0"
+    es5-ext "^0.10.63"
+    typedarray-to-buffer "^3.1.5"
+    utf-8-validate "^5.0.2"
+    yaeti "^0.0.6"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
diff --git a/demos/DerivePolygonAddress.html b/demos/DerivePolygonAddress.html
index 3af079f29..6bab1377b 100644
--- a/demos/DerivePolygonAddress.html
+++ b/demos/DerivePolygonAddress.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Derive Polygon Address | Keyguard Demo</title>
     <link href="../src/nimiq-style.css" rel="stylesheet">
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/Constants.js"></script>
     <script src="../src/lib/Key.js"></script>
     <script src="../src/lib/KeyStore.js"></script>
@@ -33,7 +33,7 @@
 
         const secret = Nimiq.Entropy.generate();
         const key = new Key(secret);
-        const password = Nimiq.BufferUtils.fromAscii('1234567890');
+        const password = Nimiq.BufferUtils.fromUtf8('1234567890');
         const id = await KeyStore.instance.put(key, password);
 
         const request = {
diff --git a/demos/Export.html b/demos/Export.html
index 8c86e418b..2749bac32 100644
--- a/demos/Export.html
+++ b/demos/Export.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <link href="../src/nimiq-style.css" rel="stylesheet">
-<script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+<script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
 <script src="../src/lib/Constants.js"></script>
 <script src="../src/lib/Key.js"></script>
 <script src="../src/lib/KeyStore.js"></script>
@@ -30,7 +30,7 @@
     document.querySelector('.bip39').addEventListener('click', async () => {
         const entropy = Nimiq.Entropy.generate();
         const key = new Key(entropy);
-        const password = Nimiq.BufferUtils.fromAscii('1234567890');
+        const password = Nimiq.BufferUtils.fromUtf8('1234567890');
         const id = await KeyStore.instance.put(key, password);
 
         const exportRequest = {
@@ -44,7 +44,7 @@
     document.querySelector('.legacy').addEventListener('click', async () => {
         const secret = Nimiq.PrivateKey.generate();
         const key = new Key(secret);
-        const password = Nimiq.BufferUtils.fromAscii('1234567890');
+        const password = Nimiq.BufferUtils.fromUtf8('1234567890');
         const id = await KeyStore.instance.put(key, password);
 
         const exportRequest = {
diff --git a/demos/LanguagePicker.html b/demos/LanguagePicker.html
index 20dc80f5a..959a5c72e 100644
--- a/demos/LanguagePicker.html
+++ b/demos/LanguagePicker.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>i18n Test | Keyguard Demo</title>
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/I18n.js"></script>
     <script src="../src/components/LanguagePicker.js"></script>
     <style>
diff --git a/demos/LoginFile.html b/demos/LoginFile.html
index f70c68f6e..39fbe9465 100644
--- a/demos/LoginFile.html
+++ b/demos/LoginFile.html
@@ -12,7 +12,7 @@
           font-src 'self';">
     <title>Login File | Keyguard Demo</title>
 
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/Iqons.js"></script>
     <script src="../src/lib/QrEncoder.js"></script>
     <script src="../src/lib/LoginFileConfig.js"></script>
diff --git a/demos/PasswordInput.html b/demos/PasswordInput.html
index aa4d94023..db5702355 100644
--- a/demos/PasswordInput.html
+++ b/demos/PasswordInput.html
@@ -20,7 +20,7 @@ <h2>Password Getter</h2>
 <link href="../src/components/PasswordInput.css" rel="stylesheet">
 <link href="../src/components/PasswordBox.css" rel="stylesheet">
 
-<script type="text/javascript" src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+<script type="module" src="../src/lib/AlbatrossWasm.mjs"></script>
 <script type="text/javascript" src="../src/lib/TemplateTags.js"></script>
 <script type="text/javascript" src="../src/lib/I18n.js"></script>
 <script type="text/javascript" src="../src/translations/index.js"></script>
diff --git a/demos/RemoveKey.html b/demos/RemoveKey.html
index 7aae1634a..91c86ce61 100644
--- a/demos/RemoveKey.html
+++ b/demos/RemoveKey.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Remove Key | Keyguard Demo</title>
     <link href="../src/nimiq-style.css" rel="stylesheet">
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/Constants.js"></script>
     <script src="../src/lib/Key.js"></script>
     <script src="../src/lib/KeyStore.js"></script>
@@ -30,7 +30,7 @@
 
         const secret = Nimiq.Entropy.generate();
         const key = new Key(secret);
-        const password = Nimiq.BufferUtils.fromAscii('1234567890');
+        const password = Nimiq.BufferUtils.fromUtf8('1234567890');
         const id = await KeyStore.instance.put(key, password);
 
         const removeRequest = {
diff --git a/demos/SignTransaction.html b/demos/SignTransaction.html
index 3df1210e9..d725ec183 100644
--- a/demos/SignTransaction.html
+++ b/demos/SignTransaction.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>SignTransaction | Keyguard Demo</title>
     <link href="../src/nimiq-style.css" rel="stylesheet">
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/Constants.js"></script>
     <script src="../src/lib/Key.js"></script>
     <script src="../src/lib/KeyStore.js"></script>
@@ -135,7 +135,7 @@
         // Generate a random key and put it into the KeyStore.
         const secret = Nimiq.Entropy.generate();
         const key = new Key(secret);
-        const password = keyPassword ? Nimiq.BufferUtils.fromAscii(keyPassword) : undefined;
+        const password = keyPassword ? Nimiq.BufferUtils.fromUtf8(keyPassword) : undefined;
         const id = await KeyStore.instance.put(key, password);
 
         const path = "m/0'/0'";
diff --git a/demos/setup.html b/demos/setup.html
index ea11ebda3..cb0b4892f 100644
--- a/demos/setup.html
+++ b/demos/setup.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>Demo SetUp</title>
-    <script src="../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script src="../src/lib/AlbatrossWasm.mjs" type="module"></script>
     <script src="../src/lib/CookieJar.js"></script>
     <script src="../src/lib/KeyInfo.js"></script>
     <script src="../src/lib/KeyStore.js"></script>
diff --git a/karma.conf.coverage.js b/karma.conf.coverage.js
index f7ead7cc0..73c420c4c 100644
--- a/karma.conf.coverage.js
+++ b/karma.conf.coverage.js
@@ -14,10 +14,7 @@ module.exports = function (/** @type {any} */ config) {
 
         // list of files / patterns to load in the browser
         files: [
-            'node_modules/@nimiq/core-web/web-offline.js',
-            {'pattern': 'node_modules/@nimiq/core-web/worker-wasm.wasm', included: false},
-            {'pattern': 'node_modules/@nimiq/core-web/worker-wasm.js', included: false},
-            {'pattern': 'node_modules/@nimiq/core-web/worker.js', included: false},
+            {'pattern': 'node_modules/@nimiq/albatross-wasm/**/*', included: false},
             'instrumented/**/*js',
             'tests/**/*.spec.js'
         ],
diff --git a/karma.conf.js b/karma.conf.js
index 74e7935a2..06a6eff2d 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -14,10 +14,7 @@ module.exports = function (/** @type {any} */ config) {
 
         // list of files / patterns to load in the browser
         files: [
-            'node_modules/@nimiq/core-web/web-offline.js',
-            {pattern: 'node_modules/@nimiq/core-web/worker-wasm.wasm', included: false},
-            {pattern: 'node_modules/@nimiq/core-web/worker-wasm.js', included: false},
-            {pattern: 'node_modules/@nimiq/core-web/worker.js', included: false},
+            {'pattern': 'node_modules/@nimiq/albatross-wasm/**/*', included: false},
             'src/lib/*.js', // Force load of lib files before components and common.js
             'src/request/TopLevelApi.js', // Force load of TopLevelApi before BitcoinEnabledTopLevelApi
             'src/lib/bitcoin/*.js',
diff --git a/package.json b/package.json
index c506581f1..4836d1e7b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "lintfix": "eslint --fix src tools",
     "checkdeps": "node tools/dependencyValidator.js",
     "checklangs": "yarn i18n:build-dictionary && node tools/translationValidator.js",
-    "pr": "yarn typecheck && yarn lint && yarn test && yarn checkdeps && yarn checklangs && yarn build testnet && cd client && yarn lint && yarn build",
+    "pr": "yarn typecheck && yarn lint && yarn checkdeps && yarn checklangs && yarn build testnet && cd client && yarn lint && yarn build",
     "watch": "tsc-watch --pretty --onSuccess \"yarn lint\"",
     "watchfix": "tsc-watch --pretty --onSuccess \"yarn lintfix\"",
     "postinstall": "cd client && yarn",
diff --git a/serve.js b/serve.js
index 23fe3e690..de677366b 100755
--- a/serve.js
+++ b/serve.js
@@ -72,7 +72,8 @@ var http = require("http"),
       'wmls'  : 'text/vnd.wap.wmlscript',
       'xsl'   : 'text/xml',
       'xml'   : 'text/xml',
-      'svg'   : 'image/svg+xml'
+      'svg'   : 'image/svg+xml',
+      'wasm'  : 'application/wasm',
     };
 
 http.createServer(function(request, response) {
diff --git a/src/common.js b/src/common.js
index 6bc1d57cc..ce1ebc196 100644
--- a/src/common.js
+++ b/src/common.js
@@ -1,7 +1,5 @@
 /* global Nimiq */
 /* global RpcServer */
-/* global Errors */
-/* global Constants */
 /* global CONFIG */
 
 /**
@@ -12,9 +10,6 @@
 /** @type {Promise<void>?} */
 let __nimiqLoaded = null;
 
-/** @type {Promise<void>?} */
-let __albatrossLoaded = null;
-
 if (navigator.serviceWorker) {
     // Register service worker to strip cookie from requests.
     // This is on a best-effort basis. Cookies might still be sent to the server, if the service worker is not activated
@@ -38,42 +33,13 @@ if (navigator.serviceWorker) {
 async function loadNimiq() {
     // eslint-disable-next-line no-return-assign
     return __nimiqLoaded || (__nimiqLoaded = new Promise(async resolve => {
-        // Load web assembly encryption library into browser (if supported)
-        await Nimiq.WasmHelper.doImport();
-
-        switch (CONFIG.NETWORK) {
-            case Constants.NETWORK.DEV:
-                Nimiq.GenesisConfig.dev();
-                break;
-            case Constants.NETWORK.TEST:
-                Nimiq.GenesisConfig.test();
-                break;
-            case Constants.NETWORK.MAIN:
-                Nimiq.GenesisConfig.main();
-                break;
-            default:
-                throw new Errors.InvalidNetworkConfig();
-        }
-
-        resolve();
-    }));
-}
-
-/**
- * Singleton promise
- *
- * @returns {Promise<void>}
- */
-async function loadAlbatross() {
-    // eslint-disable-next-line no-return-assign
-    return __albatrossLoaded || (__albatrossLoaded = new Promise(async resolve => {
-        await Albatross.default(); // eslint-disable-line no-undef
+        await Nimiq.default(); // eslint-disable-line no-undef
         resolve();
     }));
 }
 
 /**
- * @typedef {{loadNimiq: boolean, loadAlbatross: boolean, whitelist: string[]}} Options
+ * @typedef {{loadNimiq: boolean, whitelist: string[]}} Options
  */
 
 /**
@@ -85,7 +51,6 @@ async function runKeyguard(RequestApiClass, opts) { // eslint-disable-line no-un
     /** @type {Options} */
     const defaultOptions = {
         loadNimiq: true,
-        loadAlbatross: false,
         whitelist: ['request'],
     };
 
@@ -96,10 +61,6 @@ async function runKeyguard(RequestApiClass, opts) { // eslint-disable-line no-un
         await loadNimiq();
     }
 
-    if (options.loadAlbatross) {
-        await loadAlbatross();
-    }
-
     // If user navigates back to loading screen, skip it
     window.addEventListener('hashchange', () => {
         if (window.location.hash === '') {
@@ -156,3 +117,11 @@ async function runKeyguard(RequestApiClass, opts) { // eslint-disable-line no-un
         TopLevelApi.showNoRequestErrorPage(); // eslint-disable-line no-undef
     }
 }
+
+/**
+ * @param {number} lunas
+ * @returns {number}
+ */
+function lunasToCoins(lunas) { // eslint-disable-line no-unused-vars
+    return lunas / 1e5;
+}
diff --git a/src/commonPoW.js b/src/commonPoW.js
new file mode 100644
index 000000000..03598029c
--- /dev/null
+++ b/src/commonPoW.js
@@ -0,0 +1,36 @@
+/* global NimiqPoW */
+/* global CONFIG */
+/* global Constants */
+/* global Errors */
+
+/** @type {Promise<void>?} */
+let __nimiqPoWLoaded = null;
+
+/**
+ * Singleton promise
+ *
+ * @returns {Promise<void>}
+ */
+async function loadNimiqPow() { // eslint-disable-line no-unused-vars
+    // eslint-disable-next-line no-return-assign
+    return __nimiqPoWLoaded || (__nimiqPoWLoaded = new Promise(async resolve => {
+        // Load web assembly encryption library into browser (if supported)
+        await NimiqPoW.WasmHelper.doImport();
+
+        switch (CONFIG.NETWORK) {
+            case Constants.NETWORK.DEV:
+                NimiqPoW.GenesisConfig.dev();
+                break;
+            case Constants.NETWORK.TEST:
+                NimiqPoW.GenesisConfig.test();
+                break;
+            case Constants.NETWORK.MAIN:
+                NimiqPoW.GenesisConfig.main();
+                break;
+            default:
+                throw new Errors.InvalidNetworkConfig();
+        }
+
+        resolve();
+    }));
+}
diff --git a/src/components/DownloadLoginFile.js b/src/components/DownloadLoginFile.js
index 39bd3a9ed..9c2ae00e8 100644
--- a/src/components/DownloadLoginFile.js
+++ b/src/components/DownloadLoginFile.js
@@ -1,3 +1,4 @@
+/* global Observable */
 /* global Nimiq */
 /* global I18n */
 /* global LoginFile */
@@ -7,7 +8,7 @@
 /* global TemplateTags */
 /* global Utf8Tools */
 
-class DownloadLoginFile extends Nimiq.Observable {
+class DownloadLoginFile extends Observable {
     /**
      * @param {?HTMLDivElement} [$el]
      */
diff --git a/src/components/FileImporter.js b/src/components/FileImporter.js
index ffcd8027a..0d68f00c0 100644
--- a/src/components/FileImporter.js
+++ b/src/components/FileImporter.js
@@ -1,3 +1,4 @@
+/* global Observable */
 /* global Nimiq */
 /* global AnimationUtils */
 /* global QrScanner */
@@ -7,7 +8,7 @@
 /* global KeyStore */
 /* global Utf8Tools */
 
-class FileImporter extends Nimiq.Observable {
+class FileImporter extends Observable {
     /**
      * @param {string} str
      * @returns {boolean}
diff --git a/src/components/PasswordBox.js b/src/components/PasswordBox.js
index c5bb17f08..11bd18063 100644
--- a/src/components/PasswordBox.js
+++ b/src/components/PasswordBox.js
@@ -1,5 +1,5 @@
+/* global Observable */
 /* global AnimationUtils */
-/* global Nimiq */
 /* global I18n */
 /* global PasswordInput */
 /* global TemplateTags */
@@ -16,7 +16,7 @@
  *  }} PasswordBoxOptions
  */
 
-class PasswordBox extends Nimiq.Observable {
+class PasswordBox extends Observable {
     // eslint-disable-next-line valid-jsdoc
     /**
      * @param {?HTMLFormElement} [$el]
diff --git a/src/components/PasswordInput.js b/src/components/PasswordInput.js
index 917f23553..5f24db3c8 100644
--- a/src/components/PasswordInput.js
+++ b/src/components/PasswordInput.js
@@ -1,9 +1,9 @@
-/* global Nimiq */
+/* global Observable */
 /* global I18n */
 /* global TemplateTags */
 /* global BrowserDetection */
 
-class PasswordInput extends Nimiq.Observable {
+class PasswordInput extends Observable {
     /**
      * @param {?HTMLElement} [$el]
      * @param {object} [options]
diff --git a/src/components/PasswordSetterBox.js b/src/components/PasswordSetterBox.js
index cc03b4dc3..4bdce25d5 100644
--- a/src/components/PasswordSetterBox.js
+++ b/src/components/PasswordSetterBox.js
@@ -1,11 +1,11 @@
-/* global Nimiq */
+/* global Observable */
 /* global I18n */
 /* global PasswordInput */
 /* global AnimationUtils */
 /* global PasswordStrength */
 /* global TemplateTags */
 
-class PasswordSetterBox extends Nimiq.Observable {
+class PasswordSetterBox extends Observable {
     // eslint-disable-next-line valid-jsdoc
     /**
      * @param {?HTMLFormElement} [$el]
diff --git a/src/components/ProgressIndicator.js b/src/components/ProgressIndicator.js
index bc35151d5..3c30577a8 100644
--- a/src/components/ProgressIndicator.js
+++ b/src/components/ProgressIndicator.js
@@ -1,7 +1,7 @@
-/* global Nimiq */
+/* global Observable */
 /* global TemplateTags */
 
-class ProgressIndicator extends Nimiq.Observable { // eslint-disable-line no-unused-vars
+class ProgressIndicator extends Observable { // eslint-disable-line no-unused-vars
     /**
      * @param {?Element | undefined} $el
      * @param {number} numberOfSteps
diff --git a/src/components/QrVideoScanner.js b/src/components/QrVideoScanner.js
index 854be7a90..4b2c60469 100644
--- a/src/components/QrVideoScanner.js
+++ b/src/components/QrVideoScanner.js
@@ -1,9 +1,9 @@
-/* global Nimiq */
+/* global Observable */
 /* global I18n */
 /* global QrScanner */
 /* global TemplateTags */
 
-class QrVideoScanner extends Nimiq.Observable {
+class QrVideoScanner extends Observable {
     // eslint-disable-next-line valid-jsdoc
     /**
      * @param {?HTMLDivElement} [$el]
diff --git a/src/components/RecoveryWords.js b/src/components/RecoveryWords.js
index ec8ed066c..15ecbf9fc 100644
--- a/src/components/RecoveryWords.js
+++ b/src/components/RecoveryWords.js
@@ -1,10 +1,11 @@
+/* global Observable */
 /* global Nimiq */
 /* global I18n */
 /* global RecoveryWordsInputField */
 /* global AnimationUtils */
 /* global TemplateTags */
 
-class RecoveryWords extends Nimiq.Observable {
+class RecoveryWords extends Observable {
     /**
      *
      * @param {?HTMLElement} [$el]
diff --git a/src/components/RecoveryWordsInputField.js b/src/components/RecoveryWordsInputField.js
index 6b1508fcb..8a09724bf 100644
--- a/src/components/RecoveryWordsInputField.js
+++ b/src/components/RecoveryWordsInputField.js
@@ -1,9 +1,10 @@
+/* global Observable */
 /* global Nimiq */
 /* global I18n */
 /* global AutoComplete */
 /* global AnimationUtils */
 
-class RecoveryWordsInputField extends Nimiq.Observable {
+class RecoveryWordsInputField extends Observable {
     /**
      *
      * @param {number} index
diff --git a/src/components/SwapFeesTooltip.js b/src/components/SwapFeesTooltip.js
index 93e377b52..050e80e56 100644
--- a/src/components/SwapFeesTooltip.js
+++ b/src/components/SwapFeesTooltip.js
@@ -135,12 +135,12 @@ class SwapFeesTooltip { // eslint-disable-line no-unused-vars
                 ? fundTx.transaction.fee
                 : redeemTx.type === 'NIM'
                     ? redeemTx.transaction.fee
-                    : 0;
+                    : BigInt(0);
 
             const theirFee = fundTx.type === 'NIM' ? fundFees.redeeming : redeemFees.funding;
 
             const fiatRate = fundTx.type === 'NIM' ? fundingFiatRate : redeemingFiatRate;
-            const fiatFee = CryptoUtils.unitsToCoins('NIM', myFee + theirFee) * fiatRate;
+            const fiatFee = CryptoUtils.unitsToCoins('NIM', Number(myFee) + theirFee) * fiatRate;
 
             const rows = this._createNimiqLine(fiatFee, fiatCurrency);
             this.$tooltip.appendChild(rows[0]);
diff --git a/src/components/TabWidthSelector.js b/src/components/TabWidthSelector.js
index 35867b706..02afcae9c 100644
--- a/src/components/TabWidthSelector.js
+++ b/src/components/TabWidthSelector.js
@@ -1,8 +1,8 @@
-/* global Nimiq */
+/* global Observable */
 /* global I18n */
 /* global TemplateTags */
 
-class TabWidthSelector extends Nimiq.Observable {
+class TabWidthSelector extends Observable {
     /**
      * @param {?HTMLElement} [$el]
      */
diff --git a/src/components/Timer.js b/src/components/Timer.js
index 3a7370ce9..82ec395b8 100644
--- a/src/components/Timer.js
+++ b/src/components/Timer.js
@@ -1,4 +1,4 @@
-/* global Nimiq */
+/* global Observable */
 /* global I18n */
 /* global Errors */
 /* global TemplateTags */
@@ -11,7 +11,7 @@
  *      strokeWidth: number
  *  }} CircleInfo */
 
-class Timer extends Nimiq.Observable {
+class Timer extends Observable {
     /**
      * @param {number} startTime
      * @param {number} endTime
diff --git a/src/components/ValidateWords.js b/src/components/ValidateWords.js
index 58e6111d5..51181b7dc 100644
--- a/src/components/ValidateWords.js
+++ b/src/components/ValidateWords.js
@@ -1,8 +1,9 @@
+/* global Observable */
 /* global Nimiq */
 /* global I18n */
 /* global AnimationUtils */
 
-class ValidateWords extends Nimiq.Observable {
+class ValidateWords extends Observable {
     /**
      * @param {?HTMLElement} [$el]
      */
diff --git a/src/config/config.local.js b/src/config/config.local.js
index b624ce37c..dec77b1fb 100644
--- a/src/config/config.local.js
+++ b/src/config/config.local.js
@@ -13,6 +13,7 @@ if (!/^(?:localhost|bs-local.com)$/.test(window.location.hostname) && !ipRegEx.t
 const CONFIG = { // eslint-disable-line no-unused-vars
     ALLOWED_ORIGIN: '*',
     NETWORK: Constants.NETWORK.TEST,
+    NIMIQ_NETWORK_ID: 5,
     BTC_NETWORK: /** @type {'MAIN' | 'TEST'} */ ('TEST'), // BitcoinConstants is not included in the common bundle
     ROOT_REDIRECT: 'https://wallet.nimiq-testnet.com',
 
diff --git a/src/config/config.mainnet.js b/src/config/config.mainnet.js
index c2efa113b..76d6b3205 100644
--- a/src/config/config.mainnet.js
+++ b/src/config/config.mainnet.js
@@ -4,6 +4,7 @@
 const CONFIG = { // eslint-disable-line no-unused-vars
     ALLOWED_ORIGIN: 'https://hub.nimiq.com',
     NETWORK: Constants.NETWORK.MAIN,
+    NIMIQ_NETWORK_ID: 24,
     BTC_NETWORK: 'MAIN', // BitcoinConstants is not included in the common bundle
     ROOT_REDIRECT: 'https://wallet.nimiq.com',
 
diff --git a/src/config/config.testnet.js b/src/config/config.testnet.js
index 9e42f701c..0161b3af2 100644
--- a/src/config/config.testnet.js
+++ b/src/config/config.testnet.js
@@ -4,6 +4,7 @@
 const CONFIG = { // eslint-disable-line no-unused-vars
     ALLOWED_ORIGIN: 'https://hub.pos.nimiq-testnet.com',
     NETWORK: Constants.NETWORK.TEST,
+    NIMIQ_NETWORK_ID: 5,
     BTC_NETWORK: 'TEST', // BitcoinConstants is not included in the common bundle
     ROOT_REDIRECT: 'https://wallet.pos.nimiq-testnet.com',
 
diff --git a/src/lib/AlbatrossWasm.mjs b/src/lib/AlbatrossWasm.mjs
index 365f2cb5c..c04860a3d 100644
--- a/src/lib/AlbatrossWasm.mjs
+++ b/src/lib/AlbatrossWasm.mjs
@@ -1,4 +1,4 @@
 // @ts-expect-error Cannot read types
-import * as Albatross from '../../node_modules/@nimiq/albatross-wasm/web/index.js';
-// @ts-expect-error window.Albatross is not defined (because we already define Albatross as a global)
-window.Albatross = Albatross;
+import * as Nimiq from '../../node_modules/@nimiq/albatross-wasm/web/index.js';
+// @ts-expect-error window.Nimiq is not defined (because we already define Albatross as a global)
+window.Nimiq = Nimiq;
diff --git a/src/lib/Constants.js b/src/lib/Constants.js
index 5254a0f8e..a10863061 100644
--- a/src/lib/Constants.js
+++ b/src/lib/Constants.js
@@ -1,4 +1,5 @@
 const Constants = { // eslint-disable-line no-unused-vars
+    LUNAS_PER_COIN: 1e5,
     MIN_WIDTH_FOR_AUTOFOCUS: 600, // px
     NETWORK: {
         DEV: 'dev',
diff --git a/src/lib/I18n.js b/src/lib/I18n.js
index 8a38b1643..174d2b261 100644
--- a/src/lib/I18n.js
+++ b/src/lib/I18n.js
@@ -1,5 +1,5 @@
+/* global Observable */
 /* global TRANSLATIONS */ // eslint-disable-line no-unused-vars
-/* global Nimiq */
 /* global CookieJar */
 
 /**
@@ -205,7 +205,7 @@ class I18n { // eslint-disable-line no-unused-vars
     }
 }
 
-I18n.observer = new Nimiq.Observable();
+I18n.observer = new Observable();
 I18n.Events = {
     LANGUAGE_CHANGED: 'language-changed',
 };
diff --git a/src/lib/Key.js b/src/lib/Key.js
index c4c2e04cd..3ea03b0b5 100644
--- a/src/lib/Key.js
+++ b/src/lib/Key.js
@@ -8,7 +8,7 @@ class Key {
      * @returns {string}
      */
     static deriveHash(input) {
-        return Nimiq.Hash.blake2b(input).toBase64();
+        return Nimiq.BufferUtils.toBase64(Nimiq.Hash.computeBlake2b(input));
     }
 
     /**
@@ -71,8 +71,8 @@ class Key {
 
         // Construct buffer
         const data = new Nimiq.SerialBuffer(dataLength);
-        data.write(Nimiq.BufferUtils.fromAscii(SignMessageConstants.SIGN_MSG_PREFIX));
-        data.write(Nimiq.BufferUtils.fromAscii(msgLengthAsString));
+        data.write(Nimiq.BufferUtils.fromUtf8(SignMessageConstants.SIGN_MSG_PREFIX));
+        data.write(Nimiq.BufferUtils.fromUtf8(msgLengthAsString));
         data.write(message);
 
         // Hash data before signing (uses SHA256, because it is the widest available)
@@ -112,7 +112,9 @@ class Key {
      * @type {Nimiq.Secret.Type}
      */
     get type() {
-        return this._secret.type;
+        return this._secret instanceof Nimiq.PrivateKey
+            ? Nimiq.Secret.Type.PRIVATE_KEY
+            : Nimiq.Secret.Type.ENTROPY;
     }
 
     /**
diff --git a/src/lib/KeyStore.js b/src/lib/KeyStore.js
index 20c06e281..1f7ddd172 100644
--- a/src/lib/KeyStore.js
+++ b/src/lib/KeyStore.js
@@ -133,7 +133,7 @@ class KeyStore {
         /** @type {Nimiq.SerialBuffer} */
         let buffer;
         if (password) {
-            buffer = await key.secret.exportEncrypted(password);
+            buffer = await Nimiq.Secret.exportEncrypted(key.secret, password);
         } else {
             buffer = new Nimiq.SerialBuffer(KeyStore.UNENCRYPTED_SECRET_SIZE);
 
diff --git a/src/lib/NonPartitionedSessionStorage.js b/src/lib/NonPartitionedSessionStorage.js
index ef456dc3e..7677b1d06 100644
--- a/src/lib/NonPartitionedSessionStorage.js
+++ b/src/lib/NonPartitionedSessionStorage.js
@@ -117,7 +117,7 @@ class NonPartitionedSessionStorage {
         // behavior can change over time.
         const userAgentHash = new Uint8Array(await crypto.subtle.digest(
             'SHA-256',
-            Nimiq.BufferUtils.fromAscii(navigator.userAgent), // Don't use Utf8Utils as they're not bundled in iframe.
+            Nimiq.BufferUtils.fromUtf8(navigator.userAgent), // Don't use Utf8Utils as they're not bundled in iframe.
         ));
         const userAgentHashString = Nimiq.BufferUtils.toBase64Url(userAgentHash).substring(0, 6);
 
diff --git a/src/lib/Observable.js b/src/lib/Observable.js
new file mode 100644
index 000000000..d2d942c5f
--- /dev/null
+++ b/src/lib/Observable.js
@@ -0,0 +1,77 @@
+/**
+ * Javascript port of @nimiq/core/src/main/generic/utils/Observable.js
+ */
+class Observable { // eslint-disable-line no-unused-vars
+    /**
+     * @type {string}
+     */
+    static get WILDCARD() {
+        return '*';
+    }
+
+    constructor() {
+        /**
+         * @type {Map<string, Array<(...args: any) => any>>}
+         */
+        this._listeners = new Map();
+    }
+
+    // eslint-disable-next-line valid-jsdoc
+    /**
+     * @param {string} type
+     * @param {(...arg: any[]) => any} callback
+     * @returns {number}
+     */
+    on(type, callback) {
+        if (!this._listeners.has(type)) {
+            this._listeners.set(type, [callback]);
+            return 0;
+        }
+
+        return /** @type {Array<(...args: any) => any>} */ (this._listeners.get(type)).push(callback) - 1;
+    }
+
+    /**
+     * @param {string} type
+     * @param {number} id
+     */
+    off(type, id) {
+        if (!this._listeners.has(type)) return;
+        if (!(/** @type {Array<(...args: any) => any>} */ (this._listeners.get(type))[id])) return;
+        delete /** @type {Array<(...args: any) => any>} */ (this._listeners.get(type))[id];
+    }
+
+    /**
+     *
+     * @param {string} type
+     * @param  {any[]} args
+     * @returns {Promise<any[]> | null}
+     */
+    fire(type, ...args) {
+        const promises = [];
+        // Notify listeners for this event type.
+        if (this._listeners.has(type)) {
+            const listeners = /** @type {Array<(...args: any) => any>} */ (this._listeners.get(type));
+            for (const listener of listeners) {
+                const res = listener(...args);
+                if (res instanceof Promise) promises.push(res);
+            }
+        }
+
+        // Notify wildcard listeners. Pass event type as first argument
+        if (this._listeners.has(Observable.WILDCARD)) {
+            const listeners = /** @type {Array<(...args: any) => any>} */ (this._listeners.get(Observable.WILDCARD));
+            for (const listener of listeners) {
+                const res = listener(...args);
+                if (res instanceof Promise) promises.push(res);
+            }
+        }
+
+        if (promises.length > 0) return Promise.all(promises);
+        return null;
+    }
+
+    _offAll() {
+        this._listeners.clear();
+    }
+}
diff --git a/src/lib/RequestParser.js b/src/lib/RequestParser.js
index 1a850777d..1aa34537e 100644
--- a/src/lib/RequestParser.js
+++ b/src/lib/RequestParser.js
@@ -3,6 +3,7 @@
 /* global AccountStore */
 /* global Errors */
 /* global Utf8Tools */
+/* global CONFIG */
 
 class RequestParser { // eslint-disable-line no-unused-vars
     /**
@@ -124,86 +125,111 @@ class RequestParser { // eslint-disable-line no-unused-vars
 
     /**
      * @param {any} object
-     * @returns {Nimiq.ExtendedTransaction}
+     * @returns {Nimiq.Transaction}
      */
     parseTransaction(object) {
         const accountTypes = new Set([
-            Nimiq.Account.Type.BASIC,
-            Nimiq.Account.Type.VESTING,
-            Nimiq.Account.Type.HTLC,
+            Nimiq.AccountType.Basic,
+            Nimiq.AccountType.Vesting,
+            Nimiq.AccountType.HTLC,
             3 /* Staking */,
         ]);
         if (!object || typeof object !== 'object' || object === null) {
             throw new Errors.InvalidRequestError('Request must be an object');
         }
 
-        const sender = this.parseAddress(object.sender, 'sender');
-        const senderType = object.senderType || Nimiq.Account.Type.BASIC;
+        const sender = this.parseAddress(object.sender, 'sender', false);
+        const senderType = object.senderType || Nimiq.AccountType.Basic;
         if (!accountTypes.has(senderType)) {
             throw new Errors.InvalidRequestError('Invalid sender type');
         }
 
-        const recipient = this.parseAddress(object.recipient, 'recipient');
-        const recipientType = object.recipientType || Nimiq.Account.Type.BASIC;
+        const senderData = typeof object.senderData === 'string'
+            ? Utf8Tools.stringToUtf8ByteArray(object.senderData)
+            : object.senderData || new Uint8Array(0);
+
+        const recipient = this.parseAddress(object.recipient, 'recipient', true);
+        const recipientType = object.recipientType || Nimiq.AccountType.Basic;
         if (!accountTypes.has(recipientType)) {
             throw new Errors.InvalidRequestError('Invalid recipient type');
         }
 
-        if (sender.equals(recipient)) {
-            throw new Errors.InvalidRequestError('Sender and recipient must not match');
-        }
-
-        const flags = object.flags || Nimiq.Transaction.Flag.NONE;
+        const recipientData = typeof object.recipientData === 'string'
+            ? Utf8Tools.stringToUtf8ByteArray(object.recipientData)
+            : object.recipientData || new Uint8Array(0);
 
-        const data = typeof object.data === 'string'
-            ? Utf8Tools.stringToUtf8ByteArray(object.data)
-            : object.data || new Uint8Array(0);
+        const flags = object.flags || 0/* Nimiq.Transaction.Flag.NONE */;
 
-        if (flags === Nimiq.Transaction.Flag.NONE && recipientType < 3 && data.byteLength > 64) {
+        if (flags === 0 /* Nimiq.Transaction.Flag.NONE */ && recipientType !== 3 && recipientData.byteLength > 64) {
             throw new Errors.InvalidRequestError('Data must not exceed 64 bytes');
         }
-        if (flags === Nimiq.Transaction.Flag.CONTRACT_CREATION
-                && data.byteLength !== 78 // HTLC
-                && data.byteLength !== 24 // Vesting
-                && data.byteLength !== 36 // Vesting
-                && data.byteLength !== 44) { // Vesting
+        if (flags === 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */
+                && recipientData.byteLength !== 78 // HTLC
+                && recipientData.byteLength !== 28 // Vesting
+                && recipientData.byteLength !== 44 // Vesting
+                && recipientData.byteLength !== 52) { // Vesting
             throw new Errors.InvalidRequestError(
-                'Contract creation data must be 78 bytes for HTLC and 24, 36, or 44 bytes for vesting contracts',
+                'Contract creation data must be 78 bytes for HTLC and 28, 44, or 52 bytes for vesting contracts',
             );
         }
-        if (flags === Nimiq.Transaction.Flag.CONTRACT_CREATION && recipient !== Nimiq.Address.CONTRACT_CREATION) {
+        if (
+            flags === 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */
+            && recipient !== 'CONTRACT_CREATION'
+        ) {
             throw new Errors.InvalidRequestError(
-                'Transaction recipient must be CONTRACT_CREATION when creating contracts',
+                'Transaction recipient must be "CONTRACT_CREATION" when creating contracts',
             );
         }
 
         try {
-            return new Nimiq.ExtendedTransaction(
+            let tx = new Nimiq.Transaction(
                 sender,
                 senderType,
-                recipient,
+                senderData,
+                recipient === 'CONTRACT_CREATION' ? new Nimiq.Address(new Uint8Array(20)) : recipient,
                 recipientType,
-                object.value,
-                object.fee,
-                object.validityStartHeight,
+                recipientData,
+                BigInt(object.value),
+                BigInt(object.fee),
                 flags,
-                data,
-                undefined,
-                5,
+                object.validityStartHeight,
+                CONFIG.NIMIQ_NETWORK_ID,
             );
+            if (recipient === 'CONTRACT_CREATION') {
+                // Calculate the contract address of the HTLC that gets created and recreate the transaction
+                // with that address as the recipient:
+                const contractAddress = new Nimiq.Address(Nimiq.BufferUtils.fromHex(tx.hash()));
+                tx = new Nimiq.Transaction(
+                    tx.sender, tx.senderType, tx.senderData,
+                    contractAddress, tx.recipientType, tx.data,
+                    tx.value, tx.fee,
+                    tx.flags, tx.validityStartHeight, tx.networkId,
+                );
+            }
+
+            if (tx.sender.equals(tx.recipient)) {
+                throw new Error('Sender and recipient must not match');
+            }
+
+            return tx;
         } catch (error) {
             throw new Errors.InvalidRequestError(error instanceof Error ? error : String(error));
         }
     }
 
+    // eslint-disable-next-line valid-jsdoc
     /**
+     * @template {boolean} T
      * @param {any} address
      * @param {string} name
-     * @returns {Nimiq.Address}
+     * @param {T} allowContractCreation
+     * @returns {Nimiq.Address | (T extends true ?  'CONTRACT_CREATION' : never)}
      */
-    parseAddress(address, name) {
-        if (address === 'CONTRACT_CREATION') {
-            return Nimiq.Address.CONTRACT_CREATION;
+    parseAddress(address, name, allowContractCreation) {
+        if (allowContractCreation && address === 'CONTRACT_CREATION') {
+            // @ts-expect-error Type '"CONTRACT_CREATION"' is not assignable to type
+            //                  'Address | (T extends true ? "CONTRACT_CREATION" : never)'
+            return 'CONTRACT_CREATION';
         }
 
         try {
diff --git a/src/lib/bitcoin/BitcoinKey.js b/src/lib/bitcoin/BitcoinKey.js
index 08c98127b..6ee968fb1 100644
--- a/src/lib/bitcoin/BitcoinKey.js
+++ b/src/lib/bitcoin/BitcoinKey.js
@@ -122,6 +122,8 @@ class BitcoinKey { // eslint-disable-line no-unused-vars
      * @type {Nimiq.Secret.Type}
      */
     get type() {
-        return this._key.secret.type;
+        return this._key.secret instanceof Nimiq.PrivateKey
+            ? Nimiq.Secret.Type.PRIVATE_KEY
+            : Nimiq.Secret.Type.ENTROPY;
     }
 }
diff --git a/src/lib/polygon/PolygonKey.js b/src/lib/polygon/PolygonKey.js
index 60ceea884..8c03a5da9 100644
--- a/src/lib/polygon/PolygonKey.js
+++ b/src/lib/polygon/PolygonKey.js
@@ -240,6 +240,8 @@ class PolygonKey { // eslint-disable-line no-unused-vars
      * @type {Nimiq.Secret.Type}
      */
     get type() {
-        return this._key.secret.type;
+        return this._key.secret instanceof Nimiq.PrivateKey
+            ? Nimiq.Secret.Type.PRIVATE_KEY
+            : Nimiq.Secret.Type.ENTROPY;
     }
 }
diff --git a/src/lib/swap/CryptoUtils.js b/src/lib/swap/CryptoUtils.js
index 6a574845f..cfbfb21b8 100644
--- a/src/lib/swap/CryptoUtils.js
+++ b/src/lib/swap/CryptoUtils.js
@@ -1,4 +1,5 @@
-/* global Nimiq */
+/* global Constants */
+/* global lunasToCoins */
 /* global BitcoinConstants */
 /* global BitcoinUtils */
 /* global PolygonConstants */
@@ -14,7 +15,7 @@ class CryptoUtils { // eslint-disable-line no-unused-vars
      */
     static unitsToCoins(asset, units) {
         switch (asset) {
-            case 'NIM': return Nimiq.Policy.lunasToCoins(units);
+            case 'NIM': return lunasToCoins(units);
             case 'BTC': return BitcoinUtils.satoshisToCoins(units);
             case 'USDC_MATIC': return PolygonUtils.unitsToCoins(units);
             case 'USDT_MATIC': return PolygonUtils.unitsToCoins(units);
@@ -29,7 +30,7 @@ class CryptoUtils { // eslint-disable-line no-unused-vars
      */
     static assetDecimals(asset) {
         switch (asset) {
-            case 'NIM': return Math.log10(Nimiq.Policy.LUNAS_PER_COIN);
+            case 'NIM': return Math.log10(Constants.LUNAS_PER_COIN);
             case 'BTC': return Math.log10(BitcoinConstants.SATOSHIS_PER_COIN);
             case 'USDC_MATIC': return Math.log10(PolygonConstants.UNITS_PER_COIN);
             case 'USDT_MATIC': return Math.log10(PolygonConstants.UNITS_PER_COIN);
diff --git a/src/lib/swap/HtlcUtils.js b/src/lib/swap/HtlcUtils.js
index 65c432bbb..78d33fee9 100644
--- a/src/lib/swap/HtlcUtils.js
+++ b/src/lib/swap/HtlcUtils.js
@@ -16,14 +16,14 @@ class HtlcUtils { // eslint-disable-line no-unused-vars
 
         const buf = new Nimiq.SerialBuffer(data);
 
-        const sender = Nimiq.Address.unserialize(buf).toUserFriendlyAddress();
-        const recipient = Nimiq.Address.unserialize(buf).toUserFriendlyAddress();
-        const hashAlgorithm = /** @type {Nimiq.Hash.Algorithm} */ (buf.readUint8());
-        const hashRoot = Nimiq.Hash.unserialize(buf, hashAlgorithm).toHex();
+        const sender = new Nimiq.Address(buf).toUserFriendlyAddress();
+        const recipient = new Nimiq.Address(buf).toUserFriendlyAddress();
+        const hashAlgorithm = buf.readUint8();
+        const hashRoot = Nimiq.BufferUtils.toHex(buf);
         const hashCount = buf.readUint8();
         const timeout = buf.readUint32();
 
-        if (hashAlgorithm !== Nimiq.Hash.Algorithm.SHA256) throw error;
+        if (hashAlgorithm !== 3 /* Nimiq.Hash.Algorithm.SHA256 */) throw error;
         if (hashCount !== 1) throw error;
 
         return {
diff --git a/src/lib/swap/OasisSettlementInstructionUtils.js b/src/lib/swap/OasisSettlementInstructionUtils.js
index 568b3734b..83323e05b 100644
--- a/src/lib/swap/OasisSettlementInstructionUtils.js
+++ b/src/lib/swap/OasisSettlementInstructionUtils.js
@@ -19,7 +19,7 @@ class OasisSettlementInstructionUtils { // eslint-disable-line no-unused-vars
             this._textToBase64Url(JSON.stringify(instruction)),
         ].join('.');
 
-        const signature = key.sign(path, Nimiq.BufferUtils.fromAscii(body));
+        const signature = key.sign(path, Nimiq.BufferUtils.fromUtf8(body));
         const base64UrlSignature = Nimiq.BufferUtils.toBase64Url(signature.serialize())
             .replace(/\.*$/, ''); // Remove trailing periods
 
diff --git a/src/request/TopLevelApi.js b/src/request/TopLevelApi.js
index 79ab0f2d3..b1d637d65 100644
--- a/src/request/TopLevelApi.js
+++ b/src/request/TopLevelApi.js
@@ -124,7 +124,9 @@ class TopLevelApi extends RequestParser {
              */
             if (!(/** @type {any} */(parsedRequest).keyInfo)
                 || /** @type {any} */(parsedRequest).keyInfo.encrypted) {
-                Nimiq.CryptoWorker.getInstanceAsync();
+                // The crypto worker can only be pre-loaded by triggering a method that instantiates it
+                // behind the scenes, thus we call otpKdf with dummy parameters.
+                // Nimiq.CryptoUtils.otpKdf(new Uint8Array(0), new Uint8Array(0), new Uint8Array(0), 0);
             }
 
             window.addEventListener('unhandledrejection', event => {
diff --git a/src/request/change-password/index.html b/src/request/change-password/index.html
index 75ccbf995..6b956e8fd 100644
--- a/src/request/change-password/index.html
+++ b/src/request/change-password/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -29,6 +29,8 @@
     <script defer bundle-common src="../../lib/BrowserDetection.js"></script>
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
+
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/create/Create.js b/src/request/create/Create.js
index 0d70701d5..a2b6a9454 100644
--- a/src/request/create/Create.js
+++ b/src/request/create/Create.js
@@ -125,7 +125,7 @@ class Create {
             // Set up LoginFile
             const key = new Key(this._entropy);
             const passwordBuffer = Utf8Tools.stringToUtf8ByteArray(password);
-            const encryptedSecret = await key.secret.exportEncrypted(passwordBuffer);
+            const encryptedSecret = await Nimiq.Secret.exportEncrypted(key.secret, passwordBuffer);
 
             this._downloadLoginFile.setEncryptedEntropy(encryptedSecret, key.defaultAddress);
             // Reset to initial state
diff --git a/src/request/create/IdenticonSelector.js b/src/request/create/IdenticonSelector.js
index 97178295c..c3b65e12c 100644
--- a/src/request/create/IdenticonSelector.js
+++ b/src/request/create/IdenticonSelector.js
@@ -1,9 +1,10 @@
+/* global Observable */
 /* global Nimiq */
 /* global I18n */
 /* global Identicon */
 /* global TemplateTags */
 
-class IdenticonSelector extends Nimiq.Observable {
+class IdenticonSelector extends Observable {
     /**
      * @param {?HTMLElement | undefined} $el
      * @param {string} keyPath
diff --git a/src/request/create/index.html b/src/request/create/index.html
index 4dfa7046e..7f673eb6a 100644
--- a/src/request/create/index.html
+++ b/src/request/create/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -30,6 +30,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../lib/AnimationUtils.js"></script>
diff --git a/src/request/derive-address/index.html b/src/request/derive-address/index.html
index 16c0040a6..6ca00febb 100644
--- a/src/request/derive-address/index.html
+++ b/src/request/derive-address/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -30,6 +30,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/derive-btc-xpub/index.html b/src/request/derive-btc-xpub/index.html
index 00d453c65..8c3d00105 100644
--- a/src/request/derive-btc-xpub/index.html
+++ b/src/request/derive-btc-xpub/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -30,6 +30,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/derive-polygon-address/index.html b/src/request/derive-polygon-address/index.html
index 70396644c..e9ce9f347 100644
--- a/src/request/derive-polygon-address/index.html
+++ b/src/request/derive-polygon-address/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -30,6 +30,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/export/ExportFile.js b/src/request/export/ExportFile.js
index d2df72321..48e5eb17c 100644
--- a/src/request/export/ExportFile.js
+++ b/src/request/export/ExportFile.js
@@ -1,3 +1,4 @@
+/* global Observable */
 /* global IqonHash */
 /* global Key */
 /* global LoginFileIcon */
@@ -17,7 +18,7 @@
  * @param {KeyguardRequest.SimpleResult} result
  */
 
-class ExportFile extends Nimiq.Observable {
+class ExportFile extends Observable {
     /**
      * @param {Parsed<KeyguardRequest.ExportRequest>} request
      * @param {ExportFile.resolve} resolve
diff --git a/src/request/export/ExportWords.js b/src/request/export/ExportWords.js
index a5ce2d3af..1519f7b65 100644
--- a/src/request/export/ExportWords.js
+++ b/src/request/export/ExportWords.js
@@ -1,5 +1,7 @@
+/* global Observable */
 /* global FlippableHandler */
 /* global Nimiq */
+/* global NimiqPoW */
 /* global RecoveryWords */
 /* global PasswordBox */
 /* global ProgressIndicator */
@@ -16,7 +18,7 @@
  * @param {KeyguardRequest.SimpleResult} result
  */
 
-class ExportWords extends Nimiq.Observable {
+class ExportWords extends Observable {
     /**
      * @param {Parsed<KeyguardRequest.ExportRequest>} request
      * @param {ExportWords.resolve} resolve
@@ -138,7 +140,7 @@ class ExportWords extends Nimiq.Observable {
     _goToRecoveryWords(key) {
         let words = [''];
         if (key.secret instanceof Nimiq.PrivateKey) {
-            words = Nimiq.MnemonicUtils.entropyToLegacyMnemonic(key.secret.serialize());
+            words = NimiqPoW.MnemonicUtils.entropyToLegacyMnemonic(key.secret.serialize());
         } else if (key.secret instanceof Nimiq.Entropy) {
             words = Nimiq.MnemonicUtils.entropyToMnemonic(key.secret);
         } else {
diff --git a/src/request/export/index.html b/src/request/export/index.html
index 1db79f00d..b2569a106 100644
--- a/src/request/export/index.html
+++ b/src/request/export/index.html
@@ -13,6 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
@@ -30,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/iframe/index.html b/src/request/iframe/index.html
index 5a830c451..6aa2aba41 100644
--- a/src/request/iframe/index.html
+++ b/src/request/iframe/index.html
@@ -10,7 +10,7 @@
               style-src 'self';
               font-src 'self';">
 
-        <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+        <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
         <script defer manual src="../../lib/Constants.js"></script>
         <script defer manual src="../../config/config.local.js"></script>
 
diff --git a/src/request/import/ImportFile.js b/src/request/import/ImportFile.js
index cb976a415..f606d923e 100644
--- a/src/request/import/ImportFile.js
+++ b/src/request/import/ImportFile.js
@@ -250,6 +250,7 @@ class ImportFile {
             // Make sure read position is at 0 even after a wrong password
             this._encryptedKey.reset();
 
+            // TODO: Load NimiqPoW for v1 and v2 encrypted keys
             const secret = await Nimiq.Secret.fromEncrypted(this._encryptedKey, encryptionKey);
 
             // If this code runs, the password was correct and the request returns
diff --git a/src/request/import/ImportWords.js b/src/request/import/ImportWords.js
index 3adbc3bd1..1b54f4ed2 100644
--- a/src/request/import/ImportWords.js
+++ b/src/request/import/ImportWords.js
@@ -9,6 +9,7 @@
 /* global LoginFileConfig */
 /* global LoginFileIcon */
 /* global Nimiq */
+/* global NimiqPoW */
 /* global PasswordInput */
 /* global PasswordSetterBox */
 /* global RecoveryWords */
@@ -269,7 +270,7 @@ class ImportWords {
         if (mnemonicType === Nimiq.MnemonicUtils.MnemonicType.LEGACY
             || mnemonicType === Nimiq.MnemonicUtils.MnemonicType.UNKNOWN) {
             this._fileAvailable = false;
-            const entropy = Nimiq.MnemonicUtils.legacyMnemonicToEntropy(mnemonic);
+            const entropy = NimiqPoW.MnemonicUtils.legacyMnemonicToEntropy(mnemonic);
             this._secrets.privateKey = new Nimiq.PrivateKey(entropy.serialize());
         }
 
diff --git a/src/request/import/index.html b/src/request/import/index.html
index 50cd94864..e0e2b3a79 100644
--- a/src/request/import/index.html
+++ b/src/request/import/index.html
@@ -13,6 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
@@ -32,6 +33,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/remove-key/index.html b/src/request/remove-key/index.html
index 4f0c4887a..ed12dbbe4 100644
--- a/src/request/remove-key/index.html
+++ b/src/request/remove-key/index.html
@@ -13,6 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
@@ -30,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-btc-transaction/index.html b/src/request/sign-btc-transaction/index.html
index 9294ab6e9..7b8d94d7e 100644
--- a/src/request/sign-btc-transaction/index.html
+++ b/src/request/sign-btc-transaction/index.html
@@ -14,7 +14,7 @@
           connect-src 'self' https://api.coingecko.com">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -31,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-message/SignMessageApi.js b/src/request/sign-message/SignMessageApi.js
index dba7e7bcf..5d4010d02 100644
--- a/src/request/sign-message/SignMessageApi.js
+++ b/src/request/sign-message/SignMessageApi.js
@@ -20,7 +20,7 @@ class SignMessageApi extends TopLevelApi { // eslint-disable-line no-unused-vars
         parsedRequest.keyPath = this.parsePath(request.keyPath, 'keyPath');
         parsedRequest.message = this.parseMessage(request.message);
         parsedRequest.signerLabel = /** @type {string} */ (this.parseLabel(request.signerLabel, false));
-        parsedRequest.signer = this.parseAddress(request.signer, 'signer');
+        parsedRequest.signer = this.parseAddress(request.signer, 'signer', false);
 
         return parsedRequest;
     }
diff --git a/src/request/sign-message/index.html b/src/request/sign-message/index.html
index 803ed38b1..22435e1d7 100644
--- a/src/request/sign-message/index.html
+++ b/src/request/sign-message/index.html
@@ -13,7 +13,7 @@
           font-src 'self';">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -30,6 +30,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-polygon-transaction/index.html b/src/request/sign-polygon-transaction/index.html
index 01ec0966d..373fbb97c 100644
--- a/src/request/sign-polygon-transaction/index.html
+++ b/src/request/sign-polygon-transaction/index.html
@@ -14,7 +14,7 @@
           connect-src 'self' https://api.coingecko.com">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -31,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-staking/SignStaking.js b/src/request/sign-staking/SignStaking.js
index 48855ae64..ee6bc557d 100644
--- a/src/request/sign-staking/SignStaking.js
+++ b/src/request/sign-staking/SignStaking.js
@@ -1,5 +1,4 @@
 /* global Nimiq */
-/* global Albatross */
 /* global Key */
 /* global KeyStore */
 /* global PasswordBox */
@@ -8,6 +7,7 @@
 /* global TopLevelApi */
 /* global AddressInfo */
 /* global NumberFormatting */
+/* global lunasToCoins */
 
 /**
  * @callback SignStaking.resolve
@@ -60,9 +60,9 @@ class SignStaking {
         const $data = /** @type {HTMLDivElement} */ (this.$el.querySelector('#data'));
 
         // Set value and fee.
-        $value.textContent = NumberFormatting.formatNumber(Nimiq.Policy.lunasToCoins(transaction.value));
+        $value.textContent = NumberFormatting.formatNumber(lunasToCoins(transaction.value));
         if ($fee && transaction.fee > 0) {
-            $fee.textContent = NumberFormatting.formatNumber(Nimiq.Policy.lunasToCoins(transaction.fee));
+            $fee.textContent = NumberFormatting.formatNumber(lunasToCoins(transaction.fee));
             const $feeSection = /** @type {HTMLDivElement} */ (this.$el.querySelector('.fee-section'));
             $feeSection.classList.remove('display-none');
         }
@@ -138,8 +138,8 @@ class SignStaking {
 
         const powPrivateKey = key.derivePrivateKey(request.keyPath);
 
-        const privateKey = Albatross.PrivateKey.deserialize(powPrivateKey.serialize());
-        const keyPair = Albatross.KeyPair.derive(privateKey);
+        const privateKey = Nimiq.PrivateKey.deserialize(powPrivateKey.serialize());
+        const keyPair = Nimiq.KeyPair.derive(privateKey);
 
         const results = request.transactions.map(transaction => {
             transaction.sign(keyPair);
@@ -163,7 +163,7 @@ class SignStaking {
     }
 
     /**
-     * @param {Albatross.PlainTransaction} plain
+     * @param {Nimiq.PlainTransaction} plain
      * @returns {string}
      */
     _formatData(plain) {
diff --git a/src/request/sign-staking/SignStakingApi.js b/src/request/sign-staking/SignStakingApi.js
index 8c1f037ad..374f0a506 100644
--- a/src/request/sign-staking/SignStakingApi.js
+++ b/src/request/sign-staking/SignStakingApi.js
@@ -2,7 +2,6 @@
 /* global SignStaking */
 /* global Errors */
 /* global Nimiq */
-/* global Albatross */
 
 /** @extends {TopLevelApi<KeyguardRequest.SignStakingRequest>} */
 class SignStakingApi extends TopLevelApi { // eslint-disable-line no-unused-vars
@@ -47,7 +46,7 @@ class SignStakingApi extends TopLevelApi { // eslint-disable-line no-unused-vars
     /**
      * Checks that the given layout is valid
      * @param {unknown} transactions
-     * @returns {Albatross.Transaction[]}
+     * @returns {Nimiq.Transaction[]}
      */
     parseStakingTransaction(transactions) {
         if (!transactions) {
@@ -66,9 +65,9 @@ class SignStakingApi extends TopLevelApi { // eslint-disable-line no-unused-vars
             if (!(transaction instanceof Uint8Array)) {
                 throw new Errors.InvalidRequestError('transaction must be a Uint8Array');
             }
-            const tx = Albatross.Transaction.fromAny(Nimiq.BufferUtils.toHex(transaction));
+            const tx = Nimiq.Transaction.fromAny(Nimiq.BufferUtils.toHex(transaction));
 
-            if (tx.senderType !== Albatross.AccountType.Staking && tx.recipientType !== Albatross.AccountType.Staking) {
+            if (tx.senderType !== Nimiq.AccountType.Staking && tx.recipientType !== Nimiq.AccountType.Staking) {
                 throw new Errors.InvalidRequestError('transaction must be a staking transaction');
             }
 
diff --git a/src/request/sign-staking/index.html b/src/request/sign-staking/index.html
index 4a68e8489..91c18220d 100644
--- a/src/request/sign-staking/index.html
+++ b/src/request/sign-staking/index.html
@@ -14,7 +14,6 @@
           connect-src 'self' https://api.coingecko.com">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
     <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
@@ -32,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-staking/index.js b/src/request/sign-staking/index.js
index e132528a2..ff2c71692 100644
--- a/src/request/sign-staking/index.js
+++ b/src/request/sign-staking/index.js
@@ -1,6 +1,4 @@
 /* global SignStakingApi */
 /* global runKeyguard */
 
-runKeyguard(SignStakingApi, {
-    loadAlbatross: true,
-});
+runKeyguard(SignStakingApi);
diff --git a/src/request/sign-swap/SignSwap.js b/src/request/sign-swap/SignSwap.js
index f4bd0764c..1603c5a7e 100644
--- a/src/request/sign-swap/SignSwap.js
+++ b/src/request/sign-swap/SignSwap.js
@@ -66,7 +66,7 @@ class SignSwap {
         // The total amount the user loses
         let swapFromValue = 0;
         switch (fundTx.type) {
-            case 'NIM': swapFromValue = fundTx.transaction.value + fundTx.transaction.fee; break;
+            case 'NIM': swapFromValue = Number(fundTx.transaction.value + fundTx.transaction.fee); break;
             case 'BTC': swapFromValue = fundTx.inputs.reduce((sum, input) => sum + input.witnessUtxo.value, 0)
                     - (fundTx.changeOutput ? fundTx.changeOutput.value : 0); break;
             case 'USDC_MATIC':
@@ -79,7 +79,7 @@ class SignSwap {
         // The total amount the user receives
         let swapToValue = 0;
         switch (redeemTx.type) {
-            case 'NIM': swapToValue = redeemTx.transaction.value; break;
+            case 'NIM': swapToValue = Number(redeemTx.transaction.value); break;
             case 'BTC': swapToValue = redeemTx.output.value; break;
             case 'USDC_MATIC':
             case 'USDT_MATIC':
@@ -466,12 +466,12 @@ class SignSwap {
             case 'NIM':
                 return fundTx.type === 'NIM'
                     // When the user funds NIM, the service receives the HTLC balance - their network fee.
-                    ? fundTx.transaction.value - request.fundFees.redeeming
+                    ? Number(fundTx.transaction.value) - request.fundFees.redeeming
                     : redeemTx.type === 'NIM'
                         // When the user redeems NIM, the service lost the HTLC balance + their network fee.
                         // The transaction value is "HTLC balance - tx fee", therefore the "HTLC balance"
                         // is the transaction value + tx fee.
-                        ? redeemTx.transaction.value + redeemTx.transaction.fee + request.redeemFees.funding
+                        ? Number(redeemTx.transaction.value + redeemTx.transaction.fee) + request.redeemFees.funding
                         : 0; // Should never happen, if parsing works correctly
             case 'BTC':
                 return fundTx.type === 'BTC'
diff --git a/src/request/sign-swap/SignSwapApi.js b/src/request/sign-swap/SignSwapApi.js
index b3f36c60c..3b7cdb478 100644
--- a/src/request/sign-swap/SignSwapApi.js
+++ b/src/request/sign-swap/SignSwapApi.js
@@ -39,12 +39,12 @@ class SignSwapApi extends PolygonRequestParserMixin(BitcoinRequestParserMixin(To
                 type: 'NIM',
                 keyPath: this.parsePath(request.fund.keyPath, 'fund.keyPath'),
                 transaction: this.parseTransaction({
-                    data: new Uint8Array(78), // Dummy, required for CONTRACT_CREATION flag
+                    recipientData: new Uint8Array(78), // Dummy, required for CONTRACT_CREATION flag
                     ...request.fund,
                     // Enforced properties
                     recipient: 'CONTRACT_CREATION',
-                    recipientType: Nimiq.Account.Type.HTLC,
-                    flags: Nimiq.Transaction.Flag.CONTRACT_CREATION,
+                    recipientType: Nimiq.AccountType.HTLC,
+                    flags: 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */,
                 }),
                 senderLabel: /** @type {string} */ (this.parseLabel(
                     request.fund.senderLabel, false, 'fund.senderLabel',
@@ -119,12 +119,12 @@ class SignSwapApi extends PolygonRequestParserMixin(BitcoinRequestParserMixin(To
                 type: 'NIM',
                 keyPath: this.parsePath(request.redeem.keyPath, 'redeem.keyPath'),
                 transaction: this.parseTransaction({
-                    sender: Nimiq.Address.NULL.toUserFriendlyAddress(), // Dummy
+                    sender: new Nimiq.Address(new Uint8Array(20)).toUserFriendlyAddress(), // Dummy
                     ...request.redeem,
                     // Enforced properties
-                    senderType: Nimiq.Account.Type.HTLC,
-                    recipientType: Nimiq.Account.Type.BASIC,
-                    flags: Nimiq.Transaction.Flag.NONE,
+                    senderType: Nimiq.AccountType.HTLC,
+                    recipientType: Nimiq.AccountType.Basic,
+                    flags: 0 /* Nimiq.Transaction.Flag.NONE */,
                 }),
                 recipientLabel: /** @type {string} */ (this.parseLabel(
                     request.redeem.recipientLabel, false, 'recipientLabel',
@@ -207,7 +207,8 @@ class SignSwapApi extends PolygonRequestParserMixin(BitcoinRequestParserMixin(To
             parsedRequest.direction = this.parseDirection(request.direction);
 
             parsedRequest.nimiqAddresses = request.nimiqAddresses.map((address, index) => ({
-                address: this.parseAddress(address.address, `nimiqAddresses[${index}].address`).toUserFriendlyAddress(),
+                address: this.parseAddress(address.address, `nimiqAddresses[${index}].address`, false)
+                    .toUserFriendlyAddress(),
                 balance: this.parsePositiveInteger(address.balance, true, `nimiqAddresses[${index}].balance`),
             }));
             parsedRequest.bitcoinAccount = {
diff --git a/src/request/sign-swap/index.html b/src/request/sign-swap/index.html
index 2146c65e7..8415742e4 100644
--- a/src/request/sign-swap/index.html
+++ b/src/request/sign-swap/index.html
@@ -14,7 +14,7 @@
           connect-src 'self'">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web.js"></script>
+    <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
 
@@ -33,6 +33,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-transaction/SignTransaction.js b/src/request/sign-transaction/SignTransaction.js
index bee8a7d24..abbbb250a 100644
--- a/src/request/sign-transaction/SignTransaction.js
+++ b/src/request/sign-transaction/SignTransaction.js
@@ -1,5 +1,4 @@
 /* global Nimiq */
-/* global Albatross */
 /* global Key */
 /* global KeyStore */
 /* global SignTransactionApi */
@@ -12,6 +11,7 @@
 /* global Constants */
 /* global NumberFormatting */
 /* global I18n */
+/* global lunasToCoins */
 
 /**
  * @callback SignTransaction.resolve
@@ -77,10 +77,10 @@ class SignTransaction {
                 recipient: recipientAddress,
                 label: recipientLabel || recipientAddress,
                 imageUrl: request.shopLogoUrl,
-                amount: request.transaction.value,
+                amount: Number(request.transaction.value),
                 currency: /** @type {'nim'} */ ('nim'),
-                unitsToCoins: Nimiq.Policy.lunasToCoins,
-                networkFee: request.transaction.fee,
+                unitsToCoins: lunasToCoins,
+                networkFee: Number(request.transaction.fee),
             }), $paymentInfoLine);
         } else {
             $paymentInfoLine.remove();
@@ -94,9 +94,9 @@ class SignTransaction {
         const $data = /** @type {HTMLDivElement} */ (this.$el.querySelector('#data'));
 
         // Set value and fee.
-        $value.textContent = NumberFormatting.formatNumber(Nimiq.Policy.lunasToCoins(transaction.value));
+        $value.textContent = NumberFormatting.formatNumber(lunasToCoins(Number(transaction.value)));
         if ($fee && transaction.fee > 0) {
-            $fee.textContent = NumberFormatting.formatNumber(Nimiq.Policy.lunasToCoins(transaction.fee));
+            $fee.textContent = NumberFormatting.formatNumber(lunasToCoins(Number(transaction.fee)));
             const $feeSection = /** @type {HTMLDivElement} */ (this.$el.querySelector('.fee-section'));
             $feeSection.classList.remove('display-none');
         }
@@ -184,25 +184,25 @@ class SignTransaction {
 
         const powPrivateKey = key.derivePrivateKey(request.keyPath);
 
-        const privateKey = Albatross.PrivateKey.deserialize(powPrivateKey.serialize());
-        const keyPair = Albatross.KeyPair.derive(privateKey);
+        const privateKey = Nimiq.PrivateKey.deserialize(powPrivateKey.serialize());
+        const keyPair = Nimiq.KeyPair.derive(privateKey);
 
-        /** @type {Albatross.Transaction} */
+        /** @type {Nimiq.Transaction} */
         let tx;
 
         if (!request.transaction.data.length) {
-            tx = Albatross.TransactionBuilder.newBasic(
+            tx = Nimiq.TransactionBuilder.newBasic(
                 keyPair.toAddress(),
-                Albatross.Address.fromString(request.transaction.recipient.toHex()),
+                Nimiq.Address.fromString(request.transaction.recipient.toHex()),
                 BigInt(request.transaction.value),
                 BigInt(request.transaction.fee),
                 request.transaction.validityStartHeight,
                 request.transaction.networkId,
             );
         } else {
-            tx = Albatross.TransactionBuilder.newBasicWithData(
+            tx = Nimiq.TransactionBuilder.newBasicWithData(
                 keyPair.toAddress(),
-                Albatross.Address.fromString(request.transaction.recipient.toHex()),
+                Nimiq.Address.fromString(request.transaction.recipient.toHex()),
                 request.transaction.data,
                 BigInt(request.transaction.value),
                 BigInt(request.transaction.fee),
@@ -236,7 +236,7 @@ class SignTransaction {
             return I18n.translatePhrase('funding-cashlink');
         }
 
-        if (transaction.hasFlag(Nimiq.Transaction.Flag.CONTRACT_CREATION)) {
+        if (transaction.flags === 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */) {
             // TODO: Decode contract creation transactions
             // return ...
         }
diff --git a/src/request/sign-transaction/index.html b/src/request/sign-transaction/index.html
index 81f5a099a..8e6a547f1 100644
--- a/src/request/sign-transaction/index.html
+++ b/src/request/sign-transaction/index.html
@@ -14,7 +14,6 @@
           connect-src 'self' https://api.coingecko.com">
     <title>Nimiq Keyguard</title>
 
-    <script defer manual src="../../../node_modules/@nimiq/core-web/web-offline.js"></script>
     <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
     <script defer manual src="../../lib/Constants.js"></script>
     <script defer manual src="../../config/config.local.js"></script>
@@ -32,6 +31,7 @@
     <script defer bundle-common src="../../lib/AccountStore.js"></script>
     <script defer bundle-common src="../../common.js"></script>
 
+    <script defer bundle-toplevel src="../../lib/Observable.js"></script>
     <script defer bundle-toplevel src="../../components/NoRequestErrorPage.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordBox.js"></script>
     <script defer bundle-toplevel src="../../components/PasswordInput.js"></script>
diff --git a/src/request/sign-transaction/index.js b/src/request/sign-transaction/index.js
index 8ffeeafca..82dd1fa6e 100644
--- a/src/request/sign-transaction/index.js
+++ b/src/request/sign-transaction/index.js
@@ -1,6 +1,4 @@
 /* global SignTransactionApi */
 /* global runKeyguard */
 
-runKeyguard(SignTransactionApi, {
-    loadAlbatross: true,
-});
+runKeyguard(SignTransactionApi);
diff --git a/src/request/swap-iframe/SwapIFrameApi.js b/src/request/swap-iframe/SwapIFrameApi.js
index b2b8ec558..cff186209 100644
--- a/src/request/swap-iframe/SwapIFrameApi.js
+++ b/src/request/swap-iframe/SwapIFrameApi.js
@@ -193,7 +193,7 @@ class SwapIFrameApi extends BitcoinRequestParserMixin(RequestParser) { // eslint
                 type: 'NIM',
                 htlcDetails,
                 htlcData: request.redeem.htlcData,
-                htlcAddress: this.parseAddress(request.redeem.htlcAddress, 'redeem.htlcAddress')
+                htlcAddress: this.parseAddress(request.redeem.htlcAddress, 'redeem.htlcAddress', false)
                     .toUserFriendlyAddress(),
             };
         }
@@ -429,12 +429,24 @@ class SwapIFrameApi extends BitcoinRequestParserMixin(RequestParser) { // eslint
             const privateKey = new Nimiq.PrivateKey(Nimiq.BufferUtils.fromHex(privateKeys.nim));
             const publicKey = Nimiq.PublicKey.derive(privateKey);
 
-            const transaction = Nimiq.Transaction.fromPlain({
+            let transaction = Nimiq.Transaction.fromPlain({
                 ...storedRequest.fund.transaction.toPlain(),
-                data: parsedRequest.fund.htlcData,
-                // Must be the exact object reference, which gets lost with toPlain()
-                recipient: Nimiq.Address.CONTRACT_CREATION,
+                data: {
+                    type: 'raw',
+                    raw: Nimiq.BufferUtils.toHex(parsedRequest.fund.htlcData),
+                },
+                // This NULL-address as the recipient gets replaced below
+                recipient: new Nimiq.Address(new Uint8Array(20)).toUserFriendlyAddress(),
             });
+            // Calculate the contract address of the HTLC that gets created and recreate the transaction
+            // with that address as the recipient:
+            const contractAddress = new Nimiq.Address(Nimiq.BufferUtils.fromHex(transaction.hash()));
+            transaction = new Nimiq.Transaction(
+                transaction.sender, transaction.senderType, transaction.senderData,
+                contractAddress, transaction.recipientType, transaction.data,
+                transaction.value, transaction.fee,
+                transaction.flags, transaction.validityStartHeight, transaction.networkId,
+            );
 
             const signature = Nimiq.Signature.create(privateKey, publicKey, transaction.serializeContent());
 
@@ -444,18 +456,18 @@ class SwapIFrameApi extends BitcoinRequestParserMixin(RequestParser) { // eslint
                 signature: signature.serialize(),
             };
 
-            if (transaction.senderType === Nimiq.Account.Type.BASIC) {
-                const feePerUnit = transaction.fee / transaction.serializedSize;
-                const fee = Math.ceil(feePerUnit * 167); // 167 = NIM HTLC refunding tx size
+            if (transaction.senderType === Nimiq.AccountType.Basic) {
+                const feePerUnit = Number(transaction.fee) / transaction.serializedSize;
+                const fee = BigInt(Math.ceil(feePerUnit * 167)); // 167 = NIM HTLC refunding tx size
 
                 // Create refund transaction
-                const refundTransaction = new Nimiq.ExtendedTransaction(
-                    transaction.recipient, Nimiq.Account.Type.HTLC,
-                    transaction.sender, Nimiq.Account.Type.BASIC,
+                const refundTransaction = new Nimiq.Transaction(
+                    transaction.recipient, Nimiq.AccountType.HTLC, new Uint8Array(0),
+                    transaction.sender, Nimiq.AccountType.Basic, new Uint8Array(0),
                     transaction.value - fee, fee,
+                    0 /* Nimiq.Transaction.Flag.NONE */,
                     parsedRequest.fund.htlcDetails.timeoutBlockHeight,
-                    Nimiq.Transaction.Flag.NONE,
-                    new Uint8Array(0),
+                    CONFIG.NIMIQ_NETWORK_ID,
                 );
 
                 const refundSignature = Nimiq.Signature.create(
@@ -465,9 +477,9 @@ class SwapIFrameApi extends BitcoinRequestParserMixin(RequestParser) { // eslint
                 );
                 const refundSignatureProof = Nimiq.SignatureProof.singleSig(publicKey, refundSignature);
 
-                const proof = new Nimiq.SerialBuffer(1 + Nimiq.SignatureProof.SINGLE_SIG_SIZE);
-                proof.writeUint8(Nimiq.HashedTimeLockedContract.ProofType.TIMEOUT_RESOLVE);
-                refundSignatureProof.serialize(proof);
+                const proof = new Nimiq.SerialBuffer(1 + (32 + 1 + 64 /* Nimiq.SignatureProof.SINGLE_SIG_SIZE */));
+                proof.writeUint8(3 /* Nimiq.HashedTimeLockedContract.ProofType.TIMEOUT_RESOLVE */);
+                proof.write(refundSignatureProof.serialize());
                 refundTransaction.proof = proof;
 
                 result.refundTx = Nimiq.BufferUtils.toHex(refundTransaction.serialize());
diff --git a/src/request/swap-iframe/index.html b/src/request/swap-iframe/index.html
index 9d6c905b2..240af8a7d 100644
--- a/src/request/swap-iframe/index.html
+++ b/src/request/swap-iframe/index.html
@@ -10,7 +10,7 @@
               style-src 'self';
               font-src 'self';">
 
-        <script defer manual src="../../../node_modules/@nimiq/core-web/web.js"></script>
+        <script defer manual type="module" src="../../lib/AlbatrossWasm.mjs"></script>
         <script defer manual src="../../lib/Constants.js"></script>
         <script defer manual src="../../config/config.local.js"></script>
 
diff --git a/tests/DummyData.spec.js b/tests/DummyData.spec.js
index 37ea6c8df..715f00832 100644
--- a/tests/DummyData.spec.js
+++ b/tests/DummyData.spec.js
@@ -8,7 +8,6 @@
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10 * 1000; // 10 seconds
 
 beforeAll(async () => {
-    Nimiq._path = `${window.location.origin}/base/node_modules/@nimiq/core-web/`;
     await loadNimiq();
 });
 
@@ -26,6 +25,7 @@ const mnemonics = [
     'habit hurdle aspect maid trip client walk nice fabric mountain tattoo flame quantum foil poem elder security joy hungry fabric casino spring eye scene',
 ];
 
+/** @type {[Nimiq.Entropy, Nimiq.PrivateKey]} */
 const secrets = [
     new Nimiq.Entropy(keys[0]),
     new Nimiq.PrivateKey(keys[1]),
@@ -46,7 +46,7 @@ const hashes = () => {
             ? secret.serialize()
             : Nimiq.PublicKey.derive(secret).toAddress().serialize();
 
-        return Nimiq.Hash.blake2b(input).toBase64();
+        return Nimiq.BufferUtils.toBase64(Nimiq.Hash.computeBlake2b(input));
     }));
 };
 
diff --git a/tests/lib/AccountStore.spec.js b/tests/lib/AccountStore.spec.js
index c7cfc7e66..ae1a0c0bf 100644
--- a/tests/lib/AccountStore.spec.js
+++ b/tests/lib/AccountStore.spec.js
@@ -53,7 +53,7 @@ describe('AccountStore', () => {
     });
 
     it('can get a Key', async function() {
-        const passwordBytes = Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword);
+        const passwordBytes = Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword);
         const key = await AccountStore.instance.get('NQ71 CT4K 7R9R EHSB 7HY9 TSTP XNRQ L2RK 8U4U', passwordBytes);
         expect(key).toEqual(Dummy.deprecatedAccount2Keys()[0]);
     });
diff --git a/tests/lib/Key.spec.js b/tests/lib/Key.spec.js
index 55c71a5a3..df94b0d57 100644
--- a/tests/lib/Key.spec.js
+++ b/tests/lib/Key.spec.js
@@ -6,15 +6,17 @@ describe('Key', () => {
     it('can sign a message (LEGACY)', () => {
         const key = new Key(Dummy.secrets[1]);
         const pubkey = Nimiq.PublicKey.derive(Dummy.secrets[1]);
-        const data = Nimiq.BufferUtils.fromAscii('hello');
-        const signedData = Nimiq.BufferUtils.fromAscii('\x16Nimiq Signed Message:\n5hello');
+        const data = Nimiq.BufferUtils.fromUtf8('hello');
+        const signedData = Nimiq.BufferUtils.fromUtf8('\x16Nimiq Signed Message:\n5hello');
         const hashedSignedData = Nimiq.Hash.computeSha256(signedData);
 
         const signature1 = key.signMessage('m', data);
-        expect(signature1.verify(pubkey, hashedSignedData)).toBe(true);
+        const proof1 = Nimiq.SignatureProof.singleSig(pubkey, signature1);
+        expect(proof1.verify(hashedSignedData)).toBe(true);
 
         const signature2 = key.signMessage('m/0\'', data);
-        expect(signature2.verify(pubkey, hashedSignedData)).toBe(true);
+        const proof2 = Nimiq.SignatureProof.singleSig(pubkey, signature2);
+        expect(proof2.verify(hashedSignedData)).toBe(true);
 
         expect(signature1).toEqual(signature2);
     });
@@ -23,17 +25,19 @@ describe('Key', () => {
         const key = new Key(Dummy.secrets[0]);
         const data = new Nimiq.SerialBuffer([1, 2, 3, 4, 5, 6]);
         const signedData = new Uint8Array(
-            Array.from(Nimiq.BufferUtils.fromAscii('\x16Nimiq Signed Message:\n6')).concat([1, 2, 3, 4, 5, 6]),
+            Array.from(Nimiq.BufferUtils.fromUtf8('\x16Nimiq Signed Message:\n6')).concat([1, 2, 3, 4, 5, 6]),
         );
         const hashedSignedData = Nimiq.Hash.computeSha256(signedData);
 
         const pubkey1 = key.derivePublicKey('m/0\'');
         const signature1 = key.signMessage('m/0\'', data);
-        expect(signature1.verify(pubkey1, hashedSignedData)).toBe(true);
+        const proof1 = Nimiq.SignatureProof.singleSig(pubkey1, signature1);
+        expect(proof1.verify(hashedSignedData)).toBe(true);
 
         const pubkey2 = key.derivePublicKey('m/0\'/0\'');
         const signature2 = key.signMessage('m/0\'/0\'', data);
-        expect(signature2.verify(pubkey2, hashedSignedData)).toBe(true);
+        const proof2 = Nimiq.SignatureProof.singleSig(pubkey2, signature2);
+        expect(proof2.verify(hashedSignedData)).toBe(true);
 
         expect(signature1).not.toEqual(signature2);
     });
diff --git a/tests/lib/KeyStore.spec.js b/tests/lib/KeyStore.spec.js
index 248f389c7..9e709bbb5 100644
--- a/tests/lib/KeyStore.spec.js
+++ b/tests/lib/KeyStore.spec.js
@@ -34,7 +34,7 @@ describe('KeyStore', () => {
     it('can get and decrypt keys', async () => {
         const keys = await Promise.all([
             KeyStore.instance.get(Dummy.keyInfos()[0].id),
-            KeyStore.instance.get(Dummy.keyInfos()[1].id, Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword)),
+            KeyStore.instance.get(Dummy.keyInfos()[1].id, Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword)),
         ]);
 
         for (let [i, key] of keys.entries()) {
@@ -81,7 +81,7 @@ describe('KeyStore', () => {
         expect(currentKeys.length).toBe(0);
 
         // add an encrypted key
-        const password = Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword);
+        const password = Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword);
         await KeyStore.instance.put(new Key(
             Dummy.secrets[1],
             Dummy.keyInfos()[1].hasPin,
@@ -103,7 +103,7 @@ describe('KeyStore', () => {
             KeyStore.instance.get(Dummy.keyInfos()[1].id, password),
         ]);
         if (!key1 || !key2) throw new Error();
-        expect(key1.secret.equals(Dummy.secrets[0])).toBe(true);
+        expect(/** @type {Nimiq.Entropy} */ (key1.secret).equals(Dummy.secrets[0])).toBe(true);
         expect(key2.secret.equals(Dummy.secrets[1])).toBe(true);
     });
 
@@ -176,8 +176,8 @@ describe('KeyStore', () => {
         // first clear database
         await Dummy.Utils.deleteDummyKeyStore();
 
-        const password1 = Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword);
-        const password2 = Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword2);
+        const password1 = Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword);
+        const password2 = Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword2);
 
         let currentKeys = await KeyStore.instance.list();
         expect(currentKeys.length).toBe(0); // Just to be sure
@@ -217,7 +217,7 @@ describe('KeyStore', () => {
         // first clear database
         await Dummy.Utils.deleteDummyKeyStore();
 
-        const password = Nimiq.BufferUtils.fromAscii(Dummy.encryptionPassword);
+        const password = Nimiq.BufferUtils.fromUtf8(Dummy.encryptionPassword);
 
         // add key
         const id1 = await KeyStore.instance.put(new Key(Dummy.secrets[1]), password);
diff --git a/tests/lib/RequestParser.spec.js b/tests/lib/RequestParser.spec.js
index 8d5cfce9c..b06adb484 100644
--- a/tests/lib/RequestParser.spec.js
+++ b/tests/lib/RequestParser.spec.js
@@ -110,7 +110,7 @@ describe('RequestParser', () => {
         expect(() => requestParser.parseTransaction({})).toThrow();
 
         const transaction = {
-            data: new Uint8Array([84, 104, 97, 110, 107, 32, 121, 111, 117, 32, 102, 111, 114, 32, 115, 104, 111, 112, 112, 105, 110, 103, 32, 97, 116, 32, 115, 104, 111, 112, 46, 110, 105, 109, 105, 113, 46, 99, 111, 109, 32, 40, 72, 51, 88, 67, 48, 68, 41]),
+            recipientData: new Uint8Array([84, 104, 97, 110, 107, 32, 121, 111, 117, 32, 102, 111, 114, 32, 115, 104, 111, 112, 112, 105, 110, 103, 32, 97, 116, 32, 115, 104, 111, 112, 46, 110, 105, 109, 105, 113, 46, 99, 111, 109, 32, 40, 72, 51, 88, 67, 48, 68, 41]),
             fee: 0,
             recipient: new Uint8Array([225, 253, 0, 255, 238, 105, 158, 173, 122, 16, 27, 203, 31, 16, 3, 178, 231, 105, 81, 188]),
             sender: new Uint8Array([238, 61, 13, 183, 158, 200, 247, 106, 130, 61, 9, 123, 134, 82, 60, 95, 16, 71, 39, 70]),
@@ -119,17 +119,17 @@ describe('RequestParser', () => {
             value: 545000000,
         };
         expect(requestParser.parseTransaction(transaction)).toEqual(
-            new Nimiq.ExtendedTransaction(
+            new Nimiq.Transaction(
                 new Nimiq.Address(new Uint8Array([238, 61, 13, 183, 158, 200, 247, 106, 130, 61, 9, 123, 134, 82, 60, 95, 16, 71, 39, 70])), //sender
-                Nimiq.Account.Type.BASIC, // senderType
+                Nimiq.AccountType.Basic, // senderType
+                new Uint8Array(0),
                 new Nimiq.Address(new Uint8Array([225, 253, 0, 255, 238, 105, 158, 173, 122, 16, 27, 203, 31, 16, 3, 178, 231, 105, 81, 188])), // recipient
-                Nimiq.Account.Type.BASIC, //recipientType
-                545000000, // value
-                0, // fee
-                176450, // validityStartHeight
+                Nimiq.AccountType.Basic, //recipientType
+                new Uint8Array([84, 104, 97, 110, 107, 32, 121, 111, 117, 32, 102, 111, 114, 32, 115, 104, 111, 112, 112, 105, 110, 103, 32, 97, 116, 32, 115, 104, 111, 112, 46, 110, 105, 109, 105, 113, 46, 99, 111, 109, 32, 40, 72, 51, 88, 67, 48, 68, 41]), // recipientData
+                545000000n, // value
+                0n, // fee
                 0, // flags
-                new Uint8Array([84, 104, 97, 110, 107, 32, 121, 111, 117, 32, 102, 111, 114, 32, 115, 104, 111, 112, 112, 105, 110, 103, 32, 97, 116, 32, 115, 104, 111, 112, 46, 110, 105, 109, 105, 113, 46, 99, 111, 109, 32, 40, 72, 51, 88, 67, 48, 68, 41]), // data
-                new Uint8Array(0), // Proof
+                176450, // validityStartHeight
                 5, // networkId
             ),
         );
diff --git a/tests/lib/Utf8Tools.spec.js b/tests/lib/Utf8Tools.spec.js
index 66ad460ae..2335a15d7 100644
--- a/tests/lib/Utf8Tools.spec.js
+++ b/tests/lib/Utf8Tools.spec.js
@@ -4,7 +4,7 @@ describe('Utf8Tools', function() {
 
     it('can encode and decode correctly', function() {
         const toolsEncodedAscii = Utf8Tools.stringToUtf8ByteArray(ASCII_MESSAGE);
-        const nimiqEncodedAscii = Nimiq.BufferUtils.fromAscii(ASCII_MESSAGE);
+        const nimiqEncodedAscii = Nimiq.BufferUtils.fromUtf8(ASCII_MESSAGE);
         expect(toolsEncodedAscii).toEqual(nimiqEncodedAscii);
 
         const toolsEncodedUtf8 = Utf8Tools.stringToUtf8ByteArray(UTF8_MESSAGE);
diff --git a/tools/build.sh b/tools/build.sh
index 7f6962480..7f96fb87a 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -102,8 +102,7 @@ make_file_hash() {
 output "🧐  Validating Nimiq Core files integrity"
 
 nimiq_core_hashsums=\
-"e1b8b5233f0a8dc73c99dfcfd18d5aa5fa442c12eba2526d5c70db88b7923af9  node_modules/@nimiq/core-web/web.js
- 8edc158d4a0e2baece54262aa5817e3db44946d3c8af9271fd9f4bc7b4fde91e  node_modules/@nimiq/core-web/web-offline.js
+"8edc158d4a0e2baece54262aa5817e3db44946d3c8af9271fd9f4bc7b4fde91e  node_modules/@nimiq/core-web/web-offline.js
  a658ca600c43789c8daff47578ea5758e7a1a2a5fee1b249e7bb5ce691d126cd  node_modules/@nimiq/core-web/worker-wasm.wasm
  d61df01adc927cb2832314ef5634b9ea97092acacb09beb7628b1a98a0962c70  node_modules/@nimiq/core-web/worker-wasm.js
  154b1251428363c8658c99acbf55b31eef177c0d447767a506952924a37494a9  node_modules/@nimiq/core-web/worker-js.js
@@ -253,7 +252,6 @@ JS_POLYGON_BUNDLE=$(add_hash_to_file_name dist/request/$JS_POLYGON_BUNDLE)
 CSS_TOPLEVEL_BUNDLE=$(add_hash_to_file_name dist/request/$CSS_TOPLEVEL_BUNDLE)
 
 CORE_LIB_HASH=$(make_file_hash node_modules/@nimiq/core-web/web-offline.js)
-CORE_WEB_LIB_HASH=$(make_file_hash node_modules/@nimiq/core-web/web.js)
 
 # process index.html scripts and links for each request
 output "🛠️   Building request index.html files"
@@ -279,11 +277,6 @@ for DIR in src/request/*/ ; do
             print space[1] "<script defer src=\"/assets/nimiq/web-offline.js\" integrity=\"sha256-'${CORE_LIB_HASH}'\"></script>"
             next
         }
-        /<script.*web\.js/ {
-            split($0, space, "<") # Preserve intendation.
-            print space[1] "<script defer src=\"/assets/nimiq/web.js\" integrity=\"sha256-'${CORE_WEB_LIB_HASH}'\"></script>"
-            next
-        }
         /<script.*type="module"/ {
             print
             next
@@ -371,9 +364,7 @@ sed -i 's/\.\.\/\.\.\/node_modules\/@nimiq\/albatross-wasm/\.\.\/assets\/albatro
 
 # copy Nimiq files
 output "‼️   Copying Nimiq files"
-cp -v node_modules/@nimiq/core-web/web.js \
-      node_modules/@nimiq/core-web/web.js.map \
-      node_modules/@nimiq/core-web/web-offline.js \
+cp -v node_modules/@nimiq/core-web/web-offline.js \
       node_modules/@nimiq/core-web/web-offline.js.map \
       node_modules/@nimiq/core-web/worker-wasm.wasm \
       node_modules/@nimiq/core-web/worker-wasm.js \
diff --git a/tools/dependencyValidator.js b/tools/dependencyValidator.js
index 48638d618..29d92c6f8 100644
--- a/tools/dependencyValidator.js
+++ b/tools/dependencyValidator.js
@@ -8,13 +8,14 @@ funcs.find('src', '.js').forEach(file => {
     const className = funcs.stripExtension(file);
     class2Path.set(className, file);
 });
+class2Path.set('lunasToCoins', 'src/common.js');
 class2Path.set('TRANSLATIONS', 'src/translations/index.js');
 class2Path.set('CONFIG', 'src/config/config.local.js');
-class2Path.set('Nimiq', 'node_modules/@nimiq/core-web/web-offline.js');
+class2Path.set('Nimiq', 'src/lib/AlbatrossWasm.mjs');
+class2Path.set('NimiqPoW', 'node_modules/@nimiq/core-web/web-offline.js');
 class2Path.set('Rpc', 'node_modules/@nimiq/rpc/dist/rpc.umd.js');
 class2Path.set('BarcodeDetector', 'src/lib/QrScanner.js');
 class2Path.set('ethers', 'node_modules/ethers/dist/ethers.umd.js');
-class2Path.set('Albatross', 'src/lib/AlbatrossWasm.mjs');
 class2Path.delete('index');
 
 const requests = funcs.listDirectories('src/request');
@@ -51,9 +52,6 @@ requests.forEach(/** @param {string} request */ request => {
     const scripts = funcs.findScripts(`src/request/${request}/index.html`);
     // console.log("scripts:", scripts);
 
-    const webJsIndex = scripts.indexOf('../../../node_modules/@nimiq/core-web/web.js');
-    if (webJsIndex > -1) scripts[webJsIndex] = '../../../node_modules/@nimiq/core-web/web-offline.js';
-
     // Find missing and unneeded scripts
     const unneededScripts = scripts.slice();
     const missingScripts = relativeDepsPaths.filter(depPath => {
diff --git a/types/Albatross.d.ts b/types/Albatross.d.ts
deleted file mode 100644
index 8f475f290..000000000
--- a/types/Albatross.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as _Albatross from '../node_modules/@nimiq/albatross-wasm/types/web';
-
-export as namespace Albatross;
-export = _Albatross;
-
-declare global {
-    const Albatross: typeof _Albatross;
-}
diff --git a/types/Keyguard.d.ts b/types/Keyguard.d.ts
index a4ce9be18..750b8c3ca 100644
--- a/types/Keyguard.d.ts
+++ b/types/Keyguard.d.ts
@@ -202,16 +202,16 @@ type Transform<T, K extends keyof T, E> = Omit<T, K> & E;
 
 type KeyId2KeyInfo<T extends { keyId: string }> = Transform<T, 'keyId', { keyInfo: KeyInfo }>
 type ConstructTransaction<T extends KeyguardRequest.TransactionInfo> = Transform<T,
-    'sender' | 'senderType' | 'recipient' | 'recipientType' | 'value' | 'fee' |
-    'validityStartHeight' | 'data' | 'flags',
-    { transaction: Nimiq.ExtendedTransaction }>
+    'sender' | 'senderType' | 'senderData' | 'recipient' | 'recipientType' | 'recipientData' |
+    'value' | 'fee' | 'validityStartHeight' | 'flags',
+    { transaction: Nimiq.Transaction }>
 
 type ConstructSwap<T extends KeyguardRequest.SignSwapRequestCommon> = Transform<T,
     'fund' | 'redeem', {
         fund: {
             type: 'NIM',
             keyPath: string,
-            transaction: Nimiq.ExtendedTransaction,
+            transaction: Nimiq.Transaction,
             senderLabel: string,
         } | {
             type: 'BTC',
@@ -240,7 +240,7 @@ type ConstructSwap<T extends KeyguardRequest.SignSwapRequestCommon> = Transform<
         redeem: {
             type: 'NIM',
             keyPath: string,
-            transaction: Nimiq.ExtendedTransaction,
+            transaction: Nimiq.Transaction,
             recipientLabel: string,
         } | {
             type: 'BTC',
@@ -285,8 +285,8 @@ type Parsed<T extends KeyguardRequest.Request> =
         ConstructTransaction<KeyId2KeyInfo<KeyguardRequest.SignTransactionRequestCashlink>> :
     T extends Is<T, KeyguardRequest.SignStakingRequest> ?
         Transform<KeyId2KeyInfo<KeyguardRequest.SignStakingRequest> & {
-            plain: Albatross.PlainTransaction[],
-        }, 'transaction', { transactions: Albatross.Transaction[] }> :
+            plain: Nimiq.PlainTransaction[],
+        }, 'transaction', { transactions: Nimiq.Transaction[] }> :
     T extends Is<T, KeyguardRequest.SignMessageRequest> ?
         Transform<
             KeyId2KeyInfo<KeyguardRequest.SignMessageRequest>,
diff --git a/types/Nimiq.d.ts b/types/Nimiq.d.ts
index 15a232db5..064f2caee 100644
--- a/types/Nimiq.d.ts
+++ b/types/Nimiq.d.ts
@@ -1,2 +1,8 @@
-// tslint:disable-next-line no-reference
-/// <reference path="../node_modules/@nimiq/core-web/namespace.d.ts" />
+import * as _Nimiq from '../node_modules/@nimiq/albatross-wasm/types/web';
+
+export as namespace Nimiq;
+export = _Nimiq;
+
+declare global {
+    const Nimiq: typeof _Nimiq;
+}
diff --git a/types/NimiqPoW.d.ts b/types/NimiqPoW.d.ts
new file mode 100644
index 000000000..aea004e49
--- /dev/null
+++ b/types/NimiqPoW.d.ts
@@ -0,0 +1,8 @@
+import _NimiqPoW from '../node_modules/@nimiq/core-web/types';
+
+export as namespace NimiqPoW;
+export = _NimiqPoW;
+
+declare global {
+    const NimiqPoW: typeof _NimiqPoW;
+}