diff --git a/.env b/.env
deleted file mode 100644
index a310146a26..0000000000
--- a/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-NODE_TAG=v6.8.0
-COMPILER_TAG=v7.2.0
diff --git a/.eslintrc.js b/.eslintrc.js
index 5b9286c39a..1106acb49f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
   ],
   ignorePatterns: [
     'dist', 'es', 'src/apis', 'docs/api', 'test/environment/ledger/browser', 'types-legacy',
+    'docs/examples', 'site',
   ],
   rules: {
     'rulesdir/tsdoc-syntax': 'error',
diff --git a/.github/workflows/docs-develop.yml b/.github/workflows/docs-develop.yml
index a166be4af6..c44cec002d 100644
--- a/.github/workflows/docs-develop.yml
+++ b/.github/workflows/docs-develop.yml
@@ -1,23 +1,30 @@
+# TODO: combine with docs-release using if
 name: Publish develop docs
 on:
   push:
     branches: ['develop']
-      
+
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.8
-      - uses: actions/cache@v2
+          python-version: 3.11
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip3
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+            ~/.autorest
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
       - run: pip3 install -r docs/requirements.txt
       - run: git config --global user.email "github-action@users.noreply.github.com"
       - run: git config --global user.name "GitHub Action"
-      - run: mike deploy --push develop
\ No newline at end of file
+      - run: mike deploy --push develop
diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
index 2ebf1fb129..a89987fc46 100644
--- a/.github/workflows/docs-release.yml
+++ b/.github/workflows/docs-release.yml
@@ -2,23 +2,29 @@ name: Publish release docs
 on:
   release:
     types: [released]
-      
+
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.8
-      - uses: actions/cache@v2
+          python-version: 3.11
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip3
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+            ~/.autorest
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
       - run: pip3 install -r docs/requirements.txt
+      - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
       - run: git config --global user.email "github-action@users.noreply.github.com"
       - run: git config --global user.name "GitHub Action"
-      - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-      - run: mike deploy --push --update-aliases $RELEASE_VERSION latest
\ No newline at end of file
+      - run: mike deploy --push --update-aliases $RELEASE_VERSION latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7e7101ecff..3ae182a336 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 name: Test & build
-on: [push, pull_request]
+on: [pull_request]
 jobs:
   main:
     runs-on: ubuntu-22.04
@@ -7,10 +7,10 @@ jobs:
       - run: |
           wget -q https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
           sudo apt install --allow-downgrades ./esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 100
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 18.x
       - uses: actions/cache@v3
diff --git a/.gitignore b/.gitignore
index 18ce8d8795..bf245d2b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ site
 /src/apis/
 /src/tx/builder/schema.generated.ts
 /tooling/autorest/compiler-swagger.yaml
+/tooling/autorest/middleware-openapi.yaml
 /test/environment/ledger/browser
 /types-legacy
 /bin
diff --git a/README.md b/README.md
index 8f61cea933..c08541bebb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # [æternity](https://aeternity.com)'s JavaScript SDK
 
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/aeternity/aepp-sdk-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/aeternity/aepp-sdk-js/context:javascript)
+[![main action](https://github.com/aeternity/aepp-sdk-js/actions/workflows/main.yml/badge.svg)](https://github.com/aeternity/aepp-sdk-js/actions/workflows/main.yml)
+[![codecov](https://codecov.io/gh/aeternity/aepp-sdk-js/branch/develop/graph/badge.svg?token=wON6gOciRP)](https://codecov.io/gh/aeternity/aepp-sdk-js)
+[![docs](https://github.com/aeternity/aepp-sdk-js/actions/workflows/docs-develop.yml/badge.svg)](https://github.com/aeternity/aepp-sdk-js/actions/workflows/docs-develop.yml)
 [![npm](https://img.shields.io/npm/v/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk)
 [![npm](https://img.shields.io/npm/l/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk)
 
@@ -50,7 +52,7 @@ We keep our [Changelog](docs/CHANGELOG.md) up to date.
 ## License
 
 ISC License (ISC)
-Copyright © 2018 æternity developers
+Copyright © 2023 æternity developers
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice
diff --git a/commitlint.config.js b/commitlint.config.js
index c02a6b35e3..1ff9f4adce 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -12,6 +12,8 @@ module.exports = {
         'channel',
         'compiler',
         'contract',
+        'middleware',
+        'docs', // TODO: remove after releasing 13.1.0
         'deps',
         'deps-dev',
         'node',
diff --git a/docker-compose.yml b/docker-compose.yml
index b48c5c7925..3bbbc2739f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   node:
-    image: aeternity/aeternity:${NODE_TAG}
+    image: aeternity/aeternity:v6.8.1
     hostname: node
     ports: ["3013:3013", "3113:3113", "3014:3014", "3114:3114"]
     volumes:
@@ -9,6 +9,6 @@ services:
       - ./docker/accounts_test.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
 
   compiler:
-    image: aeternity/aesophia_http:${COMPILER_TAG}
+    image: aeternity/aesophia_http:v7.4.0
     hostname: compiler
     ports: ["3080:3080"]
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 4fbc019989..1bd7d40b52 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,35 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [13.1.0](https://github.com/aeternity/aepp-sdk-js/compare/v13.0.1...v13.1.0) (2023-07-07)
+
+
+### Features
+
+* **account:** support signing typed data ([e5acdd4](https://github.com/aeternity/aepp-sdk-js/commit/e5acdd44e056cd60638088d74753f912809e63d2))
+* **aens:** add `ensureName` helper to check names ([f1322b1](https://github.com/aeternity/aepp-sdk-js/commit/f1322b13ab99860719ca47dda8e277ece6f7823c))
+* **aens:** support unicode names claim ([f837e90](https://github.com/aeternity/aepp-sdk-js/commit/f837e9081b0ac7eefa942f31e3056b00bd3768eb))
+* **aepp,wallet:** support inner transaction signing ([725782b](https://github.com/aeternity/aepp-sdk-js/commit/725782b8d84ac426d3a192d40de8e1e155e370bc))
+* **aepp,wallet:** support signing typed data ([78ce3b2](https://github.com/aeternity/aepp-sdk-js/commit/78ce3b259377a719dbf7ada7bf3b744e630f0dac))
+* **compiler:** add `generateAci`, `generateAciBySourceCode` ([981bcf2](https://github.com/aeternity/aepp-sdk-js/commit/981bcf252432a3b96aca92ccd682214c124009e2))
+* **middleware:** generate autorest wrapper ([bd08a08](https://github.com/aeternity/aepp-sdk-js/commit/bd08a087509bb47acf49cd015d5d7016b544094e))
+* **middleware:** implement MiddlewareSubscriber ([b51b0a3](https://github.com/aeternity/aepp-sdk-js/commit/b51b0a3ffb7258f3ed1f25395b95811f39ba0cc7))
+
+
+### Bug Fixes
+
+* `onAccount` option in AeSdkMethods ([290758b](https://github.com/aeternity/aepp-sdk-js/commit/290758b1884dc36209194bc6bd760c6063f9edd3))
+* **aens:** more accurate name check in `isNameValid` ([b62dcc6](https://github.com/aeternity/aepp-sdk-js/commit/b62dcc655f086cdf28611837e1ed3de2bae09d37))
+* **aepp:** call `onDetected` always with `newWallet` ([80d97fa](https://github.com/aeternity/aepp-sdk-js/commit/80d97fa4b3d2c3fd5fb710c2bdaae10ab521f129))
+* **contract:** use fallback account if `onAccount` not provided ([9033cd7](https://github.com/aeternity/aepp-sdk-js/commit/9033cd799be5974ebf28a49df181eeb63b1fce84))
+* converting proxied options to JSON ([efebbd1](https://github.com/aeternity/aepp-sdk-js/commit/efebbd139ea85c35e28bdcfe907670743f9fc1f4))
+* provide types in exports field of package.json ([dbd19e7](https://github.com/aeternity/aepp-sdk-js/commit/dbd19e70bca2d6dbc5b2392db478bb98936b63f2))
+* reject prefixes other then provided in isAddressValid ([9462add](https://github.com/aeternity/aepp-sdk-js/commit/9462adde8fab9848fca0a6d9a382dbd34f5e2b8f))
+* **tx-builder:** `buildTx` produces the same type as `unpackTx` accepts ([d3d6c88](https://github.com/aeternity/aepp-sdk-js/commit/d3d6c88607abbfb74acf016fba886540938b216d))
+* **tx-builder:** decode tag in entry error message ([db0d96f](https://github.com/aeternity/aepp-sdk-js/commit/db0d96f156f3e8cfe52c6a7d7411c359f6dae35c))
+* **wallet:** emit internal error if something broke while broadcast ([332d1b5](https://github.com/aeternity/aepp-sdk-js/commit/332d1b567f69bf6b7d3567af43fb805556ac015b))
+* **wallet:** throw reason of internal error to handle it in wallet ([276699b](https://github.com/aeternity/aepp-sdk-js/commit/276699ba22539f75591754d2e2c3c503d528fdf4))
+
 ### [13.0.1](https://github.com/aeternity/aepp-sdk-js/compare/v13.0.0...v13.0.1) (2023-04-24)
 
 
diff --git a/docs/README.md b/docs/README.md
index 2c6bb44994..5302787539 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,7 +13,7 @@ In case you're not using any JS bundling/compilation technique, the SDK can also
 ```html
 <script src="https://unpkg.com/@aeternity/aepp-sdk@VERSION/dist/aepp-sdk.browser-script.js"></script>
 ```
-...where `VERSION` is the version number of the SDK you want to use (eg. `8.1.0`).
+...where `VERSION` is the version number of the SDK you want to use (eg. `13.1.0`).
 
 ### Browser `<script>` tag
 The bundle will assign the SDK to a global variable called `Aeternity` that makes all functionalities of the SDK accessible.
diff --git a/docs/build-assets.sh b/docs/build-assets.sh
new file mode 100755
index 0000000000..a2470aab0f
--- /dev/null
+++ b/docs/build-assets.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+[ ! -d "node_modules" ] && npm i
+npm run docs:examples
+npm run docs:api
+
+# TODO: revisit --ignore-scripts after solving https://github.com/npm/cli/issues/4202
+perl -i -pe 's/"prepare"/"rem-prepare"/g' package.json
+mkdir -p docs/examples/browser
+
+echo Build example aepp
+cd ./examples/browser/aepp
+npm i
+VUE_APP_WALLET_URL=../wallet-iframe/ PUBLIC_PATH=./ npm run build -- --report
+mv -f dist/ ../../../docs/examples/browser/aepp
+
+echo Build example wallet-iframe
+cd ../wallet-iframe
+npm i
+VUE_APP_AEPP_URL=../aepp/ PUBLIC_PATH=./ npm run build -- --report
+mv -f dist/ ../../../docs/examples/browser/wallet-iframe
+
+echo Build example wallet-web-extension
+cd ../wallet-web-extension
+npm i
+NODE_OPTIONS=--openssl-legacy-provider npm run build -- --report
+mkdir ../../../docs/examples/browser/wallet-web-extension/
+mv artifacts/wallet-web-extension-v0.1.0-production.zip ../../../docs/examples/browser/wallet-web-extension/packed.zip
+mv dist/report.html ../../../docs/examples/browser/wallet-web-extension/report.html
+
+cd ../../..
+perl -i -pe 's/"rem-prepare"/"prepare"/g' package.json
diff --git a/docs/compatibility.md b/docs/compatibility.md
index f844505c66..12da5924e8 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -25,5 +25,5 @@ This package is expected to work in these environments:
 [jest]: https://github.com/facebook/jest/issues/4422#issuecomment-770274099
 [typescript]: README.md#typescript-projects
 [vue-cli4]: README.md#vue-cli4
-[vue-3]: README.md#vue-3
+[vue-3]: README.md#vue3
 [vite]: https://github.com/vitejs/vite/issues/9062#issuecomment-1202167352
diff --git a/docs/conda.yml b/docs/conda.yml
index e1322646d8..fac1f4392a 100644
--- a/docs/conda.yml
+++ b/docs/conda.yml
@@ -1,6 +1,6 @@
 dependencies:
-  - python=3.8.*
-  - nodejs=10.*
+  - python=3.11.*
+  - nodejs=18.*
   - pip
   - pip:
     - -r file:requirements.txt
diff --git a/docs/guides/address-length.md b/docs/guides/address-length.md
new file mode 100644
index 0000000000..5413b40d69
--- /dev/null
+++ b/docs/guides/address-length.md
@@ -0,0 +1,85 @@
+# The range of possible address length
+
+While base64-encoded strings have a constant length depending on the length of data to encode. In
+base58 it depends on the exact data to encode, e.g. it is shorter if encoded data have more
+leading zeroes.
+
+Building an aepp you may need to know the range of possible address lengths to validate an
+user-provided addresses (though better to use [isAddressValid]) or for designs of address-related
+components. Doing manual tests you may conclude that account address length is between 52 and 53
+chars, but it is not correct.
+
+```js
+import { MemoryAccount } from '@aeternity/aepp-sdk';
+
+const result = new Array(10000).fill()
+  .map(() => MemoryAccount.generate().address.length)
+  .reduce((p, n) => ({ ...p, [n]: (p[n] ?? 0) + 1 }), {});
+
+console.log(result);
+```
+
+Running the above code you would get something like `{ '51': 55, '52': 5021, '53': 4924 }`
+depending on generated accounts. So, while the most of addresses have length between 52 and 53
+chars, there is a ~0.55% chance to get an address of 51 chars.
+
+Theoretically there can be even shorter addresses if they lucky to be prefixed with a long
+sequence of `0`.
+
+```js
+import {
+  MemoryAccount, Encoding, encode, decode,
+} from '@aeternity/aepp-sdk';
+
+const publicKey = decode(MemoryAccount.generate().address);
+
+for (let i = -1; i < publicKey.length; i += 1) {
+  if (i >= 0) publicKey[i] = 0;
+  const address = encode(publicKey, Encoding.AccountAddress);
+  console.log(address.length, address);
+}
+```
+
+Running the above code you would get output like
+
+```
+52 ak_XsSLpN161dHo77k82CZHDnUCDpVG1JSujZjbGYhNKTgMy5exZ
+52 ak_13P6GKgb4VcxJHrb5Vnhb66RNBGgdnFLVJS8RaLcrAeseZmuc
+52 ak_115z6Ns8nevqahWHQfYU3QNJbK7PsX2rWxoPQRcpvWzB4U77s
+51 ak_111dqrd5iRqVHQe2T2JdZe79bqNBVCkWPqSc1JAXMW6F2vvT
+50 ak_1111PM8Acd6qZCjioCqPt6PcTuWVxxS22gt2ytCdH82FY4C
+51 ak_111113q5w8zgNNjAgLbxrMmA8qBNCv8aVHBM7eLm7JbfcgVe
+50 ak_111111UGVF8HYKFC7hLzwffE8JR5vQKQ9z4BiYJYCVcEGna
+49 ak_1111111wnTfJ9TWagQmzk42ADoUqVg1VvNMG7t8Fo8SQGf
+50 ak_11111111389cwfh57Mw1d4uYXps2orpWxc9Zoov7PdW6G7S
+49 ak_111111111G6iURaQ8ycLUNERoocnfJPQ8J7bopyndikHFM
+49 ak_11111111116b9WMyCB85kS4YkDfP9D3LhqUu5eG7AEfrLg
+48 ak_11111111111urvTGsQm76A4yTbApC8DJ1rLggAFKXiZXp
+48 ak_1111111111119eSHeN26TTHqgKpcEVTmbCHEbQgAHJkjd
+48 ak_11111111111115QmcWAusFcLUq2MfYLXdxnFEhPkRrQu5
+47 ak_11111111111111c7Y1hucPEYuPH6ZY5sFdKo6dhb86gk
+47 ak_1111111111111116qaT3Ac44qzDFevr9Czj1S9p9Y46r
+47 ak_11111111111111114KqRXnNJJwVDnphudyDt4XDmjLn7
+46 ak_11111111111111111XGs41KwLTa74AMCwx3gYYAHv81
+46 ak_1111111111111111114sffTSqJvTbsAjsQykvVsDcV8
+45 ak_1111111111111111111wVeBwZE5g63oPLdnrQC7TuP
+45 ak_11111111111111111111Y4FSQ8pV3J8f96h3SS68Df
+45 ak_1111111111111111111114ZmkEyJVpPoE6bFrxSt3n
+44 ak_1111111111111111111111hEHXkLzkWadzEyFn6pw
+44 ak_11111111111111111111111A6y5vKi2SUtEiqyw1H
+44 ak_1111111111111111111111112PszJecmUrBA1wHbx
+43 ak_1111111111111111111111111yqJmD1ujq7rtGX6
+43 ak_111111111111111111111111113hoVWLS2aptDtG
+42 ak_111111111111111111111111111PhgEh1GA292t
+42 ak_1111111111111111111111111111Z6ci7mUpU7i
+42 ak_111111111111111111111111111119gETXQQAsT
+42 ak_11111111111111111111111111111136u6WXDf6
+41 ak_1111111111111111111111111111111PqPZYur
+41 ak_11111111111111111111111111111111273Yts
+```
+
+Therefore the minimum address length is 41 chars. All these addresses valid, for example
+`ak_11111111111111111111111111111111273Yts` [used] to collect AENS name fees.
+
+[isAddressValid]: https://docs.aeternity.com/aepp-sdk-js/v13.1.0/api/functions/isAddressValid.html
+[used]: https://mainnet.aeternity.io/v3/accounts/ak_11111111111111111111111111111111273Yts
diff --git a/docs/guides/aens.md b/docs/guides/aens.md
index 1a9ffe9209..97e952f5c7 100644
--- a/docs/guides/aens.md
+++ b/docs/guides/aens.md
@@ -1,9 +1,9 @@
 # AENS (æternity naming system)
 
 ## Introduction
-This guide shows you how to perform all the operations that you need within the lifecycle of [æternity naming system (AENS)](https://docs.aeternity.com/protocol/AENS.html) using the SDK.
+This guide shows you how to perform all the operations that you need within the lifecycle of [æternity naming system (AENS)](https://docs.aeternity.com/protocol/AENS/) using the SDK.
 
-If you successfully claimed a name it will expire after 180000 keyblocks (~375 days). You will need to update your name before it expires!
+If you successfully claimed a name it will expire after 180000 key blocks (~375 days). You will need to update your name before it expires!
 
 ## 1. Claim a name
 Claiming an AENS name requires you (at least) 2 transactions:
@@ -36,7 +36,7 @@ console.log(preClaimTx)
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
     commitmentId: 'cm_2igvW9egddKh77gDdE8mjotmL8PzE7Tf2Q639Q5stUqWQoEfap',
-    fee: 16620000000000,
+    fee: 16620000000000n,
     nonce: 18,
     type: 'NamePreclaimTx',
     version: 1
@@ -52,10 +52,10 @@ console.log(preClaimTx)
 
 Note:
 
-- After transaction is included, you have `300` keyblocks to broadcast `claim` transaction with
+- After transaction is included, you have `300` key blocks to broadcast `claim` transaction with
 the same `salt` and it should be signed with the same private key as `pre-claim`.
-    - As the `pre-claim` is required to avoid front running it is recommended to wait with the actual `claim` until at least 1 keyblock has been mined so that nobody knows which name you aim to claim.
-    - The corresponding `claim` cannot be included in the same keyblock anyway. The protocol doesn't allow that.
+    - As the `pre-claim` is required to avoid front running it is recommended to wait with the actual `claim` until at least 1 key block has been mined so that nobody knows which name you aim to claim.
+    - The corresponding `claim` cannot be included in the same key block anyway. The protocol doesn't allow that.
 - You should check if the name is still available before performing a `pre-claim`. The protocol itself doesn't reject a `pre-claim` transaction if the name isn't available anymore.
 - As you can see above in the logs the result (`preClaimTx`) of the `aensPreclaim` has bound a `claim` function that you can make use of to perform the actual claim.
     - In case you want to perform the actual claim at a later point you should remember the `salt` that has been used for the `pre-claim`
@@ -63,9 +63,9 @@ the same `salt` and it should be signed with the same private key as `pre-claim`
 ### Claim
 This example assumes that you perform the actual `claim` manually by having remembered the required `salt`. In most cases you'd probably use the `claim` function that is bound to the result of the `aensPreclaim` function directly (see above).
 
-Depending on the length of the name the actual `claim` will result in direct ownership of the AENS name or start an auction:
+Depending on the length of the name in punycode the actual `claim` will result in direct ownership of the AENS name or start an auction:
 
-- `Name length` > 12: ownership of the name is immediately transfered to your account
+- `Name length` > 12: ownership of the name is immediately transferred to your account
 - `Name length` <= 12: an `auction` is started
 
 ```js
@@ -87,10 +87,10 @@ console.log(claimTx)
   ],
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
-    fee: 16800000000000,
+    fee: 16800000000000n,
     name: 'testNameForTheGuide.chain',
-    nameFee: '2865700000000000000',
-    nameSalt: '7595805618692717',
+    nameFee: 2865700000000000000n,
+    nameSalt: 7595805618692717,
     nonce: 19,
     type: 'NameClaimTx',
     version: 2
@@ -131,7 +131,7 @@ const increment = 0.05 // 5%, the minimum required increment
 // startFee is OPTIONAL and defaults to minimum calculated fee for the name in general
 // startFee MUST be at least the nameFee of the last bid
 // increment is OPTIONAL and defaults to 0.05
-const nameFee = computeBidFee(name, startFee, increment)
+const nameFee = computeBidFee(name, { startFee, increment })
 const bidTx = await aeSdk.aensBid(name, nameFee)
 
 console.log(bidTx)
@@ -147,9 +147,9 @@ console.log(`BID PLACED AT ${bidTx.blockHeight} WILL END AT ${computeAuctionEndB
   ],
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
-    fee: 16520000000000,
+    fee: 16520000000000n,
     name: 'auctiontest1.chain',
-    nameFee: '3159434250000000000',
+    nameFee: 3159434250000000000n,
     nameSalt: 0,
     nonce: 24,
     type: 'NameClaimTx',
@@ -172,7 +172,7 @@ Now that you own your AENS name you might want to update it in order to:
 
 - Set pointers to `accounts`, `oracles`, `contracts` or `channels`.
 - Extend the TTL before it expires.
-    - By default a name will have a TTL of 180000 keyblocks (~375 days). It cannot be extended longer than 180000 keyblocks.
+    - By default a name will have a TTL of 180000 key blocks (~375 days). It cannot be extended longer than 180000 key blocks.
 
 ### Set pointers & update TTL
 ```js
@@ -208,7 +208,7 @@ console.log(nameUpdateTx)
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
     clientTtl: 84600,
-    fee: 17800000000000,
+    fee: 17800000000000n,
     nameId: 'nm_1Cz5HGY8PMWZxNrM6s51CtsJZDU3DDT1LdmpEipa3DRghyGz5',
     nameTtl: 180000,
     nonce: 27,
@@ -264,7 +264,7 @@ console.log(nameUpdateTx)
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
     clientTtl: 100000,
-    fee: 17800000000000,
+    fee: 17800000000000n,
     nameId: 'nm_1Cz5HGY8PMWZxNrM6s51CtsJZDU3DDT1LdmpEipa3DRghyGz5',
     nameTtl: 100000,
     nonce: 28,
@@ -308,7 +308,7 @@ console.log(nameTransferTx)
   ],
   tx: {
     accountId: 'ak_2519mBsgjJEVEFoRgno1ryDsn3BEaCZGRbXPEjThWYLX9MTpmk',
-    fee: 17300000000000,
+    fee: 17300000000000n,
     nameId: 'nm_1Cz5HGY8PMWZxNrM6s51CtsJZDU3DDT1LdmpEipa3DRghyGz5',
     nonce: 33,
     recipientId: 'ak_21A27UVVt3hDkBE5J7rhhqnH5YNb4Y1dqo4PnSybrH85pnWo7E',
@@ -356,7 +356,7 @@ console.log(nameRevokeTx)
 Note:
 
 - On revocation the name enters in a `revoked` state.
-- After a timeout of `2016` keyblocks the name will be available for claiming again.
+- After a timeout of `2016` key blocks the name will be available for claiming again.
 
 ## Delegate signature to contract (AENS interface)
 It is possible to authorize a Sophia contract to manage an AENS name on behalf of your account. In order to achieve that you need to provide a delegation signature to the contract. The contract will then be able to use the [AENS interface](https://docs.aeternity.com/aesophia/latest/sophia_features/#aens-interface) and perform AENS related actions on behalf of your account.
diff --git a/docs/guides/contracts.md b/docs/guides/contracts.md
index fd13f8b59e..c024b42536 100644
--- a/docs/guides/contracts.md
+++ b/docs/guides/contracts.md
@@ -8,7 +8,7 @@ Before interacting with contracts using the SDK you should get familiar with Sop
 The SDK needs to interact with following components in order to enable smart contract interactions on the æternity blockchain:
 
 - [æternity](https://github.com/aeternity/aeternity) (host your own one or use the public testnet node at `https://testnet.aeternity.io`)
-- [aesophia_http](https://github.com/aeternity/aesophia_http) (host your own one or use the public compiler at `https://v7.compiler.stg.aepps.com`)
+- [aesophia_http](https://github.com/aeternity/aesophia_http) (host your own one or use the public compiler at `https://v7.compiler.aepps.com`)
 
 Note:
 
@@ -32,7 +32,7 @@ const account = new MemoryAccount(SECRET_KEY)
 const aeSdk = new AeSdk({
   nodes: [{ name: 'testnet', instance: node }],
   accounts: [account],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'), // ideally host your own compiler
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'), // ideally host your own compiler
 })
 ```
 
diff --git a/docs/guides/error-handling.md b/docs/guides/error-handling.md
index 5c81a06491..5ece0cc621 100644
--- a/docs/guides/error-handling.md
+++ b/docs/guides/error-handling.md
@@ -96,7 +96,6 @@ BaseError
 │
 ├── RpcError
 │   ├── RpcInvalidTransactionError
-│   ├── RpcBroadcastError
 │   ├── RpcRejectedByUserError
 │   ├── RpcUnsupportedProtocolError
 │   ├── RpcConnectionDenyError
diff --git a/docs/guides/paying-for-tx.md b/docs/guides/paying-for-tx.md
index 6fd321794f..98eb8e579f 100644
--- a/docs/guides/paying-for-tx.md
+++ b/docs/guides/paying-for-tx.md
@@ -13,8 +13,8 @@ You can then collect the signed inner transaction, wrap it into a `PayingForTx`
 ## Usage examples
 We provided following two NodeJS examples which you can take a look at:
 
-- [InnerTx: ContractCallTx](https://docs.aeternity.com/aepp-sdk-js/v12.1.3/examples/node/paying-for-tx-contract-call-tx/)
-- [InnerTx: SpendTx](https://docs.aeternity.com/aepp-sdk-js/v12.1.3/examples/node/paying-for-tx-spend-tx/)
+- [InnerTx: ContractCallTx](https://docs.aeternity.com/aepp-sdk-js/v13.1.0/examples/node/paying-for-contract-call-tx/)
+- [InnerTx: SpendTx](https://docs.aeternity.com/aepp-sdk-js/v13.1.0/examples/node/paying-for-spend-tx/)
 
 Note:
 
diff --git a/docs/guides/typed-data.md b/docs/guides/typed-data.md
new file mode 100644
index 0000000000..5871e44bd5
--- /dev/null
+++ b/docs/guides/typed-data.md
@@ -0,0 +1,44 @@
+# Typed data hashing and signing
+
+## Common structure
+
+The whole idea is heavily inspired by [EIP-712](https://eips.ethereum.org/EIPS/eip-712#definition-of-domainseparator). To get a signature needed to calculate `hash(hash(domain), hash(aci), hash(data))`.
+
+`hash` function is `blake2b`.
+
+`domain` is a record containing not required properties:
+- `name` as string,
+- `version` as integer,
+- `networkId` as string,
+- `contractAddress` as ct-encoded string.
+
+`aci` is part of a complete contract ACI. It defines a type of data to sign. For example, the ACI
+```json
+{
+  "record": [
+    { "name": "foo", "type": "string" },
+    { "name": "bar", "type": "int" }
+  ]
+}
+```
+corresponds to the data
+```json
+{ "foo": "test", "bar": 42 }
+```
+
+`domain` and `data` are fate-encoded before hashing. `aci` is prepared for hashing according to [RFC8785](https://tools.ietf.org/html/rfc8785).
+
+## Implementation
+
+- [encodeFateValue](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/utils/typed-data.ts#L44-L52) — use to generate the first argument for `signTypedData`;
+- [AccountBase::signTypedData](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/account/Base.ts#L63-L70) — calculates signature, supported in MemoryAccount and in aepp-wallet connection;
+- [hashTypedData](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/utils/typed-data.ts#L87-L95) — calculates the overall hash of typed data to sign;
+- [decodeFateValue](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/utils/typed-data.ts#L55-L63) — use to preview data to sign on wallet side;
+- [hashJson](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/utils/typed-data.ts#L16-L18) — deterministic hashing of an arbitrary JS value, used to calculate `hash(aci)`;
+- [hashDomain](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/src/utils/typed-data.ts#L68-L85) — use for debugging or to prepare the hash value for smart contract.
+
+## Examples
+
+- [signing and verifying on aepp side](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/examples/browser/aepp/src/TypedData.vue)
+- [signing confirmation on wallet side](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/examples/browser/wallet-iframe/src/App.vue#L105-L111)
+- [verifying a signature on contract side](https://github.com/aeternity/aepp-sdk-js/blob/5952a7b9f4d0cf30ad7caa0831dfb974d1e91afc/test/integration/typed-data.ts#L97-L128)
diff --git a/docs/hooks.py b/docs/hooks.py
index fc9260583d..8339aa96a2 100644
--- a/docs/hooks.py
+++ b/docs/hooks.py
@@ -1,15 +1,9 @@
-import os.path
 import subprocess
 import re
 import urllib.request
 
 def pre_build(**kwargs):
-  if not os.path.exists('node_modules'):
-    subprocess.run(['npm', 'install', '--ignore-scripts'], check=True)
-  subprocess.run(['npm', 'run', 'build:api'], check=True)
-  subprocess.run(['npm', 'run', 'build:generate'], check=True)
-  subprocess.run(['npm', 'run', 'docs:examples'], check=True)
-  subprocess.run(['npm', 'run', 'docs:api'], check=True)
+  subprocess.run(['./docs/build-assets.sh'], check=True)
 
 def replacer(match):
   filename = f'{match.group(3)}.{match.group(4)}'
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 3e4da3bda9..3eb5d17b75 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -34,7 +34,7 @@ This example shows:
 
 ```js
 const NODE_URL = 'https://testnet.aeternity.io'
-const COMPILER_URL = 'https://v7.compiler.stg.aepps.com' // required for contract interactions
+const COMPILER_URL = 'https://v7.compiler.aepps.com' // required for contract interactions
 // replace <SENDER_SECRET_KEY> with the generated secretKey from step 2
 const senderAccount = new MemoryAccount('<SENDER_SECRET_KEY>');
 
diff --git a/examples/browser/aepp/src/App.vue b/examples/browser/aepp/src/App.vue
index c194db2774..32bfef5240 100644
--- a/examples/browser/aepp/src/App.vue
+++ b/examples/browser/aepp/src/App.vue
@@ -3,10 +3,7 @@
 
   <Connect />
 
-  <div
-    v-if="aeSdk"
-    class="nav"
-  >
+  <div class="nav">
     <a
       href="#"
       :class="{ active: view === 'Basic' }"
@@ -21,10 +18,24 @@
     >
       Smart contracts
     </a>
+    <a
+      href="#"
+      :class="{ active: view === 'PayForTx' }"
+      @click="view = 'PayForTx'"
+    >
+      Pay for transaction
+    </a>
+    <a
+      href="#"
+      :class="{ active: view === 'TypedData' }"
+      @click="view = 'TypedData'"
+    >
+      Typed data
+    </a>
   </div>
 
   <Component
-    v-if="aeSdk && view"
+    v-if="view"
     :is="view"
   />
 </template>
@@ -34,9 +45,13 @@ import { mapState } from 'vuex';
 import Connect from './Connect.vue';
 import Basic from './Basic.vue';
 import Contracts from './Contracts.vue';
+import PayForTx from './PayForTx.vue';
+import TypedData from './TypedData.vue';
 
 export default {
-  components: { Connect, Basic, Contracts },
+  components: {
+    Connect, Basic, Contracts, PayForTx, TypedData,
+  },
   data: () => ({ view: '' }),
   computed: mapState(['aeSdk']),
 };
diff --git a/examples/browser/aepp/src/Basic.vue b/examples/browser/aepp/src/Basic.vue
index 50ab44889b..3e2986d2a1 100644
--- a/examples/browser/aepp/src/Basic.vue
+++ b/examples/browser/aepp/src/Basic.vue
@@ -23,75 +23,38 @@
     </div>
   </div>
 
-  <h2>Spend coins</h2>
-  <div class="group">
-    <div>
-      <div>Recipient address</div>
-      <div>
-        <input
-          v-model="spendTo"
-          placeholder="ak_..."
-        >
-      </div>
-    </div>
-    <div>
-      <div>Coins amount</div>
-      <div><input v-model="spendAmount"></div>
-    </div>
-    <div>
-      <div>Payload</div>
-      <div><input v-model="spendPayload"></div>
-    </div>
-    <button
-      :disabled="!aeSdk"
-      @click="spendPromise = spend()"
-    >
-      Spend
-    </button>
-    <div v-if="spendPromise">
-      <div>Spend result</div>
-      <Value :value="spendPromise" />
-    </div>
-  </div>
+  <SpendCoins />
+
+  <MessageSign />
 </template>
 
 <script>
 import { mapState } from 'vuex';
-import { encode, Encoding } from '@aeternity/aepp-sdk';
-import Value from './Value.vue';
+import Value from './components/Value.vue';
+import SpendCoins from './components/SpendCoins.vue';
+import MessageSign from './components/MessageSign.vue';
 
 export default {
-  components: { Value },
+  components: { Value, SpendCoins, MessageSign },
   data: () => ({
     balancePromise: null,
     heightPromise: null,
     nodeInfoPromise: null,
     compilerVersionPromise: null,
-    spendTo: '',
-    spendAmount: '',
-    spendPayload: '',
-    spendPromise: null,
   }),
   computed: mapState(['aeSdk', 'address', 'networkId']),
   mounted() {
     this.$watch(
       ({ aeSdk, address, networkId }) => [aeSdk, address, networkId],
       ([aeSdk, address]) => {
-        if (!aeSdk) return;
         this.compilerVersionPromise = aeSdk.compilerApi.version();
-        this.balancePromise = aeSdk.getBalance(address);
+        this.balancePromise = address
+          ? aeSdk.getBalance(address) : Promise.reject(new Error('Address not available'));
         this.heightPromise = aeSdk.getHeight();
         this.nodeInfoPromise = aeSdk.getNodeInfo();
       },
       { immediate: true },
     );
   },
-  methods: {
-    spend() {
-      return this.aeSdk.spend(this.spendAmount, this.spendTo, {
-        payload: encode(new TextEncoder().encode(this.spendPayload), Encoding.Bytearray),
-      });
-    },
-  },
 };
 </script>
diff --git a/examples/browser/aepp/src/Connect.vue b/examples/browser/aepp/src/Connect.vue
index 9647214d42..5ec9bcbf63 100644
--- a/examples/browser/aepp/src/Connect.vue
+++ b/examples/browser/aepp/src/Connect.vue
@@ -58,13 +58,12 @@ export default {
     walletConnected: false,
     walletConnecting: null,
     reverseIframe: null,
-    reverseIframeWalletUrl: 'http://localhost:9000',
+    reverseIframeWalletUrl: process.env.VUE_APP_WALLET_URL ?? 'http://localhost:9000',
     walletInfo: null,
   }),
   computed: {
     ...mapState(['aeSdk']),
     walletName() {
-      if (!this.aeSdk) return 'SDK is not ready';
       if (!this.walletConnected) return 'Wallet is not connected';
       return this.walletInfo.name;
     },
@@ -113,7 +112,6 @@ export default {
       await this.aeSdk.disconnectWallet();
       this.walletConnected = false;
       if (this.reverseIframe) this.reverseIframe.remove();
-      this.$emit('aeSdk', null);
     },
   },
 };
diff --git a/examples/browser/aepp/src/Contracts.vue b/examples/browser/aepp/src/Contracts.vue
index 892619bb17..27823160b2 100644
--- a/examples/browser/aepp/src/Contracts.vue
+++ b/examples/browser/aepp/src/Contracts.vue
@@ -80,7 +80,7 @@
 <script>
 import { shallowRef } from 'vue';
 import { mapState } from 'vuex';
-import Value from './Value.vue';
+import Value from './components/Value.vue';
 
 const contractSourceCode = `
 contract Multiplier =
@@ -104,7 +104,7 @@ export default {
   computed: mapState(['aeSdk']),
   methods: {
     async create() {
-      // Contract instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue-3
+      // Contract instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue3
       this.contract = shallowRef(
         await this.aeSdk.initializeContract({ sourceCode: this.contractSourceCode }),
       );
diff --git a/examples/browser/aepp/src/PayForTx.vue b/examples/browser/aepp/src/PayForTx.vue
new file mode 100644
index 0000000000..4167ab7b8e
--- /dev/null
+++ b/examples/browser/aepp/src/PayForTx.vue
@@ -0,0 +1,72 @@
+<template>
+  <GenerateSpendTx />
+
+  <h2>Sign inner transaction</h2>
+  <div class="group">
+    <div>
+      <div>Transaction</div>
+      <div>
+        <input
+          v-model="txToPayFor"
+          placeholder="tx_..."
+        >
+      </div>
+    </div>
+    <button @click="signInnerTxPromise = signInnerTx()">
+      Sign
+    </button>
+    <div v-if="signInnerTxPromise">
+      <div>Signed inner transaction</div>
+      <Value :value="signInnerTxPromise" />
+    </div>
+  </div>
+
+  <h2>Pay for transaction</h2>
+  <div class="group">
+    <div>
+      <div>Signed inner transaction</div>
+      <div>
+        <input
+          v-model="innerTx"
+          placeholder="tx_..."
+        >
+      </div>
+    </div>
+    <button @click="payForTxPromise = payForTx()">
+      Pay for transaction
+    </button>
+    <div v-if="payForTxPromise">
+      <div>Result</div>
+      <Value :value="payForTxPromise" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import Value from './components/Value.vue';
+import SpendCoins from './components/SpendCoins.vue';
+import MessageSign from './components/MessageSign.vue';
+import GenerateSpendTx from './components/GenerateSpendTx.vue';
+
+export default {
+  components: {
+    Value, SpendCoins, MessageSign, GenerateSpendTx,
+  },
+  data: () => ({
+    innerTx: '',
+    txToPayFor: '',
+    signInnerTxPromise: null,
+    payForTxPromise: null,
+  }),
+  computed: mapState(['aeSdk']),
+  methods: {
+    signInnerTx() {
+      return this.aeSdk.signTransaction(this.txToPayFor, { innerTx: true });
+    },
+    payForTx() {
+      return this.aeSdk.payForTransaction(this.innerTx);
+    },
+  },
+};
+</script>
diff --git a/examples/browser/aepp/src/TypedData.vue b/examples/browser/aepp/src/TypedData.vue
new file mode 100644
index 0000000000..8307293bd6
--- /dev/null
+++ b/examples/browser/aepp/src/TypedData.vue
@@ -0,0 +1,170 @@
+<template>
+  <h2>Domain</h2>
+  <div class="group">
+    <div>
+      <div>Name</div>
+      <div>
+        <input
+          :value="domain.name"
+          @input="domain.name = $event.target.value || null"
+        >
+      </div>
+    </div>
+    <div>
+      <div>Version</div>
+      <div>
+        <input
+          :value="domain.version"
+          @input="domain.version = $event.target.value || null"
+        >
+      </div>
+    </div>
+    <div>
+      <div>Network id</div>
+      <div>
+        <input
+          :value="domain.networkId"
+          @input="domain.networkId = $event.target.value || null"
+        >
+      </div>
+    </div>
+    <div>
+      <div>Contract address</div>
+      <div>
+        <input
+          :value="domain.contractAddress"
+          @input="domain.contractAddress = $event.target.value || null"
+        >
+      </div>
+    </div>
+  </div>
+
+  <h2>Data</h2>
+  <div class="group">
+    <div>
+      <div>Type</div>
+      <div>
+        <textarea
+          v-model="aci"
+          placeholder="Type as ACI JSON"
+        />
+      </div>
+    </div>
+    <div>
+      <div>Data</div>
+      <div>
+        <textarea v-model="data" />
+      </div>
+    </div>
+    <div>
+      <div>Encoded data</div>
+      <Value :value="toPromise(() => dataEncoded)" />
+    </div>
+    <div>
+      <div>Hash</div>
+      <Value :value="toPromise(() => hash.toString('base64'))" />
+    </div>
+  </div>
+
+  <h2>Sign</h2>
+  <div class="group">
+    <button @click="signPromise = signTypedData()">
+      Sign
+    </button>
+    <div v-if="signPromise">
+      <div>Signature</div>
+      <Value :value="signPromise" />
+    </div>
+  </div>
+
+  <h2>Verify</h2>
+  <div class="group">
+    <div>
+      <div>Signature</div>
+      <div>
+        <input
+          v-model="verifySignature"
+          placeholder="sg-encoded"
+        >
+      </div>
+    </div>
+    <div>
+      <div>Signer address</div>
+      <div>
+        <input
+          v-model="verifyAddress"
+          placeholder="ak_..."
+        >
+      </div>
+    </div>
+    <button @click="verifyPromise = verifyTypedData()">
+      Verify
+    </button>
+    <div v-if="verifyPromise">
+      <div>Is signature correct</div>
+      <Value :value="verifyPromise" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import {
+  hashTypedData, encodeFateValue, verify, decode,
+} from '@aeternity/aepp-sdk';
+import Value from './components/Value.vue';
+
+export default {
+  components: {
+    Value,
+  },
+  data: () => ({
+    domain: {
+      name: 'Simple æpp',
+      version: 2,
+      networkId: 'ae_uat',
+      contractAddress: null,
+    },
+    aci: Value.methods.valueToString({
+      record: [
+        { name: 'operation', type: 'string' },
+        { name: 'parameter', type: 'int' },
+      ],
+    }),
+    data: Value.methods.valueToString({
+      operation: 'test',
+      parameter: 42,
+    }),
+    signPromise: null,
+    verifySignature: null,
+    verifyAddress: null,
+    verifyPromise: null,
+  }),
+  computed: {
+    ...mapState(['aeSdk']),
+    dataParsed() {
+      return JSON.parse(this.data);
+    },
+    aciParsed() {
+      return JSON.parse(this.aci);
+    },
+    dataEncoded() {
+      return encodeFateValue(this.dataParsed, this.aciParsed);
+    },
+    hash() {
+      return hashTypedData(this.dataEncoded, this.aciParsed, this.domain);
+    },
+  },
+  methods: {
+    async toPromise(getter) {
+      return getter();
+    },
+    signTypedData() {
+      return this.aeSdk.signTypedData(this.dataEncoded, this.aciParsed, this.domain);
+    },
+    async verifyTypedData() {
+      return verify(this.hash, decode(this.verifySignature), this.verifyAddress);
+    },
+  },
+};
+</script>
diff --git a/examples/browser/aepp/src/components/GenerateSpendTx.vue b/examples/browser/aepp/src/components/GenerateSpendTx.vue
new file mode 100644
index 0000000000..c9d9496863
--- /dev/null
+++ b/examples/browser/aepp/src/components/GenerateSpendTx.vue
@@ -0,0 +1,76 @@
+<template>
+  <h2>Generate spend transaction</h2>
+  <div class="group">
+    <div>
+      <div>Recipient address</div>
+      <div>
+        <input
+          v-model="spendTo"
+          placeholder="ak_..."
+        >
+      </div>
+    </div>
+    <div>
+      <div>Coins amount</div>
+      <div><input v-model="spendAmount"></div>
+    </div>
+    <div>
+      <div>Payload</div>
+      <div><input v-model="spendPayload"></div>
+    </div>
+    <div>
+      <div>Increment nonce by 1</div>
+      <div>
+        <input
+          type="checkbox"
+          v-model="incrementNonce"
+        >
+        (only if you want to pay for this transaction yourself)
+      </div>
+    </div>
+    <button @click="generatePromise = generate()">
+      Generate
+    </button>
+    <div v-if="generatePromise">
+      <div>Spend transaction</div>
+      <Value :value="generatePromise" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import {
+  encode, Encoding, Tag, unpackTx, buildTx,
+} from '@aeternity/aepp-sdk';
+import Value from './Value.vue';
+
+export default {
+  components: { Value },
+  data: () => ({
+    spendTo: '',
+    spendAmount: '',
+    spendPayload: '',
+    incrementNonce: true,
+    generatePromise: null,
+  }),
+  computed: mapState(['aeSdk']),
+  methods: {
+    async generate() {
+      let spendTx = await this.aeSdk.buildTx({
+        tag: Tag.SpendTx,
+        senderId: this.aeSdk.address,
+        recipientId: this.spendTo,
+        amount: this.spendAmount,
+        payload: encode(new TextEncoder().encode(this.spendPayload), Encoding.Bytearray),
+      });
+      if (this.incrementNonce) {
+        const spendTxParams = unpackTx(spendTx);
+        spendTxParams.nonce += 1;
+        spendTx = buildTx(spendTxParams);
+      }
+      return spendTx;
+    },
+  },
+};
+</script>
diff --git a/examples/browser/aepp/src/components/MessageSign.vue b/examples/browser/aepp/src/components/MessageSign.vue
new file mode 100644
index 0000000000..4ad1821822
--- /dev/null
+++ b/examples/browser/aepp/src/components/MessageSign.vue
@@ -0,0 +1,40 @@
+<template>
+  <h2>Sign a message</h2>
+  <div class="group">
+    <div>
+      <div>Message to sign</div>
+      <div>
+        <input
+          v-model="messageToSign"
+          placeholder="I want to <action name> at <time> on <network name>"
+        >
+      </div>
+    </div>
+    <button @click="messageSignPromise = messageSign()">
+      Sign message
+    </button>
+    <div v-if="messageSignPromise">
+      <div>Message sign result</div>
+      <Value :value="messageSignPromise" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import Value from './Value.vue';
+
+export default {
+  components: { Value },
+  data: () => ({
+    messageToSign: '',
+    messageSignPromise: null,
+  }),
+  computed: mapState(['aeSdk']),
+  methods: {
+    messageSign() {
+      return this.aeSdk.signMessage(this.messageToSign);
+    },
+  },
+};
+</script>
diff --git a/examples/browser/aepp/src/components/SpendCoins.vue b/examples/browser/aepp/src/components/SpendCoins.vue
new file mode 100644
index 0000000000..e82bb3c723
--- /dev/null
+++ b/examples/browser/aepp/src/components/SpendCoins.vue
@@ -0,0 +1,53 @@
+<template>
+  <h2>Spend coins</h2>
+  <div class="group">
+    <div>
+      <div>Recipient address</div>
+      <div>
+        <input
+          v-model="spendTo"
+          placeholder="ak_..."
+        >
+      </div>
+    </div>
+    <div>
+      <div>Coins amount</div>
+      <div><input v-model="spendAmount"></div>
+    </div>
+    <div>
+      <div>Payload</div>
+      <div><input v-model="spendPayload"></div>
+    </div>
+    <button @click="spendPromise = spend()">
+      Spend
+    </button>
+    <div v-if="spendPromise">
+      <div>Spend result</div>
+      <Value :value="spendPromise" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import { encode, Encoding } from '@aeternity/aepp-sdk';
+import Value from './Value.vue';
+
+export default {
+  components: { Value },
+  data: () => ({
+    spendTo: '',
+    spendAmount: '',
+    spendPayload: '',
+    spendPromise: null,
+  }),
+  computed: mapState(['aeSdk']),
+  methods: {
+    spend() {
+      return this.aeSdk.spend(this.spendAmount, this.spendTo, {
+        payload: encode(new TextEncoder().encode(this.spendPayload), Encoding.Bytearray),
+      });
+    },
+  },
+};
+</script>
diff --git a/examples/browser/aepp/src/Value.vue b/examples/browser/aepp/src/components/Value.vue
similarity index 100%
rename from examples/browser/aepp/src/Value.vue
rename to examples/browser/aepp/src/components/Value.vue
diff --git a/examples/browser/aepp/src/store.js b/examples/browser/aepp/src/store.js
index 65130f4b4d..32d20a5184 100644
--- a/examples/browser/aepp/src/store.js
+++ b/examples/browser/aepp/src/store.js
@@ -4,13 +4,13 @@ import { AeSdkAepp, Node, CompilerHttp } from '@aeternity/aepp-sdk';
 
 const TESTNET_NODE_URL = 'https://testnet.aeternity.io';
 const MAINNET_NODE_URL = 'https://mainnet.aeternity.io';
-const COMPILER_URL = 'https://v7.compiler.stg.aepps.com';
+const COMPILER_URL = 'https://v7.compiler.aepps.com';
 
 const store = createStore({
   state: {
     address: undefined,
     networkId: undefined,
-    // AeSdkAepp instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue-3
+    // AeSdkAepp instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue3
     aeSdk: shallowReactive(new AeSdkAepp({
       name: 'Simple æpp',
       nodes: [
diff --git a/examples/browser/aepp/src/styles.scss b/examples/browser/aepp/src/styles.scss
index 77f45e94c3..1ea40925ba 100644
--- a/examples/browser/aepp/src/styles.scss
+++ b/examples/browser/aepp/src/styles.scss
@@ -30,7 +30,7 @@ h2 {
   @extend .mt-2, .font-bold, .text-2xl;
 }
 
-input:not([type=radio]), textarea {
+input:not([type=radio]):not([type=checkbox]), textarea {
   @extend .bg-gray-900, .text-white, .p-2, .w-full;
 }
 
diff --git a/examples/browser/aepp/vue.config.js b/examples/browser/aepp/vue.config.js
index a7e9344d35..383f082ae8 100644
--- a/examples/browser/aepp/vue.config.js
+++ b/examples/browser/aepp/vue.config.js
@@ -1,6 +1,7 @@
 const { defineConfig } = require('@vue/cli-service');
 
 module.exports = defineConfig({
+  publicPath: process.env.PUBLIC_PATH ?? '/',
   devServer: {
     port: 9001,
   },
diff --git a/examples/browser/wallet-iframe/src/App.vue b/examples/browser/wallet-iframe/src/App.vue
index 8638240c16..b0aad366e0 100644
--- a/examples/browser/wallet-iframe/src/App.vue
+++ b/examples/browser/wallet-iframe/src/App.vue
@@ -23,7 +23,7 @@
   <iframe
     v-if="!runningInFrame"
     ref="aepp"
-    src="http://localhost:9001"
+    :src="aeppUrl"
   />
 </template>
 
@@ -31,20 +31,19 @@
 import {
   MemoryAccount, generateKeyPair, AeSdkWallet, Node, CompilerHttp,
   BrowserWindowMessageConnection, METHODS, WALLET_TYPE,
-  RpcConnectionDenyError, RpcRejectedByUserError,
+  RpcConnectionDenyError, RpcRejectedByUserError, unpackTx, decodeFateValue,
 } from '@aeternity/aepp-sdk';
 import Value from './Value.vue';
 
 export default {
   components: { Value },
-  data() {
-    return {
-      runningInFrame: window.parent !== window,
-      nodeName: '',
-      address: '',
-      balancePromise: null,
-    };
-  },
+  data: () => ({
+    aeppUrl: process.env.VUE_APP_AEPP_URL ?? 'http://localhost:9001',
+    runningInFrame: window.parent !== window,
+    nodeName: '',
+    address: '',
+    balancePromise: null,
+  }),
   methods: {
     async shareWalletInfo(clientId, { interval = 5000, attemps = 5 } = {}) {
       this.aeSdk.shareWalletInfo(clientId);
@@ -79,7 +78,7 @@ export default {
     const genConfirmCallback = (actionName) => (aeppId, parameters, origin) => {
       if (!confirm([
         `Client ${aeppInfo[aeppId].name} with id ${aeppId} at ${origin} want to ${actionName}`,
-        JSON.stringify(parameters, null, 2),
+        Value.methods.valueToString(parameters),
       ].join('\n'))) {
         throw new RpcRejectedByUserError();
       }
@@ -88,7 +87,10 @@ export default {
     class AccountMemoryProtected extends MemoryAccount {
       async signTransaction(tx, { aeppRpcClientId: id, aeppOrigin, ...options } = {}) {
         if (id != null) {
-          genConfirmCallback(`sign transaction ${tx}`)(id, options, aeppOrigin);
+          const opt = { ...options, unpackedTx: unpackTx(tx) };
+          if (opt.onCompiler) opt.onCompiler = '<Compiler>';
+          if (opt.onNode) opt.onNode = '<Node>';
+          genConfirmCallback(`sign transaction ${tx}`)(id, opt, aeppOrigin);
         }
         return super.signTransaction(tx, options);
       }
@@ -100,6 +102,14 @@ export default {
         return super.signMessage(message, options);
       }
 
+      async signTypedData(data, aci, { aeppRpcClientId: id, aeppOrigin, ...options }) {
+        if (id != null) {
+          const opt = { ...options, aci, decodedData: decodeFateValue(data, aci) };
+          genConfirmCallback(`sign typed data ${data}`)(id, opt, aeppOrigin);
+        }
+        return super.signTypedData(data, aci, options);
+      }
+
       static generate() {
         // TODO: can inherit parent method after implementing https://github.com/aeternity/aepp-sdk-js/issues/1672
         return new AccountMemoryProtected(generateKeyPair().secretKey);
@@ -118,7 +128,7 @@ export default {
         new AccountMemoryProtected('9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200'),
         AccountMemoryProtected.generate(),
       ],
-      onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+      onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
       name: 'Wallet Iframe',
       onConnection: (aeppId, params, origin) => {
         if (!confirm(`Client ${params.name} with id ${aeppId} at ${origin} want to connect`)) {
diff --git a/examples/browser/wallet-iframe/vue.config.js b/examples/browser/wallet-iframe/vue.config.js
index c05654eb6c..7b45f66e5a 100644
--- a/examples/browser/wallet-iframe/vue.config.js
+++ b/examples/browser/wallet-iframe/vue.config.js
@@ -1,6 +1,7 @@
 const { defineConfig } = require('@vue/cli-service');
 
 module.exports = defineConfig({
+  publicPath: process.env.PUBLIC_PATH ?? '/',
   devServer: {
     port: 9000,
   },
diff --git a/examples/browser/wallet-web-extension/src/Popup.vue b/examples/browser/wallet-web-extension/src/Popup.vue
index c105bf3001..aab4088f1a 100644
--- a/examples/browser/wallet-web-extension/src/Popup.vue
+++ b/examples/browser/wallet-web-extension/src/Popup.vue
@@ -23,7 +23,6 @@
 
 <script>
 import browser from 'webextension-polyfill';
-import { unpackTx } from '@aeternity/aepp-sdk';
 
 export default {
   data: () => ({
@@ -37,7 +36,6 @@ export default {
     const data = new URL(location).searchParams.get('data');
     if (data != null) {
       const { aeppOrigin, action, popupId, ...params } = JSON.parse(data);
-      if (params.transaction) params.unpackedTx = unpackTx(params.transaction);
       this.aeppOrigin = aeppOrigin;
       this.action = action;
       this.popupId = popupId;
diff --git a/examples/browser/wallet-web-extension/src/background.js b/examples/browser/wallet-web-extension/src/background.js
index be05bcd396..7f352ae2aa 100644
--- a/examples/browser/wallet-web-extension/src/background.js
+++ b/examples/browser/wallet-web-extension/src/background.js
@@ -1,15 +1,23 @@
 import browser from 'webextension-polyfill';
 import {
   AeSdkWallet, CompilerHttp, Node, MemoryAccount, generateKeyPair, BrowserRuntimeConnection,
-  WALLET_TYPE, RpcConnectionDenyError, RpcRejectedByUserError,
+  WALLET_TYPE, RpcConnectionDenyError, RpcRejectedByUserError, unpackTx, decodeFateValue,
 } from '@aeternity/aepp-sdk';
 
+function stringifyBigint(value) {
+  return JSON.stringify(
+    value,
+    (k, v) => (typeof v === 'bigint' ? `${v} (as BigInt)` : v),
+    2,
+  );
+}
+
 let popupCounter = 0;
 async function confirmInPopup(parameters) {
   const popupUrl = new URL(browser.runtime.getURL('./popup.html'));
   const popupId = popupCounter;
   popupCounter += 1;
-  popupUrl.searchParams.set('data', JSON.stringify({ ...parameters, popupId }));
+  popupUrl.searchParams.set('data', stringifyBigint({ ...parameters, popupId }));
   await browser.windows.create({
     url: popupUrl.toString(),
     type: 'popup',
@@ -42,7 +50,10 @@ const genConfirmCallback = (action) => async (aeppId, parameters, aeppOrigin) =>
 class AccountMemoryProtected extends MemoryAccount {
   async signTransaction(transaction, { aeppRpcClientId: id, aeppOrigin, ...options } = {}) {
     if (id != null) {
-      await genConfirmCallback('sign transaction')(id, { ...options, transaction }, aeppOrigin);
+      const opt = { ...options, transaction, unpackedTx: unpackTx(transaction) };
+      if (opt.onCompiler) opt.onCompiler = '<Compiler>';
+      if (opt.onNode) opt.onNode = '<Node>';
+      await genConfirmCallback('sign transaction')(id, opt, aeppOrigin);
     }
     return super.signTransaction(transaction, options);
   }
@@ -54,6 +65,16 @@ class AccountMemoryProtected extends MemoryAccount {
     return super.signMessage(message, options);
   }
 
+  async signTypedData(data, aci, { aeppRpcClientId: id, aeppOrigin, ...options }) {
+    if (id != null) {
+      const opt = {
+        ...options, aci, data, decodedData: decodeFateValue(data, aci),
+      };
+      await genConfirmCallback('sign typed data')(id, opt, aeppOrigin);
+    }
+    return super.signTypedData(data, aci, options);
+  }
+
   static generate() {
     // TODO: can inherit parent method after implementing https://github.com/aeternity/aepp-sdk-js/issues/1672
     return new AccountMemoryProtected(generateKeyPair().secretKey);
@@ -61,7 +82,7 @@ class AccountMemoryProtected extends MemoryAccount {
 }
 
 const aeSdk = new AeSdkWallet({
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
   nodes: [{
     name: 'testnet',
     instance: new Node('https://testnet.aeternity.io'),
diff --git a/examples/node/account-generalized.mjs b/examples/node/account-generalized.mjs
index e34c1cd92e..41bb0d703e 100755
--- a/examples/node/account-generalized.mjs
+++ b/examples/node/account-generalized.mjs
@@ -18,7 +18,7 @@ import {
 const aeSdk = new AeSdk({
   nodes: [{ name: 'testnet', instance: new Node('https://testnet.aeternity.io') }],
   accounts: [MemoryAccount.generate()],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
 });
 const { address } = aeSdk;
 
diff --git a/examples/node/contract-interaction.mjs b/examples/node/contract-interaction.mjs
index 3484c1e5c3..5df1303d95 100755
--- a/examples/node/contract-interaction.mjs
+++ b/examples/node/contract-interaction.mjs
@@ -33,7 +33,7 @@ contract Multiplier =
 `;
 const ACCOUNT_SECRET_KEY = '9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200';
 const NODE_URL = 'https://testnet.aeternity.io';
-const COMPILER_URL = 'https://v7.compiler.stg.aepps.com';
+const COMPILER_URL = 'https://v7.compiler.aepps.com';
 
 // Note:
 //
diff --git a/examples/node/paying-for-contract-call-tx.mjs b/examples/node/paying-for-contract-call-tx.mjs
index 0268a81757..7a4c2955cb 100644
--- a/examples/node/paying-for-contract-call-tx.mjs
+++ b/examples/node/paying-for-contract-call-tx.mjs
@@ -42,7 +42,7 @@ import {
 // The following constants are used in the subsequent code snippets.
 const PAYER_ACCOUNT_SECRET_KEY = '9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200';
 const NODE_URL = 'https://testnet.aeternity.io';
-const COMPILER_URL = 'https://v7.compiler.stg.aepps.com';
+const COMPILER_URL = 'https://v7.compiler.aepps.com';
 const CONTRACT_ADDRESS = 'ct_iy86kak8GGt4U5VjDFNQf1a9qjbyxKpmGVNe3UuKwnmcM6LW8';
 const CONTRACT_SOURCE_CODE = `
 @compiler >= 6
diff --git a/examples/node/transfer-ae.mjs b/examples/node/transfer-ae.mjs
index 59f097b450..7a90392de4 100755
--- a/examples/node/transfer-ae.mjs
+++ b/examples/node/transfer-ae.mjs
@@ -53,7 +53,7 @@ console.log(`Balance of ${recipient} (before): ${balanceBefore} aettos`);
 // Calling the `spend` function will create, sign and broadcast a `SpendTx` to the network.
 const tx = await aeSdk.spend(amount, recipient);
 console.log('Transaction mined', tx);
-// Alternatively, you can use [transferFunds](https://docs.aeternity.com/aepp-sdk-js/latest/api/functions/transferFunds.html)
+// Alternatively, you can use [transferFunds](https://docs.aeternity.com/aepp-sdk-js/v13.1.0/api/functions/transferFunds.html)
 // method to transfer a fraction of your AE to another account.
 
 // ## 6. Get AE balance of recipient (after transfer)
diff --git a/mkdocs.yml b/mkdocs.yml
index dc0efd8dcc..2d02f3f0f0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -46,9 +46,10 @@ markdown_extensions:
   - pymdownx.superfences
 
 nav:
-  - index.md
+  - README.md
   - quick-start.md
   - Usage Guides:
+    - guides/address-length.md
     - guides/aens.md
     - guides/contracts.md
     - guides/contract-events.md
@@ -57,6 +58,7 @@ nav:
     - guides/batch-requests.md
     - guides/error-handling.md
     - guides/low-vs-high-usage.md
+    - guides/typed-data.md
     - Wallet interaction:
       - guides/connect-aepp-to-wallet.md
       - guides/build-wallet.md
@@ -70,8 +72,12 @@ nav:
         - examples/node/paying-for-contract-call-tx.md
         - examples/node/paying-for-spend-tx.md
       - examples/node/account-generalized.md
+    - Browser:
+      - 'Aepp example': examples/browser/aepp/index.html
+      - 'Iframe wallet example': examples/browser/wallet-iframe/index.html
+      - 'Webextension wallet example': examples/browser/wallet-web-extension/packed.zip
     - tutorials/vuejs/helloworld-blockheight.md
-  - 'API Reference': api/
+  - 'API Reference': api/index.html
   - compatibility.md
   - Changelog: CHANGELOG.md
   - Migration Guides:
diff --git a/package-lock.json b/package-lock.json
index 4b2c7b6e4e..3b6fb11a2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aeternity/aepp-sdk",
-      "version": "13.0.1",
+      "version": "13.1.0",
       "license": "ISC",
       "dependencies": {
         "@aeternity/aepp-calldata": "^1.4.0",
@@ -23,13 +23,16 @@
         "@types/uuid": "^9.0.1",
         "@types/webextension-polyfill": "^0.10.0",
         "@types/websocket": "^1.0.5",
+        "@types/ws": "^8.5.4",
         "aes-js": "^3.1.2",
         "bignumber.js": "^9.1.1",
         "bip32-path": "^0.4.2",
         "blakejs": "^1.2.1",
         "bs58": "^5.0.0",
         "buffer": "^6.0.3",
+        "canonicalize": "^2.0.0",
         "events": "^3.3.0",
+        "isomorphic-ws": "^5.0.0",
         "json-bigint": "^1.0.0",
         "process": "^0.11.10",
         "rlp": "^3.0.0",
@@ -37,7 +40,8 @@
         "tweetnacl": "^1.0.3",
         "tweetnacl-auth": "^1.0.1",
         "varuint-bitcoin": "^1.1.2",
-        "websocket": "^1.0.34"
+        "websocket": "^1.0.34",
+        "ws": "^8.13.0"
       },
       "devDependencies": {
         "@babel/cli": "^7.21.0",
@@ -3305,6 +3309,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/ws": {
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.54.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz",
@@ -4681,6 +4693,11 @@
         }
       ]
     },
+    "node_modules/canonicalize": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz",
+      "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w=="
+    },
     "node_modules/chai": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
@@ -8284,6 +8301,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/isomorphic-ws": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz",
+      "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==",
+      "peerDependencies": {
+        "ws": "*"
+      }
+    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -12493,6 +12518,27 @@
         "node": ">=8"
       }
     },
+    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/webpack-cli": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
@@ -12846,16 +12892,15 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "dev": true,
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
diff --git a/package.json b/package.json
index 1e6c917a82..c9433d5c4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "types": "es/index.d.ts",
@@ -8,11 +8,17 @@
     "<4.5": {
       "es/index.d.ts": [
         "./types-legacy/ts4.2/index.d.ts"
+      ],
+      "es/index-browser.d.ts": [
+        "./types-legacy/ts4.2/index-browser.d.ts"
       ]
     },
     "<4.7": {
       "es/index.d.ts": [
         "./types-legacy/ts4.5/index.d.ts"
+      ],
+      "es/index-browser.d.ts": [
+        "./types-legacy/ts4.5/index-browser.d.ts"
       ]
     }
   },
@@ -23,9 +29,15 @@
   },
   "exports": {
     "node": {
+      "types@<4.5": "./types-legacy/ts4.2/index.d.ts",
+      "types@<4.7": "./types-legacy/ts4.5/index.d.ts",
+      "types": "./es/index.d.ts",
       "import": "./es/index.mjs",
       "default": "./dist/aepp-sdk.js"
     },
+    "types@<4.5": "./types-legacy/ts4.2/index-browser.d.ts",
+    "types@<4.7": "./types-legacy/ts4.5/index-browser.d.ts",
+    "types": "./es/index-browser.d.ts",
     "import": "./es/index-browser.mjs",
     "default": "./dist/aepp-sdk.browser.js"
   },
@@ -34,7 +46,10 @@
     "build:assets": "node tooling/fetch-aesophia-cli.mjs",
     "build:types": "tsc && node tooling/downlevel/run.mjs",
     "build:es": "babel src --config-file ./babel.esm.config.js --out-dir es --extensions .js,.ts --out-file-extension .mjs --source-maps true",
-    "build:api": "node tooling/autorest/compiler-prepare.mjs && autorest tooling/autorest/compiler.yaml && autorest tooling/autorest/node.yaml",
+    "build:api:node": "autorest tooling/autorest/node.yaml",
+    "build:api:compiler": "node tooling/autorest/compiler-prepare.mjs && autorest tooling/autorest/compiler.yaml",
+    "build:api:middleware": "node tooling/autorest/middleware-prepare.mjs && autorest tooling/autorest/middleware.yaml",
+    "build:api": "npm run build:api:node && npm run build:api:compiler && npm run build:api:middleware",
     "build:generate": "ts-node --transpileOnly tooling/generate-schema.ts",
     "build": "npm run build:api && npm run build:generate && webpack && npm run build:types && npm run build:es && npm run build:assets",
     "docs:examples": "node tooling/docs/examples-to-md.js examples/node/*.mjs",
@@ -47,7 +62,7 @@
     "test:unit": "mocha './test/unit/'",
     "test:watch": "mocha './test/unit/' './test/integration/' --watch",
     "prepare": "npm run build",
-    "prepublishOnly": "test/examples.sh && npm run docs:examples && npm run docs:api",
+    "prepublishOnly": "test/examples.sh",
     "release": "standard-version --skip.tag --infile docs/CHANGELOG.md",
     "release-alpha": "npm run release -- --prerelease alpha",
     "release-beta": "npm run release -- --prerelease beta"
@@ -74,13 +89,16 @@
     "@types/uuid": "^9.0.1",
     "@types/webextension-polyfill": "^0.10.0",
     "@types/websocket": "^1.0.5",
+    "@types/ws": "^8.5.4",
     "aes-js": "^3.1.2",
     "bignumber.js": "^9.1.1",
     "bip32-path": "^0.4.2",
     "blakejs": "^1.2.1",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3",
+    "canonicalize": "^2.0.0",
     "events": "^3.3.0",
+    "isomorphic-ws": "^5.0.0",
     "json-bigint": "^1.0.0",
     "process": "^0.11.10",
     "rlp": "^3.0.0",
@@ -88,7 +106,8 @@
     "tweetnacl": "^1.0.3",
     "tweetnacl-auth": "^1.0.1",
     "varuint-bitcoin": "^1.1.2",
-    "websocket": "^1.0.34"
+    "websocket": "^1.0.34",
+    "ws": "^8.13.0"
   },
   "repository": {
     "type": "git",
diff --git a/src/AeSdkBase.ts b/src/AeSdkBase.ts
index f2c21b4a45..709639ad79 100644
--- a/src/AeSdkBase.ts
+++ b/src/AeSdkBase.ts
@@ -1,9 +1,11 @@
 import Node from './Node';
 import AccountBase from './account/Base';
-import { CompilerError, DuplicateNodeError, NodeNotFoundError } from './utils/errors';
+import {
+  CompilerError, DuplicateNodeError, NodeNotFoundError, NotImplementedError, TypeError,
+} from './utils/errors';
 import { Encoded } from './utils/encoder';
 import CompilerBase from './contract/compiler/Base';
-import AeSdkMethods, { OnAccount, getValueOrErrorProxy } from './AeSdkMethods';
+import AeSdkMethods, { OnAccount, getValueOrErrorProxy, AeSdkMethodsOptions } from './AeSdkMethods';
 
 type NodeInfo = Awaited<ReturnType<Node['getNodeInfo']>> & { name: string };
 
@@ -23,7 +25,7 @@ export default class AeSdkBase extends AeSdkMethods {
    * @param options.nodes - Array of nodes
    */
   constructor(
-    { nodes = [], ...options }: ConstructorParameters<typeof AeSdkMethods>[0] & {
+    { nodes = [], ...options }: AeSdkMethodsOptions & {
       nodes?: Array<{ name: string; instance: Node }>;
     } = {},
   ) {
@@ -127,6 +129,19 @@ export default class AeSdkBase extends AeSdkMethods {
     return [];
   }
 
+  /**
+   * Resolves an account
+   * @param account - ak-address, instance of AccountBase, or keypair
+   */
+  _resolveAccount(account: OnAccount = this._options.onAccount): AccountBase {
+    if (typeof account === 'string') throw new NotImplementedError('Address in AccountResolver');
+    if (typeof account === 'object') return account;
+    throw new TypeError(
+      'Account should be an address (ak-prefixed string), '
+      + `or instance of AccountBase, got ${String(account)} instead`,
+    );
+  }
+
   get address(): Encoded.AccountAddress {
     return this._resolveAccount().address;
   }
@@ -153,15 +168,25 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount(onAccount).signMessage(message, options);
   }
 
-  override _getOptions(): {
+  async signTypedData(
+    data: Encoded.ContractBytearray,
+    aci: Parameters<AccountBase['signTypedData']>[1],
+    { onAccount, ...options }: { onAccount?: OnAccount } & Parameters<AccountBase['signTypedData']>[2] = {},
+  ): Promise<Encoded.Signature> {
+    return this._resolveAccount(onAccount).signTypedData(data, aci, options);
+  }
+
+  override _getOptions(callOptions: AeSdkMethodsOptions = {}): {
     onNode: Node;
     onAccount: AccountBase;
     onCompiler: CompilerBase;
   } {
     return {
-      ...super._getOptions(),
+      ...this._options,
       onNode: getValueOrErrorProxy(() => this.api),
       onCompiler: getValueOrErrorProxy(() => this.compilerApi),
+      ...callOptions,
+      onAccount: getValueOrErrorProxy(() => this._resolveAccount(callOptions.onAccount)),
     };
   }
 }
diff --git a/src/AeSdkMethods.ts b/src/AeSdkMethods.ts
index 5cfd72f0b7..f4c2aec503 100644
--- a/src/AeSdkMethods.ts
+++ b/src/AeSdkMethods.ts
@@ -11,25 +11,27 @@ import Node from './Node';
 import { TxParamsAsync } from './tx/builder/schema.generated';
 import AccountBase from './account/Base';
 import { Encoded } from './utils/encoder';
-import { ArgumentError, NotImplementedError, TypeError } from './utils/errors';
+import CompilerBase from './contract/compiler/Base';
 
 export type OnAccount = Encoded.AccountAddress | AccountBase | undefined;
 
-export function getValueOrErrorProxy<Value extends object>(valueCb: () => Value): Value {
-  return new Proxy({}, {
-    ...Object.fromEntries([
+export function getValueOrErrorProxy<Value extends object | undefined>(
+  valueCb: () => Value,
+): NonNullable<Value> {
+  return new Proxy(
+    {},
+    Object.fromEntries(([
       'apply', 'construct', 'defineProperty', 'deleteProperty', 'getOwnPropertyDescriptor',
       'getPrototypeOf', 'isExtensible', 'ownKeys', 'preventExtensions', 'set', 'setPrototypeOf',
-    ].map((name) => [name, () => { throw new NotImplementedError(`${name} proxy request`); }])),
-    get(t: {}, property: string | symbol, receiver: any) {
-      const target = valueCb();
-      const value = Reflect.get(target, property, receiver);
-      return typeof value === 'function' ? value.bind(target) : value;
-    },
-    has(t: {}, property: string | symbol) {
-      return Reflect.has(valueCb(), property);
-    },
-  }) as Value;
+      'get', 'has',
+    ] as const).map((name) => [name, (t: {}, ...args: unknown[]) => {
+      const target = valueCb() as object; // to get a native exception in case it missed
+      const res = (Reflect[name] as any)(target, ...args);
+      return typeof res === 'function' && name === 'get'
+        ? res.bind(target) // otherwise it fails with attempted to get private field on non-instance
+        : res;
+    }])),
+  ) as NonNullable<Value>;
 }
 
 const { InvalidTxError: _2, ...chainMethodsOther } = chainMethods;
@@ -51,9 +53,8 @@ type GetMethodsOptions <Methods extends { [key: string]: Function }> =
       ? Args[Decrement<Args['length']>] : never
   };
 type MethodsOptions = GetMethodsOptions<typeof methods>;
-interface AeSdkMethodsOptions
+export interface AeSdkMethodsOptions
   extends Partial<UnionToIntersection<MethodsOptions[keyof MethodsOptions]>> {
-  nodes?: Array<{ name: string; instance: Node }>;
 }
 
 /**
@@ -79,24 +80,15 @@ class AeSdkMethods {
     Object.assign(this._options, options);
   }
 
-  /**
-   * Resolves an account
-   * @param account - ak-address, instance of AccountBase, or keypair
-   */
-  // eslint-disable-next-line class-methods-use-this
-  _resolveAccount(account?: OnAccount): AccountBase {
-    if (typeof account === 'string') throw new NotImplementedError('Address in AccountResolver');
-    if (typeof account === 'object') return account;
-    throw new TypeError(
-      'Account should be an address (ak-prefixed string), '
-      + `or instance of AccountBase, got ${String(account)} instead`,
-    );
-  }
-
-  _getOptions(): AeSdkMethodsOptions & { onAccount: AccountBase } {
+  _getOptions(
+    callOptions: AeSdkMethodsOptions = {},
+  ): AeSdkMethodsOptions & { onAccount: AccountBase; onCompiler: CompilerBase; onNode: Node } {
     return {
       ...this._options,
-      onAccount: getValueOrErrorProxy(() => this._resolveAccount()),
+      onAccount: getValueOrErrorProxy(() => this._options.onAccount),
+      onNode: getValueOrErrorProxy(() => this._options.onNode),
+      onCompiler: getValueOrErrorProxy(() => this._options.onCompiler),
+      ...callOptions,
     };
   }
 
@@ -107,16 +99,7 @@ class AeSdkMethods {
   async initializeContract<Methods extends ContractMethodsBase>(
     options?: Omit<Parameters<typeof Contract.initialize>[0], 'onNode'> & { onNode?: Node },
   ): Promise<Contract<Methods>> {
-    const { onNode, onCompiler, ...otherOptions } = this._getOptions();
-    if (onCompiler == null || onNode == null) {
-      throw new ArgumentError('onCompiler, onNode', 'provided', null);
-    }
-    return Contract.initialize<Methods>({
-      ...otherOptions,
-      onNode,
-      onCompiler,
-      ...options,
-    });
+    return Contract.initialize<Methods>(this._getOptions(options as AeSdkMethodsOptions));
   }
 }
 
@@ -147,18 +130,16 @@ Object.assign(AeSdkMethods.prototype, mapObject<Function, Function>(
   methods,
   ([name, handler]) => [
     name,
-    function methodWrapper(...args: any[]) {
+    function methodWrapper(this: AeSdkMethods, ...args: any[]) {
       args.length = handler.length;
       const options = args[args.length - 1];
-      args[args.length - 1] = {
-        ...this._getOptions(),
-        ...options,
-        ...options?.onAccount != null && { onAccount: this._resolveAccount(options.onAccount) },
-      };
+      args[args.length - 1] = this._getOptions(options);
       return handler(...args);
     },
   ],
 ));
 
-export default AeSdkMethods as new (options?: ConstructorParameters<typeof AeSdkMethods>[0]) =>
-AeSdkMethods & AeSdkMethodsTransformed;
+type AeSdkMethodsTyped = AeSdkMethods & AeSdkMethodsTransformed;
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+const AeSdkMethodsTyped = AeSdkMethods as new (options?: AeSdkMethodsOptions) => AeSdkMethodsTyped;
+export default AeSdkMethodsTyped;
diff --git a/src/AeSdkWallet.ts b/src/AeSdkWallet.ts
index 71f9c24812..8a46aa61fc 100644
--- a/src/AeSdkWallet.ts
+++ b/src/AeSdkWallet.ts
@@ -4,7 +4,7 @@ import verifyTransaction from './tx/validator';
 import RpcClient from './aepp-wallet-communication/rpc/RpcClient';
 import {
   METHODS, RPC_STATUS, SUBSCRIPTION_TYPES, WALLET_TYPE,
-  RpcBroadcastError, RpcInvalidTransactionError,
+  RpcInvalidTransactionError,
   RpcNotAuthorizeError, RpcPermissionDenyError, RpcUnsupportedProtocolError,
 } from './aepp-wallet-communication/schema';
 import { InternalError, UnknownRpcClientError } from './utils/errors';
@@ -242,14 +242,21 @@ export default class AeSdkWallet extends AeSdk {
             await this.onAskAccounts(id, params, origin);
             return this.addresses();
           },
-          [METHODS.sign]: async ({ tx, onAccount = this.address, returnSigned }, origin) => {
+          [METHODS.sign]: async (
+            {
+              tx, onAccount = this.address, returnSigned, innerTx,
+            },
+            origin,
+          ) => {
             if (!this._isRpcClientConnected(id)) throw new RpcNotAuthorizeError();
             if (!this.addresses().includes(onAccount)) {
               throw new RpcPermissionDenyError(onAccount);
             }
 
-            const parameters = { onAccount, aeppOrigin: origin, aeppRpcClientId: id };
-            if (returnSigned) {
+            const parameters = {
+              onAccount, aeppOrigin: origin, aeppRpcClientId: id, innerTx,
+            };
+            if (returnSigned || innerTx === true) {
               return { signedTransaction: await this.signTransaction(tx, parameters) };
             }
             try {
@@ -259,7 +266,7 @@ export default class AeSdkWallet extends AeSdk {
             } catch (error) {
               const validation = await verifyTransaction(tx, this.api);
               if (validation.length > 0) throw new RpcInvalidTransactionError(validation);
-              throw new RpcBroadcastError(error.message);
+              throw error;
             }
           },
           [METHODS.signMessage]: async ({ message, onAccount = this.address }, origin) => {
@@ -273,6 +280,21 @@ export default class AeSdkWallet extends AeSdk {
               signature: Buffer.from(await this.signMessage(message, parameters)).toString('hex'),
             };
           },
+          [METHODS.signTypedData]: async ({
+            domain, aci, data, onAccount = this.address,
+          }, origin) => {
+            if (!this._isRpcClientConnected(id)) throw new RpcNotAuthorizeError();
+            if (!this.addresses().includes(onAccount)) {
+              throw new RpcPermissionDenyError(onAccount);
+            }
+
+            const parameters = {
+              ...domain, onAccount, aeppOrigin: origin, aeppRpcClientId: id,
+            };
+            return {
+              signature: await this.signTypedData(data, aci, parameters),
+            };
+          },
         },
       ),
     };
diff --git a/src/Middleware.ts b/src/Middleware.ts
new file mode 100644
index 0000000000..fafb521234
--- /dev/null
+++ b/src/Middleware.ts
@@ -0,0 +1,141 @@
+// eslint-disable-next-line max-classes-per-file
+import BigNumber from 'bignumber.js';
+import { OperationArguments, OperationSpec } from '@azure/core-client';
+import {
+  genRequestQueuesPolicy, genCombineGetRequestsPolicy, genErrorFormatterPolicy,
+  genVersionCheckPolicy, genRetryOnFailurePolicy,
+} from './utils/autorest';
+import { Middleware as MiddlewareApi, MiddlewareOptionalParams, ErrorResponse } from './apis/middleware';
+import { mapObject } from './utils/other';
+import { Encoded } from './utils/encoder';
+import { ConsensusProtocolVersion } from './tx/builder/constants';
+
+const bigIntPropertyNames = [] as const;
+
+const numberPropertyNames = [] as const;
+
+class MiddlewareTransformed extends MiddlewareApi {
+  override async sendOperationRequest(
+    operationArguments: OperationArguments,
+    operationSpec: OperationSpec,
+  ): Promise<any> {
+    const args = mapObject(
+      operationArguments,
+      ([key, value]) => [key, this.#encodeArg(value)],
+    ) as OperationArguments;
+    return this.#decodeRes(await super.sendOperationRequest(args, operationSpec));
+  }
+
+  #mapData(data: any, transform: {
+    bigInt: (v: any) => any;
+    number: (v: any) => any;
+  }): unknown {
+    if (Array.isArray(data)) return data.map((d) => this.#mapData(d, transform));
+    if (data != null && typeof data === 'object') {
+      return mapObject(data, ([key, value]) => {
+        if (value == null) return [key, value];
+        if (bigIntPropertyNames.some((k) => k === key)) return [key, transform.bigInt(value)];
+        if (numberPropertyNames.some((k) => k === key)) return [key, transform.number(value)];
+        return [key, this.#mapData(value, transform)];
+      });
+    }
+    return data;
+  }
+
+  #encodeArg(data: any): any {
+    return this.#mapData(data, {
+      bigInt: (value) => {
+        if (value instanceof BigNumber) return value.toFixed();
+        return value.toString();
+      },
+      number: (value) => value.toString(),
+    });
+  }
+
+  #decodeRes(data: any): any {
+    return this.#mapData(data, {
+      bigInt: (value) => BigInt(value),
+      number: (value) => +value,
+    });
+  }
+}
+
+type BigIntPropertyNames = typeof bigIntPropertyNames[number];
+type NumberPropertyNames = typeof numberPropertyNames[number];
+type PreserveOptional<NewType, OrigType> =
+  OrigType extends undefined ? NewType | undefined : NewType;
+export type TransformMiddlewareType<Type> =
+  Type extends (...args: infer Args) => infer Ret
+    ? (...args: TransformMiddlewareType<Args>) => TransformMiddlewareType<Ret>
+    : Type extends [infer Item, ...infer Rest]
+      ? [TransformMiddlewareType<Item>, ...TransformMiddlewareType<Rest>]
+      : Type extends Array<infer Item>
+        ? Array<TransformMiddlewareType<Item>>
+        : Type extends Promise<infer T>
+          ? Promise<TransformMiddlewareType<T>>
+          : Type extends { [P in any]: any }
+            ? {
+              [Property in keyof Type]:
+              Property extends BigIntPropertyNames
+                ? PreserveOptional<bigint, Type[Property]>
+                : Property extends NumberPropertyNames
+                  ? PreserveOptional<number, Type[Property]>
+                  : Property extends 'txHash'
+                    ? PreserveOptional<Encoded.TxHash, Type[Property]>
+                    : Property extends 'bytecode'
+                      ? PreserveOptional<Encoded.ContractBytearray, Type[Property]>
+                      : TransformMiddlewareType<Type[Property]>
+            }
+            : Type;
+type MiddlewareTransformedApi = new (...args: ConstructorParameters<typeof MiddlewareApi>) => {
+  [Name in keyof InstanceType<typeof MiddlewareApi>]:
+  Name extends 'pipeline' | 'sendRequest' | 'sendOperationRequest'
+    ? MiddlewareApi[Name] : TransformMiddlewareType<MiddlewareApi[Name]>
+};
+
+export interface MiddlewareInfo {
+  url: string;
+  nodeNetworkId: string;
+  version: string;
+  consensusProtocolVersion: ConsensusProtocolVersion;
+}
+
+export default class Middleware
+  extends (MiddlewareTransformed as unknown as MiddlewareTransformedApi) {
+  /**
+   * @param url - Url for middleware API
+   * @param options - Options
+   * @param options.ignoreVersion - Don't check node version
+   * @param options.retryCount - Amount of extra requests to do in case of failure
+   * @param options.retryOverallDelay - Time in ms to wait between all retries
+   */
+  constructor(
+    url: string,
+    {
+      ignoreVersion = false, retryCount = 3, retryOverallDelay = 800, ...options
+    }: MiddlewareOptionalParams & {
+      ignoreVersion?: boolean;
+      retryCount?: number;
+      retryOverallDelay?: number;
+    } = {},
+  ) {
+    // eslint-disable-next-line constructor-super
+    super(url, {
+      allowInsecureConnection: true,
+      additionalPolicies: [
+        genRequestQueuesPolicy(),
+        genCombineGetRequestsPolicy(),
+        genRetryOnFailurePolicy(retryCount, retryOverallDelay),
+        genErrorFormatterPolicy((body: ErrorResponse) => ` ${body.error}`),
+      ],
+      ...options,
+    });
+    if (!ignoreVersion) {
+      const statusPromise = this.getStatus();
+      const versionPromise = statusPromise.then(({ mdwVersion }) => mdwVersion, (error) => error);
+      this.pipeline.addPolicy(
+        genVersionCheckPolicy('middleware', '/v2/status', versionPromise, '1.47.0', '2.0.0'),
+      );
+    }
+  }
+}
diff --git a/src/MiddlewareSubscriber.ts b/src/MiddlewareSubscriber.ts
new file mode 100644
index 0000000000..c4e7750af7
--- /dev/null
+++ b/src/MiddlewareSubscriber.ts
@@ -0,0 +1,207 @@
+/* eslint-disable max-classes-per-file */
+import WebSocket from 'isomorphic-ws';
+import { BaseError, UnexpectedTsError, InternalError } from './utils/errors';
+import { Encoded } from './utils/encoder';
+
+interface Message {
+  payload: Object;
+  source: Source.Middleware | Source.Node;
+  subscription: 'KeyBlocks' | 'MicroBlocks' | 'Transactions' | 'Object';
+  target?: string;
+}
+
+enum Source {
+  Middleware = 'mdw',
+  Node = 'node',
+  All = 'all',
+}
+
+export class MiddlewareSubscriberError extends BaseError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'MiddlewareSubscriberError';
+  }
+}
+
+export class MiddlewareSubscriberDisconnected extends MiddlewareSubscriberError {
+  constructor(readonly closeEvent: WebSocket.CloseEvent) {
+    super('Connection closed');
+    this.name = 'MiddlewareSubscriberDisconnected';
+  }
+}
+
+export default class MiddlewareSubscriber {
+  #subscriptions: Array<
+  readonly [target: string, s: Source, cb: (p?: Object, e?: Error) => void]
+  > = [];
+
+  #requestQueue: Array<[isSubscribe: boolean, target: string]> = [];
+
+  #webSocket?: WebSocket;
+
+  get webSocket(): WebSocket | undefined {
+    return this.#webSocket;
+  }
+
+  get #targets(): Set<string> {
+    return new Set(this.#subscriptions.map(([target]) => target));
+  }
+
+  #sendMessage(message: any): void {
+    if (this.#webSocket == null) throw new UnexpectedTsError();
+    this.#webSocket.send(JSON.stringify(message));
+  }
+
+  #sendSubscribe(isSubscribe: boolean, target: string): void {
+    if (this.#webSocket == null) return;
+    const payload = ['KeyBlocks', 'MicroBlocks', 'Transactions'].includes(target)
+      ? target : 'Object';
+    this.#sendMessage({
+      op: isSubscribe ? 'Subscribe' : 'Unsubscribe',
+      payload,
+      ...payload === 'Object' && { target },
+    });
+    this.#requestQueue.push([isSubscribe, target]);
+  }
+
+  #emit(condition: (target: string, source: Source) => boolean, p?: Object, e?: Error): void {
+    this.#subscriptions
+      .filter(([target, source]) => condition(target, source))
+      .forEach(([, , cb]) => cb(p, e));
+  }
+
+  constructor(readonly url: string) {
+  }
+
+  #disconnect(onlyReset = false): void {
+    if (this.#webSocket == null) return;
+    if (!onlyReset) this.#webSocket.close();
+    Object.assign(this.#webSocket, {
+      onopen: undefined,
+      onerror: undefined,
+      onmessage: undefined,
+    });
+    this.#webSocket = undefined;
+  }
+
+  async reconnect(): Promise<void> {
+    this.#disconnect();
+    this.#webSocket = await new Promise((resolve) => {
+      const webSocket = new WebSocket(this.url);
+      Object.assign(webSocket, {
+        onopen: () => resolve(webSocket),
+        onerror: (errorEvent: WebSocket.ErrorEvent) => {
+          this.#emit(() => true, undefined, errorEvent.error);
+        },
+        onmessage: (event: WebSocket.MessageEvent) => {
+          if (typeof event.data !== 'string') {
+            throw new InternalError(`Unknown incoming message type: ${typeof event.data}`);
+          }
+          this.#messageHandler(JSON.parse(event.data));
+        },
+        onclose: (event: WebSocket.CloseEvent) => {
+          this.#emit(() => true, undefined, new MiddlewareSubscriberDisconnected(event));
+          this.#disconnect(true);
+        },
+      });
+    });
+    await Promise.all([...this.#targets].map((target) => this.#sendSubscribe(true, target)));
+  }
+
+  #messageHandler(message: string | string[] | Message): void {
+    if (typeof message === 'string' || Array.isArray(message)) {
+      const request = this.#requestQueue.shift();
+      if (request == null) throw new InternalError('Request queue is empty');
+      const [isSubscribe, target] = request;
+      let error;
+      if (typeof message === 'string') error = new MiddlewareSubscriberError(message);
+      if (message.includes(target) !== isSubscribe) {
+        error = new InternalError(`Expected ${target} to be${isSubscribe ? '' : ' not'} included into ${message}`);
+      }
+      if (error != null) this.#emit((t) => target === t, undefined, error);
+      return;
+    }
+    this.#emit(
+      (target, source) => (target === message.subscription || target === message.target)
+        && (source === message.source || source === Source.All),
+      message.payload,
+    );
+  }
+
+  #subscribe(target: string, source: Source, cb: (p?: Object, e?: Error) => void): () => void {
+    const subscription = [target, source, cb] as const;
+    if (this.#targets.size === 0) this.reconnect();
+    if (!this.#targets.has(target)) this.#sendSubscribe(true, target);
+    this.#subscriptions.push(subscription);
+    return () => {
+      this.#subscriptions = this.#subscriptions.filter((item) => item !== subscription);
+      if (!this.#targets.has(target)) this.#sendSubscribe(false, target);
+      if (this.#targets.size === 0) this.#disconnect();
+    };
+  }
+
+  // TODO: replace p?: any with a proper type definition
+
+  subscribeKeyBlocks(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('KeyBlocks', Source.Middleware, cb);
+  }
+
+  subscribeKeyBlocksNode(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('KeyBlocks', Source.Node, cb);
+  }
+
+  subscribeKeyBlocksAll(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('KeyBlocks', Source.All, cb);
+  }
+
+  subscribeMicroBlocks(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('MicroBlocks', Source.Middleware, cb);
+  }
+
+  subscribeMicroBlocksNode(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('MicroBlocks', Source.Node, cb);
+  }
+
+  subscribeMicroBlocksAll(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('MicroBlocks', Source.All, cb);
+  }
+
+  subscribeTransactions(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('Transactions', Source.Middleware, cb);
+  }
+
+  subscribeTransactionsNode(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('Transactions', Source.Node, cb);
+  }
+
+  subscribeTransactionsAll(cb: (p?: any, e?: Error) => void): () => void {
+    return this.#subscribe('Transactions', Source.All, cb);
+  }
+
+  subscribeObject(
+    target: Encoded.KeyBlockHash | Encoded.Channel | Encoded.ContractAddress
+    | Encoded.OracleAddress | Encoded.OracleQueryId | Encoded.AccountAddress
+    | Encoded.Name | `${string}.chain`,
+    cb: (p?: any, e?: Error) => void,
+  ): () => void {
+    return this.#subscribe(target, Source.Middleware, cb);
+  }
+
+  subscribeObjectNode(
+    target: Encoded.KeyBlockHash | Encoded.Channel | Encoded.ContractAddress
+    | Encoded.OracleAddress | Encoded.OracleQueryId | Encoded.AccountAddress
+    | Encoded.Name | `${string}.chain`,
+    cb: (p?: any, e?: Error) => void,
+  ): () => void {
+    return this.#subscribe(target, Source.Node, cb);
+  }
+
+  subscribeObjectAll(
+    target: Encoded.KeyBlockHash | Encoded.Channel | Encoded.ContractAddress
+    | Encoded.OracleAddress | Encoded.OracleQueryId | Encoded.AccountAddress
+    | Encoded.Name | `${string}.chain`,
+    cb: (p?: any, e?: Error) => void,
+  ): () => void {
+    return this.#subscribe(target, Source.All, cb);
+  }
+}
diff --git a/src/Node.ts b/src/Node.ts
index 62100e41e8..ff22ae8f81 100644
--- a/src/Node.ts
+++ b/src/Node.ts
@@ -103,7 +103,7 @@ type NodeTransformedApi = new (...args: ConstructorParameters<typeof NodeApi>) =
     ? NodeApi[Name] : TransformNodeType<NodeApi[Name]>
 };
 
-export interface NodeInfo {
+interface NodeInfo {
   url: string;
   nodeNetworkId: string;
   version: string;
diff --git a/src/account/Base.ts b/src/account/Base.ts
index 47f8dd48f1..8adbe9a670 100644
--- a/src/account/Base.ts
+++ b/src/account/Base.ts
@@ -2,6 +2,7 @@ import { Encoded } from '../utils/encoder';
 import Node from '../Node';
 import CompilerBase from '../contract/compiler/Base';
 import { Int } from '../tx/builder/constants';
+import { AciValue, Domain } from '../utils/typed-data';
 
 interface AuthData {
   fee?: Int;
@@ -42,7 +43,7 @@ export default abstract class AccountBase {
    * Sign message
    * @param message - Message to sign
    * @param options - Options
-   * @returns Signature as hex string of Uint8Array
+   * @returns Signature
    */
   abstract signMessage(
     message: string,
@@ -52,16 +53,32 @@ export default abstract class AccountBase {
     },
   ): Promise<Uint8Array>;
 
+  /**
+   * Sign typed data
+   * @param type - Type of data to sign
+   * @param data - Encoded data to sign
+   * @param options - Options
+   * @returns Signature
+   */
+  abstract signTypedData(
+    data: Encoded.ContractBytearray,
+    aci: AciValue,
+    options?: Domain & {
+      aeppOrigin?: string;
+      aeppRpcClientId?: string;
+    },
+  ): Promise<Encoded.Signature>;
+
   /**
    * Sign data blob
    * @param data - Data blob to sign
    * @param options - Options
-   * @returns Signed data blob
+   * @returns Signature
    */
   abstract sign(data: string | Uint8Array, options?: any): Promise<Uint8Array>;
 
   /**
    * Account address
    */
-  readonly address: Encoded.AccountAddress;
+  readonly address!: Encoded.AccountAddress;
 }
diff --git a/src/account/Generalized.ts b/src/account/Generalized.ts
index 622b21498b..002dfc8c0e 100644
--- a/src/account/Generalized.ts
+++ b/src/account/Generalized.ts
@@ -38,6 +38,11 @@ export default class AccountGeneralized extends AccountBase {
     throw new NotImplementedError('Can\'t sign using generalized account');
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  override async signTypedData(): Promise<Encoded.Signature> {
+    throw new NotImplementedError('Can\'t sign using generalized account');
+  }
+
   override async signTransaction(
     tx: Encoded.Transaction,
     { authData, onCompiler, onNode }: Parameters<AccountBase['signTransaction']>[1],
diff --git a/src/account/Ledger.ts b/src/account/Ledger.ts
index 4777e25686..ff95eb1591 100644
--- a/src/account/Ledger.ts
+++ b/src/account/Ledger.ts
@@ -40,6 +40,11 @@ export default class AccountLedger extends AccountBase {
     throw new NotImplementedError('RAW signing using Ledger HW');
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  override async signTypedData(): Promise<Encoded.Signature> {
+    throw new NotImplementedError('Typed data signing using Ledger HW');
+  }
+
   override async signTransaction(
     tx: Encoded.Transaction,
     { innerTx, networkId }: { innerTx?: boolean; networkId?: string } = {},
diff --git a/src/account/Memory.ts b/src/account/Memory.ts
index 29bd5d260f..ec1a3da388 100644
--- a/src/account/Memory.ts
+++ b/src/account/Memory.ts
@@ -7,6 +7,7 @@ import {
   decode, encode, Encoded, Encoding,
 } from '../utils/encoder';
 import { concatBuffers } from '../utils/other';
+import { hashTypedData, AciValue } from '../utils/typed-data';
 import { buildTx } from '../tx/builder';
 import { Tag } from '../tx/builder/constants';
 
@@ -74,4 +75,18 @@ export default class AccountMemory extends AccountBase {
   override async signMessage(message: string, options?: any): Promise<Uint8Array> {
     return this.sign(messageToHash(message), options);
   }
+
+  override async signTypedData(
+    data: Encoded.ContractBytearray,
+    aci: AciValue,
+    {
+      name, version, networkId, contractAddress, ...options
+    }: Parameters<AccountBase['signTypedData']>[2] = {},
+  ): Promise<Encoded.Signature> {
+    const dHash = hashTypedData(data, aci, {
+      name, version, networkId, contractAddress,
+    });
+    const signature = await this.sign(dHash, options);
+    return encode(signature, Encoding.Signature);
+  }
 }
diff --git a/src/account/Rpc.ts b/src/account/Rpc.ts
index c808cb3da8..7c7984e436 100644
--- a/src/account/Rpc.ts
+++ b/src/account/Rpc.ts
@@ -28,20 +28,17 @@ export default class AccountRpc extends AccountBase {
     throw new NotImplementedError('RAW signing using wallet');
   }
 
-  /**
-   * @returns Signed transaction
-   */
   override async signTransaction(
     tx: Encoded.Transaction,
     { innerTx, networkId }: Parameters<AccountBase['signTransaction']>[1] = {},
   ): Promise<Encoded.Transaction> {
-    if (innerTx != null) throw new NotImplementedError('innerTx option in AccountRpc');
     if (networkId == null) throw new ArgumentError('networkId', 'provided', networkId);
     const res = await this._rpcClient.request(METHODS.sign, {
       onAccount: this.address,
       tx,
       returnSigned: true,
       networkId,
+      innerTx,
     });
     if (res.signedTransaction == null) {
       throw new UnsupportedProtocolError('signedTransaction is missed in wallet response');
@@ -49,12 +46,27 @@ export default class AccountRpc extends AccountBase {
     return res.signedTransaction;
   }
 
-  /**
-   * @returns Signed message
-   */
   override async signMessage(message: string): Promise<Uint8Array> {
     const { signature } = await this._rpcClient
       .request(METHODS.signMessage, { onAccount: this.address, message });
     return Buffer.from(signature, 'hex');
   }
+
+  override async signTypedData(
+    data: Encoded.ContractBytearray,
+    aci: Parameters<AccountBase['signTypedData']>[1],
+    {
+      name, version, contractAddress, networkId,
+    }: Parameters<AccountBase['signTypedData']>[2] = {},
+  ): Promise<Encoded.Signature> {
+    const { signature } = await this._rpcClient.request(METHODS.signTypedData, {
+      onAccount: this.address,
+      domain: {
+        name, version, networkId, contractAddress,
+      },
+      aci,
+      data,
+    });
+    return signature;
+  }
 }
diff --git a/src/aens.ts b/src/aens.ts
index 40ae519804..1b968b9709 100644
--- a/src/aens.ts
+++ b/src/aens.ts
@@ -379,7 +379,7 @@ interface AensPreclaimOptions extends
  * @example
  * ```js
  * const name = 'test.chain'
- * const bidFee = computeBidFee(name, startFee, incrementPercentage)
+ * const bidFee = computeBidFee(name, { startFee, increment: 0.42 })
  *
  * await sdkInstance.aensBid(name, 213109412839123, { ttl, fee, nonce })
  * ```
diff --git a/src/aepp-wallet-communication/rpc/RpcClient.ts b/src/aepp-wallet-communication/rpc/RpcClient.ts
index 2e7af83954..4450b6dc8b 100644
--- a/src/aepp-wallet-communication/rpc/RpcClient.ts
+++ b/src/aepp-wallet-communication/rpc/RpcClient.ts
@@ -1,6 +1,7 @@
 import { RpcError, RpcInternalError, RpcMethodNotFoundError } from '../schema';
 import BrowserConnection from '../connection/Browser';
 import { InvalidRpcMessageError, MissingCallbackError } from '../../utils/errors';
+import { ensureError } from '../../utils/other';
 
 interface JsonRpcRequest {
   jsonrpc: '2.0';
@@ -64,17 +65,24 @@ export default class RpcClient <
 
     const request = msg as JsonRpcRequest;
     let result;
-    let error;
+    let error: Error | undefined;
     try {
       if (!(request.method in this.#methods)) throw new RpcMethodNotFoundError();
       const methodName = request.method as keyof LocalApi;
       result = await this.#methods[methodName](request.params, origin);
     } catch (e) {
-      error = e instanceof RpcError ? e : new RpcInternalError();
+      ensureError(e);
+      error = e;
     }
     if (request.id != null) {
-      this.#sendResponse(request.id, request.method as keyof LocalApi, result, error);
+      this.#sendResponse(
+        request.id,
+        request.method as keyof LocalApi,
+        result,
+        error == null || error instanceof RpcError ? error : new RpcInternalError(),
+      );
     }
+    if (error != null && !(error instanceof RpcError)) throw error;
   }
 
   #sendRequest(
diff --git a/src/aepp-wallet-communication/rpc/types.ts b/src/aepp-wallet-communication/rpc/types.ts
index 1aad2fb343..4554a57f67 100644
--- a/src/aepp-wallet-communication/rpc/types.ts
+++ b/src/aepp-wallet-communication/rpc/types.ts
@@ -1,4 +1,5 @@
 import { Encoded } from '../../utils/encoder';
+import { Domain, AciValue } from '../../utils/typed-data';
 import { METHODS, SUBSCRIPTION_TYPES, WALLET_TYPE } from '../schema';
 import { TransformNodeType } from '../../Node';
 import { SignedTx } from '../../apis/node';
@@ -55,6 +56,7 @@ export interface WalletApi {
        * @see {@link https://github.com/aeternity/aepp-sdk-js/commit/153fd89a52c4eab39fcd659b356b36d32129c1ba}
        */
       networkId: string;
+      innerTx?: boolean;
     }
   ) => Promise<{
     /**
@@ -71,6 +73,15 @@ export interface WalletApi {
   [METHODS.signMessage]: (
     p: { message: string; onAccount: Encoded.AccountAddress }
   ) => Promise<{ signature: string }>;
+
+  [METHODS.signTypedData]: (
+    p: {
+      domain: Domain;
+      aci: AciValue;
+      data: Encoded.ContractBytearray;
+      onAccount: Encoded.AccountAddress;
+    },
+  ) => Promise<{ signature: Encoded.Signature }>;
 }
 
 export interface AeppApi {
diff --git a/src/aepp-wallet-communication/schema.ts b/src/aepp-wallet-communication/schema.ts
index 6279565873..e9fc4d89ae 100644
--- a/src/aepp-wallet-communication/schema.ts
+++ b/src/aepp-wallet-communication/schema.ts
@@ -36,6 +36,7 @@ export const enum METHODS {
   connect = 'connection.open',
   sign = 'transaction.sign',
   signMessage = 'message.sign',
+  signTypedData = 'typedData.sign',
   subscribeAddress = 'address.subscribe',
   updateNetwork = 'networkId.update',
   closeConnection = 'connection.close',
@@ -64,7 +65,7 @@ const rpcErrors: Array<(new (data?: any) => RpcError) & { code: number }> = [];
 export abstract class RpcError extends BaseError {
   static code: number;
 
-  code: number;
+  code!: number;
 
   data?: any;
 
@@ -99,22 +100,6 @@ export class RpcInvalidTransactionError extends RpcError {
 }
 rpcErrors.push(RpcInvalidTransactionError);
 
-/**
- * @category exception
- */
-export class RpcBroadcastError extends RpcError {
-  static override code = 3;
-
-  override code = 3;
-
-  constructor(data?: any) {
-    super('Broadcast failed');
-    this.data = data;
-    this.name = 'RpcBroadcastError';
-  }
-}
-rpcErrors.push(RpcBroadcastError);
-
 /**
  * @category exception
  */
diff --git a/src/aepp-wallet-communication/wallet-detector.ts b/src/aepp-wallet-communication/wallet-detector.ts
index 732c061aaf..eb557afbbc 100644
--- a/src/aepp-wallet-communication/wallet-detector.ts
+++ b/src/aepp-wallet-communication/wallet-detector.ts
@@ -22,7 +22,7 @@ interface Wallets { [key: string]: Wallet }
  */
 export default (
   connection: BrowserConnection,
-  onDetected: ({ wallets, newWallet }: { wallets: Wallets; newWallet?: Wallet }) => void,
+  onDetected: ({ wallets, newWallet }: { wallets: Wallets; newWallet: Wallet }) => void,
 ): () => void => {
   if (window == null) throw new UnsupportedPlatformError('Window object not found, you can run wallet detector only in browser');
   const wallets: Wallets = {};
@@ -49,7 +49,6 @@ export default (
     wallets[wallet.info.id] = wallet;
     onDetected({ wallets, newWallet: wallet });
   }, () => {});
-  if (Object.keys(wallets).length > 0) onDetected({ wallets });
 
   return () => connection.disconnect();
 };
diff --git a/src/chain.ts b/src/chain.ts
index 17eb194b9f..7f59c6fe0c 100644
--- a/src/chain.ts
+++ b/src/chain.ts
@@ -1,6 +1,6 @@
 import { AE_AMOUNT_FORMATS, formatAmount } from './utils/amount-formatter';
 import verifyTransaction, { ValidatorResult } from './tx/validator';
-import { isAccountNotFoundError, pause } from './utils/other';
+import { ensureError, isAccountNotFoundError, pause } from './utils/other';
 import { isNameValid, produceNameId } from './tx/builder/helpers';
 import { DRY_RUN_ACCOUNT } from './tx/builder/schema';
 import { AensName } from './tx/builder/constants';
@@ -23,7 +23,7 @@ import { buildTxHash } from './tx/builder';
  * @category chain
  */
 export function _getPollInterval(
-  type: 'block' | 'microblock',
+  type: 'block' | 'microblock', // TODO: rename to 'key-block' | 'micro-block'
   { _expectedMineRate = 180000, _microBlockCycle = 3000, _maxPollInterval = 5000 }:
   { _expectedMineRate?: number; _microBlockCycle?: number; _maxPollInterval?: number },
 ): number {
@@ -208,6 +208,7 @@ export async function sendTransaction(
     }
     return { hash: txHash, rawTx: tx };
   } catch (error) {
+    ensureError(error);
     throw Object.assign(error, {
       rawTx: tx,
       verifyTx: async () => verifyTransaction(tx, onNode),
diff --git a/src/channel/Base.ts b/src/channel/Base.ts
index 38e236be06..e9b0b5ffaf 100644
--- a/src/channel/Base.ts
+++ b/src/channel/Base.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import EventEmitter from 'events';
 import { w3cwebsocket as W3CWebSocket } from 'websocket';
 import { snakeToPascal } from '../utils/string';
 import { buildTx, unpackTx } from '../tx/builder';
@@ -55,7 +55,7 @@ function snakeToPascalObjKeys<Type>(obj: object): Type {
 export default class Channel {
   _eventEmitter = new EventEmitter();
 
-  _pingTimeoutId: NodeJS.Timeout;
+  _pingTimeoutId!: NodeJS.Timeout;
 
   _nextRpcMessageId = 0;
 
@@ -73,13 +73,13 @@ export default class Channel {
 
   _status: ChannelStatus = 'disconnected';
 
-  _fsm: ChannelFsm;
+  _fsm!: ChannelFsm;
 
-  _websocket: W3CWebSocket;
+  _websocket!: W3CWebSocket;
 
   _state: Encoded.Transaction | '' = '';
 
-  _options: ChannelOptions;
+  _options!: ChannelOptions;
 
   _channelId?: Encoded.Channel;
 
diff --git a/src/channel/internal.ts b/src/channel/internal.ts
index fd2ef38aae..4f95947b4d 100644
--- a/src/channel/internal.ts
+++ b/src/channel/internal.ts
@@ -15,6 +15,7 @@ import {
 } from '../utils/errors';
 import { encodeContractAddress } from '../utils/crypto';
 import { buildTx } from '../tx/builder';
+import { ensureError } from '../utils/other';
 
 export interface ChannelEvents {
   statusChanged: (status: ChannelStatus) => void;
@@ -240,6 +241,7 @@ async function dequeueMessage(channel: Channel): Promise<void> {
     try {
       await handleMessage(channel, message);
     } catch (error) {
+      ensureError(error);
       emit(channel, 'error', new ChannelIncomingMessageError(error, message));
     }
   }
diff --git a/src/contract/Contract.ts b/src/contract/Contract.ts
index ebaf067282..443138b734 100644
--- a/src/contract/Contract.ts
+++ b/src/contract/Contract.ts
@@ -324,6 +324,7 @@ class Contract<M extends ContractMethodsBase> {
       const useFallbackAccount = callStatic === true && (
         (error instanceof TypeError && error.message === 'Account should be an address (ak-prefixed string), or instance of AccountBase, got undefined instead')
         || (error instanceof NoWalletConnectedError)
+        || (error instanceof InternalError && error.message === 'Use fallback account')
       );
       if (!useFallbackAccount) throw error;
       callerId = DRY_RUN_ACCOUNT.pub;
diff --git a/src/contract/compiler/Base.ts b/src/contract/compiler/Base.ts
index 4612301370..a06e4c733a 100644
--- a/src/contract/compiler/Base.ts
+++ b/src/contract/compiler/Base.ts
@@ -55,6 +55,32 @@ export default abstract class CompilerBase {
     aci: Aci;
   }>;
 
+  /**
+   * Generate contract's ACI by contract's path
+   * Available only in Node.js
+   * @param path - Path to contract source code
+   * @returns ACI
+   */
+  abstract generateAci(path: string): Promise<Aci>;
+
+  /**
+   * Generate contract's ACI by contract's source code
+   * @param sourceCode - Contract source code as string
+   * @param fileSystem - A map of contract filename to the corresponding contract source code to
+   * include into the main contract
+   * @example
+   * ```js
+   * {
+   *   'library.aes': 'namespace TestLib =\n  function sum(x: int, y: int) : int = x + y'
+   * }
+   * ```
+   * @returns ACI
+   */
+  abstract generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci>;
+
   /**
    * Verify that a contract bytecode is the result of compiling the given source code
    * Available only in Node.js
diff --git a/src/contract/compiler/Cli.ts b/src/contract/compiler/Cli.ts
index acad9f97e4..47ee9babc1 100644
--- a/src/contract/compiler/Cli.ts
+++ b/src/contract/compiler/Cli.ts
@@ -7,6 +7,7 @@ import CompilerBase, { Aci } from './Base';
 import { Encoded } from '../../utils/encoder';
 import { CompilerError, InternalError, UnsupportedVersionError } from '../../utils/errors';
 import semverSatisfies from '../../utils/semver-satisfies';
+import { ensureError } from '../../utils/other';
 
 const getPackagePath = (): string => {
   const path = dirname(fileURLToPath(import.meta.url));
@@ -22,7 +23,7 @@ const getPackagePath = (): string => {
 export default class CompilerCli extends CompilerBase {
   #path: string;
 
-  #ensureCompatibleVersion: Promise<void>;
+  #ensureCompatibleVersion = Promise.resolve();
 
   constructor(
     compilerPath = resolve(getPackagePath(), './bin/aesophia_cli'),
@@ -32,7 +33,7 @@ export default class CompilerCli extends CompilerBase {
     this.#path = compilerPath;
     if (ignoreVersion !== true) {
       this.#ensureCompatibleVersion = this.version().then((version) => {
-        const versions = [version, '7.0.1', '8.0.0'] as const;
+        const versions = [version, '7.2.1', '8.0.0'] as const;
         if (!semverSatisfies(...versions)) throw new UnsupportedVersionError('compiler', ...versions);
       });
     }
@@ -78,9 +79,10 @@ export default class CompilerCli extends CompilerBase {
       ]);
       return {
         bytecode: bytecode.trimEnd() as Encoded.ContractBytearray,
-        aci: aci as Aci,
+        aci,
       };
     } catch (error) {
+      ensureError(error);
       throw new CompilerError(error.message);
     }
   }
@@ -97,6 +99,28 @@ export default class CompilerCli extends CompilerBase {
     }
   }
 
+  async generateAci(path: string): Promise<Aci> {
+    await this.#ensureCompatibleVersion;
+    try {
+      return JSON.parse(await this.#run('--no_code', '--create_json_aci', path));
+    } catch (error) {
+      ensureError(error);
+      throw new CompilerError(error.message);
+    }
+  }
+
+  async generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci> {
+    const tmp = await CompilerCli.#saveContractToTmpDir(sourceCode, fileSystem);
+    try {
+      return await this.generateAci(tmp);
+    } finally {
+      await rm(dirname(tmp), { recursive: true });
+    }
+  }
+
   async validate(bytecode: Encoded.ContractBytearray, path: string): Promise<boolean> {
     await this.#ensureCompatibleVersion;
     try {
diff --git a/src/contract/compiler/Http.ts b/src/contract/compiler/Http.ts
index a8164975c2..176a633226 100644
--- a/src/contract/compiler/Http.ts
+++ b/src/contract/compiler/Http.ts
@@ -55,7 +55,7 @@ export default class CompilerHttp extends CompilerBase {
       const versionPromise = this.api.apiVersion()
         .then(({ apiVersion }) => apiVersion, (error) => error);
       this.api.pipeline.addPolicy(
-        genVersionCheckPolicy('compiler', '/api-version', versionPromise, '7.1.1', '8.0.0'),
+        genVersionCheckPolicy('compiler', '/api-version', versionPromise, '7.3.0', '8.0.0'),
       );
     }
   }
@@ -70,7 +70,7 @@ export default class CompilerHttp extends CompilerBase {
       return res as { bytecode: Encoded.ContractBytearray; aci: Aci };
     } catch (error) {
       if (error instanceof RestError && error.statusCode === 400) {
-        throw new CompilerError(error.message.replace(/^aci error:/, 'compile error:'));
+        throw new CompilerError(error.message);
       }
       throw error;
     }
@@ -81,6 +81,25 @@ export default class CompilerHttp extends CompilerBase {
     throw new NotImplementedError('File system access, use CompilerHttpNode instead');
   }
 
+  async generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci> {
+    try {
+      return await this.api.generateACI({ code: sourceCode, options: { fileSystem } });
+    } catch (error) {
+      if (error instanceof RestError && error.statusCode === 400) {
+        throw new CompilerError(error.message);
+      }
+      throw error;
+    }
+  }
+
+  // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+  async generateAci(path: string): Promise<Aci> {
+    throw new NotImplementedError('File system access, use CompilerHttpNode instead');
+  }
+
   async validateBySourceCode(
     bytecode: Encoded.ContractBytearray,
     sourceCode: string,
diff --git a/src/contract/compiler/HttpNode.ts b/src/contract/compiler/HttpNode.ts
index aba048dff0..c4d4541c8f 100644
--- a/src/contract/compiler/HttpNode.ts
+++ b/src/contract/compiler/HttpNode.ts
@@ -18,6 +18,12 @@ export default class CompilerHttpNode extends HttpBrowser {
     return this.compileBySourceCode(sourceCode, fileSystem);
   }
 
+  override async generateAci(path: string): Promise<Aci> {
+    const fileSystem = await getFileSystem(path);
+    const sourceCode = await readFile(path, 'utf8');
+    return this.generateAciBySourceCode(sourceCode, fileSystem);
+  }
+
   override async validate(bytecode: Encoded.ContractBytearray, path: string): Promise<boolean> {
     const fileSystem = await getFileSystem(path);
     const sourceCode = await readFile(path, 'utf8');
diff --git a/src/deprecated.ts b/src/deprecated.ts
new file mode 100644
index 0000000000..5b5c0a7223
--- /dev/null
+++ b/src/deprecated.ts
@@ -0,0 +1,23 @@
+import { RpcError } from './aepp-wallet-communication/schema';
+
+/**
+ * @category exception
+ * @deprecated this exception is not thrown anymore
+ */
+// eslint-disable-next-line import/prefer-default-export
+export class RpcBroadcastError extends RpcError {
+  static override code = 3;
+
+  override code = 3;
+
+  constructor(data?: any) {
+    super('Broadcast failed');
+    this.data = data;
+    this.name = 'RpcBroadcastError';
+  }
+}
+
+/**
+ * @deprecated use isAuctionName instead
+ */
+export const NAME_BID_MAX_LENGTH = 12; // # this is the max length for a domain to be part of a bid
diff --git a/src/index-browser.ts b/src/index-browser.ts
index 71545875b2..c3ae0d7984 100644
--- a/src/index-browser.ts
+++ b/src/index-browser.ts
@@ -1,13 +1,30 @@
-// TODO: avoid `export * from`
-export * from './chain';
-export * from './utils/crypto';
-export * from './utils/keystore';
-export * from './utils/bytes';
+export {
+  _getPollInterval, InvalidTxError, getHeight, poll, awaitHeight, waitForTxConfirm, sendTransaction,
+  getAccount, getBalance, getCurrentGeneration, getGeneration, getMicroBlockTransactions,
+  getKeyBlock, getMicroBlockHeader, txDryRun, getContractByteCode, getContract, getName,
+  resolveName,
+} from './chain';
+export {
+  getAddressFromPriv, isAddressValid, genSalt, encodeUnsigned, hash, encodeContractAddress,
+  generateKeyPairFromSecret, generateKeyPair, sign, verify, messageToHash, signMessage,
+  verifyMessage, isValidKeypair,
+} from './utils/crypto';
+export { recover, dump } from './utils/keystore';
+export type { Keystore } from './utils/keystore';
+export { toBytes } from './utils/bytes';
 export {
   buildTx, buildTxAsync, buildTxHash, unpackTx, buildContractIdByContractTx,
 } from './tx/builder';
-export * from './tx/builder/helpers';
-export * from './tx/builder/constants';
+export {
+  buildContractId, oracleQueryId, produceNameId, commitmentHash, readInt, isNameValid, ensureName,
+  getDefaultPointerKey, getMinimumNameFee, computeBidFee, computeAuctionEndBlock, isAuctionName,
+} from './tx/builder/helpers';
+export {
+  MAX_AUTH_FUN_GAS, NAME_TTL, NAME_MAX_TTL, NAME_MAX_CLIENT_TTL, CLIENT_TTL, MIN_GAS_PRICE,
+  NAME_FEE_MULTIPLIER, NAME_FEE_BID_INCREMENT, NAME_BID_TIMEOUT_BLOCKS, NAME_MAX_LENGTH_FEE,
+  NAME_BID_RANGES, ConsensusProtocolVersion, VmVersion, AbiVersion, Tag,
+} from './tx/builder/constants';
+export type { Int, AensName } from './tx/builder/constants';
 // TODO: move to constants
 export {
   ORACLE_TTL_TYPES, ORACLE_TTL, QUERY_TTL, RESPONSE_TTL, DRY_RUN_ACCOUNT, CallReturnType,
@@ -16,17 +33,30 @@ export {
   getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode,
 } from './tx/execution-cost';
 export { default as getTransactionSignerAddress } from './tx/transaction-signer';
-export * from './utils/amount-formatter';
-export * from './utils/hd-wallet';
+export {
+  AE_AMOUNT_FORMATS, formatAmount, toAe, toAettos, prefixedAmount,
+} from './utils/amount-formatter';
+export {
+  DerivationError, deriveChild, derivePathFromKey, getMasterKeyFromSeed, derivePathFromSeed,
+  getKeyPair, generateSaveHDWalletFromSeed, getSaveHDWalletAccounts, getHdWalletAccountFromSeed,
+} from './utils/hd-wallet';
 export {
   encode, decode, Encoding, Encoded,
 } from './utils/encoder';
-export * from './aens';
+export {
+  encodeFateValue, decodeFateValue, hashTypedData, hashDomain, hashJson,
+} from './utils/typed-data';
+export {
+  aensRevoke, aensUpdate, aensTransfer, aensQuery, aensClaim, aensPreclaim, aensBid,
+} from './aens';
 export { default as Contract } from './contract/Contract';
 export type { ContractMethodsBase } from './contract/Contract';
-export * from './oracle';
-export * from './spend';
-export * from './contract/ga';
+export {
+  pollForQueries, pollForQueryResponse, getQueryObject, postQueryToOracle, extendOracleTtl,
+  respondToQuery, getOracleObject, registerOracle,
+} from './oracle';
+export { spend, transferFunds, payForTransaction } from './spend';
+export { createGeneralizedAccount, buildAuthTxHash, buildAuthTxHashByGaMetaTx } from './contract/ga';
 
 export { default as AeSdkMethods } from './AeSdkMethods';
 export { default as AeSdkBase } from './AeSdkBase';
@@ -43,10 +73,42 @@ export { default as AccountLedgerFactory } from './account/LedgerFactory';
 export { default as CompilerBase } from './contract/compiler/Base';
 export { default as CompilerHttp } from './contract/compiler/Http';
 export { default as Channel } from './channel/Contract';
+export {
+  default as _MiddlewareSubscriber,
+  MiddlewareSubscriberError as _MiddlewareSubscriberError,
+  MiddlewareSubscriberDisconnected as _MiddlewareSubscriberDisconnected,
+} from './MiddlewareSubscriber';
+export { default as _Middleware } from './Middleware';
 
 export { default as connectionProxy } from './aepp-wallet-communication/connection-proxy';
-export * from './aepp-wallet-communication/schema';
+export {
+  MESSAGE_DIRECTION, WALLET_TYPE, SUBSCRIPTION_TYPES, METHODS, RPC_STATUS, RpcError,
+  RpcInvalidTransactionError, RpcRejectedByUserError, RpcUnsupportedProtocolError,
+  RpcConnectionDenyError, RpcNotAuthorizeError, RpcPermissionDenyError, RpcInternalError,
+  RpcMethodNotFoundError,
+} from './aepp-wallet-communication/schema';
 export { default as walletDetector } from './aepp-wallet-communication/wallet-detector';
 export { default as BrowserRuntimeConnection } from './aepp-wallet-communication/connection/BrowserRuntime';
 export { default as BrowserWindowMessageConnection } from './aepp-wallet-communication/connection/BrowserWindowMessage';
-export * from './utils/errors';
+export {
+  BaseError, AccountError, AensError, AeppError, ChannelError, CompilerError, ContractError,
+  CryptographyError, NodeError, TransactionError, WalletError, ArgumentError, IllegalArgumentError,
+  ArgumentCountMismatchError, InsufficientBalanceError, MissingParamError, NoSerializerFoundError,
+  RequestTimedOutError, TxTimedOutError, TypeError, UnsupportedPlatformError,
+  UnsupportedProtocolError, NotImplementedError, UnsupportedVersionError, InternalError,
+  UnexpectedTsError, UnavailableAccountError, AensPointerContextError, InsufficientNameFeeError,
+  InvalidAensNameError, InvalidRpcMessageError, MissingCallbackError, UnAuthorizedAccountError,
+  UnknownRpcClientError, UnsubscribedAccountError, ChannelCallError, ChannelConnectionError,
+  ChannelPingTimedOutError, UnexpectedChannelMessageError, ChannelIncomingMessageError,
+  UnknownChannelStateError, InvalidAuthDataError, BytecodeMismatchError, DuplicateContractError,
+  InactiveContractError, InvalidMethodInvocationError, MissingContractAddressError,
+  MissingContractDefError, MissingFunctionNameError, NodeInvocationError,
+  NoSuchContractFunctionError, NotPayableFunctionError, MissingEventDefinitionError,
+  AmbiguousEventDefinitionError, InvalidChecksumError, InvalidPasswordError,
+  MerkleTreeHashMismatchError, MissingNodeInTreeError, UnknownNodeLengthError,
+  UnknownPathNibbleError, DuplicateNodeError, NodeNotFoundError, DecodeError, PayloadLengthError,
+  DryRunError, IllegalBidFeeError, InvalidSignatureError, PrefixNotFoundError, SchemaNotFoundError,
+  TagNotFoundError, TxNotInChainError, AlreadyConnectedError, NoWalletConnectedError,
+  RpcConnectionError,
+} from './utils/errors';
+export { RpcBroadcastError, NAME_BID_MAX_LENGTH } from './deprecated';
diff --git a/src/tx/builder/constants.ts b/src/tx/builder/constants.ts
index 29290cff22..377d313f91 100644
--- a/src/tx/builder/constants.ts
+++ b/src/tx/builder/constants.ts
@@ -20,7 +20,6 @@ export const NAME_FEE_BID_INCREMENT = 0.05; // # the increment is in percentage
 export const NAME_BID_TIMEOUT_BLOCKS = 480; // # ~1 day
 // # this is the max length for a domain that requires a base fee to be paid
 export const NAME_MAX_LENGTH_FEE = 31;
-export const NAME_BID_MAX_LENGTH = 12; // # this is the max length for a domain to be part of a bid
 // # https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
 // # https://github.com/aeternity/protocol/blob/master/AENS.md#protocol-fees-and-protection-times
 // # bid ranges:
diff --git a/src/tx/builder/field-types/coin-amount.ts b/src/tx/builder/field-types/coin-amount.ts
index 902b7504e9..0f53bea7a4 100644
--- a/src/tx/builder/field-types/coin-amount.ts
+++ b/src/tx/builder/field-types/coin-amount.ts
@@ -5,7 +5,8 @@ import { AE_AMOUNT_FORMATS, formatAmount } from '../../../utils/amount-formatter
 export default {
   ...uInt,
 
-  serializeAettos(value: string | undefined): string {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  serializeAettos(value: string | undefined, params: {}): string {
     return value ?? '0';
   },
 
diff --git a/src/tx/builder/field-types/entry.ts b/src/tx/builder/field-types/entry.ts
index 5507853ffe..810223e862 100644
--- a/src/tx/builder/field-types/entry.ts
+++ b/src/tx/builder/field-types/entry.ts
@@ -29,7 +29,7 @@ export default function genEntryField<T extends Tag = Tag>(tag?: T): {
 
     deserialize(buf, { unpackTx }) {
       const tx = unpackTx(encode(buf, Encoding.Transaction));
-      if (tag != null && tx.tag !== tag) throw new ArgumentError('Tag', tag, tx.tag);
+      if (tag != null && tx.tag !== tag) throw new ArgumentError('Tag', Tag[tag], Tag[tx.tag]);
       return tx;
     },
   };
diff --git a/src/tx/builder/helpers.ts b/src/tx/builder/helpers.ts
index ecaaaace3f..a544bc155f 100644
--- a/src/tx/builder/helpers.ts
+++ b/src/tx/builder/helpers.ts
@@ -59,6 +59,39 @@ export function oracleQueryId(
   return encode(b2bHash, Encoding.OracleQueryId);
 }
 
+const AENS_SUFFIX = '.chain';
+
+export function nameToPunycode(maybeName: string): AensName {
+  const [name, suffix, ...other] = maybeName.split('.');
+  if (other.length !== 0) throw new ArgumentError('aens name', 'including only one dot', maybeName);
+  if (suffix !== AENS_SUFFIX.slice(1)) {
+    throw new ArgumentError('aens name', `suffixed with ${AENS_SUFFIX}`, maybeName);
+  }
+  if (/\p{Emoji_Presentation}/u.test(name)) {
+    throw new ArgumentError('aens name', 'not containing emoji', maybeName);
+  }
+  let punycode;
+  try {
+    const u = new URL(`http://${name}.${suffix}`);
+    if (u.username + u.password + u.port + u.search + u.hash !== '' || u.pathname !== '/') {
+      throw new ArgumentError('aens name', 'valid', maybeName);
+    }
+    punycode = u.host;
+  } catch (error) {
+    if (error instanceof TypeError && error.message.includes('Invalid URL')) {
+      throw new ArgumentError('aens name', 'valid', maybeName);
+    }
+    throw error;
+  }
+  if (!/^[a-z0-9.-]+$/i.test(punycode)) {
+    throw new ArgumentError('aens name', 'without illegal chars', maybeName);
+  }
+  if (punycode.length > 63 + AENS_SUFFIX.length) {
+    throw new ArgumentError('aens name', 'not too long', maybeName);
+  }
+  return punycode as AensName;
+}
+
 /**
  * Encode an AENS name
  * @category AENS
@@ -66,7 +99,7 @@ export function oracleQueryId(
  * @returns `nm_` prefixed encoded AENS name
  */
 export function produceNameId(name: AensName): Encoded.Name {
-  return encode(hash(name.toLowerCase()), Encoding.Name);
+  return encode(hash(nameToPunycode(name)), Encoding.Name);
 }
 
 /**
@@ -83,7 +116,7 @@ export function commitmentHash(
 ): Encoded.Commitment {
   return encode(
     hash(concatBuffers([
-      Buffer.from(name.toLowerCase()),
+      Buffer.from(nameToPunycode(name)),
       Buffer.from(salt.toString(16).padStart(64, '0'), 'hex'),
     ])),
     Encoding.Commitment,
@@ -100,16 +133,28 @@ export function readInt(buf: Buffer = Buffer.from([])): string {
   return new BigNumber(Buffer.from(buf).toString('hex'), 16).toString(10);
 }
 
-const AENS_SUFFIX = '.chain';
+/**
+ * Ensure that name is valid AENS name, would throw an exception otherwise
+ * @category AENS
+ * @param name - AENS name
+ */
+export function ensureName(maybeName: string): asserts maybeName is AensName {
+  nameToPunycode(maybeName);
+}
 
 /**
  * Is AENS name valid
  * @category AENS
  * @param name - AENS name
  */
-export function isNameValid(name: string): name is AensName {
-  // TODO: probably there are stronger requirements
-  return name.endsWith(AENS_SUFFIX);
+// TODO: consider renaming to isName
+export function isNameValid(maybeName: string): maybeName is AensName {
+  try {
+    ensureName(maybeName);
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 
 const encodingToPointerKey = [
@@ -145,7 +190,7 @@ export function getDefaultPointerKey(
  * @returns the minimum fee for the AENS name auction
  */
 export function getMinimumNameFee(name: AensName): BigNumber {
-  const nameLength = name.length - AENS_SUFFIX.length;
+  const nameLength = nameToPunycode(name).length - AENS_SUFFIX.length;
   return NAME_BID_RANGES[Math.min(nameLength, NAME_MAX_LENGTH_FEE)];
 }
 
@@ -181,7 +226,7 @@ export function computeBidFee(
  * @returns Auction end height
  */
 export function computeAuctionEndBlock(name: AensName, claimHeight: number): number {
-  const length = name.length - AENS_SUFFIX.length;
+  const length = nameToPunycode(name).length - AENS_SUFFIX.length;
   const h = (length <= 4 ? 62 * NAME_BID_TIMEOUT_BLOCKS : null)
     ?? (length <= 8 ? 31 * NAME_BID_TIMEOUT_BLOCKS : null)
     ?? (length <= 12 ? NAME_BID_TIMEOUT_BLOCKS : null)
@@ -194,5 +239,5 @@ export function computeAuctionEndBlock(name: AensName, claimHeight: number): num
  * @category AENS
  */
 export function isAuctionName(name: AensName): boolean {
-  return name.length < 13 + AENS_SUFFIX.length;
+  return nameToPunycode(name).length < 13 + AENS_SUFFIX.length;
 }
diff --git a/src/tx/builder/index.ts b/src/tx/builder/index.ts
index cd17f77486..20754cd461 100644
--- a/src/tx/builder/index.ts
+++ b/src/tx/builder/index.ts
@@ -23,6 +23,9 @@ export function getSchema(tag: Tag, version?: number): Array<[string, Field]> {
   return Object.entries(schema);
 }
 
+type TxEncoding = Encoding.Transaction | Encoding.Poi | Encoding.StateTrees
+| Encoding.CallStateTree;
+
 /**
  * Build transaction hash
  * @category transaction builder
@@ -31,15 +34,9 @@ export function getSchema(tag: Tag, version?: number): Array<[string, Field]> {
  * @param options.prefix - Prefix of transaction
  * @returns object Base64Check transaction hash with 'tx_' prefix
  */
-export function buildTx<
-  E extends Encoding = Encoding.Transaction,
->(
+export function buildTx<E extends TxEncoding = Encoding.Transaction>(
   params: TxParams,
-  {
-    prefix,
-  }: {
-    prefix?: E;
-  } = {},
+  { prefix }: { prefix?: E } = {},
 ): Encoded.Generic<E> {
   const schema = getSchema(params.tag, params.version);
 
@@ -92,7 +89,7 @@ export async function buildTxAsync(params: TxParamsAsync): Promise<Encoded.Trans
  * @returns Object with transaction param's
  */
 export function unpackTx<TxType extends Tag>(
-  encodedTx: Encoded.Transaction | Encoded.Poi | Encoded.StateTrees | Encoded.CallStateTree,
+  encodedTx: Encoded.Generic<TxEncoding>,
   txType?: TxType,
 ): TxUnpacked & { tag: TxType } {
   const binary = rlpDecode(decode(encodedTx));
diff --git a/src/tx/validator.ts b/src/tx/validator.ts
index 9a50bc1b62..ca17dc8056 100644
--- a/src/tx/validator.ts
+++ b/src/tx/validator.ts
@@ -1,3 +1,4 @@
+import { RestError } from '@azure/core-rest-pipeline';
 import { hash, verify } from '../utils/crypto';
 import { TxUnpacked } from './builder/schema.generated';
 import { CtVersion, ProtocolToVmAbi } from './builder/field-types/ct-version';
@@ -143,6 +144,7 @@ validators.push(
     return [{ message, key: 'InvalidAccountType', checkedKeys: ['tag'] }];
   },
   // TODO: revert nonce check
+  // TODO: ensure nonce valid when paying for own tx
   (tx, { consensusProtocolVersion }) => {
     const oracleCall = Tag.Oracle === tx.tag || Tag.OracleRegisterTx === tx.tag;
     const contractCreate = Tag.ContractCreateTx === tx.tag || Tag.GaAttachTx === tx.tag;
@@ -183,9 +185,9 @@ validators.push(
         checkedKeys: ['contractId'],
       }];
     } catch (error) {
-      if (error.response?.parsedBody?.reason == null) throw error;
+      if (!(error instanceof RestError) || error.response?.bodyAsText == null) throw error;
       return [{
-        message: error.response.parsedBody.reason,
+        message: JSON.parse(error.response.bodyAsText).reason, // TODO: use parsedBody instead
         key: 'ContractNotFound',
         checkedKeys: ['contractId'],
       }];
diff --git a/src/utils/autorest.ts b/src/utils/autorest.ts
index cbe3426808..2d45829029 100644
--- a/src/utils/autorest.ts
+++ b/src/utils/autorest.ts
@@ -2,7 +2,7 @@ import { RestError, PipelineResponse, PipelinePolicy } from '@azure/core-rest-pi
 import { AdditionalPolicyConfig } from '@azure/core-client';
 import { pause } from './other';
 import semverSatisfies from './semver-satisfies';
-import { UnexpectedTsError, UnsupportedVersionError } from './errors';
+import { UnsupportedVersionError } from './errors';
 
 export const genRequestQueuesPolicy = (): AdditionalPolicyConfig => {
   const requestQueues = new Map<string, Promise<unknown>>();
@@ -126,22 +126,17 @@ export const genRetryOnFailurePolicy = (
       const intervalSum = intervals.reduce((a, b) => a + b);
       const intervalsInMs = intervals.map((el) => (el / intervalSum) * retryOverallDelay);
 
-      let error: Error | undefined;
+      let error = new RestError('Not expected to be thrown');
       for (let attempt = 0; attempt <= retryCount; attempt += 1) {
-        if (error != null) {
-          if (
-            !(error instanceof RestError)
-            || statusesToNotRetry.includes(error.response?.status ?? 0)
-          ) throw error;
-          await pause(intervalsInMs[attempt - 1]);
-        }
+        if (attempt !== 0) await pause(intervalsInMs[attempt - 1]);
         try {
           return await next(request);
         } catch (e) {
+          if (!(e instanceof RestError)) throw e;
+          if (statusesToNotRetry.includes(e.response?.status ?? 0)) throw e;
           error = e;
         }
       }
-      if (error == null) throw new UnexpectedTsError();
       throw error;
     },
   },
diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts
index 7813956ff1..29af2f3653 100644
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@@ -8,6 +8,7 @@ import { concatBuffers } from './other';
 import {
   decode, encode, Encoded, Encoding,
 } from './encoder';
+import { ArgumentError } from './errors';
 
 /**
  * Generate address from secret key
@@ -32,6 +33,10 @@ export function isAddressValid(
 ): boolean {
   try {
     decode(address as Encoded.Generic<typeof prefix>);
+    const actualPrefix = address.split('_')[0];
+    if (actualPrefix !== prefix) {
+      throw new ArgumentError('Encoded string type', prefix, actualPrefix);
+    }
     return true;
   } catch (e) {
     return false;
@@ -152,10 +157,13 @@ export function verify(
   return nacl.sign.detached.verify(data, signature, decode(address));
 }
 
+const messagePrefix = Buffer.from('aeternity Signed Message:\n', 'utf8');
+export const messagePrefixLength = varuintEncode(messagePrefix.length);
+
+// TODO: consider rename to hashMessage
 export function messageToHash(message: string): Buffer {
-  const p = Buffer.from('aeternity Signed Message:\n', 'utf8');
   const msg = Buffer.from(message, 'utf8');
-  return hash(concatBuffers([varuintEncode(p.length), p, varuintEncode(msg.length), msg]));
+  return hash(concatBuffers([messagePrefixLength, messagePrefix, varuintEncode(msg.length), msg]));
 }
 
 export function signMessage(message: string, privateKey: string | Buffer): Uint8Array {
@@ -169,6 +177,8 @@ export function signMessage(message: string, privateKey: string | Buffer): Uint8
  * @param address - Address to verify against
  * @returns is data was signed by address
  */
+// TODO: deprecate in favour of `verify(messageToHash(message), ...`, also the name is confusing
+// it should contain "signature"
 export function verifyMessage(
   message: string,
   signature: Uint8Array,
diff --git a/src/utils/errors.ts b/src/utils/errors.ts
index a475ca0acd..febf54db62 100644
--- a/src/utils/errors.ts
+++ b/src/utils/errors.ts
@@ -401,11 +401,11 @@ export class UnexpectedChannelMessageError extends ChannelError {
  * @category exception
  */
 export class ChannelIncomingMessageError extends ChannelError {
-  handlerError: BaseError;
+  handlerError: Error;
 
   incomingMessage: { [key: string]: any };
 
-  constructor(handlerError: BaseError, incomingMessage: { [key: string]: any }) {
+  constructor(handlerError: Error, incomingMessage: { [key: string]: any }) {
     super(handlerError.message);
     this.handlerError = handlerError;
     this.incomingMessage = incomingMessage;
diff --git a/src/utils/other.ts b/src/utils/other.ts
index c49900fd36..2e137e0249 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -57,3 +57,8 @@ export function isAccountNotFoundError(error: Error): boolean {
 export type UnionToIntersection<Union> =
   (Union extends any ? (k: Union) => void : never) extends ((k: infer Intersection) => void)
     ? Intersection : never;
+
+export function ensureError(error: unknown): asserts error is Error {
+  if (error instanceof Error) return;
+  throw error;
+}
diff --git a/src/utils/typed-data.ts b/src/utils/typed-data.ts
new file mode 100644
index 0000000000..3bb13ed492
--- /dev/null
+++ b/src/utils/typed-data.ts
@@ -0,0 +1,95 @@
+// js extension is required for mjs build
+// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216
+// eslint-disable-next-line import/extensions
+import ContractByteArrayEncoder from '@aeternity/aepp-calldata/src/ContractByteArrayEncoder.js';
+// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216
+// eslint-disable-next-line import/extensions
+import AciTypeResolver from '@aeternity/aepp-calldata/src/AciTypeResolver.js';
+import canonicalize from 'canonicalize';
+import { Encoded, decode } from './encoder';
+import { hash, messagePrefixLength } from './crypto';
+import { concatBuffers } from './other';
+
+/**
+ * Hashes arbitrary object, can be used to inline the aci hash to contract source code
+ */
+export function hashJson(data: unknown): Buffer {
+  return hash(canonicalize(data) ?? '');
+}
+
+// TODO: move this type to calldata library https://github.com/aeternity/aepp-calldata-js/issues/215
+// based on https://github.com/aeternity/aepp-calldata-js/blob/82b5a98f9b308482627da8d7484d213e9cf87151/src/AciTypeResolver.js#L129
+export type AciValue = 'void' | 'unit' | 'int' | 'bool' | 'string' | 'bits' | 'hash' | 'signature'
+| 'address' | 'contract_pubkey' | 'Chain.ttl' | 'Chain.ga_meta_tx' | 'Chain.paying_for_tx'
+| 'Chain.base_tx' | 'AENS.pointee' | 'AENS.name' | 'MCL_BLS12_381.fr' | 'MCL_BLS12_381.fp'
+| { 'Set.set': readonly [AciValue] }
+| { bytes: number }
+| { list: readonly [AciValue] }
+| { map: readonly [AciValue, AciValue] }
+| { tuple: readonly AciValue[] }
+| { record: ReadonlyArray<{ name: string; type: AciValue }> }
+| { variant: ReadonlyArray<{ [key: string]: readonly AciValue[] }> }
+| { option: readonly [AciValue] }
+| { oracle: readonly [AciValue, AciValue] }
+| { oracle_query: readonly [AciValue, AciValue] };
+
+export interface Domain {
+  name?: string;
+  version?: number;
+  networkId?: string;
+  contractAddress?: Encoded.ContractAddress;
+}
+
+// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216
+export function encodeFateValue(
+  value: unknown,
+  aci: AciValue,
+): Encoded.ContractBytearray {
+  const contractByteArrayEncoder = new ContractByteArrayEncoder();
+  const aciTypeResolver = new AciTypeResolver([]);
+  aciTypeResolver.isCustomType = () => false;
+  return contractByteArrayEncoder.encode(aciTypeResolver.resolveType(aci), value);
+}
+
+// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216
+export function decodeFateValue(
+  value: Encoded.ContractBytearray,
+  aci: AciValue,
+): Encoded.ContractBytearray {
+  const contractByteArrayEncoder = new ContractByteArrayEncoder();
+  const aciTypeResolver = new AciTypeResolver([]);
+  aciTypeResolver.isCustomType = () => false;
+  return contractByteArrayEncoder.decodeWithType(value, aciTypeResolver.resolveType(aci));
+}
+
+/**
+ * Hashes domain object, can be used to inline domain hash to contract source code
+ */
+export function hashDomain(domain: Domain): Buffer {
+  const domainAci = {
+    record: [{
+      name: 'name',
+      type: { option: ['string'] },
+    }, {
+      name: 'version',
+      type: { option: ['int'] },
+    }, {
+      name: 'networkId',
+      type: { option: ['string'] },
+    }, {
+      name: 'contractAddress',
+      type: { option: ['contract_pubkey'] },
+    }],
+  } as const;
+  return hash(decode(encodeFateValue(domain, domainAci)));
+}
+
+export function hashTypedData(
+  data: Encoded.ContractBytearray,
+  aci: AciValue,
+  domain: Domain,
+): Buffer {
+  return hash(concatBuffers([
+    messagePrefixLength, new Uint8Array([0]), hashDomain(domain), hashJson(aci), hash(decode(data)),
+  ]));
+}
diff --git a/test/environment/browser.html b/test/environment/browser.html
index cd4cae150d..4d379e1553 100644
--- a/test/environment/browser.html
+++ b/test/environment/browser.html
@@ -20,7 +20,7 @@
   accounts: [
     new MemoryAccount('9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200'),
   ],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
 });
 
 (async () => {
diff --git a/test/environment/ledger/main.mjs b/test/environment/ledger/main.mjs
index 587cede271..97a4345c71 100644
--- a/test/environment/ledger/main.mjs
+++ b/test/environment/ledger/main.mjs
@@ -17,7 +17,7 @@ export default async function run(transport) {
   const aeSdk = new AeSdk({
     nodes: [{ name: 'testnet', instance: node }],
     accounts: [account],
-    onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+    onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
   });
 
   const { hash } = await aeSdk.spend(1e17, 'ak_21A27UVVt3hDkBE5J7rhhqnH5YNb4Y1dqo4PnSybrH85pnWo7E');
diff --git a/test/environment/node.js b/test/environment/node.js
index 8612dd75eb..b25ad373ec 100755
--- a/test/environment/node.js
+++ b/test/environment/node.js
@@ -14,7 +14,7 @@ const aeSdk = new AeSdk({
   accounts: [
     new MemoryAccount('9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200'),
   ],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
 });
 
 (async () => {
diff --git a/test/environment/node.mjs b/test/environment/node.mjs
index 189106d777..5bd3b501ca 100755
--- a/test/environment/node.mjs
+++ b/test/environment/node.mjs
@@ -14,7 +14,7 @@ const aeSdk = new AeSdk({
   accounts: [
     new MemoryAccount('9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200'),
   ],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
 });
 
 console.log('Height:', await aeSdk.getHeight());
diff --git a/test/environment/node.ts b/test/environment/node.ts
index 42a356ce80..4607152c4b 100755
--- a/test/environment/node.ts
+++ b/test/environment/node.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env ts-node
+#!/usr/bin/env npx ts-node
 import {
   Node, AeSdk, MemoryAccount, CompilerHttp,
 } from '../..';
@@ -13,7 +13,7 @@ const aeSdk = new AeSdk({
   accounts: [
     new MemoryAccount('9ebd7beda0c79af72a42ece3821a56eff16359b6df376cf049aee995565f022f840c974b97164776454ba119d84edc4d6058a8dec92b6edc578ab2d30b4c4200'),
   ],
-  onCompiler: new CompilerHttp('https://v7.compiler.stg.aepps.com'),
+  onCompiler: new CompilerHttp('https://v7.compiler.aepps.com'),
 });
 
 (async () => {
diff --git a/test/examples.sh b/test/examples.sh
index 146f5b956e..ed82389ba4 100755
--- a/test/examples.sh
+++ b/test/examples.sh
@@ -37,20 +37,6 @@ npm i
 npm run build
 cd ../../..
 
-echo Build example aepp
-cd ./examples/browser/aepp
-npm i
-npm run build
-
-echo Build example wallet-iframe
-cd ../wallet-iframe
-npm i
-npm run build
-
-echo Build example wallet-web-extension
-cd ../wallet-web-extension
-npm i
-npm run build
-
-cd ../../..
 perl -i -pe 's/"rem-prepare"/"prepare"/g' package.json
+
+./docs/build-assets.sh
diff --git a/test/integration/AeSdkMethods.ts b/test/integration/AeSdkMethods.ts
new file mode 100644
index 0000000000..9c2289db89
--- /dev/null
+++ b/test/integration/AeSdkMethods.ts
@@ -0,0 +1,138 @@
+import { describe, it, before } from 'mocha';
+import { expect } from 'chai';
+import { getSdk, url, compilerUrl } from '.';
+import { assertNotNull } from '../utils';
+import {
+  AeSdkMethods, Node, CompilerHttp, AccountBase,
+} from '../../src';
+
+describe('AeSdkMethods', () => {
+  let accounts: AccountBase[];
+  let aeSdkMethods: AeSdkMethods;
+
+  before(async () => {
+    accounts = Object.values((await getSdk(2)).accounts);
+    aeSdkMethods = new AeSdkMethods({
+      onAccount: accounts[0],
+      onNode: new Node(url),
+      onCompiler: new CompilerHttp(compilerUrl),
+    });
+  });
+
+  it('spend coins', async () => {
+    const { tx } = await aeSdkMethods.spend(1, accounts[1].address);
+    assertNotNull(tx);
+    expect(tx.senderId).to.equal(accounts[0].address);
+    expect(tx.recipientId).to.equal(accounts[1].address);
+  });
+
+  it('created contract remains connected to sdk', async () => {
+    const contract = await aeSdkMethods.initializeContract({
+      sourceCode: ''
+      + 'contract Identity =\n'
+      + '  entrypoint getArg(x : int) = x',
+    });
+    expect(contract.$options.onAccount?.address).to.be.eql(accounts[0].address);
+    [, aeSdkMethods._options.onAccount] = accounts;
+    expect(contract.$options.onAccount?.address).to.be.eql(accounts[1].address);
+  });
+
+  it('converts options to JSON', () => {
+    const options = aeSdkMethods._getOptions();
+    const data = JSON.parse(JSON.stringify(options));
+    data.onNode._httpClient = '<removed>';
+    data.onCompiler.api._httpClient = '<removed>';
+    expect(data).to.eql({
+      onAccount: {
+        address: options.onAccount.address,
+      },
+      onNode: {
+        _requestContentType: 'application/json; charset=utf-8',
+        _endpoint: '{$host}',
+        _allowInsecureConnection: true,
+        _httpClient: '<removed>',
+        pipeline: {
+          _policies: [
+            { policy: { name: 'proxyPolicy' }, options: {} },
+            { policy: { name: 'decompressResponsePolicy' }, options: {} },
+            { policy: { name: 'formDataPolicy' }, options: {} },
+            { policy: { name: 'userAgentPolicy' }, options: {} },
+            { policy: { name: 'setClientRequestIdPolicy' }, options: {} },
+            { policy: { name: 'defaultRetryPolicy' }, options: { phase: 'Retry' } },
+            { policy: { name: 'tracingPolicy' }, options: { afterPhase: 'Retry' } },
+            { policy: { name: 'redirectPolicy' }, options: { afterPhase: 'Retry' } },
+            { policy: { name: 'logPolicy' }, options: { afterPhase: 'Sign' } },
+            { policy: { name: 'serializationPolicy' }, options: { phase: 'Serialize' } },
+            { policy: { name: 'deserializationPolicy' }, options: { phase: 'Deserialize' } },
+            { policy: { name: 'request-queues' }, options: {} },
+            { policy: { name: 'combine-get-requests' }, options: {} },
+            { policy: { name: 'retry-on-failure' }, options: {} },
+            { policy: { name: 'error-formatter' }, options: {} },
+            { policy: { name: 'version-check' }, options: {} },
+          ],
+          _orderedPolicies: [
+            { name: 'serializationPolicy' },
+            { name: 'proxyPolicy' },
+            { name: 'decompressResponsePolicy' },
+            { name: 'formDataPolicy' },
+            { name: 'userAgentPolicy' },
+            { name: 'setClientRequestIdPolicy' },
+            { name: 'request-queues' },
+            { name: 'combine-get-requests' },
+            { name: 'retry-on-failure' },
+            { name: 'error-formatter' },
+            { name: 'version-check' },
+            { name: 'deserializationPolicy' },
+            { name: 'defaultRetryPolicy' },
+            { name: 'tracingPolicy' },
+            { name: 'redirectPolicy' },
+            { name: 'logPolicy' },
+          ],
+        },
+        $host: 'http://localhost:3013',
+        intAsString: true,
+      },
+      onCompiler: {
+        api: {
+          _requestContentType: 'application/json; charset=utf-8',
+          _endpoint: '{$host}',
+          _allowInsecureConnection: true,
+          _httpClient: '<removed>',
+          pipeline: {
+            _policies: [
+              { policy: { name: 'proxyPolicy' }, options: {} },
+              { policy: { name: 'decompressResponsePolicy' }, options: {} },
+              { policy: { name: 'formDataPolicy' }, options: {} },
+              { policy: { name: 'userAgentPolicy' }, options: {} },
+              { policy: { name: 'setClientRequestIdPolicy' }, options: {} },
+              { policy: { name: 'defaultRetryPolicy' }, options: { phase: 'Retry' } },
+              { policy: { name: 'tracingPolicy' }, options: { afterPhase: 'Retry' } },
+              { policy: { name: 'redirectPolicy' }, options: { afterPhase: 'Retry' } },
+              { policy: { name: 'logPolicy' }, options: { afterPhase: 'Sign' } },
+              { policy: { name: 'serializationPolicy' }, options: { phase: 'Serialize' } },
+              { policy: { name: 'deserializationPolicy' }, options: { phase: 'Deserialize' } },
+              { policy: { name: 'error-formatter' }, options: {} },
+              { policy: { name: 'version-check' }, options: {} },
+            ],
+            _orderedPolicies: [
+              { name: 'serializationPolicy' },
+              { name: 'proxyPolicy' },
+              { name: 'decompressResponsePolicy' },
+              { name: 'formDataPolicy' },
+              { name: 'userAgentPolicy' },
+              { name: 'setClientRequestIdPolicy' },
+              { name: 'error-formatter' },
+              { name: 'version-check' },
+              { name: 'deserializationPolicy' },
+              { name: 'defaultRetryPolicy' },
+              { name: 'tracingPolicy' },
+              { name: 'redirectPolicy' },
+              { name: 'logPolicy' },
+            ],
+          },
+          $host: 'http://localhost:3080',
+        },
+      },
+    });
+  });
+});
diff --git a/test/integration/Middleware.ts b/test/integration/Middleware.ts
new file mode 100644
index 0000000000..248b584526
--- /dev/null
+++ b/test/integration/Middleware.ts
@@ -0,0 +1,148 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import '../index';
+import { _Middleware } from '../../src';
+
+describe('Middleware API', () => {
+  // TODO: remove after solving https://github.com/aeternity/ae_mdw/issues/1336
+  const middleware = new _Middleware('https://testnet.aeternity.io/mdw/');
+
+  it('gets status', async () => {
+    const res = await middleware.getStatus();
+    const expectedRes: typeof res = {
+      mdwAsyncTasks: {
+        longTasks: 0,
+        producerBuffer: 0,
+        totalPending: res.mdwAsyncTasks.totalPending,
+      },
+      mdwGensPerMinute: res.mdwGensPerMinute,
+      mdwHeight: res.mdwHeight,
+      mdwLastMigration: res.mdwLastMigration,
+      mdwRevision: res.mdwRevision,
+      mdwSynced: true,
+      mdwSyncing: true,
+      mdwTxIndex: res.mdwTxIndex,
+      mdwVersion: res.mdwVersion,
+      nodeHeight: res.nodeHeight,
+      nodeProgress: 100,
+      nodeRevision: 'a42c1b1e84dabdad350005213a2a9334113a6832',
+      nodeSyncing: false,
+      nodeVersion: '6.8.1',
+    };
+    expect(res).to.be.eql(expectedRes);
+  });
+
+  it('gets account activities', async () => {
+    const res = await middleware.getAccountActivities('ak_DtJrupsqqByQag76NrxAAimmkYJMk7on7z3xktdZpdkmxKQak');
+    const expectedRes: typeof res = {
+      data: [{
+        blockHash: 'mh_LAo6Cg6d8LGDpxJ3se2aGJZbCubDZyC6GonHK58MKiW4a4LWb',
+        // @ts-expect-error https://github.com/aeternity/ae_mdw/issues/1454
+        block_time: 1684995426848,
+        height: 779178,
+        payload: {
+          block_hash: 'mh_LAo6Cg6d8LGDpxJ3se2aGJZbCubDZyC6GonHK58MKiW4a4LWb',
+          block_height: 779178,
+          hash: 'th_YHj5aB6JzHciY5f6jqgtso8u2iY9p6MT9RV96FwXQNS1MpSML',
+          micro_index: 18,
+          micro_time: 1684995426848,
+          tx: {
+            abi_version: 3,
+            auth_data: 'cb_KxFs8lcLOwKfAKC2+ARNbHQ/i2cN0jPpYmw2o6/mve+skTCovW+5OcIa4p8BAQBRsNynuucudvyocC+ZWBzpUbjiGWctldfdDOR9csCIDeXwMpQ3yyJlC91g8AuFAB2uhHMjHNz5fGqWhxbju/QDsvQe5g==',
+            fee: 78540000000000,
+            ga_id: 'ak_DtJrupsqqByQag76NrxAAimmkYJMk7on7z3xktdZpdkmxKQak',
+            gas: 50000,
+            gas_price: 1000000000,
+            gas_used: 8444,
+            return_type: 'ok',
+            tx: {
+              signatures: [],
+              tx: {
+                amount: 112,
+                fee: 16660000000000,
+                nonce: 0,
+                payload: 'ba_Xfbg4g==',
+                recipient_id: 'ak_VTNurrhRhJBVK19JfUnEv4qgdZJT7DUghxz3ACEFBNKgw8R3D',
+                sender_id: 'ak_DtJrupsqqByQag76NrxAAimmkYJMk7on7z3xktdZpdkmxKQak',
+                type: 'SpendTx',
+                version: 1,
+              },
+            },
+            type: 'GAMetaTx',
+            version: 2,
+          },
+        },
+        type: 'GAMetaTxEvent',
+      }, {
+        blockHash: 'mh_2R1PVwTNP3Jha7oRby9Me3SRBP4R9he6RMH6eCCJGyVBHAzy5f',
+        // @ts-expect-error https://github.com/aeternity/ae_mdw/issues/1454
+        block_time: 1684995366595,
+        height: 779178,
+        payload: {
+          block_hash: 'mh_2R1PVwTNP3Jha7oRby9Me3SRBP4R9he6RMH6eCCJGyVBHAzy5f',
+          block_height: 779178,
+          hash: 'th_AScnu6AAGHvfewMELKvmc6KH9jaMfzopGpcFFo1HAoS7ne1fD',
+          micro_index: 11,
+          micro_time: 1684995366595,
+          signatures: [
+            'sg_SBD5RkjMkfDM8KGJTgTTgmfXaimac2cGy4x39efXZjrPdr5zVJAmqu8dLiMNoVX1FHTESERRvejAnDVDjxLq6x2gb1SzK',
+          ],
+          tx: {
+            abi_version: 3,
+            args: [
+              {
+                type: 'address',
+                value: 'ak_2PahBfbkrmBFfbb4FGEVErP7mChFGPYFb9eGMARU514u5V3K52',
+              },
+            ],
+            auth_fun: '0x6cf2570b0a1599b708291e50aa3daf13d0c7f2484bc337ddad2413a37fd4a009',
+            auth_fun_name: 'authorize',
+            call_data: 'cb_KxFE1kQfG58AoLb4BE1sdD+LZw3SM+libDajr+a976yRMKi9b7k5whrijU9L2Q==',
+            code: 'cb_+QXbRgOgIWATGdstfrc/IBdG4UH4kAFwPvl8s2yJYeWFVCTIFjvAuQWtuQQ//j0eiWgANwA3BEcAZ0cAhwM3ADcBBzcBB4cCNwA3ATcCBwcHDAKCDAKEDAKGDAKIJwwIAP5E1kQfADcBRwA3AFUAIwQABwwE+wOtTWFzdGVyIG5vdCBhbGxvd2VkIHRvIGJlIHRoZSBhY2NvdW50IGl0c2VsZhoOhC8AGg6Gr4IAAQEbK2+HBxr9SYz/wG+F6NSlD8AaBoIAGg6IAgEDP/5GZxOgADcCl0AHl0AMAQIMAQACAxHfeYdcAgMRjXO6DAIDEauIMtEdAAD+VzGKFwA3AYcCNwA3ATcCBwc3AFUAICCCBwwE+wM9T25seSBmb3IgbWFzdGVyGgaGAAEDP/5s8lcLADcDB0cAl28AFyIkAIgHDAT7AzVOb25jZSB0b28gbG93ISQAiAcMCPsDOU5vbmNlIHRvbyBoaWdoAgMRr3c2mAcMDvsDYUZlZSBvciBnYXNwcmljZSB0b28gaGlnaAwBAgIDEc5DjIkHDBT7A01Ob3QgYWxsb3dlZCB0byBzaWduAgMR0/b5PgcMGvsDPUFtb3VudCB0b28gaGlnaBQ2iAACdwIoCD4oIBwMAQQMAQIMAQBGOCgAAgMRRmcToHQAAPsDTU5vdCBpbiBBdXRoIGNvbnRleHT+c7AX2gA3AUcAhwI3ADcBhwM3ADcBBzcBBxoKAIQvGIQABwwEAQOvggABAD8rGAAARPwjAAICAgD+jXO6DAI3AHcBA3EaYWV0ZXJuaXR5IFNpZ25lZCBNZXNzYWdlOgpA/quIMtECNwJ3d3c6FAACAP6vdzaYAjcAFxoKAIYIPoYCBAED/0Y6AgAApwAoLAACIgAHDAgBA39fACgsAgIiAAD+zkOMiQI3AUcAFyAkAIIHDCQaCgSELxiEAAcMIgwDr4IAAQA/DwIICD4IBggBA39GOgoIAAn+CgoMEgED/0Y6DAoAWQAeCAwHDBABA/8uGoSEAAEDf0Y6DAoAHzgMAgcMIBoKEIQvGIQABwweDAOvggABAD8PAhQIPhQYGgEDf0Y6FhQACf4WGBgcLhqEhAABA/8rGBAARPwjAAICAg8CFAg+FBgaFTgMAkT8MwACAgQCLRqEhAABA/8rGAQARPwjAAICAg8CCAg+CAYIAQP//tP2+T4CNwAXmwIACD4AAgQBA39GOgIAACguBAoCCg4EHwYIBgYGBgYGBgYGBgYGBgYGBgYGBgYGAQN/RjoIBAIeOAhvggFQAP7ZqMEoADcABwECiP7feYdcADcCl0AHdwwBAAwBAicMBB0AQAAA/ubMjCMANwAnNwJHAIcDNwA3AQc3AQcyCIQA/vKsV4UANwFHADcAVQAgIIIHDAT7Az1Pbmx5IGZvciBtYXN0ZXIuGoSEAAEDP/75EvIfADcCRwCHAzcANwEHNwEHNwBVACAgggcMBPsDPU9ubHkgZm9yIG1hc3Rlci1ahIQAAgEDP7kBZS8QET0eiWglZ2V0X3N0YXRlEUTWRB8RaW5pdBFGZxOgHXRvX3NpZ24RVzGKF0lzZXRfZmVlX3Byb3RlY3Rpb24RbPJXCyVhdXRob3JpemURc7AX2ilnZXRfc2lnbmVyEY1zugylLkdBTWFpbldUZW1wb3Jhcnkuc3VwZXJoZXJvX3dhbGxldF9wcmVmaXgRq4gy0TkuU3RyaW5nLmNvbmNhdBGvdzaYYS5HQU1haW5XVGVtcG9yYXJ5LmZlZV9vaxHOQ4yJgS5HQU1haW5XVGVtcG9yYXJ5LmFsbG93ZWRfc2lnbmVyEdP2+T5tLkdBTWFpbldUZW1wb3JhcnkuYW1vdW50X29rEdmowSglZ2V0X25vbmNlEd95h1xJdG9fc2lnbl91bnByZWZpeGVkEebMjCMxZ2V0X3RydXN0ZWVzEfKsV4U5cmVtb3ZlX3RydXN0ZWUR+RLyHy1hZGRfdHJ1c3RlZYIvAIU3LjEuMAAStuVe',
+            contract_id: 'ct_2TRQYcmvhRrbGrNKXy8uBZX2MQbgHrZmVCEHZBAJkhs24DdeVP',
+            fee: 107820000000000,
+            gas: 597,
+            gas_price: 1000000000,
+            gas_used: 478,
+            nonce: 1,
+            owner_id: 'ak_DtJrupsqqByQag76NrxAAimmkYJMk7on7z3xktdZpdkmxKQak',
+            return_type: 'ok',
+            type: 'GAAttachTx',
+            version: 1,
+            vm_version: 7,
+          },
+        },
+        type: 'GAAttachTxEvent',
+      }, {
+        blockHash: 'mh_25snWYwTkU1xjPCcH592XVNzL894qSpF4yqnt8tABKGEVm6nSz',
+        // @ts-expect-error https://github.com/aeternity/ae_mdw/issues/1454
+        block_time: 1684995336526,
+        height: 779178,
+        payload: {
+          block_hash: 'mh_25snWYwTkU1xjPCcH592XVNzL894qSpF4yqnt8tABKGEVm6nSz',
+          block_height: 779178,
+          hash: 'th_242zV1qXwag6iBH3Pd8zn3DQC37h4uP38CoFjkaTgT19AVKMHo',
+          micro_index: 7,
+          micro_time: 1684995336526,
+          signatures: [
+            'sg_E1Ezn9EMsxTZz7a93Zc5kjXkS1t3WqFbr3X8DqqjdXXfXD9Xy6DZQpjB2rHfcoZ3ySZ1FHh9bzMjfQfdA9mRJJ4yeYdfN',
+          ],
+          tx: {
+            amount: 5000000000000000000,
+            fee: 17040000000000,
+            nonce: 37016,
+            payload: 'ba_RmF1Y2V0IFR4tYtyuw==',
+            recipient_id: 'ak_DtJrupsqqByQag76NrxAAimmkYJMk7on7z3xktdZpdkmxKQak',
+            sender_id: 'ak_2iBPH7HUz3cSDVEUWiHg76MZJ6tZooVNBmmxcgVK6VV8KAE688',
+            type: 'SpendTx',
+            version: 1,
+          },
+        },
+        type: 'SpendTxEvent',
+      }],
+      next: null,
+      prev: null,
+    };
+    expect(res).to.be.eql(expectedRes);
+  });
+});
diff --git a/test/integration/MiddlewareSubscriber.ts b/test/integration/MiddlewareSubscriber.ts
new file mode 100644
index 0000000000..0f7d8c8b90
--- /dev/null
+++ b/test/integration/MiddlewareSubscriber.ts
@@ -0,0 +1,181 @@
+import {
+  describe, it, before, beforeEach,
+} from 'mocha';
+import { expect } from 'chai';
+import { spy } from 'sinon';
+import '../index';
+import { assertNotNull } from '../utils';
+import {
+  _MiddlewareSubscriber, _MiddlewareSubscriberError, _MiddlewareSubscriberDisconnected,
+  MemoryAccount, AeSdkMethods, Node,
+} from '../../src';
+import { pause } from '../../src/utils/other';
+
+describe('MiddlewareSubscriber', () => {
+  let middleware: _MiddlewareSubscriber;
+  // TODO: remove after solving https://github.com/aeternity/ae_mdw/issues/1336
+  const account = MemoryAccount.generate();
+  const aeSdk = new AeSdkMethods({
+    onNode: new Node('https://testnet.aeternity.io'),
+    onAccount: account,
+  });
+
+  before(async () => {
+    const { status } = await fetch(
+      `https://faucet.aepps.com/account/${account.address}`,
+      { method: 'POST' },
+    );
+    console.assert([200, 425].includes(status), 'Invalid faucet response code', status);
+  });
+
+  beforeEach(async () => {
+    middleware = new _MiddlewareSubscriber('wss://testnet.aeternity.io/mdw/websocket');
+  });
+
+  it('fails to connect to invalid url', async () => {
+    middleware = new _MiddlewareSubscriber('wss://testnet.aeternity.io/mdw/api');
+    const promise = new Promise((resolve, reject) => {
+      middleware.subscribeKeyBlocks((payload, error) => {
+        if (error != null) reject(error);
+        else resolve(payload);
+      });
+    });
+    await expect(promise).to.be.rejectedWith('Unexpected server response: 200');
+    expect(middleware.webSocket).to.be.equal(undefined);
+  });
+
+  it('fails to subscribe to invalid address', async () => {
+    const promise = new Promise((resolve, reject) => {
+      middleware.subscribeObject('ak_test', (payload, error) => {
+        if (error != null) reject(error);
+        else resolve(payload);
+      });
+    });
+    await expect(promise).to.be.rejectedWith(_MiddlewareSubscriberError, 'invalid target: ak_test');
+  });
+
+  async function ensureConnected(ms: _MiddlewareSubscriber): Promise<void> {
+    return Promise.race([
+      (async () => {
+        while (ms.webSocket?.bufferedAmount !== 0) {
+          await pause(100);
+        }
+        await new Promise((resolve) => {
+          assertNotNull(ms.webSocket);
+          ms.webSocket.addEventListener('message', resolve);
+        });
+      })(),
+      pause(1000).then(() => { throw new Error('Timeout'); }),
+    ]);
+  }
+
+  it('reconnects if subscribed again', async () => {
+    expect(middleware.webSocket).to.be.equal(undefined);
+    let unsubscribe = middleware.subscribeTransactions(() => {});
+    await ensureConnected(middleware);
+    expect(middleware.webSocket).to.be.not.equal(undefined);
+    unsubscribe();
+    expect(middleware.webSocket).to.be.equal(undefined);
+
+    unsubscribe = middleware.subscribeTransactions(() => {});
+    await ensureConnected(middleware);
+    expect(middleware.webSocket).to.be.not.equal(undefined);
+    unsubscribe();
+    expect(middleware.webSocket).to.be.equal(undefined);
+  });
+
+  it('can be reconnected', async () => {
+    const handleTx = spy();
+    const unsubscribe = middleware.subscribeTransactions(handleTx);
+    await ensureConnected(middleware);
+    assertNotNull(middleware.webSocket);
+    middleware.webSocket.close();
+    await new Promise((resolve) => {
+      assertNotNull(middleware.webSocket);
+      middleware.webSocket.addEventListener('close', resolve);
+    });
+    expect(handleTx.callCount).to.be.equal(1);
+    expect(handleTx.firstCall.args[0]).to.be.equal(undefined);
+    expect(handleTx.firstCall.args[1]).to.be.instanceOf(_MiddlewareSubscriberDisconnected);
+    expect(middleware.webSocket).to.be.equal(undefined);
+
+    middleware.reconnect();
+    await ensureConnected(middleware);
+    expect(middleware.webSocket).to.not.be.equal(undefined);
+    unsubscribe();
+    expect(handleTx.callCount).to.be.equal(1);
+  });
+
+  async function fetchNodeRaw(path: string): Promise<any> {
+    const response = await fetch(`https://testnet.aeternity.io/v3/${path}`);
+    if (response.status !== 200) throw new Error(`Unexpected status code: ${response.status}`);
+    return response.json();
+  }
+
+  // TODO: enable after solving https://github.com/aeternity/ae_mdw/issues/1336
+  it.skip('subscribes for new transactions', async () => {
+    const [{ hash }, transaction] = await Promise.all([
+      aeSdk.spend(1, account.address),
+      new Promise((resolve, reject) => {
+        const unsubscribe = middleware.subscribeTransactions((payload, error) => {
+          unsubscribe();
+          if (error != null) reject(error);
+          else resolve(payload);
+        });
+      }),
+    ]);
+    expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
+  }).timeout(80_000);
+
+  // TODO: enable after fixing https://github.com/aeternity/ae_mdw/issues/1337
+  it.skip('subscribes for account', async () => {
+    const { hash } = await aeSdk.spend(1, account.address);
+    const transaction = await new Promise((resolve, reject) => {
+      const unsubscribe = middleware.subscribeObject(account.address, (payload, error) => {
+        unsubscribe();
+        if (error != null) reject(error);
+        else resolve(payload);
+      });
+    });
+    expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
+  }).timeout(80_000);
+
+  // TODO: enable after solving https://github.com/aeternity/ae_mdw/issues/1336
+  it.skip('subscribes for micro block', async () => {
+    const [{ blockHash }, microBlock] = await Promise.all([
+      aeSdk.spend(1, account.address),
+      new Promise((resolve, reject) => {
+        const unsubscribe = middleware.subscribeMicroBlocks((payload, error) => {
+          unsubscribe();
+          if (error != null) reject(error);
+          else resolve(payload);
+        });
+      }),
+    ]);
+    expect(microBlock).to.be.eql(await fetchNodeRaw(`micro-blocks/hash/${blockHash}/header`));
+  }).timeout(80_000);
+
+  // TODO: enable after solving https://github.com/aeternity/ae_mdw/issues/1336
+  it.skip('subscribes simultaneously for micro block', async () => {
+    const [{ hash, blockHash }, transaction, microBlock] = await Promise.all([
+      aeSdk.spend(1, account.address),
+      new Promise((resolve, reject) => {
+        const unsubscribe = middleware.subscribeTransactions((payload, error) => {
+          expect(middleware.webSocket).to.be.not.equal(undefined);
+          unsubscribe();
+          if (error != null) reject(error);
+          else resolve(payload);
+        });
+      }),
+      new Promise((resolve, reject) => {
+        const unsubscribe = middleware.subscribeMicroBlocks((payload, error) => {
+          unsubscribe();
+          if (error != null) reject(error);
+          else resolve(payload);
+        });
+      }),
+    ]);
+    expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
+    expect(microBlock).to.be.eql(await fetchNodeRaw(`micro-blocks/hash/${blockHash}/header`));
+  }).timeout(80_000);
+});
diff --git a/test/integration/account-generalized.ts b/test/integration/account-generalized.ts
index b3d0948df6..c8ea8935d1 100644
--- a/test/integration/account-generalized.ts
+++ b/test/integration/account-generalized.ts
@@ -86,7 +86,7 @@ describe('Generalized Account', () => {
       .eql((await authContract.getTxHash()).decodedResult);
 
     const gaMetaTxParams = unpackTx(rawTx, Tag.SignedTx).encodedTx;
-    if (gaMetaTxParams.tag !== Tag.GaMetaTx) throw new Error('Unexpected nested transaction');
+    ensureEqual<Tag.GaMetaTx>(gaMetaTxParams.tag, Tag.GaMetaTx);
     const spendTx = buildTx(gaMetaTxParams.tx.encodedTx);
     const { fee, gasPrice } = gaMetaTxParams;
     expect(new Uint8Array(await aeSdk.buildAuthTxHash(spendTx, { fee, gasPrice }))).to.be
diff --git a/test/integration/accounts.ts b/test/integration/accounts.ts
index 899d365b9f..c36221f22e 100644
--- a/test/integration/accounts.ts
+++ b/test/integration/accounts.ts
@@ -149,19 +149,17 @@ describe('Accounts', () => {
       tx.senderId.should.be.equal(onAccount);
     });
 
-    it('Fail on invalid account', () => {
-      expect(() => {
-        aeSdk.spend(1, aeSdk.address, { onAccount: 1 as any });
-      }).to.throw(
+    it('Fail on invalid account', async () => {
+      await expect(aeSdk.spend(1, aeSdk.address, { onAccount: 1 as any })).to.be.rejectedWith(
         TypeError,
         'Account should be an address (ak-prefixed string), or instance of AccountBase, got 1 instead',
       );
     });
 
-    it('Fail on non exist account', () => {
-      expect(() => {
-        aeSdk.spend(1, aeSdk.address, { onAccount: 'ak_q2HatMwDnwCBpdNtN9oXf5gpD9pGSgFxaa8i2Evcam6gjiggk' });
-      }).to.throw(
+    it('Fail on non exist account', async () => {
+      await expect(
+        aeSdk.spend(1, aeSdk.address, { onAccount: 'ak_q2HatMwDnwCBpdNtN9oXf5gpD9pGSgFxaa8i2Evcam6gjiggk' }),
+      ).to.be.rejectedWith(
         UnavailableAccountError,
         'Account for ak_q2HatMwDnwCBpdNtN9oXf5gpD9pGSgFxaa8i2Evcam6gjiggk not available',
       );
diff --git a/test/integration/aens.ts b/test/integration/aens.ts
index 1f4e4a0ae2..4443a93ac2 100644
--- a/test/integration/aens.ts
+++ b/test/integration/aens.ts
@@ -1,9 +1,9 @@
 import { describe, it, before } from 'mocha';
 import { expect } from 'chai';
 import { getSdk } from '.';
-import { assertNotNull, randomName } from '../utils';
+import { assertNotNull, randomName, randomString } from '../utils';
 import {
-  AeSdk, generateKeyPair, buildContractId, computeAuctionEndBlock, computeBidFee,
+  AeSdk, generateKeyPair, buildContractId, computeBidFee, ensureName, produceNameId,
   AensPointerContextError, UnexpectedTsError, encode, decode, Encoding, ContractMethodsBase,
 } from '../../src';
 import { pause } from '../../src/utils/other';
@@ -16,7 +16,7 @@ describe('Aens', () => {
     aeSdk = await getSdk(2);
   });
 
-  it('claims names', async () => {
+  it('claims a name', async () => {
     const preclaim = await aeSdk.aensPreclaim(name);
     expect(preclaim.commitmentId).to.satisfy((s: string) => s.startsWith('cm_'));
 
@@ -25,6 +25,54 @@ describe('Aens', () => {
     expect(claimed.ttl).to.be.an('number');
   });
 
+  it('claims a unicode name', async () => {
+    const n = `испытаниЕ-æpP-${randomString(4)}.chain`;
+    ensureName(n);
+    const preclaim = await aeSdk.aensPreclaim(n);
+    const claimed = await preclaim.claim();
+
+    expect(claimed.ttl).to.be.a('number');
+    expect(claimed.update).to.be.a('function');
+    expect(claimed.transfer).to.be.a('function');
+    expect(claimed.revoke).to.be.a('function');
+    expect(claimed.extendTtl).to.be.a('function');
+    assertNotNull(claimed.tx);
+    assertNotNull(claimed.signatures);
+    expect(claimed).to.be.eql({
+      tx: {
+        fee: 16960000000000n,
+        nonce: claimed.tx.nonce,
+        accountId: aeSdk.address,
+        name: n,
+        nameSalt: claimed.tx.nameSalt,
+        nameFee: 300000000000000n,
+        version: 2,
+        type: 'NameClaimTx',
+      },
+      blockHeight: claimed.blockHeight,
+      blockHash: claimed.blockHash,
+      hash: claimed.hash,
+      signatures: [claimed.signatures[0]],
+      rawTx: claimed.rawTx,
+      id: produceNameId(n),
+      owner: aeSdk.address,
+      ttl: claimed.ttl,
+      pointers: [],
+      update: claimed.update,
+      transfer: claimed.transfer,
+      revoke: claimed.revoke,
+      extendTtl: claimed.extendTtl,
+    });
+
+    const queried = await aeSdk.api.getNameEntryByName(n);
+    expect(queried).to.eql({
+      id: produceNameId(n),
+      owner: aeSdk.address,
+      ttl: claimed.ttl,
+      pointers: [],
+    });
+  });
+
   it('queries names', async () => {
     // For some reason the node will return 404 when name is queried
     // just right after claim tx has been mined so we wait 0.5s
@@ -152,7 +200,7 @@ describe('Aens', () => {
   });
 
   describe('name auctions', () => {
-    it('claims names', async () => {
+    it('claims a name', async () => {
       const onAccount = aeSdk.addresses().find((acc) => acc !== aeSdk.address);
       const nameShort = randomName(12);
 
@@ -168,10 +216,18 @@ describe('Aens', () => {
       bid.should.be.an('object');
 
       await expect(aeSdk.getName(nameShort)).to.be.rejectedWith('error: Name not found');
+    });
+
+    it('claims a unicode name', async () => {
+      const onAccount = aeSdk.addresses().find((acc) => acc !== aeSdk.address);
+      const nameShort = `æ${randomString(4)}.chain`;
+      ensureName(nameShort);
 
-      if (bid.blockHeight == null) throw new UnexpectedTsError();
-      const auctionEndBlock = computeAuctionEndBlock(nameShort, bid.blockHeight);
-      console.log(`BID STARTED AT ${bid.blockHeight} WILL END AT ${auctionEndBlock}`);
+      const preclaim = await aeSdk.aensPreclaim(nameShort);
+      await preclaim.claim();
+      await aeSdk.aensBid(nameShort, computeBidFee(nameShort), { onAccount });
+
+      await expect(aeSdk.getName(nameShort)).to.be.rejectedWith('error: Name not found');
     });
   });
 });
diff --git a/test/integration/compiler.ts b/test/integration/compiler.ts
index 218670e9bd..1b1e5c36d5 100644
--- a/test/integration/compiler.ts
+++ b/test/integration/compiler.ts
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { readFile } from 'fs/promises';
 import { compilerUrl, ignoreVersion } from '.';
+import inclAci from './contracts/Includes.json';
 import {
   CompilerBase, CompilerHttpNode, CompilerCli, CompilerError, getFileSystem, Encoded,
 } from '../../src';
@@ -10,35 +11,69 @@ function testCompiler(compiler: CompilerBase): void {
   const inclSourceCodePath = './test/integration/contracts/Includes.aes';
   let inclSourceCode: string;
   let inclFileSystem: Record<string, string>;
-  const inclBytecode = 'cb_+QEGRgOg7BH1sCv+p2IrS0Pn3/i6AfE8lOGUuC71lLPn6mbUm9PAuNm4cv4AWolkAjcCBwcHFBQAAgD+RNZEHwA3ADcAGg6CPwEDP/5Nt4A5AjcCBwcHDAECDAEABAMRAFqJZP6SiyA2ADcBBwcMAwgMAQAEAxFNt4A5/pSgnxIANwF3BwwBAAQDEarAwob+qsDChgI3AXcHPgQAALhgLwYRAFqJZD0uU3VibGlicmFyeS5zdW0RRNZEHxFpbml0EU23gDkxLkxpYnJhcnkuc3VtEZKLIDYRdGVzdBGUoJ8SJWdldExlbmd0aBGqwMKGOS5TdHJpbmcubGVuZ3Rogi8AhTcuMS4wAGHgFTw=';
-  // TODO: use Includes.aes after fixing https://github.com/aeternity/aesophia_cli/issues/74
-  const incSourceCodePath = './test/integration/contracts/Increment.aes';
-  let incSourceCode: string;
-  const incBytecode = 'cb_+G1GA6Cln3BxyOo1iNITGseMS58ZfBbRNB0x8Ix7Bh54qZlSOcC4QKD+Er1R0wA3AQcHFDQAAgD+RNZEHwA3ADcAGg6CPwEDP5svAhESvVHTJWluY3JlbWVudBFE1kQfEWluaXSCLwCFNy4wLjEAfImpuQ==';
+  const inclBytecode = 'cb_+QEGRgOg7BH1sCv+p2IrS0Pn3/i6AfE8lOGUuC71lLPn6mbUm9PAuNm4cv4AWolkAjcCBwcHFBQAAgD+RNZEHwA3ADcAGg6CPwEDP/5Nt4A5AjcCBwcHDAECDAEABAMRAFqJZP6SiyA2ADcBBwcMAwgMAQAEAxFNt4A5/pSgnxIANwF3BwwBAAQDEarAwob+qsDChgI3AXcHPgQAALhgLwYRAFqJZD0uU3VibGlicmFyeS5zdW0RRNZEHxFpbml0EU23gDkxLkxpYnJhcnkuc3VtEZKLIDYRdGVzdBGUoJ8SJWdldExlbmd0aBGqwMKGOS5TdHJpbmcubGVuZ3Rogi8AhTcuMi4xAFw7b7s=';
   const testBytecode = 'cb_+GhGA6BgYgXqYB9ctBcQ8mJ0+we5OXhb9PpsSQWP2DhPx9obn8C4O57+RNZEHwA3ADcAGg6CPwEDP/6AeCCSADcBd3cBAQCYLwIRRNZEHxFpbml0EYB4IJIZZ2V0QXJngi8AhTcuMC4xAMXqWXc=';
 
+  const interfaceSourceCodePath = './test/integration/contracts/Interface.aes';
+  let interfaceSourceCode: string;
+  let interfaceFileSystem: Record<string, string>;
+  const interfaceAci = [
+    { namespace: { name: 'ListInternal', typedefs: [] } },
+    { namespace: { name: 'List', typedefs: [] } },
+    { namespace: { name: 'String', typedefs: [] } },
+    {
+      contract: {
+        functions: [{
+          arguments: [{ name: '_1', type: 'int' }],
+          name: 'decrement',
+          payable: false,
+          returns: 'int',
+          stateful: false,
+        }],
+        kind: 'contract_child',
+        name: 'Decrement',
+        payable: false,
+        typedefs: [],
+      },
+    },
+    {
+      contract: {
+        functions: [{
+          arguments: [{ name: '_1', type: 'int' }],
+          name: 'increment',
+          payable: false,
+          returns: 'int',
+          stateful: false,
+        }],
+        kind: 'contract_main',
+        name: 'Increment',
+        payable: false,
+        typedefs: [],
+      },
+    },
+  ];
+
   before(async () => {
     inclSourceCode = await readFile(inclSourceCodePath, 'utf8');
     inclFileSystem = await getFileSystem(inclSourceCodePath);
-    incSourceCode = await readFile(incSourceCodePath, 'utf8');
+    interfaceSourceCode = await readFile(interfaceSourceCodePath, 'utf8');
+    interfaceFileSystem = await getFileSystem(interfaceSourceCodePath);
   });
 
   it('returns version', async () => {
-    expect(await compiler.version()).to.be.equal('7.1.0');
+    expect(await compiler.version()).to.be.equal('7.2.1');
   });
 
   it('compiles and generates aci by path', async () => {
     const { bytecode, aci } = await compiler.compile(inclSourceCodePath);
     expect(bytecode).to.equal(inclBytecode);
-    expect(aci).to.have.length(6);
-    expect(aci[aci.length - 1]).to.have.property('contract');
+    expect(aci).to.eql(inclAci);
   });
 
   it('compiles and generates aci by source code', async () => {
     const { bytecode, aci } = await compiler.compileBySourceCode(inclSourceCode, inclFileSystem);
     expect(bytecode).to.equal(inclBytecode);
-    expect(aci).to.have.length(6);
-    expect(aci[aci.length - 1]).to.have.property('contract');
+    expect(aci).to.eql(inclAci);
   });
 
   it('throws clear exception if compile broken contract', async () => {
@@ -60,21 +95,30 @@ function testCompiler(compiler: CompilerBase): void {
     );
   });
 
+  it('generates aci by path', async () => {
+    const aci = await compiler.generateAci(interfaceSourceCodePath);
+    expect(aci).to.eql(interfaceAci);
+  });
+
+  it('generates aci by source code', async () => {
+    const aci = await compiler.generateAciBySourceCode(interfaceSourceCode, interfaceFileSystem);
+    expect(aci).to.eql(interfaceAci);
+  });
+
   it('validates bytecode by path', async () => {
-    expect(await compiler.validate(incBytecode, incSourceCodePath))
-      .to.be.equal(true);
-    expect(await compiler.validate(testBytecode, incSourceCodePath)).to.be.equal(false);
+    expect(await compiler.validate(inclBytecode, inclSourceCodePath)).to.be.equal(true);
+    expect(await compiler.validate(testBytecode, inclSourceCodePath)).to.be.equal(false);
     const invalidBytecode = `${testBytecode}test` as Encoded.ContractBytearray;
-    expect(await compiler.validate(invalidBytecode, incSourceCodePath))
-      .to.be.equal(false);
+    expect(await compiler.validate(invalidBytecode, inclSourceCodePath)).to.be.equal(false);
   });
 
   it('validates bytecode by source code', async () => {
-    expect(await compiler.validateBySourceCode(incBytecode, incSourceCode))
+    expect(await compiler.validateBySourceCode(inclBytecode, inclSourceCode, inclFileSystem))
       .to.be.equal(true);
-    expect(await compiler.validateBySourceCode(testBytecode, incSourceCode)).to.be.equal(false);
+    expect(await compiler.validateBySourceCode(testBytecode, inclSourceCode, inclFileSystem))
+      .to.be.equal(false);
     const invalidBytecode = `${testBytecode}test` as Encoded.ContractBytearray;
-    expect(await compiler.validateBySourceCode(invalidBytecode, incSourceCode))
+    expect(await compiler.validateBySourceCode(invalidBytecode, inclSourceCode, inclFileSystem))
       .to.be.equal(false);
   });
 }
diff --git a/test/integration/contract-aci.ts b/test/integration/contract-aci.ts
index 2f1e7191b6..3a90103ade 100644
--- a/test/integration/contract-aci.ts
+++ b/test/integration/contract-aci.ts
@@ -23,6 +23,7 @@ import {
 } from '../utils';
 import { Aci } from '../../src/contract/compiler/Base';
 import { ContractCallObject } from '../../src/contract/Contract';
+import includesAci from './contracts/Includes.json';
 
 const identityContractSourceCode = `
 contract Identity =
@@ -207,23 +208,8 @@ describe('Contract instance', () => {
 
   it('compiles contract by sourceCodePath', async () => {
     const ctr = await aeSdk.initializeContract({
-      aci: [{
-        contract: {
-          functions: [{
-            arguments: [{ name: 'x', type: 'int' }],
-            name: 'increment',
-            payable: false,
-            returns: 'int',
-            stateful: false,
-          },
-          ],
-          kind: 'contract_main',
-          name: 'Increment',
-          payable: false,
-          typedefs: [],
-        },
-      }],
-      sourceCodePath: './test/integration/contracts/Increment.aes',
+      aci: includesAci,
+      sourceCodePath: './test/integration/contracts/Includes.aes',
     });
     expect(ctr.$options.bytecode).to.equal(undefined);
     expect(await ctr.$compile()).to.satisfy((b: string) => b.startsWith('cb_'));
@@ -269,6 +255,14 @@ describe('Contract instance', () => {
     expect(res.tx.fee).to.be.equal('182000000000000');
   });
 
+  it('calls with fallback account if onAccount is not provided', async () => {
+    const account = testContract.$options.onAccount;
+    delete testContract.$options.onAccount;
+    const res = await testContract.intFn(2);
+    expect(res.decodedResult).to.be.equal(2n);
+    testContract.$options.onAccount = account;
+  });
+
   it('calls on chain', async () => {
     const res = await testContract.intFn(2, { callStatic: false });
     expect(res.decodedResult).to.be.equal(2n);
diff --git a/test/integration/contracts/Includes.json b/test/integration/contracts/Includes.json
new file mode 100644
index 0000000000..564b1c35e0
--- /dev/null
+++ b/test/integration/contracts/Includes.json
@@ -0,0 +1,31 @@
+[{
+  "namespace": { "name": "ListInternal", "typedefs": [] }
+}, {
+  "namespace": { "name": "List", "typedefs": [] }
+}, {
+  "namespace": { "name": "String", "typedefs": [] }
+}, {
+  "namespace": { "name": "Sublibrary", "typedefs": [] }
+}, {
+  "namespace": { "name": "Library", "typedefs": [] }
+}, {
+  "contract": {
+    "functions": [{
+      "arguments": [{ "name": "x", "type": "int" }],
+      "name": "test",
+      "payable": false,
+      "returns": "int",
+      "stateful": false
+    }, {
+      "arguments": [{ "name": "x", "type": "string" }],
+      "name": "getLength",
+      "payable": false,
+      "returns": "int",
+      "stateful": false
+    }],
+    "kind": "contract_main",
+    "name": "Includes",
+    "payable": false,
+    "typedefs": []
+  }
+}]
diff --git a/test/integration/contracts/Increment.aes b/test/integration/contracts/Increment.aes
deleted file mode 100644
index e1e2e1fe7a..0000000000
--- a/test/integration/contracts/Increment.aes
+++ /dev/null
@@ -1,2 +0,0 @@
-contract Increment =
-    entrypoint increment(x: int): int = x + 1
diff --git a/test/integration/contracts/Interface.aes b/test/integration/contracts/Interface.aes
new file mode 100644
index 0000000000..8aafcb57c0
--- /dev/null
+++ b/test/integration/contracts/Interface.aes
@@ -0,0 +1,5 @@
+include "String.aes"
+include "./lib/DecrementInterface.aes"
+
+main contract Increment =
+  entrypoint increment: (int) => int
diff --git a/test/integration/contracts/lib/DecrementInterface.aes b/test/integration/contracts/lib/DecrementInterface.aes
new file mode 100644
index 0000000000..f7b6ca7144
--- /dev/null
+++ b/test/integration/contracts/lib/DecrementInterface.aes
@@ -0,0 +1,2 @@
+contract Decrement =
+  entrypoint decrement: (int) => int
diff --git a/test/integration/rpc.ts b/test/integration/rpc.ts
index 0f2a483266..74304f18dd 100644
--- a/test/integration/rpc.ts
+++ b/test/integration/rpc.ts
@@ -21,7 +21,6 @@ import {
   METHODS,
   RPC_STATUS,
   generateKeyPair,
-  hash,
   verify,
   NoWalletConnectedError,
   UnAuthorizedAccountError,
@@ -31,8 +30,9 @@ import {
   AccountBase,
   verifyMessage,
   buildTx,
+  hashTypedData,
 } from '../../src';
-import { concatBuffers } from '../../src/utils/other';
+import { getBufferToSign } from '../../src/account/Memory';
 import { ImplPostMessage } from '../../src/aepp-wallet-communication/connection/BrowserWindowMessage';
 import {
   getSdk, ignoreVersion, networkId, url, compilerUrl,
@@ -41,24 +41,27 @@ import { Accounts, Network } from '../../src/aepp-wallet-communication/rpc/types
 
 const WindowPostMessageFake = (
   name: string,
-): ImplPostMessage & { name: string; messages: any[] } => ({
-  name,
-  messages: [],
-  addEventListener(onEvent: string, listener: any) {
-    this.listener = listener;
-  },
-  removeEventListener() {
-    return () => null;
-  },
-  postMessage(source: any, msg: any) {
-    this.messages.push(msg);
-    setTimeout(() => {
-      if (typeof this.listener === 'function') {
-        this.listener({ data: msg, origin: 'http://origin.test', source });
-      }
-    });
-  },
-});
+): ImplPostMessage & { name: string; messages: any[] } => {
+  let listener: (event: any) => void;
+  return {
+    name,
+    messages: [],
+    addEventListener(onEvent: string, _listener: typeof listener) {
+      listener = _listener;
+    },
+    removeEventListener() {
+      return () => null;
+    },
+    postMessage(source: any, msg: any) {
+      this.messages.push(msg);
+      setTimeout(() => {
+        if (typeof listener === 'function') {
+          listener({ data: msg, origin: 'http://origin.test', source });
+        }
+      });
+    },
+  };
+};
 
 const getConnections = (): { walletWindow: ImplPostMessage; aeppWindow: ImplPostMessage } => {
   // @ts-expect-error workaround for tests
@@ -220,11 +223,10 @@ describe('Aepp<->Wallet', function aeppWallet() {
       Object.keys(subscriptionResponse.address.connected).length.should.be.equal(1);
     });
 
-    it('Try to use `onAccount` for not existent account', () => {
+    it('Try to use `onAccount` for not existent account', async () => {
       const { publicKey } = generateKeyPair();
-      expect(() => {
-        aepp.spend(100, publicKey, { onAccount: publicKey });
-      }).to.throw(UnAuthorizedAccountError, `You do not have access to account ${publicKey}`);
+      await expect(aepp.spend(100, publicKey, { onAccount: publicKey }))
+        .to.be.rejectedWith(UnAuthorizedAccountError, `You do not have access to account ${publicKey}`);
     });
 
     it('aepp accepts key pairs in onAccount', async () => {
@@ -298,23 +300,23 @@ describe('Aepp<->Wallet', function aeppWallet() {
         .to.be.rejectedWith('The peer failed to execute your request due to unknown error');
     });
 
-    it('Sign transaction: wallet allow', async () => {
-      // @ts-expect-error removes object property to restore the original behavior
-      delete wallet._resolveAccount().signTransaction;
-      const tx = await aepp.buildTx({
-        tag: Tag.SpendTx,
-        senderId: aepp.address,
-        recipientId: aepp.address,
-        amount: 0,
-      });
+    [false, true].forEach((innerTx) => {
+      it(`Sign${innerTx ? ' inner' : ''} transaction`, async () => {
+        // @ts-expect-error removes object property to restore the original behavior
+        delete wallet._resolveAccount().signTransaction;
+        const tx = await aepp.buildTx({
+          tag: Tag.SpendTx,
+          senderId: aepp.address,
+          recipientId: aepp.address,
+          amount: 0,
+        });
 
-      const signedTx = await aepp.signTransaction(tx);
-      const unpackedTx = unpackTx(signedTx, Tag.SignedTx);
-      const { signatures: [signature], encodedTx } = unpackedTx;
-      const txWithNetwork = concatBuffers([
-        Buffer.from(networkId), hash(decode(buildTx(encodedTx))),
-      ]);
-      expect(verify(txWithNetwork, signature, aepp.address)).to.be.equal(true);
+        const signedTx = await aepp.signTransaction(tx, { innerTx });
+        const unpackedTx = unpackTx(signedTx, Tag.SignedTx);
+        const { signatures: [signature], encodedTx } = unpackedTx;
+        const txWithNetwork = getBufferToSign(buildTx(encodedTx), networkId, innerTx);
+        expect(verify(txWithNetwork, signature, aepp.address)).to.be.equal(true);
+      });
     });
 
     it('Try to sign using unpermited account', async () => {
@@ -354,38 +356,84 @@ describe('Aepp<->Wallet', function aeppWallet() {
       res.blockHeight.should.be.a('number');
     });
 
-    it('Sign message: rejected', async () => {
-      let origin;
-      wallet._resolveAccount().signMessage = (message, { aeppOrigin } = {}) => {
-        origin = aeppOrigin;
-        throw new RpcRejectedByUserError();
-      };
-      await expect(aepp.signMessage('test')).to.be.eventually
-        .rejectedWith('Operation rejected by user').with.property('code', 4);
-      expect(origin).to.be.equal('http://origin.test');
-    });
+    describe('Sign message', () => {
+      it('rejected by wallet', async () => {
+        let origin;
+        wallet._resolveAccount().signMessage = (message, { aeppOrigin } = {}) => {
+          origin = aeppOrigin;
+          throw new RpcRejectedByUserError();
+        };
+        await expect(aepp.signMessage('test')).to.be.eventually
+          .rejectedWith('Operation rejected by user').with.property('code', 4);
+        expect(origin).to.be.equal('http://origin.test');
+      });
 
-    it('Sign message', async () => {
-      // @ts-expect-error removes object property to restore the original behavior
-      delete wallet._resolveAccount().signMessage;
-      const messageSig = await aepp.signMessage('test');
-      messageSig.should.be.instanceof(Buffer);
-      expect(verifyMessage('test', messageSig, aepp.address)).to.be.equal(true);
-    });
+      it('works', async () => {
+        // @ts-expect-error removes object property to restore the original behavior
+        delete wallet._resolveAccount().signMessage;
+        const messageSig = await aepp.signMessage('test');
+        messageSig.should.be.instanceof(Buffer);
+        expect(verifyMessage('test', messageSig, aepp.address)).to.be.equal(true);
+      });
 
-    it('Sign message fails with unknown error', async () => {
-      wallet._resolveAccount().signMessage = () => {
-        throw new Error('test');
-      };
-      await expect(aepp.signMessage('test', { onAccount: account.address }))
-        .to.be.rejectedWith('The peer failed to execute your request due to unknown error');
+      it('fails with unknown error', async () => {
+        wallet._resolveAccount().signMessage = () => {
+          throw new Error('test');
+        };
+        await expect(aepp.signMessage('test', { onAccount: account.address }))
+          .to.be.rejectedWith('The peer failed to execute your request due to unknown error');
+      });
+
+      it('signs using specific account', async () => {
+        const onAccount = wallet.addresses()[1];
+        const messageSig = await aepp.signMessage('test', { onAccount });
+        expect(verifyMessage('test', messageSig, onAccount)).to.be.equal(true);
+      });
     });
 
-    it('Sign message using specific account', async () => {
-      const onAccount = wallet.addresses()[1];
-      const messageSig = await aepp.signMessage('test', { onAccount });
-      messageSig.should.be.instanceof(Buffer);
-      expect(verifyMessage('test', messageSig, onAccount)).to.be.equal(true);
+    describe('Sign typed data', () => {
+      const recordAci = {
+        record: [
+          { name: 'operation', type: 'string' },
+          { name: 'parameter', type: 'int' },
+        ],
+      } as const;
+      const recordData = 'cb_KxF0ZXN0VANAuWU=';
+
+      it('rejected by wallet', async () => {
+        let origin;
+        wallet._resolveAccount().signTypedData = (data, aci, { aeppOrigin } = {}) => {
+          origin = aeppOrigin;
+          throw new RpcRejectedByUserError();
+        };
+        await expect(aepp.signTypedData(recordData, recordAci)).to.be.eventually
+          .rejectedWith('Operation rejected by user').with.property('code', 4);
+        expect(origin).to.be.equal('http://origin.test');
+      });
+
+      it('works', async () => {
+        // @ts-expect-error removes object property to restore the original behavior
+        delete wallet._resolveAccount().signTypedData;
+        const messageSig = await aepp.signTypedData(recordData, recordAci);
+        expect(messageSig).to.satisfy((s: string) => s.startsWith('sg_'));
+        const hash = hashTypedData(recordData, recordAci, {});
+        expect(verify(hash, decode(messageSig), aepp.address)).to.be.equal(true);
+      });
+
+      it('fails with unknown error', async () => {
+        wallet._resolveAccount().signTypedData = () => {
+          throw new Error('test');
+        };
+        await expect(aepp.signTypedData(recordData, recordAci, { onAccount: account.address }))
+          .to.be.rejectedWith('The peer failed to execute your request due to unknown error');
+      });
+
+      it('signs using specific account', async () => {
+        const onAccount = wallet.addresses()[1];
+        const messageSig = await aepp.signTypedData(recordData, recordAci, { onAccount });
+        const hash = hashTypedData(recordData, recordAci, {});
+        expect(verify(hash, decode(messageSig), onAccount)).to.be.equal(true);
+      });
     });
 
     it('Sign and broadcast invalid transaction', async () => {
@@ -404,37 +452,39 @@ describe('Aepp<->Wallet', function aeppWallet() {
         .rejectedWith('Transaction verification errors: TTL 1 is already expired, current height is');
     });
 
-    it('Add new account to wallet: receive notification for update accounts', async () => {
-      if (aepp._accounts == null) throw new UnexpectedTsError();
-      const connectedLength = Object.keys(aepp._accounts.connected).length;
-      const accountsPromise = new Promise<Accounts>((resolve) => {
-        aepp.onAddressChange = resolve;
+    describe('Subscriptions', () => {
+      it('Add new account to wallet: receive notification for update accounts', async () => {
+        if (aepp._accounts == null) throw new UnexpectedTsError();
+        const connectedLength = Object.keys(aepp._accounts.connected).length;
+        const accountsPromise = new Promise<Accounts>((resolve) => {
+          aepp.onAddressChange = resolve;
+        });
+        wallet.addAccount(MemoryAccount.generate());
+        expect(Object.keys((await accountsPromise).connected).length).to.equal(connectedLength + 1);
       });
-      wallet.addAccount(MemoryAccount.generate());
-      expect(Object.keys((await accountsPromise).connected).length).to.equal(connectedLength + 1);
-    });
 
-    it('Receive update for wallet select account', async () => {
-      if (aepp._accounts == null) throw new UnexpectedTsError();
-      const connectedAccount = Object
-        .keys(aepp._accounts.connected)[0] as Encoded.AccountAddress;
-      const accountsPromise = new Promise<Accounts>((resolve) => {
-        aepp.onAddressChange = resolve;
+      it('Receive update for wallet select account', async () => {
+        if (aepp._accounts == null) throw new UnexpectedTsError();
+        const connectedAccount = Object
+          .keys(aepp._accounts.connected)[0] as Encoded.AccountAddress;
+        const accountsPromise = new Promise<Accounts>((resolve) => {
+          aepp.onAddressChange = resolve;
+        });
+        wallet.selectAccount(connectedAccount);
+        const { connected, current } = await accountsPromise;
+        if (current == null || connected == null) throw new UnexpectedTsError();
+        expect(current[connectedAccount]).to.be.eql({});
+        expect(Object.keys(connected).includes(connectedAccount)).to.be.equal(false);
       });
-      wallet.selectAccount(connectedAccount);
-      const { connected, current } = await accountsPromise;
-      if (current == null || connected == null) throw new UnexpectedTsError();
-      expect(current[connectedAccount]).to.be.eql({});
-      expect(Object.keys(connected).includes(connectedAccount)).to.be.equal(false);
-    });
 
-    it('Aepp: receive notification for network update', async () => {
-      const message = await new Promise<Network>((resolve) => {
-        aepp.onNetworkChange = (msg: any) => resolve(msg);
-        wallet.addNode('second_node', node, true);
+      it('Aepp: receive notification for network update', async () => {
+        const message = await new Promise<Network>((resolve) => {
+          aepp.onNetworkChange = (msg: any) => resolve(msg);
+          wallet.addNode('second_node', node, true);
+        });
+        message.networkId.should.be.equal(networkId);
+        expect(wallet.selectedNodeName).to.be.equal('second_node');
       });
-      message.networkId.should.be.equal(networkId);
-      expect(wallet.selectedNodeName).to.be.equal('second_node');
     });
 
     it('Try to connect unsupported protocol', async () => {
@@ -442,44 +492,46 @@ describe('Aepp<->Wallet', function aeppWallet() {
       await expect(aepp.rpcClient.request(METHODS.connect, { name: 'test-aepp', version: 2 as 1, connectNode: false })).to.be.eventually.rejectedWith('Unsupported Protocol Version').with.property('code', 5);
     });
 
-    it('Disconnect from wallet', async () => {
-      const walletDisconnect: Promise<any> = new Promise((resolve) => {
-        wallet.onDisconnect = (...args: any) => resolve(args);
-      });
-      const aeppDisconnect: Promise<any> = new Promise((resolve) => {
-        aepp.onDisconnect = (...args: any) => resolve(args);
-      });
-      connectionFromWalletToAepp.sendMessage({
-        method: METHODS.closeConnection, params: { reason: 'bye' }, jsonrpc: '2.0',
-      });
-      const [aeppMessage] = await aeppDisconnect;
-      aeppMessage.reason.should.be.equal('bye');
-      connectionFromAeppToWallet.sendMessage({
-        method: METHODS.closeConnection, params: { reason: 'bye' }, jsonrpc: '2.0',
+    describe('Disconnect', () => {
+      it('Disconnect from wallet', async () => {
+        const walletDisconnect: Promise<any> = new Promise((resolve) => {
+          wallet.onDisconnect = (...args: any) => resolve(args);
+        });
+        const aeppDisconnect: Promise<any> = new Promise((resolve) => {
+          aepp.onDisconnect = (...args: any) => resolve(args);
+        });
+        connectionFromWalletToAepp.sendMessage({
+          method: METHODS.closeConnection, params: { reason: 'bye' }, jsonrpc: '2.0',
+        });
+        const [aeppMessage] = await aeppDisconnect;
+        aeppMessage.reason.should.be.equal('bye');
+        connectionFromAeppToWallet.sendMessage({
+          method: METHODS.closeConnection, params: { reason: 'bye' }, jsonrpc: '2.0',
+        });
+        const [, walletMessage] = await walletDisconnect;
+        walletMessage.reason.should.be.equal('bye');
       });
-      const [, walletMessage] = await walletDisconnect;
-      walletMessage.reason.should.be.equal('bye');
-    });
-
-    it('Remove rpc client', async () => {
-      wallet.onConnection = () => {};
-      const id = wallet.addRpcClient(new BrowserWindowMessageConnection({
-        self: connections.walletWindow,
-        target: connections.aeppWindow,
-      }));
-      await aepp.connectToWallet(
-        new BrowserWindowMessageConnection({
-          self: connections.aeppWindow,
-          target: connections.walletWindow,
-        }),
-      );
 
-      wallet.removeRpcClient(id);
-      Array.from(wallet._clients.keys()).length.should.be.equal(0);
-    });
+      it('Remove rpc client', async () => {
+        wallet.onConnection = () => {};
+        const id = wallet.addRpcClient(new BrowserWindowMessageConnection({
+          self: connections.walletWindow,
+          target: connections.aeppWindow,
+        }));
+        await aepp.connectToWallet(
+          new BrowserWindowMessageConnection({
+            self: connections.aeppWindow,
+            target: connections.walletWindow,
+          }),
+        );
+
+        wallet.removeRpcClient(id);
+        Array.from(wallet._clients.keys()).length.should.be.equal(0);
+      });
 
-    it('Remove rpc client: client not found', () => {
-      expect(() => wallet.removeRpcClient('a1')).to.throw(UnknownRpcClientError, 'RpcClient with id a1 do not exist');
+      it('Remove rpc client: client not found', () => {
+        expect(() => wallet.removeRpcClient('a1')).to.throw(UnknownRpcClientError, 'RpcClient with id a1 do not exist');
+      });
     });
   });
 
diff --git a/test/integration/transaction.ts b/test/integration/transaction.ts
index 09cce68c7a..cd6ea8210e 100644
--- a/test/integration/transaction.ts
+++ b/test/integration/transaction.ts
@@ -107,7 +107,7 @@ describe('Transaction', () => {
     }),
   ], [
     'contract create',
-    'tx_+LAqAaEBhAyXS5cWR3ZFS6EZ2E7cTWBYqN7JK27cV4qy0wtMQgABuGr4aEYDoKEijZbj/w2AeiWwAbldusME5pm3ZgPuomnZ3TbUbYgrwLg7nv5E1kQfADcANwAaDoI/AQM//oB4IJIANwEHBwEBAJgvAhFE1kQfEWluaXQRgHggkhlnZXRBcmeCLwCFNy4xLjAAgwcAA4ZHcyzkwAAAAACDTEtAhDuaygCHKxFE1kQfP0tdwp4=',
+    'tx_+LAqAaEBhAyXS5cWR3ZFS6EZ2E7cTWBYqN7JK27cV4qy0wtMQgABuGr4aEYDoKEijZbj/w2AeiWwAbldusME5pm3ZgPuomnZ3TbUbYgrwLg7nv5E1kQfADcANwAaDoI/AQM//oB4IJIANwEHBwEBAJgvAhFE1kQfEWluaXQRgHggkhlnZXRBcmeCLwCFNy4yLjEAgwcAA4ZHcyzkwAAAAACDTEtAhDuaygCHKxFE1kQfP7cARy4=',
     async () => aeSdk.buildTx({
       tag: Tag.ContractCreateTx,
       nonce,
diff --git a/test/integration/typed-data.ts b/test/integration/typed-data.ts
new file mode 100644
index 0000000000..3e675717ed
--- /dev/null
+++ b/test/integration/typed-data.ts
@@ -0,0 +1,160 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import canonicalize from 'canonicalize';
+import {
+  AeSdk, Contract, decode, Encoded, encodeFateValue, decodeFateValue,
+  hashDomain, hashJson, hashTypedData,
+} from '../../src';
+import { Domain } from '../../src/utils/typed-data';
+import { getSdk } from '.';
+
+describe('typed data', () => {
+  describe('hashJson', () => {
+    it('hashes json', () => {
+      expect(hashJson({ a: 'test', b: 42 }).toString('base64')).to.be.eql('EE0l7gg3Xv9K4szSHhK2g24mx5ck1MJHHVCLJscZyEA=');
+    });
+
+    it('gets the same hash if keys ordered differently', () => {
+      expect(hashJson({ b: 42, a: 'test' })).to.be.eql(hashJson({ a: 'test', b: 42 }));
+    });
+  });
+
+  const plainAci = 'int';
+  const plainDataDecoded = 42n;
+  const plainData = 'cb_VNLOFXc=';
+
+  const recordAci = {
+    record: [
+      { name: 'operation', type: 'string' },
+      { name: 'parameter', type: 'int' },
+    ],
+  } as const;
+  const recordDataDecoded = {
+    operation: 'test',
+    parameter: 42n,
+  };
+  const recordData = 'cb_KxF0ZXN0VANAuWU=';
+
+  describe('encodeFateValue', () => {
+    it('encodes plain value', () => {
+      expect(encodeFateValue(plainDataDecoded, plainAci)).to.be.equal(plainData);
+    });
+
+    it('encodes record value', () => {
+      expect(encodeFateValue(recordDataDecoded, recordAci)).to.be.equal(recordData);
+    });
+  });
+
+  describe('decodeFateValue', () => {
+    it('decodes plain value', () => {
+      expect(decodeFateValue(plainData, plainAci)).to.be.eql(plainDataDecoded);
+    });
+
+    it('decodes record value', () => {
+      expect(decodeFateValue(recordData, recordAci)).to.be.eql(recordDataDecoded);
+    });
+  });
+
+  const domain: Domain = {
+    name: 'Test app',
+    version: 2,
+    networkId: 'ae_devnet',
+    contractAddress: 'ct_21A27UVVt3hDkBE5J7rhhqnH5YNb4Y1dqo4PnSybrH85pnWo7E',
+  };
+
+  describe('hashDomain', () => {
+    it('hashes', async () => {
+      expect(hashDomain(domain).toString('base64')).to.be.equal('h3MNXZ4vY96Ill3Q8tEFkX4hPEC2BO2uc6OkPSCYvCY=');
+    });
+  });
+
+  describe('hashTypedData', () => {
+    it('hashes int', async () => {
+      const hash = hashTypedData(plainData, plainAci, domain);
+      expect(hash.toString('base64')).to.be.equal('XoUMXvMeNlw9taOVS+QTUlMNP0LUV/4wYX9dEuX/S+E=');
+    });
+
+    it('hashes record', async () => {
+      const hash = hashTypedData(recordData, recordAci, domain);
+      expect(hash.toString('base64')).to.be.equal('Rl4vsrwkDaEu6FXUHf4WMmIBESYJLGijJSLWyIrNPsg=');
+    });
+  });
+
+  describe('with contract', () => {
+    let aeSdk: AeSdk;
+    let contract: Contract<{
+      getDomain: () => Domain & { version: bigint };
+      getDomainHash: () => Uint8Array;
+      hashTypedData: (parameter: number) => Uint8Array;
+      verify: (parameter: number, pub: Encoded.AccountAddress, sig: Uint8Array) => boolean;
+    }>;
+
+    before(async () => {
+      aeSdk = await getSdk();
+      const typeJson = (canonicalize(recordAci) ?? '').replaceAll('"', '\\"');
+      contract = await aeSdk.initializeContract({
+        sourceCode: ''
+          + '\ninclude "String.aes"'
+          + '\ninclude "Option.aes"'
+          + '\n'
+          + '\ncontract VerifyTypedDataSignature ='
+          + '\n  record domain = { name: option(string),'
+          + '\n                    version: option(int),'
+          + '\n                    networkId: option(string),'
+          + '\n                    contractAddress: option(VerifyTypedDataSignature) }'
+          + '\n'
+          + '\n  entrypoint getDomain(): domain =' // kind of EIP-5267
+          + '\n    { name = Some("Test app"),'
+          + '\n      version = Some(2),'
+          // TODO: don't hardcode network id after solving https://github.com/aeternity/aesophia/issues/461
+          + '\n      networkId = Some("ae_devnet"),'
+          + '\n      contractAddress = Some(Address.to_contract(Contract.address)) }'
+          + '\n'
+          + '\n  entrypoint getDomainHash() = Crypto.blake2b(getDomain())'
+          + '\n'
+          + '\n  record typedData = { operation: string, parameter: int }'
+          + '\n'
+          + '\n  entrypoint getTypedData(parameter: int): typedData ='
+          + '\n    { operation = "test", parameter = parameter }'
+          + '\n'
+          + '\n  entrypoint hashTypedData(parameter: int): hash ='
+          + `\n    let typeHash = Crypto.blake2b("${typeJson}")`
+          + '\n    let dataHash = Crypto.blake2b(getTypedData(parameter))'
+          + '\n    let payload = Bytes.concat(getDomainHash(), Bytes.concat(typeHash, dataHash))'
+          + '\n    Crypto.blake2b(Bytes.concat(#1a00, payload))'
+          + '\n'
+          + '\n  entrypoint verify(parameter: int, pub: address, sig: signature): bool ='
+          + '\n    require(parameter > 40 && parameter < 50, "Invalid parameter")'
+          + '\n    Crypto.verify_sig(hashTypedData(parameter), pub, sig)',
+      });
+      await contract.$deploy([]);
+      domain.contractAddress = contract.$options.address;
+    });
+
+    it('gets domain', async () => {
+      expect((await contract.getDomain()).decodedResult).to.be.eql({ ...domain, version: 2n });
+    });
+
+    it('calculates domain hash', async () => {
+      const domainHash = Buffer.from((await contract.getDomainHash()).decodedResult);
+      expect(domainHash).to.be.eql(hashDomain(domain));
+    });
+
+    it('calculates typed data hash', async () => {
+      const data = encodeFateValue({ operation: 'test', parameter: 43 }, recordAci);
+      const typedDataHash = Buffer.from((await contract.hashTypedData(43)).decodedResult);
+      expect(typedDataHash).to.be.eql(hashTypedData(data, recordAci, domain));
+    });
+
+    it('verifies signature', async () => {
+      const data = encodeFateValue({ operation: 'test', parameter: 45 }, recordAci);
+      const signature = await aeSdk.signTypedData(data, recordAci, domain);
+      const signatureDecoded = decode(signature);
+
+      expect((await contract.verify(46, aeSdk.address, signatureDecoded)).decodedResult)
+        .to.be.equal(false);
+      expect((await contract.verify(45, aeSdk.address, signatureDecoded)).decodedResult)
+        .to.be.equal(true);
+    });
+  });
+});
diff --git a/test/unit/aens.ts b/test/unit/aens.ts
new file mode 100644
index 0000000000..5f03383635
--- /dev/null
+++ b/test/unit/aens.ts
@@ -0,0 +1,335 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import {
+  ensureName, ArgumentError, isAuctionName, computeAuctionEndBlock,
+} from '../../src';
+import { nameToPunycode } from '../../src/tx/builder/helpers';
+
+const tests = [{
+  unicodeAsHex: 'ED8CB62E636861696E',
+  punycode: 'xn--hb8b.chain',
+}, {
+  unicodeAsHex: 'E8BFA9E4B993E99CA7EC9295F0988480F0A0AEB4F0A4AB8FF0ADAAA2F0AD97992E636861696E',
+  punycode: 'xn--ijqv21n7sef34cz41nd6lg9kod1p6k88i.chain',
+}, {
+  unicodeAsHex: 'F0A2929F2E636861696E',
+  punycode: 'xn--et8i.chain',
+}, {
+  unicodeAsHex: 'E49582EA95BAF0A19C8DF0AA9E96F0ADB981EBB195F0AB809FF0A39B932E636861696E',
+  punycode: 'xn--6moy67vslo8503abh7aun7jbrman70g.chain',
+}, {
+  unicodeAsHex: 'F0A2808DE7A8A2E9B094F09782BBF0AEA784EC9191F0A683A3E78696EB8CA8F0ADB3B6E481A2E49686F0A483A9E5B992E891BC2E636861696E',
+  punycode: 'xn--jmn31letzutrtyjotp432bpu0buj6a3k44ay9mnmowcn43dj9uszekb.chain',
+}, {
+  unicodeAsHex: 'F09796B7E39393EA93B7F0A2ABA2F0A8B4A9F0A5BDA3F0AB9681F0979383F0A3BD99F0A4A4A0F0AB889EEBA396F0AD9DBCE5B4AE2E636861696E',
+  punycode: 'xn--z6k806ify1cnvqyy8s0gb4652esh8awnsh24c1h9f5x3d6gj023j.chain',
+}, {
+  unicodeAsHex: 'E7BC87E19782E18084F097BFA3EB8691F0988F9AF0AA9AB4ECA89BEC98A92E636861696E',
+  punycode: 'xn--rid350a5v8hyixbfsveiffz17abwgm422e.chain',
+}, {
+  unicodeAsHex: 'F0A6A0AAEBB282F0A18BB6E3AD8BF0A3A986EC8CAAF0ABB6AD2E636861696E',
+  punycode: 'xn--bkmz887adgeoy60b0cmb3s5cmd3g.chain',
+}, {
+  unicodeAsHex: 'F0928A8CE490AAF0A79781E8A3B4F0AC8FA3F0A7B5BDF0A18AA2F0909A89F0AB8E83ED9092F0A58EBE2E636861696E',
+  punycode: 'xn--6eou47okd9bpg0bmj3aob0zxiidb49bgtoro1knwpb.chain',
+}, {
+  unicodeAsHex: 'F0ADB199E78181F0A5A69FED8CBCF0AE819A2E636861696E',
+  punycode: 'xn--omxo52sg0uowjwdsge.chain',
+}, {
+  unicodeAsHex: 'E7889AF09798A6F0AA92A7F0A99086E98C8EE4A99F2E636861696E',
+  punycode: 'xn--lpp818gd4vd33q4y2k03ua.chain',
+}, {
+  unicodeAsHex: 'F0AA93ADF0928DB8F0A4ADA2F0A2A2BCF09292B5EBA6A9EA9583E4958EF0A7A6A2E4A9A4F0AD9589F0A4B2B8F0A7B2B82E636861696E',
+  punycode: 'xn--jnoy3k6t8g1brt34jmtbn744fo61bescdz7nmdhz29jtn0f.chain',
+}, {
+  unicodeAsHex: 'F0AD8AA9E88A95F0A7B0A0F0A7829AF0AA84A4E5B1B3E588B6F09D9BBEF0A889BCF096A0892E636861696E',
+  punycode: 'xn--oxa1131bwogwx3bs09ruzxl83qaiul7h1e5qxf.chain',
+}, {
+  unicodeAsHex: 'EB99ABE791B2F0AE838BF0A19094F0A688ADF0A5BF9FE28492E5AF83F096AC9D2E636861696E',
+  punycode: 'xn--l-cf2b124efk4dn29jc43hv43d33d8557a.chain',
+}, {
+  unicodeAsHex: 'E9BB87F09080A1E88581E592B8E9BEABF0A7BA9AEB9D81E18D99E6B6B1E98397F09794A7F0A7A89F2E636861696E',
+  punycode: 'xn--46d3854a9wpj2rd0rs9sxnbew1hfc7iwt2j25lvdila.chain',
+}, {
+  unicodeAsHex: 'F097A4BC2E636861696E',
+  punycode: 'xn--tz2f.chain',
+}, {
+  unicodeAsHex: 'E69E9BE981A0F0938297F0A483A72E636861696E',
+  punycode: 'xn--ftvn12gur0idw3j.chain',
+}, {
+  unicodeAsHex: 'F0A88AA5EA9693E78B96E981A4F0A3A681F092929B2E636861696E',
+  punycode: 'xn--k5xm44d1qowe0jtlzmzy7c.chain',
+}, {
+  unicodeAsHex: 'F0A78AA7F0A79D83E0B88C2E636861696E',
+  punycode: 'xn--d3c76742af5c.chain',
+}, {
+  unicodeAsHex: 'EC82A6E2B5A5F0AE93972E636861696E',
+  punycode: 'xn--nnj7428b6xur.chain',
+}, {
+  unicodeAsHex: 'F0A6B0B7F0A5BCBDE7A58DE1A98AE49EB1E3A390F0A68291E0B0B02E636861696E',
+  punycode: 'xn--rpc333e1zxkgniq2dyk70be7bp70b.chain',
+}, {
+  unicodeAsHex: 'EBB9B0E59EA1F0A8A58CE897BC2E636861696E',
+  punycode: 'xn--khss29hyn9a7t61a.chain',
+}, {
+  unicodeAsHex: 'E98D9FF0A2A89BE5B497F0ABB68EF0A4B798F0A292802E636861696E',
+  punycode: 'xn--imt167j7q5u7xeb73crcxj.chain',
+}, {
+  unicodeAsHex: 'E5B5BAE9A087E88DB8E886BAF0ABAC87E59999F0A2ABB02E636861696E',
+  punycode: 'xn--66rt9np16a7pb359bd194cm1yg.chain',
+}, {
+  unicodeAsHex: 'E597822E636861696E',
+  punycode: 'xn--v2r.chain',
+}, {
+  unicodeAsHex: 'E4A493F0A49D95F0978982F0A0B195F0AD8F84E0AAB9E1B688F0A7BDA92E636861696E',
+  punycode: 'xn--1ec447goz5a0o2uz8ufh8xclbzd690g.chain',
+}, {
+  unicodeAsHex: 'F0ACB0B7F0A89BB1F0A6B08BF0AA99AAE2BCA2E58D96F0AE9680F0ABBA9FF0A388B5F0ADB5A6F0AC8E89F0A298B2F0AEA5B5E4A3A82E636861696E',
+  punycode: 'xn--vept0yeref257cjtmad15fgmvbwv0cus4bqjkeixpe1cj9vmvm.chain',
+}, {
+  unicodeAsHex: 'E5AC9BF0AA9684F0A9BC9AF0A18C85F0A3B38FF0A5AD9BF0AB87A3F0A2A184F096AC9AF0ABBF82F0A6B3A5E59F9CE1938EED9A8DEFB88EF0AE80862E636861696E',
+  punycode: 'xn--sie5445ahbczu3qwhxggt9h2c5abm8a4p7c6wubmo5h7cqapy0bqu3bef3g.chain',
+}, {
+  unicodeAsHex: 'F09F88A4F0A2849BF0A7BEA0E99E98F0ABAEB9E7A186E3B2A6F0A783972E636861696E',
+  punycode: 'xn--7tm371fvpvlg0ajg52bk8gd5vvavs0i.chain',
+}, {
+  unicodeAsHex: 'F0988FB3F0A08AAE2E636861696E',
+  punycode: 'xn--674f860s.chain',
+}, {
+  unicodeAsHex: 'E6898BE89E85E7B195F0AD93AFE0BA8AE3B9ABF09294BBF0A29BB4E3A1AF2E636861696E',
+  punycode: 'xn--y6c465sk0dty5bkh1a79n5o4xq4zp1hrk.chain',
+}, {
+  unicodeAsHex: 'F0AB8D8BF0A1B0B0F0A2B7ACF09886A2F09B89AEF0A296BCF0AB89B0F0A8A987EB9288F0AE888BF0A1A1AAF0A5A4A3EA9E842E636861696E',
+  punycode: 'xn--w58at0wru4nx1qb0twgrze4nt9np6x5ghy0efl3d6ecr99v.chain',
+}, {
+  unicodeAsHex: 'EBA497F0AD8584E58299F097A793F0A8B7AA2E636861696E',
+  punycode: 'xn--4zq706wg3ygv1ojcnoc.chain',
+}, {
+  unicodeAsHex: 'E68B9FF0ACAFA7F0A693BCF0A5B89FF0A2ABA4E396A1F0A9A5BAE4ADB7E18D99E789BDF0AB8EB3F0A5B9BAE9BFA8F0A7AFA7F0ADA79A2E636861696E',
+  punycode: 'xn--46d566of5o0mvikrhj6dc278aywvctxa298bfp3dvf3dri9cf28c1z0b.chain',
+}, {
+  unicodeAsHex: 'F0AC8791F0909B9FF0A4AB8D2E636861696E',
+  punycode: 'xn--c38cm246crvwc.chain',
+}, {
+  unicodeAsHex: 'ECAC81F0A28186E5809CEB8CBFF09D9190F0978D83F0A2A790F09082BBF0A7A2BAF0ABABAEF0AD9FBFF0A1B1A32E636861696E',
+  punycode: 'xn--c-uj7am951ab4ta7r3djv5hio5jjrgc8wbm4psg1fh5yc.chain',
+}, {
+  unicodeAsHex: 'F0A398B8F0A1A7BCF0988CA7F0AB9F94E38ABAEA8D93E8BBBBF0A69BA4F0A6A895F0AB9A902E636861696E',
+  punycode: 'xn--45-rl3gl80ewz9wmevgukpbgn3ed9f950sw5c.chain',
+}, {
+  unicodeAsHex: 'E0A88AF09D90B0F09D989B2E636861696E',
+  punycode: 'xn--wt-l8f.chain',
+}, {
+  unicodeAsHex: 'F0A284B2E5B4B9F0A69CABEB9B9FECB2ACF0A0AB9DF0938098F0A79A87F0A485ACF0A28592F0A5B1852E636861696E',
+  punycode: 'xn--hnt499rnxn224gyu2k781atgaz84vnr9b70wa5o1b.chain',
+}, {
+  unicodeAsHex: 'F0AA8EA8F0A4BE96F0A2A986E38D9AE39AAFF097AEBDF0ABB49CF0AB85B8F0A3BD88E8A89A2E636861696E',
+  punycode: 'xn--2-xww653sthv8q6wr3whzz4a5i1ahe2nq42at00a.chain',
+}, {
+  unicodeAsHex: 'F0A997BEE4B286F0AEA0B3F0A2AA8BF0A1A4B82E636861696E',
+  punycode: 'xn--c5pz543ie4kavm5hq5wd.chain',
+}, {
+  unicodeAsHex: 'E494A6E39884E79D92E69DBBF0A0AEA4F0A1BFBDEC89B0EAA1ABE4A5A9F0A69AB0F0A8BEB7EBB69AE8B58EF0908E9C2E636861696E',
+  punycode: 'xn--pglz34bt9c0v3bjtq4e4afx3buo9ajdj8k8nb75z79sbucymhbqe.chain',
+}, {
+  unicodeAsHex: 'F098A0ACE18B9DE49582E7A8BBE7AF8AF0938180EFA995F0ACA3A6F0A3A181F0AA988D2E636861696E',
+  punycode: 'xn--l3d619wnh7a9hau0dx304cqvuernsm1r6g22sc.chain',
+}, {
+  unicodeAsHex: 'F0ADAEA5F097BAB7F096AC93F0AA8A8AF0A1A985ED829BE58B84E99DB8F0A38E93E4B285F0A2A5A8E48688F09783B8EB83882E636861696E',
+  punycode: 'xn--xunu90ab3ec93f1p0ar53b174pc4jay83a0c93a818aorzabq51ascwf.chain',
+}, {
+  unicodeAsHex: 'F0AEA898F0A084B7F0A2978FF0A985A5E8818FE3AC8FE6ACA6E68AA0EB9993F09B899BF0A3AF93E1B09D2E636861696E',
+  punycode: 'xn--80f123khe1ameh2r1avz1e9x0ti3le62wcq91bty2mgpoi.chain',
+}, {
+  unicodeAsHex: 'ED8E8BE9AC88F0A9B98BE39B812E636861696E',
+  punycode: 'xn--3llx56z9o9a0q61a.chain',
+}, {
+  unicodeAsHex: 'F0A79C95E189A4E7A396F0A7A685E8B196F0A5BCA8F0A1AC80F0A5B48DF0A791A9F0ADA4A8E484862E636861696E',
+  punycode: 'xn--4zd099ux88askqzt96by2uc0cdz79cy9em2g2t12a.chain',
+}, {
+  unicodeAsHex: 'CFA5F0A384A2F0A39FB7F09B889B2E636861696E',
+  punycode: 'xn--3ya2831tlwxc5yf.chain',
+}, {
+  unicodeAsHex: 'F0A2BBA8E494BCE5BAB8F09BB09EF0A1BB872E636861696E',
+  punycode: 'xn--0mo256d2j1wsq0c03qa.chain',
+}, {
+  unicodeAsHex: 'F0AEA2B3F096A7B5F0ACA2AFED8D8AF0938F96F0A0B6A0E69180F096A3A8F0A68594F0A9AEB4E597AFE7A89FF0A1B2892E636861696E',
+  punycode: 'xn--53rz64a75qzq5f44yectwcysb8v15dwb2aw07lygof21ueg8ud.chain',
+}, {
+  unicodeAsHex: 'F0A485B7E78CACF0A9AB89F0AE9CA4F09099BEF0A4A5A7E5A3872E636861696E',
+  punycode: 'xn--yps172dwi8hfkvlmkiar76joy1e.chain',
+}, {
+  unicodeAsHex: 'F0ADA9B42E636861696E',
+  punycode: 'xn--dt6m.chain',
+}, {
+  unicodeAsHex: 'F0A6BF93E1AF84C7AEEA9286F0979BACE88CB2E199A1F0AAB0A8F0A09AB92E636861696E',
+  punycode: 'xn--rka285hf2dd09j328ar29txmoh0yng0qne.chain',
+}, {
+  unicodeAsHex: 'F0A89EA82E636861696E',
+  punycode: 'xn--ri9k.chain',
+}, {
+  unicodeAsHex: 'F096A89BE8B0A8E5BE87E7989AF0AAAABCE285A8F0ADA6B0F0AD9997EB8183F09494B4F0A5899FE9A8AB2E636861696E',
+  punycode: 'xn--ix-gu3dq93fsgzburgl9ah92ubonc1n9zlergnm5dkdj.chain',
+}, {
+  unicodeAsHex: 'F0ADBDBDF09F889FF0AA88BC2E636861696E',
+  punycode: 'xn--efv6858jbojb.chain',
+}, {
+  unicodeAsHex: 'F0938E94F0A0959B2E636861696E',
+  punycode: 'xn--cg8dg496a.chain',
+}, {
+  unicodeAsHex: 'F0AD81A6E3B9BEE382BAE9A7A7E4A091F0A6A881F0AC8BA82E636861696E',
+  punycode: 'xn--0ck072beohjo9f568ztqsdwzta.chain',
+}, {
+  unicodeAsHex: 'F0A6AAB3F0AC9E9EE49F9BF0A28FBEF0A89290F0928DBB2E636861696E',
+  punycode: 'xn--65o2537cu2wgwd7b690axc8f.chain',
+}, {
+  unicodeAsHex: 'F0ABA6A7E79C84ED8F8CED91BFE9B0842E636861696E',
+  punycode: 'xn--40y620f8h2bquad239p.chain',
+}, {
+  unicodeAsHex: 'F0AD99A2ED9CADEC9DB4E4AF9CF0AEA792F0A4A283F0949789F0A08986E5B9B4F0A1B38BEA9D822E636861696E',
+  punycode: 'xn--h0p266bwh7c050a8oqiw5mvz9k2lqb3h4e0q4o8xpb.chain',
+}, {
+  unicodeAsHex: 'F0A3A8A5F0ACA4ACF0A996AAE39A82F0A3BE88E7A3B7E39B90EA80A2E8B8B7F0A19198F0A2A292E1A8A9F0A3AABF2E636861696E',
+  punycode: 'xn--ymf013kyga923vghwalqwir85ct27ayb7aijb171a735ww65e.chain',
+}, {
+  unicodeAsHex: 'E69096F0ADA998ED8988F0A1AC8BE9A7B3F0A780BDE9A6A4F0AB998BF0A0B88EF0908EBB2E636861696E',
+  punycode: 'xn--o2u150j0ga537rrxvc263t68sagz9mw09eyl3c.chain',
+}, {
+  unicodeAsHex: 'EBB2A8E9ADAEF0A3AB8AF09B8B99E9B193EBA5B4F09D92A9E9B184F0909BA82E636861696E',
+  punycode: 'xn--n-o08d8vzbv60tr9d071n5pxm2xxi.chain',
+}, {
+  unicodeAsHex: 'E1A888F0A09CB4F0A7A5ACEC959BF0A899BBF0AEA9A6F0A6ACBBF0A3BBB72E636861696E',
+  punycode: 'xn--0lf0680fi1vjqvsb3i5b01rw2uww6p.chain',
+}, {
+  unicodeAsHex: 'F09884A8F0A4B19BF0A6B2B6F0A9A8ACF0A399A32E636861696E',
+  punycode: 'xn--rn4fh701ab1nws3aur1c.chain',
+}, {
+  unicodeAsHex: 'F097819EED87A1F0ABB1982E636861696E',
+  punycode: 'xn--q07b3110ate2j.chain',
+}, {
+  unicodeAsHex: 'E8B694F0A5B8B5E88892F0A6A28DE48192F0A0B289F0A6A394F0A2BBB9F0A89B94F0938586ED87B7F0A4A790EAB796ECB3A5F0A6A5A82E636861696E',
+  punycode: 'xn--2ln748orhh3p6a4p6aqmg1t4p6t4o808bhdwcy45b66zap0an3d314r.chain',
+}, {
+  unicodeAsHex: 'F0A18699F0A2B4B0F0ADAE91E597ADE993BFE9A990F0A59C87F0A581A8E9B59FF0AB91B1F0A9BFB2E2B7962E636861696E',
+  punycode: 'xn--vqj359j745btpe4lel755evmjb546c3pmr65obexb4d2f.chain',
+}, {
+  unicodeAsHex: 'F097BCA9F09B8A92EC9299F098A3BBE59C8FF0A0B1B0E7A997F0AD83942E636861696E',
+  punycode: 'xn--edsy43fn34cj71igjkfz4dkq0hyl3n.chain',
+}, {
+  unicodeAsHex: 'E7A2B4F09083B2F0AD8194F0A99CB7F0978E89E4AA93F0A3B5BC2E636861696E',
+  punycode: 'xn--2qp873ito9fu16dv9vj2r5dgtrd.chain',
+}, {
+  unicodeAsHex: 'F0ABBDABF0988D9E2E636861696E',
+  punycode: 'xn--x34f2333c.chain',
+}, {
+  unicodeAsHex: 'F0A78792F0AEABB2F0A2B4952E636861696E',
+  punycode: 'xn--9k0jz31i361e.chain',
+}, {
+  unicodeAsHex: 'F0A5948CF0A7A693F09188ABE6B48CF091B198EA9CADF09784ACF0A6A689F0A99887E5978DF0AD94B0F0A4BBA9E8BBBE2E636861696E',
+  punycode: 'xn--62rv45c55xrhu2s2jv0mi83l5yzp1slaz23ck4xbtm9dxu1i.chain',
+}, {
+  unicodeAsHex: 'E98680F0A5809CE78F9EE4AAB1EC9CA8E99895E98E85F0A38287E9B9A6F0A08ABAF0A99E9D2E636861696E',
+  punycode: 'xn--xrps71hhxtf0byze92qzq3equ83a7eyc381cin2i.chain',
+}, {
+  unicodeAsHex: 'E69382F0AA96A3E8AC86E9B385F0AC8980F0918A942E636861696E',
+  punycode: 'xn--l7ut56fo0l0f5imfzs149a.chain',
+}, {
+  unicodeAsHex: 'F0A090B2ECBD86F0A693B5F0ACAC93F0A681BEF096A88FF0AB8E9CF0A590B0EC849D2E636861696E',
+  punycode: 'xn--3i4bz2xpi5jt3sfru9c7opuehmm4ouevb.chain',
+}, {
+  unicodeAsHex: 'E284B1F0A9A6B3F0A2B5A3F0A888B7E4B0962E636861696E',
+  punycode: 'xn--f-0u5ao515m35kc2sya.chain',
+}, {
+  unicodeAsHex: 'F0AAAA83E8BCA0F0A98C83F0989EA7F0938DB82E636861696E',
+  punycode: 'xn--h23a8943ah16bfrtmntya.chain',
+}, {
+  unicodeAsHex: 'E5B2B6E38B99E68E9BF0A28B8AF0A1B7A2E9AA8BE782ABE4B1B2F0A1BFA9F0AAB2B4F0A5A69CF09288A9E68BAF2E636861696E',
+  punycode: 'xn--tck284f4ele1fsyaj78c850evzwmppornierpj261p9zsj.chain',
+}, {
+  unicodeAsHex: 'F0AA94B5E3A5B1F0A8938DF0A58599F0A98397E9A0A4F0909D84F0A7B283E18980F0ADAC83E6AFBDEA82AA2E636861696E',
+  punycode: 'xn--3yd971rgu7az5yb15ixh9mf4wu1fkctupvm2au20c06wi.chain',
+}, {
+  unicodeAsHex: 'F0ADAABDF0AFA082F0A0A6A9F0ACAD9AF0A6BBB52E636861696E',
+  punycode: 'xn--ziq9329h0r9bgixdwcqa.chain',
+}, {
+  unicodeAsHex: 'F09B829EEB89882E636861696E',
+  punycode: 'xn--mf1bz639b.chain',
+}];
+
+describe('AENS utils', () => {
+  describe('nameToPunycode', () => {
+    it('encodes', () => {
+      tests.forEach(({ unicodeAsHex, punycode }) => {
+        const name = Buffer.from(unicodeAsHex, 'hex').toString();
+        expect(nameToPunycode(name)).to.be.equal(punycode);
+      });
+    });
+  });
+
+  describe('ensureName', () => {
+    it('fails if more than 2 labels', () => {
+      expect(() => ensureName('test.test.chain'))
+        .to.throw(ArgumentError, 'aens name should be including only one dot, got test.test.chain instead');
+    });
+
+    it('fails if wrong top level label', () => {
+      expect(() => ensureName('test.test'))
+        .to.throw(ArgumentError, 'aens name should be suffixed with .chain, got test.test instead');
+    });
+
+    it('fails if invalid char in label', () => {
+      expect(() => ensureName('te/st.chain'))
+        .to.throw(ArgumentError, 'aens name should be valid, got te/st.chain instead');
+      expect(() => ensureName('te%st.chain'))
+        .to.throw(ArgumentError, 'aens name should be valid, got te%st.chain instead');
+      expect(() => ensureName('te!st.chain'))
+        .to.throw(ArgumentError, 'aens name should be without illegal chars, got te!st.chain instead');
+    });
+
+    it('fails if emoji char in label', () => {
+      expect(() => ensureName('🚀.chain'))
+        .to.throw(ArgumentError, 'aens name should be not containing emoji, got 🚀.chain instead');
+    });
+
+    it('fails if name too long', () => {
+      expect(() => ensureName('ldiDxa1Yxy1iiTRztYEN4F8nrnfZib3Q1MllPghmst8fjJ1sI3DXzOoAddE2ETxp.chain'))
+        .to.throw(ArgumentError, 'aens name should be not too long, got ldiDxa1Yxy1iiTRztYEN4F8nrnfZib3Q1MllPghmst8fjJ1sI3DXzOoAddE2ETxp.chain instead');
+    });
+  });
+
+  describe('isAuctionName', () => {
+    it('checks non-auction name', () => {
+      expect(isAuctionName('1234567890123.chain')).to.be.equal(false);
+    });
+
+    it('checks auction name', () => {
+      expect(isAuctionName('123456789012.chain')).to.be.equal(true);
+    });
+
+    it('checks non-auction unicode name', () => {
+      expect(isAuctionName('æ23456.chain')).to.be.equal(false);
+    });
+
+    it('checks auction unicode name', () => {
+      expect(isAuctionName('æ2345.chain')).to.be.equal(true);
+    });
+  });
+
+  describe('computeAuctionEndBlock', () => {
+    it('computes for longest auction', () => {
+      expect(computeAuctionEndBlock('123456789012.chain', 1)).to.be.equal(481);
+    });
+
+    it('computes for shortest auction', () => {
+      expect(computeAuctionEndBlock('1.chain', 1)).to.be.equal(29761);
+    });
+
+    it('computes for longest unicode auction', () => {
+      expect(computeAuctionEndBlock('æ2345.chain', 1)).to.be.equal(481);
+    });
+
+    it('computes for shortest unicode auction', () => {
+      expect(computeAuctionEndBlock('æ.chain', 1)).to.be.equal(14881);
+    });
+  });
+});
diff --git a/test/unit/crypto.ts b/test/unit/crypto.ts
index 7eb9d30d8f..6690ed5a74 100644
--- a/test/unit/crypto.ts
+++ b/test/unit/crypto.ts
@@ -56,6 +56,7 @@ describe('crypto', () => {
 
   it('isAddressValid', () => {
     expect(isAddressValid('test')).to.be.equal(false);
+    expect(isAddressValid('th_11111111111111111111111111111111273Yts')).to.be.equal(false);
     expect(isAddressValid('ak_11111111111111111111111111111111273Yts')).to.be.equal(true);
   });
 
diff --git a/test/unit/tx.ts b/test/unit/tx.ts
index 0ba9b343a0..a669bb71a9 100644
--- a/test/unit/tx.ts
+++ b/test/unit/tx.ts
@@ -3,7 +3,7 @@ import { describe, it } from 'mocha';
 import { expect } from 'chai';
 import { encode as rlpEncode } from 'rlp';
 import BigNumber from 'bignumber.js';
-import { checkOnlyTypes, randomName } from '../utils';
+import { checkOnlyTypes, ensureEqual, randomName } from '../utils';
 import {
   genSalt,
   decode, encode, Encoding, Encoded,
@@ -215,7 +215,7 @@ describe('Tx', () => {
         Tag.SignedTx,
       );
       expect(signatures).to.have.lengthOf(2);
-      if (encodedTx.tag !== Tag.ChannelOffChainTx) throw new Error('Unexpected nested transaction');
+      ensureEqual<Tag.ChannelOffChainTx>(encodedTx.tag, Tag.ChannelOffChainTx);
       expect(encodedTx.channelId).to.be.satisfy((s: string) => s.startsWith('ch_'));
       expect(encodedTx.round).to.be.equal(3);
       expect(encodedTx.stateHash).to.be.satisfy((s: string) => s.startsWith('st_'));
diff --git a/test/utils.ts b/test/utils.ts
index adf1ca4b23..181e1387a1 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 import { expect } from 'chai';
 import { AensName } from '../src';
 
-function randomString(len: number): string {
+export function randomString(len: number): string {
   const charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   let string = '';
   for (let i = 0; i < len; i += 1) {
diff --git a/tooling/autorest/compiler-prepare.mjs b/tooling/autorest/compiler-prepare.mjs
index 67c2028662..6d8f58755e 100644
--- a/tooling/autorest/compiler-prepare.mjs
+++ b/tooling/autorest/compiler-prepare.mjs
@@ -1,15 +1,10 @@
-import https from 'https';
 import fs from 'fs';
 
-const swaggerUrl = 'https://raw.githubusercontent.com/aeternity/aesophia_http/v7.1.1/config/swagger.yaml';
+const swaggerUrl = 'https://raw.githubusercontent.com/aeternity/aesophia_http/v7.4.0/config/swagger.yaml';
 
-let swagger = await new Promise((resolve) => {
-  https.get(swaggerUrl, (res) => {
-    let data = '';
-    res.on('data', (chunk) => { data += chunk; });
-    res.on('close', () => resolve(data));
-  }).end();
-});
+const response = await fetch(swaggerUrl);
+console.assert(response.status === 200, 'Invalid response code', response.status);
+let swagger = await response.text();
 
 swagger = swagger.replace(/basePath: \//, '');
 // TODO: Remove after fixing https://github.com/aeternity/aesophia_http/issues/87
diff --git a/tooling/autorest/compiler.yaml b/tooling/autorest/compiler.yaml
index 13a5be685c..295ef1d50b 100644
--- a/tooling/autorest/compiler.yaml
+++ b/tooling/autorest/compiler.yaml
@@ -17,8 +17,8 @@ directive:
 
 version: ^3.6.3
 use-extension:
-  '@autorest/typescript': ^6.0.0-rc.7
-  '@autorest/modelerfour': ^4.26.0
+  '@autorest/typescript': ^6.0.2
+  '@autorest/modelerfour': ^4.26.2
 # replace with a link to https://github.com/aeternity/aesophia_http/blob/master/config/swagger.yaml
 # at specific version after fixing https://github.com/aeternity/aesophia_http/issues/87
 input-file: compiler-swagger.yaml
diff --git a/tooling/autorest/middleware-prepare.mjs b/tooling/autorest/middleware-prepare.mjs
new file mode 100755
index 0000000000..1abd0b1fc1
--- /dev/null
+++ b/tooling/autorest/middleware-prepare.mjs
@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'child_process';
+
+const run = (getOutput, command, ...args) => {
+  const { error, stdout } = spawnSync(
+    command,
+    args,
+    { shell: true, ...!getOutput && { stdio: 'inherit' } },
+  );
+  if (error) throw error;
+  return stdout?.toString().trim();
+};
+
+const version = '1.53.0';
+const id = run(true, 'docker', 'create', `aeternity/ae_mdw:${version}`);
+const openapi = `/home/aeternity/node/lib/ae_mdw-${version}/priv/static/swagger/swagger_v2.yaml`;
+run(false, 'docker', 'cp', `${id}:${openapi}`, './tooling/autorest/middleware-openapi.yaml');
+run(false, 'docker', 'rm', '-v', id);
diff --git a/tooling/autorest/middleware.yaml b/tooling/autorest/middleware.yaml
new file mode 100644
index 0000000000..8cc69c1382
--- /dev/null
+++ b/tooling/autorest/middleware.yaml
@@ -0,0 +1,120 @@
+---
+directive:
+  - from: openapi-document
+    where: $.paths.*.get.responses
+    transform: >
+      Object.entries($)
+        .filter(([key]) => key !== '200')
+        .forEach(([, value]) => value['x-ms-error-response'] = true)
+    reason: >
+      throw errors even for explained response with not 200 code
+      https://github.com/Azure/autorest.typescript/issues/463#issuecomment-524203041
+
+  - from: openapi-document
+    where: $.paths.*.get.parameters[?(@.type)]
+    transform: >
+      if ($.schema) throw new Error('Defined both schema and type');
+      $.schema = { type: $.type };
+      delete $.type;
+    reason: >
+      Schema violation: must NOT have additional properties (paths > /aex141 > get > parameters > 2)
+      additionalProperty: type
+      https://github.com/aeternity/ae_mdw/issues/1428
+
+  - from: openapi-document
+    where: $.components.schemas.Activity.properties.payload.oneOf
+    transform: return $.filter((el) => !el.$ref.includes('Aex141TransferEvent'))
+    reason: >
+      Ref '#/components/schemas/Aex141TransferEvent' is not referencing a valid location.
+      components,schemas,Activity,properties,payload,enum,2
+      https://github.com/aeternity/ae_mdw/issues/1344
+
+  - from: openapi-document
+    where: $.components.schemas.Activity.properties.payload
+    transform: delete $.oneOf;
+    reason: >
+      Error: modelProperties cannot be null or undefined in the mapper
+      https://github.com/Azure/autorest/issues/4118
+
+  - from: openapi-document
+    where: $.paths.*.get.responses.200.content.application/json.schema.allOf^
+    transform: $.type ??= 'object'
+    reason: >
+      The schema 'paths·ulsf14·v2-aex141·get·responses·200·content·application-json·schema' with
+      an undefined type and 'allOf'/'anyOf'/'oneOf' is a bit ambiguous. This has been auto-corrected
+      to 'type:object'
+      https://github.com/Azure/autorest/issues/4118
+
+  - from: openapi-document
+    where: $.paths./names/search.get.responses.200.content.application/json.schema.allOf[0].properties.data.items.allOf^
+    transform: $.type ??= 'object'
+    reason: >
+      The schema 'get-200-application-json-allOf-properties-itemsItem' with an undefined type and
+      'allOf'/'anyOf'/'oneOf' is a bit ambiguous. This has been auto-corrected to 'type:object'
+      https://github.com/Azure/autorest/issues/4118
+
+  - from: openapi-document
+    where: $.paths.*.get.parameters.*.schema.oneOf^
+    transform: $.type ??= 'string'
+    reason: >
+      The schema 'paths·u0n47u·v2-keyblocks-hash_orkbi·get·parameters·0·schema' with an undefined
+      type and 'allOf'/'anyOf'/'oneOf' is a bit ambiguous. This has been auto-corrected
+      to 'type:object'
+      https://github.com/Azure/autorest/issues/4118
+
+  - from: openapi-document
+    where: $.paths./contracts/logs.get.parameters
+    transform: return $.filter((param) => param.name !== 'function')
+    reason: https://github.com/Azure/autorest.typescript/issues/1871
+
+  - from: openapi-document
+    where: $.paths.*.get
+    transform: $.operationId = $.operationId.replace(/(_[a-z])/g, (group) => group[1].toUpperCase())
+    reason: >
+      Otherwise autorest groups operations by 'get' prefix
+      https://github.com/aeternity/ae_mdw/issues/1357
+
+  - from: openapi-document
+    where: $.paths./aex9/account-balances/{account_id}.get.responses.200.content.application/json.allOf^
+    transform: >
+      $.schema = { allOf: $.allOf };
+      delete $.allOf;
+    reason: >
+      Schema violation: must NOT have additional properties (paths >
+      /v2/aex9/account-balances/{account_id} > get > responses > 200 > content > application/json)
+      additionalProperty: allOf
+      https://github.com/aeternity/ae_mdw/pull/1437
+
+  - from: openapi-document
+    where: $.servers
+    transform: $ = []
+    reason: remove a server with /mdw/v2 url
+
+  - from: openapi-document
+    where: $.paths
+    transform: >
+      if ($doc.info.title === 'middleware') return $;
+      const apiPrefix = '/v2';
+      Object.keys($).forEach(key => {
+        $[apiPrefix + key] = $[key];
+        delete $[key];
+      });
+    reason: to don't add /v2 prefix to $host parameter
+
+  - from: openapi-document
+    where: $.info.title
+    set: middleware
+    reason: the whole SDK already about aeternity
+
+version: ^3.6.3
+use-extension:
+  '@autorest/typescript': ^6.0.2
+  '@autorest/modelerfour': ^4.26.2
+input-file: middleware-openapi.yaml
+output-folder: ../../src/apis/middleware
+source-code-folder-path: .
+generator: typescript
+generate-metadata: false
+add-credentials: false
+modelerfour:
+  seal-single-value-enum-by-default: false
diff --git a/tooling/autorest/node.yaml b/tooling/autorest/node.yaml
index 7db790e7f8..f677c0194c 100644
--- a/tooling/autorest/node.yaml
+++ b/tooling/autorest/node.yaml
@@ -102,13 +102,6 @@ directive:
       return $.oneOf[1];
     reason: use more precise form to avoid oneOf
 
-  - from: openapi-document
-    where: $.paths['/accounts/{pubkey}/next-nonce'].get.responses.200.content['application/json'].schema
-    transform: $.type = 'object';
-    reason:
-      add missed object type
-      fixed in https://github.com/aeternity/aeternity/pull/3795
-
   - from: openapi-document
     where: $.paths.*.*.parameters[?(@.$ref && !@.$ref.includes('intAsString'))]
     transform: >
@@ -159,8 +152,8 @@ directive:
 
 version: ^3.6.3
 use-extension:
-  '@autorest/typescript': ^6.0.0-rc.7
-  '@autorest/modelerfour': ^4.26.0
+  '@autorest/typescript': ^6.0.2
+  '@autorest/modelerfour': ^4.26.2
 input-file: https://raw.githubusercontent.com/aeternity/aeternity/v6.5.2/apps/aehttp/priv/oas3.yaml
 output-folder: ../../src/apis/node
 source-code-folder-path: .
diff --git a/tooling/fetch-aesophia-cli.mjs b/tooling/fetch-aesophia-cli.mjs
index b525fa1d29..fa5c39f975 100644
--- a/tooling/fetch-aesophia-cli.mjs
+++ b/tooling/fetch-aesophia-cli.mjs
@@ -3,7 +3,7 @@ import { dirname } from 'path';
 import { writeFileSync, readFileSync, mkdirSync } from 'fs';
 
 const path = './bin/aesophia_cli';
-const hash = 'BqnxuwwjV5q+4nmnkB7Ksa6lR2wwFaCVT2Mq3Y5xJ6rgp5GiwQL3At0Sqi2Z573PXYw0JTXNsglA7R1SyuahVQ==';
+const hash = 'KSUb0KzzM3zhM2cbHeQRqnBvRR7CHvC5Lb9VFw3RPfmC5FOYuxHvRYYsMWwFbrYg76L9fPv5IypKEZbdGohXgA==';
 
 function ensureBinaryCorrect() {
   const buffer = readFileSync(path);
@@ -16,7 +16,7 @@ try {
 } catch {
   console.log('Fetching aesophia_cli');
   const request = await fetch(
-    'https://github.com/aeternity/aesophia_cli/releases/download/v7.1.0/aesophia_cli',
+    'https://github.com/aeternity/aesophia_cli/releases/download/v7.2.1/aesophia_cli',
   );
   const body = Buffer.from(await request.arrayBuffer());
   mkdirSync(dirname(path), { recursive: true });
diff --git a/tsconfig.json b/tsconfig.json
index ef3cbf319c..7b8551dbdd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,21 +9,21 @@
     "emitDeclarationOnly": true,
     "isolatedModules": true,
     "outDir": "./es",
-    "noImplicitAny": true,
     "noImplicitOverride": true,
-    "module": "es2020",
-    "target": "es2020",
-    "lib": ["es2020", "dom"],
+    "module": "es2022",
+    "target": "es2022",
+    "lib": ["es2022", "dom"],
     "moduleResolution": "node",
     "preserveConstEnums": true,
     "declaration": true,
     "downlevelIteration": true,
-    "strictNullChecks": true,
     "allowSyntheticDefaultImports": true,
     "typeRoots": [
       "./node_modules/@types",
       "./src/typings"
-    ]
+    ],
+    "strict": true,
+    "strictFunctionTypes": false, // see https://github.com/aeternity/aepp-sdk-js/issues/1793
   },
   "include": [
     "src/**/*"
diff --git a/tsconfig.tests.json b/tsconfig.tests.json
index 46a28a8afa..237876c2d3 100644
--- a/tsconfig.tests.json
+++ b/tsconfig.tests.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "emitDeclarationOnly": false,
+    "resolveJsonModule": true,
     "noEmit": true
   },
   "include": [