diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a8b76b3b632..68b256efb4d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -770,6 +770,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - package_type: tarballs
+            os: ubuntu-22.04
           - package_type: win
             os: ubuntu-22.04
           - package_type: deb
@@ -792,6 +794,29 @@ jobs:
           colima start
           echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
 
+      - name: Install the Apple certificate
+        if: runner.os == 'macOS'
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.MACOS_BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.MACOS_P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+
+           # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+
       - name: Install Linux build deps
         if: runner.os == 'Linux'
         run: sudo apt-get install -y nsis
@@ -825,6 +850,8 @@ jobs:
           CARGO_BUILD_PROFILE: release
 
       - name: Create package
+        env:
+          OSX_KEYCHAIN: $RUNNER_TEMP/app-signing.keychain-db
         run: "${GITHUB_WORKSPACE}/scripts/pack_dashmate.sh ${{ matrix.package_type }}"
 
       - name: Upload artifacts to action summary
diff --git a/.pnp.cjs b/.pnp.cjs
index fcffa1832f4..a9b196e03cf 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -2694,10 +2694,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@dashevo/oclif", [\
-        ["npm:1.0.1", {\
-          "packageLocation": "./.yarn/cache/@dashevo-oclif-npm-1.0.1-f30fea1a8a-1a9b7871f8.zip/node_modules/@dashevo/oclif/",\
+        ["npm:1.0.2", {\
+          "packageLocation": "./.yarn/cache/@dashevo-oclif-npm-1.0.2-838469dc60-b421acd414.zip/node_modules/@dashevo/oclif/",\
           "packageDependencies": [\
-            ["@dashevo/oclif", "npm:1.0.1"],\
+            ["@dashevo/oclif", "npm:1.0.2"],\
             ["@oclif/core", "npm:1.22.0"],\
             ["@oclif/plugin-help", "npm:5.1.20"],\
             ["@oclif/plugin-not-found", "npm:2.3.11"],\
@@ -2713,8 +2713,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["normalize-package-data", "npm:3.0.3"],\
             ["semver", "npm:7.3.8"],\
             ["tslib", "npm:2.4.1"],\
-            ["yeoman-environment", "virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:3.13.0"],\
-            ["yeoman-generator", "virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:5.6.1"],\
+            ["yeoman-environment", "virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:3.13.0"],\
+            ["yeoman-generator", "virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:5.6.1"],\
             ["yosay", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
@@ -3506,6 +3506,41 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["wrap-ansi", "npm:7.0.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.26.2", {\
+          "packageLocation": "./.yarn/cache/@oclif-core-npm-1.26.2-6e8f4423c3-1da7f22fff.zip/node_modules/@oclif/core/",\
+          "packageDependencies": [\
+            ["@oclif/core", "npm:1.26.2"],\
+            ["@oclif/linewrap", "npm:1.0.0"],\
+            ["@oclif/screen", "npm:3.0.4"],\
+            ["ansi-escapes", "npm:4.3.2"],\
+            ["ansi-styles", "npm:4.3.0"],\
+            ["cardinal", "npm:2.1.1"],\
+            ["chalk", "npm:4.1.2"],\
+            ["clean-stack", "npm:3.0.1"],\
+            ["cli-progress", "npm:3.10.0"],\
+            ["debug", "virtual:da6319fb8ee6999f0780eb633cb928f5c3591495496bf4772d10fe1fe1a6bdb4d9da75848709ecbee87ebbe810b9042e34151e541b86413683541ebf018679fa#npm:4.3.4"],\
+            ["ejs", "npm:3.1.8"],\
+            ["fs-extra", "npm:9.1.0"],\
+            ["get-package-type", "npm:0.1.0"],\
+            ["globby", "npm:11.1.0"],\
+            ["hyperlinker", "npm:1.0.0"],\
+            ["indent-string", "npm:4.0.0"],\
+            ["is-wsl", "npm:2.2.0"],\
+            ["js-yaml", "npm:3.14.1"],\
+            ["natural-orderby", "npm:2.0.3"],\
+            ["object-treeify", "npm:1.1.33"],\
+            ["password-prompt", "npm:1.1.2"],\
+            ["semver", "npm:7.3.8"],\
+            ["string-width", "npm:4.2.3"],\
+            ["strip-ansi", "npm:6.0.1"],\
+            ["supports-color", "npm:8.1.1"],\
+            ["supports-hyperlinks", "npm:2.2.0"],\
+            ["tslib", "npm:2.4.1"],\
+            ["widest-line", "npm:3.1.0"],\
+            ["wrap-ansi", "npm:7.0.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@oclif/linewrap", [\
@@ -3563,6 +3598,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@oclif/screen", "npm:3.0.3"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.4", {\
+          "packageLocation": "./.yarn/cache/@oclif-screen-npm-3.0.4-d372fa56f8-6d662c81ed.zip/node_modules/@oclif/screen/",\
+          "packageDependencies": [\
+            ["@oclif/screen", "npm:3.0.4"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@octokit/auth-token", [\
@@ -7753,10 +7795,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@dashevo/dpp", "workspace:packages/js-dpp"],\
             ["@dashevo/feature-flags-contract", "workspace:packages/feature-flags-contract"],\
             ["@dashevo/masternode-reward-shares-contract", "workspace:packages/masternode-reward-shares-contract"],\
-            ["@dashevo/oclif", "npm:1.0.1"],\
+            ["@dashevo/oclif", "npm:1.0.2"],\
             ["@dashevo/wallet-lib", "workspace:packages/wallet-lib"],\
             ["@dashevo/withdrawals-contract", "workspace:packages/withdrawals-contract"],\
-            ["@oclif/core", "npm:1.22.0"],\
+            ["@oclif/core", "npm:1.26.2"],\
             ["@oclif/plugin-help", "npm:5.1.20"],\
             ["ajv", "npm:8.8.1"],\
             ["ajv-formats", "virtual:58fb68f2aed20e5e0f2e48520ab903ae9bb3440369bfd5e912034003cf27c5aae368649fc5620dd2acbed578131f3a0975e75b838d77d12335fb0412e24026c6#npm:2.1.1"],\
@@ -12705,10 +12747,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d57a3bd532041f95d204482eda0a956044e32c7f872cadfef73b29f820fc5c3d8536a7bada8e0e465272cceec08d4ac9da54258525d634de10eba0af9cc6dfe1#npm:9.4.0", {\
-          "packageLocation": "./.yarn/__virtual__/mem-fs-editor-virtual-96decfce1f/0/cache/mem-fs-editor-npm-9.4.0-97c608fb01-427b71d59a.zip/node_modules/mem-fs-editor/",\
+        ["virtual:29cd966a3bf4a1d402f9cda58cb039a316be3657f4e6b8ac58634c33284e2ea8a4372e13f710cd2a2d785a107d9d65ea8ec3877ffec3f4046f107c19d1df875e#npm:9.4.0", {\
+          "packageLocation": "./.yarn/__virtual__/mem-fs-editor-virtual-1238782479/0/cache/mem-fs-editor-npm-9.4.0-97c608fb01-427b71d59a.zip/node_modules/mem-fs-editor/",\
           "packageDependencies": [\
-            ["mem-fs-editor", "virtual:d57a3bd532041f95d204482eda0a956044e32c7f872cadfef73b29f820fc5c3d8536a7bada8e0e465272cceec08d4ac9da54258525d634de10eba0af9cc6dfe1#npm:9.4.0"],\
+            ["mem-fs-editor", "virtual:29cd966a3bf4a1d402f9cda58cb039a316be3657f4e6b8ac58634c33284e2ea8a4372e13f710cd2a2d785a107d9d65ea8ec3877ffec3f4046f107c19d1df875e#npm:9.4.0"],\
             ["@types/mem-fs", null],\
             ["binaryextensions", "npm:4.18.0"],\
             ["commondir", "npm:1.0.1"],\
@@ -18775,10 +18817,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:3.13.0", {\
-          "packageLocation": "./.yarn/__virtual__/yeoman-environment-virtual-d57a3bd532/0/cache/yeoman-environment-npm-3.13.0-f7ad653f8e-2d622d18d2.zip/node_modules/yeoman-environment/",\
+        ["virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:3.13.0", {\
+          "packageLocation": "./.yarn/__virtual__/yeoman-environment-virtual-29cd966a3b/0/cache/yeoman-environment-npm-3.13.0-f7ad653f8e-2d622d18d2.zip/node_modules/yeoman-environment/",\
           "packageDependencies": [\
-            ["yeoman-environment", "virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:3.13.0"],\
+            ["yeoman-environment", "virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:3.13.0"],\
             ["@npmcli/arborist", "npm:4.3.1"],\
             ["@types/mem-fs", null],\
             ["@types/mem-fs-editor", null],\
@@ -18803,7 +18845,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["lodash", "npm:4.17.21"],\
             ["log-symbols", "npm:4.1.0"],\
             ["mem-fs", "npm:2.2.1"],\
-            ["mem-fs-editor", "virtual:d57a3bd532041f95d204482eda0a956044e32c7f872cadfef73b29f820fc5c3d8536a7bada8e0e465272cceec08d4ac9da54258525d634de10eba0af9cc6dfe1#npm:9.4.0"],\
+            ["mem-fs-editor", "virtual:29cd966a3bf4a1d402f9cda58cb039a316be3657f4e6b8ac58634c33284e2ea8a4372e13f710cd2a2d785a107d9d65ea8ec3877ffec3f4046f107c19d1df875e#npm:9.4.0"],\
             ["minimatch", "npm:3.1.2"],\
             ["npmlog", "npm:5.0.1"],\
             ["p-queue", "npm:6.6.2"],\
@@ -18833,10 +18875,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:5.6.1", {\
-          "packageLocation": "./.yarn/__virtual__/yeoman-generator-virtual-ad9d192e11/0/cache/yeoman-generator-npm-5.6.1-a49b7654c4-ef036210b6.zip/node_modules/yeoman-generator/",\
+        ["virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:5.6.1", {\
+          "packageLocation": "./.yarn/__virtual__/yeoman-generator-virtual-4147e1a57f/0/cache/yeoman-generator-npm-5.6.1-a49b7654c4-ef036210b6.zip/node_modules/yeoman-generator/",\
           "packageDependencies": [\
-            ["yeoman-generator", "virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:5.6.1"],\
+            ["yeoman-generator", "virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:5.6.1"],\
             ["@types/yeoman-environment", null],\
             ["chalk", "npm:4.1.2"],\
             ["dargs", "npm:7.0.0"],\
@@ -18851,7 +18893,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["shelljs", "npm:0.8.5"],\
             ["sort-keys", "npm:4.2.0"],\
             ["text-table", "npm:0.2.0"],\
-            ["yeoman-environment", "virtual:f30fea1a8a1e96cd95aaa42203f6e54f27d334aca599a6a058bdf580a493e4506d84d23c55f845dc694b6895d6ebbf513119b16b84b915ea59e5faf03cf40f96#npm:3.13.0"]\
+            ["yeoman-environment", "virtual:838469dc6055e1f2cba01fd72be9fbca6706b01748bd0e84ae73ecebec5159ccf815131e67deb9faaa4a6ec339ab1a43a8cfcd7805ad0d0047211e293bb5941b#npm:3.13.0"]\
           ],\
           "packagePeers": [\
             "@types/yeoman-environment",\
diff --git a/.yarn/cache/@dashevo-oclif-npm-1.0.1-f30fea1a8a-1a9b7871f8.zip b/.yarn/cache/@dashevo-oclif-npm-1.0.2-838469dc60-b421acd414.zip
similarity index 88%
rename from .yarn/cache/@dashevo-oclif-npm-1.0.1-f30fea1a8a-1a9b7871f8.zip
rename to .yarn/cache/@dashevo-oclif-npm-1.0.2-838469dc60-b421acd414.zip
index 59de21db83e..bbe43088d5e 100644
Binary files a/.yarn/cache/@dashevo-oclif-npm-1.0.1-f30fea1a8a-1a9b7871f8.zip and b/.yarn/cache/@dashevo-oclif-npm-1.0.2-838469dc60-b421acd414.zip differ
diff --git a/.yarn/cache/@oclif-core-npm-1.26.2-6e8f4423c3-1da7f22fff.zip b/.yarn/cache/@oclif-core-npm-1.26.2-6e8f4423c3-1da7f22fff.zip
new file mode 100644
index 00000000000..22b0f522690
Binary files /dev/null and b/.yarn/cache/@oclif-core-npm-1.26.2-6e8f4423c3-1da7f22fff.zip differ
diff --git a/.yarn/cache/@oclif-screen-npm-3.0.4-d372fa56f8-6d662c81ed.zip b/.yarn/cache/@oclif-screen-npm-3.0.4-d372fa56f8-6d662c81ed.zip
new file mode 100644
index 00000000000..cdfe3c1804f
Binary files /dev/null and b/.yarn/cache/@oclif-screen-npm-3.0.4-d372fa56f8-6d662c81ed.zip differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 715e3616234..77f0af4501d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,46 @@
+## [0.24.0-dev.19](https://github.com/dashpay/platform/compare/v0.24.0-dev.18...v0.24.0-dev.19) (2023-04-17)
+
+## [0.24.0-dev.18](https://github.com/dashpay/platform/compare/v0.24.0-dev.17...v0.24.0-dev.18) (2023-04-14)
+
+
+### Features
+
+* **dashmate:** build linux tarballs ([#887](https://github.com/dashpay/platform/issues/887))
+* **dashmate:** build services before restart ([#894](https://github.com/dashpay/platform/issues/894))
+* **dashmate:** exit status with 2 if it's not running ([#896](https://github.com/dashpay/platform/issues/896))
+* **dashmate:** implement http json rpc api ([#888](https://github.com/dashpay/platform/issues/888))
+* **dashmate:** tenderdash latest block time in status ([#906](https://github.com/dashpay/platform/issues/906))
+* **dpp:** serialize consensus errors ([#871](https://github.com/dashpay/platform/issues/871))
+* drive verification c bindings ([#860](https://github.com/dashpay/platform/issues/860))
+
+
+### Bug Fixes
+
+* DAPI still expected on normal masternodes ([#904](https://github.com/dashpay/platform/issues/904))
+* **dapi-client:** platform port is ignored from SML ([#903](https://github.com/dashpay/platform/issues/903))
+* **dashmate:** api binds to all interfaces ([#893](https://github.com/dashpay/platform/issues/893))
+* **dashmate:** dashmate helper is running under root user ([#895](https://github.com/dashpay/platform/issues/895))
+* **dashmate:** dashmate logic doesn't recognize it's ran from helper ([#902](https://github.com/dashpay/platform/issues/902))
+* **dashmate:** missing rawblock zmq message in core config ([#770](https://github.com/dashpay/platform/issues/770))
+* **dashmate:** undefined wallet for dash-cli ([#786](https://github.com/dashpay/platform/issues/786))
+* **dpp:** various fixes in DPP and system contracts ([#907](https://github.com/dashpay/platform/issues/907))
+* **drive:** non-deterministic run of mn identities sync ([#910](https://github.com/dashpay/platform/issues/910))
+* **drive:** total HPMNs contains all masternodes ([#911](https://github.com/dashpay/platform/issues/911))
+* identifier deserialization doesn't work for bincode ([#885](https://github.com/dashpay/platform/issues/885))
+* llmqType must be equal to one of the allowed values ([#884](https://github.com/dashpay/platform/issues/884))
+* possible overflow issues ([#877](https://github.com/dashpay/platform/issues/877))
+
+
+### Miscellaneous Chores
+
+* **dashmate:** update production dashcore versions for mainnet and testnet ([#840](https://github.com/dashpay/platform/issues/840))
+* **sdk:** add eslint ([#829](https://github.com/dashpay/platform/issues/829))
+
+
+### Continuous Integration
+
+* sign MacOs Dashmate release ([#890](https://github.com/dashpay/platform/issues/890))
+
 ## [0.24.0-dev.17](https://github.com/dashpay/platform/compare/v0.24.0-dev.16...v0.24.0-dev.17) (2023-04-04)
 
 
diff --git a/Cargo.lock b/Cargo.lock
index d7cd7436e3b..c743c697dd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -525,6 +525,25 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
+[[package]]
+name = "cbindgen"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb"
+dependencies = [
+ "clap 3.2.24",
+ "heck",
+ "indexmap",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 1.0.109",
+ "tempfile",
+ "toml",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -607,10 +626,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "bitflags",
- "textwrap",
+ "textwrap 0.11.0",
  "unicode-width",
 ]
 
+[[package]]
+name = "clap"
+version = "3.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83"
+dependencies = [
+ "atty",
+ "bitflags",
+ "clap_lex 0.2.4",
+ "indexmap",
+ "strsim",
+ "termcolor",
+ "textwrap 0.16.0",
+]
+
 [[package]]
 name = "clap"
 version = "4.2.4"
@@ -631,7 +665,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "bitflags",
- "clap_lex",
+ "clap_lex 0.4.1",
  "strsim",
 ]
 
@@ -647,6 +681,15 @@ dependencies = [
  "syn 2.0.15",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "clap_lex"
 version = "0.4.1"
@@ -2353,6 +2396,12 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
+[[package]]
+name = "os_str_bytes"
+version = "6.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
+
 [[package]]
 name = "output_vt100"
 version = "0.1.3"
@@ -2950,6 +2999,15 @@ dependencies = [
  "librocksdb-sys",
 ]
 
+[[package]]
+name = "rs-drive-verify-c-binding"
+version = "0.1.0"
+dependencies = [
+ "cbindgen",
+ "drive",
+ "hex",
+]
+
 [[package]]
 name = "rust_decimal"
 version = "1.29.1"
@@ -3542,6 +3600,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
 [[package]]
 name = "thiserror"
 version = "1.0.40"
@@ -3992,12 +4056,25 @@ dependencies = [
  "dpp",
  "itertools",
  "js-sys",
+ "log",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-logger",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-logger"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718"
+dependencies = [
+ "log",
+ "wasm-bindgen",
  "web-sys",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index fd540e3fd56..dffb1861363 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,4 +14,5 @@ members = [
     "packages/feature-flags-contract",
     "packages/dpns-contract",
     "packages/data-contracts",
+    "packages/rs-drive-verify-c-binding"
 ]
diff --git a/package.json b/package.json
index 87aad11ad10..16fef79de1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/platform",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "private": true,
   "scripts": {
     "setup": "yarn install && yarn run build && yarn run configure",
diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json
index 946086cacaf..8d3c72bbbfa 100644
--- a/packages/bench-suite/package.json
+++ b/packages/bench-suite/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/bench-suite",
   "private": true,
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Dash Platform benchmark tool",
   "scripts": {
     "bench": "node ./bin/bench.js",
diff --git a/packages/dapi-grpc/package.json b/packages/dapi-grpc/package.json
index 7410dda4a1b..7a43dd72c4b 100644
--- a/packages/dapi-grpc/package.json
+++ b/packages/dapi-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
diff --git a/packages/dapi/package.json b/packages/dapi/package.json
index 19788940e5f..0e6cfbcf7a2 100644
--- a/packages/dapi/package.json
+++ b/packages/dapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/dapi",
   "private": true,
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "A decentralized API for the Dash network",
   "scripts": {
     "api": "node scripts/api.js",
diff --git a/packages/dash-spv/package.json b/packages/dash-spv/package.json
index bd1e930a67c..8b13884d9cc 100644
--- a/packages/dash-spv/package.json
+++ b/packages/dash-spv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dash-spv",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Repository containing SPV functions used by @dashevo",
   "main": "index.js",
   "scripts": {
diff --git a/packages/dashmate/Dockerfile b/packages/dashmate/Dockerfile
index e307e101bba..0eae41df61d 100644
--- a/packages/dashmate/Dockerfile
+++ b/packages/dashmate/Dockerfile
@@ -11,7 +11,8 @@ RUN apk update && \
                        alpine-sdk \
                        make \
                        cmake \
-                       g++
+                       g++ \
+                       curl
 
 # Enable corepack https://github.com/nodejs/corepack
 RUN corepack enable
@@ -51,7 +52,6 @@ FROM node:16-alpine3.16
 
 ARG NODE_ENV=production
 ENV NODE_ENV ${NODE_ENV}
-ENV DASHMATE_HELPER=1
 
 RUN apk update && \
     apk --no-cache upgrade && \
@@ -60,7 +60,6 @@ RUN apk update && \
 LABEL maintainer="Dash Developers <dev@dash.org>"
 LABEL description="Dashmate Helper Node.JS"
 
-
 WORKDIR /platform
 
 COPY --from=builder /platform /platform
diff --git a/packages/dashmate/configs/migrations.js b/packages/dashmate/configs/migrations.js
index f68e767fd02..b192c025c1a 100644
--- a/packages/dashmate/configs/migrations.js
+++ b/packages/dashmate/configs/migrations.js
@@ -512,4 +512,26 @@ module.exports = {
 
     return configFile;
   },
+  '0.24.0-dev.18': (configFile) => {
+    let groupJsonApiPort = systemConfigs.local.dashmate.helper.api.port;
+
+    Object.entries(configFile.configs)
+      .forEach(([, config]) => {
+        if (config.group === 'local') {
+          config.dashmate.helper.api = {
+            enable: false,
+            port: groupJsonApiPort,
+          };
+
+          groupJsonApiPort += 100;
+        } else {
+          config.dashmate.helper.api = {
+            enable: false,
+            port: systemConfigs.base.dashmate.helper.api.port,
+          };
+        }
+      });
+
+    return configFile;
+  },
 };
diff --git a/packages/dashmate/configs/schema/configJsonSchema.js b/packages/dashmate/configs/schema/configJsonSchema.js
index c563306f784..e3d2b5df070 100644
--- a/packages/dashmate/configs/schema/configJsonSchema.js
+++ b/packages/dashmate/configs/schema/configJsonSchema.js
@@ -407,8 +407,8 @@ module.exports = {
                   properties: {
                     llmqType: {
                       type: 'number',
-                      // https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57
-                      enum: [1, 2, 3, 4, 100, 101, 102, 106, 107],
+                      // https://github.com/dashpay/dashcore-lib/blob/843176fed9fc81feae43ccf319d99e2dd942fe1f/lib/constants/index.js#L50-L99
+                      enum: [1, 2, 3, 4, 5, 6, 100, 101, 102, 103, 104, 105, 106, 107],
                     },
                   },
                   additionalProperties: false,
@@ -669,8 +669,21 @@ module.exports = {
             docker: {
               $ref: '#/definitions/docker',
             },
+            api: {
+              type: 'object',
+              properties: {
+                enable: {
+                  type: 'boolean',
+                },
+                port: {
+                  $ref: '#/definitions/port',
+                },
+              },
+              required: ['enable', 'port'],
+              additionalProperties: false,
+            },
           },
-          required: ['docker'],
+          required: ['docker', 'api'],
           additionalProperties: false,
         },
       },
diff --git a/packages/dashmate/configs/system/base.js b/packages/dashmate/configs/system/base.js
index a43b467fe78..accf90915a7 100644
--- a/packages/dashmate/configs/system/base.js
+++ b/packages/dashmate/configs/system/base.js
@@ -235,6 +235,10 @@ module.exports = {
       docker: {
         image: 'dashpay/dashmate-helper:0.24-dev',
       },
+      api: {
+        enable: false,
+        port: 9000,
+      },
     },
   },
   externalIp: null,
diff --git a/packages/dashmate/configs/system/local.js b/packages/dashmate/configs/system/local.js
index 1c9d9e169d1..c3b38e0717a 100644
--- a/packages/dashmate/configs/system/local.js
+++ b/packages/dashmate/configs/system/local.js
@@ -48,6 +48,13 @@ module.exports = lodashMerge({}, baseConfig, {
       },
     },
   },
+  dashmate: {
+    helper: {
+      api: {
+        port: 9100,
+      },
+    },
+  },
   externalIp: null,
   environment: 'development',
   network: NETWORK_LOCAL,
diff --git a/packages/dashmate/docker-compose.platform.yml b/packages/dashmate/docker-compose.platform.yml
index 6cc471198af..0f80d81bb41 100644
--- a/packages/dashmate/docker-compose.platform.yml
+++ b/packages/dashmate/docker-compose.platform.yml
@@ -114,6 +114,8 @@ services:
       - DASHMATE_HOME_DIR=/home/dashmate/.dashmate
       - LOCAL_UID=${LOCAL_UID:?err}
       - LOCAL_GID=${LOCAL_GID:?err}
+    ports:
+      - 127.0.0.1:${DASHMATE_HELPER_API_PORT:?err}:${DASHMATE_HELPER_API_PORT:?err}
     command: yarn workspace dashmate helper ${CONFIG_NAME:?err}
     volumes:
       - ${DASHMATE_HOME_DIR:?err}:/home/dashmate/.dashmate
diff --git a/packages/dashmate/docker/entrypoint.sh b/packages/dashmate/docker/entrypoint.sh
index 926223f1325..d6a1d69ad5c 100755
--- a/packages/dashmate/docker/entrypoint.sh
+++ b/packages/dashmate/docker/entrypoint.sh
@@ -31,6 +31,4 @@ fi
 
 echo "Starting with: USERNAME: $USERNAME, UID: $USER_ID, GID: $GROUP_ID, USER: $USERNAME, GROUP: $GROUP"
 
-su $USERNAME
-
-exec "$@"
+exec su - $USERNAME -c "cd /platform;DASHMATE_HELPER=1 $*"
diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json
index 511bedebae8..071ae2d7a9f 100644
--- a/packages/dashmate/package.json
+++ b/packages/dashmate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dashmate",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Distribution package for Dash node installation",
   "scripts": {
     "lint": "eslint .",
@@ -58,7 +58,7 @@
     "@dashevo/masternode-reward-shares-contract": "workspace:*",
     "@dashevo/wallet-lib": "workspace:*",
     "@dashevo/withdrawals-contract": "workspace:*",
-    "@oclif/core": "^1.21.0",
+    "@oclif/core": "^1.25.0",
     "@oclif/plugin-help": "^5.1.20",
     "ajv": "^8.6.0",
     "ajv-formats": "^2.1.1",
@@ -90,7 +90,7 @@
     "table": "^5.4.6"
   },
   "devDependencies": {
-    "@dashevo/oclif": "^1.0.1",
+    "@dashevo/oclif": "^1.0.2",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
@@ -120,7 +120,8 @@
     "commands": "./src/commands",
     "bin": "dashmate",
     "macos": {
-      "identifier": "org.dash.dashmate"
+      "identifier": "org.dash.dashmate",
+      "sign": "'Developer ID Installer: The Dash Foundation, Inc.'"
     },
     "deb": {
       "dependencies": "docker-ce (>= 20.10.0) | docker.io (>= 20.10.0)"
diff --git a/packages/dashmate/scripts/helper.js b/packages/dashmate/scripts/helper.js
index c9bf7174317..c7c9403149b 100644
--- a/packages/dashmate/scripts/helper.js
+++ b/packages/dashmate/scripts/helper.js
@@ -27,13 +27,13 @@ const createDIContainer = require('../src/createDIContainer');
 
   const configFile = await configFileRepository.read();
 
+  const config = configFile.getConfig(configName);
+
   // Register config collection in the container
   container.register({
     configFile: asValue(configFile),
   });
 
-  const config = configFile.getConfig(configName);
-
   const provider = config.get('platform.dapi.envoy.ssl.provider');
 
   if (provider === 'zerossl') {
@@ -43,4 +43,16 @@ const createDIContainer = require('../src/createDIContainer');
     // prevent infinite restarts
     setInterval(() => {}, 60 * 1000);
   }
+
+  if (config.get('dashmate.helper.api.enable')) {
+    const createHttpApiServer = container.resolve('createHttpApiServer');
+
+    const httpAPIServer = createHttpApiServer();
+
+    const port = config.get('dashmate.helper.api.port');
+
+    httpAPIServer
+      // eslint-disable-next-line no-console
+      .listen(port, () => console.log(`Dashmate JSON-RPC API started on port ${port}`));
+  }
 }());
diff --git a/packages/dashmate/src/commands/group/status.js b/packages/dashmate/src/commands/group/status.js
index a4c24983cb5..c6b29aa08e4 100644
--- a/packages/dashmate/src/commands/group/status.js
+++ b/packages/dashmate/src/commands/group/status.js
@@ -64,7 +64,7 @@ class GroupStatusCommand extends GroupBaseCommand {
           } else {
             plain['Platform Status'] = colors.status(scope.platform.tenderdash.serviceStatus)(scope.platform.tenderdash.serviceStatus);
             plain['Platform Version'] = scope.platform.tenderdash.version;
-            plain['Platform Block Height'] = scope.platform.tenderdash.lastBlockHeight;
+            plain['Platform Block Height'] = scope.platform.tenderdash.latestBlockHeight;
             plain['Platform Peers'] = scope.platform.tenderdash.peers;
             plain['Platform Network'] = scope.platform.tenderdash.network;
           }
diff --git a/packages/dashmate/src/commands/status/index.js b/packages/dashmate/src/commands/status/index.js
index 84f831ae76a..c2ff732a5dc 100644
--- a/packages/dashmate/src/commands/status/index.js
+++ b/packages/dashmate/src/commands/status/index.js
@@ -24,7 +24,11 @@ class StatusCommand extends ConfigBaseCommand {
     config,
   ) {
     if (!(await dockerCompose.isServiceRunning(config.toEnvs()))) {
-      throw new Error('Node is not running, start it with `dashmate start`');
+      const error = new Error('Node is not running, start it with `dashmate start`');
+
+      error.exitCode = 2;
+
+      throw error;
     }
 
     const scope = await getOverviewScope(config);
@@ -85,7 +89,7 @@ class StatusCommand extends ConfigBaseCommand {
 
         if (platform.tenderdash.serviceStatus === ServiceStatusEnum.up) {
           plain['Platform Version'] = platform.tenderdash.version;
-          plain['Platform Block Height'] = platform.tenderdash.lastBlockHeight;
+          plain['Platform Block Height'] = platform.tenderdash.latestBlockHeight;
           plain['Platform Peers'] = platform.tenderdash.peers;
           plain['Platform Network'] = platform.tenderdash.network;
         }
diff --git a/packages/dashmate/src/commands/status/platform.js b/packages/dashmate/src/commands/status/platform.js
index 00bdc8a27ef..5944fdb6283 100644
--- a/packages/dashmate/src/commands/status/platform.js
+++ b/packages/dashmate/src/commands/status/platform.js
@@ -79,7 +79,7 @@ class PlatformStatusCommand extends ConfigBaseCommand {
       if (tenderdash.version) {
         const {
           version: tenderdashVersion,
-          lastBlockHeight: platformBlockHeight,
+          latestBlockHeight: platformBlockHeight,
           latestAppHash: platformLatestAppHash,
           peers: platformPeers,
           network: tenderdashNetwork,
diff --git a/packages/dashmate/src/createDIContainer.js b/packages/dashmate/src/createDIContainer.js
index 8f2207521f4..7d36704f686 100644
--- a/packages/dashmate/src/createDIContainer.js
+++ b/packages/dashmate/src/createDIContainer.js
@@ -92,6 +92,7 @@ const scheduleRenewZeroSslCertificateFactory = require('./helper/scheduleRenewZe
 const registerMasternodeGuideTaskFactory = require('./listr/tasks/setup/regular/registerMasternodeGuideTaskFactory');
 const configureNodeTaskFactory = require('./listr/tasks/setup/regular/configureNodeTaskFactory');
 const configureSSLCertificateTaskFactory = require('./listr/tasks/setup/regular/configureSSLCertificateTaskFactory');
+const createHttpApiServerFactory = require('./helper/api/createHttpApiServerFactory');
 
 async function createDIContainer() {
   const container = createAwilixContainer({
@@ -236,6 +237,7 @@ async function createDIContainer() {
    */
   container.register({
     scheduleRenewZeroSslCertificate: asFunction(scheduleRenewZeroSslCertificateFactory).singleton(),
+    createHttpApiServer: asFunction(createHttpApiServerFactory).singleton(),
   });
 
   return container;
diff --git a/packages/dashmate/src/helper/api/createHttpApiServerFactory.js b/packages/dashmate/src/helper/api/createHttpApiServerFactory.js
new file mode 100644
index 00000000000..2f2db5f01ed
--- /dev/null
+++ b/packages/dashmate/src/helper/api/createHttpApiServerFactory.js
@@ -0,0 +1,38 @@
+const jayson = require('jayson/promise');
+const oclif = require('@oclif/core');
+
+function createHttpApiServerFactory() {
+  /**
+   * @return {HttpServer}
+   */
+  function createHttpApiServer() {
+    const server = new jayson.Server({}, {
+      router(method, params) {
+        const argv = method.split(' ');
+
+        // map arguments to argv
+        if (Array.isArray(params)) {
+          argv.push(...params);
+        } else {
+          for (const [name, value] of Object.entries(params)) {
+            argv.push(`--${name}=${value}`);
+          }
+        }
+
+        return new jayson.Method(async () => {
+          try {
+            return await oclif.run([...argv]);
+          } catch (e) {
+            throw server.error(501, e.message);
+          }
+        });
+      },
+    });
+
+    return server.http();
+  }
+
+  return createHttpApiServer;
+}
+
+module.exports = createHttpApiServerFactory;
diff --git a/packages/dashmate/src/listr/tasks/restartNodeTaskFactory.js b/packages/dashmate/src/listr/tasks/restartNodeTaskFactory.js
index 26586b9c990..0b70b602f72 100644
--- a/packages/dashmate/src/listr/tasks/restartNodeTaskFactory.js
+++ b/packages/dashmate/src/listr/tasks/restartNodeTaskFactory.js
@@ -3,10 +3,10 @@ const { Listr } = require('listr2');
 /**
  * @param {startNodeTask} startNodeTask
  * @param {stopNodeTask} stopNodeTask
- *
+ * @param {buildServicesTask} buildServicesTask
  * @return {restartNodeTask}
  */
-function restartNodeTaskFactory(startNodeTask, stopNodeTask) {
+function restartNodeTaskFactory(startNodeTask, stopNodeTask, buildServicesTask) {
   /**
    * Restart node
    * @typedef {restartNodeTask}
@@ -17,6 +17,14 @@ function restartNodeTaskFactory(startNodeTask, stopNodeTask) {
    */
   function restartNodeTask(config) {
     return new Listr([
+      {
+        enabled: () => config.get('platform.enable') && config.get('platform.sourcePath') !== null,
+        task: (ctx) => {
+          ctx.skipBuildServices = true;
+
+          return buildServicesTask(config);
+        },
+      },
       {
         task: () => stopNodeTask(config),
       },
diff --git a/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js
index 437cda27d52..023affc64cc 100644
--- a/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js
+++ b/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js
@@ -244,6 +244,8 @@ function setupLocalPresetTaskFactory(
                     masternodeRewardSharesDerivedSecondPrivateKey.privateKey
                       .toPublicKey().toString(),
                   );
+
+                  config.set('dashmate.helper.api.port', config.get('dashmate.helper.api.port') + (i * 100));
                 }
               },
               options: {
diff --git a/packages/dashmate/src/printers/printArrayOfObjects.js b/packages/dashmate/src/printers/printArrayOfObjects.js
index 63bd50e10ce..26213d2ce34 100644
--- a/packages/dashmate/src/printers/printArrayOfObjects.js
+++ b/packages/dashmate/src/printers/printArrayOfObjects.js
@@ -36,6 +36,8 @@ function printArrayOfObjects(array, format) {
 
   // eslint-disable-next-line no-console
   console.log(output);
+
+  return output;
 }
 
 module.exports = printArrayOfObjects;
diff --git a/packages/dashmate/src/printers/printObject.js b/packages/dashmate/src/printers/printObject.js
index 05f2a67d2ae..32149006b61 100644
--- a/packages/dashmate/src/printers/printObject.js
+++ b/packages/dashmate/src/printers/printObject.js
@@ -29,6 +29,8 @@ function printObject(object, format) {
 
   // eslint-disable-next-line no-console
   console.log(output);
+
+  return output;
 }
 
 module.exports = printObject;
diff --git a/packages/dashmate/src/status/scopes/platform.js b/packages/dashmate/src/status/scopes/platform.js
index 7ffe430cfef..457a6428424 100644
--- a/packages/dashmate/src/status/scopes/platform.js
+++ b/packages/dashmate/src/status/scopes/platform.js
@@ -72,8 +72,9 @@ function getPlatformScopeFactory(dockerCompose,
         version: null,
         listening: null,
         catchingUp: null,
-        lastBlockHash: null,
-        lastBlockHeight: null,
+        latestBlockHash: null,
+        latestBlockHeight: null,
+        latestBlockTime: null,
         latestAppHash: null,
         peers: null,
         moniker: null,
@@ -109,17 +110,19 @@ function getPlatformScopeFactory(dockerCompose,
         const { version, network, moniker } = tenderdashStatus.node_info;
 
         const catchingUp = tenderdashStatus.sync_info.catching_up;
-        const lastBlockHeight = tenderdashStatus.sync_info.latest_block_height;
-        const lastBlockHash = tenderdashStatus.sync_info.latest_block_hash;
+        const latestBlockHeight = tenderdashStatus.sync_info.latest_block_height;
+        const latestBlockHash = tenderdashStatus.sync_info.latest_block_hash;
         const latestAppHash = tenderdashStatus.sync_info.latest_app_hash;
+        const latestBlockTime = tenderdashStatus.sync_info.latest_block_time;
 
         const platformPeers = parseInt(tenderdashNetInfo.n_peers, 10);
         const { listening } = tenderdashNetInfo;
 
         platform.tenderdash.version = version;
         platform.tenderdash.listening = listening;
-        platform.tenderdash.lastBlockHeight = lastBlockHeight;
-        platform.tenderdash.lastBlockHash = lastBlockHash;
+        platform.tenderdash.latestBlockHeight = latestBlockHeight;
+        platform.tenderdash.latestBlockHash = latestBlockHash;
+        platform.tenderdash.latestBlockTime = latestBlockTime;
         platform.tenderdash.catchingUp = catchingUp;
         platform.tenderdash.peers = platformPeers;
         platform.tenderdash.moniker = moniker;
diff --git a/packages/dashmate/test/unit/status/scopes/overview.spec.js b/packages/dashmate/test/unit/status/scopes/overview.spec.js
index b653c5fccef..6fce7913ff1 100644
--- a/packages/dashmate/test/unit/status/scopes/overview.spec.js
+++ b/packages/dashmate/test/unit/status/scopes/overview.spec.js
@@ -54,8 +54,9 @@ describe('getOverviewScopeFactory', () => {
           serviceStatus: ServiceStatusEnum.up,
           version: null,
           catchingUp: null,
-          lastBlockHeight: null,
+          latestBlockHeight: null,
           latestAppHash: null,
+          latestBlockTime: null,
           peers: null,
           network: null,
         },
diff --git a/packages/dashmate/test/unit/status/scopes/platform.spec.js b/packages/dashmate/test/unit/status/scopes/platform.spec.js
index 43cf6135988..a8ba335abd4 100644
--- a/packages/dashmate/test/unit/status/scopes/platform.spec.js
+++ b/packages/dashmate/test/unit/status/scopes/platform.spec.js
@@ -128,7 +128,8 @@ describe('getPlatformScopeFactory', () => {
       expect(scope.tenderdash.serviceStatus).to.be.equal(ServiceStatusEnum.error);
       expect(scope.tenderdash.version).to.be.equal(null);
       expect(scope.tenderdash.catchingUp).to.be.equal(null);
-      expect(scope.tenderdash.lastBlockHeight).to.be.equal(null);
+      expect(scope.tenderdash.latestBlockHeight).to.be.equal(null);
+      expect(scope.tenderdash.latestBlockTime).to.be.equal(null);
       expect(scope.tenderdash.latestAppHash).to.be.equal(null);
     });
   });
diff --git a/packages/dashpay-contract/package.json b/packages/dashpay-contract/package.json
index eb0d6f712a9..08a0069b117 100644
--- a/packages/dashpay-contract/package.json
+++ b/packages/dashpay-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dashpay-contract",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Reference contract of the DashPay DPA on Dash Evolution",
   "scripts": {
     "lint": "eslint .",
diff --git a/packages/dpns-contract/package.json b/packages/dpns-contract/package.json
index c0d2f79b968..26704ee9cf7 100644
--- a/packages/dpns-contract/package.json
+++ b/packages/dpns-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpns-contract",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "A contract and helper scripts for DPNS DApp",
   "scripts": {
     "lint": "eslint .",
diff --git a/packages/feature-flags-contract/package.json b/packages/feature-flags-contract/package.json
index ea38f9ad1a8..a963f78c32e 100644
--- a/packages/feature-flags-contract/package.json
+++ b/packages/feature-flags-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/feature-flags-contract",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Data Contract to store Dash Platform feature flags",
   "scripts": {
     "build": "",
diff --git a/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js b/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js
index d5ad8c8074d..eedfcbfe284 100644
--- a/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js
+++ b/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js
@@ -30,7 +30,7 @@ class ListDAPIAddressProvider {
     }
 
     // This is a temporary fix for a localhost masternode.
-    // On mac os, internal docker IP is used to register masternode, and it's
+    // On macOS, internal docker IP is used to register masternode, and it's
     // not really possible to bind to that address, so that workaround is introduced.
     const network = networks.get(this.options.network);
     if (network && network.regtestEnabled) {
diff --git a/packages/js-dapi-client/lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.js b/packages/js-dapi-client/lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.js
index cacacaec60f..fa238c87771 100644
--- a/packages/js-dapi-client/lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.js
+++ b/packages/js-dapi-client/lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.js
@@ -19,10 +19,15 @@ class SimplifiedMasternodeListDAPIAddressProvider {
    */
   async getLiveAddress() {
     const sml = await this.smlProvider.getSimplifiedMNList();
-    const validMasternodeList = sml.getValidMasternodesList();
+    const validMasternodeList = sml.getValidMasternodesList()
+      // Keep only HP masternodes
+      .filter((smlEntry) => smlEntry.nType === 1);
 
     const addressesByRegProTxHashes = {};
+    let allowSelfSignedCertificate;
     this.listDAPIAddressProvider.getAllAddresses().forEach((address) => {
+      allowSelfSignedCertificate = address.isSelfSignedCertificateAllowed();
+
       if (!address.getProRegTxHash()) {
         return;
       }
@@ -36,6 +41,8 @@ class SimplifiedMasternodeListDAPIAddressProvider {
       if (!address) {
         address = new DAPIAddress({
           host: smlEntry.getIp(),
+          port: smlEntry.platformHTTPPort,
+          allowSelfSignedCertificate,
           proRegTxHash: smlEntry.proRegTxHash,
         });
       } else {
diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json
index 7338949d80d..cf869981f4e 100644
--- a/packages/js-dapi-client/package.json
+++ b/packages/js-dapi-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
diff --git a/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js b/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js
index f1cad40085e..f130795e44e 100644
--- a/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js
+++ b/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js
@@ -1,6 +1,5 @@
 const SimplifiedMNListEntry = require('@dashevo/dashcore-lib/lib/deterministicmnlist/SimplifiedMNListEntry');
 
-const getMNListDiffsFixture = require('../../../lib/test/fixtures/getMNListDiffsFixture');
 const DAPIAddress = require('../../../lib/dapiAddressProvider/DAPIAddress');
 
 const SimplifiedMasternodeListDAPIAddressProvider = require('../../../lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider');
@@ -14,22 +13,60 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
   let addresses;
 
   beforeEach(function beforeEach() {
-    const [mnListDiffFixture] = getMNListDiffsFixture();
+    const mnListDiffFixture = [{
+      proRegTxHash: 'f5ec54aed788c434da2fc535ea6b125ec6fc54e58bc0a00a005d1a8d5e477a90',
+      confirmedHash: '53125505b0e9d11b371cf3e12c92d164296dfa215fde6201d28ea44bed992187',
+      service: '192.168.65.2:20101',
+      pubKeyOperator: '951a3208ba531ea75aedd2dc0a9efc75f2c4d9492f1ee0a989b593bcd9722b1a101774d80a426552a9f91d24eb55af6e',
+      votingAddress: 'yYH1rgZsgvkmT8bSSSw1cKCjyVPnFpTBCw',
+      isValid: true,
+      nVersion: 2,
+      nType: 1,
+      payoutAddress: 'yZv7wf496sjqJVgnEUAtYKozWQhVpoHRh9',
+      platformHTTPPort: 3200,
+      platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d',
+    }, {
+      proRegTxHash: 'a2c9b34ef525271d84f70a0d4d2c107e8a2f81cd4d8256dc7b3911ed253d5611',
+      confirmedHash: '29ff8afb463604ba7d984b483e92dfefa4e80e12de3acae6d75f9b910df9eab6',
+      service: '192.168.65.2:20201',
+      pubKeyOperator: 'a5ad6d8cad7b233210b718a5fc9ec3cea18aeebe38b2e3122deb581e430aa28875fe7336c283871db42808f8d4107745',
+      votingAddress: 'yRXtaRmQ7LCmT5XcgzQdLwPEf31dycBaeY',
+      isValid: true,
+      nVersion: 2,
+      nType: 1,
+      payoutAddress: 'yiBP17AgHGit2TE9p9FpHEh4ouowNSxMxg',
+      platformHTTPPort: 3200,
+      platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d',
+    }, {
+      proRegTxHash: '1c81a5faa2c0e0d96eb59c58a10fcbc87f431bb6cd880d960b43b269e682d2d2',
+      confirmedHash: '03cc2acc135ab51304d3cff42215c7a8041902fa3f19451d5562a03b38143e8f',
+      service: '192.168.65.2:20001',
+      pubKeyOperator: '96f83eedc8a7b87663e591987f051ce341a6fb88989322c64bbbf56d205e4e77d2cb7d839d8b4106a8a1f5d5cf7cfa57',
+      votingAddress: 'ybJfuKs59MJWkPEnS8qNmtvdisHrCy7Njn',
+      isValid: true,
+      nVersion: 2,
+      nType: 1,
+      payoutAddress: 'yd3AnRA5YRtN1jsv7jqUK8egA6Mk9e8HoS',
+      platformHTTPPort: 3200,
+      platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d',
+    }];
 
     validMasternodeList = [
-      new SimplifiedMNListEntry(mnListDiffFixture.mnList[0]),
-      new SimplifiedMNListEntry(mnListDiffFixture.mnList[1]),
-      new SimplifiedMNListEntry(mnListDiffFixture.mnList[2]),
+      new SimplifiedMNListEntry(mnListDiffFixture[0]),
+      new SimplifiedMNListEntry(mnListDiffFixture[1]),
+      new SimplifiedMNListEntry(mnListDiffFixture[2]),
     ];
 
     addresses = [
       new DAPIAddress({
         host: validMasternodeList[0].getIp(),
         proRegTxHash: validMasternodeList[0].proRegTxHash,
+        port: validMasternodeList[0].platformHTTPPort,
       }),
       new DAPIAddress({
         host: '127.0.0.1',
         proRegTxHash: validMasternodeList[1].proRegTxHash,
+        port: validMasternodeList[1].platformHTTPPort,
       }),
       new DAPIAddress({
         host: '127.0.0.1',
@@ -80,7 +117,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       expect(firstAddress).to.equal(addresses[0]);
       expect(firstAddress.toJSON()).to.deep.equal({
         host: validMasternodeList[0].getIp(),
-        port: DAPIAddress.DEFAULT_PORT,
+        port: validMasternodeList[0].platformHTTPPort,
         proRegTxHash: validMasternodeList[0].proRegTxHash,
         protocol: DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: false,
@@ -90,7 +127,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       expect(secondAddress).to.deep.equal(addresses[1]);
       expect(secondAddress.toJSON()).to.deep.equal({
         host: validMasternodeList[1].getIp(),
-        port: DAPIAddress.DEFAULT_PORT,
+        port: validMasternodeList[1].platformHTTPPort,
         proRegTxHash: validMasternodeList[1].proRegTxHash,
         protocol: DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: false,
@@ -100,7 +137,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       expect(thirdAddress).to.not.equal(addresses[2]);
       expect(thirdAddress.toJSON()).to.deep.equal({
         host: validMasternodeList[2].getIp(),
-        port: DAPIAddress.DEFAULT_PORT,
+        port: validMasternodeList[2].platformHTTPPort,
         proRegTxHash: validMasternodeList[2].proRegTxHash,
         protocol: DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: false,
@@ -116,7 +153,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       smlDAPIAddressProvider = new SimplifiedMasternodeListDAPIAddressProvider(
         smlProviderMock,
         listDAPIAddressProviderMock,
-        [new DAPIAddress(validMasternodeList[1].getIp())],
+        [new DAPIAddress(`${validMasternodeList[1].getIp()}:${validMasternodeList[1].platformHTTPPort}`)],
       );
 
       await smlDAPIAddressProvider.getLiveAddress();
@@ -136,7 +173,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       expect(secondAddress).to.equal(addresses[0]);
       expect(secondAddress.toJSON()).to.deep.equal({
         host: validMasternodeList[0].getIp(),
-        port: DAPIAddress.DEFAULT_PORT,
+        port: validMasternodeList[0].platformHTTPPort,
         proRegTxHash: validMasternodeList[0].proRegTxHash,
         protocol: DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: false,
@@ -146,7 +183,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => {
       expect(thirdAddress).to.not.equal(addresses[2]);
       expect(thirdAddress.toJSON()).to.deep.equal({
         host: validMasternodeList[1].getIp(),
-        port: DAPIAddress.DEFAULT_PORT,
+        port: validMasternodeList[1].platformHTTPPort,
         proRegTxHash: validMasternodeList[1].proRegTxHash,
         protocol: DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: false,
diff --git a/packages/js-dash-sdk/package.json b/packages/js-dash-sdk/package.json
index ef3ba451c93..f8b04fd5b52 100644
--- a/packages/js-dash-sdk/package.json
+++ b/packages/js-dash-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash",
-  "version": "3.24.0-dev.17",
+  "version": "3.24.0-dev.19",
   "description": "Dash library for JavaScript/TypeScript ecosystem (Wallet, DAPI, Primitives, BLS, ...)",
   "main": "build/src/index.js",
   "unpkg": "dist/dash.min.js",
diff --git a/packages/js-dpp/package.json b/packages/js-dpp/package.json
index ab3285372b1..b71a41497ca 100644
--- a/packages/js-dpp/package.json
+++ b/packages/js-dpp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpp",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "scripts": {
     "lint": "eslint .",
diff --git a/packages/js-grpc-common/package.json b/packages/js-grpc-common/package.json
index 3a2e8646ed2..bbf52302ff1 100644
--- a/packages/js-grpc-common/package.json
+++ b/packages/js-grpc-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/grpc-common",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Common GRPC library",
   "main": "index.js",
   "scripts": {
diff --git a/packages/masternode-reward-shares-contract/package.json b/packages/masternode-reward-shares-contract/package.json
index 5038793e762..624ff11c36c 100644
--- a/packages/masternode-reward-shares-contract/package.json
+++ b/packages/masternode-reward-shares-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/masternode-reward-shares-contract",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "A contract and helper scripts for reward sharing",
   "scripts": {
     "lint": "eslint .",
diff --git a/packages/platform-test-suite/package.json b/packages/platform-test-suite/package.json
index 35039a27973..f808b3ec78b 100644
--- a/packages/platform-test-suite/package.json
+++ b/packages/platform-test-suite/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/platform-test-suite",
   "private": true,
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Dash Network end-to-end tests",
   "scripts": {
     "test": "yarn exec bin/test.sh",
diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml
index 8f69a04f78f..60b1c0866ba 100644
--- a/packages/rs-dpp/Cargo.toml
+++ b/packages/rs-dpp/Cargo.toml
@@ -35,7 +35,7 @@ jsonschema = { git = "https://github.com/fominok/jsonschema-rs", branch = "feat-
     "draft202012",
 ] }
 lazy_static = { version = "1.4" }
-log = { version = "0.4" }
+log = { version = "0.4.6" }
 num_enum = "0.5.7"
 bincode = { version = "2.0.0-rc.3", features = ["serde"] }
 rand = { version = "0.8.4", features = ["small_rng"] }
diff --git a/packages/rs-dpp/src/block_time_window/validate_time_in_block_time_window.rs b/packages/rs-dpp/src/block_time_window/validate_time_in_block_time_window.rs
index e49b79288c5..f3270f7e93f 100644
--- a/packages/rs-dpp/src/block_time_window/validate_time_in_block_time_window.rs
+++ b/packages/rs-dpp/src/block_time_window/validate_time_in_block_time_window.rs
@@ -1,4 +1,4 @@
-use crate::prelude::TimestampMillis;
+use crate::{prelude::TimestampMillis, NonConsensusError};
 
 use super::validation_result::TimeWindowValidationResult;
 
@@ -9,17 +9,28 @@ pub fn validate_time_in_block_time_window(
     last_block_header_time_millis: TimestampMillis,
     time_to_check_millis: TimestampMillis,
     average_block_spacing_ms: u64, //in the event of very long blocks we need to add this
-) -> TimeWindowValidationResult {
-    let time_window_start = last_block_header_time_millis - BLOCK_TIME_WINDOW_MILLIS;
-    let time_window_end =
-        last_block_header_time_millis + BLOCK_TIME_WINDOW_MILLIS + average_block_spacing_ms;
+) -> Result<TimeWindowValidationResult, NonConsensusError> {
+    let time_window_start = last_block_header_time_millis
+        .checked_sub(BLOCK_TIME_WINDOW_MILLIS)
+        .ok_or(NonConsensusError::Overflow(
+            "calculation of start window failed",
+        ))?;
+    let time_window_end = last_block_header_time_millis
+        .checked_add(BLOCK_TIME_WINDOW_MILLIS)
+        .ok_or(NonConsensusError::Overflow(
+            "calculation of end window failed: block time window overflow",
+        ))?
+        .checked_add(average_block_spacing_ms)
+        .ok_or(NonConsensusError::Overflow(
+            "calculation of end window failed: average block spacing overflow",
+        ))?;
 
     let valid =
         time_to_check_millis >= time_window_start && time_to_check_millis <= time_window_end;
 
-    TimeWindowValidationResult {
+    Ok(TimeWindowValidationResult {
         time_window_start,
         time_window_end,
         valid,
-    }
+    })
 }
diff --git a/packages/rs-dpp/src/data_contract/data_contract.rs b/packages/rs-dpp/src/data_contract/data_contract.rs
index 80656165350..f9208367ac7 100644
--- a/packages/rs-dpp/src/data_contract/data_contract.rs
+++ b/packages/rs-dpp/src/data_contract/data_contract.rs
@@ -434,10 +434,37 @@ impl DataContract {
         self.document_types.get(document_type_name).is_some()
     }
 
-    pub fn set_document_schema(&mut self, doc_type: String, schema: JsonSchema) {
+    pub fn set_document_schema(
+        &mut self,
+        doc_type: String,
+        schema: JsonSchema,
+    ) -> Result<(), ProtocolError> {
         let binary_properties = get_binary_properties(&schema);
-        self.documents.insert(doc_type.clone(), schema);
-        self.binary_properties.insert(doc_type, binary_properties);
+        self.documents.insert(doc_type.clone(), schema.clone());
+        self.binary_properties
+            .insert(doc_type.clone(), binary_properties);
+
+        let document_type_value = platform_value::Value::from(schema);
+
+        // Make sure the document_type_value is a map
+        let Some(document_type_value_map) = document_type_value.as_map() else {
+            return Err(ProtocolError::DataContractError(DataContractError::InvalidContractStructure(
+                "document type data is not a map as expected",
+            )));
+        };
+
+        let document_type = DocumentType::from_platform_value(
+            self.id,
+            &doc_type,
+            document_type_value_map,
+            &BTreeMap::new(),
+            self.config.documents_keep_history_contract_default,
+            self.config.documents_mutable_contract_default,
+        )?;
+
+        self.document_types.insert(doc_type, document_type);
+
+        Ok(())
     }
 
     pub fn get_document_schema(&self, doc_type: &str) -> Result<&JsonSchema, ProtocolError> {
diff --git a/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/apply_data_contract_update_transition_factory.rs b/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/apply_data_contract_update_transition_factory.rs
index 888954356ea..b3b7d9f5e00 100644
--- a/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/apply_data_contract_update_transition_factory.rs
+++ b/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/apply_data_contract_update_transition_factory.rs
@@ -30,7 +30,7 @@ where
         execution_context: &StateTransitionExecutionContext,
     ) -> Result<()> {
         self.state_repository
-            .store_data_contract(
+            .update_data_contract(
                 state_transition.data_contract.clone(),
                 Some(execution_context),
             )
diff --git a/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/basic/validate_data_contract_update_transition_basic.rs b/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/basic/validate_data_contract_update_transition_basic.rs
index dc3cbbaaf42..f34b9e12d25 100644
--- a/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/basic/validate_data_contract_update_transition_basic.rs
+++ b/packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/basic/validate_data_contract_update_transition_basic.rs
@@ -144,9 +144,16 @@ where
             }
         };
 
-        let new_version = new_data_contract_object.get_integer(contract_property_names::VERSION)?;
+        let new_version: u32 =
+            new_data_contract_object.get_integer(contract_property_names::VERSION)?;
         let old_version = existing_data_contract.version;
-        if new_version < old_version || new_version - old_version != 1 {
+
+        let version_diff = new_version
+            .checked_sub(old_version)
+            .ok_or(ProtocolError::Overflow(
+                "comparing protocol versions failed",
+            ))?;
+        if new_version < old_version || version_diff != 1 {
             validation_result.add_error(BasicError::InvalidDataContractVersionError(
                 InvalidDataContractVersionError::new(old_version + 1, new_version),
             ))
diff --git a/packages/rs-dpp/src/data_trigger/dpns_triggers/mod.rs b/packages/rs-dpp/src/data_trigger/dpns_triggers/mod.rs
index d9fd930eaac..178d9690776 100644
--- a/packages/rs-dpp/src/data_trigger/dpns_triggers/mod.rs
+++ b/packages/rs-dpp/src/data_trigger/dpns_triggers/mod.rs
@@ -77,13 +77,13 @@ where
         .map_err(ProtocolError::ValueError)?;
 
     let mut result = DataTriggerExecutionResult::default();
-    let full_domain_name = normalized_label;
+    let mut full_domain_name = normalized_label.to_string();
 
     if !is_dry_run {
         if full_domain_name.len() > MAX_PRINTABLE_DOMAIN_NAME_LENGTH {
             let err = create_error(
                 context,
-                dt_create,
+                dt_create.base.id,
                 format!(
                     "Full domain name length can not be more than {} characters long but got {}",
                     MAX_PRINTABLE_DOMAIN_NAME_LENGTH,
@@ -96,7 +96,7 @@ where
         if normalized_label != label.to_lowercase() {
             let err = create_error(
                 context,
-                dt_create,
+                dt_create.base.id,
                 "Normalized label doesn't match label".to_string(),
             );
             result.add_error(err.into());
@@ -109,7 +109,7 @@ where
             if id != owner_id {
                 let err = create_error(
                     context,
-                    dt_create,
+                    dt_create.base.id,
                     format!(
                         "ownerId {} doesn't match {} {}",
                         owner_id, PROPERTY_DASH_UNIQUE_IDENTITY_ID, id
@@ -126,7 +126,7 @@ where
             if id != owner_id {
                 let err = create_error(
                     context,
-                    dt_create,
+                    dt_create.base.id,
                     format!(
                         "ownerId {} doesn't match {} {}",
                         owner_id, PROPERTY_DASH_ALIAS_IDENTITY_ID, id
@@ -139,7 +139,7 @@ where
         if normalized_parent_domain_name.is_empty() && context.owner_id != top_level_identity {
             let err = create_error(
                 context,
-                dt_create,
+                dt_create.base.id,
                 "Can't create top level domain for this identity".to_string(),
             );
             result.add_error(err.into())
@@ -147,6 +147,8 @@ where
     }
 
     if !normalized_parent_domain_name.is_empty() {
+        full_domain_name = format!("{full_domain_name}.{normalized_parent_domain_name}");
+
         //? What is the `normalized_parent_name`. Are we sure the content is a valid dot-separated data
         let mut parent_domain_segments = normalized_parent_domain_name.split('.');
         let parent_domain_label = parent_domain_segments.next().unwrap().to_string();
@@ -175,7 +177,7 @@ where
             if documents.is_empty() {
                 let err = create_error(
                     context,
-                    dt_create,
+                    dt_create.base.id,
                     "Parent domain is not present".to_string(),
                 );
                 result.add_error(err.into());
@@ -186,7 +188,7 @@ where
             if rule_allow_subdomains {
                 let err = create_error(
                     context,
-                    dt_create,
+                    dt_create.base.id,
                     "Allowing subdomains registration is forbidden for non top level domains"
                         .to_string(),
                 );
@@ -200,7 +202,7 @@ where
             {
                 let err = create_error(
                     context,
-                    dt_create,
+                    dt_create.base.id,
                     "The subdomain can be created only by the parent domain owner".to_string(),
                 );
                 result.add_error(err.into());
@@ -238,7 +240,7 @@ where
     if preorder_documents.is_empty() {
         let err = create_error(
             context,
-            dt_create,
+            dt_create.base.id,
             "preorderDocument was not found".to_string(),
         );
         result.add_error(err.into())
diff --git a/packages/rs-dpp/src/data_trigger/feature_flags_data_triggers/mod.rs b/packages/rs-dpp/src/data_trigger/feature_flags_data_triggers/mod.rs
index eed45ccf499..65ba4b16cd1 100644
--- a/packages/rs-dpp/src/data_trigger/feature_flags_data_triggers/mod.rs
+++ b/packages/rs-dpp/src/data_trigger/feature_flags_data_triggers/mod.rs
@@ -55,7 +55,7 @@ where
     if enable_at_height < block_height {
         let err = create_error(
             context,
-            dt_create,
+            dt_create.base.id,
             "This identity can't activate selected feature flag".to_string(),
         );
         result.add_error(err.into());
@@ -65,7 +65,7 @@ where
     if context.owner_id != top_level_identity {
         let err = create_error(
             context,
-            dt_create,
+            dt_create.base.id,
             "This Identity can't activate selected feature flag".to_string(),
         );
         result.add_error(err.into());
diff --git a/packages/rs-dpp/src/data_trigger/get_data_triggers_factory.rs b/packages/rs-dpp/src/data_trigger/get_data_triggers_factory.rs
index 87837735cbe..d01fbd163be 100644
--- a/packages/rs-dpp/src/data_trigger/get_data_triggers_factory.rs
+++ b/packages/rs-dpp/src/data_trigger/get_data_triggers_factory.rs
@@ -15,6 +15,12 @@ use crate::{
 
 use super::{DataTrigger, DataTriggerKind};
 
+// TODO: Move to system contract crates
+pub const REWARD_SHARE_DOCUMENT_TYPE: &str = "rewardShare";
+pub const CONTACT_REQUEST_DOCUMENT_TYPE: &str = "contactRequest";
+pub const DOMAIN_DOCUMENT_TYPE: &str = "domain";
+pub const PREORDER_DOCUMENT_TYPE: &str = "preorder";
+
 /// returns Date Triggers filtered out by dataContractId, documentType, transactionAction
 pub fn get_data_triggers<'a>(
     data_contract_id: &'a Identifier,
@@ -58,56 +64,56 @@ pub fn data_triggers() -> Result<Vec<DataTrigger>, ProtocolError> {
     let data_triggers = vec![
         DataTrigger {
             data_contract_id: dpns_data_contract_id,
-            document_type: "domain".to_string(),
+            document_type: DOMAIN_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Create,
             data_trigger_kind: DataTriggerKind::DataTriggerCreateDomain,
             top_level_identity: Some(dpns_owner_id),
         },
         DataTrigger {
             data_contract_id: dpns_data_contract_id,
-            document_type: "domain".to_string(),
+            document_type: DOMAIN_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Replace,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dpns_data_contract_id,
-            document_type: "domain".to_string(),
+            document_type: DOMAIN_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Delete,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dpns_data_contract_id,
-            document_type: "preorder".to_string(),
+            document_type: PREORDER_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Delete,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dpns_data_contract_id,
-            document_type: "preorder".to_string(),
+            document_type: PREORDER_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Delete,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dashpay_data_contract_id,
-            document_type: "contactRequest".to_string(),
+            document_type: CONTACT_REQUEST_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Create,
             data_trigger_kind: DataTriggerKind::CreateDataContractRequest,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dashpay_data_contract_id,
-            document_type: "contactRequest".to_string(),
+            document_type: CONTACT_REQUEST_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Replace,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: dashpay_data_contract_id,
-            document_type: "contactRequest".to_string(),
+            document_type: CONTACT_REQUEST_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Delete,
             data_trigger_kind: DataTriggerKind::DataTriggerReject,
             top_level_identity: None,
@@ -135,14 +141,14 @@ pub fn data_triggers() -> Result<Vec<DataTrigger>, ProtocolError> {
         },
         DataTrigger {
             data_contract_id: master_node_reward_shares_contract_id,
-            document_type: feature_flags_contract::types::UPDATE_CONSENSUS_PARAMS.to_string(),
+            document_type: REWARD_SHARE_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Create,
             data_trigger_kind: DataTriggerKind::DataTriggerRewardShare,
             top_level_identity: None,
         },
         DataTrigger {
             data_contract_id: master_node_reward_shares_contract_id,
-            document_type: "rewardShare".to_string(),
+            document_type: REWARD_SHARE_DOCUMENT_TYPE.to_string(),
             transition_action: Action::Replace,
             data_trigger_kind: DataTriggerKind::DataTriggerRewardShare,
             top_level_identity: None,
diff --git a/packages/rs-dpp/src/data_trigger/mod.rs b/packages/rs-dpp/src/data_trigger/mod.rs
index e7573394ccf..c1abf50f336 100644
--- a/packages/rs-dpp/src/data_trigger/mod.rs
+++ b/packages/rs-dpp/src/data_trigger/mod.rs
@@ -147,11 +147,11 @@ where
 
 fn create_error<SR>(
     context: &DataTriggerExecutionContext<SR>,
-    dt_create: &DocumentCreateTransition,
+    transition_id: Identifier,
     msg: String,
 ) -> DataTriggerError
 where
     SR: StateRepositoryLike,
 {
-    DataTriggerConditionError::new(context.data_contract.id, dt_create.base.id, msg).into()
+    DataTriggerConditionError::new(context.data_contract.id, transition_id, msg).into()
 }
diff --git a/packages/rs-dpp/src/data_trigger/reward_share_data_triggers/mod.rs b/packages/rs-dpp/src/data_trigger/reward_share_data_triggers/mod.rs
index 65df3398e75..f6d205d7cc6 100644
--- a/packages/rs-dpp/src/data_trigger/reward_share_data_triggers/mod.rs
+++ b/packages/rs-dpp/src/data_trigger/reward_share_data_triggers/mod.rs
@@ -32,17 +32,24 @@ where
     let is_dry_run = context.state_transition_execution_context.is_dry_run();
     let owner_id = context.owner_id.to_string(Encoding::Base58);
 
-    let document_create_transition = match document_transition {
-        DocumentTransition::Create(document_create_transition) => document_create_transition,
+    let (transition_data, transition_base) = match document_transition {
+        DocumentTransition::Create(document_create_transition) => (
+            document_create_transition.data.as_ref(),
+            &document_create_transition.base,
+        ),
+        DocumentTransition::Replace(document_replace_transition) => (
+            document_replace_transition.data.as_ref(),
+            &document_replace_transition.base,
+        ),
         _ => bail!(
-            "the Document Transition {} isn't 'CREATE'",
+            "the Document Transition {} isn't 'CREATE or REPLACE'",
             get_from_transition!(document_transition, id)
         ),
     };
-    let properties = document_create_transition.data.as_ref().ok_or_else(|| {
+    let properties = transition_data.ok_or_else(|| {
         anyhow!(
             "data isn't defined in Data Transition '{}'",
-            document_create_transition.base.id
+            transition_base.id
         )
     })?;
 
@@ -50,20 +57,26 @@ where
     let percentage = properties.get_integer(PROPERTY_PERCENTAGE)?;
 
     if !is_dry_run {
-        // Do not allow creating document if ownerId is not in SML
-        let sml_store: SMLStore = context.state_repository.fetch_sml_store().await?;
-
-        let valid_master_nodes_list = sml_store.get_current_sml()?.get_valid_master_nodes();
-
-        let owner_id_in_sml = valid_master_nodes_list.iter().any(|entry| {
-            hex::decode(&entry.pro_reg_tx_hash).expect("invalid hex value")
-                == context.owner_id.to_buffer()
-        });
-
-        if !owner_id_in_sml {
+        let is_valid_master_node = context
+            .state_repository
+            .is_in_the_valid_master_nodes_list(context.owner_id.to_buffer())
+            .await?;
+
+        // TODO: bring it back once the SML store is implemented
+        // // Do not allow creating document if ownerId is not in SML
+        // let sml_store: SMLStore = context.state_repository.fetch_sml_store().await?;
+        //
+        // let valid_master_nodes_list = sml_store.get_current_sml()?.get_valid_master_nodes();
+        //
+        // let owner_id_in_sml = valid_master_nodes_list.iter().any(|entry| {
+        //     hex::decode(&entry.pro_reg_tx_hash).expect("invalid hex value")
+        //         == context.owner_id.to_buffer()
+        // });
+
+        if !is_valid_master_node {
             let err = create_error(
                 context,
-                document_create_transition,
+                transition_base.id,
                 "Only masternode identities can share rewards".to_string(),
             );
             result.add_error(err.into());
@@ -83,19 +96,20 @@ where
     if !is_dry_run && maybe_identity.is_none() {
         let err = create_error(
             context,
-            document_create_transition,
+            transition_base.id,
             format!("Identity '{}' doesn't exist", pay_to_identifier),
         );
-        result.add_error(err.into())
+        result.add_error(err.into());
+        return Ok(result);
     }
 
     let documents_data = context
         .state_repository
         .fetch_documents(
             &context.data_contract.id,
-            &document_create_transition.base.document_type_name,
+            &transition_base.document_type_name,
             platform_value!({
-                "where" : [ [ "$owner_id", "==", owner_id ]]
+                "where" : [ [ "$ownerId", "==", owner_id ]]
             }),
             Some(context.state_transition_execution_context),
         )
@@ -112,7 +126,7 @@ where
     if documents.len() >= MAX_DOCUMENTS {
         let err = create_error(
             context,
-            document_create_transition,
+            transition_base.id,
             format!(
                 "Reward shares cannot contain more than {} identities",
                 MAX_DOCUMENTS
@@ -130,7 +144,7 @@ where
     if total_percent > MAX_PERCENTAGE {
         let err = create_error(
             context,
-            document_create_transition,
+            transition_base.id,
             format!("Percentage can not be more than {}", MAX_PERCENTAGE),
         );
         result.add_error(err.into());
@@ -246,6 +260,7 @@ mod test {
             sml_store,
             data_contract,
             top_level_identifier,
+            identity,
             ..
         } = setup_test();
 
@@ -257,11 +272,11 @@ mod test {
 
         let mut state_repository_mock = MockStateRepositoryLike::new();
         state_repository_mock
-            .expect_fetch_sml_store()
-            .returning(move || Ok(sml_store.clone()));
+            .expect_is_in_the_valid_master_nodes_list()
+            .returning(move |_| Ok(true));
         state_repository_mock
             .expect_fetch_identity()
-            .returning(|_, _| Ok(None));
+            .returning(move |_, _| Ok(Some(identity.clone())));
         state_repository_mock
             .expect_fetch_documents()
             .returning(move |_, _, _, _| Ok(documents.clone()));
@@ -281,7 +296,7 @@ mod test {
             create_masternode_reward_shares_data_trigger(&document_transition, &context, None)
                 .await;
 
-        let percentage_error = get_data_trigger_error(&result, 1);
+        let percentage_error = get_data_trigger_error(&result, 0);
         assert_eq!(
             "Percentage can not be more than 10000",
             percentage_error.to_string()
@@ -300,8 +315,8 @@ mod test {
 
         let mut state_repository_mock = MockStateRepositoryLike::new();
         state_repository_mock
-            .expect_fetch_sml_store()
-            .returning(move || Ok(sml_store.clone()));
+            .expect_is_in_the_valid_master_nodes_list()
+            .returning(move |_| Ok(true));
         state_repository_mock
             .expect_fetch_identity()
             .returning(move |_, _| Ok(None));
@@ -345,8 +360,8 @@ mod test {
 
         let mut state_repository_mock = MockStateRepositoryLike::new();
         state_repository_mock
-            .expect_fetch_sml_store()
-            .returning(move || Ok(sml_store.clone()));
+            .expect_is_in_the_valid_master_nodes_list()
+            .returning(move |_| Ok(false));
         state_repository_mock
             .expect_fetch_identity()
             .returning(move |_, _| Ok(None));
@@ -385,8 +400,8 @@ mod test {
 
         let mut state_repository_mock = MockStateRepositoryLike::new();
         state_repository_mock
-            .expect_fetch_sml_store()
-            .returning(move || Ok(sml_store.clone()));
+            .expect_is_in_the_valid_master_nodes_list()
+            .returning(move |_| Ok(true));
         state_repository_mock
             .expect_fetch_identity()
             .returning(move |_, _| Ok(Some(identity.clone())));
@@ -421,8 +436,8 @@ mod test {
 
         let mut state_repository_mock = MockStateRepositoryLike::new();
         state_repository_mock
-            .expect_fetch_sml_store()
-            .returning(move || Ok(sml_store.clone()));
+            .expect_is_in_the_valid_master_nodes_list()
+            .returning(move |_| Ok(true));
         state_repository_mock
             .expect_fetch_identity()
             .returning(move |_, _| Ok(Some(identity.clone())));
diff --git a/packages/rs-dpp/src/document/document_factory.rs b/packages/rs-dpp/src/document/document_factory.rs
index e13f62fc2ca..c195feb6681 100644
--- a/packages/rs-dpp/src/document/document_factory.rs
+++ b/packages/rs-dpp/src/document/document_factory.rs
@@ -404,6 +404,18 @@ where
             let new_revision = document_revision + 1;
             map.insert(PROPERTY_REVISION.to_string(), Value::U64(new_revision));
 
+            // If document have an originally set `updatedAt`
+            // we should update it then
+            let contains_updated_at = document
+                .document_type()?
+                .required_fields
+                .contains(PROPERTY_UPDATED_AT);
+
+            if contains_updated_at {
+                let now = Utc::now().timestamp_millis() as TimestampMillis;
+                map.insert(PROPERTY_UPDATED_AT.to_string(), Value::U64(now));
+            }
+
             raw_transitions.push(map.into());
         }
         Ok(raw_transitions)
diff --git a/packages/rs-dpp/src/document/state_transition/documents_batch_transition/validation/state/validate_documents_batch_transition_state.rs b/packages/rs-dpp/src/document/state_transition/documents_batch_transition/validation/state/validate_documents_batch_transition_state.rs
index a9990a86401..6001f612bd0 100644
--- a/packages/rs-dpp/src/document/state_transition/documents_batch_transition/validation/state/validate_documents_batch_transition_state.rs
+++ b/packages/rs-dpp/src/document/state_transition/documents_batch_transition/validation/state/validate_documents_batch_transition_state.rs
@@ -21,6 +21,7 @@ use crate::document::state_transition::documents_batch_transition::{
 };
 use crate::document::Document;
 use crate::validation::{AsyncDataValidator, SimpleConsensusValidationResult};
+use crate::NonConsensusError;
 use crate::{
     block_time_window::validate_time_in_block_time_window::validate_time_in_block_time_window,
     consensus::ConsensusError,
@@ -151,7 +152,7 @@ pub async fn validate_document_transitions(
 
     // Data Contract must exist
     let data_contract = state_repository
-        .fetch_data_contract(data_contract_id, None)
+        .fetch_data_contract(data_contract_id, Some(&tmp_execution_context))
         .await?
         .map(TryInto::try_into)
         .transpose()
@@ -260,11 +261,11 @@ fn validate_transition(
             result.merge(validation_result);
 
             let validation_result =
-                check_created_inside_time_window(transition, last_header_block_time_millis);
+                check_created_inside_time_window(transition, last_header_block_time_millis)?;
             result.merge(validation_result);
 
             let validation_result =
-                check_updated_inside_time_window(transition, last_header_block_time_millis);
+                check_updated_inside_time_window(transition, last_header_block_time_millis)?;
             result.merge(validation_result);
 
             let validation_result =
@@ -285,7 +286,7 @@ fn validate_transition(
                 DocumentTransitionAction::ReplaceAction(DocumentReplaceTransitionAction::default()),
             );
             let validation_result =
-                check_updated_inside_time_window(transition, last_header_block_time_millis);
+                check_updated_inside_time_window(transition, last_header_block_time_millis)?;
             result.merge(validation_result);
 
             let validation_result = check_revision(transition, fetched_documents);
@@ -459,15 +460,16 @@ pub fn check_if_timestamps_are_equal(
 pub fn check_created_inside_time_window(
     document_transition: &DocumentTransition,
     last_block_ts_millis: TimestampMillis,
-) -> SimpleConsensusValidationResult {
+) -> Result<SimpleConsensusValidationResult, NonConsensusError> {
     let mut result = SimpleConsensusValidationResult::default();
     let created_at = match document_transition.get_created_at() {
         Some(t) => t,
-        None => return result,
+        None => return Ok(result),
     };
 
     //todo: deal with block spacing
-    let window_validation = validate_time_in_block_time_window(last_block_ts_millis, created_at, 0);
+    let window_validation =
+        validate_time_in_block_time_window(last_block_ts_millis, created_at, 0)?;
     if !window_validation.is_valid() {
         result.add_error(ConsensusError::StateError(
             StateError::DocumentTimestampWindowViolationError(
@@ -481,21 +483,22 @@ pub fn check_created_inside_time_window(
             ),
         ));
     }
-    result
+    Ok(result)
 }
 
 pub fn check_updated_inside_time_window(
     document_transition: &DocumentTransition,
     last_block_ts_millis: TimestampMillis,
-) -> SimpleConsensusValidationResult {
+) -> Result<SimpleConsensusValidationResult, ProtocolError> {
     let mut result = SimpleConsensusValidationResult::default();
     let updated_at = match document_transition.get_updated_at() {
         Some(t) => t,
-        None => return result,
+        None => return Ok(result),
     };
 
     //todo: deal with block spacing
-    let window_validation = validate_time_in_block_time_window(last_block_ts_millis, updated_at, 0);
+    let window_validation =
+        validate_time_in_block_time_window(last_block_ts_millis, updated_at, 0)?;
     if !window_validation.is_valid() {
         result.add_error(ConsensusError::StateError(
             StateError::DocumentTimestampWindowViolationError(
@@ -509,5 +512,5 @@ pub fn check_updated_inside_time_window(
             ),
         ));
     }
-    result
+    Ok(result)
 }
diff --git a/packages/rs-dpp/src/errors/consensus/consensus_error.rs b/packages/rs-dpp/src/errors/consensus/consensus_error.rs
index 784e295bab2..685cfc52ed3 100644
--- a/packages/rs-dpp/src/errors/consensus/consensus_error.rs
+++ b/packages/rs-dpp/src/errors/consensus/consensus_error.rs
@@ -56,8 +56,8 @@ impl ConsensusError {
             .with_variable_int_encoding()
             .with_big_endian();
 
-        bincode::serde::encode_to_vec(self, config).map_err(|_| {
-            ProtocolError::EncodingError(String::from("unable to serialize identity public key"))
+        bincode::serde::encode_to_vec(self, config).map_err(|e| {
+            ProtocolError::EncodingError(format!("unable to serialize consensus error: {e}"))
         })
     }
 
@@ -68,7 +68,7 @@ impl ConsensusError {
             .with_big_endian();
 
         bincode::serde::decode_borrowed_from_slice(bytes, config).map_err(|e| {
-            ProtocolError::EncodingError(format!("unable to deserialize consensus error {}", e))
+            ProtocolError::EncodingError(format!("unable to deserialize consensus error: {e}"))
         })
     }
 }
diff --git a/packages/rs-dpp/src/errors/non_consensus_error.rs b/packages/rs-dpp/src/errors/non_consensus_error.rs
index c1186be059c..db620169b49 100644
--- a/packages/rs-dpp/src/errors/non_consensus_error.rs
+++ b/packages/rs-dpp/src/errors/non_consensus_error.rs
@@ -48,6 +48,10 @@ pub enum NonConsensusError {
 
     #[error(transparent)]
     Error(#[from] anyhow::Error),
+
+    /// Error
+    #[error("overflow error: {0}")]
+    Overflow(&'static str),
 }
 
 pub mod object_names {
diff --git a/packages/rs-dpp/src/identity/credits_converter.rs b/packages/rs-dpp/src/identity/credits_converter.rs
index beb411ed613..98ff23a815e 100644
--- a/packages/rs-dpp/src/identity/credits_converter.rs
+++ b/packages/rs-dpp/src/identity/credits_converter.rs
@@ -1,11 +1,17 @@
+use crate::{state_transition::fee::Credits, ProtocolError};
+
 pub const RATIO: u64 = 1000;
 
-pub fn convert_satoshi_to_credits(amount: u64) -> u64 {
-    amount * RATIO
+pub fn convert_satoshi_to_credits(amount: u64) -> Result<Credits, ProtocolError> {
+    amount.checked_mul(RATIO).ok_or(ProtocolError::Overflow(
+        "converting satoshi to credits failed",
+    ))
 }
 
-pub fn convert_credits_to_satoshi(amount: u64) -> u64 {
-    amount / RATIO
+pub fn convert_credits_to_satoshi(amount: Credits) -> Result<u64, ProtocolError> {
+    amount.checked_div(RATIO).ok_or(ProtocolError::Overflow(
+        "converting credits to satoshi failed",
+    ))
 }
 
 #[cfg(test)]
@@ -15,7 +21,7 @@ mod test {
     #[test]
     fn test_should_convert_satoshi_to_credits() {
         let amount = 42;
-        let converted = convert_satoshi_to_credits(amount);
+        let converted = convert_satoshi_to_credits(amount).unwrap();
 
         assert_eq!(converted, amount * RATIO);
     }
@@ -23,14 +29,14 @@ mod test {
     #[test]
     fn test_should_convert_credits_to_satoshi() {
         let amount = 10000;
-        let converted = convert_credits_to_satoshi(amount);
+        let converted = convert_credits_to_satoshi(amount).unwrap();
         assert_eq!(converted, amount / RATIO);
     }
 
     #[test]
     fn test_convert_to_0_satoshi_if_amount_lower_than_ratio() {
         let amount = RATIO - 1;
-        let converted = convert_credits_to_satoshi(amount);
+        let converted = convert_credits_to_satoshi(amount).unwrap();
         assert_eq!(converted, 0);
     }
 }
diff --git a/packages/rs-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs b/packages/rs-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs
index c4dbde51b3a..d787bb0cf51 100644
--- a/packages/rs-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs
+++ b/packages/rs-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs
@@ -43,7 +43,7 @@ where
             .fetch(state_transition.get_asset_lock_proof(), execution_context)
             .await?;
 
-        let credits_amount = convert_satoshi_to_credits(output.value);
+        let credits_amount = convert_satoshi_to_credits(output.value)?;
 
         let identity = Identity {
             protocol_version: state_transition.get_protocol_version(),
diff --git a/packages/rs-dpp/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs b/packages/rs-dpp/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs
index 23877a71c95..7d9d830ff58 100644
--- a/packages/rs-dpp/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs
+++ b/packages/rs-dpp/src/identity/state_transition/identity_topup_transition/apply_identity_topup_transition.rs
@@ -41,7 +41,7 @@ where
             .fetch(state_transition.get_asset_lock_proof(), execution_context)
             .await?;
 
-        let mut credits_amount = convert_satoshi_to_credits(output.value);
+        let mut credits_amount = convert_satoshi_to_credits(output.value)?;
 
         let out_point = state_transition
             .get_asset_lock_proof()
diff --git a/packages/rs-dpp/src/identity/state_transition/identity_update_transition/identity_update_transition.rs b/packages/rs-dpp/src/identity/state_transition/identity_update_transition/identity_update_transition.rs
index e409c3aabb5..8bf5d44a26c 100644
--- a/packages/rs-dpp/src/identity/state_transition/identity_update_transition/identity_update_transition.rs
+++ b/packages/rs-dpp/src/identity/state_transition/identity_update_transition/identity_update_transition.rs
@@ -347,10 +347,12 @@ impl StateTransitionConvert for IdentityUpdateTransition {
             add_public_keys.push(key.to_raw_object(skip_signature)?);
         }
 
-        value.insert(
-            property_names::ADD_PUBLIC_KEYS.to_owned(),
-            Value::Array(add_public_keys),
-        )?;
+        if !add_public_keys.is_empty() {
+            value.insert_at_end(
+                property_names::ADD_PUBLIC_KEYS.to_owned(),
+                Value::Array(add_public_keys),
+            )?;
+        }
 
         Ok(value)
     }
@@ -389,6 +391,11 @@ impl StateTransitionConvert for IdentityUpdateTransition {
 
         Ok(value)
     }
+
+    // Override to_canonical_cleaned_object to manage add_public_keys individually
+    fn to_canonical_cleaned_object(&self, skip_signature: bool) -> Result<Value, ProtocolError> {
+        self.to_cleaned_object(skip_signature)
+    }
 }
 
 impl StateTransitionLike for IdentityUpdateTransition {
diff --git a/packages/rs-dpp/src/identity/state_transition/identity_update_transition/validate_identity_update_transition_state.rs b/packages/rs-dpp/src/identity/state_transition/identity_update_transition/validate_identity_update_transition_state.rs
index 943ebd76d81..c6bc2408cfe 100644
--- a/packages/rs-dpp/src/identity/state_transition/identity_update_transition/validate_identity_update_transition_state.rs
+++ b/packages/rs-dpp/src/identity/state_transition/identity_update_transition/validate_identity_update_transition_state.rs
@@ -80,7 +80,11 @@ where
         let mut identity = stored_identity.clone();
 
         // Check revision
-        if identity.get_revision() != (state_transition.get_revision() - 1) {
+        if identity.get_revision()
+            != (state_transition.get_revision().checked_sub(1).ok_or(
+                NonConsensusError::Overflow("unable subtract 1 from revision"),
+            )?)
+        {
             validation_result.add_error(StateError::InvalidIdentityRevisionError(
                 InvalidIdentityRevisionError::new(
                     state_transition.get_identity_id().to_owned(),
@@ -134,7 +138,7 @@ where
             )?;
             //todo: add block spacing ms
             let window_validation_result =
-                validate_time_in_block_time_window(last_block_header_time, disabled_at_ms, 0);
+                validate_time_in_block_time_window(last_block_header_time, disabled_at_ms, 0)?;
 
             if !window_validation_result.is_valid() {
                 validation_result.add_error(
diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs
index f48d5e00a80..5b60db9c068 100644
--- a/packages/rs-dpp/src/lib.rs
+++ b/packages/rs-dpp/src/lib.rs
@@ -56,6 +56,7 @@ pub mod prelude {
     pub use crate::document::ExtendedDocument;
     pub use crate::errors::ProtocolError;
     pub use crate::identifier::Identifier;
+    pub use crate::identity::state_transition::asset_lock_proof::AssetLockProof;
     pub use crate::identity::Identity;
     pub use crate::identity::IdentityPublicKey;
     pub use crate::validation::ConsensusValidationResult;
diff --git a/packages/rs-dpp/src/state_repository.rs b/packages/rs-dpp/src/state_repository.rs
index 7dc4c529382..38d5cf0ede6 100644
--- a/packages/rs-dpp/src/state_repository.rs
+++ b/packages/rs-dpp/src/state_repository.rs
@@ -54,6 +54,7 @@ pub trait StateRepositoryLike: Sync {
         execution_context: Option<&'a StateTransitionExecutionContext>,
     ) -> AnyResult<Option<Self::FetchDataContract>>;
 
+    // TODO(wasm-dpp): rename to `create_data_contract`
     /// Store Data Contract
     async fn store_data_contract<'a>(
         &self,
@@ -61,6 +62,12 @@ pub trait StateRepositoryLike: Sync {
         execution_context: Option<&'a StateTransitionExecutionContext>,
     ) -> AnyResult<()>;
 
+    async fn update_data_contract<'a>(
+        &self,
+        data_contract: DataContract,
+        execution_context: Option<&'a StateTransitionExecutionContext>,
+    ) -> AnyResult<()>;
+
     /// Fetch Documents by Data Contract Id and type
     /// By default, the method should return data as bytes (`Vec<u8>`), but the deserialization to [`Document`] should be also possible
     async fn fetch_documents<'a>(
@@ -225,6 +232,12 @@ pub trait StateRepositoryLike: Sync {
     where
         T: for<'de> serde::de::Deserialize<'de> + 'static;
 
+    /// Check if AssetLock Transaction outPoint exists in spent list
+    async fn is_in_the_valid_master_nodes_list(
+        &self,
+        out_point_buffer: [u8; 32],
+    ) -> AnyResult<bool>;
+
     // Get latest (in a queue) withdrawal transaction index
     async fn fetch_latest_withdrawal_transaction_index(&self) -> AnyResult<u64>;
 
diff --git a/packages/rs-dpp/src/state_transition/fee/calculate_operation_fees.rs b/packages/rs-dpp/src/state_transition/fee/calculate_operation_fees.rs
index d6fe927df83..3656777fa8e 100644
--- a/packages/rs-dpp/src/state_transition/fee/calculate_operation_fees.rs
+++ b/packages/rs-dpp/src/state_transition/fee/calculate_operation_fees.rs
@@ -1,16 +1,24 @@
+use crate::NonConsensusError;
+
 use super::{
     operations::{Operation, OperationLike},
-    DummyFeesResult, Refunds,
+    Credits, DummyFeesResult, Refunds,
 };
 
-pub fn calculate_operation_fees(operations: &[Operation]) -> DummyFeesResult {
-    let mut storage_fee = 0;
-    let mut processing_fee = 0;
+pub fn calculate_operation_fees(
+    operations: &[Operation],
+) -> Result<DummyFeesResult, NonConsensusError> {
+    let mut storage_fee: Credits = 0;
+    let mut processing_fee: Credits = 0;
     let mut fee_refunds: Vec<Refunds> = Vec::new();
 
     for operation in operations {
-        storage_fee += operation.get_storage_cost();
-        processing_fee += operation.get_processing_cost();
+        storage_fee = storage_fee
+            .checked_add(operation.get_storage_cost()?)
+            .ok_or(NonConsensusError::Overflow("storage cost is too big"))?;
+        processing_fee = processing_fee
+            .checked_add(operation.get_processing_cost()?)
+            .ok_or(NonConsensusError::Overflow("processing cost is too big"))?;
 
         // Merge refunds
         if let Some(operation_refunds) = operation.get_refunds() {
@@ -30,16 +38,19 @@ pub fn calculate_operation_fees(operations: &[Operation]) -> DummyFeesResult {
                             .credits_per_epoch
                             .entry(epoch_index.to_string())
                             .or_default();
-                        *epoch += credits
+
+                        *epoch = epoch
+                            .checked_add(*credits)
+                            .ok_or(NonConsensusError::Overflow("credits per epoch are too big"))?
                     }
                 }
             }
         }
     }
 
-    DummyFeesResult {
+    Ok(DummyFeesResult {
         storage: storage_fee,
         processing: processing_fee,
         fee_refunds,
-    }
+    })
 }
diff --git a/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_factory.rs b/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_factory.rs
index 3e0945cede7..3f7edfd93f2 100644
--- a/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_factory.rs
+++ b/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_factory.rs
@@ -1,7 +1,10 @@
 use crate::state_transition::state_transition_execution_context::StateTransitionExecutionContext;
-use crate::state_transition::{
-    fee::calculate_state_transition_fee_from_operations_factory::calculate_state_transition_fee_from_operations,
-    StateTransition,
+use crate::{
+    state_transition::{
+        fee::calculate_state_transition_fee_from_operations_factory::calculate_state_transition_fee_from_operations,
+        StateTransition, StateTransitionLike,
+    },
+    NonConsensusError,
 };
 
 use super::FeeResult;
@@ -9,7 +12,7 @@ use super::FeeResult;
 pub fn calculate_state_transition_fee(
     state_transition: &StateTransition,
     execution_context: &StateTransitionExecutionContext,
-) -> FeeResult {
+) -> Result<FeeResult, NonConsensusError> {
     calculate_state_transition_fee_from_operations(
         &execution_context.get_operations(),
         state_transition.get_owner_id(),
diff --git a/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations_factory.rs b/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations_factory.rs
index a5a7adf92f6..59bcae604dd 100644
--- a/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations_factory.rs
+++ b/packages/rs-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations_factory.rs
@@ -1,4 +1,4 @@
-use crate::prelude::Identifier;
+use crate::{prelude::Identifier, NonConsensusError};
 
 use super::{
     calculate_operation_fees::calculate_operation_fees, constants::DEFAULT_USER_TIP,
@@ -8,7 +8,7 @@ use super::{
 pub fn calculate_state_transition_fee_from_operations(
     operations: &[Operation],
     identity_id: &Identifier,
-) -> FeeResult {
+) -> Result<FeeResult, NonConsensusError> {
     calculate_state_transition_fee_from_operations_with_custom_calculator(
         operations,
         identity_id,
@@ -19,9 +19,9 @@ pub fn calculate_state_transition_fee_from_operations(
 fn calculate_state_transition_fee_from_operations_with_custom_calculator(
     operations: &[Operation],
     identity_id: &Identifier,
-    calculate_operation_fees_fn: impl FnOnce(&[Operation]) -> DummyFeesResult,
-) -> FeeResult {
-    let calculated_fees = calculate_operation_fees_fn(operations);
+    calculate_operation_fees_fn: impl FnOnce(&[Operation]) -> Result<DummyFeesResult, NonConsensusError>,
+) -> Result<FeeResult, NonConsensusError> {
+    let calculated_fees = calculate_operation_fees_fn(operations)?;
 
     let storage_fee = calculated_fees.storage;
     let processing_fee = calculated_fees.processing;
@@ -40,28 +40,47 @@ fn calculate_state_transition_fee_from_operations_with_custom_calculator(
             .fold(0, |sum, (_, credits)| sum + credits);
     }
 
-    let required_amount = (storage_fee - total_refunds) + DEFAULT_USER_TIP;
-    let desired_amount = (storage_fee + processing_fee - total_refunds) + DEFAULT_USER_TIP;
+    let required_amount = if storage_fee > total_refunds {
+        (storage_fee - total_refunds) + DEFAULT_USER_TIP
+    } else {
+        0
+    };
+
+    let fee_sum = storage_fee + processing_fee;
+
+    let desired_amount = if fee_sum > total_refunds {
+        (fee_sum - total_refunds) + DEFAULT_USER_TIP
+    } else {
+        0
+    };
 
-    FeeResult {
+    Ok(FeeResult {
         storage_fee,
         processing_fee,
         fee_refunds,
         total_refunds,
         required_amount,
         desired_amount,
-    }
+    })
 }
 
 #[cfg(test)]
 mod test {
+    use dashcore::blockdata::script::Instruction::Op;
+    use platform_value::Identifier;
     use std::collections::HashMap;
 
+    use crate::identity::KeyType::ECDSA_SECP256K1;
+    use crate::state_transition::fee::calculate_operation_fees::calculate_operation_fees;
+    use crate::state_transition::fee::operations::{
+        PreCalculatedOperation, SignatureVerificationOperation,
+    };
     use crate::{
         state_transition::fee::{
             operations::Operation, Credits, DummyFeesResult, FeeResult, Refunds,
         },
         tests::utils::generate_random_identifier_struct,
+        NonConsensusError,
     };
 
     use super::calculate_state_transition_fee_from_operations_with_custom_calculator;
@@ -84,19 +103,20 @@ mod test {
             credits_per_epoch,
         };
 
-        let mock = |_operations: &[Operation]| -> DummyFeesResult {
-            DummyFeesResult {
+        let mock = |_operations: &[Operation]| -> Result<DummyFeesResult, NonConsensusError> {
+            Ok(DummyFeesResult {
                 storage: storage_fee,
                 processing: processing_fee,
                 fee_refunds: vec![refunds.clone()],
-            }
+            })
         };
 
         let result = calculate_state_transition_fee_from_operations_with_custom_calculator(
             &[],
             &identifier,
             mock,
-        );
+        )
+        .expect("result should be returned");
         let expected = FeeResult {
             storage_fee,
             processing_fee,
@@ -107,4 +127,59 @@ mod test {
         };
         assert_eq!(expected, result);
     }
+
+    #[test]
+    fn test_with_negative_credits() {
+        // Set of operations that produced by Document Remove Transition
+        let operations = vec![
+            Operation::PreCalculated(PreCalculatedOperation {
+                storage_cost: 0,
+                processing_cost: 551320,
+                fee_refunds: vec![],
+            }),
+            Operation::SignatureVerification(SignatureVerificationOperation {
+                signature_type: ECDSA_SECP256K1,
+            }),
+            Operation::PreCalculated(PreCalculatedOperation {
+                storage_cost: 0,
+                processing_cost: 551320,
+                fee_refunds: vec![],
+            }),
+            Operation::PreCalculated(PreCalculatedOperation {
+                storage_cost: 0,
+                processing_cost: 191260,
+                fee_refunds: vec![],
+            }),
+            Operation::PreCalculated(PreCalculatedOperation {
+                storage_cost: 0,
+                processing_cost: 16870910,
+                fee_refunds: vec![Refunds {
+                    identifier: Identifier::new([
+                        130, 188, 56, 7, 78, 143, 58, 212, 133, 162, 145, 56, 186, 219, 191, 75,
+                        64, 112, 236, 226, 135, 75, 132, 170, 135, 243, 180, 110, 103, 161, 153,
+                        252,
+                    ]),
+                    credits_per_epoch: [("0".to_string(), 114301030)].iter().cloned().collect(),
+                }],
+            }),
+        ];
+
+        let identifier = Identifier::new([
+            130, 188, 56, 7, 78, 143, 58, 212, 133, 162, 145, 56, 186, 219, 191, 75, 64, 112, 236,
+            226, 135, 75, 132, 170, 135, 243, 180, 110, 103, 161, 153, 252,
+        ]);
+
+        // Panics because of negative credits
+        let result = calculate_state_transition_fee_from_operations_with_custom_calculator(
+            &operations,
+            &identifier,
+            calculate_operation_fees,
+        );
+
+        assert!(matches!(result, Ok(FeeResult {
+            desired_amount,
+            required_amount,
+            ..
+        }) if desired_amount == 0 && required_amount == 0));
+    }
 }
diff --git a/packages/rs-dpp/src/state_transition/fee/operations/mod.rs b/packages/rs-dpp/src/state_transition/fee/operations/mod.rs
index 59430db494a..63a1b8563b4 100644
--- a/packages/rs-dpp/src/state_transition/fee/operations/mod.rs
+++ b/packages/rs-dpp/src/state_transition/fee/operations/mod.rs
@@ -10,6 +10,8 @@ use serde_json::Value;
 mod signature_verification_operation;
 pub use signature_verification_operation::*;
 
+use crate::NonConsensusError;
+
 use super::{Credits, Refunds};
 
 pub const STORAGE_CREDIT_PER_BYTE: i64 = 5000;
@@ -25,9 +27,9 @@ pub enum Operation {
 
 pub trait OperationLike {
     /// Get CPU cost of the operation
-    fn get_processing_cost(&self) -> Credits;
+    fn get_processing_cost(&self) -> Result<Credits, NonConsensusError>;
     /// Get storage cost of the operation
-    fn get_storage_cost(&self) -> Credits;
+    fn get_storage_cost(&self) -> Result<Credits, NonConsensusError>;
 
     /// Get refunds
     fn get_refunds(&self) -> Option<&Vec<Refunds>>;
@@ -44,11 +46,11 @@ macro_rules! call_method {
 }
 
 impl OperationLike for Operation {
-    fn get_processing_cost(&self) -> Credits {
+    fn get_processing_cost(&self) -> Result<Credits, NonConsensusError> {
         call_method!(self, get_processing_cost)
     }
 
-    fn get_storage_cost(&self) -> Credits {
+    fn get_storage_cost(&self) -> Result<Credits, NonConsensusError> {
         call_method!(self, get_storage_cost)
     }
 
diff --git a/packages/rs-dpp/src/state_transition/fee/operations/precalculated_operation.rs b/packages/rs-dpp/src/state_transition/fee/operations/precalculated_operation.rs
index b7cdc272502..227cb47475a 100644
--- a/packages/rs-dpp/src/state_transition/fee/operations/precalculated_operation.rs
+++ b/packages/rs-dpp/src/state_transition/fee/operations/precalculated_operation.rs
@@ -1,6 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use crate::state_transition::fee::{Credits, DummyFeesResult, Refunds};
+use crate::{
+    state_transition::fee::{Credits, DummyFeesResult, Refunds},
+    NonConsensusError,
+};
 
 use super::OperationLike;
 
@@ -35,12 +38,12 @@ impl PreCalculatedOperation {
 }
 
 impl OperationLike for PreCalculatedOperation {
-    fn get_processing_cost(&self) -> Credits {
-        self.processing_cost
+    fn get_processing_cost(&self) -> Result<Credits, NonConsensusError> {
+        Ok(self.processing_cost)
     }
 
-    fn get_storage_cost(&self) -> Credits {
-        self.storage_cost
+    fn get_storage_cost(&self) -> Result<Credits, NonConsensusError> {
+        Ok(self.storage_cost)
     }
 
     fn get_refunds(&self) -> Option<&Vec<Refunds>> {
diff --git a/packages/rs-dpp/src/state_transition/fee/operations/read_operation.rs b/packages/rs-dpp/src/state_transition/fee/operations/read_operation.rs
index 007be2e941e..e50bd2389ad 100644
--- a/packages/rs-dpp/src/state_transition/fee/operations/read_operation.rs
+++ b/packages/rs-dpp/src/state_transition/fee/operations/read_operation.rs
@@ -2,9 +2,12 @@ use serde::{Deserialize, Serialize};
 
 use super::OperationLike;
 
-use crate::state_transition::fee::{
-    constants::{PROCESSING_CREDIT_PER_BYTE, READ_BASE_PROCESSING_COST},
-    Credits, Refunds,
+use crate::{
+    state_transition::fee::{
+        constants::{PROCESSING_CREDIT_PER_BYTE, READ_BASE_PROCESSING_COST},
+        Credits, Refunds,
+    },
+    NonConsensusError,
 };
 
 #[derive(Default, Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
@@ -20,12 +23,23 @@ impl ReadOperation {
 }
 
 impl OperationLike for ReadOperation {
-    fn get_processing_cost(&self) -> Credits {
-        READ_BASE_PROCESSING_COST + (self.value_size * PROCESSING_CREDIT_PER_BYTE)
+    fn get_processing_cost(&self) -> Result<Credits, NonConsensusError> {
+        let value_byte_processing_cost = self
+            .value_size
+            .checked_mul(PROCESSING_CREDIT_PER_BYTE)
+            .ok_or(NonConsensusError::Overflow(
+                "value processing cost is too big",
+            ))?;
+
+        READ_BASE_PROCESSING_COST
+            .checked_add(value_byte_processing_cost)
+            .ok_or(NonConsensusError::Overflow(
+                "can't add read base processing cost",
+            ))
     }
 
-    fn get_storage_cost(&self) -> Credits {
-        0
+    fn get_storage_cost(&self) -> Result<Credits, NonConsensusError> {
+        Ok(0)
     }
 
     fn get_refunds(&self) -> Option<&Vec<Refunds>> {
diff --git a/packages/rs-dpp/src/state_transition/fee/operations/signature_verification_operation.rs b/packages/rs-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
index 59d43afb249..299d6a2564c 100644
--- a/packages/rs-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
+++ b/packages/rs-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
@@ -4,6 +4,7 @@ use super::OperationLike;
 use crate::{
     identity::KeyType,
     state_transition::fee::{constants::signature_verify_cost, Credits, Refunds},
+    NonConsensusError,
 };
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
@@ -19,12 +20,12 @@ impl SignatureVerificationOperation {
 }
 
 impl OperationLike for SignatureVerificationOperation {
-    fn get_processing_cost(&self) -> Credits {
-        signature_verify_cost(self.signature_type)
+    fn get_processing_cost(&self) -> Result<Credits, NonConsensusError> {
+        Ok(signature_verify_cost(self.signature_type))
     }
 
-    fn get_storage_cost(&self) -> Credits {
-        0
+    fn get_storage_cost(&self) -> Result<Credits, NonConsensusError> {
+        Ok(0)
     }
 
     fn get_refunds(&self) -> Option<&Vec<Refunds>> {
diff --git a/packages/rs-dpp/src/state_transition/validation/validate_state_transition_fee.rs b/packages/rs-dpp/src/state_transition/validation/validate_state_transition_fee.rs
index 1081c8b60b7..8081cc88b1f 100644
--- a/packages/rs-dpp/src/state_transition/validation/validate_state_transition_fee.rs
+++ b/packages/rs-dpp/src/state_transition/validation/validate_state_transition_fee.rs
@@ -9,6 +9,7 @@ use crate::state_transition::fee::calculate_state_transition_fee_factory::calcul
 use crate::state_transition::fee::{Credits, FeeResult};
 use crate::state_transition::state_transition_execution_context::StateTransitionExecutionContext;
 use crate::state_transition::StateTransitionType;
+use crate::NonConsensusError;
 use crate::{
     identity::{
         convert_satoshi_to_credits,
@@ -58,11 +59,11 @@ where
         calculate_state_transition_fee_fn: impl Fn(
             &StateTransition,
             &StateTransitionExecutionContext,
-        ) -> FeeResult,
+        ) -> Result<FeeResult, NonConsensusError>,
         execution_context: &StateTransitionExecutionContext,
     ) -> Result<SimpleConsensusValidationResult, ProtocolError> {
         let mut result = SimpleConsensusValidationResult::default();
-        let required_fee = calculate_state_transition_fee_fn(state_transition, execution_context);
+        let required_fee = calculate_state_transition_fee_fn(state_transition, execution_context)?;
 
         let balance = match state_transition {
             StateTransition::IdentityCreate(st) => {
@@ -76,7 +77,7 @@ where
                             st.get_asset_lock_proof()
                         )
                     })?;
-                convert_satoshi_to_credits(output.value)
+                convert_satoshi_to_credits(output.value)?
             }
             StateTransition::IdentityTopUp(st) => {
                 let output = self
@@ -89,7 +90,7 @@ where
                             st.get_asset_lock_proof()
                         )
                     })?;
-                let balance = convert_satoshi_to_credits(output.value);
+                let balance = convert_satoshi_to_credits(output.value)?;
                 let identity_id = st.get_owner_id();
                 let identity_balance: i64 = self
                     .state_repository
@@ -112,9 +113,17 @@ where
                 }
 
                 if identity_balance.is_negative() {
-                    balance - identity_balance.unsigned_abs()
+                    balance.checked_sub(identity_balance.unsigned_abs()).ok_or(
+                        ProtocolError::Overflow(
+                            "can't subtract identity balance from the state transition balance",
+                        ),
+                    )?
                 } else {
-                    balance + identity_balance as Credits
+                    balance.checked_add(identity_balance as Credits).ok_or(
+                        ProtocolError::Overflow(
+                            "can't add identity balance to state transition balance",
+                        ),
+                    )?
                 }
             }
             StateTransition::DataContractCreate(st) => {
@@ -414,9 +423,11 @@ mod test {
         let output_amount = get_output_amount_from_identity_transition!(identity_create_transition);
         let state_repository_mock = MockStateRepositoryLike::new();
         let calculate_state_transition_fee_mock =
-            |_: &StateTransition, _: &StateTransitionExecutionContext| FeeResult {
-                desired_amount: output_amount + 1,
-                ..Default::default()
+            |_: &StateTransition, _: &StateTransitionExecutionContext| {
+                Ok(FeeResult {
+                    desired_amount: output_amount + 1,
+                    ..Default::default()
+                })
             };
 
         let execution_context = StateTransitionExecutionContext::default();
@@ -445,9 +456,11 @@ mod test {
         let output_amount = get_output_amount_from_identity_transition!(identity_create_transition);
         let state_repository_mock = MockStateRepositoryLike::new();
         let calculate_state_transition_fee_mock =
-            |_: &StateTransition, _: &StateTransitionExecutionContext| FeeResult {
-                desired_amount: output_amount,
-                ..Default::default()
+            |_: &StateTransition, _: &StateTransitionExecutionContext| {
+                Ok(FeeResult {
+                    desired_amount: output_amount,
+                    ..Default::default()
+                })
             };
         let execution_context = StateTransitionExecutionContext::default();
 
@@ -475,9 +488,11 @@ mod test {
         let output_amount = get_output_amount_from_identity_transition!(identity_topup_transition);
 
         let calculate_state_transition_fee_mock =
-            |_: &StateTransition, _: &StateTransitionExecutionContext| FeeResult {
-                desired_amount: output_amount + 2,
-                ..Default::default()
+            |_: &StateTransition, _: &StateTransitionExecutionContext| {
+                Ok(FeeResult {
+                    desired_amount: output_amount + 2,
+                    ..Default::default()
+                })
             };
 
         let execution_context = StateTransitionExecutionContext::default();
@@ -510,11 +525,12 @@ mod test {
             IdentityTopUpTransition::new(identity_topup_transition_fixture(None)).unwrap();
         let output_amount = get_output_amount_from_identity_transition!(identity_topup_transition);
 
-        let calculation_mock =
-            |_: &StateTransition, _: &StateTransitionExecutionContext| FeeResult {
+        let calculation_mock = |_: &StateTransition, _: &StateTransitionExecutionContext| {
+            Ok(FeeResult {
                 desired_amount: output_amount - 1,
                 ..Default::default()
-            };
+            })
+        };
 
         let execution_context = StateTransitionExecutionContext::default();
 
diff --git a/packages/rs-dpp/src/tests/payloads/contract/dashpay-contract.json b/packages/rs-dpp/src/tests/payloads/contract/dashpay-contract.json
index d6459d7e807..48a48db48c2 100644
--- a/packages/rs-dpp/src/tests/payloads/contract/dashpay-contract.json
+++ b/packages/rs-dpp/src/tests/payloads/contract/dashpay-contract.json
@@ -192,4 +192,4 @@
             "additionalProperties": false
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/rs-drive-abci/src/execution/data_trigger/reward_share_data_triggers/mod.rs b/packages/rs-drive-abci/src/execution/data_trigger/reward_share_data_triggers/mod.rs
index 0186a879ddb..ced0caa9569 100644
--- a/packages/rs-drive-abci/src/execution/data_trigger/reward_share_data_triggers/mod.rs
+++ b/packages/rs-drive-abci/src/execution/data_trigger/reward_share_data_triggers/mod.rs
@@ -220,7 +220,7 @@ mod test {
             state: DMNState {
                 service: SocketAddr::from_str("1.2.3.4:1234").unwrap(),
                 registered_height: 0,
-                pose_revived_height: 0,
+                pose_revived_height: None,
                 pose_ban_height: None,
                 revocation_reason: 0,
                 owner_address: [1;20],
@@ -251,7 +251,7 @@ mod test {
             state: DMNState {
                 service: SocketAddr::from_str("1.2.3.5:1234").unwrap(),
                 registered_height: 0,
-                pose_revived_height: 0,
+                pose_revived_height: None,
                 pose_ban_height: None,
                 revocation_reason: 0,
                 owner_address: [1;20],
diff --git a/packages/rs-drive-abci/src/identity_credit_withdrawal/mod.rs b/packages/rs-drive-abci/src/identity_credit_withdrawal/mod.rs
index 4fa4a2432bf..fc59b63a5a4 100644
--- a/packages/rs-drive-abci/src/identity_credit_withdrawal/mod.rs
+++ b/packages/rs-drive-abci/src/identity_credit_withdrawal/mod.rs
@@ -504,7 +504,7 @@ where
             let output_script: Script = Script(output_script_bytes.into());
 
             let tx_out = TxOut {
-                value: convert_credits_to_satoshi(amount),
+                value: convert_credits_to_satoshi(amount)?,
                 script_pubkey: output_script,
             };
 
diff --git a/packages/rs-drive-abci/src/validation/state_transition/document_state_validation/validate_documents_batch_transition_state.rs b/packages/rs-drive-abci/src/validation/state_transition/document_state_validation/validate_documents_batch_transition_state.rs
index 9d52166bde0..750dece4bc2 100644
--- a/packages/rs-drive-abci/src/validation/state_transition/document_state_validation/validate_documents_batch_transition_state.rs
+++ b/packages/rs-drive-abci/src/validation/state_transition/document_state_validation/validate_documents_batch_transition_state.rs
@@ -39,6 +39,7 @@ use dpp::{
         StateTransitionIdentitySigned,
     },
     validation::ConsensusValidationResult,
+    NonConsensusError, ProtocolError,
 };
 use drive::grovedb::TransactionArg;
 
@@ -279,7 +280,7 @@ fn validate_transition(
                     transition,
                     latest_block_time_ms,
                     average_block_spacing_ms,
-                );
+                )?;
                 result.merge(validation_result);
 
                 if !result.is_valid() {
@@ -289,7 +290,7 @@ fn validate_transition(
                     transition,
                     latest_block_time_ms,
                     average_block_spacing_ms,
-                );
+                )?;
                 result.merge(validation_result);
 
                 if !result.is_valid() {
@@ -335,7 +336,7 @@ fn validate_transition(
                     transition,
                     latest_block_time_ms,
                     average_block_spacing_ms,
-                );
+                )?;
                 result.merge(validation_result);
 
                 if !result.is_valid() {
@@ -537,18 +538,19 @@ pub fn check_created_inside_time_window(
     document_transition: &DocumentTransition,
     last_block_ts_millis: TimestampMillis,
     average_block_spacing_ms: u64,
-) -> SimpleConsensusValidationResult {
+) -> Result<SimpleConsensusValidationResult, Error> {
     let mut result = SimpleConsensusValidationResult::default();
     let created_at = match document_transition.get_created_at() {
         Some(t) => t,
-        None => return result,
+        None => return Ok(result),
     };
 
     let window_validation = validate_time_in_block_time_window(
         last_block_ts_millis,
         created_at,
         average_block_spacing_ms,
-    );
+    )
+    .map_err(|e| Error::Protocol(ProtocolError::NonConsensusError(e)))?;
     if !window_validation.is_valid() {
         result.add_error(ConsensusError::StateError(
             StateError::DocumentTimestampWindowViolationError(
@@ -562,25 +564,26 @@ pub fn check_created_inside_time_window(
             ),
         ));
     }
-    result
+    Ok(result)
 }
 
 pub fn check_updated_inside_time_window(
     document_transition: &DocumentTransition,
     last_block_ts_millis: TimestampMillis,
     average_block_spacing_ms: u64,
-) -> SimpleConsensusValidationResult {
+) -> Result<SimpleConsensusValidationResult, Error> {
     let mut result = SimpleConsensusValidationResult::default();
     let updated_at = match document_transition.get_updated_at() {
         Some(t) => t,
-        None => return result,
+        None => return Ok(result),
     };
 
     let window_validation = validate_time_in_block_time_window(
         last_block_ts_millis,
         updated_at,
         average_block_spacing_ms,
-    );
+    )
+    .map_err(|e| Error::Protocol(ProtocolError::NonConsensusError(e)))?;
     if !window_validation.is_valid() {
         result.add_error(ConsensusError::StateError(
             StateError::DocumentTimestampWindowViolationError(
@@ -594,5 +597,5 @@ pub fn check_updated_inside_time_window(
             ),
         ));
     }
-    result
+    Ok(result)
 }
diff --git a/packages/rs-drive-abci/src/validation/state_transition/identity_update.rs b/packages/rs-drive-abci/src/validation/state_transition/identity_update.rs
index be90ac20220..266be8bc6ee 100644
--- a/packages/rs-drive-abci/src/validation/state_transition/identity_update.rs
+++ b/packages/rs-drive-abci/src/validation/state_transition/identity_update.rs
@@ -1,5 +1,5 @@
 use dpp::identity::PartialIdentity;
-use dpp::{identity::state_transition::identity_update_transition::identity_update_transition::IdentityUpdateTransition, state_transition::StateTransitionAction, validation::{ConsensusValidationResult, SimpleConsensusValidationResult}};
+use dpp::{identity::state_transition::identity_update_transition::identity_update_transition::IdentityUpdateTransition, ProtocolError, state_transition::StateTransitionAction, validation::{ConsensusValidationResult, SimpleConsensusValidationResult}};
 use dpp::block_time_window::validate_time_in_block_time_window::validate_time_in_block_time_window;
 use dpp::consensus::state::identity::identity_public_key_disabled_at_window_violation_error::IdentityPublicKeyDisabledAtWindowViolationError;
 use dpp::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError;
@@ -163,7 +163,8 @@ impl StateTransitionValidation for IdentityUpdateTransition {
                     last_block_time,
                     disabled_at_ms,
                     platform.config.block_spacing_ms,
-                );
+                )
+                .map_err(|e| Error::Protocol(ProtocolError::NonConsensusError(e)))?;
 
                 if !window_validation_result.is_valid() {
                     validation_result.add_error(
diff --git a/packages/rs-drive-verify-c-binding/.gitignore b/packages/rs-drive-verify-c-binding/.gitignore
new file mode 100644
index 00000000000..178ab4f911c
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/.gitignore
@@ -0,0 +1,3 @@
+/target
+/Cargo.lock
+a
\ No newline at end of file
diff --git a/packages/rs-drive-verify-c-binding/Cargo.toml b/packages/rs-drive-verify-c-binding/Cargo.toml
new file mode 100644
index 00000000000..7736140b4b0
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "rs-drive-verify-c-binding"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "drive"
+crate-type = ["staticlib"]
+
+[build-dependencies]
+cbindgen = "0.24.3"
+
+[dependencies]
+hex = "0.4.3"
+
+[dependencies.drive]
+path = "../rs-drive"
+features = ["verify"]
+default-features = false
diff --git a/packages/rs-drive-verify-c-binding/build.rs b/packages/rs-drive-verify-c-binding/build.rs
new file mode 100644
index 00000000000..1d94716d7fc
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/build.rs
@@ -0,0 +1,10 @@
+use std::env;
+
+fn main() {
+    let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let mut config: cbindgen::Config = Default::default();
+    config.language = cbindgen::Language::C;
+    cbindgen::generate_with_config(crate_dir, config)
+        .unwrap()
+        .write_to_file("target/drive.h");
+}
diff --git a/packages/rs-drive-verify-c-binding/c/main.c b/packages/rs-drive-verify-c-binding/c/main.c
new file mode 100644
index 00000000000..a374f303c12
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/c/main.c
@@ -0,0 +1,265 @@
+#include <stdio.h>
+#include <assert.h>
+#include "../target/drive.h"
+#include "./utils.c"
+
+void test_verify_full_identity_by_public_key_hash() {
+    char *proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b100401180018020114aee302720896bba837dcf3f2d674f546fd25496f00ca359aa1b2032e3158ae5e5c489f7d46722f29644a15e1cf7c3935b30606def61104012000240201203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200a0d5a4f6418663468515cd75189be3e1034bbfa9a1807eb81d964ba7442a0b1e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d0401203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2fd1cb12a5b2614000000fbbd3be097e7f07d5619dd69e7767884d116f95ae9a5fcdb651e71727902cc1e10011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e311110201187f03144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1110101204d04203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab3901203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a20000110201604f04203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a02";
+    char *pub_key_hex = "4463a1a994d5040e69c090b6985d7af295bfd11a";
+
+    unsigned char *proof_bin = hex2bin(proof_hex);
+    unsigned char *pub_key_bin = hex2bin(pub_key_hex);
+
+    IdentityVerificationResult *result = verify_full_identity_by_public_key_hash(proof_bin, 1038, pub_key_bin);
+    assert(result->is_valid);
+
+    uint8_t expected_root_hash[32] = {72,72,215,200,156,21,128,156,166,182,110,57,113,232,229,242,193,199,240,135,222,102,246,165,181,68,81,221,120,195,236,199};
+    assert(is_array_equal(result->root_hash, expected_root_hash,32));
+
+    assert(result->has_identity);
+
+    Identity *identity = result->identity;
+    assert(identity->protocol_version == 1);
+
+    uint8_t id[32] = {62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162};
+    assert(is_array_equal(*identity->id, id, 32));
+
+    // Confirm identity has 3 public keys
+    assert(identity->public_keys_count == 3);
+
+    // Assert on the first public key
+    assert(identity->public_keys[0]->key == 0);
+    IdentityPublicKey *first = identity->public_keys[0]->public_key;
+    assert(first->id == 0);
+    assert(first->purpose == 0);
+    assert(first->security_level == 1);
+    assert(first->key_type == 2);
+    assert(first->read_only == false);
+    assert(first->has_disabled_at == false);
+    uint8_t first_public_key[20] = {68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122, 242, 149, 191, 209, 26};
+    assert(is_array_equal(first->data, first_public_key, first->data_length));
+
+    // Assert on the second public key
+    assert(identity->public_keys[1]->key == 1);
+    IdentityPublicKey *second = identity->public_keys[1]->public_key;
+    assert(second->id == 1);
+    assert(second->purpose == 0);
+    assert(second->security_level == 2);
+    assert(second->key_type == 1);
+    assert(second->read_only == false);
+    assert(second->has_disabled_at == false);
+    unsigned char second_public_key[50] = {151, 57, 136, 178, 145, 253, 27, 202, 134, 217, 6, 114, 62, 51, 91, 223, 19, 211, 235, 186, 223, 234, 49, 221, 22, 75, 60, 103, 44, 22, 218, 114, 175, 142, 110, 223, 192, 186, 196, 75, 146, 184, 197, 54, 215, 8, 220, 51};
+    assert(is_array_equal(second->data,second_public_key, second->data_length));
+
+    // Assert on the third public key
+    assert(identity->public_keys[0]->key == 0);
+    IdentityPublicKey *third = identity->public_keys[2]->public_key;
+    assert(third->id == 2);
+    assert(third->purpose == 0);
+    assert(third->security_level == 3);
+    assert(third->key_type == 0);
+    assert(third->read_only == false);
+    assert(third->has_disabled_at == false);
+    unsigned char third_public_key[33] = {3, 96, 218, 121, 197, 137, 149, 228, 236, 136, 81, 42, 249, 164, 68, 12, 164, 242, 215, 191, 232, 66, 64, 225, 126, 255, 196, 221, 140, 233, 64, 51, 162};
+    assert(is_array_equal(third->data,third_public_key, third->data_length));
+
+    assert(identity->balance == 11077485418638);
+    assert(identity->revision == 16);
+    assert(!identity->has_metadata);
+    assert(!identity->has_asset_lock_proof);
+
+}
+
+void test_verify_full_identities_by_public_key_hashes() {
+    char *multiple_identity_proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b1004011800180201145e0e49d808ad21d01d07dd799a75bd1b472788a7008c10aa4c1d19e2e7e42fe0b1a7f6d93d4c0b6992ef63ea985c16447cada4629511040120002402012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000ba56cfb1d87ef47857f6b1cd7fb918406fd50f81966619777dd4c1b595a1a26e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d04012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30fdbafd6833aeb700000012b27f4a0a7cfd06e3387b33a5bca6682953512e21621ae9cf6d633d9041771910011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e31111020118b3080132c9d35844d5ce2a8e0f377cee23c143a53396073dea86c494b86ba4c4af0b3903141f0815269afc012de44260ceb28a4496d3184184002300200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb00100168576e24521e03ba4b624912bb07833767c81102310b87d8ea1caf2795c68f921102e8b7eb376f0f7993badf93971f690be8a48f09db0711f052a2ed48471497b9d01003144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a20002254bf0a990beb721c21f21e8dbab50e33cd9cf09618fc27c9f7450c673516aee1001c6adfe081809218ee07461f95f53ce6ce462ec379f97a71f1be40f7218cb50af111103145e0e49d808ad21d01d07dd799a75bd1b472788a70023002035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30001001a4b31998d47c30e390f4fa56f28f19c62f114f17a704d29c56e28b6fdb47f101031467892af390cd2b7653a918c7b692c85b87b44d3200230020399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80001001eb4da977338a3da4204eaaac0c8856bdfd51d9b25ceef04b40bb38eff79ab11011021f22102429dbe1bc0ca714847b08187d9a874cc43329aaa79647fb9aa0834d691003149a061f31734c5f5f0b119ab72d433c9af133d3a600230020e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330002644c601e67692188cf5a975c2207caba899d99f1bbd4b62e5fe856850b9d7286100314a54921bb29b67e31898efebc29f241b1aefa4dca002300207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e510010029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d0314b3bfce478de96fe30cd3713bf88ce7728687da8a00230020a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40001111110314bb3df025e32fd90d1feee7dca4b83321c683292d0023002003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3001001ee0847805b145b5fb500b139fe12767ee681fc310a21d6e9814619df5187470802a0de352fe6767da7bf4c33ba7d2da8db0440457835d3c2992473210e02b6312c1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1029a563c983d202520c1a94f4c6ba99750373450aaf9dcb2a62ef50e9877646043100314ed738aaadd75d1677fefeccadd033f126cfee76a0023002097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000314fbd9daa5993de56a2e4346b7c72ff5585efffaab002300201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb0010111111110101208b06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d300090201010201030000006c4bfcf223cd4fe5c1cac82e1a9e2c73eb0e7f34cebabdd7630e24cb192f975804200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000902010102010300000080da62acb8c49f901d6bf84a2a2af15431e69e29069abf8d02f2c113c6099ba61004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000902010102010300000051a23049efbcde3a0e9c85ea7af05a28d4de31f90ae44a07c5fa18090128237011042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000090201010201030000002a390761b997897afe51540c39dfeb5c78d00781a547d2b83b1e72259894dea5100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f800009020101020103000000b3f28f9cc26df90ea49e13e3cd97c01d772e9d6609453e91d4369ef78e3880a004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab391004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e5100090201010201030000001d64a3f9270bf8b8104305ba76829472f3aac2b6fff20b98ac10361ec5473fbb11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef0009020101020103000000adb76570d64f89650686df5819414e5e42cf7eedab24605aa63c4b8e26e90eda100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be400009020101020103000000a5a8530416d9462521b6fd932723d8971684b4620e4254caf09c75289e0e64700420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330009020101020103000000fa1d907f967c48292a5af3d4c3aad435c2ee9237119614d612aee3b4f52e3614111111012003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d37f030100000b0008000000000000003d000401010005020101010072cc451270c61384d358f7d41135b78788011830301a697b97a3714c203a36dc100214105bdf191491b67249d321f3d9bebdf82c9a3395fef336c60b3701af0593e7100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b000002030014bb3df025e32fd90d1feee7dca4b83321c683292d0000030101003a0037010001010030a5fd02c96d5f60eb54b15b043a84ed80a0af804eff4a2bfea1fc9fed323232c7ab12072368097e556439d08aa0a6866c000010030102003a003702000001003085ff00e6339367d3e31e27cbc33c13c3cd0c6e973a5b902e76668d7a6daf83c129257cc7f9cc35e1c0689a6df03a891d00001101200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb7f030100000b000800000000000000030004010100050201010100783a62676dbffd012f9343ef0af71c1b800cda19801689dfb7e2372cccc3ed9d10027f0e94e54c63ffdcd3d3d9017a63e82f9984ade5c4faa59d2479c11007932524100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df1102010178030100002b002800000200002103fe65fcdcfe242dc2e43d654274ec9ce1bbbc9dd5a1c88945eeef18cc93151f7f0000030101001e001b010001030014c94f46cf38b83862990f782c84acbc178d7b02da000010030102001e001b02000203001426d387d9884862f96160dd59ca596bdce82da74600001101201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb7f030100000b000800000000000000600004010100050201010100ca3a10eab3b889465bba51bc5354131aee1044e510d9ed4a7068d1181c7dbfcd10029626ec2b4e8861c675b20bc4456333d8c41fd0c0b9c9f0b78047c6634ebab8ef100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100001e001b000003020014fbd9daa5993de56a2e4346b7c72ff5585efffaab0000030101002b002801000300002103fdc9403eb6f005db700e7841627f4f92e7c65d167384cd57a4f4e46583c21afe000010030102002b002802000000002103703446f77c8db1fbac6f3422c8e045098adb662c0b620a15b8c4d9ecd2a3defa000011012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c307f030100000b000800000000000000420004010100050201010100d7f397a816f23f32e9a6cd2ab5b03d5b6d30742cf0b58517f276d9f75c1c4d611002bfd5686ae0d2a7684c2f6ed3a7419a436a5389afc9a84a1bb22a1decdfa7625d100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b0000020300145e0e49d808ad21d01d07dd799a75bd1b472788a70000030101003a003701000001003097c8d8102d216818c693dc46614ce9242b8e54e05a8ff1f520a3694b9481091d92906b13b9b2762b127ee4f07e91119e000010030102003a00370200030100308949c96dda849268044e176dbdba458fb5deac81e9918793bdb837f5afee0c2496a5930d46d1fe37ce536cbef8e95bb40000110120399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f807f030100000b0008000000000000000c0004010100050201010100a9403aa408af35d267980dfff1706d70a59b6dba867d0b568ca8c5b77560d67a100276cbfe822d7b9f6863f9a06b668097458e123ff385e31c29d830d03f1148973a100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100003a0037000000010030b79d4caa865f84207124c3d304430372f39d7c18a237df3a71e3c4fb7ba9ab9816439a809beb8606c3bb52d53a5364590000030101001e001b0100030200146406a5082b231340726d4cd0de2452bc73a33003000010030102001e001b0200010300144ac7b42f524e1d1b22098f85adfca752600ef9a000001101203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a200001101207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e517f030100000b000800000000000000580004010100050201010100d95ff983db933edc675487a6f4e388fcf2db59313aeab5f45991a7f2471774471002355f98c38fd87ca5775e5e451243eb11300ed91fc950ea204c0a74b9a1991a25100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100003a0037000003010030b3423844bae8a591bbfb437b55566b5d61e54ee64f93351b0a3b9d4b731445d25ce367f7aedfcb32bd3cd14308a54cf50000030101003a0037010001010030a154c19082ac6b5fec72b81f6488550fec7149d52f66b4463915a61179c4f1f8507d366614b454dabf2c942235caad01000010030102001e001b0200030300140a8c14745c982f9fdc43aa985c02b1e5bff6c403000011012097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef7f030100000b000800000000000000620004010100050201010100412c1e7de2394dcd009223eb8c3a24e34b93a7c48df0bb86499160a31ea9dbdb1002180590eec33397034675f379cf17f62c0e77d17724a03238dcd3f216a4bc9509100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100003a0037000002010030afa4370aa5a48ab2f3ab510ccaba3b6d8cf51752304507e6a341c4e4ff6aa7c07610a503b42f479834b032d25dd160590000030101002b002801000300002103a9584c4580d165d2744ba49a70472653915bfdbec4bef471e26ce4c1c9e6c6ab000010030102001e001b02000102001445d04558a26b8ca04b486957c8abf5abf24ec76f0000110120a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be407f030100000b0008000000000000005d0004010100050201010100f140186a6bd413a50814db484b00398c2e7e6da9fbe2cb536728e880deb7506010027767f75fded47f94a6f81c671d448beddb6c2727f1f209ba015bf8de7331c13c100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100002b002800000000002102eebd2f91818a234e1879f8a55652f1e52419ad168b8f27b91be6b79958f7a5510000030101002b00280100020000210214a91dfcb36718209a5ee79c290029b849f1ce2feef6585a3b3fa37d04fb62b7000010030102001e001b0200030200144ee490084160fc8b1e73361d5a4c055beee77d8c0000110120e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4337f030100000b0008000000000000004f0004010100050201010100eb90b3c6d9a547e3b8a1111f621e0dbe5bfc68a8196371d497cb2912fa809d001002ab80ce7b6ca4875dbc7dc1f0d902551628c97b2383c27d04538d46a97d3cad43100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100001e001b0000020300149a061f31734c5f5f0b119ab72d433c9af133d3a60000030101003a003701000101003096e1fc631934a14acd313ff28ca29c9e9b43181b8df29386702b1a2d65a7cc823683f5733e296fb40c73648bc9cbf625000010030102001e001b02000102001474f185aa527f31202442d208cdb2905fa71403290000110201609f06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3000b03fda4d93a40301700000095840c6be056ed3d199dedf5265a5d3dafd195aa4cb54ca26943f7e092a5f06904200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000b03fd62132d410718000000b9dec92595e5eabb6de045782827bd98b60b9252287eec0f8e3450ea7c59619b1004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000b03fd8e29761d5405000000380d1a8cb3511b3ecf770a1d81f40c293182d29cf0574962db50c4cfb626fdb711042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30000b03fd62b9bfe135190000002eefa752386580c31084b54f2119973ccef6ac92fc38607e8609e896c9994c3e100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80000b03fdd0a1b7eee2140000002271b648a8925b8c717543453a59a3a20a3c52ce9b3e5fc793983c64f9f6fea004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a021004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e51000b03fd586ba25d1f1a0000005e3b38a6d9bede250ed0b612d01915a78182ee18d819d07d43ae925728b42d2d11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000b03fd120b51f4ea10000000be380b13cfd7149332e5ac818ae84d31e4be119bc0ebd717475630f6f38b6e90100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40000b03fd505d6c926f0d0000009500204c698cc12fc96774a34f77415c37376ff17b492838e414d774b5b7bec10420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae433000b03fd1e078984690800000064d995f4b5b62c480a04f1b8fb4c7a30b607f12da4abc357993ee7505be19b26111111";
+    char *pub_key_hash_one_hex = "1f0815269afc012de44260ceb28a4496d3184184";
+    char *pub_key_hash_two_hex = "4463a1a994d5040e69c090b6985d7af295bfd11a";
+    char *pub_key_hash_three_hex = "5e0e49d808ad21d01d07dd799a75bd1b472788a7";
+
+    unsigned char *multiple_identity_proof_bin = hex2bin(multiple_identity_proof_hex);
+    unsigned char *pub_key_hashes[3] = {
+            hex2bin(pub_key_hash_one_hex),
+            hex2bin(pub_key_hash_two_hex),
+            hex2bin(pub_key_hash_three_hex),
+    };
+    MultipleIdentityVerificationResult *multi_iden_result = verify_full_identities_by_public_key_hashes(multiple_identity_proof_bin, 6206, pub_key_hashes, 3);
+    assert(multi_iden_result->is_valid);
+
+    uint8_t expected_root_hash[32] = {202, 84, 121, 98, 165, 168, 181, 237, 228, 130, 249, 5, 45, 10, 35, 77, 17, 60, 42, 121, 141, 6, 90, 21, 12, 231, 68, 33, 156, 219, 114, 132};
+    assert(is_array_equal(expected_root_hash, *multi_iden_result->root_hash, 32));
+
+    assert(multi_iden_result->map_size == 3);
+
+    uint8_t iden_one_pk_hash[20] = {  31,
+                                      8,
+                                      21,
+                                      38,
+                                      154,
+                                      252,
+                                      1,
+                                      45,
+                                      228,
+                                      66,
+                                      96,
+                                      206,
+                                      178,
+                                      138,
+                                      68,
+                                      150,
+                                      211,
+                                      24,
+                                      65,
+                                      132};
+    assert(is_array_equal(iden_one_pk_hash, multi_iden_result-> public_key_hash_identity_map[0]->public_key_hash, multi_iden_result->public_key_hash_identity_map[0]->public_key_hash_length));
+    assert(multi_iden_result->public_key_hash_identity_map[0]->has_identity);
+
+    uint8_t iden_two_pk_hash[20] = {   68,
+                                       99,
+                                       161,
+                                       169,
+                                       148,
+                                       213,
+                                       4,
+                                       14,
+                                       105,
+                                       192,
+                                       144,
+                                       182,
+                                       152,
+                                       93,
+                                       122,
+                                       242,
+                                       149,
+                                       191,
+                                       209,
+                                       26};
+    assert(is_array_equal(iden_two_pk_hash, multi_iden_result-> public_key_hash_identity_map[1]->public_key_hash, multi_iden_result->public_key_hash_identity_map[1]->public_key_hash_length));
+    assert(multi_iden_result->public_key_hash_identity_map[1]->has_identity);
+
+    uint8_t iden_three_pk_hash[20] = {   94,
+                                       14,
+                                       73,
+                                       216, 8,
+                                       173,
+                                       33,
+                                       208,
+                                       29,
+                                       7,
+                                       221,
+                                       121,
+                                       154,
+                                       117,
+                                       189,
+                                       27,
+                                       71,
+                                       39,
+                                       136,
+                                       167};
+    assert(is_array_equal(iden_three_pk_hash, multi_iden_result-> public_key_hash_identity_map[2]->public_key_hash, multi_iden_result->public_key_hash_identity_map[2]->public_key_hash_length));
+    assert(multi_iden_result->public_key_hash_identity_map[2]->has_identity);
+}
+
+void test_verify_full_identity_by_identity_id() {
+    char *proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b100401180018020114aee302720896bba837dcf3f2d674f546fd25496f00ca359aa1b2032e3158ae5e5c489f7d46722f29644a15e1cf7c3935b30606def61104012000240201203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200a0d5a4f6418663468515cd75189be3e1034bbfa9a1807eb81d964ba7442a0b1e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d0401203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2fd1cb12a5b2614000000fbbd3be097e7f07d5619dd69e7767884d116f95ae9a5fcdb651e71727902cc1e10011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e311110201187f03144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1110101204d04203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab3901203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a20000110201604f04203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a02";
+    char *identity_id_hex = "3eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2";
+
+    unsigned char *proof_bin = hex2bin(proof_hex);
+    unsigned char *identity_id_bin = hex2bin(identity_id_hex);
+
+    IdentityVerificationResult *result = verify_full_identity_by_identity_id(proof_bin, 1038, true, identity_id_bin);
+    assert(result->is_valid);
+
+    uint8_t expected_root_hash[32] = {72,72,215,200,156,21,128,156,166,182,110,57,113,232,229,242,193,199,240,135,222,102,246,165,181,68,81,221,120,195,236,199};
+    assert(is_array_equal(result->root_hash, expected_root_hash,32));
+
+    assert(result->has_identity);
+}
+
+void test_verify_identity_id_by_public_key_hash() {
+    char *multiple_identity_proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b1004011800180201145e0e49d808ad21d01d07dd799a75bd1b472788a7008c10aa4c1d19e2e7e42fe0b1a7f6d93d4c0b6992ef63ea985c16447cada4629511040120002402012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000ba56cfb1d87ef47857f6b1cd7fb918406fd50f81966619777dd4c1b595a1a26e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d04012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30fdbafd6833aeb700000012b27f4a0a7cfd06e3387b33a5bca6682953512e21621ae9cf6d633d9041771910011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e31111020118b3080132c9d35844d5ce2a8e0f377cee23c143a53396073dea86c494b86ba4c4af0b3903141f0815269afc012de44260ceb28a4496d3184184002300200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb00100168576e24521e03ba4b624912bb07833767c81102310b87d8ea1caf2795c68f921102e8b7eb376f0f7993badf93971f690be8a48f09db0711f052a2ed48471497b9d01003144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a20002254bf0a990beb721c21f21e8dbab50e33cd9cf09618fc27c9f7450c673516aee1001c6adfe081809218ee07461f95f53ce6ce462ec379f97a71f1be40f7218cb50af111103145e0e49d808ad21d01d07dd799a75bd1b472788a70023002035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30001001a4b31998d47c30e390f4fa56f28f19c62f114f17a704d29c56e28b6fdb47f101031467892af390cd2b7653a918c7b692c85b87b44d3200230020399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80001001eb4da977338a3da4204eaaac0c8856bdfd51d9b25ceef04b40bb38eff79ab11011021f22102429dbe1bc0ca714847b08187d9a874cc43329aaa79647fb9aa0834d691003149a061f31734c5f5f0b119ab72d433c9af133d3a600230020e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330002644c601e67692188cf5a975c2207caba899d99f1bbd4b62e5fe856850b9d7286100314a54921bb29b67e31898efebc29f241b1aefa4dca002300207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e510010029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d0314b3bfce478de96fe30cd3713bf88ce7728687da8a00230020a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40001111110314bb3df025e32fd90d1feee7dca4b83321c683292d0023002003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3001001ee0847805b145b5fb500b139fe12767ee681fc310a21d6e9814619df5187470802a0de352fe6767da7bf4c33ba7d2da8db0440457835d3c2992473210e02b6312c1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1029a563c983d202520c1a94f4c6ba99750373450aaf9dcb2a62ef50e9877646043100314ed738aaadd75d1677fefeccadd033f126cfee76a0023002097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000314fbd9daa5993de56a2e4346b7c72ff5585efffaab002300201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb0010111111110101208b06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d300090201010201030000006c4bfcf223cd4fe5c1cac82e1a9e2c73eb0e7f34cebabdd7630e24cb192f975804200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000902010102010300000080da62acb8c49f901d6bf84a2a2af15431e69e29069abf8d02f2c113c6099ba61004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000902010102010300000051a23049efbcde3a0e9c85ea7af05a28d4de31f90ae44a07c5fa18090128237011042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000090201010201030000002a390761b997897afe51540c39dfeb5c78d00781a547d2b83b1e72259894dea5100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f800009020101020103000000b3f28f9cc26df90ea49e13e3cd97c01d772e9d6609453e91d4369ef78e3880a004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab391004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e5100090201010201030000001d64a3f9270bf8b8104305ba76829472f3aac2b6fff20b98ac10361ec5473fbb11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef0009020101020103000000adb76570d64f89650686df5819414e5e42cf7eedab24605aa63c4b8e26e90eda100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be400009020101020103000000a5a8530416d9462521b6fd932723d8971684b4620e4254caf09c75289e0e64700420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330009020101020103000000fa1d907f967c48292a5af3d4c3aad435c2ee9237119614d612aee3b4f52e3614111111012003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d37f030100000b0008000000000000003d000401010005020101010072cc451270c61384d358f7d41135b78788011830301a697b97a3714c203a36dc100214105bdf191491b67249d321f3d9bebdf82c9a3395fef336c60b3701af0593e7100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b000002030014bb3df025e32fd90d1feee7dca4b83321c683292d0000030101003a0037010001010030a5fd02c96d5f60eb54b15b043a84ed80a0af804eff4a2bfea1fc9fed323232c7ab12072368097e556439d08aa0a6866c000010030102003a003702000001003085ff00e6339367d3e31e27cbc33c13c3cd0c6e973a5b902e76668d7a6daf83c129257cc7f9cc35e1c0689a6df03a891d00001101200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb7f030100000b000800000000000000030004010100050201010100783a62676dbffd012f9343ef0af71c1b800cda19801689dfb7e2372cccc3ed9d10027f0e94e54c63ffdcd3d3d9017a63e82f9984ade5c4faa59d2479c11007932524100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df1102010178030100002b002800000200002103fe65fcdcfe242dc2e43d654274ec9ce1bbbc9dd5a1c88945eeef18cc93151f7f0000030101001e001b010001030014c94f46cf38b83862990f782c84acbc178d7b02da000010030102001e001b02000203001426d387d9884862f96160dd59ca596bdce82da74600001101201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb7f030100000b000800000000000000600004010100050201010100ca3a10eab3b889465bba51bc5354131aee1044e510d9ed4a7068d1181c7dbfcd10029626ec2b4e8861c675b20bc4456333d8c41fd0c0b9c9f0b78047c6634ebab8ef100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100001e001b000003020014fbd9daa5993de56a2e4346b7c72ff5585efffaab0000030101002b002801000300002103fdc9403eb6f005db700e7841627f4f92e7c65d167384cd57a4f4e46583c21afe000010030102002b002802000000002103703446f77c8db1fbac6f3422c8e045098adb662c0b620a15b8c4d9ecd2a3defa000011012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c307f030100000b000800000000000000420004010100050201010100d7f397a816f23f32e9a6cd2ab5b03d5b6d30742cf0b58517f276d9f75c1c4d611002bfd5686ae0d2a7684c2f6ed3a7419a436a5389afc9a84a1bb22a1decdfa7625d100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b0000020300145e0e49d808ad21d01d07dd799a75bd1b472788a70000030101003a003701000001003097c8d8102d216818c693dc46614ce9242b8e54e05a8ff1f520a3694b9481091d92906b13b9b2762b127ee4f07e91119e000010030102003a00370200030100308949c96dda849268044e176dbdba458fb5deac81e9918793bdb837f5afee0c2496a5930d46d1fe37ce536cbef8e95bb40000110120399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f807f030100000b0008000000000000000c0004010100050201010100a9403aa408af35d267980dfff1706d70a59b6dba867d0b568ca8c5b77560d67a100276cbfe822d7b9f6863f9a06b668097458e123ff385e31c29d830d03f1148973a100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100003a0037000000010030b79d4caa865f84207124c3d304430372f39d7c18a237df3a71e3c4fb7ba9ab9816439a809beb8606c3bb52d53a5364590000030101001e001b0100030200146406a5082b231340726d4cd0de2452bc73a33003000010030102001e001b0200010300144ac7b42f524e1d1b22098f85adfca752600ef9a000001101203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a200001101207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e517f030100000b000800000000000000580004010100050201010100d95ff983db933edc675487a6f4e388fcf2db59313aeab5f45991a7f2471774471002355f98c38fd87ca5775e5e451243eb11300ed91fc950ea204c0a74b9a1991a25100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100003a0037000003010030b3423844bae8a591bbfb437b55566b5d61e54ee64f93351b0a3b9d4b731445d25ce367f7aedfcb32bd3cd14308a54cf50000030101003a0037010001010030a154c19082ac6b5fec72b81f6488550fec7149d52f66b4463915a61179c4f1f8507d366614b454dabf2c942235caad01000010030102001e001b0200030300140a8c14745c982f9fdc43aa985c02b1e5bff6c403000011012097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef7f030100000b000800000000000000620004010100050201010100412c1e7de2394dcd009223eb8c3a24e34b93a7c48df0bb86499160a31ea9dbdb1002180590eec33397034675f379cf17f62c0e77d17724a03238dcd3f216a4bc9509100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100003a0037000002010030afa4370aa5a48ab2f3ab510ccaba3b6d8cf51752304507e6a341c4e4ff6aa7c07610a503b42f479834b032d25dd160590000030101002b002801000300002103a9584c4580d165d2744ba49a70472653915bfdbec4bef471e26ce4c1c9e6c6ab000010030102001e001b02000102001445d04558a26b8ca04b486957c8abf5abf24ec76f0000110120a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be407f030100000b0008000000000000005d0004010100050201010100f140186a6bd413a50814db484b00398c2e7e6da9fbe2cb536728e880deb7506010027767f75fded47f94a6f81c671d448beddb6c2727f1f209ba015bf8de7331c13c100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100002b002800000000002102eebd2f91818a234e1879f8a55652f1e52419ad168b8f27b91be6b79958f7a5510000030101002b00280100020000210214a91dfcb36718209a5ee79c290029b849f1ce2feef6585a3b3fa37d04fb62b7000010030102001e001b0200030200144ee490084160fc8b1e73361d5a4c055beee77d8c0000110120e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4337f030100000b0008000000000000004f0004010100050201010100eb90b3c6d9a547e3b8a1111f621e0dbe5bfc68a8196371d497cb2912fa809d001002ab80ce7b6ca4875dbc7dc1f0d902551628c97b2383c27d04538d46a97d3cad43100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100001e001b0000020300149a061f31734c5f5f0b119ab72d433c9af133d3a60000030101003a003701000101003096e1fc631934a14acd313ff28ca29c9e9b43181b8df29386702b1a2d65a7cc823683f5733e296fb40c73648bc9cbf625000010030102001e001b02000102001474f185aa527f31202442d208cdb2905fa71403290000110201609f06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3000b03fda4d93a40301700000095840c6be056ed3d199dedf5265a5d3dafd195aa4cb54ca26943f7e092a5f06904200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000b03fd62132d410718000000b9dec92595e5eabb6de045782827bd98b60b9252287eec0f8e3450ea7c59619b1004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000b03fd8e29761d5405000000380d1a8cb3511b3ecf770a1d81f40c293182d29cf0574962db50c4cfb626fdb711042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30000b03fd62b9bfe135190000002eefa752386580c31084b54f2119973ccef6ac92fc38607e8609e896c9994c3e100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80000b03fdd0a1b7eee2140000002271b648a8925b8c717543453a59a3a20a3c52ce9b3e5fc793983c64f9f6fea004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a021004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e51000b03fd586ba25d1f1a0000005e3b38a6d9bede250ed0b612d01915a78182ee18d819d07d43ae925728b42d2d11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000b03fd120b51f4ea10000000be380b13cfd7149332e5ac818ae84d31e4be119bc0ebd717475630f6f38b6e90100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40000b03fd505d6c926f0d0000009500204c698cc12fc96774a34f77415c37376ff17b492838e414d774b5b7bec10420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae433000b03fd1e078984690800000064d995f4b5b62c480a04f1b8fb4c7a30b607f12da4abc357993ee7505be19b26111111";
+    char *pub_key_hash_hex = "1f0815269afc012de44260ceb28a4496d3184184";
+
+    unsigned char *proof = hex2bin(multiple_identity_proof_hex);
+    unsigned char *pub_key_hash = hex2bin(pub_key_hash_hex);
+
+    IdentityIdVerificationResult *result = verify_identity_id_by_public_key_hash(proof, 6206, true, pub_key_hash);
+    uint8_t expected_identity_id[32] = {15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23, 39,
+                                    205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203,};
+    assert(result->is_valid);
+    assert(result->has_identity_id);
+    assert(result->id_size == 32);
+    assert(is_array_equal(expected_identity_id, result->identity_id, result->id_size));
+}
+
+void test_verify_identity_balances_by_identity_ids() {
+    char *multiple_identity_proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b1004011800180201145e0e49d808ad21d01d07dd799a75bd1b472788a7008c10aa4c1d19e2e7e42fe0b1a7f6d93d4c0b6992ef63ea985c16447cada4629511040120002402012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000ba56cfb1d87ef47857f6b1cd7fb918406fd50f81966619777dd4c1b595a1a26e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d04012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30fdbafd6833aeb700000012b27f4a0a7cfd06e3387b33a5bca6682953512e21621ae9cf6d633d9041771910011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e31111020118b3080132c9d35844d5ce2a8e0f377cee23c143a53396073dea86c494b86ba4c4af0b3903141f0815269afc012de44260ceb28a4496d3184184002300200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb00100168576e24521e03ba4b624912bb07833767c81102310b87d8ea1caf2795c68f921102e8b7eb376f0f7993badf93971f690be8a48f09db0711f052a2ed48471497b9d01003144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a20002254bf0a990beb721c21f21e8dbab50e33cd9cf09618fc27c9f7450c673516aee1001c6adfe081809218ee07461f95f53ce6ce462ec379f97a71f1be40f7218cb50af111103145e0e49d808ad21d01d07dd799a75bd1b472788a70023002035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30001001a4b31998d47c30e390f4fa56f28f19c62f114f17a704d29c56e28b6fdb47f101031467892af390cd2b7653a918c7b692c85b87b44d3200230020399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80001001eb4da977338a3da4204eaaac0c8856bdfd51d9b25ceef04b40bb38eff79ab11011021f22102429dbe1bc0ca714847b08187d9a874cc43329aaa79647fb9aa0834d691003149a061f31734c5f5f0b119ab72d433c9af133d3a600230020e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330002644c601e67692188cf5a975c2207caba899d99f1bbd4b62e5fe856850b9d7286100314a54921bb29b67e31898efebc29f241b1aefa4dca002300207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e510010029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d0314b3bfce478de96fe30cd3713bf88ce7728687da8a00230020a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40001111110314bb3df025e32fd90d1feee7dca4b83321c683292d0023002003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3001001ee0847805b145b5fb500b139fe12767ee681fc310a21d6e9814619df5187470802a0de352fe6767da7bf4c33ba7d2da8db0440457835d3c2992473210e02b6312c1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1029a563c983d202520c1a94f4c6ba99750373450aaf9dcb2a62ef50e9877646043100314ed738aaadd75d1677fefeccadd033f126cfee76a0023002097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000314fbd9daa5993de56a2e4346b7c72ff5585efffaab002300201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb0010111111110101208b06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d300090201010201030000006c4bfcf223cd4fe5c1cac82e1a9e2c73eb0e7f34cebabdd7630e24cb192f975804200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000902010102010300000080da62acb8c49f901d6bf84a2a2af15431e69e29069abf8d02f2c113c6099ba61004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000902010102010300000051a23049efbcde3a0e9c85ea7af05a28d4de31f90ae44a07c5fa18090128237011042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000090201010201030000002a390761b997897afe51540c39dfeb5c78d00781a547d2b83b1e72259894dea5100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f800009020101020103000000b3f28f9cc26df90ea49e13e3cd97c01d772e9d6609453e91d4369ef78e3880a004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab391004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e5100090201010201030000001d64a3f9270bf8b8104305ba76829472f3aac2b6fff20b98ac10361ec5473fbb11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef0009020101020103000000adb76570d64f89650686df5819414e5e42cf7eedab24605aa63c4b8e26e90eda100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be400009020101020103000000a5a8530416d9462521b6fd932723d8971684b4620e4254caf09c75289e0e64700420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330009020101020103000000fa1d907f967c48292a5af3d4c3aad435c2ee9237119614d612aee3b4f52e3614111111012003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d37f030100000b0008000000000000003d000401010005020101010072cc451270c61384d358f7d41135b78788011830301a697b97a3714c203a36dc100214105bdf191491b67249d321f3d9bebdf82c9a3395fef336c60b3701af0593e7100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b000002030014bb3df025e32fd90d1feee7dca4b83321c683292d0000030101003a0037010001010030a5fd02c96d5f60eb54b15b043a84ed80a0af804eff4a2bfea1fc9fed323232c7ab12072368097e556439d08aa0a6866c000010030102003a003702000001003085ff00e6339367d3e31e27cbc33c13c3cd0c6e973a5b902e76668d7a6daf83c129257cc7f9cc35e1c0689a6df03a891d00001101200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb7f030100000b000800000000000000030004010100050201010100783a62676dbffd012f9343ef0af71c1b800cda19801689dfb7e2372cccc3ed9d10027f0e94e54c63ffdcd3d3d9017a63e82f9984ade5c4faa59d2479c11007932524100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df1102010178030100002b002800000200002103fe65fcdcfe242dc2e43d654274ec9ce1bbbc9dd5a1c88945eeef18cc93151f7f0000030101001e001b010001030014c94f46cf38b83862990f782c84acbc178d7b02da000010030102001e001b02000203001426d387d9884862f96160dd59ca596bdce82da74600001101201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb7f030100000b000800000000000000600004010100050201010100ca3a10eab3b889465bba51bc5354131aee1044e510d9ed4a7068d1181c7dbfcd10029626ec2b4e8861c675b20bc4456333d8c41fd0c0b9c9f0b78047c6634ebab8ef100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100001e001b000003020014fbd9daa5993de56a2e4346b7c72ff5585efffaab0000030101002b002801000300002103fdc9403eb6f005db700e7841627f4f92e7c65d167384cd57a4f4e46583c21afe000010030102002b002802000000002103703446f77c8db1fbac6f3422c8e045098adb662c0b620a15b8c4d9ecd2a3defa000011012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c307f030100000b000800000000000000420004010100050201010100d7f397a816f23f32e9a6cd2ab5b03d5b6d30742cf0b58517f276d9f75c1c4d611002bfd5686ae0d2a7684c2f6ed3a7419a436a5389afc9a84a1bb22a1decdfa7625d100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b0000020300145e0e49d808ad21d01d07dd799a75bd1b472788a70000030101003a003701000001003097c8d8102d216818c693dc46614ce9242b8e54e05a8ff1f520a3694b9481091d92906b13b9b2762b127ee4f07e91119e000010030102003a00370200030100308949c96dda849268044e176dbdba458fb5deac81e9918793bdb837f5afee0c2496a5930d46d1fe37ce536cbef8e95bb40000110120399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f807f030100000b0008000000000000000c0004010100050201010100a9403aa408af35d267980dfff1706d70a59b6dba867d0b568ca8c5b77560d67a100276cbfe822d7b9f6863f9a06b668097458e123ff385e31c29d830d03f1148973a100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100003a0037000000010030b79d4caa865f84207124c3d304430372f39d7c18a237df3a71e3c4fb7ba9ab9816439a809beb8606c3bb52d53a5364590000030101001e001b0100030200146406a5082b231340726d4cd0de2452bc73a33003000010030102001e001b0200010300144ac7b42f524e1d1b22098f85adfca752600ef9a000001101203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a200001101207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e517f030100000b000800000000000000580004010100050201010100d95ff983db933edc675487a6f4e388fcf2db59313aeab5f45991a7f2471774471002355f98c38fd87ca5775e5e451243eb11300ed91fc950ea204c0a74b9a1991a25100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100003a0037000003010030b3423844bae8a591bbfb437b55566b5d61e54ee64f93351b0a3b9d4b731445d25ce367f7aedfcb32bd3cd14308a54cf50000030101003a0037010001010030a154c19082ac6b5fec72b81f6488550fec7149d52f66b4463915a61179c4f1f8507d366614b454dabf2c942235caad01000010030102001e001b0200030300140a8c14745c982f9fdc43aa985c02b1e5bff6c403000011012097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef7f030100000b000800000000000000620004010100050201010100412c1e7de2394dcd009223eb8c3a24e34b93a7c48df0bb86499160a31ea9dbdb1002180590eec33397034675f379cf17f62c0e77d17724a03238dcd3f216a4bc9509100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100003a0037000002010030afa4370aa5a48ab2f3ab510ccaba3b6d8cf51752304507e6a341c4e4ff6aa7c07610a503b42f479834b032d25dd160590000030101002b002801000300002103a9584c4580d165d2744ba49a70472653915bfdbec4bef471e26ce4c1c9e6c6ab000010030102001e001b02000102001445d04558a26b8ca04b486957c8abf5abf24ec76f0000110120a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be407f030100000b0008000000000000005d0004010100050201010100f140186a6bd413a50814db484b00398c2e7e6da9fbe2cb536728e880deb7506010027767f75fded47f94a6f81c671d448beddb6c2727f1f209ba015bf8de7331c13c100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100002b002800000000002102eebd2f91818a234e1879f8a55652f1e52419ad168b8f27b91be6b79958f7a5510000030101002b00280100020000210214a91dfcb36718209a5ee79c290029b849f1ce2feef6585a3b3fa37d04fb62b7000010030102001e001b0200030200144ee490084160fc8b1e73361d5a4c055beee77d8c0000110120e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4337f030100000b0008000000000000004f0004010100050201010100eb90b3c6d9a547e3b8a1111f621e0dbe5bfc68a8196371d497cb2912fa809d001002ab80ce7b6ca4875dbc7dc1f0d902551628c97b2383c27d04538d46a97d3cad43100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100001e001b0000020300149a061f31734c5f5f0b119ab72d433c9af133d3a60000030101003a003701000101003096e1fc631934a14acd313ff28ca29c9e9b43181b8df29386702b1a2d65a7cc823683f5733e296fb40c73648bc9cbf625000010030102001e001b02000102001474f185aa527f31202442d208cdb2905fa71403290000110201609f06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3000b03fda4d93a40301700000095840c6be056ed3d199dedf5265a5d3dafd195aa4cb54ca26943f7e092a5f06904200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000b03fd62132d410718000000b9dec92595e5eabb6de045782827bd98b60b9252287eec0f8e3450ea7c59619b1004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000b03fd8e29761d5405000000380d1a8cb3511b3ecf770a1d81f40c293182d29cf0574962db50c4cfb626fdb711042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30000b03fd62b9bfe135190000002eefa752386580c31084b54f2119973ccef6ac92fc38607e8609e896c9994c3e100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80000b03fdd0a1b7eee2140000002271b648a8925b8c717543453a59a3a20a3c52ce9b3e5fc793983c64f9f6fea004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a021004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e51000b03fd586ba25d1f1a0000005e3b38a6d9bede250ed0b612d01915a78182ee18d819d07d43ae925728b42d2d11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000b03fd120b51f4ea10000000be380b13cfd7149332e5ac818ae84d31e4be119bc0ebd717475630f6f38b6e90100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40000b03fd505d6c926f0d0000009500204c698cc12fc96774a34f77415c37376ff17b492838e414d774b5b7bec10420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae433000b03fd1e078984690800000064d995f4b5b62c480a04f1b8fb4c7a30b607f12da4abc357993ee7505be19b26111111";
+    char *iden_one_hex = "3eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2";
+    char *iden_two_hex = "97ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef";
+
+    unsigned char *proof = hex2bin(multiple_identity_proof_hex);
+    unsigned char *iden_ids[2] = {
+            hex2bin(iden_one_hex),
+            hex2bin(iden_two_hex),
+    };
+    MultipleIdentityBalanceVerificationResult *result = verify_identity_balances_by_identity_ids(proof, 6206, true, iden_ids, 2);
+    assert(result->is_valid);
+    assert(result->map_size == 2);
+    assert(result->identity_id_balance_map[0]->has_balance);
+    assert(result->identity_id_balance_map[0]->balance == 11077485418638);
+    uint8_t expected_iden_one_bin[32] = {62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22,
+                                         47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162};
+    assert(is_array_equal(expected_iden_one_bin, result->identity_id_balance_map[0]->identity_id, result->identity_id_balance_map[0]->id_size));
+
+    assert(result->identity_id_balance_map[1]->has_balance);
+    assert(result->identity_id_balance_map[1]->balance == 9300653671817);
+    uint8_t expected_iden_two_bin[32] = {151, 172, 124, 81, 243, 147, 225, 5, 188, 204, 9, 152, 150, 127, 129, 13, 246, 19,
+                                         141, 93, 239, 8, 214, 194, 123, 127, 177, 23, 144, 211, 189, 239,};
+    assert(is_array_equal(expected_iden_two_bin, result->identity_id_balance_map[1]->identity_id, result->identity_id_balance_map[1]->id_size));
+}
+
+void test_verify_identity_ids_by_public_key_hashes() {
+    char *multiple_identity_proof_hex = "06000100a603014a75cf3f535e81c4680f8137a2208dbcb2652ffd7e715bd4290cc5c560b2cc6102cfbe0535bd2defe586b863b9ccb92d0d66fb2b810d730e7ba2cb7e2fb302613b1004011800180201145e0e49d808ad21d01d07dd799a75bd1b472788a7008c10aa4c1d19e2e7e42fe0b1a7f6d93d4c0b6992ef63ea985c16447cada4629511040120002402012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000ba56cfb1d87ef47857f6b1cd7fb918406fd50f81966619777dd4c1b595a1a26e100169931838564707dbf11e90a059fd7dd453cc7e68adb7d2c2375bae53566664e711025670752cc3d883200a7598b65cd74b41a760cc0be57cda5536f15f03c8783aa81001c33635136e502e9ac5244b15a20a757e0759ce0a90823cd37f893f6a49556d26040160002d04012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30fdbafd6833aeb700000012b27f4a0a7cfd06e3387b33a5bca6682953512e21621ae9cf6d633d9041771910011e0c1443d0925f781132f4c506747202dbffa3ca3ded4d2387d4b7e40e0303e31111020118b3080132c9d35844d5ce2a8e0f377cee23c143a53396073dea86c494b86ba4c4af0b3903141f0815269afc012de44260ceb28a4496d3184184002300200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb00100168576e24521e03ba4b624912bb07833767c81102310b87d8ea1caf2795c68f921102e8b7eb376f0f7993badf93971f690be8a48f09db0711f052a2ed48471497b9d01003144463a1a994d5040e69c090b6985d7af295bfd11a002300203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a20002254bf0a990beb721c21f21e8dbab50e33cd9cf09618fc27c9f7450c673516aee1001c6adfe081809218ee07461f95f53ce6ce462ec379f97a71f1be40f7218cb50af111103145e0e49d808ad21d01d07dd799a75bd1b472788a70023002035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30001001a4b31998d47c30e390f4fa56f28f19c62f114f17a704d29c56e28b6fdb47f101031467892af390cd2b7653a918c7b692c85b87b44d3200230020399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80001001eb4da977338a3da4204eaaac0c8856bdfd51d9b25ceef04b40bb38eff79ab11011021f22102429dbe1bc0ca714847b08187d9a874cc43329aaa79647fb9aa0834d691003149a061f31734c5f5f0b119ab72d433c9af133d3a600230020e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330002644c601e67692188cf5a975c2207caba899d99f1bbd4b62e5fe856850b9d7286100314a54921bb29b67e31898efebc29f241b1aefa4dca002300207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e510010029e6f2d33b1580030e3b6030e3c25016ab7253965682556059dcc243b75c7fa6d0314b3bfce478de96fe30cd3713bf88ce7728687da8a00230020a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40001111110314bb3df025e32fd90d1feee7dca4b83321c683292d0023002003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3001001ee0847805b145b5fb500b139fe12767ee681fc310a21d6e9814619df5187470802a0de352fe6767da7bf4c33ba7d2da8db0440457835d3c2992473210e02b6312c1001e09f88cd09cc595d524892b3e642b939f2827995605703c49c861f653001d5e1029a563c983d202520c1a94f4c6ba99750373450aaf9dcb2a62ef50e9877646043100314ed738aaadd75d1677fefeccadd033f126cfee76a0023002097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000314fbd9daa5993de56a2e4346b7c72ff5585efffaab002300201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb0010111111110101208b06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d300090201010201030000006c4bfcf223cd4fe5c1cac82e1a9e2c73eb0e7f34cebabdd7630e24cb192f975804200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000902010102010300000080da62acb8c49f901d6bf84a2a2af15431e69e29069abf8d02f2c113c6099ba61004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000902010102010300000051a23049efbcde3a0e9c85ea7af05a28d4de31f90ae44a07c5fa18090128237011042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c3000090201010201030000002a390761b997897afe51540c39dfeb5c78d00781a547d2b83b1e72259894dea5100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f800009020101020103000000b3f28f9cc26df90ea49e13e3cd97c01d772e9d6609453e91d4369ef78e3880a004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a200090201010201030000007fae89b888b23f4fbdaed2fb990a1f42727aef5bd2a8b91f8cb970570909ab391004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e5100090201010201030000001d64a3f9270bf8b8104305ba76829472f3aac2b6fff20b98ac10361ec5473fbb11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef0009020101020103000000adb76570d64f89650686df5819414e5e42cf7eedab24605aa63c4b8e26e90eda100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be400009020101020103000000a5a8530416d9462521b6fd932723d8971684b4620e4254caf09c75289e0e64700420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4330009020101020103000000fa1d907f967c48292a5af3d4c3aad435c2ee9237119614d612aee3b4f52e3614111111012003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d37f030100000b0008000000000000003d000401010005020101010072cc451270c61384d358f7d41135b78788011830301a697b97a3714c203a36dc100214105bdf191491b67249d321f3d9bebdf82c9a3395fef336c60b3701af0593e7100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b000002030014bb3df025e32fd90d1feee7dca4b83321c683292d0000030101003a0037010001010030a5fd02c96d5f60eb54b15b043a84ed80a0af804eff4a2bfea1fc9fed323232c7ab12072368097e556439d08aa0a6866c000010030102003a003702000001003085ff00e6339367d3e31e27cbc33c13c3cd0c6e973a5b902e76668d7a6daf83c129257cc7f9cc35e1c0689a6df03a891d00001101200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb7f030100000b000800000000000000030004010100050201010100783a62676dbffd012f9343ef0af71c1b800cda19801689dfb7e2372cccc3ed9d10027f0e94e54c63ffdcd3d3d9017a63e82f9984ade5c4faa59d2479c11007932524100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df1102010178030100002b002800000200002103fe65fcdcfe242dc2e43d654274ec9ce1bbbc9dd5a1c88945eeef18cc93151f7f0000030101001e001b010001030014c94f46cf38b83862990f782c84acbc178d7b02da000010030102001e001b02000203001426d387d9884862f96160dd59ca596bdce82da74600001101201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb7f030100000b000800000000000000600004010100050201010100ca3a10eab3b889465bba51bc5354131aee1044e510d9ed4a7068d1181c7dbfcd10029626ec2b4e8861c675b20bc4456333d8c41fd0c0b9c9f0b78047c6634ebab8ef100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100001e001b000003020014fbd9daa5993de56a2e4346b7c72ff5585efffaab0000030101002b002801000300002103fdc9403eb6f005db700e7841627f4f92e7c65d167384cd57a4f4e46583c21afe000010030102002b002802000000002103703446f77c8db1fbac6f3422c8e045098adb662c0b620a15b8c4d9ecd2a3defa000011012035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c307f030100000b000800000000000000420004010100050201010100d7f397a816f23f32e9a6cd2ab5b03d5b6d30742cf0b58517f276d9f75c1c4d611002bfd5686ae0d2a7684c2f6ed3a7419a436a5389afc9a84a1bb22a1decdfa7625d100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100001e001b0000020300145e0e49d808ad21d01d07dd799a75bd1b472788a70000030101003a003701000001003097c8d8102d216818c693dc46614ce9242b8e54e05a8ff1f520a3694b9481091d92906b13b9b2762b127ee4f07e91119e000010030102003a00370200030100308949c96dda849268044e176dbdba458fb5deac81e9918793bdb837f5afee0c2496a5930d46d1fe37ce536cbef8e95bb40000110120399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f807f030100000b0008000000000000000c0004010100050201010100a9403aa408af35d267980dfff1706d70a59b6dba867d0b568ca8c5b77560d67a100276cbfe822d7b9f6863f9a06b668097458e123ff385e31c29d830d03f1148973a100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100003a0037000000010030b79d4caa865f84207124c3d304430372f39d7c18a237df3a71e3c4fb7ba9ab9816439a809beb8606c3bb52d53a5364590000030101001e001b0100030200146406a5082b231340726d4cd0de2452bc73a33003000010030102001e001b0200010300144ac7b42f524e1d1b22098f85adfca752600ef9a000001101203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a27f030100000b000800000000000000100004010100050201010100d651221796b5206a5b9678a4d9995d519d8b9e75e87d85e57effb91f82a23e8d1002bcf84a882c0f72dd0d520a6954b3e1887fa55b7dc67635b44516856b31fd20a8100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100001e001b0000010200144463a1a994d5040e69c090b6985d7af295bfd11a0000030101003a0037010002010030973988b291fd1bca86d906723e335bdf13d3ebbadfea31dd164b3c672c16da72af8e6edfc0bac44b92b8c536d708dc33000010030102002b00280200030000210360da79c58995e4ec88512af9a4440ca4f2d7bfe84240e17effc4dd8ce94033a200001101207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e517f030100000b000800000000000000580004010100050201010100d95ff983db933edc675487a6f4e388fcf2db59313aeab5f45991a7f2471774471002355f98c38fd87ca5775e5e451243eb11300ed91fc950ea204c0a74b9a1991a25100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df11020101a301030100003a0037000003010030b3423844bae8a591bbfb437b55566b5d61e54ee64f93351b0a3b9d4b731445d25ce367f7aedfcb32bd3cd14308a54cf50000030101003a0037010001010030a154c19082ac6b5fec72b81f6488550fec7149d52f66b4463915a61179c4f1f8507d366614b454dabf2c942235caad01000010030102001e001b0200030300140a8c14745c982f9fdc43aa985c02b1e5bff6c403000011012097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef7f030100000b000800000000000000620004010100050201010100412c1e7de2394dcd009223eb8c3a24e34b93a7c48df0bb86499160a31ea9dbdb1002180590eec33397034675f379cf17f62c0e77d17724a03238dcd3f216a4bc9509100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201019401030100003a0037000002010030afa4370aa5a48ab2f3ab510ccaba3b6d8cf51752304507e6a341c4e4ff6aa7c07610a503b42f479834b032d25dd160590000030101002b002801000300002103a9584c4580d165d2744ba49a70472653915bfdbec4bef471e26ce4c1c9e6c6ab000010030102001e001b02000102001445d04558a26b8ca04b486957c8abf5abf24ec76f0000110120a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be407f030100000b0008000000000000005d0004010100050201010100f140186a6bd413a50814db484b00398c2e7e6da9fbe2cb536728e880deb7506010027767f75fded47f94a6f81c671d448beddb6c2727f1f209ba015bf8de7331c13c100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018501030100002b002800000000002102eebd2f91818a234e1879f8a55652f1e52419ad168b8f27b91be6b79958f7a5510000030101002b00280100020000210214a91dfcb36718209a5ee79c290029b849f1ce2feef6585a3b3fa37d04fb62b7000010030102001e001b0200030200144ee490084160fc8b1e73361d5a4c055beee77d8c0000110120e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae4337f030100000b0008000000000000004f0004010100050201010100eb90b3c6d9a547e3b8a1111f621e0dbe5bfc68a8196371d497cb2912fa809d001002ab80ce7b6ca4875dbc7dc1f0d902551628c97b2383c27d04538d46a97d3cad43100146197ba2d1d89ae65f0e38b4207166d2b6d52014cc704c567082bf1dbd65f9df110201018701030100001e001b0000020300149a061f31734c5f5f0b119ab72d433c9af133d3a60000030101003a003701000101003096e1fc631934a14acd313ff28ca29c9e9b43181b8df29386702b1a2d65a7cc823683f5733e296fb40c73648bc9cbf625000010030102001e001b02000102001474f185aa527f31202442d208cdb2905fa71403290000110201609f06042003c1211aa9d26239c6dca1e6cb1dbb8266fe2b9500f8699c84aa90d623f7b1d3000b03fda4d93a40301700000095840c6be056ed3d199dedf5265a5d3dafd195aa4cb54ca26943f7e092a5f06904200f7e9f9896fecebab4c19d41e9d7f16c1727cd63d9db56f4d5b04322f29256cb000b03fd62132d410718000000b9dec92595e5eabb6de045782827bd98b60b9252287eec0f8e3450ea7c59619b1004201b240fcb4e632e7856bff58b784dcebc19398c734ec600c465fde95a2366dbeb000b03fd8e29761d5405000000380d1a8cb3511b3ecf770a1d81f40c293182d29cf0574962db50c4cfb626fdb711042035a8dd6a65ed429912d2db054462c7e8c011965aa76a76356a69b4c881808c30000b03fd62b9bfe135190000002eefa752386580c31084b54f2119973ccef6ac92fc38607e8609e896c9994c3e100420399474f653ba6b7b3839a43ed0fa35ffcddd5efa1d0e7082941bd6240c219f80000b03fdd0a1b7eee2140000002271b648a8925b8c717543453a59a3a20a3c52ce9b3e5fc793983c64f9f6fea004203eab8233e9132dbfc2b700abb64d5d46d843162f27199c92236c638522bbf3a2000b03fd1cb12a5b261400000068f31829eaec02f7e5eddada129d4981a99bda0e5c0fd4eff3c23eafc2c79a021004207f3dfd2ccb054f410ee77eb02ee7b4ea960795d89746cdc226ddd899e6ac4e51000b03fd586ba25d1f1a0000005e3b38a6d9bede250ed0b612d01915a78182ee18d819d07d43ae925728b42d2d11042097ac7c51f393e105bccc0998967f810df6138d5def08d6c27b7fb11790d3bdef000b03fd120b51f4ea10000000be380b13cfd7149332e5ac818ae84d31e4be119bc0ebd717475630f6f38b6e90100420a89ba1a7b2bd5b99fc1beee05aca5587ae3cfb4628d2a0358f208252b7e8be40000b03fd505d6c926f0d0000009500204c698cc12fc96774a34f77415c37376ff17b492838e414d774b5b7bec10420e8f1eaea303ab85c0a20dc6e80ba551e3fab2b85702319a122e550a8734ae433000b03fd1e078984690800000064d995f4b5b62c480a04f1b8fb4c7a30b607f12da4abc357993ee7505be19b26111111";
+    char *pub_key_hash_one_hex = "1f0815269afc012de44260ceb28a4496d3184184";
+    char *pub_key_hash_two_hex = "4463a1a994d5040e69c090b6985d7af295bfd11a";
+    char *pub_key_hash_three_hex = "5e0e49d808ad21d01d07dd799a75bd1b472788a7";
+
+    unsigned char *multiple_identity_proof_bin = hex2bin(multiple_identity_proof_hex);
+    unsigned char *pub_key_hashes[3] = {
+            hex2bin(pub_key_hash_one_hex),
+            hex2bin(pub_key_hash_two_hex),
+            hex2bin(pub_key_hash_three_hex),
+    };
+    MultipleIdentityIdVerificationResult *result = verify_identity_ids_by_public_key_hashes(multiple_identity_proof_bin, 6206, true, pub_key_hashes, 3);
+    assert(result->is_valid);
+    assert(result->map_size == 3);
+
+    assert(result->public_key_hash_identity_id_map[0]->has_identity_id);
+    assert(result->public_key_hash_identity_id_map[0]->id_size == 32);
+    uint8_t expected_id_one[32] = {15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23,
+                                   39, 205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203};
+    assert(is_array_equal(expected_id_one, result->public_key_hash_identity_id_map[0]->identity_id, result->public_key_hash_identity_id_map[0]->id_size));
+
+    assert(result->public_key_hash_identity_id_map[1]->has_identity_id);
+    assert(result->public_key_hash_identity_id_map[1]->id_size == 32);
+    uint8_t expected_id_two[32] = {62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22,
+                                   47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162};
+    assert(is_array_equal(expected_id_two, result->public_key_hash_identity_id_map[1]->identity_id, result->public_key_hash_identity_id_map[0]->id_size));
+
+    assert(result->public_key_hash_identity_id_map[2]->has_identity_id);
+    assert(result->public_key_hash_identity_id_map[2]->id_size == 32);
+    uint8_t expected_id_three[32] = {53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5, 68, 98, 199, 232, 192, 17,
+                                     150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128, 140, 48,};
+    assert(is_array_equal(expected_id_three, result->public_key_hash_identity_id_map[2]->identity_id, result->public_key_hash_identity_id_map[2]->id_size));
+}
+
+
+int main() {
+    test_verify_full_identity_by_public_key_hash();
+    test_verify_full_identities_by_public_key_hashes();
+    test_verify_full_identity_by_identity_id();
+    test_verify_identity_id_by_public_key_hash();
+    test_verify_identity_balances_by_identity_ids();
+    test_verify_identity_ids_by_public_key_hashes();
+
+    printf("All assertions passed!!");
+}
diff --git a/packages/rs-drive-verify-c-binding/c/utils.c b/packages/rs-drive-verify-c-binding/c/utils.c
new file mode 100644
index 00000000000..db766ffb833
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/c/utils.c
@@ -0,0 +1,87 @@
+//
+// Created by anton on 05.10.2021.
+//
+
+#include <stdlib.h>
+
+char *bin2hex(unsigned char *p, int len)
+{
+    char *hex = malloc(((2*len) + 1));
+    char *r = hex;
+
+    while(len && p)
+    {
+        (*r) = ((*p) & 0xF0) >> 4;
+        (*r) = ((*r) <= 9 ? '0' + (*r) : 'a' - 10 + (*r));
+        r++;
+        (*r) = ((*p) & 0x0F);
+        (*r) = ((*r) <= 9 ? '0' + (*r) : 'a' - 10 + (*r));
+        r++;
+        p++;
+        len--;
+    }
+    *r = '\0';
+
+    return hex;
+}
+
+unsigned char *hex2bin(const char *str)
+{
+    int len, h;
+    unsigned char *result, *err, *p, c;
+
+    err = malloc(1);
+    *err = 0;
+
+    if (!str)
+        return err;
+
+    if (!*str)
+        return err;
+
+    len = 0;
+    p = (unsigned char*) str;
+    while (*p++)
+        len++;
+
+    result = malloc((len/2)+1);
+    h = !(len%2) * 4;
+    p = result;
+    *p = 0;
+
+    c = *str;
+    while(c)
+    {
+        if(('0' <= c) && (c <= '9'))
+            *p += (c - '0') << h;
+        else if(('A' <= c) && (c <= 'F'))
+            *p += (c - 'A' + 10) << h;
+        else if(('a' <= c) && (c <= 'f'))
+            *p += (c - 'a' + 10) << h;
+        else
+            return err;
+
+        str++;
+        c = *str;
+
+        if (h)
+            h = 0;
+        else
+        {
+            h = 4;
+            p++;
+            *p = 0;
+        }
+    }
+
+    return result;
+}
+
+bool is_array_equal(uint8_t a[], uint8_t b[], int size) {
+    for (int i = 0; i < size; i++) {
+        if (a[i] != b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
diff --git a/packages/rs-drive-verify-c-binding/cbindgen.toml b/packages/rs-drive-verify-c-binding/cbindgen.toml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/rs-drive-verify-c-binding/src/lib.rs b/packages/rs-drive-verify-c-binding/src/lib.rs
new file mode 100644
index 00000000000..047b90961cc
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/src/lib.rs
@@ -0,0 +1,781 @@
+mod types;
+mod util;
+
+use crate::types::{
+    IdentityIdBalanceMap, IdentityIdVerificationResult, IdentityVerificationResult,
+    MultipleIdentityBalanceVerificationResult, MultipleIdentityIdVerificationResult,
+    MultipleIdentityVerificationResult, PublicKeyHash, PublicKeyHashIdentityIdMap,
+    PublicKeyHashIdentityMap,
+};
+use crate::util::{build_c_identity_struct, extract_vector_from_pointer, vec_to_pointer};
+use drive::drive::verify::AssetLockProof as DppAssetLockProof;
+use drive::drive::verify::Identity as DppIdentity;
+use drive::drive::Drive;
+use std::collections::BTreeMap;
+use std::slice;
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_full_identity_by_public_key_hash(
+    proof_array: *const u8,
+    proof_len: usize,
+    public_key_hash: *const PublicKeyHash,
+) -> *const IdentityVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let public_key_hash = unsafe { std::ptr::read(public_key_hash) };
+
+    let verification_result =
+        Drive::verify_full_identity_by_public_key_hash(proof, public_key_hash);
+
+    match verification_result {
+        Ok((root_hash, maybe_identity)) => Box::into_raw(Box::from(IdentityVerificationResult {
+            root_hash: Box::into_raw(Box::from(root_hash)),
+            is_valid: true,
+            has_identity: maybe_identity.is_some(),
+            identity: build_c_identity_struct(maybe_identity),
+        })),
+        Err(..) => Box::into_raw(Box::from(IdentityVerificationResult::default())),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_full_identities_by_public_key_hashes(
+    proof_array: *const u8,
+    proof_len: usize,
+    public_key_hashes_c: *const *const u8,
+    public_key_hash_count: usize,
+) -> *const MultipleIdentityVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let public_key_hashes =
+        extract_vector_from_pointer::<[u8; 20]>(public_key_hashes_c, public_key_hash_count);
+
+    let verification_result = Drive::verify_full_identities_by_public_key_hashes::<
+        BTreeMap<PublicKeyHash, Option<DppIdentity>>,
+    >(proof, &public_key_hashes);
+
+    match verification_result {
+        Ok((root_hash, hash_identity_map)) => {
+            let mut pkhash_identity_map_as_vec: Vec<*const PublicKeyHashIdentityMap> = Vec::new();
+            for (public_key_hash, maybe_identity) in hash_identity_map {
+                pkhash_identity_map_as_vec.push(Box::into_raw(Box::from(
+                    PublicKeyHashIdentityMap {
+                        public_key_hash: vec_to_pointer(public_key_hash.to_vec()),
+                        public_key_hash_length: public_key_hash.len(),
+                        has_identity: maybe_identity.is_some(),
+                        identity: build_c_identity_struct(maybe_identity),
+                    },
+                )));
+            }
+
+            Box::into_raw(Box::from(MultipleIdentityVerificationResult {
+                is_valid: true,
+                root_hash: Box::into_raw(Box::from(root_hash)),
+                map_size: pkhash_identity_map_as_vec.len(),
+                public_key_hash_identity_map: vec_to_pointer(pkhash_identity_map_as_vec),
+            }))
+        }
+        Err(..) => Box::into_raw(Box::from(MultipleIdentityVerificationResult::default())),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_full_identity_by_identity_id(
+    proof_array: *const u8,
+    proof_len: usize,
+    is_proof_subset: bool,
+    identity_id: *const [u8; 32],
+) -> *const IdentityVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let identity_id: [u8; 32] = unsafe { std::ptr::read(identity_id) };
+    let verification_result =
+        Drive::verify_full_identity_by_identity_id(proof, is_proof_subset, identity_id);
+    match verification_result {
+        Ok((root_hash, maybe_identity)) => Box::into_raw(Box::from(IdentityVerificationResult {
+            root_hash: Box::into_raw(Box::from(root_hash)),
+            is_valid: true,
+            has_identity: maybe_identity.is_some(),
+            identity: build_c_identity_struct(maybe_identity),
+        })),
+        Err(..) => Box::into_raw(Box::from(IdentityVerificationResult::default())),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_identity_id_by_public_key_hash(
+    proof_array: *const u8,
+    proof_len: usize,
+    is_proof_subset: bool,
+    public_key_hash: *const PublicKeyHash,
+) -> *const IdentityIdVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let public_key_hash = unsafe { std::ptr::read(public_key_hash) };
+
+    let verification_result =
+        Drive::verify_identity_id_by_public_key_hash(proof, is_proof_subset, public_key_hash);
+
+    match verification_result {
+        Ok((root_hash, maybe_identity_id)) => {
+            Box::into_raw(Box::from(IdentityIdVerificationResult {
+                root_hash: Box::into_raw(Box::from(root_hash)),
+                is_valid: true,
+                has_identity_id: maybe_identity_id.is_some(),
+                identity_id: maybe_identity_id
+                    .map(|id| vec_to_pointer(id.to_vec()))
+                    .unwrap_or(std::ptr::null()),
+                id_size: maybe_identity_id.map(|id| id.len()).unwrap_or(0),
+            }))
+        }
+        Err(..) => Box::into_raw(Box::from(IdentityIdVerificationResult::default())),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_identity_balances_by_identity_ids(
+    proof_array: *const u8,
+    proof_len: usize,
+    is_proof_subset: bool,
+    identity_ids: *const *const u8,
+    id_size: usize,
+) -> *const MultipleIdentityBalanceVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let identity_ids = extract_vector_from_pointer::<[u8; 32]>(identity_ids, id_size);
+
+    let verification_result = Drive::verify_identity_balances_for_identity_ids::<
+        Vec<([u8; 32], Option<u64>)>,
+    >(proof, is_proof_subset, identity_ids.as_slice());
+
+    match verification_result {
+        Ok((root_hash, identity_id_balance_map)) => {
+            let mut identity_id_balance_map_as_vec: Vec<*const IdentityIdBalanceMap> = Vec::new();
+            for (identity_id, maybe_balance) in identity_id_balance_map {
+                identity_id_balance_map_as_vec.push(Box::into_raw(Box::from(
+                    IdentityIdBalanceMap {
+                        identity_id: vec_to_pointer(identity_id.to_vec()),
+                        id_size: 32,
+                        has_balance: maybe_balance.is_some(),
+                        balance: maybe_balance.unwrap_or(0),
+                    },
+                )));
+            }
+            Box::into_raw(Box::from(MultipleIdentityBalanceVerificationResult {
+                is_valid: true,
+                root_hash: Box::into_raw(Box::from(root_hash)),
+                map_size: identity_id_balance_map_as_vec.len(),
+                identity_id_balance_map: vec_to_pointer(identity_id_balance_map_as_vec),
+            }))
+        }
+        Err(..) => Box::into_raw(Box::from(
+            MultipleIdentityBalanceVerificationResult::default(),
+        )),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn verify_identity_ids_by_public_key_hashes(
+    proof_array: *const u8,
+    proof_len: usize,
+    is_proof_subset: bool,
+    public_key_hashes_c: *const *const u8,
+    public_key_hash_count: usize,
+) -> *const MultipleIdentityIdVerificationResult {
+    let proof = unsafe { slice::from_raw_parts(proof_array, proof_len) };
+    let public_key_hashes =
+        extract_vector_from_pointer::<[u8; 20]>(public_key_hashes_c, public_key_hash_count);
+
+    let verification_result = Drive::verify_identity_ids_by_public_key_hashes::<
+        Vec<(PublicKeyHash, Option<[u8; 32]>)>,
+    >(proof, is_proof_subset, public_key_hashes.as_slice());
+
+    match verification_result {
+        Ok((root_hash, public_key_hash_identity_id_map)) => {
+            let mut pkhash_identity_id_map_as_vec: Vec<*const PublicKeyHashIdentityIdMap> =
+                Vec::new();
+            for (public_key_hash, maybe_identity_id) in &public_key_hash_identity_id_map {
+                pkhash_identity_id_map_as_vec.push(Box::into_raw(Box::from(
+                    PublicKeyHashIdentityIdMap {
+                        public_key_hash: vec_to_pointer(public_key_hash.to_vec()),
+                        public_key_hash_size: public_key_hash.len(),
+                        has_identity_id: maybe_identity_id.is_some(),
+                        identity_id: maybe_identity_id
+                            .map(|id| vec_to_pointer(id.to_vec()))
+                            .unwrap_or(std::ptr::null()),
+                        id_size: maybe_identity_id.map(|id| id.len()).unwrap_or(0),
+                    },
+                )))
+            }
+            Box::into_raw(Box::from(MultipleIdentityIdVerificationResult {
+                is_valid: true,
+                root_hash: Box::into_raw(Box::from(root_hash)),
+                map_size: public_key_hash_identity_id_map.len(),
+                public_key_hash_identity_id_map: vec_to_pointer(pkhash_identity_id_map_as_vec),
+            }))
+        }
+        Err(..) => Box::into_raw(Box::from(MultipleIdentityIdVerificationResult::default())),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use drive::drive::verify::RootHash;
+    use drive::drive::Drive;
+    use std::collections::BTreeMap;
+
+    fn single_identity_proof() -> &'static [u8] {
+        &[
+            6, 0, 1, 0, 166, 3, 1, 74, 117, 207, 63, 83, 94, 129, 196, 104, 15, 129, 55, 162, 32,
+            141, 188, 178, 101, 47, 253, 126, 113, 91, 212, 41, 12, 197, 197, 96, 178, 204, 97, 2,
+            207, 190, 5, 53, 189, 45, 239, 229, 134, 184, 99, 185, 204, 185, 45, 13, 102, 251, 43,
+            129, 13, 115, 14, 123, 162, 203, 126, 47, 179, 2, 97, 59, 16, 4, 1, 24, 0, 24, 2, 1,
+            20, 174, 227, 2, 114, 8, 150, 187, 168, 55, 220, 243, 242, 214, 116, 245, 70, 253, 37,
+            73, 111, 0, 202, 53, 154, 161, 178, 3, 46, 49, 88, 174, 94, 92, 72, 159, 125, 70, 114,
+            47, 41, 100, 74, 21, 225, 207, 124, 57, 53, 179, 6, 6, 222, 246, 17, 4, 1, 32, 0, 36,
+            2, 1, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216,
+            67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162, 0, 160, 213, 164,
+            246, 65, 134, 99, 70, 133, 21, 205, 117, 24, 155, 227, 225, 3, 75, 191, 169, 161, 128,
+            126, 184, 29, 150, 75, 167, 68, 42, 11, 30, 16, 1, 105, 147, 24, 56, 86, 71, 7, 219,
+            241, 30, 144, 160, 89, 253, 125, 212, 83, 204, 126, 104, 173, 183, 210, 194, 55, 91,
+            174, 83, 86, 102, 100, 231, 17, 2, 86, 112, 117, 44, 195, 216, 131, 32, 10, 117, 152,
+            182, 92, 215, 75, 65, 167, 96, 204, 11, 229, 124, 218, 85, 54, 241, 95, 3, 200, 120,
+            58, 168, 16, 1, 195, 54, 53, 19, 110, 80, 46, 154, 197, 36, 75, 21, 162, 10, 117, 126,
+            7, 89, 206, 10, 144, 130, 60, 211, 127, 137, 63, 106, 73, 85, 109, 38, 4, 1, 96, 0, 45,
+            4, 1, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216,
+            67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162, 253, 28, 177, 42,
+            91, 38, 20, 0, 0, 0, 251, 189, 59, 224, 151, 231, 240, 125, 86, 25, 221, 105, 231, 118,
+            120, 132, 209, 22, 249, 90, 233, 165, 252, 219, 101, 30, 113, 114, 121, 2, 204, 30, 16,
+            1, 30, 12, 20, 67, 208, 146, 95, 120, 17, 50, 244, 197, 6, 116, 114, 2, 219, 255, 163,
+            202, 61, 237, 77, 35, 135, 212, 183, 228, 14, 3, 3, 227, 17, 17, 2, 1, 24, 127, 3, 20,
+            68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122, 242, 149, 191,
+            209, 26, 0, 35, 0, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77,
+            93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162, 0, 2,
+            158, 111, 45, 51, 177, 88, 0, 48, 227, 182, 3, 14, 60, 37, 1, 106, 183, 37, 57, 101,
+            104, 37, 86, 5, 157, 204, 36, 59, 117, 199, 250, 109, 16, 1, 224, 159, 136, 205, 9,
+            204, 89, 93, 82, 72, 146, 179, 230, 66, 185, 57, 242, 130, 121, 149, 96, 87, 3, 196,
+            156, 134, 31, 101, 48, 1, 213, 225, 17, 1, 1, 32, 77, 4, 32, 62, 171, 130, 51, 233, 19,
+            45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108,
+            99, 133, 34, 187, 243, 162, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 127, 174, 137, 184, 136,
+            178, 63, 79, 189, 174, 210, 251, 153, 10, 31, 66, 114, 122, 239, 91, 210, 168, 185, 31,
+            140, 185, 112, 87, 9, 9, 171, 57, 1, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183,
+            0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187,
+            243, 162, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4, 1, 1, 0, 5, 2, 1,
+            1, 1, 0, 214, 81, 34, 23, 150, 181, 32, 106, 91, 150, 120, 164, 217, 153, 93, 81, 157,
+            139, 158, 117, 232, 125, 133, 229, 126, 255, 185, 31, 130, 162, 62, 141, 16, 2, 188,
+            248, 74, 136, 44, 15, 114, 221, 13, 82, 10, 105, 84, 179, 225, 136, 127, 165, 91, 125,
+            198, 118, 53, 180, 69, 22, 133, 107, 49, 253, 32, 168, 16, 1, 70, 25, 123, 162, 209,
+            216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32, 20, 204, 112, 76, 86,
+            112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 148, 1, 3, 1, 0, 0, 30, 0, 27, 0,
+            0, 1, 2, 0, 20, 68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122,
+            242, 149, 191, 209, 26, 0, 0, 3, 1, 1, 0, 58, 0, 55, 1, 0, 2, 1, 0, 48, 151, 57, 136,
+            178, 145, 253, 27, 202, 134, 217, 6, 114, 62, 51, 91, 223, 19, 211, 235, 186, 223, 234,
+            49, 221, 22, 75, 60, 103, 44, 22, 218, 114, 175, 142, 110, 223, 192, 186, 196, 75, 146,
+            184, 197, 54, 215, 8, 220, 51, 0, 0, 16, 3, 1, 2, 0, 43, 0, 40, 2, 0, 3, 0, 0, 33, 3,
+            96, 218, 121, 197, 137, 149, 228, 236, 136, 81, 42, 249, 164, 68, 12, 164, 242, 215,
+            191, 232, 66, 64, 225, 126, 255, 196, 221, 140, 233, 64, 51, 162, 0, 0, 17, 2, 1, 96,
+            79, 4, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216,
+            67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162, 0, 11, 3, 253, 28,
+            177, 42, 91, 38, 20, 0, 0, 0, 104, 243, 24, 41, 234, 236, 2, 247, 229, 237, 218, 218,
+            18, 157, 73, 129, 169, 155, 218, 14, 92, 15, 212, 239, 243, 194, 62, 175, 194, 199,
+            154, 2,
+        ]
+    }
+
+    fn multiple_identity_proof() -> &'static [u8] {
+        &[
+            6, 0, 1, 0, 166, 3, 1, 74, 117, 207, 63, 83, 94, 129, 196, 104, 15, 129, 55, 162, 32,
+            141, 188, 178, 101, 47, 253, 126, 113, 91, 212, 41, 12, 197, 197, 96, 178, 204, 97, 2,
+            207, 190, 5, 53, 189, 45, 239, 229, 134, 184, 99, 185, 204, 185, 45, 13, 102, 251, 43,
+            129, 13, 115, 14, 123, 162, 203, 126, 47, 179, 2, 97, 59, 16, 4, 1, 24, 0, 24, 2, 1,
+            20, 94, 14, 73, 216, 8, 173, 33, 208, 29, 7, 221, 121, 154, 117, 189, 27, 71, 39, 136,
+            167, 0, 140, 16, 170, 76, 29, 25, 226, 231, 228, 47, 224, 177, 167, 246, 217, 61, 76,
+            11, 105, 146, 239, 99, 234, 152, 92, 22, 68, 124, 173, 164, 98, 149, 17, 4, 1, 32, 0,
+            36, 2, 1, 32, 53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5, 68, 98, 199, 232,
+            192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128, 140, 48, 0, 186, 86,
+            207, 177, 216, 126, 244, 120, 87, 246, 177, 205, 127, 185, 24, 64, 111, 213, 15, 129,
+            150, 102, 25, 119, 125, 212, 193, 181, 149, 161, 162, 110, 16, 1, 105, 147, 24, 56, 86,
+            71, 7, 219, 241, 30, 144, 160, 89, 253, 125, 212, 83, 204, 126, 104, 173, 183, 210,
+            194, 55, 91, 174, 83, 86, 102, 100, 231, 17, 2, 86, 112, 117, 44, 195, 216, 131, 32,
+            10, 117, 152, 182, 92, 215, 75, 65, 167, 96, 204, 11, 229, 124, 218, 85, 54, 241, 95,
+            3, 200, 120, 58, 168, 16, 1, 195, 54, 53, 19, 110, 80, 46, 154, 197, 36, 75, 21, 162,
+            10, 117, 126, 7, 89, 206, 10, 144, 130, 60, 211, 127, 137, 63, 106, 73, 85, 109, 38, 4,
+            1, 96, 0, 45, 4, 1, 32, 53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5, 68, 98,
+            199, 232, 192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128, 140, 48,
+            253, 186, 253, 104, 51, 174, 183, 0, 0, 0, 18, 178, 127, 74, 10, 124, 253, 6, 227, 56,
+            123, 51, 165, 188, 166, 104, 41, 83, 81, 46, 33, 98, 26, 233, 207, 109, 99, 61, 144,
+            65, 119, 25, 16, 1, 30, 12, 20, 67, 208, 146, 95, 120, 17, 50, 244, 197, 6, 116, 114,
+            2, 219, 255, 163, 202, 61, 237, 77, 35, 135, 212, 183, 228, 14, 3, 3, 227, 17, 17, 2,
+            1, 24, 179, 8, 1, 50, 201, 211, 88, 68, 213, 206, 42, 142, 15, 55, 124, 238, 35, 193,
+            67, 165, 51, 150, 7, 61, 234, 134, 196, 148, 184, 107, 164, 196, 175, 11, 57, 3, 20,
+            31, 8, 21, 38, 154, 252, 1, 45, 228, 66, 96, 206, 178, 138, 68, 150, 211, 24, 65, 132,
+            0, 35, 0, 32, 15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241,
+            108, 23, 39, 205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203, 0, 16, 1,
+            104, 87, 110, 36, 82, 30, 3, 186, 75, 98, 73, 18, 187, 7, 131, 55, 103, 200, 17, 2, 49,
+            11, 135, 216, 234, 28, 175, 39, 149, 198, 143, 146, 17, 2, 232, 183, 235, 55, 111, 15,
+            121, 147, 186, 223, 147, 151, 31, 105, 11, 232, 164, 143, 9, 219, 7, 17, 240, 82, 162,
+            237, 72, 71, 20, 151, 185, 208, 16, 3, 20, 68, 99, 161, 169, 148, 213, 4, 14, 105, 192,
+            144, 182, 152, 93, 122, 242, 149, 191, 209, 26, 0, 35, 0, 32, 62, 171, 130, 51, 233,
+            19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35,
+            108, 99, 133, 34, 187, 243, 162, 0, 2, 37, 75, 240, 169, 144, 190, 183, 33, 194, 31,
+            33, 232, 219, 171, 80, 227, 60, 217, 207, 9, 97, 143, 194, 124, 159, 116, 80, 198, 115,
+            81, 106, 238, 16, 1, 198, 173, 254, 8, 24, 9, 33, 142, 224, 116, 97, 249, 95, 83, 206,
+            108, 228, 98, 236, 55, 159, 151, 167, 31, 27, 228, 15, 114, 24, 203, 80, 175, 17, 17,
+            3, 20, 94, 14, 73, 216, 8, 173, 33, 208, 29, 7, 221, 121, 154, 117, 189, 27, 71, 39,
+            136, 167, 0, 35, 0, 32, 53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5, 68, 98,
+            199, 232, 192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128, 140, 48,
+            0, 16, 1, 164, 179, 25, 152, 212, 124, 48, 227, 144, 244, 250, 86, 242, 143, 25, 198,
+            47, 17, 79, 23, 167, 4, 210, 156, 86, 226, 139, 111, 219, 71, 241, 1, 3, 20, 103, 137,
+            42, 243, 144, 205, 43, 118, 83, 169, 24, 199, 182, 146, 200, 91, 135, 180, 77, 50, 0,
+            35, 0, 32, 57, 148, 116, 246, 83, 186, 107, 123, 56, 57, 164, 62, 208, 250, 53, 255,
+            205, 221, 94, 250, 29, 14, 112, 130, 148, 27, 214, 36, 12, 33, 159, 128, 0, 16, 1, 235,
+            77, 169, 119, 51, 138, 61, 164, 32, 78, 170, 172, 12, 136, 86, 189, 253, 81, 217, 178,
+            92, 238, 240, 75, 64, 187, 56, 239, 247, 154, 177, 16, 17, 2, 31, 34, 16, 36, 41, 219,
+            225, 188, 12, 167, 20, 132, 123, 8, 24, 125, 154, 135, 76, 196, 51, 41, 170, 167, 150,
+            71, 251, 154, 160, 131, 77, 105, 16, 3, 20, 154, 6, 31, 49, 115, 76, 95, 95, 11, 17,
+            154, 183, 45, 67, 60, 154, 241, 51, 211, 166, 0, 35, 0, 32, 232, 241, 234, 234, 48, 58,
+            184, 92, 10, 32, 220, 110, 128, 186, 85, 30, 63, 171, 43, 133, 112, 35, 25, 161, 34,
+            229, 80, 168, 115, 74, 228, 51, 0, 2, 100, 76, 96, 30, 103, 105, 33, 136, 207, 90, 151,
+            92, 34, 7, 202, 186, 137, 157, 153, 241, 187, 212, 182, 46, 95, 232, 86, 133, 11, 157,
+            114, 134, 16, 3, 20, 165, 73, 33, 187, 41, 182, 126, 49, 137, 142, 254, 188, 41, 242,
+            65, 177, 174, 250, 77, 202, 0, 35, 0, 32, 127, 61, 253, 44, 203, 5, 79, 65, 14, 231,
+            126, 176, 46, 231, 180, 234, 150, 7, 149, 216, 151, 70, 205, 194, 38, 221, 216, 153,
+            230, 172, 78, 81, 0, 16, 2, 158, 111, 45, 51, 177, 88, 0, 48, 227, 182, 3, 14, 60, 37,
+            1, 106, 183, 37, 57, 101, 104, 37, 86, 5, 157, 204, 36, 59, 117, 199, 250, 109, 3, 20,
+            179, 191, 206, 71, 141, 233, 111, 227, 12, 211, 113, 59, 248, 140, 231, 114, 134, 135,
+            218, 138, 0, 35, 0, 32, 168, 155, 161, 167, 178, 189, 91, 153, 252, 27, 238, 224, 90,
+            202, 85, 135, 174, 60, 251, 70, 40, 210, 160, 53, 143, 32, 130, 82, 183, 232, 190, 64,
+            0, 17, 17, 17, 3, 20, 187, 61, 240, 37, 227, 47, 217, 13, 31, 238, 231, 220, 164, 184,
+            51, 33, 198, 131, 41, 45, 0, 35, 0, 32, 3, 193, 33, 26, 169, 210, 98, 57, 198, 220,
+            161, 230, 203, 29, 187, 130, 102, 254, 43, 149, 0, 248, 105, 156, 132, 170, 144, 214,
+            35, 247, 177, 211, 0, 16, 1, 238, 8, 71, 128, 91, 20, 91, 95, 181, 0, 177, 57, 254, 18,
+            118, 126, 230, 129, 252, 49, 10, 33, 214, 233, 129, 70, 25, 223, 81, 135, 71, 8, 2,
+            160, 222, 53, 47, 230, 118, 125, 167, 191, 76, 51, 186, 125, 45, 168, 219, 4, 64, 69,
+            120, 53, 211, 194, 153, 36, 115, 33, 14, 2, 182, 49, 44, 16, 1, 224, 159, 136, 205, 9,
+            204, 89, 93, 82, 72, 146, 179, 230, 66, 185, 57, 242, 130, 121, 149, 96, 87, 3, 196,
+            156, 134, 31, 101, 48, 1, 213, 225, 2, 154, 86, 60, 152, 61, 32, 37, 32, 193, 169, 79,
+            76, 107, 169, 151, 80, 55, 52, 80, 170, 249, 220, 178, 166, 46, 245, 14, 152, 119, 100,
+            96, 67, 16, 3, 20, 237, 115, 138, 170, 221, 117, 209, 103, 127, 239, 236, 202, 221, 3,
+            63, 18, 108, 254, 231, 106, 0, 35, 0, 32, 151, 172, 124, 81, 243, 147, 225, 5, 188,
+            204, 9, 152, 150, 127, 129, 13, 246, 19, 141, 93, 239, 8, 214, 194, 123, 127, 177, 23,
+            144, 211, 189, 239, 0, 3, 20, 251, 217, 218, 165, 153, 61, 229, 106, 46, 67, 70, 183,
+            199, 47, 245, 88, 94, 255, 250, 171, 0, 35, 0, 32, 27, 36, 15, 203, 78, 99, 46, 120,
+            86, 191, 245, 139, 120, 77, 206, 188, 25, 57, 140, 115, 78, 198, 0, 196, 101, 253, 233,
+            90, 35, 102, 219, 235, 0, 16, 17, 17, 17, 17, 1, 1, 32, 139, 6, 4, 32, 3, 193, 33, 26,
+            169, 210, 98, 57, 198, 220, 161, 230, 203, 29, 187, 130, 102, 254, 43, 149, 0, 248,
+            105, 156, 132, 170, 144, 214, 35, 247, 177, 211, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 108,
+            75, 252, 242, 35, 205, 79, 229, 193, 202, 200, 46, 26, 158, 44, 115, 235, 14, 127, 52,
+            206, 186, 189, 215, 99, 14, 36, 203, 25, 47, 151, 88, 4, 32, 15, 126, 159, 152, 150,
+            254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23, 39, 205, 99, 217, 219, 86,
+            244, 213, 176, 67, 34, 242, 146, 86, 203, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 128, 218,
+            98, 172, 184, 196, 159, 144, 29, 107, 248, 74, 42, 42, 241, 84, 49, 230, 158, 41, 6,
+            154, 191, 141, 2, 242, 193, 19, 198, 9, 155, 166, 16, 4, 32, 27, 36, 15, 203, 78, 99,
+            46, 120, 86, 191, 245, 139, 120, 77, 206, 188, 25, 57, 140, 115, 78, 198, 0, 196, 101,
+            253, 233, 90, 35, 102, 219, 235, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 81, 162, 48, 73, 239,
+            188, 222, 58, 14, 156, 133, 234, 122, 240, 90, 40, 212, 222, 49, 249, 10, 228, 74, 7,
+            197, 250, 24, 9, 1, 40, 35, 112, 17, 4, 32, 53, 168, 221, 106, 101, 237, 66, 153, 18,
+            210, 219, 5, 68, 98, 199, 232, 192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180, 200,
+            129, 128, 140, 48, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 42, 57, 7, 97, 185, 151, 137, 122,
+            254, 81, 84, 12, 57, 223, 235, 92, 120, 208, 7, 129, 165, 71, 210, 184, 59, 30, 114,
+            37, 152, 148, 222, 165, 16, 4, 32, 57, 148, 116, 246, 83, 186, 107, 123, 56, 57, 164,
+            62, 208, 250, 53, 255, 205, 221, 94, 250, 29, 14, 112, 130, 148, 27, 214, 36, 12, 33,
+            159, 128, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 179, 242, 143, 156, 194, 109, 249, 14, 164,
+            158, 19, 227, 205, 151, 192, 29, 119, 46, 157, 102, 9, 69, 62, 145, 212, 54, 158, 247,
+            142, 56, 128, 160, 4, 32, 62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182,
+            77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162, 0,
+            9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 127, 174, 137, 184, 136, 178, 63, 79, 189, 174, 210, 251,
+            153, 10, 31, 66, 114, 122, 239, 91, 210, 168, 185, 31, 140, 185, 112, 87, 9, 9, 171,
+            57, 16, 4, 32, 127, 61, 253, 44, 203, 5, 79, 65, 14, 231, 126, 176, 46, 231, 180, 234,
+            150, 7, 149, 216, 151, 70, 205, 194, 38, 221, 216, 153, 230, 172, 78, 81, 0, 9, 2, 1,
+            1, 2, 1, 3, 0, 0, 0, 29, 100, 163, 249, 39, 11, 248, 184, 16, 67, 5, 186, 118, 130,
+            148, 114, 243, 170, 194, 182, 255, 242, 11, 152, 172, 16, 54, 30, 197, 71, 63, 187, 17,
+            4, 32, 151, 172, 124, 81, 243, 147, 225, 5, 188, 204, 9, 152, 150, 127, 129, 13, 246,
+            19, 141, 93, 239, 8, 214, 194, 123, 127, 177, 23, 144, 211, 189, 239, 0, 9, 2, 1, 1, 2,
+            1, 3, 0, 0, 0, 173, 183, 101, 112, 214, 79, 137, 101, 6, 134, 223, 88, 25, 65, 78, 94,
+            66, 207, 126, 237, 171, 36, 96, 90, 166, 60, 75, 142, 38, 233, 14, 218, 16, 4, 32, 168,
+            155, 161, 167, 178, 189, 91, 153, 252, 27, 238, 224, 90, 202, 85, 135, 174, 60, 251,
+            70, 40, 210, 160, 53, 143, 32, 130, 82, 183, 232, 190, 64, 0, 9, 2, 1, 1, 2, 1, 3, 0,
+            0, 0, 165, 168, 83, 4, 22, 217, 70, 37, 33, 182, 253, 147, 39, 35, 216, 151, 22, 132,
+            180, 98, 14, 66, 84, 202, 240, 156, 117, 40, 158, 14, 100, 112, 4, 32, 232, 241, 234,
+            234, 48, 58, 184, 92, 10, 32, 220, 110, 128, 186, 85, 30, 63, 171, 43, 133, 112, 35,
+            25, 161, 34, 229, 80, 168, 115, 74, 228, 51, 0, 9, 2, 1, 1, 2, 1, 3, 0, 0, 0, 250, 29,
+            144, 127, 150, 124, 72, 41, 42, 90, 243, 212, 195, 170, 212, 53, 194, 238, 146, 55, 17,
+            150, 20, 214, 18, 174, 227, 180, 245, 46, 54, 20, 17, 17, 17, 1, 32, 3, 193, 33, 26,
+            169, 210, 98, 57, 198, 220, 161, 230, 203, 29, 187, 130, 102, 254, 43, 149, 0, 248,
+            105, 156, 132, 170, 144, 214, 35, 247, 177, 211, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0,
+            0, 0, 0, 61, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 114, 204, 69, 18, 112, 198, 19, 132, 211,
+            88, 247, 212, 17, 53, 183, 135, 136, 1, 24, 48, 48, 26, 105, 123, 151, 163, 113, 76,
+            32, 58, 54, 220, 16, 2, 20, 16, 91, 223, 25, 20, 145, 182, 114, 73, 211, 33, 243, 217,
+            190, 189, 248, 44, 154, 51, 149, 254, 243, 54, 198, 11, 55, 1, 175, 5, 147, 231, 16, 1,
+            70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32,
+            20, 204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 163, 1, 3, 1,
+            0, 0, 30, 0, 27, 0, 0, 2, 3, 0, 20, 187, 61, 240, 37, 227, 47, 217, 13, 31, 238, 231,
+            220, 164, 184, 51, 33, 198, 131, 41, 45, 0, 0, 3, 1, 1, 0, 58, 0, 55, 1, 0, 1, 1, 0,
+            48, 165, 253, 2, 201, 109, 95, 96, 235, 84, 177, 91, 4, 58, 132, 237, 128, 160, 175,
+            128, 78, 255, 74, 43, 254, 161, 252, 159, 237, 50, 50, 50, 199, 171, 18, 7, 35, 104, 9,
+            126, 85, 100, 57, 208, 138, 160, 166, 134, 108, 0, 0, 16, 3, 1, 2, 0, 58, 0, 55, 2, 0,
+            0, 1, 0, 48, 133, 255, 0, 230, 51, 147, 103, 211, 227, 30, 39, 203, 195, 60, 19, 195,
+            205, 12, 110, 151, 58, 91, 144, 46, 118, 102, 141, 122, 109, 175, 131, 193, 41, 37,
+            124, 199, 249, 204, 53, 225, 192, 104, 154, 109, 240, 58, 137, 29, 0, 0, 17, 1, 32, 15,
+            126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23, 39, 205,
+            99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203, 127, 3, 1, 0, 0, 11, 0, 8,
+            0, 0, 0, 0, 0, 0, 0, 3, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 120, 58, 98, 103, 109, 191,
+            253, 1, 47, 147, 67, 239, 10, 247, 28, 27, 128, 12, 218, 25, 128, 22, 137, 223, 183,
+            226, 55, 44, 204, 195, 237, 157, 16, 2, 127, 14, 148, 229, 76, 99, 255, 220, 211, 211,
+            217, 1, 122, 99, 232, 47, 153, 132, 173, 229, 196, 250, 165, 157, 36, 121, 193, 16, 7,
+            147, 37, 36, 16, 1, 70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113,
+            102, 210, 182, 213, 32, 20, 204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223,
+            17, 2, 1, 1, 120, 3, 1, 0, 0, 43, 0, 40, 0, 0, 2, 0, 0, 33, 3, 254, 101, 252, 220, 254,
+            36, 45, 194, 228, 61, 101, 66, 116, 236, 156, 225, 187, 188, 157, 213, 161, 200, 137,
+            69, 238, 239, 24, 204, 147, 21, 31, 127, 0, 0, 3, 1, 1, 0, 30, 0, 27, 1, 0, 1, 3, 0,
+            20, 201, 79, 70, 207, 56, 184, 56, 98, 153, 15, 120, 44, 132, 172, 188, 23, 141, 123,
+            2, 218, 0, 0, 16, 3, 1, 2, 0, 30, 0, 27, 2, 0, 2, 3, 0, 20, 38, 211, 135, 217, 136, 72,
+            98, 249, 97, 96, 221, 89, 202, 89, 107, 220, 232, 45, 167, 70, 0, 0, 17, 1, 32, 27, 36,
+            15, 203, 78, 99, 46, 120, 86, 191, 245, 139, 120, 77, 206, 188, 25, 57, 140, 115, 78,
+            198, 0, 196, 101, 253, 233, 90, 35, 102, 219, 235, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0,
+            0, 0, 0, 0, 96, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 202, 58, 16, 234, 179, 184, 137, 70,
+            91, 186, 81, 188, 83, 84, 19, 26, 238, 16, 68, 229, 16, 217, 237, 74, 112, 104, 209,
+            24, 28, 125, 191, 205, 16, 2, 150, 38, 236, 43, 78, 136, 97, 198, 117, 178, 11, 196,
+            69, 99, 51, 216, 196, 31, 208, 192, 185, 201, 240, 183, 128, 71, 198, 99, 78, 186, 184,
+            239, 16, 1, 70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210,
+            182, 213, 32, 20, 204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1,
+            133, 1, 3, 1, 0, 0, 30, 0, 27, 0, 0, 3, 2, 0, 20, 251, 217, 218, 165, 153, 61, 229,
+            106, 46, 67, 70, 183, 199, 47, 245, 88, 94, 255, 250, 171, 0, 0, 3, 1, 1, 0, 43, 0, 40,
+            1, 0, 3, 0, 0, 33, 3, 253, 201, 64, 62, 182, 240, 5, 219, 112, 14, 120, 65, 98, 127,
+            79, 146, 231, 198, 93, 22, 115, 132, 205, 87, 164, 244, 228, 101, 131, 194, 26, 254, 0,
+            0, 16, 3, 1, 2, 0, 43, 0, 40, 2, 0, 0, 0, 0, 33, 3, 112, 52, 70, 247, 124, 141, 177,
+            251, 172, 111, 52, 34, 200, 224, 69, 9, 138, 219, 102, 44, 11, 98, 10, 21, 184, 196,
+            217, 236, 210, 163, 222, 250, 0, 0, 17, 1, 32, 53, 168, 221, 106, 101, 237, 66, 153,
+            18, 210, 219, 5, 68, 98, 199, 232, 192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180,
+            200, 129, 128, 140, 48, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 66, 0, 4, 1, 1,
+            0, 5, 2, 1, 1, 1, 0, 215, 243, 151, 168, 22, 242, 63, 50, 233, 166, 205, 42, 181, 176,
+            61, 91, 109, 48, 116, 44, 240, 181, 133, 23, 242, 118, 217, 247, 92, 28, 77, 97, 16, 2,
+            191, 213, 104, 106, 224, 210, 167, 104, 76, 47, 110, 211, 167, 65, 154, 67, 106, 83,
+            137, 175, 201, 168, 74, 27, 178, 42, 29, 236, 223, 167, 98, 93, 16, 1, 70, 25, 123,
+            162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32, 20, 204,
+            112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 163, 1, 3, 1, 0, 0,
+            30, 0, 27, 0, 0, 2, 3, 0, 20, 94, 14, 73, 216, 8, 173, 33, 208, 29, 7, 221, 121, 154,
+            117, 189, 27, 71, 39, 136, 167, 0, 0, 3, 1, 1, 0, 58, 0, 55, 1, 0, 0, 1, 0, 48, 151,
+            200, 216, 16, 45, 33, 104, 24, 198, 147, 220, 70, 97, 76, 233, 36, 43, 142, 84, 224,
+            90, 143, 241, 245, 32, 163, 105, 75, 148, 129, 9, 29, 146, 144, 107, 19, 185, 178, 118,
+            43, 18, 126, 228, 240, 126, 145, 17, 158, 0, 0, 16, 3, 1, 2, 0, 58, 0, 55, 2, 0, 3, 1,
+            0, 48, 137, 73, 201, 109, 218, 132, 146, 104, 4, 78, 23, 109, 189, 186, 69, 143, 181,
+            222, 172, 129, 233, 145, 135, 147, 189, 184, 55, 245, 175, 238, 12, 36, 150, 165, 147,
+            13, 70, 209, 254, 55, 206, 83, 108, 190, 248, 233, 91, 180, 0, 0, 17, 1, 32, 57, 148,
+            116, 246, 83, 186, 107, 123, 56, 57, 164, 62, 208, 250, 53, 255, 205, 221, 94, 250, 29,
+            14, 112, 130, 148, 27, 214, 36, 12, 33, 159, 128, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0,
+            0, 0, 0, 0, 12, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 169, 64, 58, 164, 8, 175, 53, 210,
+            103, 152, 13, 255, 241, 112, 109, 112, 165, 155, 109, 186, 134, 125, 11, 86, 140, 168,
+            197, 183, 117, 96, 214, 122, 16, 2, 118, 203, 254, 130, 45, 123, 159, 104, 99, 249,
+            160, 107, 102, 128, 151, 69, 142, 18, 63, 243, 133, 227, 28, 41, 216, 48, 208, 63, 17,
+            72, 151, 58, 16, 1, 70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113,
+            102, 210, 182, 213, 32, 20, 204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223,
+            17, 2, 1, 1, 135, 1, 3, 1, 0, 0, 58, 0, 55, 0, 0, 0, 1, 0, 48, 183, 157, 76, 170, 134,
+            95, 132, 32, 113, 36, 195, 211, 4, 67, 3, 114, 243, 157, 124, 24, 162, 55, 223, 58,
+            113, 227, 196, 251, 123, 169, 171, 152, 22, 67, 154, 128, 155, 235, 134, 6, 195, 187,
+            82, 213, 58, 83, 100, 89, 0, 0, 3, 1, 1, 0, 30, 0, 27, 1, 0, 3, 2, 0, 20, 100, 6, 165,
+            8, 43, 35, 19, 64, 114, 109, 76, 208, 222, 36, 82, 188, 115, 163, 48, 3, 0, 0, 16, 3,
+            1, 2, 0, 30, 0, 27, 2, 0, 1, 3, 0, 20, 74, 199, 180, 47, 82, 78, 29, 27, 34, 9, 143,
+            133, 173, 252, 167, 82, 96, 14, 249, 160, 0, 0, 17, 1, 32, 62, 171, 130, 51, 233, 19,
+            45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108,
+            99, 133, 34, 187, 243, 162, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 16, 0, 4,
+            1, 1, 0, 5, 2, 1, 1, 1, 0, 214, 81, 34, 23, 150, 181, 32, 106, 91, 150, 120, 164, 217,
+            153, 93, 81, 157, 139, 158, 117, 232, 125, 133, 229, 126, 255, 185, 31, 130, 162, 62,
+            141, 16, 2, 188, 248, 74, 136, 44, 15, 114, 221, 13, 82, 10, 105, 84, 179, 225, 136,
+            127, 165, 91, 125, 198, 118, 53, 180, 69, 22, 133, 107, 49, 253, 32, 168, 16, 1, 70,
+            25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32, 20,
+            204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 148, 1, 3, 1, 0,
+            0, 30, 0, 27, 0, 0, 1, 2, 0, 20, 68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182,
+            152, 93, 122, 242, 149, 191, 209, 26, 0, 0, 3, 1, 1, 0, 58, 0, 55, 1, 0, 2, 1, 0, 48,
+            151, 57, 136, 178, 145, 253, 27, 202, 134, 217, 6, 114, 62, 51, 91, 223, 19, 211, 235,
+            186, 223, 234, 49, 221, 22, 75, 60, 103, 44, 22, 218, 114, 175, 142, 110, 223, 192,
+            186, 196, 75, 146, 184, 197, 54, 215, 8, 220, 51, 0, 0, 16, 3, 1, 2, 0, 43, 0, 40, 2,
+            0, 3, 0, 0, 33, 3, 96, 218, 121, 197, 137, 149, 228, 236, 136, 81, 42, 249, 164, 68,
+            12, 164, 242, 215, 191, 232, 66, 64, 225, 126, 255, 196, 221, 140, 233, 64, 51, 162, 0,
+            0, 17, 1, 32, 127, 61, 253, 44, 203, 5, 79, 65, 14, 231, 126, 176, 46, 231, 180, 234,
+            150, 7, 149, 216, 151, 70, 205, 194, 38, 221, 216, 153, 230, 172, 78, 81, 127, 3, 1, 0,
+            0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 88, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 217, 95, 249,
+            131, 219, 147, 62, 220, 103, 84, 135, 166, 244, 227, 136, 252, 242, 219, 89, 49, 58,
+            234, 181, 244, 89, 145, 167, 242, 71, 23, 116, 71, 16, 2, 53, 95, 152, 195, 143, 216,
+            124, 165, 119, 94, 94, 69, 18, 67, 235, 17, 48, 14, 217, 31, 201, 80, 234, 32, 76, 10,
+            116, 185, 161, 153, 26, 37, 16, 1, 70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56,
+            180, 32, 113, 102, 210, 182, 213, 32, 20, 204, 112, 76, 86, 112, 130, 191, 29, 189,
+            101, 249, 223, 17, 2, 1, 1, 163, 1, 3, 1, 0, 0, 58, 0, 55, 0, 0, 3, 1, 0, 48, 179, 66,
+            56, 68, 186, 232, 165, 145, 187, 251, 67, 123, 85, 86, 107, 93, 97, 229, 78, 230, 79,
+            147, 53, 27, 10, 59, 157, 75, 115, 20, 69, 210, 92, 227, 103, 247, 174, 223, 203, 50,
+            189, 60, 209, 67, 8, 165, 76, 245, 0, 0, 3, 1, 1, 0, 58, 0, 55, 1, 0, 1, 1, 0, 48, 161,
+            84, 193, 144, 130, 172, 107, 95, 236, 114, 184, 31, 100, 136, 85, 15, 236, 113, 73,
+            213, 47, 102, 180, 70, 57, 21, 166, 17, 121, 196, 241, 248, 80, 125, 54, 102, 20, 180,
+            84, 218, 191, 44, 148, 34, 53, 202, 173, 1, 0, 0, 16, 3, 1, 2, 0, 30, 0, 27, 2, 0, 3,
+            3, 0, 20, 10, 140, 20, 116, 92, 152, 47, 159, 220, 67, 170, 152, 92, 2, 177, 229, 191,
+            246, 196, 3, 0, 0, 17, 1, 32, 151, 172, 124, 81, 243, 147, 225, 5, 188, 204, 9, 152,
+            150, 127, 129, 13, 246, 19, 141, 93, 239, 8, 214, 194, 123, 127, 177, 23, 144, 211,
+            189, 239, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 98, 0, 4, 1, 1, 0, 5, 2, 1,
+            1, 1, 0, 65, 44, 30, 125, 226, 57, 77, 205, 0, 146, 35, 235, 140, 58, 36, 227, 75, 147,
+            167, 196, 141, 240, 187, 134, 73, 145, 96, 163, 30, 169, 219, 219, 16, 2, 24, 5, 144,
+            238, 195, 51, 151, 3, 70, 117, 243, 121, 207, 23, 246, 44, 14, 119, 209, 119, 36, 160,
+            50, 56, 220, 211, 242, 22, 164, 188, 149, 9, 16, 1, 70, 25, 123, 162, 209, 216, 154,
+            230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32, 20, 204, 112, 76, 86, 112, 130,
+            191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 148, 1, 3, 1, 0, 0, 58, 0, 55, 0, 0, 2, 1, 0,
+            48, 175, 164, 55, 10, 165, 164, 138, 178, 243, 171, 81, 12, 202, 186, 59, 109, 140,
+            245, 23, 82, 48, 69, 7, 230, 163, 65, 196, 228, 255, 106, 167, 192, 118, 16, 165, 3,
+            180, 47, 71, 152, 52, 176, 50, 210, 93, 209, 96, 89, 0, 0, 3, 1, 1, 0, 43, 0, 40, 1, 0,
+            3, 0, 0, 33, 3, 169, 88, 76, 69, 128, 209, 101, 210, 116, 75, 164, 154, 112, 71, 38,
+            83, 145, 91, 253, 190, 196, 190, 244, 113, 226, 108, 228, 193, 201, 230, 198, 171, 0,
+            0, 16, 3, 1, 2, 0, 30, 0, 27, 2, 0, 1, 2, 0, 20, 69, 208, 69, 88, 162, 107, 140, 160,
+            75, 72, 105, 87, 200, 171, 245, 171, 242, 78, 199, 111, 0, 0, 17, 1, 32, 168, 155, 161,
+            167, 178, 189, 91, 153, 252, 27, 238, 224, 90, 202, 85, 135, 174, 60, 251, 70, 40, 210,
+            160, 53, 143, 32, 130, 82, 183, 232, 190, 64, 127, 3, 1, 0, 0, 11, 0, 8, 0, 0, 0, 0, 0,
+            0, 0, 93, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 241, 64, 24, 106, 107, 212, 19, 165, 8, 20,
+            219, 72, 75, 0, 57, 140, 46, 126, 109, 169, 251, 226, 203, 83, 103, 40, 232, 128, 222,
+            183, 80, 96, 16, 2, 119, 103, 247, 95, 222, 212, 127, 148, 166, 248, 28, 103, 29, 68,
+            139, 237, 219, 108, 39, 39, 241, 242, 9, 186, 1, 91, 248, 222, 115, 49, 193, 60, 16, 1,
+            70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56, 180, 32, 113, 102, 210, 182, 213, 32,
+            20, 204, 112, 76, 86, 112, 130, 191, 29, 189, 101, 249, 223, 17, 2, 1, 1, 133, 1, 3, 1,
+            0, 0, 43, 0, 40, 0, 0, 0, 0, 0, 33, 2, 238, 189, 47, 145, 129, 138, 35, 78, 24, 121,
+            248, 165, 86, 82, 241, 229, 36, 25, 173, 22, 139, 143, 39, 185, 27, 230, 183, 153, 88,
+            247, 165, 81, 0, 0, 3, 1, 1, 0, 43, 0, 40, 1, 0, 2, 0, 0, 33, 2, 20, 169, 29, 252, 179,
+            103, 24, 32, 154, 94, 231, 156, 41, 0, 41, 184, 73, 241, 206, 47, 238, 246, 88, 90, 59,
+            63, 163, 125, 4, 251, 98, 183, 0, 0, 16, 3, 1, 2, 0, 30, 0, 27, 2, 0, 3, 2, 0, 20, 78,
+            228, 144, 8, 65, 96, 252, 139, 30, 115, 54, 29, 90, 76, 5, 91, 238, 231, 125, 140, 0,
+            0, 17, 1, 32, 232, 241, 234, 234, 48, 58, 184, 92, 10, 32, 220, 110, 128, 186, 85, 30,
+            63, 171, 43, 133, 112, 35, 25, 161, 34, 229, 80, 168, 115, 74, 228, 51, 127, 3, 1, 0,
+            0, 11, 0, 8, 0, 0, 0, 0, 0, 0, 0, 79, 0, 4, 1, 1, 0, 5, 2, 1, 1, 1, 0, 235, 144, 179,
+            198, 217, 165, 71, 227, 184, 161, 17, 31, 98, 30, 13, 190, 91, 252, 104, 168, 25, 99,
+            113, 212, 151, 203, 41, 18, 250, 128, 157, 0, 16, 2, 171, 128, 206, 123, 108, 164, 135,
+            93, 188, 125, 193, 240, 217, 2, 85, 22, 40, 201, 123, 35, 131, 194, 125, 4, 83, 141,
+            70, 169, 125, 60, 173, 67, 16, 1, 70, 25, 123, 162, 209, 216, 154, 230, 95, 14, 56,
+            180, 32, 113, 102, 210, 182, 213, 32, 20, 204, 112, 76, 86, 112, 130, 191, 29, 189,
+            101, 249, 223, 17, 2, 1, 1, 135, 1, 3, 1, 0, 0, 30, 0, 27, 0, 0, 2, 3, 0, 20, 154, 6,
+            31, 49, 115, 76, 95, 95, 11, 17, 154, 183, 45, 67, 60, 154, 241, 51, 211, 166, 0, 0, 3,
+            1, 1, 0, 58, 0, 55, 1, 0, 1, 1, 0, 48, 150, 225, 252, 99, 25, 52, 161, 74, 205, 49, 63,
+            242, 140, 162, 156, 158, 155, 67, 24, 27, 141, 242, 147, 134, 112, 43, 26, 45, 101,
+            167, 204, 130, 54, 131, 245, 115, 62, 41, 111, 180, 12, 115, 100, 139, 201, 203, 246,
+            37, 0, 0, 16, 3, 1, 2, 0, 30, 0, 27, 2, 0, 1, 2, 0, 20, 116, 241, 133, 170, 82, 127,
+            49, 32, 36, 66, 210, 8, 205, 178, 144, 95, 167, 20, 3, 41, 0, 0, 17, 2, 1, 96, 159, 6,
+            4, 32, 3, 193, 33, 26, 169, 210, 98, 57, 198, 220, 161, 230, 203, 29, 187, 130, 102,
+            254, 43, 149, 0, 248, 105, 156, 132, 170, 144, 214, 35, 247, 177, 211, 0, 11, 3, 253,
+            164, 217, 58, 64, 48, 23, 0, 0, 0, 149, 132, 12, 107, 224, 86, 237, 61, 25, 157, 237,
+            245, 38, 90, 93, 61, 175, 209, 149, 170, 76, 181, 76, 162, 105, 67, 247, 224, 146, 165,
+            240, 105, 4, 32, 15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215,
+            241, 108, 23, 39, 205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203, 0,
+            11, 3, 253, 98, 19, 45, 65, 7, 24, 0, 0, 0, 185, 222, 201, 37, 149, 229, 234, 187, 109,
+            224, 69, 120, 40, 39, 189, 152, 182, 11, 146, 82, 40, 126, 236, 15, 142, 52, 80, 234,
+            124, 89, 97, 155, 16, 4, 32, 27, 36, 15, 203, 78, 99, 46, 120, 86, 191, 245, 139, 120,
+            77, 206, 188, 25, 57, 140, 115, 78, 198, 0, 196, 101, 253, 233, 90, 35, 102, 219, 235,
+            0, 11, 3, 253, 142, 41, 118, 29, 84, 5, 0, 0, 0, 56, 13, 26, 140, 179, 81, 27, 62, 207,
+            119, 10, 29, 129, 244, 12, 41, 49, 130, 210, 156, 240, 87, 73, 98, 219, 80, 196, 207,
+            182, 38, 253, 183, 17, 4, 32, 53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5,
+            68, 98, 199, 232, 192, 17, 150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128,
+            140, 48, 0, 11, 3, 253, 98, 185, 191, 225, 53, 25, 0, 0, 0, 46, 239, 167, 82, 56, 101,
+            128, 195, 16, 132, 181, 79, 33, 25, 151, 60, 206, 246, 172, 146, 252, 56, 96, 126, 134,
+            9, 232, 150, 201, 153, 76, 62, 16, 4, 32, 57, 148, 116, 246, 83, 186, 107, 123, 56, 57,
+            164, 62, 208, 250, 53, 255, 205, 221, 94, 250, 29, 14, 112, 130, 148, 27, 214, 36, 12,
+            33, 159, 128, 0, 11, 3, 253, 208, 161, 183, 238, 226, 20, 0, 0, 0, 34, 113, 182, 72,
+            168, 146, 91, 140, 113, 117, 67, 69, 58, 89, 163, 162, 10, 60, 82, 206, 155, 62, 95,
+            199, 147, 152, 60, 100, 249, 246, 254, 160, 4, 32, 62, 171, 130, 51, 233, 19, 45, 191,
+            194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47, 39, 25, 156, 146, 35, 108, 99, 133,
+            34, 187, 243, 162, 0, 11, 3, 253, 28, 177, 42, 91, 38, 20, 0, 0, 0, 104, 243, 24, 41,
+            234, 236, 2, 247, 229, 237, 218, 218, 18, 157, 73, 129, 169, 155, 218, 14, 92, 15, 212,
+            239, 243, 194, 62, 175, 194, 199, 154, 2, 16, 4, 32, 127, 61, 253, 44, 203, 5, 79, 65,
+            14, 231, 126, 176, 46, 231, 180, 234, 150, 7, 149, 216, 151, 70, 205, 194, 38, 221,
+            216, 153, 230, 172, 78, 81, 0, 11, 3, 253, 88, 107, 162, 93, 31, 26, 0, 0, 0, 94, 59,
+            56, 166, 217, 190, 222, 37, 14, 208, 182, 18, 208, 25, 21, 167, 129, 130, 238, 24, 216,
+            25, 208, 125, 67, 174, 146, 87, 40, 180, 45, 45, 17, 4, 32, 151, 172, 124, 81, 243,
+            147, 225, 5, 188, 204, 9, 152, 150, 127, 129, 13, 246, 19, 141, 93, 239, 8, 214, 194,
+            123, 127, 177, 23, 144, 211, 189, 239, 0, 11, 3, 253, 18, 11, 81, 244, 234, 16, 0, 0,
+            0, 190, 56, 11, 19, 207, 215, 20, 147, 50, 229, 172, 129, 138, 232, 77, 49, 228, 190,
+            17, 155, 192, 235, 215, 23, 71, 86, 48, 246, 243, 139, 110, 144, 16, 4, 32, 168, 155,
+            161, 167, 178, 189, 91, 153, 252, 27, 238, 224, 90, 202, 85, 135, 174, 60, 251, 70, 40,
+            210, 160, 53, 143, 32, 130, 82, 183, 232, 190, 64, 0, 11, 3, 253, 80, 93, 108, 146,
+            111, 13, 0, 0, 0, 149, 0, 32, 76, 105, 140, 193, 47, 201, 103, 116, 163, 79, 119, 65,
+            92, 55, 55, 111, 241, 123, 73, 40, 56, 228, 20, 215, 116, 181, 183, 190, 193, 4, 32,
+            232, 241, 234, 234, 48, 58, 184, 92, 10, 32, 220, 110, 128, 186, 85, 30, 63, 171, 43,
+            133, 112, 35, 25, 161, 34, 229, 80, 168, 115, 74, 228, 51, 0, 11, 3, 253, 30, 7, 137,
+            132, 105, 8, 0, 0, 0, 100, 217, 149, 244, 181, 182, 44, 72, 10, 4, 241, 184, 251, 76,
+            122, 48, 182, 7, 241, 45, 164, 171, 195, 87, 153, 62, 231, 80, 91, 225, 155, 38, 17,
+            17, 17,
+        ]
+    }
+
+    #[test]
+    fn test_verify_full_identity_by_public_key_hash() {
+        let proof: &[u8] = single_identity_proof();
+        let key_hash: PublicKeyHash = [
+            68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122, 242, 149, 191,
+            209, 26,
+        ];
+        let (_root_hash, proved_identity) =
+            Drive::verify_full_identity_by_public_key_hash(proof, key_hash).expect("should verify");
+        // verify part of the identity, make sure it's the correct one
+        assert!(proved_identity.is_some());
+        let proved_identity = proved_identity.unwrap();
+        assert_eq!(proved_identity.protocol_version, 1);
+        assert_eq!(proved_identity.public_keys.len(), 3);
+        assert_eq!(proved_identity.balance, 11077485418638);
+    }
+
+    #[test]
+    fn multiple_identity_proofs() {
+        let proof = multiple_identity_proof();
+        let key_hashes: &[PublicKeyHash] = &[
+            [
+                31, 8, 21, 38, 154, 252, 1, 45, 228, 66, 96, 206, 178, 138, 68, 150, 211, 24, 65,
+                132,
+            ],
+            [
+                68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122, 242, 149, 191,
+                209, 26,
+            ],
+            [
+                94, 14, 73, 216, 8, 173, 33, 208, 29, 7, 221, 121, 154, 117, 189, 27, 71, 39, 136,
+                167,
+            ],
+            [
+                103, 137, 42, 243, 144, 205, 43, 118, 83, 169, 24, 199, 182, 146, 200, 91, 135,
+                180, 77, 50,
+            ],
+            [
+                154, 6, 31, 49, 115, 76, 95, 95, 11, 17, 154, 183, 45, 67, 60, 154, 241, 51, 211,
+                166,
+            ],
+            [
+                165, 73, 33, 187, 41, 182, 126, 49, 137, 142, 254, 188, 41, 242, 65, 177, 174, 250,
+                77, 202,
+            ],
+            [
+                179, 191, 206, 71, 141, 233, 111, 227, 12, 211, 113, 59, 248, 140, 231, 114, 134,
+                135, 218, 138,
+            ],
+            [
+                187, 61, 240, 37, 227, 47, 217, 13, 31, 238, 231, 220, 164, 184, 51, 33, 198, 131,
+                41, 45,
+            ],
+            [
+                237, 115, 138, 170, 221, 117, 209, 103, 127, 239, 236, 202, 221, 3, 63, 18, 108,
+                254, 231, 106,
+            ],
+            [
+                251, 217, 218, 165, 153, 61, 229, 106, 46, 67, 70, 183, 199, 47, 245, 88, 94, 255,
+                250, 171,
+            ],
+        ];
+
+        let (_, proved_identities): ([u8; 32], BTreeMap<PublicKeyHash, Option<DppIdentity>>) =
+            Drive::verify_full_identities_by_public_key_hashes(proof, key_hashes)
+                .expect("expect that this be verified");
+        assert_eq!(proved_identities.len(), 10);
+        dbg!(proved_identities.values());
+    }
+
+    #[test]
+    fn verify_full_identity_by_identity_id() {
+        let proof = single_identity_proof();
+        let identity_id: [u8; 32] = [
+            62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47,
+            39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162,
+        ];
+        dbg!(hex::encode(identity_id));
+        let (_root_hash, maybe_identity) =
+            Drive::verify_full_identity_by_identity_id(proof, true, identity_id)
+                .expect("verification failed");
+        let identity = maybe_identity.expect("couldn't get identity");
+        assert_eq!(identity.protocol_version, 1);
+        assert_eq!(identity.public_keys.len(), 3);
+        assert_eq!(identity.balance, 11077485418638);
+    }
+
+    #[test]
+    fn verify_identity_id_by_public_key_hash() {
+        let proof = multiple_identity_proof();
+        let public_key_hash: PublicKeyHash = [
+            31, 8, 21, 38, 154, 252, 1, 45, 228, 66, 96, 206, 178, 138, 68, 150, 211, 24, 65, 132,
+        ];
+        let (_root_hash, maybe_identity_id) =
+            Drive::verify_identity_id_by_public_key_hash(proof, true, public_key_hash)
+                .expect("should verify");
+        let expected_identity_id: [u8; 32] = [
+            15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23, 39,
+            205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203,
+        ];
+        let actual_identity_id = maybe_identity_id.expect("should have identity id");
+        assert_eq!(expected_identity_id, actual_identity_id);
+    }
+
+    #[ignore]
+    #[test]
+    fn verify_identity_balance_by_identity_id() {
+        // TODO: given identity proof is a subset proof but this verify function expects non-subset proof
+        let proof = single_identity_proof();
+        let identity_id: [u8; 32] = [
+            62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22, 47,
+            39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162,
+        ];
+        let (_root_hash, maybe_balance) =
+            Drive::verify_identity_balance_for_identity_id(proof, identity_id)
+                .expect("should verify");
+        let actual_balance = maybe_balance.expect("should have balance");
+        assert_eq!(actual_balance, 11077485418639);
+    }
+
+    #[test]
+    fn verify_identity_balances_by_identity_ids() {
+        let proof = multiple_identity_proof();
+        let identity_ids: &[[u8; 32]] = &[
+            [
+                62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22,
+                47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162,
+            ],
+            [
+                151, 172, 124, 81, 243, 147, 225, 5, 188, 204, 9, 152, 150, 127, 129, 13, 246, 19,
+                141, 93, 239, 8, 214, 194, 123, 127, 177, 23, 144, 211, 189, 239,
+            ],
+        ];
+        let (_, balances): (RootHash, Vec<([u8; 32], Option<u64>)>) =
+            Drive::verify_identity_balances_for_identity_ids(proof, true, identity_ids)
+                .expect("should verify");
+        assert_eq!(balances.len(), 2);
+        assert_eq!(balances[0].1.unwrap(), 11077485418638);
+        assert_eq!(balances[1].1.unwrap(), 9300653671817);
+    }
+
+    #[test]
+    fn verify_identity_ids_by_public_key_hashes() {
+        let proof = multiple_identity_proof();
+        let public_key_hashes: &[PublicKeyHash] = &[
+            [
+                31, 8, 21, 38, 154, 252, 1, 45, 228, 66, 96, 206, 178, 138, 68, 150, 211, 24, 65,
+                132,
+            ],
+            [
+                68, 99, 161, 169, 148, 213, 4, 14, 105, 192, 144, 182, 152, 93, 122, 242, 149, 191,
+                209, 26,
+            ],
+            [
+                94, 14, 73, 216, 8, 173, 33, 208, 29, 7, 221, 121, 154, 117, 189, 27, 71, 39, 136,
+                167,
+            ],
+        ];
+        let (_, ids): (RootHash, Vec<([u8; 20], Option<[u8; 32]>)>) =
+            Drive::verify_identity_ids_by_public_key_hashes(proof, true, public_key_hashes)
+                .expect("should verify");
+        assert_eq!(ids.len(), 3);
+        assert_eq!(
+            ids[0].1.unwrap(),
+            [
+                15, 126, 159, 152, 150, 254, 206, 186, 180, 193, 157, 65, 233, 215, 241, 108, 23,
+                39, 205, 99, 217, 219, 86, 244, 213, 176, 67, 34, 242, 146, 86, 203
+            ]
+        );
+        assert_eq!(
+            ids[1].1.unwrap(),
+            [
+                62, 171, 130, 51, 233, 19, 45, 191, 194, 183, 0, 171, 182, 77, 93, 70, 216, 67, 22,
+                47, 39, 25, 156, 146, 35, 108, 99, 133, 34, 187, 243, 162,
+            ]
+        );
+        assert_eq!(
+            ids[2].1.unwrap(),
+            [
+                53, 168, 221, 106, 101, 237, 66, 153, 18, 210, 219, 5, 68, 98, 199, 232, 192, 17,
+                150, 90, 167, 106, 118, 53, 106, 105, 180, 200, 129, 128, 140, 48,
+            ]
+        );
+    }
+}
diff --git a/packages/rs-drive-verify-c-binding/src/types.rs b/packages/rs-drive-verify-c-binding/src/types.rs
new file mode 100644
index 00000000000..66b42773b73
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/src/types.rs
@@ -0,0 +1,203 @@
+/// Type alias for a public key hash
+pub(crate) type PublicKeyHash = [u8; 20];
+
+/// Represents proof verification result + full identity
+#[repr(C)]
+pub struct IdentityVerificationResult {
+    pub is_valid: bool,
+    pub root_hash: *const [u8; 32],
+    pub has_identity: bool,
+    pub identity: *const Identity,
+}
+
+impl Default for IdentityVerificationResult {
+    fn default() -> Self {
+        Self {
+            is_valid: false,
+            root_hash: std::ptr::null(),
+            has_identity: false,
+            identity: std::ptr::null(),
+        }
+    }
+}
+
+/// Represent proof verification result + multiple identities
+#[repr(C)]
+pub struct MultipleIdentityVerificationResult {
+    pub is_valid: bool,
+    pub root_hash: *const [u8; 32],
+    pub public_key_hash_identity_map: *const *const PublicKeyHashIdentityMap,
+    pub map_size: usize,
+}
+
+impl Default for MultipleIdentityVerificationResult {
+    fn default() -> Self {
+        Self {
+            is_valid: false,
+            root_hash: std::ptr::null(),
+            public_key_hash_identity_map: std::ptr::null(),
+            map_size: 0,
+        }
+    }
+}
+
+/// Maps a public key hash to an identity
+#[repr(C)]
+pub struct PublicKeyHashIdentityMap {
+    pub public_key_hash: *const u8,
+    pub public_key_hash_length: usize,
+    pub has_identity: bool,
+    pub identity: *const Identity,
+}
+
+/// Represents proof verification result + identity id result
+#[repr(C)]
+pub struct IdentityIdVerificationResult {
+    pub is_valid: bool,
+    pub root_hash: *const [u8; 32],
+    pub has_identity_id: bool,
+    pub identity_id: *const u8,
+    pub id_size: usize,
+}
+
+impl Default for IdentityIdVerificationResult {
+    fn default() -> Self {
+        Self {
+            is_valid: false,
+            root_hash: std::ptr::null(),
+            has_identity_id: false,
+            identity_id: std::ptr::null(),
+            id_size: 0,
+        }
+    }
+}
+
+/// Represent proof verification result + multiple identity balance result
+#[repr(C)]
+pub struct MultipleIdentityBalanceVerificationResult {
+    pub is_valid: bool,
+    pub root_hash: *const [u8; 32],
+    pub identity_id_balance_map: *const *const IdentityIdBalanceMap,
+    pub map_size: usize,
+}
+
+impl Default for MultipleIdentityBalanceVerificationResult {
+    fn default() -> Self {
+        Self {
+            is_valid: true,
+            root_hash: std::ptr::null(),
+            identity_id_balance_map: std::ptr::null(),
+            map_size: 0,
+        }
+    }
+}
+
+/// Maps from an identity id to an optional balance
+#[repr(C)]
+pub struct IdentityIdBalanceMap {
+    pub identity_id: *const u8,
+    pub id_size: usize,
+    pub has_balance: bool,
+    pub balance: u64,
+}
+
+/// Represents proof verification result + multiple identity id result
+#[repr(C)]
+pub struct MultipleIdentityIdVerificationResult {
+    pub is_valid: bool,
+    pub root_hash: *const [u8; 32],
+    pub map_size: usize,
+    pub public_key_hash_identity_id_map: *const *const PublicKeyHashIdentityIdMap,
+}
+
+impl Default for MultipleIdentityIdVerificationResult {
+    fn default() -> Self {
+        Self {
+            is_valid: true,
+            root_hash: std::ptr::null(),
+            map_size: 0,
+            public_key_hash_identity_id_map: std::ptr::null(),
+        }
+    }
+}
+
+/// Maps a public key hash to an identity id
+#[repr(C)]
+pub struct PublicKeyHashIdentityIdMap {
+    pub public_key_hash: *const u8,
+    pub public_key_hash_size: usize,
+    pub has_identity_id: bool,
+    pub identity_id: *const u8,
+    pub id_size: usize,
+}
+
+/// Represents an identity
+#[repr(C)]
+pub struct Identity {
+    pub protocol_version: u32,
+    pub id: *const [u8; 32],
+    pub public_keys_count: usize,
+    pub public_keys: *const *const IdPublicKeyMap,
+    pub balance: u64,
+    pub revision: u64,
+    pub has_asset_lock_proof: bool,
+    pub asset_lock_proof: *const AssetLockProof,
+    pub has_metadata: bool,
+    pub meta_data: *const MetaData,
+}
+
+/// Maps a key id to a public key
+#[repr(C)]
+pub struct IdPublicKeyMap {
+    pub key: u32,
+    pub public_key: *const IdentityPublicKey,
+}
+
+/// Represents an identity public key
+#[repr(C)]
+pub struct IdentityPublicKey {
+    pub id: u32,
+
+    // AUTHENTICATION = 0,
+    // ENCRYPTION = 1,
+    // DECRYPTION = 2,
+    // WITHDRAW = 3
+    pub purpose: u8,
+
+    // MASTER = 0,
+    // CRITICAL = 1,
+    // HIGH = 2,
+    // MEDIUM = 3
+    pub security_level: u8,
+
+    // ECDSA_SECP256K1 = 0,
+    // BLS312_381 = 1,
+    // ECDSA_HASH160 = 2,
+    // BIP13_SCRIPT_HASH = 3
+    pub key_type: u8,
+
+    pub read_only: bool,
+    pub data_length: usize,
+    pub data: *const u8,
+    pub has_disabled_at: bool,
+    pub disabled_at: u64,
+}
+
+/// Represents an asset lock proof
+// TODO: add the actual asset lock types
+#[repr(C)]
+pub struct AssetLockProof {
+    pub is_instant: bool,
+    // pub instant_asset_lock_proof: *const InstantAssetLocKProof,
+    pub is_chain: bool,
+    // pub chain_asset_lock_proof: *const ChainAssetLockProof,
+}
+
+/// Represents identity metat data
+#[repr(C)]
+pub struct MetaData {
+    pub block_height: u64,
+    pub core_chain_locked_height: u64,
+    pub time_ms: u64,
+    pub protocol_version: u32,
+}
diff --git a/packages/rs-drive-verify-c-binding/src/util.rs b/packages/rs-drive-verify-c-binding/src/util.rs
new file mode 100644
index 00000000000..1a0f6dee355
--- /dev/null
+++ b/packages/rs-drive-verify-c-binding/src/util.rs
@@ -0,0 +1,97 @@
+use crate::types::{AssetLockProof, IdPublicKeyMap, Identity, IdentityPublicKey, MetaData};
+use crate::{DppAssetLockProof, DppIdentity};
+use std::{mem, slice};
+
+pub(crate) fn build_c_identity_struct(maybe_identity: Option<DppIdentity>) -> *mut Identity {
+    maybe_identity
+        .map(|identity| {
+            Box::into_raw(Box::from(Identity {
+                protocol_version: identity.protocol_version,
+                id: Box::into_raw(Box::from(identity.id.0 .0)),
+                public_keys_count: identity.public_keys.len(),
+                public_keys: build_c_public_keys_struct(&identity),
+                balance: identity.balance,
+                revision: identity.revision,
+                has_asset_lock_proof: identity.asset_lock_proof.is_some(),
+                asset_lock_proof: build_c_asset_lock_proof_struct(&identity),
+                has_metadata: identity.metadata.is_some(),
+                meta_data: build_c_metadata_struct(&identity),
+            }))
+        })
+        .unwrap_or(std::ptr::null_mut())
+}
+
+pub(crate) fn build_c_public_keys_struct(identity: &DppIdentity) -> *const *const IdPublicKeyMap {
+    let mut id_public_key_map_as_vec: Vec<*const IdPublicKeyMap> = vec![];
+    for (key_id, identity_public_key) in &identity.public_keys {
+        id_public_key_map_as_vec.push(Box::into_raw(Box::from(IdPublicKeyMap {
+            key: *key_id,
+            public_key: Box::into_raw(Box::from(IdentityPublicKey {
+                id: identity_public_key.id,
+                purpose: identity_public_key.purpose as u8,
+                security_level: identity_public_key.security_level as u8,
+                key_type: identity_public_key.key_type as u8,
+                read_only: identity_public_key.read_only,
+                data_length: identity_public_key.data.len(),
+                data: vec_to_pointer(identity_public_key.data.to_vec()),
+                has_disabled_at: identity_public_key.disabled_at.is_some(),
+                disabled_at: identity_public_key.disabled_at.unwrap_or(0),
+            })),
+        })))
+    }
+    let pointer = id_public_key_map_as_vec.as_ptr();
+    mem::forget(id_public_key_map_as_vec);
+    pointer
+}
+
+pub(crate) fn build_c_asset_lock_proof_struct(identity: &DppIdentity) -> *const AssetLockProof {
+    let asset_lock_proof = &identity.asset_lock_proof;
+    if let Some(asset_lock_proof) = asset_lock_proof {
+        // TODO: construct the actual asset lock proofs
+        match asset_lock_proof {
+            DppAssetLockProof::Instant(..) => Box::into_raw(Box::from(AssetLockProof {
+                is_chain: false,
+                is_instant: true,
+            })),
+            DppAssetLockProof::Chain(..) => Box::into_raw(Box::from(AssetLockProof {
+                is_chain: true,
+                is_instant: false,
+            })),
+        }
+    } else {
+        Box::into_raw(Box::from(AssetLockProof {
+            is_chain: false,
+            is_instant: false,
+        }))
+    }
+}
+
+pub(crate) fn build_c_metadata_struct(identity: &DppIdentity) -> *const MetaData {
+    let metadata = &identity.metadata;
+    if let Some(metadata) = metadata {
+        Box::into_raw(Box::from(MetaData {
+            block_height: metadata.block_height,
+            core_chain_locked_height: metadata.core_chain_locked_height,
+            time_ms: metadata.time_ms,
+            protocol_version: metadata.protocol_version,
+        }))
+    } else {
+        std::ptr::null()
+    }
+}
+
+pub(crate) fn extract_vector_from_pointer<T>(ptr: *const *const u8, count: usize) -> Vec<T> {
+    let mut result = Vec::new();
+    let inner_pointers = unsafe { slice::from_raw_parts(ptr, count) };
+    for i in 0..count {
+        let inner_item: T = unsafe { std::ptr::read(inner_pointers[i] as *const T) };
+        result.push(inner_item);
+    }
+    result
+}
+
+pub(crate) fn vec_to_pointer<T>(a: Vec<T>) -> *const T {
+    let ptr = a.as_ptr();
+    mem::forget(a);
+    ptr
+}
diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml
index 40bc6df39ec..02d54ce94ce 100644
--- a/packages/rs-drive/Cargo.toml
+++ b/packages/rs-drive/Cargo.toml
@@ -40,6 +40,7 @@ mockall= { version ="0.11", optional = true }
 git = "https://github.com/dashpay/grovedb"
 branch = "develop"
 optional = true
+default-features = false
 
 [dependencies.storage]
 git = "https://github.com/dashpay/grovedb"
diff --git a/packages/rs-drive/src/drive/verify/mod.rs b/packages/rs-drive/src/drive/verify/mod.rs
index 17839255002..e2084ed5186 100644
--- a/packages/rs-drive/src/drive/verify/mod.rs
+++ b/packages/rs-drive/src/drive/verify/mod.rs
@@ -8,7 +8,7 @@ use crate::error::proof::ProofError;
 use crate::error::Error;
 use dpp::identifier::Identifier;
 use dpp::identity::{IdentityPublicKey, KeyID};
-use dpp::prelude::{Identity, Revision};
+pub use dpp::prelude::{AssetLockProof, Identity, Revision};
 
 use crate::fee::credits::Credits;
 use dpp::serialization_traits::PlatformDeserializable;
diff --git a/packages/wallet-lib/package.json b/packages/wallet-lib/package.json
index b3dec403d46..7ab09841f9a 100644
--- a/packages/wallet-lib/package.json
+++ b/packages/wallet-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wallet-lib",
-  "version": "7.24.0-dev.17",
+  "version": "7.24.0-dev.19",
   "description": "Light wallet library for Dash",
   "main": "src/index.js",
   "unpkg": "dist/wallet-lib.min.js",
diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml
index b0fd96745d2..911271d11b7 100644
--- a/packages/wasm-dpp/Cargo.toml
+++ b/packages/wasm-dpp/Cargo.toml
@@ -18,6 +18,8 @@ serde-wasm-bindgen = { git="https://github.com/QuantumExplorer/serde-wasm-bindge
 dpp = { path = "../rs-dpp", default-features = false, features=["cbor"] }
 itertools  = { version="0.10.5"}
 console_error_panic_hook = { version="0.1.7"}
+log = { version = "0.4.6" }
+wasm-logger = { version = "0.2.0" }
 
 wasm-bindgen-futures = "0.4.33"
 async-trait = "0.1.59"
diff --git a/packages/wasm-dpp/lib/test/fixtures/getIdentityFixture.js b/packages/wasm-dpp/lib/test/fixtures/getIdentityFixture.js
index b1029f6f74d..5af5cbad60c 100644
--- a/packages/wasm-dpp/lib/test/fixtures/getIdentityFixture.js
+++ b/packages/wasm-dpp/lib/test/fixtures/getIdentityFixture.js
@@ -7,7 +7,7 @@ let staticId = null;
 /**
  * @return {Identity}
  */
-module.exports = async function getIdentityFixture(id = staticId) {
+module.exports = async function getIdentityFixture(id = staticId, publicKeys = undefined) {
   ({ Identity, IdentityPublicKey } = await loadWasmDpp());
 
   if (!staticId) {
@@ -19,30 +19,32 @@ module.exports = async function getIdentityFixture(id = staticId) {
     id = staticId;
   }
 
+  const preCreatedPublicKeys = [
+    {
+      id: 0,
+      type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
+      data: Buffer.from('AuryIuMtRrl/VviQuyLD1l4nmxi9ogPzC9LT7tdpo0di', 'base64'),
+      purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
+      securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER,
+      readOnly: false,
+    },
+    {
+      id: 1,
+      type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
+      data: Buffer.from('A8AK95PYMVX5VQKzOhcVQRCUbc9pyg3RiL7jttEMDU+L', 'base64'),
+      purpose: IdentityPublicKey.PURPOSES.ENCRYPTION,
+      securityLevel: IdentityPublicKey.SECURITY_LEVELS.MEDIUM,
+      readOnly: false,
+    },
+  ];
+
   const rawIdentity = {
     // TODO: obtain latest version from some wasm binding?
     protocolVersion: 1,
     id, // TODO: should be probably id.toBuffer(), but it causes panic in IdentityWasm
     balance: 10,
     revision: 0,
-    publicKeys: [
-      {
-        id: 0,
-        type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
-        data: Buffer.from('AuryIuMtRrl/VviQuyLD1l4nmxi9ogPzC9LT7tdpo0di', 'base64'),
-        purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
-        securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER,
-        readOnly: false,
-      },
-      {
-        id: 1,
-        type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
-        data: Buffer.from('A8AK95PYMVX5VQKzOhcVQRCUbc9pyg3RiL7jttEMDU+L', 'base64'),
-        purpose: IdentityPublicKey.PURPOSES.ENCRYPTION,
-        securityLevel: IdentityPublicKey.SECURITY_LEVELS.MEDIUM,
-        readOnly: false,
-      },
-    ],
+    publicKeys: publicKeys === undefined ? preCreatedPublicKeys : publicKeys,
   };
 
   return new Identity(rawIdentity);
diff --git a/packages/wasm-dpp/lib/test/fixtures/getInstantLockFixture.js b/packages/wasm-dpp/lib/test/fixtures/getInstantLockFixture.js
new file mode 100644
index 00000000000..ec26db769bc
--- /dev/null
+++ b/packages/wasm-dpp/lib/test/fixtures/getInstantLockFixture.js
@@ -0,0 +1,53 @@
+const {
+  Transaction,
+  InstantLock,
+  PrivateKey,
+  Script,
+  Opcode,
+} = require('@dashevo/dashcore-lib');
+
+/**
+ * @param {PrivateKey} [oneTimePrivateKey]
+ */
+function getInstantLockFixture(oneTimePrivateKey = new PrivateKey()) {
+  const privateKeyHex = 'cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY';
+  const privateKey = new PrivateKey(privateKeyHex);
+  const fromAddress = privateKey.toAddress();
+
+  const oneTimePublicKey = oneTimePrivateKey.toPublicKey();
+
+  const transaction = new Transaction()
+    .from({
+      address: fromAddress,
+      txId: 'a477af6b2667c29670467e4e0728b685ee07b240235771862318e29ddbe58458',
+      outputIndex: 0,
+      script: Script.buildPublicKeyHashOut(fromAddress)
+        .toString(),
+      satoshis: 100000,
+    })
+    // eslint-disable-next-line no-underscore-dangle
+    .addBurnOutput(90000, oneTimePublicKey._getID())
+    .to(fromAddress, 5000)
+    .addOutput(Transaction.Output({
+      satoshis: 5000,
+      script: Script()
+        .add(Opcode.OP_RETURN)
+        .add(Buffer.from([1, 2, 3])),
+    }))
+    .sign(privateKey);
+
+  return new InstantLock({
+    version: 1,
+    inputs: [
+      {
+        outpointHash: '6e200d059fb567ba19e92f5c2dcd3dde522fd4e0a50af223752db16158dabb1d',
+        outpointIndex: 0,
+      },
+    ],
+    txid: transaction.id,
+    cyclehash: '7c30826123d0f29fe4c4a8895d7ba4eb469b1fafa6ad7b23896a1a591766a536',
+    signature: '8967c46529a967b3822e1ba8a173066296d02593f0f59b3a78a30a7eef9c8a120847729e62e4a32954339286b79fe7590221331cd28d576887a263f45b595d499272f656c3f5176987c976239cac16f972d796ad82931d532102a4f95eec7d80',
+  });
+}
+
+module.exports = getInstantLockFixture;
diff --git a/packages/wasm-dpp/package.json b/packages/wasm-dpp/package.json
index b3e998f386b..e15fd588a49 100644
--- a/packages/wasm-dpp/package.json
+++ b/packages/wasm-dpp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/wasm-dpp",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "The JavaScript implementation of the Dash Platform Protocol",
   "main": "dist/index.js",
   "types": "dist/lib/index.d.ts",
@@ -9,6 +9,7 @@
     "test": "yarn run test:node && yarn run test:browsers",
     "test:browsers": "karma start ./karma.conf.js --single-run",
     "test:node": "NODE_ENV=test mocha",
+    "tsc": "tsc",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "clean": "yarn exec scripts/clean.sh"
diff --git a/packages/wasm-dpp/scripts/build.sh b/packages/wasm-dpp/scripts/build.sh
index cab572ac793..ec83e49c0e9 100755
--- a/packages/wasm-dpp/scripts/build.sh
+++ b/packages/wasm-dpp/scripts/build.sh
@@ -18,7 +18,7 @@ fi
 OUTPUT_DIR="$PWD/wasm"
 OUTPUT_FILE="$OUTPUT_DIR/wasm_dpp_bg.wasm"
 OUTPUT_FILE_JS="$OUTPUT_DIR/wasm_dpp_bg.js"
-BUILD_COMMAND="cargo build --target=$TARGET $PROFILE_ARG"
+BUILD_COMMAND="cargo build --config net.git-fetch-with-cli=true --target=$TARGET $PROFILE_ARG"
 BINDGEN_COMMAND="wasm-bindgen --out-dir=$OUTPUT_DIR --target=web --omit-default-module-path ../../target/$TARGET/$PROFILE/wasm_dpp.wasm"
 
 DIST_TYPINGS="$PWD/dist/wasm/wasm_dpp.d.ts"
diff --git a/packages/wasm-dpp/src/buffer.rs b/packages/wasm-dpp/src/buffer.rs
index c0b6db19c9f..efae80aaccc 100644
--- a/packages/wasm-dpp/src/buffer.rs
+++ b/packages/wasm-dpp/src/buffer.rs
@@ -1,3 +1,4 @@
+use js_sys::ArrayBuffer;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
@@ -7,12 +8,21 @@ extern "C" {
     #[wasm_bindgen(constructor)]
     pub fn new() -> Buffer;
 
-    #[wasm_bindgen(constructor, js_name = "from")]
+    #[wasm_bindgen(static_method_of = Buffer, js_name = from)]
     pub fn from_bytes(js_sys: &[u8]) -> Buffer;
 
-    #[wasm_bindgen(constructor, js_name = "from")]
+    #[wasm_bindgen(static_method_of = Buffer, js_name = from)]
     pub fn from_bytes_owned(js_sys: Vec<u8>) -> Buffer;
 
-    #[wasm_bindgen(constructor, js_name = "from")]
+    #[wasm_bindgen(static_method_of = Buffer, js_name = from)]
     pub fn from_string(js_sys: String) -> Buffer;
+
+    #[wasm_bindgen(method, getter)]
+    pub fn buffer(this: &Buffer) -> ArrayBuffer;
+
+    #[wasm_bindgen(method, getter, js_name = byteOffset)]
+    pub fn byte_offset(this: &Buffer) -> u32;
+
+    #[wasm_bindgen(method, getter)]
+    pub fn length(this: &Buffer) -> u32;
 }
diff --git a/packages/wasm-dpp/src/dash_platform_protocol.rs b/packages/wasm-dpp/src/dash_platform_protocol.rs
index c92ace32451..aeed22ba06d 100644
--- a/packages/wasm-dpp/src/dash_platform_protocol.rs
+++ b/packages/wasm-dpp/src/dash_platform_protocol.rs
@@ -45,6 +45,10 @@ impl DashPlatformProtocol {
         entropy_generator: ExternalEntropyGenerator,
         maybe_protocol_version: Option<u32>,
     ) -> Result<DashPlatformProtocol, JsValue> {
+        if cfg!(debug_assertions) {
+            wasm_logger::init(wasm_logger::Config::new(log::Level::Debug));
+        }
+
         let bls = BlsAdapter(bls_adapter);
         let protocol_version = maybe_protocol_version.unwrap_or(LATEST_VERSION);
         let public_keys_validator = Arc::new(PublicKeysValidator::new(bls.clone()).unwrap());
diff --git a/packages/wasm-dpp/src/data_contract/data_contract.rs b/packages/wasm-dpp/src/data_contract/data_contract.rs
index 6d44bbda575..43f7c28b65f 100644
--- a/packages/wasm-dpp/src/data_contract/data_contract.rs
+++ b/packages/wasm-dpp/src/data_contract/data_contract.rs
@@ -16,7 +16,7 @@ use dpp::{platform_value, Convertible};
 use crate::errors::RustConversionError;
 use crate::identifier::identifier_from_js_value;
 use crate::metadata::MetadataWasm;
-use crate::utils::WithJsError;
+use crate::utils::{IntoWasm, WithJsError};
 use crate::{bail_js, with_js_error};
 use crate::{buffer::Buffer, identifier::IdentifierWrapper};
 
@@ -181,7 +181,9 @@ impl DataContractWasm {
         schema: JsValue,
     ) -> Result<(), JsValue> {
         let json_schema: JsonValue = with_js_error!(serde_wasm_bindgen::from_value(schema))?;
-        self.0.set_document_schema(doc_type, json_schema);
+        self.0
+            .set_document_schema(doc_type, json_schema)
+            .with_js_error()?;
         Ok(())
     }
 
@@ -260,8 +262,15 @@ impl DataContractWasm {
     }
 
     #[wasm_bindgen(js_name=setMetadata)]
-    pub fn set_metadata(&mut self, metadata: MetadataWasm) {
-        self.0.metadata = Some(metadata.into());
+    pub fn set_metadata(&mut self, metadata: JsValue) -> Result<(), JsValue> {
+        self.0.metadata = if !metadata.is_falsy() {
+            let metadata = metadata.to_wasm::<MetadataWasm>("Metadata")?;
+            Some(metadata.to_owned().into())
+        } else {
+            None
+        };
+
+        Ok(())
     }
 
     #[wasm_bindgen(js_name=toObject)]
diff --git a/packages/wasm-dpp/src/data_contract/data_contract_facade.rs b/packages/wasm-dpp/src/data_contract/data_contract_facade.rs
index 11227b95e86..3e7563a32e9 100644
--- a/packages/wasm-dpp/src/data_contract/data_contract_facade.rs
+++ b/packages/wasm-dpp/src/data_contract/data_contract_facade.rs
@@ -119,10 +119,10 @@ impl DataContractFacadeWasm {
     #[wasm_bindgen(js_name=createDataContractUpdateTransition)]
     pub fn create_data_contract_update_transition(
         &self,
-        data_contract: DataContractWasm,
+        data_contract: &DataContractWasm,
     ) -> Result<DataContractUpdateTransitionWasm, JsValue> {
         self.0
-            .create_data_contract_update_transition(data_contract.into())
+            .create_data_contract_update_transition(data_contract.to_owned().into())
             .map(Into::into)
             .map_err(from_protocol_error)
     }
diff --git a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs
index 01f5f90da16..4b89def776f 100644
--- a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs
+++ b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs
@@ -156,13 +156,31 @@ impl DataContractUpdateTransitionWasm {
     pub fn to_object(&self, skip_signature: Option<bool>) -> Result<JsValue, JsValue> {
         let serde_object = self
             .0
-            .to_object(skip_signature.unwrap_or(false))
+            .to_cleaned_object(skip_signature.unwrap_or(false))
             .map_err(from_protocol_error)?;
         serde_object
             .serialize(&serde_wasm_bindgen::Serializer::json_compatible())
             .map_err(|e| e.into())
     }
 
+    #[wasm_bindgen]
+    pub fn sign(
+        &mut self,
+        identity_public_key: &IdentityPublicKeyWasm,
+        private_key: Vec<u8>,
+        bls: JsBlsAdapter,
+    ) -> Result<(), JsValue> {
+        let bls_adapter = BlsAdapter(bls);
+
+        self.0
+            .sign(
+                &identity_public_key.to_owned().into(),
+                &private_key,
+                &bls_adapter,
+            )
+            .with_js_error()
+    }
+
     #[wasm_bindgen(js_name=verifySignature)]
     pub fn verify_signature(
         &self,
diff --git a/packages/wasm-dpp/src/document/extended_document.rs b/packages/wasm-dpp/src/document/extended_document.rs
index 91d53f5ad1a..662018c8c3c 100644
--- a/packages/wasm-dpp/src/document/extended_document.rs
+++ b/packages/wasm-dpp/src/document/extended_document.rs
@@ -2,7 +2,7 @@ use dpp::document::document_transition::document_base_transition::JsonValue;
 use dpp::document::{ExtendedDocument, EXTENDED_DOCUMENT_IDENTIFIER_FIELDS};
 
 use dpp::platform_value::{Bytes32, Value};
-use dpp::prelude::{Identifier, Revision};
+use dpp::prelude::{Identifier, Revision, TimestampMillis};
 use dpp::util::json_schema::JsonSchemaExt;
 use dpp::util::json_value::JsonValueExt;
 
@@ -17,7 +17,7 @@ use crate::document::BinaryType;
 use crate::errors::RustConversionError;
 use crate::identifier::{identifier_from_js_value, IdentifierWrapper};
 use crate::lodash::lodash_set;
-use crate::utils::{with_serde_to_platform_value, ToSerdeJSONExt, WithJsError};
+use crate::utils::{with_serde_to_platform_value, IntoWasm, ToSerdeJSONExt, WithJsError};
 use crate::{with_js_error, ConversionOptions, DocumentWasm};
 use crate::{DataContractWasm, MetadataWasm};
 
@@ -220,23 +220,37 @@ impl ExtendedDocumentWasm {
     }
 
     #[wasm_bindgen(js_name=setCreatedAt)]
-    pub fn set_created_at(&mut self, ts: f64) {
-        self.0.document.created_at = Some(ts as u64);
+    pub fn set_created_at(&mut self, ts: Option<js_sys::Date>) {
+        if let Some(ts) = ts {
+            self.0.document.created_at = Some(ts.get_time() as TimestampMillis);
+        } else {
+            self.0.document.created_at = None;
+        }
     }
 
     #[wasm_bindgen(js_name=setUpdatedAt)]
-    pub fn set_updated_at(&mut self, ts: f64) {
-        self.0.document.updated_at = Some(ts as u64);
+    pub fn set_updated_at(&mut self, ts: Option<js_sys::Date>) {
+        if let Some(ts) = ts {
+            self.0.document.updated_at = Some(ts.get_time() as TimestampMillis);
+        } else {
+            self.0.document.updated_at = None;
+        }
     }
 
     #[wasm_bindgen(js_name=getCreatedAt)]
-    pub fn get_created_at(&self) -> Option<f64> {
-        self.0.document.created_at.map(|v| v as f64)
+    pub fn get_created_at(&self) -> Option<js_sys::Date> {
+        self.0
+            .document
+            .created_at
+            .map(|v| js_sys::Date::new(&JsValue::from_f64(v as f64)))
     }
 
     #[wasm_bindgen(js_name=getUpdatedAt)]
-    pub fn get_updated_at(&self) -> Option<f64> {
-        self.0.document.updated_at.map(|v| v as f64)
+    pub fn get_updated_at(&self) -> Option<js_sys::Date> {
+        self.0
+            .document
+            .updated_at
+            .map(|v| js_sys::Date::new(&JsValue::from_f64(v as f64)))
     }
 
     #[wasm_bindgen(js_name=getMetadata)]
@@ -245,8 +259,15 @@ impl ExtendedDocumentWasm {
     }
 
     #[wasm_bindgen(js_name=setMetadata)]
-    pub fn set_metadata(&mut self, metadata: &MetadataWasm) {
-        self.0.metadata = Some(metadata.to_owned().into());
+    pub fn set_metadata(&mut self, metadata: JsValue) -> Result<(), JsValue> {
+        self.0.metadata = if !metadata.is_falsy() {
+            let metadata = metadata.to_wasm::<MetadataWasm>("Metadata")?;
+            Some(metadata.to_owned().into())
+        } else {
+            None
+        };
+
+        Ok(())
     }
 
     #[wasm_bindgen(js_name=toObject)]
diff --git a/packages/wasm-dpp/src/document/mod.rs b/packages/wasm-dpp/src/document/mod.rs
index 2f798a16e0e..5231ae57974 100644
--- a/packages/wasm-dpp/src/document/mod.rs
+++ b/packages/wasm-dpp/src/document/mod.rs
@@ -33,6 +33,7 @@ use dpp::document::{Document, EXTENDED_DOCUMENT_IDENTIFIER_FIELDS, IDENTIFIER_FI
 pub use extended_document::ExtendedDocumentWasm;
 
 use dpp::document::extended_document::property_names;
+use dpp::identity::TimestampMillis;
 use dpp::platform_value::btreemap_extensions::BTreeValueMapReplacementPathHelper;
 use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter;
 use dpp::platform_value::ReplacementType;
@@ -197,32 +198,27 @@ impl DocumentWasm {
     }
 
     #[wasm_bindgen(js_name=setCreatedAt)]
-    pub fn set_created_at(&mut self, number: JsValue) -> Result<(), JsValue> {
-        let ts = try_to_u64(number)
-            .context("setting createdAt in Document")
-            .with_js_error()?;
-
-        self.0.created_at = Some(ts);
-        Ok(())
+    pub fn set_created_at(&mut self, created_at: Option<js_sys::Date>) {
+        self.0.created_at = created_at.map(|timestamp| timestamp.get_time() as TimestampMillis);
     }
 
     #[wasm_bindgen(js_name=setUpdatedAt)]
-    pub fn set_updated_at(&mut self, number: JsValue) -> Result<(), JsValue> {
-        let ts = try_to_u64(number)
-            .context("setting updatedAt in Document")
-            .with_js_error()?;
-        self.0.updated_at = Some(ts);
-        Ok(())
+    pub fn set_updated_at(&mut self, updated_at: Option<js_sys::Date>) {
+        self.0.updated_at = updated_at.map(|timestamp| timestamp.get_time() as TimestampMillis);
     }
 
     #[wasm_bindgen(js_name=getCreatedAt)]
-    pub fn get_created_at(&self) -> Option<f64> {
-        self.0.created_at.map(|v| v as f64)
+    pub fn get_created_at(&self) -> Option<js_sys::Date> {
+        self.0
+            .created_at
+            .map(|v| js_sys::Date::new(&JsValue::from_f64(v as f64)))
     }
 
     #[wasm_bindgen(js_name=getUpdatedAt)]
-    pub fn get_updated_at(&self) -> Option<f64> {
-        self.0.updated_at.map(|v| v as f64)
+    pub fn get_updated_at(&self) -> Option<js_sys::Date> {
+        self.0
+            .updated_at
+            .map(|v| js_sys::Date::new(&JsValue::from_f64(v as f64)))
     }
 
     #[wasm_bindgen(js_name=toObject)]
diff --git a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs
index 33d6584ba7d..c5f0c771f2f 100644
--- a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs
+++ b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_create_transition.rs
@@ -81,13 +81,17 @@ impl DocumentCreateTransitionWasm {
     }
 
     #[wasm_bindgen(js_name=getCreatedAt)]
-    pub fn created_at(&self) -> Option<TimestampMillis> {
-        self.inner.created_at
+    pub fn created_at(&self) -> Option<js_sys::Date> {
+        self.inner
+            .created_at
+            .map(|timestamp| js_sys::Date::new(&JsValue::from_f64(timestamp as f64)))
     }
 
     #[wasm_bindgen(js_name=getUpdatedAt)]
-    pub fn updated_at(&self) -> Option<TimestampMillis> {
-        self.inner.updated_at
+    pub fn updated_at(&self) -> Option<js_sys::Date> {
+        self.inner
+            .updated_at
+            .map(|timestamp| js_sys::Date::new(&JsValue::from_f64(timestamp as f64)))
     }
 
     #[wasm_bindgen(js_name=getRevision)]
diff --git a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs
index 051c616ab06..49dda970b4c 100644
--- a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs
+++ b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/document_replace_transition.rs
@@ -84,8 +84,10 @@ impl DocumentReplaceTransitionWasm {
     }
 
     #[wasm_bindgen(js_name=getUpdatedAt)]
-    pub fn updated_at(&self) -> Option<TimestampMillis> {
-        self.inner.updated_at
+    pub fn updated_at(&self) -> Option<js_sys::Date> {
+        self.inner
+            .updated_at
+            .map(|timestamp| js_sys::Date::new(&JsValue::from_f64(timestamp as f64)))
     }
 
     #[wasm_bindgen(js_name=toObject)]
diff --git a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/mod.rs
index e5fc1b79795..3a983bd9140 100644
--- a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/mod.rs
+++ b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/document_transition/mod.rs
@@ -8,6 +8,7 @@ pub use document_delete_transition::*;
 pub use document_replace_transition::*;
 
 use dpp::platform_value::Value;
+use dpp::prelude::TimestampMillis;
 use dpp::{
     document::document_transition::{
         DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition,
@@ -79,46 +80,33 @@ impl DocumentTransitionWasm {
     #[wasm_bindgen(js_name=getCreatedAt)]
     pub fn get_created_at(&self) -> JsValue {
         if let Some(created_at) = self.0.get_created_at() {
-            (created_at as f64).into()
+            js_sys::Date::new(&JsValue::from_f64(created_at as f64)).into()
         } else {
             JsValue::NULL
         }
     }
+
     #[wasm_bindgen(js_name=getUpdatedAt)]
     pub fn get_updated_at(&self) -> JsValue {
         if let Some(updated_at) = self.0.get_updated_at() {
-            (updated_at as f64).into()
+            js_sys::Date::new(&JsValue::from_f64(updated_at as f64)).into()
         } else {
             JsValue::NULL
         }
     }
 
     #[wasm_bindgen(js_name=setUpdatedAt)]
-    pub fn set_updated_at(&mut self, js_timestamp_millis: JsValue) -> Result<(), JsValue> {
-        if js_timestamp_millis.is_undefined() || js_timestamp_millis.is_null() {
-            self.0.set_updated_at(None);
-            return Ok(());
-        }
-        let timestamp_millis = try_to_u64(js_timestamp_millis)
-            .context("setting updatedAt in DocumentsBatchTransition")
-            .with_js_error()?;
-        self.0.set_updated_at(Some(timestamp_millis));
+    pub fn set_updated_at(&mut self, updated_at: Option<js_sys::Date>) -> Result<(), JsValue> {
+        self.0
+            .set_updated_at(updated_at.map(|timestamp| timestamp.get_time() as TimestampMillis));
 
         Ok(())
     }
 
     #[wasm_bindgen(js_name=setCreatedAt)]
-    pub fn set_created_at(&mut self, js_timestamp_millis: JsValue) -> Result<(), JsValue> {
-        if js_timestamp_millis.is_undefined() || js_timestamp_millis.is_null() {
-            self.0.set_created_at(None);
-            return Ok(());
-        }
-        let timestamp_millis = try_to_u64(js_timestamp_millis)
-            .context("setting createdAt in DocumentsBatchTransition")
-            .with_js_error()?;
-        self.0.set_created_at(Some(timestamp_millis));
-
-        Ok(())
+    pub fn set_created_at(&mut self, created_at: Option<js_sys::Date>) {
+        self.0
+            .set_created_at(created_at.map(|timestamp| timestamp.get_time() as TimestampMillis));
     }
 
     #[wasm_bindgen(js_name=getData)]
diff --git a/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs
index f84b5c32e0a..cbca00edb48 100644
--- a/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs
@@ -17,6 +17,13 @@ impl From<&ProtocolVersionParsingError> for ProtocolVersionParsingErrorWasm {
 
 #[wasm_bindgen(js_class=ProtocolVersionParsingError)]
 impl ProtocolVersionParsingErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(parsing_error: String) -> Self {
+        Self {
+            inner: ProtocolVersionParsingError::new(parsing_error),
+        }
+    }
+
     #[wasm_bindgen(js_name = getParsingError)]
     pub fn get_parsing_error(&self) -> String {
         self.inner.parsing_error().to_string()
diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs
index 1fe0755ae78..9e623178ead 100644
--- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs
@@ -1,7 +1,11 @@
+use std::convert::TryFrom;
+
 use crate::buffer::Buffer;
+use crate::utils::WithJsError;
 use dpp::consensus::codes::ErrorWithCode;
 use dpp::consensus::signature::InvalidIdentityPublicKeyTypeError;
 use dpp::consensus::ConsensusError;
+use dpp::identity::KeyType;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(js_name=InvalidIdentityPublicKeyTypeError)]
@@ -17,6 +21,15 @@ impl From<&InvalidIdentityPublicKeyTypeError> for InvalidIdentityPublicKeyTypeEr
 
 #[wasm_bindgen(js_class=InvalidIdentityPublicKeyTypeError)]
 impl InvalidIdentityPublicKeyTypeErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(key_type: u8) -> Result<InvalidIdentityPublicKeyTypeErrorWasm, JsValue> {
+        Ok(Self {
+            inner: InvalidIdentityPublicKeyTypeError::new(
+                KeyType::try_from(key_type).with_js_error()?,
+            ),
+        })
+    }
+
     #[wasm_bindgen(js_name=getPublicKeyType)]
     pub fn get_public_key_type(&self) -> u8 {
         self.inner.public_key_type() as u8
diff --git a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs
index a2deaa122a3..c55cb460d56 100644
--- a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs
@@ -17,6 +17,13 @@ impl From<&InvalidStateTransitionTypeError> for InvalidStateTransitionTypeErrorW
 
 #[wasm_bindgen(js_class=InvalidStateTransitionTypeError)]
 impl InvalidStateTransitionTypeErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(transition_type: u8) -> Self {
+        Self {
+            inner: InvalidStateTransitionTypeError::new(transition_type),
+        }
+    }
+
     #[wasm_bindgen(js_name=getType)]
     pub fn get_type(&self) -> u8 {
         self.inner.transition_type()
diff --git a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs
index caeebd8acdb..94251e6eae7 100644
--- a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs
@@ -17,6 +17,13 @@ impl From<&MissingStateTransitionTypeError> for MissingStateTransitionTypeErrorW
 
 #[wasm_bindgen(js_class=MissingStateTransitionTypeError)]
 impl MissingStateTransitionTypeErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Self {
+        Self {
+            inner: MissingStateTransitionTypeError::new(),
+        }
+    }
+
     #[wasm_bindgen(js_name=getCode)]
     pub fn get_code(&self) -> u32 {
         ConsensusError::from(self.inner.clone()).code()
diff --git a/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs b/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs
index bfe21ea751f..ad236f8055b 100644
--- a/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs
@@ -18,6 +18,13 @@ impl From<&BalanceIsNotEnoughError> for BalanceIsNotEnoughErrorWasm {
 
 #[wasm_bindgen(js_class=BalanceIsNotEnoughError)]
 impl BalanceIsNotEnoughErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(balance: Credits, fee: Credits) -> Self {
+        Self {
+            inner: BalanceIsNotEnoughError::new(balance, fee),
+        }
+    }
+
     #[wasm_bindgen(js_name=getBalance)]
     pub fn get_balance(&self) -> Credits {
         self.inner.balance()
diff --git a/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs b/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs
index e7d7f35642e..02a48220633 100644
--- a/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs
@@ -4,6 +4,7 @@ use dpp::consensus::ConsensusError;
 use wasm_bindgen::prelude::*;
 
 use crate::buffer::Buffer;
+use crate::identifier::IdentifierWrapper;
 
 #[wasm_bindgen(js_name=IdentityNotFoundError)]
 pub struct IdentityNotFoundErrorWasm {
@@ -18,9 +19,16 @@ impl From<&IdentityNotFoundError> for IdentityNotFoundErrorWasm {
 
 #[wasm_bindgen(js_class=IdentityNotFoundError)]
 impl IdentityNotFoundErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(identity_id: IdentifierWrapper) -> Self {
+        Self {
+            inner: IdentityNotFoundError::new(identity_id.into()),
+        }
+    }
+
     #[wasm_bindgen(js_name=getIdentityId)]
-    pub fn get_identity_id(&self) -> Buffer {
-        Buffer::from_bytes(self.inner.identity_id().as_bytes())
+    pub fn get_identity_id(&self) -> IdentifierWrapper {
+        self.inner.identity_id().into()
     }
 
     #[wasm_bindgen(js_name=getCode)]
@@ -37,7 +45,7 @@ impl IdentityNotFoundErrorWasm {
     pub fn serialize(&self) -> Result<Buffer, JsError> {
         let bytes = ConsensusError::from(self.inner.clone())
             .serialize()
-            .map_err(|e| JsError::from(e))?;
+            .map_err(JsError::from)?;
 
         Ok(Buffer::from_bytes(bytes.as_slice()))
     }
diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs
index e0572742db1..ef4b7fa0dec 100644
--- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs
+++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs
@@ -1,7 +1,9 @@
 use crate::buffer::Buffer;
+use crate::identifier::IdentifierWrapper;
 use dpp::consensus::codes::ErrorWithCode;
 use dpp::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError;
 use dpp::consensus::ConsensusError;
+use dpp::identifier::Identifier;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(js_name=DataContractAlreadyPresentError)]
@@ -17,9 +19,16 @@ impl From<&DataContractAlreadyPresentError> for DataContractAlreadyPresentErrorW
 
 #[wasm_bindgen(js_class=DataContractAlreadyPresentError)]
 impl DataContractAlreadyPresentErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(data_contract_id: IdentifierWrapper) -> Self {
+        Self {
+            inner: DataContractAlreadyPresentError::new(data_contract_id.into()),
+        }
+    }
+
     #[wasm_bindgen(js_name=getDataContractId)]
-    pub fn data_contract_id(&self) -> Buffer {
-        Buffer::from_bytes(self.inner.data_contract_id().as_bytes())
+    pub fn data_contract_id(&self) -> IdentifierWrapper {
+        self.inner.data_contract_id().to_owned().into()
     }
 
     #[wasm_bindgen(js_name=getCode)]
diff --git a/packages/wasm-dpp/src/errors/mod.rs b/packages/wasm-dpp/src/errors/mod.rs
index fd8e6193505..9e517961adf 100644
--- a/packages/wasm-dpp/src/errors/mod.rs
+++ b/packages/wasm-dpp/src/errors/mod.rs
@@ -13,5 +13,5 @@ pub use public_key_validation_error::*;
 mod compatible_protocol_version_is_not_defined_error;
 pub mod data_contract_not_present_error;
 pub mod dpp_error;
-mod value_error;
+pub mod value_error;
 pub use compatible_protocol_version_is_not_defined_error::*;
diff --git a/packages/wasm-dpp/src/generate_temporary_ecdsa_private_key.rs b/packages/wasm-dpp/src/generate_temporary_ecdsa_private_key.rs
new file mode 100644
index 00000000000..2fa33a91d21
--- /dev/null
+++ b/packages/wasm-dpp/src/generate_temporary_ecdsa_private_key.rs
@@ -0,0 +1,19 @@
+use crate::buffer::Buffer;
+use dpp::dashcore::secp256k1::rand::thread_rng;
+use dpp::dashcore::secp256k1::Secp256k1;
+use dpp::dashcore::{
+    secp256k1::SecretKey, InstantLock, Network, OutPoint, PrivateKey, Script, Transaction, TxIn,
+    TxOut, Txid,
+};
+use wasm_bindgen::prelude::wasm_bindgen;
+use wasm_bindgen::JsValue;
+
+#[wasm_bindgen(js_name = generateTemporaryEcdsaPrivateKey)]
+pub fn generate_temporary_ecdsa_private_key() -> JsValue {
+    let mut rng = thread_rng();
+
+    let secret_key = SecretKey::new(&mut rng);
+    let one_time_private_key = PrivateKey::new(secret_key, Network::Testnet).to_string();
+
+    JsValue::from_str(&one_time_private_key)
+}
diff --git a/packages/wasm-dpp/src/identity/identity_public_key/mod.rs b/packages/wasm-dpp/src/identity/identity_public_key/mod.rs
index 4f5ab91492c..92500dd1604 100644
--- a/packages/wasm-dpp/src/identity/identity_public_key/mod.rs
+++ b/packages/wasm-dpp/src/identity/identity_public_key/mod.rs
@@ -6,7 +6,7 @@ use wasm_bindgen::prelude::*;
 
 use crate::utils::{Inner, WithJsError};
 use crate::{buffer::Buffer, utils, with_js_error};
-use dpp::identity::{IdentityPublicKey, KeyID};
+use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis};
 use dpp::platform_value::BinaryData;
 use dpp::Convertible;
 
@@ -67,8 +67,8 @@ impl IdentityPublicKeyWasm {
     }
 
     #[wasm_bindgen(js_name=getData)]
-    pub fn get_data(&self) -> Vec<u8> {
-        self.0.data.to_vec()
+    pub fn get_data(&self) -> Buffer {
+        Buffer::from_bytes_owned(self.0.data.to_vec())
     }
 
     #[wasm_bindgen(js_name=setPurpose)]
@@ -108,14 +108,16 @@ impl IdentityPublicKeyWasm {
     }
 
     #[wasm_bindgen(js_name=setDisabledAt)]
-    pub fn set_disabled_at(&mut self, timestamp: u32) {
-        // TODO: It's not gonna work, must be BigInt
-        self.0.set_disabled_at(timestamp as u64);
+    pub fn set_disabled_at(&mut self, timestamp: js_sys::Date) {
+        self.0
+            .set_disabled_at(timestamp.get_time() as TimestampMillis);
     }
 
     #[wasm_bindgen(js_name=getDisabledAt)]
-    pub fn get_disabled_at(&self) -> Option<f64> {
-        self.0.disabled_at.map(|timestamp| timestamp as f64)
+    pub fn get_disabled_at(&self) -> Option<js_sys::Date> {
+        self.0
+            .disabled_at
+            .map(|timestamp| js_sys::Date::new(&JsValue::from_f64(timestamp as f64)))
     }
 
     #[wasm_bindgen(js_name=hash)]
diff --git a/packages/wasm-dpp/src/identity/mod.rs b/packages/wasm-dpp/src/identity/mod.rs
index 618dfeb7c1a..2deaf9968e8 100644
--- a/packages/wasm-dpp/src/identity/mod.rs
+++ b/packages/wasm-dpp/src/identity/mod.rs
@@ -15,12 +15,13 @@ use dpp::metadata::Metadata;
 use dpp::{Convertible, ProtocolError};
 
 use crate::identifier::IdentifierWrapper;
-use crate::utils::{to_vec_of_serde_values, WithJsError};
+use crate::utils::{to_vec_of_serde_values, IntoWasm, WithJsError};
 use crate::MetadataWasm;
 use crate::{utils, with_js_error};
 pub use identity_public_key::*;
 
 use crate::buffer::Buffer;
+use crate::errors::from_dpp_err;
 pub use state_transition::*;
 
 pub mod errors;
@@ -50,7 +51,7 @@ impl IdentityWasm {
         let raw_identity: Value =
             serde_json::from_str(&identity_json).map_err(|e| e.to_string())?;
 
-        let identity = Identity::from_json(raw_identity).unwrap();
+        let identity = Identity::from_json(raw_identity).map_err(from_dpp_err)?;
         Ok(IdentityWasm(identity))
     }
 
@@ -148,8 +149,13 @@ impl IdentityWasm {
     }
 
     #[wasm_bindgen(js_name=setMetadata)]
-    pub fn set_metadata(&mut self, metadata: MetadataWasm) {
-        self.0.set_metadata(metadata.into());
+    pub fn set_metadata(&mut self, metadata: JsValue) -> Result<(), JsValue> {
+        if !metadata.is_falsy() {
+            let metadata = metadata.to_wasm::<MetadataWasm>("Metadata")?;
+            self.0.set_metadata(metadata.to_owned().into())
+        }
+
+        Ok(())
     }
 
     #[wasm_bindgen(js_name=getMetadata)]
diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs b/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs
index 8327698636c..3149d845b6f 100644
--- a/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs
+++ b/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs
@@ -64,8 +64,8 @@ impl IdentityPublicKeyWithWitnessWasm {
     }
 
     #[wasm_bindgen(js_name=getData)]
-    pub fn get_data(&self) -> Vec<u8> {
-        self.0.data.to_vec()
+    pub fn get_data(&self) -> Buffer {
+        Buffer::from_bytes_owned(self.0.data.to_vec())
     }
 
     #[wasm_bindgen(js_name=setPurpose)]
diff --git a/packages/wasm-dpp/src/lib.rs b/packages/wasm-dpp/src/lib.rs
index 39f810a3b17..fff1a8c5885 100644
--- a/packages/wasm-dpp/src/lib.rs
+++ b/packages/wasm-dpp/src/lib.rs
@@ -29,5 +29,6 @@ mod bls_adapter;
 mod buffer;
 mod decode_protocol_entity;
 mod entropy_generator;
+mod generate_temporary_ecdsa_private_key;
 mod lodash;
 mod validation;
diff --git a/packages/wasm-dpp/src/metadata.rs b/packages/wasm-dpp/src/metadata.rs
index e0e62ab7c56..b482473f08e 100644
--- a/packages/wasm-dpp/src/metadata.rs
+++ b/packages/wasm-dpp/src/metadata.rs
@@ -9,7 +9,7 @@ use dpp::util::deserializer::ProtocolVersion;
 use dpp::util::json_value::JsonValueExt;
 
 #[wasm_bindgen(js_name=Metadata)]
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct MetadataWasm(Metadata);
 
 impl std::convert::From<Metadata> for MetadataWasm {
diff --git a/packages/wasm-dpp/src/state_repository.rs b/packages/wasm-dpp/src/state_repository.rs
index 9915b5cf493..c6611c81d93 100644
--- a/packages/wasm-dpp/src/state_repository.rs
+++ b/packages/wasm-dpp/src/state_repository.rs
@@ -55,6 +55,13 @@ extern "C" {
         execution_context: &JsValue,
     ) -> Result<(), JsValue>;
 
+    #[wasm_bindgen(catch, structural, method, js_name=updateDataContract)]
+    pub async fn update_data_contract(
+        this: &ExternalStateRepositoryLike,
+        data_contract: DataContractWasm,
+        execution_context: &JsValue,
+    ) -> Result<(), JsValue>;
+
     #[wasm_bindgen(catch, structural, method, js_name=createDocument)]
     pub async fn create_document(
         this: &ExternalStateRepositoryLike,
@@ -217,6 +224,15 @@ extern "C" {
         execution_context: &JsValue,
     ) -> Result<(), JsValue>;
 
+    #[wasm_bindgen(catch, structural, method, js_name=fetchSMLStore)]
+    pub async fn fetch_sml_store(this: &ExternalStateRepositoryLike) -> Result<JsValue, JsValue>;
+
+    #[wasm_bindgen(catch, structural, method, js_name=isInTheValidMasterNodesList)]
+    async fn is_in_the_valid_master_nodes_list(
+        this: &ExternalStateRepositoryLike,
+        id: Buffer,
+    ) -> Result<JsValue, JsValue>;
+
     #[wasm_bindgen(catch, structural, method, js_name=fetchLatestPlatformBlockHeader)]
     pub async fn fetch_latest_platform_block_header(
         this: &ExternalStateRepositoryLike,
@@ -324,6 +340,17 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
             .map_err(from_js_error)
     }
 
+    async fn update_data_contract<'a>(
+        &self,
+        data_contract: DataContract,
+        execution_context: Option<&'a StateTransitionExecutionContext>,
+    ) -> anyhow::Result<()> {
+        self.0
+            .update_data_contract(data_contract.into(), &ctx_to_js_value(execution_context))
+            .await
+            .map_err(from_js_error)
+    }
+
     async fn fetch_documents<'a>(
         &self,
         contract_id: &Identifier,
@@ -455,7 +482,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
             .await
             .map_err(from_js_error)?;
 
-        if maybe_identity.is_undefined() {
+        if maybe_identity.is_undefined() || maybe_identity.is_null() {
             return Ok(None);
         }
 
@@ -543,7 +570,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
             .await
             .map_err(from_js_error)?;
 
-        if maybe_balance.is_undefined() {
+        if maybe_balance.is_undefined() || maybe_balance.is_null() {
             return Ok(None);
         }
 
@@ -568,7 +595,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
             .await
             .map_err(from_js_error)?;
 
-        if maybe_balance.is_undefined() {
+        if maybe_balance.is_undefined() || maybe_balance.is_null() {
             return Ok(None);
         }
 
@@ -630,6 +657,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
         _amount: u64,
         _execution_context: Option<&'a StateTransitionExecutionContext>,
     ) -> anyhow::Result<()> {
+        // TODO(wasm-dpp): !!!Missing implementation will hang js-drive and no one will have a clue what's going on
         todo!()
     }
 
@@ -650,7 +678,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
             .await
             .map_err(from_js_error)?;
 
-        if maybe_height.is_undefined() {
+        if maybe_height.is_undefined() || maybe_height.is_null() {
             return Ok(None);
         }
 
@@ -731,7 +759,20 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
         todo!()
     }
 
+    async fn is_in_the_valid_master_nodes_list(&self, id: [u8; 32]) -> anyhow::Result<bool> {
+        let is_valid = self
+            .0
+            .is_in_the_valid_master_nodes_list(Buffer::from_bytes(&id))
+            .await
+            .map_err(from_js_error)?;
+
+        is_valid
+            .as_bool()
+            .ok_or_else(|| anyhow!("Value is not a bool"))
+    }
+
     async fn fetch_latest_withdrawal_transaction_index(&self) -> anyhow::Result<u64> {
+        // TODO(wasm-dpp): !!!Missing implementation will hang js-drive and no one will have a clue what's going on
         todo!()
     }
 
@@ -740,6 +781,7 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
         _index: u64,
         _transaction_bytes: Vec<u8>,
     ) -> anyhow::Result<()> {
+        // TODO(wasm-dpp): !!!Missing implementation will hang js-drive and no one will have a clue what's going on
         todo!()
     }
 
diff --git a/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs b/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs
index 470c112a6ea..90f201e2cfb 100644
--- a/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs
+++ b/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs
@@ -1,7 +1,10 @@
 use dpp::consensus::ConsensusError;
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 
-use crate::errors::consensus::consensus_error::from_consensus_error_ref;
+use crate::{
+    buffer::Buffer, errors::consensus::consensus_error::from_consensus_error_ref,
+    utils::consensus_errors_from_buffers,
+};
 
 #[wasm_bindgen(js_name = InvalidStateTransitionError)]
 pub struct InvalidStateTransitionErrorWasm {
@@ -20,6 +23,19 @@ impl InvalidStateTransitionErrorWasm {
 
 #[wasm_bindgen(js_class = InvalidStateTransitionError)]
 impl InvalidStateTransitionErrorWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new_wasm(
+        error_buffers: Vec<Buffer>,
+        raw_state_transition: JsValue,
+    ) -> Result<InvalidStateTransitionErrorWasm, JsValue> {
+        let consensus_errors = consensus_errors_from_buffers(error_buffers)?;
+
+        Ok(InvalidStateTransitionErrorWasm::new(
+            consensus_errors,
+            raw_state_transition,
+        ))
+    }
+
     #[wasm_bindgen(js_name = getErrors)]
     pub fn get_errors(&self) -> Vec<JsValue> {
         self.errors.iter().map(from_consensus_error_ref).collect()
diff --git a/packages/wasm-dpp/src/state_transition/fee/calculate_operation_fees.rs b/packages/wasm-dpp/src/state_transition/fee/calculate_operation_fees.rs
index 91625c269d8..4e24ee92e26 100644
--- a/packages/wasm-dpp/src/state_transition/fee/calculate_operation_fees.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/calculate_operation_fees.rs
@@ -1,14 +1,14 @@
-use dpp::state_transition::fee::{
-    calculate_operation_fees::calculate_operation_fees, operations::Operation,
+use dpp::{
+    state_transition::fee::{
+        calculate_operation_fees::calculate_operation_fees, operations::Operation,
+    },
+    ProtocolError,
 };
 use wasm_bindgen::prelude::*;
 
-use crate::{
-    fee::dummy_fee_result::DummyFeesResultWasm,
-    utils::{Inner, IntoWasm},
-};
+use crate::{fee::dummy_fee_result::DummyFeesResultWasm, utils::WithJsError};
 
-use super::OperationWasm;
+use crate::state_transition::conversion::create_operation_from_wasm_instance;
 
 #[wasm_bindgen(js_name=calculateOperationFees)]
 pub fn calculate_operation_fees_wasm(
@@ -16,9 +16,12 @@ pub fn calculate_operation_fees_wasm(
 ) -> Result<DummyFeesResultWasm, JsValue> {
     let mut inner_operations: Vec<Operation> = vec![];
     for operation in operations.iter() {
-        let operation = operation.to_wasm::<OperationWasm>("Operation")?.to_owned();
-        inner_operations.push(operation.into_inner())
+        let operation = create_operation_from_wasm_instance(&operation)?;
+        inner_operations.push(operation);
     }
 
-    Ok(calculate_operation_fees(&inner_operations).into())
+    Ok(calculate_operation_fees(&inner_operations)
+        .map_err(ProtocolError::from)
+        .with_js_error()?
+        .into())
 }
diff --git a/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee.rs b/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee.rs
index 823b5a22fce..2e6a04e1337 100644
--- a/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee.rs
@@ -1,9 +1,12 @@
-use dpp::state_transition::fee::calculate_state_transition_fee_factory::calculate_state_transition_fee;
+use dpp::{
+    state_transition::fee::calculate_state_transition_fee_factory::calculate_state_transition_fee,
+    ProtocolError,
+};
 use wasm_bindgen::prelude::*;
 
 use crate::{
     conversion::create_state_transition_from_wasm_instance, fee::fee_result::FeeResultWasm,
-    StateTransitionExecutionContextWasm,
+    utils::WithJsError, StateTransitionExecutionContextWasm,
 };
 
 #[wasm_bindgen(js_name=calculateStateTransitionFee)]
@@ -15,6 +18,8 @@ pub fn calculate_state_transition_fee_wasm(
 
     Ok(
         calculate_state_transition_fee(&state_transition, &execution_context.to_owned().into())
+            .map_err(ProtocolError::from)
+            .with_js_error()?
             .into(),
     )
 }
diff --git a/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations.rs b/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations.rs
new file mode 100644
index 00000000000..7303c0fcb8d
--- /dev/null
+++ b/packages/wasm-dpp/src/state_transition/fee/calculate_state_transition_fee_from_operations.rs
@@ -0,0 +1,29 @@
+use dpp::state_transition::fee::calculate_state_transition_fee_from_operations_factory::calculate_state_transition_fee_from_operations;
+use dpp::state_transition::fee::operations::Operation;
+use dpp::ProtocolError;
+use wasm_bindgen::prelude::*;
+
+use crate::fee::fee_result::FeeResultWasm;
+use crate::identifier::IdentifierWrapper;
+use crate::state_transition::conversion::create_operation_from_wasm_instance;
+use crate::utils::WithJsError;
+
+#[wasm_bindgen(js_name=calculateStateTransitionFeeFromOperations)]
+pub fn calculate_state_transition_fee_from_operations_wasm(
+    operations: js_sys::Array,
+    identity_id: &IdentifierWrapper,
+) -> Result<FeeResultWasm, JsValue> {
+    let mut inner_operations: Vec<Operation> = vec![];
+    for operation in operations.iter() {
+        let operation = create_operation_from_wasm_instance(&operation)?;
+        inner_operations.push(operation);
+    }
+
+    Ok(calculate_state_transition_fee_from_operations(
+        &inner_operations,
+        &(identity_id.to_owned()).into(),
+    )
+    .map_err(ProtocolError::from)
+    .with_js_error()?
+    .into())
+}
diff --git a/packages/wasm-dpp/src/state_transition/fee/mod.rs b/packages/wasm-dpp/src/state_transition/fee/mod.rs
index c87ea551280..ccecd5249a0 100644
--- a/packages/wasm-dpp/src/state_transition/fee/mod.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/mod.rs
@@ -4,6 +4,7 @@ use wasm_bindgen::prelude::*;
 use crate::utils::Inner;
 mod calculate_operation_fees;
 mod calculate_state_transition_fee;
+mod calculate_state_transition_fee_from_operations;
 mod dummy_fee_result;
 mod fee_result;
 mod operations;
diff --git a/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs b/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs
index 0ba6380d95d..7d29f492a4f 100644
--- a/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs
@@ -1,14 +1,21 @@
 use crate::{fee::dummy_fee_result::DummyFeesResultWasm, utils::Inner};
-use dpp::state_transition::fee::{
-    operations::{OperationLike, PreCalculatedOperation},
-    Refunds,
+use dpp::platform_value::Error as PlatformValueError;
+use dpp::{
+    state_transition::fee::{
+        operations::{OperationLike, PreCalculatedOperation},
+        Credits, Refunds,
+    },
+    ProtocolError,
 };
 use js_sys::{Array, BigInt};
+use std::collections::HashMap;
 use wasm_bindgen::prelude::*;
 
+use crate::errors::value_error::PlatformValueErrorWasm;
+use crate::utils::ToSerdeJSONExt;
 use crate::{
     fee::refunds::RefundsWasm,
-    utils::{try_to_u64, IntoWasm, WithJsError},
+    utils::{try_to_u64, WithJsError},
 };
 
 #[wasm_bindgen(js_name = "PreCalculatedOperation")]
@@ -39,12 +46,40 @@ impl PreCalculatedOperationWasm {
         let processing_cost = try_to_u64(processing_cost).with_js_error()?;
 
         let mut refunds = vec![];
+        // TODO(wasm-dpp): any chance to make this parsing simpler? :)
         for refund in js_fee_refunds.iter() {
-            let transition: Refunds = refund
-                .to_wasm::<RefundsWasm>("Refunds")?
-                .to_owned()
-                .into_inner();
-            refunds.push(transition);
+            let parsed_refund = refund.with_serde_to_platform_value()?;
+            let identifier = parsed_refund
+                .get_identifier("identifier")
+                .map_err(PlatformValueErrorWasm::from)?;
+
+            let mut credits_per_epoch: HashMap<String, Credits> = HashMap::new();
+            if let Some(credits_per_epoch_value) = parsed_refund
+                .get("creditsPerEpoch")
+                .map_err(PlatformValueErrorWasm::from)?
+            {
+                let credits_per_epoch_map = credits_per_epoch_value.as_map().ok_or_else(|| {
+                    let error =
+                        PlatformValueError::PathError("Credits per epoch is not a map".to_string());
+                    PlatformValueErrorWasm::from(error)
+                })?;
+
+                for (epoch, credits) in credits_per_epoch_map {
+                    let epoch = epoch.to_str().map_err(PlatformValueErrorWasm::from)?;
+                    let credits =
+                        credits
+                            .as_integer::<u64>()
+                            .ok_or(PlatformValueErrorWasm::from(PlatformValueError::PathError(
+                                "Credits per epoch is not an integer".to_string(),
+                            )))?;
+
+                    credits_per_epoch.insert(String::from(epoch), credits);
+                }
+            }
+            refunds.push(Refunds {
+                identifier,
+                credits_per_epoch,
+            });
         }
 
         Ok(PreCalculatedOperation::new(storage_cost, processing_cost, refunds).into())
@@ -57,13 +92,23 @@ impl PreCalculatedOperationWasm {
     }
 
     #[wasm_bindgen(js_name = getProcessingCost)]
-    pub fn processing_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_processing_cost())
+    pub fn processing_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_processing_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(js_name=getStorageCost)]
-    pub fn storage_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_storage_cost())
+    pub fn storage_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_storage_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(getter)]
@@ -79,6 +124,50 @@ impl PreCalculatedOperationWasm {
             None
         }
     }
+
+    pub fn refunds_as_objects(&self) -> Result<Option<Array>, JsValue> {
+        let array_refunds = Array::new();
+        if let Some(refunds) = self.0.get_refunds() {
+            for refund in refunds {
+                let refund_wasm: RefundsWasm = refund.into();
+                array_refunds.push(&refund_wasm.to_object()?);
+            }
+            Ok(Some(array_refunds))
+        } else {
+            Ok(None)
+        }
+    }
+
+    #[wasm_bindgen(js_name = toJSON)]
+    pub fn to_json(&self) -> Result<JsValue, JsValue> {
+        let json = js_sys::Object::new();
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("type"),
+            &JsValue::from_str("preCalculated"),
+        )?;
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("storageCost"),
+            &JsValue::from(self.storage_cost()?),
+        )?;
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("processingCost"),
+            &JsValue::from(self.processing_cost()?),
+        )?;
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("feeRefunds"),
+            &JsValue::from(self.refunds_as_objects()?.unwrap_or(Array::new())),
+        )?;
+
+        Ok(json.into())
+    }
 }
 
 impl Inner for PreCalculatedOperationWasm {
diff --git a/packages/wasm-dpp/src/state_transition/fee/operations/read_operation.rs b/packages/wasm-dpp/src/state_transition/fee/operations/read_operation.rs
index abb657d07cd..e3235f9e37b 100644
--- a/packages/wasm-dpp/src/state_transition/fee/operations/read_operation.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/operations/read_operation.rs
@@ -1,4 +1,7 @@
-use dpp::state_transition::fee::operations::{OperationLike, ReadOperation};
+use dpp::{
+    state_transition::fee::operations::{OperationLike, ReadOperation},
+    ProtocolError,
+};
 use js_sys::{Array, BigInt};
 use wasm_bindgen::prelude::*;
 
@@ -32,13 +35,23 @@ impl ReadOperationWasm {
     }
 
     #[wasm_bindgen(getter,js_name = processingCost)]
-    pub fn processing_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_processing_cost())
+    pub fn processing_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_processing_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(getter, js_name=storageCost)]
-    pub fn storage_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_storage_cost())
+    pub fn storage_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_storage_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(getter)]
@@ -54,6 +67,25 @@ impl ReadOperationWasm {
             None
         }
     }
+
+    #[wasm_bindgen(js_name = toJSON)]
+    pub fn to_json(&self) -> Result<JsValue, JsValue> {
+        let json = js_sys::Object::new();
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("type"),
+            &JsValue::from_str("read"),
+        )?;
+
+        js_sys::Reflect::set(
+            &json,
+            &JsValue::from_str("valueSize"),
+            &JsValue::from(self.0.value_size),
+        )?;
+
+        Ok(json.into())
+    }
 }
 
 impl Inner for ReadOperationWasm {
diff --git a/packages/wasm-dpp/src/state_transition/fee/operations/signature_verification_operation.rs b/packages/wasm-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
index ffa27dc4723..3b747de4a6b 100644
--- a/packages/wasm-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/operations/signature_verification_operation.rs
@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use dpp::{
     identity::KeyType,
     state_transition::fee::operations::{OperationLike, SignatureVerificationOperation},
+    ProtocolError,
 };
 use js_sys::{Array, BigInt};
 use wasm_bindgen::prelude::*;
@@ -41,13 +42,23 @@ impl SignatureVerificationOperationWasm {
     }
 
     #[wasm_bindgen(js_name = getProcessingCost)]
-    pub fn get_processing_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_processing_cost())
+    pub fn get_processing_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_processing_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(js_name=getStorageCost)]
-    pub fn get_storage_cost(&self) -> BigInt {
-        BigInt::from(self.0.get_storage_cost())
+    pub fn get_storage_cost(&self) -> Result<BigInt, JsValue> {
+        Ok(BigInt::from(
+            self.0
+                .get_storage_cost()
+                .map_err(ProtocolError::from)
+                .with_js_error()?,
+        ))
     }
 
     #[wasm_bindgen(getter)]
@@ -63,6 +74,21 @@ impl SignatureVerificationOperationWasm {
             None
         }
     }
+
+    #[wasm_bindgen(js_name = toJSON)]
+    pub fn to_json(&self) -> Result<JsValue, JsValue> {
+        let json = js_sys::Object::new();
+
+        js_sys::Reflect::set(&json, &"type".into(), &"signatureVerification".into())?;
+
+        js_sys::Reflect::set(
+            &json,
+            &"signatureType".into(),
+            &JsValue::from(self.0.signature_type as u8),
+        )?;
+
+        Ok(json.into())
+    }
 }
 
 impl Inner for SignatureVerificationOperationWasm {
diff --git a/packages/wasm-dpp/src/state_transition/fee/refunds.rs b/packages/wasm-dpp/src/state_transition/fee/refunds.rs
index 10cbd37b5cd..6013f526ae9 100644
--- a/packages/wasm-dpp/src/state_transition/fee/refunds.rs
+++ b/packages/wasm-dpp/src/state_transition/fee/refunds.rs
@@ -4,6 +4,7 @@ use dpp::state_transition::fee::Refunds;
 use js_sys::BigInt;
 use wasm_bindgen::prelude::*;
 
+use crate::buffer::Buffer;
 use crate::{identifier::IdentifierWrapper, utils::Inner};
 
 #[derive(Clone)]
@@ -21,6 +22,22 @@ impl RefundsWasm {
     pub fn credits_per_epoch(&self) -> js_sys::Map {
         convert_hashmap_to_jsmap(&self.0.credits_per_epoch)
     }
+
+    #[wasm_bindgen(js_name=toObject)]
+    pub fn to_object(&self) -> Result<JsValue, JsValue> {
+        let object = js_sys::Object::new();
+
+        let identifier = Buffer::from_bytes(self.0.identifier.as_slice());
+
+        js_sys::Reflect::set(&object, &"identifier".into(), &identifier)?;
+        js_sys::Reflect::set(
+            &object,
+            &"creditsPerEpoch".into(),
+            &self.credits_per_epoch(),
+        )?;
+
+        Ok(object.into())
+    }
 }
 
 impl From<Refunds> for RefundsWasm {
diff --git a/packages/wasm-dpp/src/state_transition/mod.rs b/packages/wasm-dpp/src/state_transition/mod.rs
index 1dc022b9d63..c85f84b4408 100644
--- a/packages/wasm-dpp/src/state_transition/mod.rs
+++ b/packages/wasm-dpp/src/state_transition/mod.rs
@@ -73,6 +73,11 @@ impl StateTransitionExecutionContextWasm {
         self.0.disable_dry_run();
     }
 
+    #[wasm_bindgen(js_name=isDryRun)]
+    pub fn is_dry_run(&self) -> bool {
+        self.0.is_dry_run()
+    }
+
     #[wasm_bindgen(js_name=addOperation)]
     pub fn add_operation(&self, operation: JsValue) -> Result<(), JsValue> {
         let operation = create_operation_from_wasm_instance(&operation)?;
@@ -96,6 +101,11 @@ impl StateTransitionExecutionContextWasm {
             })
             .collect()
     }
+
+    #[wasm_bindgen(js_name=clearDryOperations)]
+    pub fn clear_dry_run_operations(&self) {
+        self.0.clear_dry_run_operations();
+    }
 }
 
 impl Inner for StateTransitionExecutionContextWasm {
diff --git a/packages/wasm-dpp/src/state_transition/state_transition_facade.rs b/packages/wasm-dpp/src/state_transition/state_transition_facade.rs
index 0096f9b5a17..0f337b12d7b 100644
--- a/packages/wasm-dpp/src/state_transition/state_transition_facade.rs
+++ b/packages/wasm-dpp/src/state_transition/state_transition_facade.rs
@@ -1,4 +1,5 @@
 use crate::bls_adapter::BlsAdapter;
+use std::convert::TryInto;
 
 use crate::state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper};
 use crate::state_transition_factory::StateTransitionFactoryWasm;
@@ -6,11 +7,18 @@ use crate::utils::{ToSerdeJSONExt, WithJsError};
 use crate::validation::ValidationResultWasm;
 use crate::{with_js_error, StateTransitionExecutionContextWasm};
 use dpp::state_transition::state_transition_execution_context::StateTransitionExecutionContext;
-use dpp::state_transition::{StateTransitionConvert, StateTransitionFacade, ValidateOptions};
+use dpp::state_transition::{
+    StateTransitionConvert, StateTransitionFacade, StateTransitionLike, StateTransitionType,
+    ValidateOptions,
+};
 use dpp::version::ProtocolVersionValidator;
 use serde::Deserialize;
 
 use crate::errors::protocol_error::from_protocol_error;
+use crate::errors::value_error::PlatformValueErrorWasm;
+use dpp::data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransition;
+use dpp::document::DocumentsBatchTransition;
+use dpp::ProtocolError;
 use std::sync::Arc;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsValue;
@@ -54,7 +62,21 @@ impl StateTransitionFacadeWasm {
             Default::default()
         };
 
-        let raw_state_transition = raw_state_transition.with_serde_to_platform_value()?;
+        let mut raw_state_transition = raw_state_transition.with_serde_to_platform_value()?;
+        let state_transition_type: StateTransitionType = raw_state_transition
+            .get_integer::<u8>("type")
+            .map_err(|e| PlatformValueErrorWasm::from(e))?
+            .try_into()
+            .map_err(|_| JsValue::from_str("Invalid state transition type"))?;
+
+        // TODO(wasm-dpp): clean values of other transitions as well?
+        match state_transition_type {
+            StateTransitionType::DataContractUpdate => {
+                DataContractUpdateTransition::clean_value(&mut raw_state_transition)
+                    .map_err(|e| PlatformValueErrorWasm::from(e))?;
+            }
+            _ => {}
+        }
 
         let result = self
             .0
diff --git a/packages/wasm-dpp/src/utils.rs b/packages/wasm-dpp/src/utils.rs
index 4a7b90061af..aee52dcb73a 100644
--- a/packages/wasm-dpp/src/utils.rs
+++ b/packages/wasm-dpp/src/utils.rs
@@ -3,17 +3,21 @@ use std::convert::TryInto;
 
 use anyhow::{anyhow, bail};
 use dpp::{
+    consensus::ConsensusError,
     dashcore::{anyhow, anyhow::Context},
     ProtocolError,
 };
 
 use dpp::platform_value::Value;
-use js_sys::Function;
+use js_sys::{Function, Uint8Array};
 use serde::de::DeserializeOwned;
 use serde_json::Value as JsonValue;
 use wasm_bindgen::{convert::RefFromWasmAbi, prelude::*};
 
-use crate::errors::{from_dpp_err, RustConversionError};
+use crate::{
+    buffer::Buffer,
+    errors::{from_dpp_err, RustConversionError},
+};
 
 pub trait ToSerdeJSONExt {
     fn with_serde_to_json_value(&self) -> Result<JsonValue, JsValue>;
@@ -280,3 +284,20 @@ pub(crate) trait Inner {
     fn inner(&self) -> &Self::InnerItem;
     fn inner_mut(&mut self) -> &mut Self::InnerItem;
 }
+
+pub(crate) fn consensus_errors_from_buffers(
+    errors: Vec<Buffer>,
+) -> Result<Vec<ConsensusError>, JsValue> {
+    errors
+        .iter()
+        .map(|error_buffer| {
+            Uint8Array::new_with_byte_offset_and_length(
+                &error_buffer.buffer(),
+                error_buffer.byte_offset(),
+                error_buffer.length(),
+            )
+            .to_vec()
+        })
+        .map(|error_bytes| ConsensusError::deserialize(&error_bytes.to_vec()).with_js_error())
+        .collect::<Result<Vec<ConsensusError>, JsValue>>()
+}
diff --git a/packages/wasm-dpp/src/validation/validation_result.rs b/packages/wasm-dpp/src/validation/validation_result.rs
index 74538528ae5..b23856454ea 100644
--- a/packages/wasm-dpp/src/validation/validation_result.rs
+++ b/packages/wasm-dpp/src/validation/validation_result.rs
@@ -1,6 +1,10 @@
-use crate::errors::consensus::consensus_error::from_consensus_error_ref;
+use crate::{
+    buffer::Buffer,
+    errors::consensus::consensus_error::from_consensus_error_ref,
+    utils::{consensus_errors_from_buffers, WithJsError},
+};
 use dpp::{consensus::ConsensusError, validation::ConsensusValidationResult};
-use js_sys::JsString;
+use js_sys::{JsString, Uint8Array};
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(js_name=ValidationResult)]
@@ -18,6 +22,19 @@ where
 
 #[wasm_bindgen(js_class=ValidationResult)]
 impl ValidationResultWasm {
+    #[wasm_bindgen(constructor)]
+    pub fn new(errors_option: Option<Vec<Buffer>>) -> Result<ValidationResultWasm, JsValue> {
+        if let Some(errors) = errors_option {
+            let consensus_errors: Vec<ConsensusError> = consensus_errors_from_buffers(errors)?;
+
+            return Ok(Self(ConsensusValidationResult::new_with_errors(
+                consensus_errors,
+            )));
+        }
+
+        Ok(Self(ConsensusValidationResult::new_with_errors(vec![])))
+    }
+
     /// This is just a test method - doesn't need to be in the resulted binding. Please
     /// remove before shipping
     #[wasm_bindgen(js_name=errorsText)]
@@ -51,6 +68,22 @@ impl ValidationResultWasm {
             JsValue::undefined()
         }
     }
+
+    #[wasm_bindgen(js_name = addError)]
+    pub fn add_error_wasm(&mut self, error_buffer: Buffer) -> Result<JsValue, JsValue> {
+        let error_bytes: Vec<u8> = Uint8Array::new_with_byte_offset_and_length(
+            &error_buffer.buffer(),
+            error_buffer.byte_offset(),
+            error_buffer.length(),
+        )
+        .to_vec();
+
+        let consensus_error = ConsensusError::deserialize(&error_bytes).with_js_error()?;
+
+        self.0.add_error(consensus_error);
+
+        Ok(JsValue::undefined())
+    }
 }
 
 impl ValidationResultWasm {
diff --git a/packages/wasm-dpp/test/integration/dataContract/DataContractFacade.spec.js b/packages/wasm-dpp/test/integration/dataContract/DataContractFacade.spec.js
index 8124b8c688f..e10b0524666 100644
--- a/packages/wasm-dpp/test/integration/dataContract/DataContractFacade.spec.js
+++ b/packages/wasm-dpp/test/integration/dataContract/DataContractFacade.spec.js
@@ -1,11 +1,13 @@
 const getDataContractJSFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
 const crypto = require('crypto');
 const getBlsAdapterMock = require('../../../lib/test/mocks/getBlsAdapterMock');
+const createStateRepositoryMock = require('../../../lib/test/mocks/createStateRepositoryMock');
+const getPrivateAndPublicKey = require('../../../lib/test/fixtures/getPrivateAndPublicKeyForSigningFixture');
 
 const { default: loadWasmDpp } = require('../../..');
 let {
   DashPlatformProtocol, DataContract, ValidationResult, DataContractValidator,
-  DataContractFactory, DataContractCreateTransition,
+  DataContractFactory, DataContractCreateTransition, DataContractUpdateTransition,
 } = require('../../..');
 
 describe('DataContractFacade', () => {
@@ -15,18 +17,21 @@ describe('DataContractFacade', () => {
   let blsAdapter;
   let rawDataContract;
   let dataContractWasm;
+  let stateTransitionMock;
 
   before(async () => {
     ({
       DashPlatformProtocol, DataContract, ValidationResult,
       DataContractValidator, DataContractFactory, DataContractCreateTransition,
+      DataContractUpdateTransition,
     } = await loadWasmDpp());
   });
 
-  beforeEach(async () => {
+  beforeEach(async function beforeEach() {
     blsAdapter = await getBlsAdapterMock();
+    stateTransitionMock = createStateRepositoryMock(this.sinonSandbox);
     dpp = new DashPlatformProtocol(
-      blsAdapter, {}, { generate: () => crypto.randomBytes(32) }, 1,
+      blsAdapter, stateTransitionMock, { generate: () => crypto.randomBytes(32) }, 1,
     );
 
     dataContractJs = await getDataContractJSFixture();
@@ -92,6 +97,38 @@ describe('DataContractFacade', () => {
     });
   });
 
+  describe('createDataContractUpdateTransition', () => {
+    it('should create DataContractUpdateTransition from buffer', async () => {
+      const dataContractBuffer = Buffer.from('01a56324696458205a3c9565f215156cfb330ef3a4a4400a1dad7415f4f1480e072d3419bb29c12c6724736368656d61783468747470733a2f2f736368656d612e646173682e6f72672f6470702d302d342d302f6d6574612f646174612d636f6e7472616374676f776e657249645820d5199a5b19334554d5dd483af53877251584ab9a66ca777bd1b2e8d2ec4808346776657273696f6e0169646f63756d656e7473a36c6e696365446f63756d656e74a46474797065666f626a656374687265717569726564816a246372656174656441746a70726f70657274696573a1646e616d65a1647479706566737472696e67746164646974696f6e616c50726f70657274696573f46e7769746842797465417272617973a56474797065666f626a65637467696e646963657381a2646e616d6566696e646578316a70726f7065727469657381a16e6279746541727261794669656c6463617363687265717569726564816e6279746541727261794669656c646a70726f70657274696573a26e6279746541727261794669656c64a36474797065656172726179686d61784974656d731069627974654172726179f56f6964656e7469666965724669656c64a56474797065656172726179686d61784974656d731820686d696e4974656d73182069627974654172726179f570636f6e74656e744d656469615479706578216170706c69636174696f6e2f782e646173682e6470702e6964656e746966696572746164646974696f6e616c50726f70657274696573f46f696e6465786564446f63756d656e74a56474797065666f626a65637467696e646963657386a3646e616d6566696e646578316a70726f7065727469657382a168246f776e6572496463617363a16966697273744e616d656361736366756e69717565f5a3646e616d6566696e646578326a70726f7065727469657382a168246f776e6572496463617363a1686c6173744e616d656361736366756e69717565f5a2646e616d6566696e646578336a70726f7065727469657381a1686c6173744e616d6563617363a2646e616d6566696e646578346a70726f7065727469657382a16a2463726561746564417463617363a16a2475706461746564417463617363a2646e616d6566696e646578356a70726f7065727469657381a16a2475706461746564417463617363a2646e616d6566696e646578366a70726f7065727469657381a16a2463726561746564417463617363687265717569726564846966697273744e616d656a246372656174656441746a24757064617465644174686c6173744e616d656a70726f70657274696573a2686c6173744e616d65a2647479706566737472696e67696d61784c656e677468183f6966697273744e616d65a2647479706566737472696e67696d61784c656e677468183f746164646974696f6e616c50726f70657274696573f4', 'hex');
+
+      const dataContract = await dpp.dataContract.createFromBuffer(dataContractBuffer);
+
+      const updatedDataContract = await dpp.dataContract.createFromObject(
+        dataContract.toObject(),
+      );
+
+      updatedDataContract.incrementVersion();
+
+      const dataContractUpdateTransition = dpp.dataContract
+        .createDataContractUpdateTransition(updatedDataContract);
+
+      const { identityPublicKey, privateKey } = await getPrivateAndPublicKey();
+
+      dataContractUpdateTransition.sign(
+        identityPublicKey,
+        privateKey,
+        await getBlsAdapterMock(),
+      );
+
+      const buf = dataContractUpdateTransition.toBuffer();
+      stateTransitionMock.fetchDataContract.resolves(dataContract);
+
+      const st = await dpp.stateTransition.createFromBuffer(buf);
+
+      expect(st).to.be.an.instanceOf(DataContractUpdateTransition);
+    });
+  });
+
   describe('validate', () => {
     it('should validate DataContract', async () => {
       const result = await dpp.dataContract.validate(rawDataContract);
diff --git a/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js b/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js
index d380a0b4cbd..052d6602d93 100644
--- a/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js
+++ b/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js
@@ -1072,7 +1072,7 @@ describe('validateDataContractFactory', () => {
           properties: {
             something: {
               type: 'string',
-              format: 'url',
+              format: 'uri',
             },
           },
           additionalProperties: false,
@@ -1096,7 +1096,7 @@ describe('validateDataContractFactory', () => {
           properties: {
             something: {
               type: 'string',
-              format: 'url',
+              format: 'uri',
               maxLength: 60000,
             },
           },
diff --git a/packages/wasm-dpp/test/integration/error/consensus/deserializeConsensusError.spec.js b/packages/wasm-dpp/test/integration/error/consensus/deserializeConsensusError.spec.js
index 8e58f571ecc..338b0af1206 100644
--- a/packages/wasm-dpp/test/integration/error/consensus/deserializeConsensusError.spec.js
+++ b/packages/wasm-dpp/test/integration/error/consensus/deserializeConsensusError.spec.js
@@ -2,7 +2,6 @@ const { default: loadWasmDpp } = require('../../../..');
 
 let {
   deserializeConsensusError,
-  decodeProtocolEntity,
   ProtocolVersionParsingError,
 } = require('../../../..');
 
@@ -10,25 +9,23 @@ describe('deserializeConsensusError', () => {
   before(async () => {
     ({
       deserializeConsensusError,
-      decodeProtocolEntity,
       ProtocolVersionParsingError,
     } = await loadWasmDpp());
   });
 
   it('should deserialize consensus error', async () => {
-    try {
-      await decodeProtocolEntity(Buffer.alloc(0));
-    } catch (consensusError) {
-      expect(consensusError).to.be.instanceOf(ProtocolVersionParsingError);
-      expect(consensusError.getCode()).to.equals(1000);
-      expect(consensusError.message).to.equals('Can\'t read protocol version from serialized object: protocol version could not be decoded as a varint');
+    const consensusError = new ProtocolVersionParsingError('test');
+    const message = 'Can\'t read protocol version from serialized object: test';
 
-      const bytes = consensusError.serialize();
+    expect(consensusError).to.be.instanceOf(ProtocolVersionParsingError);
+    expect(consensusError.getCode()).to.equals(1000);
+    expect(consensusError.message).to.equals(message);
 
-      const recoveredError = deserializeConsensusError(bytes);
-      expect(recoveredError).to.be.instanceOf(ProtocolVersionParsingError);
-      expect(recoveredError.getCode()).to.equals(1000);
-      expect(recoveredError.message).to.equals('Can\'t read protocol version from serialized object: protocol version could not be decoded as a varint');
-    }
+    const serializedConsensusError = consensusError.serialize();
+
+    const recoveredError = deserializeConsensusError(serializedConsensusError);
+    expect(recoveredError).to.be.instanceOf(ProtocolVersionParsingError);
+    expect(recoveredError.getCode()).to.equals(1000);
+    expect(recoveredError.message).to.equals(message);
   });
 });
diff --git a/packages/wasm-dpp/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js b/packages/wasm-dpp/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js
index 96a32444696..8c59c969322 100644
--- a/packages/wasm-dpp/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js
+++ b/packages/wasm-dpp/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js
@@ -109,7 +109,7 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
 
   it('should return IdentityPublicKeyIsDisabledError if disabling public key is already disabled', async () => {
     const keys = identity.getPublicKeys();
-    keys[0].setDisabledAt(new Date().getTime());
+    keys[0].setDisabledAt(new Date());
     identity.setPublicKeys(keys);
     stateTransition.setPublicKeyIdsToDisable([0]);
 
diff --git a/packages/wasm-dpp/test/integration/util/generateTemporaryEcdsaPrivateKey.spec.js b/packages/wasm-dpp/test/integration/util/generateTemporaryEcdsaPrivateKey.spec.js
new file mode 100644
index 00000000000..ca4bb7182af
--- /dev/null
+++ b/packages/wasm-dpp/test/integration/util/generateTemporaryEcdsaPrivateKey.spec.js
@@ -0,0 +1,17 @@
+const { PrivateKey } = require('@dashevo/dashcore-lib');
+const { default: loadWasmDpp } = require('../../..');
+
+let { generateTemporaryEcdsaPrivateKey } = require('../../..');
+
+describe('generateTemporaryEcdsaPrivateKey', () => {
+  beforeEach(async () => {
+    ({ generateTemporaryEcdsaPrivateKey } = await loadWasmDpp());
+  });
+
+  it('should generate a valid private key', () => {
+    const keyBase64 = generateTemporaryEcdsaPrivateKey();
+
+    // eslint-disable-next-line
+    const _key = new PrivateKey(keyBase64);
+  });
+});
diff --git a/packages/wasm-dpp/test/unit/dataContract/DataContract.spec.js b/packages/wasm-dpp/test/unit/dataContract/DataContract.spec.js
index 5d8072feb55..8197e3be90f 100644
--- a/packages/wasm-dpp/test/unit/dataContract/DataContract.spec.js
+++ b/packages/wasm-dpp/test/unit/dataContract/DataContract.spec.js
@@ -189,6 +189,7 @@ describe('DataContract', () => {
 
       expect(anotherDocuments).to.have.property(anotherType);
       expect(anotherDocuments[anotherType]).to.deep.equal(anotherDefinition);
+      expect(dataContract.isDocumentDefined(anotherType)).to.be.true();
     });
   });
 
diff --git a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js
index 7aee611e0f5..a17392636d9 100644
--- a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/applyDataContractUpdateTransitionFactory.spec.js
@@ -32,7 +32,7 @@ describe('applyDataContractUpdateTransitionFactory', () => {
     executionContext = new StateTransitionExecutionContext();
 
     const stateRepositoryLike = {
-      storeDataContract: async () => {
+      updateDataContract: async () => {
         dataContractStored = true;
       },
     };
diff --git a/packages/wasm-dpp/test/unit/document/Document.spec.js b/packages/wasm-dpp/test/unit/document/Document.spec.js
index c366066d243..a728c43eef0 100644
--- a/packages/wasm-dpp/test/unit/document/Document.spec.js
+++ b/packages/wasm-dpp/test/unit/document/Document.spec.js
@@ -277,7 +277,7 @@ describe('Document', () => {
 
       document = new ExtendedDocument(rawDocument, dataContract);
 
-      expect(document.getCreatedAt()).to.equal(rawDocument.$createdAt);
+      expect(document.getCreatedAt().getTime()).to.equal(rawDocument.$createdAt);
     });
 
     it('should create Document with $updatedAt and data if present', async () => {
@@ -298,7 +298,7 @@ describe('Document', () => {
 
       document = new ExtendedDocument(rawDocument, dataContract);
 
-      expect(document.getUpdatedAt()).to.equal(rawDocument.$updatedAt);
+      expect(document.getUpdatedAt().getTime()).to.equal(rawDocument.$updatedAt);
     });
   });
 
@@ -461,41 +461,41 @@ describe('Document', () => {
 
   describe('#setCreatedAt', () => {
     it('should set $createdAt', () => {
-      const time = new Date().getTime();
+      const time = new Date();
 
       document.setCreatedAt(time);
 
-      expect(document.getCreatedAt()).to.equal(time);
+      expect(document.getCreatedAt()).to.deep.equal(time);
     });
   });
 
   describe('#getCreatedAt', () => {
     it('should return $createdAt', () => {
-      const time = new Date().getTime();
+      const time = new Date();
 
       document.setCreatedAt(time);
 
-      expect(document.getCreatedAt()).to.equal(time);
+      expect(document.getCreatedAt()).to.deep.equal(time);
     });
   });
 
   describe('#setUpdatedAt', () => {
     it('should set $updatedAt', () => {
-      const time = new Date().getTime();
+      const time = new Date();
 
       document.setUpdatedAt(time);
 
-      expect(document.getUpdatedAt()).to.equal(time);
+      expect(document.getUpdatedAt()).to.deep.equal(time);
     });
   });
 
   describe('#getUpdatedAt', () => {
     it('should return $updatedAt', () => {
-      const time = new Date().getTime();
+      const time = new Date();
 
       document.setUpdatedAt(time);
 
-      expect(document.getUpdatedAt()).to.equal(time);
+      expect(document.getUpdatedAt()).to.deep.equal(time);
     });
   });
 });
diff --git a/packages/wasm-dpp/test/unit/document/DocumentFactory.spec.js b/packages/wasm-dpp/test/unit/document/DocumentFactory.spec.js
index 22177e253b0..b8102c8dc8e 100644
--- a/packages/wasm-dpp/test/unit/document/DocumentFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/document/DocumentFactory.spec.js
@@ -154,7 +154,7 @@ describe('DocumentFactory', () => {
       // in a true unit test. Not here.
       expect(newDocument.getEntropy()).not.to.deep.be.equal(Buffer.alloc(32));
 
-      expect(newDocument.getCreatedAt()).to.be.an('number');
+      expect(newDocument.getCreatedAt()).to.be.an.instanceOf(Date);
     });
 
     it('should throw an error if type is not defined', () => {
diff --git a/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js b/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js
index efb2e6f8e3a..37486ad7888 100644
--- a/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/applyDocumentsBatchTransitionFactory.spec.js
@@ -241,7 +241,7 @@ describe('applyDocumentsBatchTransitionFactory', () => {
       $type: documentTransition.getType(),
       $dataContractId: documentTransition.getDataContractId(),
       $ownerId: ownerId,
-      $createdAt: documentTransition.getUpdatedAt(),
+      $createdAt: documentTransition.getUpdatedAt().getTime(),
       ...documentTransition.getData(),
     }, documentTransition.getDataContract());
 
diff --git a/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js b/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js
index e880ec179a6..43f380815e0 100644
--- a/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/document/stateTransition/DocumetsBatchTransition/validation/state/validateDocumentsBatchTransitionStateFactory.spec.js
@@ -234,7 +234,7 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
       transitions: documentTransitionsJs.map((t) => t.toObject()),
     }, [dataContract]);
 
-    documents[0].setCreatedAt(replaceDocument.getCreatedAt().getMilliseconds());
+    documents[0].setCreatedAt(replaceDocument.getCreatedAt());
     stateRepositoryMock.fetchDocuments.resolves([documents[0].getDocument()]);
 
     const result = await validateDocumentsBatchTransitionState(
@@ -354,7 +354,7 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
           // eslint-disable-next-line no-param-reassign
-          t.setUpdatedAt(new Date().getMilliseconds());
+          t.setUpdatedAt(new Date());
         });
         stateTransition.setTransitions(transitions);
 
@@ -382,8 +382,8 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
 
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
-          const createdAtMinus6Mins = t.getCreatedAt() - (6 * 60 * 1000);
-          t.setCreatedAt(createdAtMinus6Mins);
+          const createdAtMinus6Mins = t.getCreatedAt().getTime() - (6 * 60 * 1000);
+          t.setCreatedAt(new Date(createdAtMinus6Mins));
           t.setUpdatedAt(undefined);
         });
         stateTransition.setTransitions(transitions);
@@ -420,8 +420,8 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
 
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
-          const createdAtMinus6Mins = t.getUpdatedAt() - (6 * 60 * 1000);
-          t.setUpdatedAt(createdAtMinus6Mins);
+          const createdAtMinus6Mins = t.getUpdatedAt().getTime() - (6 * 60 * 1000);
+          t.setUpdatedAt(new Date(createdAtMinus6Mins));
           t.setCreatedAt(undefined);
         });
         stateTransition.setTransitions(transitions);
@@ -468,8 +468,8 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
 
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
-          const createdAtMinus6Mins = t.getUpdatedAt() - (6 * 60 * 1000);
-          t.setUpdatedAt(createdAtMinus6Mins);
+          const createdAtMinus6Mins = t.getUpdatedAt().getTime() - (6 * 60 * 1000);
+          t.setUpdatedAt(new Date(createdAtMinus6Mins));
           t.setCreatedAt(undefined);
         });
         stateTransition.setTransitions(transitions);
@@ -501,7 +501,7 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
           // eslint-disable-next-line no-param-reassign
-          t.setUpdatedAt(new Date().getMilliseconds());
+          t.setUpdatedAt(new Date());
         });
         executionContext.enableDryRun();
 
@@ -536,8 +536,8 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
 
         const transitions = stateTransition.getTransitions();
         transitions.forEach((t) => {
-          const createdAtMinus6Mins = t.getUpdatedAt() - (6 * 60 * 1000);
-          t.setUpdatedAt(createdAtMinus6Mins);
+          const createdAtMinus6Mins = t.getUpdatedAt().getTime() - (6 * 60 * 1000);
+          t.setUpdatedAt(new Date(createdAtMinus6Mins));
         });
         stateTransition.setTransitions(transitions);
 
@@ -583,8 +583,8 @@ describe('validateDocumentsBatchTransitionStateFactory', () => {
         stateRepositoryMock.fetchExtendedDocuments.resolves([documentToReturn]);
 
         const transitions = stateTransition.getTransitions(); transitions.forEach((t) => {
-          const createdAtMinus6Mins = t.getUpdatedAt() - (6 * 60 * 1000);
-          t.setUpdatedAt(createdAtMinus6Mins);
+          const createdAtMinus6Mins = t.getUpdatedAt().getTime() - (6 * 60 * 1000);
+          t.setUpdatedAt(new Date(createdAtMinus6Mins));
         });
         stateTransition.setTransitions(transitions);
         executionContext.enableDryRun();
diff --git a/packages/wasm-dpp/test/unit/identity/IdentityPublicKey.spec.js b/packages/wasm-dpp/test/unit/identity/IdentityPublicKey.spec.js
index 5652950a6ef..ff56b095a39 100644
--- a/packages/wasm-dpp/test/unit/identity/IdentityPublicKey.spec.js
+++ b/packages/wasm-dpp/test/unit/identity/IdentityPublicKey.spec.js
@@ -119,17 +119,19 @@ describe('IdentityPublicKey', () => {
 
   describe('#setDisabledAt', () => {
     it('should set disabledAt', () => {
-      publicKey.setDisabledAt(123);
+      const now = new Date();
+      publicKey.setDisabledAt(now);
 
-      expect(publicKey.getDisabledAt()).to.equal(123);
+      expect(publicKey.getDisabledAt()).to.deep.equal(now);
     });
   });
 
   describe('#getDisabledAt', () => {
     it('should return disabledAt', () => {
-      publicKey.setDisabledAt(42);
+      const now = new Date();
+      publicKey.setDisabledAt(now);
 
-      expect(publicKey.getDisabledAt()).to.equal(42);
+      expect(publicKey.getDisabledAt()).to.deep.equal(now);
     });
   });
 
@@ -218,7 +220,8 @@ describe('IdentityPublicKey', () => {
     });
 
     it('should return JSON representation with optional properties', () => {
-      publicKey.setDisabledAt(42);
+      const now = new Date();
+      publicKey.setDisabledAt(now);
 
       const jsonPublicKey = publicKey.toJSON();
 
@@ -229,7 +232,7 @@ describe('IdentityPublicKey', () => {
         purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
         securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER,
         readOnly: false,
-        disabledAt: 42,
+        disabledAt: now.getTime(),
       });
     });
   });
diff --git a/packages/wasm-dpp/test/unit/stateTransition/StateTransitionExecutionContext.spec.js b/packages/wasm-dpp/test/unit/stateTransition/StateTransitionExecutionContext.spec.js
index 7975bd4690c..1c93b9f9e07 100644
--- a/packages/wasm-dpp/test/unit/stateTransition/StateTransitionExecutionContext.spec.js
+++ b/packages/wasm-dpp/test/unit/stateTransition/StateTransitionExecutionContext.spec.js
@@ -36,7 +36,10 @@ describe('StateTransitionExecutionContext', () => {
     });
 
     it('should add PreCalculatedOperation', () => {
-      executionContext.addOperation(new PreCalculatedOperation(1, 1, []));
+      executionContext.addOperation(new PreCalculatedOperation(1, 1, [{
+        identifier: Buffer.alloc(32).fill(32),
+        creditsPerEpoch: { 0: 9991498 },
+      }]));
       const operations = executionContext.getOperations();
       expect(operations[0]).to.be.instanceOf(PreCalculatedOperation);
     });
diff --git a/packages/wasm-dpp/test/unit/stateTransition/StateTransitionFactory.spec.js b/packages/wasm-dpp/test/unit/stateTransition/StateTransitionFactory.spec.js
index b12036924b0..6cc06da0d66 100644
--- a/packages/wasm-dpp/test/unit/stateTransition/StateTransitionFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/stateTransition/StateTransitionFactory.spec.js
@@ -88,8 +88,9 @@ describe('StateTransitionFactory', function main() {
       expect(result.toObject()).to.deep.equal(stateTransition.toObject());
     });
 
-    it('should throw InvalidStateTransition error in case validation failed', async () => {
+    it.skip('should throw InvalidStateTransition error in case validation failed', async () => {
       // CBOR that have invalid "type" property
+      // TODO: make it an actually missing field isntead of an invalid value
       const stateTransitionHex = '01a56c64617461436f6e7472616374a66f70726f746f636f6c56657273696f6e0163246964982018a318b611186f184718781848187d186318441830182c185518fe18e318ff188b18eb185918490218ac1831187b1873184a182c18d9189b1886182418bf6724736368656d61783468747470733a2f2f736368656d612e646173682e6f72672f6470702d302d342d302f6d6574612f646174612d636f6e74726163746776657273696f6e01676f776e657249649820187618a6185c189e18651833183d18aa02189e0d18a61869182818c107183e188908184f183818d018220418c01839161860187418ae18dd189969646f63756d656e7473a76f696e6465786564446f63756d656e74a56474797065666f626a65637467696e646963657386a3646e616d6566696e646578316a70726f7065727469657382a168246f776e6572496463617363a16966697273744e616d656361736366756e69717565f5a3646e616d6566696e646578326a70726f7065727469657382a168246f776e6572496463617363a1686c6173744e616d656361736366756e69717565f5a3646e616d6566696e646578336a70726f7065727469657381a1686c6173744e616d656361736366756e69717565f4a2646e616d6566696e646578346a70726f7065727469657382a16a2463726561746564417463617363a16a2475706461746564417463617363a2646e616d6566696e646578356a70726f7065727469657381a16a2475706461746564417463617363a2646e616d6566696e646578366a70726f7065727469657381a16a24637265617465644174636173636a70726f70657274696573a36966697273744e616d65a2647479706566737472696e67696d61784c656e677468183f686c6173744e616d65a2647479706566737472696e67696d61784c656e677468183f6d6f7468657250726f7065727479a2647479706566737472696e67696d61784c656e677468182a687265717569726564846966697273744e616d656a246372656174656441746a24757064617465644174686c6173744e616d65746164646974696f6e616c50726f70657274696573f46c6e696365446f63756d656e74a46474797065666f626a6563746a70726f70657274696573a1646e616d65a1647479706566737472696e67687265717569726564816a24637265617465644174746164646974696f6e616c50726f70657274696573f46e6e6f54696d65446f63756d656e74a36474797065666f626a6563746a70726f70657274696573a1646e616d65a1647479706566737472696e67746164646974696f6e616c50726f70657274696573f4781d6f7074696f6e616c556e69717565496e6465786564446f63756d656e74a56474797065666f626a6563746a70726f70657274696573a46966697273744e616d65a2647479706566737472696e67696d61784c656e677468183f686c6173744e616d65a2647479706566737472696e67696d61784c656e677468183f67636f756e747279a2647479706566737472696e67696d61784c656e677468183f6463697479a2647479706566737472696e67696d61784c656e677468183f67696e646963657383a3646e616d6566696e646578316a70726f7065727469657381a16966697273744e616d656361736366756e69717565f5a3646e616d6566696e646578326a70726f7065727469657383a168246f776e6572496463617363a16966697273744e616d6563617363a1686c6173744e616d656361736366756e69717565f5a3646e616d6566696e646578336a70726f7065727469657382a167636f756e74727963617363a164636974796361736366756e69717565f5687265717569726564826966697273744e616d65686c6173744e616d65746164646974696f6e616c50726f70657274696573f46e707265747479446f63756d656e74a46474797065666f626a6563746a70726f70657274696573a1686c6173744e616d65a1647479706566737472696e6768726571756972656482686c6173744e616d656a24757064617465644174746164646974696f6e616c50726f70657274696573f46b756e697175654461746573a56474797065666f626a65637467696e646963657382a3646e616d6566696e646578316a70726f7065727469657382a16a2463726561746564417463617363a16a247570646174656441746361736366756e69717565f5a2646e616d6566696e646578326a70726f7065727469657381a16a24757064617465644174636173636a70726f70657274696573a26966697273744e616d65a1647479706566737472696e67686c6173744e616d65a1647479706566737472696e67687265717569726564836966697273744e616d656a246372656174656441746a24757064617465644174746164646974696f6e616c50726f70657274696573f46e7769746842797465417272617973a56474797065666f626a65637467696e646963657381a2646e616d6566696e646578316a70726f7065727469657381a16e6279746541727261794669656c64636173636a70726f70657274696573a26e6279746541727261794669656c64a3647479706565617272617969627974654172726179f5686d61784974656d73106f6964656e7469666965724669656c64a5647479706565617272617969627974654172726179f570636f6e74656e744d656469615479706578216170706c69636174696f6e2f782e646173682e6470702e6964656e746966696572686d696e4974656d731820686d61784974656d731820687265717569726564816e6279746541727261794669656c64746164646974696f6e616c50726f70657274696573f464747970652267656e74726f70799820189618d10418b2071882188e188818fc18b7189818dd185c18811881189b1867187912183d184d187118ff1866181d185f1839188718ea1824185113747369676e61747572655075626c69634b6579496400697369676e617475726598410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000';
       const stateTransitionBuffer = Buffer.from(stateTransitionHex, 'hex');
 
diff --git a/packages/wasm-dpp/test/unit/stateTransition/validation/validateStateTransitionIdentitySignatureFactory.spec.js b/packages/wasm-dpp/test/unit/stateTransition/validation/validateStateTransitionIdentitySignatureFactory.spec.js
index 6ea8d48c3ea..9200f17f087 100644
--- a/packages/wasm-dpp/test/unit/stateTransition/validation/validateStateTransitionIdentitySignatureFactory.spec.js
+++ b/packages/wasm-dpp/test/unit/stateTransition/validation/validateStateTransitionIdentitySignatureFactory.spec.js
@@ -275,7 +275,7 @@ describe('validateStateTransitionIdentitySignatureFactory', () => {
 
     it('should return PublicKeyIsDisabledConsensusError if PublicKeyIsDisabledError was thrown', async () => {
       const publicKeys = identity.getPublicKeys();
-      publicKeys[2].setDisabledAt(Date.now());
+      publicKeys[2].setDisabledAt(new Date());
       identity.setPublicKeys(publicKeys);
 
       const result = await validateStateTransitionIdentitySignature(
@@ -315,7 +315,7 @@ describe('validateStateTransitionIdentitySignatureFactory', () => {
     it('should not verify signature on dry run', async () => {
       // This will produce an error during signature validation
       const publicKeys = identity.getPublicKeys();
-      publicKeys[2].setDisabledAt(Date.now());
+      publicKeys[2].setDisabledAt(new Date());
       identity.setPublicKeys(publicKeys);
 
       executionContext.enableDryRun();
diff --git a/packages/withdrawals-contract/package.json b/packages/withdrawals-contract/package.json
index db99137e814..e5cfcd33d16 100644
--- a/packages/withdrawals-contract/package.json
+++ b/packages/withdrawals-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/withdrawals-contract",
-  "version": "0.24.0-dev.17",
+  "version": "0.24.0-dev.19",
   "description": "Data Contract to manipulate and track withdrawals",
   "scripts": {
     "build": "",
diff --git a/scripts/configure_test_suite_network.sh b/scripts/configure_test_suite_network.sh
index d9776969c93..653e600d127 100755
--- a/scripts/configure_test_suite_network.sh
+++ b/scripts/configure_test_suite_network.sh
@@ -56,7 +56,7 @@ FEATURE_FLAGS_OWNER_PRIVATE_KEY=$(yq .feature_flags_hd_private_key "$CONFIG")
 MASTERNODE_NAME=$(grep "$DAPI_SEED" "$INVENTORY" | awk '{print $1;}')
 
 MASTERNODE_OWNER_PRO_REG_TX_HASH=$(grep "$DAPI_SEED" "$INVENTORY" | awk -F "=" '{print $6;}')
-MASTERNODE_OWNER_MASTER_PRIVATE_KEY=$(yq .masternodes."$MASTERNODE_NAME".owner.private_key "$CONFIG")
+MASTERNODE_OWNER_MASTER_PRIVATE_KEY=$(yq .hp_masternodes."$MASTERNODE_NAME".owner.private_key "$CONFIG")
 
 if [[ "$NETWORK_STRING" == "devnet"* ]]; then
   NETWORK=devnet
diff --git a/yarn.lock b/yarn.lock
index 09d29c4d1e2..a59dd92c6c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1677,9 +1677,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@dashevo/oclif@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@dashevo/oclif@npm:1.0.1"
+"@dashevo/oclif@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@dashevo/oclif@npm:1.0.2"
   dependencies:
     "@oclif/core": ^1.20.4
     "@oclif/plugin-help": ^5.1.19
@@ -1701,7 +1701,7 @@ __metadata:
     yosay: ^2.0.2
   bin:
     oclif: bin/run
-  checksum: 1a9b7871f83f97cd377c5037c67c0527241e13b917c63dd5da102755003eb36ec155326075f93fa0ba6de35e9f5f7dbf24fa6cc73f54caa7a75ae10f500500b9
+  checksum: b421acd414231e2691e1dbc31dc40f83245fddd19bba0bd3a269979a9a62e80e12366b88301dda6be3e1a117be901f0c59dff3c48ee870a19f770a8468ee0b87
   languageName: node
   linkType: hard
 
@@ -2405,6 +2405,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@oclif/core@npm:^1.25.0":
+  version: 1.26.2
+  resolution: "@oclif/core@npm:1.26.2"
+  dependencies:
+    "@oclif/linewrap": ^1.0.0
+    "@oclif/screen": ^3.0.4
+    ansi-escapes: ^4.3.2
+    ansi-styles: ^4.3.0
+    cardinal: ^2.1.1
+    chalk: ^4.1.2
+    clean-stack: ^3.0.1
+    cli-progress: ^3.10.0
+    debug: ^4.3.4
+    ejs: ^3.1.6
+    fs-extra: ^9.1.0
+    get-package-type: ^0.1.0
+    globby: ^11.1.0
+    hyperlinker: ^1.0.0
+    indent-string: ^4.0.0
+    is-wsl: ^2.2.0
+    js-yaml: ^3.14.1
+    natural-orderby: ^2.0.3
+    object-treeify: ^1.1.33
+    password-prompt: ^1.1.2
+    semver: ^7.3.7
+    string-width: ^4.2.3
+    strip-ansi: ^6.0.1
+    supports-color: ^8.1.1
+    supports-hyperlinks: ^2.2.0
+    tslib: ^2.4.1
+    widest-line: ^3.1.0
+    wrap-ansi: ^7.0.0
+  checksum: 1da7f22fff1eb4bba10f17f07a97bad308d317a0b591561be7f1171edff2f40bf84830295965b26cfcb80d3c5df7958df35bbbba4ce030e14a68bbc8e3cedc82
+  languageName: node
+  linkType: hard
+
 "@oclif/linewrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "@oclif/linewrap@npm:1.0.0"
@@ -2455,6 +2491,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@oclif/screen@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@oclif/screen@npm:3.0.4"
+  checksum: 6d662c81edfbc8acb50a30001e3c2261171e8baffcd6010603c331de375c5d0c9ce6b3230f6b0ce24961bfa3531f99e771265ea74d9d7a0ee37fb9357fb436a7
+  languageName: node
+  linkType: hard
+
 "@octokit/auth-token@npm:^2.4.4":
   version: 2.5.0
   resolution: "@octokit/auth-token@npm:2.5.0"
@@ -5745,10 +5788,10 @@ __metadata:
     "@dashevo/dpp": "workspace:*"
     "@dashevo/feature-flags-contract": "workspace:*"
     "@dashevo/masternode-reward-shares-contract": "workspace:*"
-    "@dashevo/oclif": ^1.0.1
+    "@dashevo/oclif": ^1.0.2
     "@dashevo/wallet-lib": "workspace:*"
     "@dashevo/withdrawals-contract": "workspace:*"
-    "@oclif/core": ^1.21.0
+    "@oclif/core": ^1.25.0
     "@oclif/plugin-help": ^5.1.20
     ajv: ^8.6.0
     ajv-formats: ^2.1.1