diff --git a/.circleci/config.yml b/.circleci/config.yml
index 857ded82..4b39fb77 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,7 +166,7 @@ commands:
           command: |
             git clone https://github.com/input-output-hk/vit-servicing-station.git
             cd vit-servicing-station
-            git checkout add_build_db_to_path
+            git checkout master
       - run:
           name: install vit-station-service
           command: |
diff --git a/Cargo.lock b/Cargo.lock
index bdf1beea..bcb549fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,7 +29,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -41,7 +41,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "cipher 0.3.0",
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -267,6 +267,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "base64ct"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
+
 [[package]]
 name = "bech32"
 version = "0.7.3"
@@ -297,7 +303,7 @@ dependencies = [
 [[package]]
 name = "bip39"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#6af1a21397c41a2bb831d2bc167d4df12bfc2224"
+source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056"
 dependencies = [
  "cryptoxide 0.4.2",
  "thiserror",
@@ -327,9 +333,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitvec"
-version = "0.20.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b"
 dependencies = [
  "funty",
  "radium",
@@ -344,7 +350,7 @@ source = "git+https://github.com/near/near-blake2.git?rev=736ff607cc8160af87ffa6
 dependencies = [
  "crypto-mac 0.8.0",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -369,26 +375,14 @@ dependencies = [
  "constant_time_eq",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding 0.1.5",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding 0.2.1",
- "generic-array 0.14.5",
+ "block-padding",
+ "generic-array",
 ]
 
 [[package]]
@@ -397,16 +391,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
 dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
 ]
 
 [[package]]
@@ -455,12 +440,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "bytemuck"
 version = "1.8.0"
@@ -515,7 +494,7 @@ dependencies = [
 [[package]]
 name = "cardano-legacy-address"
 version = "0.1.1"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "cbor_event",
  "chain-ser",
@@ -535,7 +514,7 @@ dependencies = [
 [[package]]
 name = "catalyst-toolbox"
 version = "0.3.0"
-source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=main#1cdbc3442447ed2cc3ded3e4cb11f696ba4c0110"
+source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=main#9d638274cd36cae2567089603b4d3843c7bea0e4"
 dependencies = [
  "assert_fs",
  "bech32 0.8.1",
@@ -596,6 +575,9 @@ name = "cc"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cfg-if"
@@ -636,7 +618,7 @@ dependencies = [
 [[package]]
 name = "chain-addr"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "bech32 0.8.1",
  "chain-core",
@@ -650,7 +632,7 @@ dependencies = [
 [[package]]
 name = "chain-core"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "chain-ser",
 ]
@@ -658,14 +640,14 @@ dependencies = [
 [[package]]
 name = "chain-crypto"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "bech32 0.8.1",
  "cryptoxide 0.4.2",
  "curve25519-dalek-ng",
  "ed25519-bip32 0.4.1",
  "ed25519-dalek",
- "generic-array 0.14.5",
+ "generic-array",
  "hex",
  "proptest",
  "quickcheck",
@@ -680,7 +662,7 @@ dependencies = [
 [[package]]
 name = "chain-evm"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "aurora-bn",
  "base64 0.13.0",
@@ -688,13 +670,13 @@ dependencies = [
  "byte-slice-cast",
  "chain-ser",
  "ethabi",
+ "ethereum-types",
  "evm",
  "hex",
  "imhamt",
  "libsecp256k1",
  "logos",
  "num",
- "primitive-types",
  "quickcheck",
  "ripemd",
  "rlp",
@@ -707,7 +689,7 @@ dependencies = [
 [[package]]
 name = "chain-impl-mockchain"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "cardano-legacy-address",
  "chain-addr",
@@ -722,6 +704,7 @@ dependencies = [
  "hex",
  "imhamt",
  "lazy_static",
+ "proptest",
  "quickcheck",
  "quickcheck_macros",
  "rand 0.8.5",
@@ -730,6 +713,7 @@ dependencies = [
  "sparse-array",
  "strum 0.23.0",
  "strum_macros 0.23.1",
+ "test-strategy",
  "thiserror",
  "typed-bytes",
 ]
@@ -737,7 +721,7 @@ dependencies = [
 [[package]]
 name = "chain-path-derivation"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#6af1a21397c41a2bb831d2bc167d4df12bfc2224"
+source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056"
 dependencies = [
  "thiserror",
 ]
@@ -745,7 +729,7 @@ dependencies = [
 [[package]]
 name = "chain-ser"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "thiserror",
 ]
@@ -753,7 +737,7 @@ dependencies = [
 [[package]]
 name = "chain-storage"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "criterion",
  "data-pile",
@@ -766,7 +750,7 @@ dependencies = [
 [[package]]
 name = "chain-time"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "chain-core",
  "chain-ser",
@@ -778,7 +762,7 @@ dependencies = [
 [[package]]
 name = "chain-vote"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
  "cfg-if 1.0.0",
  "chain-core",
@@ -817,7 +801,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -854,8 +838,8 @@ source = "git+https://github.com/dkijania/cocoon.git#1dfd975c3f0720d51c56fb297e7
 dependencies = [
  "aes-gcm",
  "chacha20poly1305",
- "hmac",
- "pbkdf2",
+ "hmac 0.11.0",
+ "pbkdf2 0.9.0",
  "rand 0.8.5",
  "sha2 0.9.9",
  "zeroize",
@@ -880,22 +864,6 @@ dependencies = [
  "unreachable",
 ]
 
-[[package]]
-name = "console"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "regex",
- "terminal_size",
- "unicode-width",
- "winapi 0.3.9",
- "winapi-util",
-]
-
 [[package]]
 name = "console"
 version = "0.15.0"
@@ -1064,7 +1032,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "typenum",
 ]
 
@@ -1074,7 +1042,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "subtle",
 ]
 
@@ -1084,7 +1052,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "subtle",
 ]
 
@@ -1274,7 +1242,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb"
 dependencies = [
- "console 0.15.0",
+ "console",
  "lazy_static",
  "tempfile",
  "zeroize",
@@ -1286,7 +1254,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349d6b4fabcd9e97e1df1ae15395ac7e49fb144946a0d453959dc2696273b9da"
 dependencies = [
- "console 0.15.0",
+ "console",
  "tempfile",
  "zeroize",
 ]
@@ -1345,22 +1313,13 @@ dependencies = [
  "ansi_term 0.12.1",
 ]
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -1371,6 +1330,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
 dependencies = [
  "block-buffer 0.10.2",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -1499,34 +1459,35 @@ checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
 
 [[package]]
 name = "ethabi"
-version = "16.0.0"
+version = "17.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5"
+checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e"
 dependencies = [
  "ethereum-types",
  "hex",
- "sha3 0.9.1",
+ "sha3 0.10.1",
 ]
 
 [[package]]
 name = "ethbloom"
-version = "0.11.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
+checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
 dependencies = [
  "crunchy",
  "fixed-hash",
  "impl-codec",
  "impl-rlp",
+ "impl-serde",
  "scale-info",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "ethereum"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34c90e0a755da706ce0970ec0fa8cc48aabcc8e8efa1245336acf718dab06ffe"
+checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef"
 dependencies = [
  "bytes 1.1.0",
  "ethereum-types",
@@ -1537,20 +1498,21 @@ dependencies = [
  "rlp-derive",
  "scale-info",
  "serde",
- "sha3 0.9.1",
+ "sha3 0.10.1",
  "triehash",
 ]
 
 [[package]]
 name = "ethereum-types"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
+checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
 dependencies = [
  "ethbloom",
  "fixed-hash",
  "impl-codec",
  "impl-rlp",
+ "impl-serde",
  "primitive-types",
  "scale-info",
  "uint",
@@ -1558,9 +1520,9 @@ dependencies = [
 
 [[package]]
 name = "evm"
-version = "0.33.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408ffdd509e16de15ea9b51f5333748f6086601f29d445d2ba53dd7e95565574"
+checksum = "be8ff320c1e25e7f6d676858f16ffd9b0493d2cc67c3d900c6f2ed027b747f43"
 dependencies = [
  "auto_impl",
  "environmental",
@@ -1574,16 +1536,15 @@ dependencies = [
  "rlp",
  "scale-info",
  "serde",
- "sha3 0.8.2",
+ "sha3 0.10.1",
 ]
 
 [[package]]
 name = "evm-core"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dfe4f2a56c4c05a8107b8596380e2332fc2019ffcf56b8f2d01971393a30c4d"
+checksum = "9d4537041d3a3438d59b2d01bd950ce89fb1ccb3cf21d9331193c10be12e849f"
 dependencies = [
- "funty",
  "parity-scale-codec",
  "primitive-types",
  "scale-info",
@@ -1592,9 +1553,9 @@ dependencies = [
 
 [[package]]
 name = "evm-gasometer"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c446679607eacac4e8c8738e20c97ea9b3c86eddd8b43666744b05f416037bd9"
+checksum = "6181da8734c86873ac9b3f9886d4e00105361039dcfb9f621be9a0ddb8f43961"
 dependencies = [
  "environmental",
  "evm-core",
@@ -1604,14 +1565,15 @@ dependencies = [
 
 [[package]]
 name = "evm-runtime"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "419e8434ac6e850a8a4bc09a19406264582d1940913b2920be2af948f4ffc49b"
+checksum = "f6157af91ca70fcf3581afaea1fa25974a71b9ef63d454c08dfba93ab0c7715d"
 dependencies = [
+ "auto_impl",
  "environmental",
  "evm-core",
  "primitive-types",
- "sha3 0.8.2",
+ "sha3 0.10.1",
 ]
 
 [[package]]
@@ -1809,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "funty"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
@@ -1921,15 +1883,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.5"
@@ -1970,7 +1923,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
 dependencies = [
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "polyval",
 ]
 
@@ -2177,7 +2130,7 @@ dependencies = [
 [[package]]
 name = "hdkeygen"
 version = "0.2.0"
-source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#6af1a21397c41a2bb831d2bc167d4df12bfc2224"
+source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056"
 dependencies = [
  "bip39",
  "cardano-legacy-address",
@@ -2238,7 +2191,7 @@ dependencies = [
 [[package]]
 name = "hersir"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "assert_fs",
  "chain-addr",
@@ -2283,6 +2236,15 @@ dependencies = [
  "digest 0.9.0",
 ]
 
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "http"
 version = "0.2.6"
@@ -2480,7 +2442,7 @@ dependencies = [
  "chain-vote",
  "chrono",
  "cocoon",
- "console 0.15.0",
+ "console",
  "cryptoxide 0.4.2",
  "csv",
  "dialoguer 0.10.0",
@@ -2574,16 +2536,19 @@ dependencies = [
 [[package]]
 name = "imhamt"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 dependencies = [
+ "proptest",
+ "rustc_version",
+ "test-strategy",
  "thiserror",
 ]
 
 [[package]]
 name = "impl-codec"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2597,6 +2562,15 @@ dependencies = [
  "rlp",
 ]
 
+[[package]]
+name = "impl-serde"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "impl-trait-for-tuples"
 version = "0.2.2"
@@ -2624,7 +2598,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
 dependencies = [
- "console 0.13.0",
+ "console",
  "lazy_static",
  "number_prefix",
  "regex",
@@ -2636,7 +2610,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -2733,7 +2707,7 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 [[package]]
 name = "jcli"
 version = "0.13.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "base64 0.13.0",
  "bech32 0.8.1",
@@ -2764,10 +2738,19 @@ dependencies = [
  "versionisator",
 ]
 
+[[package]]
+name = "jobserver"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "jormungandr-automation"
 version = "0.13.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "assert_cmd 2.0.4",
  "assert_fs",
@@ -2825,13 +2808,13 @@ dependencies = [
  "typed-bytes",
  "url",
  "warp",
- "zip 0.5.13",
+ "zip",
 ]
 
 [[package]]
 name = "jormungandr-integration-tests"
 version = "0.13.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "assert_cmd 2.0.4",
  "assert_fs",
@@ -2883,7 +2866,7 @@ dependencies = [
 [[package]]
 name = "jormungandr-lib"
 version = "0.13.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "base64 0.13.0",
  "bech32 0.8.1",
@@ -2917,7 +2900,7 @@ dependencies = [
  "base64 0.13.0",
  "bech32 0.8.1",
  "bytesize",
- "console 0.15.0",
+ "console",
  "csv",
  "custom_debug",
  "dialoguer 0.9.0",
@@ -2947,7 +2930,7 @@ dependencies = [
  "time 0.3.9",
  "tokio 1.17.0",
  "warp",
- "zip 0.6.0",
+ "zip",
 ]
 
 [[package]]
@@ -3138,7 +3121,7 @@ dependencies = [
 [[package]]
 name = "loki"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "chain-addr",
  "chain-core",
@@ -3336,7 +3319,7 @@ dependencies = [
 [[package]]
 name = "mjolnir"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "assert_fs",
  "chain-addr",
@@ -3381,7 +3364,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "multihash-derive",
  "unsigned-varint 0.5.1",
 ]
@@ -3639,12 +3622,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -3740,9 +3717,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "2.3.1"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066"
 dependencies = [
  "arrayvec 0.7.2",
  "bitvec",
@@ -3754,9 +3731,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "2.3.1"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2 1.0.36",
@@ -3789,6 +3766,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.3",
+ "subtle",
+]
+
 [[package]]
 name = "pbkdf2"
 version = "0.9.0"
@@ -3796,10 +3784,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
 dependencies = [
  "crypto-mac 0.11.1",
- "hmac",
+ "hmac 0.11.0",
  "sha2 0.9.9",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+dependencies = [
+ "digest 0.10.3",
+ "hmac 0.12.1",
+ "password-hash",
+ "sha2 0.10.2",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -3939,7 +3939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
 dependencies = [
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "universal-hash",
 ]
 
@@ -3951,7 +3951,7 @@ checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "universal-hash",
 ]
 
@@ -4005,13 +4005,14 @@ dependencies = [
 
 [[package]]
 name = "primitive-types"
-version = "0.10.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
 dependencies = [
  "fixed-hash",
  "impl-codec",
  "impl-rlp",
+ "impl-serde",
  "scale-info",
  "uint",
 ]
@@ -4080,7 +4081,7 @@ dependencies = [
 [[package]]
 name = "proptest"
 version = "1.0.0"
-source = "git+https://github.com/input-output-hk/proptest.git#dff1e6b410121989ea5aa076e5d3d6ae21b1bd81"
+source = "git+https://github.com/input-output-hk/proptest.git#38044d47b2e8eeab62408294aa9e78e393f13d6b"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -4237,9 +4238,9 @@ dependencies = [
 
 [[package]]
 name = "radium"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
@@ -4796,9 +4797,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "1.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f"
+checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9"
 dependencies = [
  "bitvec",
  "cfg-if 1.0.0",
@@ -4809,9 +4810,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "1.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
+checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2 1.0.36",
@@ -5006,7 +5007,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -5020,6 +5021,17 @@ dependencies = [
  "digest 0.10.3",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -5030,7 +5042,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -5044,19 +5056,6 @@ dependencies = [
  "digest 0.10.3",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
-dependencies = [
- "block-buffer 0.7.3",
- "byte-tools",
- "digest 0.8.1",
- "keccak",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha3"
 version = "0.9.1"
@@ -5066,7 +5065,7 @@ dependencies = [
  "block-buffer 0.9.0",
  "digest 0.9.0",
  "keccak",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -5197,7 +5196,7 @@ dependencies = [
 [[package]]
 name = "sparse-array"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 
 [[package]]
 name = "spin"
@@ -5362,7 +5361,7 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 [[package]]
 name = "symmetric-cipher"
 version = "0.5.0"
-source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#6af1a21397c41a2bb831d2bc167d4df12bfc2224"
+source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056"
 dependencies = [
  "cryptoxide 0.4.2",
  "rand 0.8.5",
@@ -5555,7 +5554,7 @@ dependencies = [
 [[package]]
 name = "thor"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#e8c4bca46527798adb631dff7d99605115af97c2"
+source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#a5ce1309f5465706a9d1ec3c87e5951ad1844c31"
 dependencies = [
  "assert_fs",
  "bech32 0.8.1",
@@ -6091,7 +6090,7 @@ dependencies = [
 [[package]]
 name = "typed-bytes"
 version = "0.1.0"
-source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#ef798477aba3794c7b4b171f0926884bc0327563"
+source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#41325015888e0a62a3e3b1718c278d4bec9d71f8"
 
 [[package]]
 name = "typenum"
@@ -6165,7 +6164,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "subtle",
 ]
 
@@ -6299,7 +6298,7 @@ dependencies = [
 [[package]]
 name = "vit-servicing-station-lib"
 version = "0.3.4-dev"
-source = "git+https://github.com/input-output-hk/vit-servicing-station.git?branch=master#71582bc561eb9e5344050c095de92ed36cdab513"
+source = "git+https://github.com/input-output-hk/vit-servicing-station.git?branch=master#070d14afda63f9ab7af4f86cc7623da2d104d8f4"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
@@ -6377,7 +6376,7 @@ dependencies = [
  "chain-impl-mockchain",
  "chain-time",
  "chain-vote",
- "console 0.15.0",
+ "console",
  "ctrlc",
  "custom_debug",
  "dialoguer 0.10.0",
@@ -6462,7 +6461,7 @@ dependencies = [
 [[package]]
 name = "wallet"
 version = "0.6.0-pre.1"
-source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#6af1a21397c41a2bb831d2bc167d4df12bfc2224"
+source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056"
 dependencies = [
  "bip39",
  "cardano-legacy-address",
@@ -6796,9 +6795,12 @@ dependencies = [
 
 [[package]]
 name = "wyz"
-version = "0.2.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e"
+dependencies = [
+ "tap",
+]
 
 [[package]]
 name = "xattr"
@@ -6839,28 +6841,23 @@ dependencies = [
  "synstructure",
 ]
 
-[[package]]
-name = "zip"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "flate2",
- "thiserror",
- "time 0.1.44",
-]
-
 [[package]]
 name = "zip"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6fa4aa90e99fb8d701bda16fb040d8ed2f9c7176fb44de750e880a74b580315"
 dependencies = [
+ "aes",
  "byteorder",
+ "bzip2",
+ "constant_time_eq",
  "crc32fast",
+ "flate2",
+ "hmac 0.12.1",
+ "pbkdf2 0.10.1",
+ "sha1",
+ "time 0.3.9",
+ "zstd",
 ]
 
 [[package]]
@@ -6884,3 +6881,32 @@ checksum = "daea6189557992dcad925fd8cd069f3cf6f85a731c65561d648009d73d7bd489"
 dependencies = [
  "data-encoding",
 ]
+
+[[package]]
+name = "zstd"
+version = "0.10.0+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "4.1.4+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "1.6.3+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
+dependencies = [
+ "cc",
+ "libc",
+]
diff --git a/iapyx/src/cli/args/interactive/mod.rs b/iapyx/src/cli/args/interactive/mod.rs
index 86d5858c..c86341b2 100644
--- a/iapyx/src/cli/args/interactive/mod.rs
+++ b/iapyx/src/cli/args/interactive/mod.rs
@@ -96,7 +96,7 @@ impl CliController {
         let key_bytes = Vec::<u8>::from_base32(&data_u5)?;
 
         let mut wallet = Wallet::recover_from_utxo(&key_bytes.try_into().unwrap())?;
-        wallet.set_state(Value(template.value), template.spending_counters[0]);
+        wallet.set_state(Value(template.value), template.spending_counters);
 
         let settings = self.backend_client.node_client().settings()?;
         Ok(Controller {
diff --git a/iapyx/src/controller/mod.rs b/iapyx/src/controller/mod.rs
index cb921f8b..9513e126 100644
--- a/iapyx/src/controller/mod.rs
+++ b/iapyx/src/controller/mod.rs
@@ -124,7 +124,7 @@ impl Controller {
         let account_state = self.get_account_state()?;
         let value: u64 = (*account_state.value()).into();
         self.wallet
-            .set_state(Value(value), account_state.counters()[0]);
+            .set_state(Value(value), account_state.counters());
         Ok(())
     }
 
@@ -185,14 +185,13 @@ impl Controller {
         votes_data: Vec<(&Proposal, Choice)>,
     ) -> Result<Vec<FragmentId>, ControllerError> {
         let account_state = self.backend.account_state(self.wallet.id())?;
-
-        let mut counter = account_state.counters()[0];
+        let mut counters = account_state.counters();
         let settings = self.settings.clone();
         let txs = votes_data
             .into_iter()
             .map(|(p, c)| {
                 self.wallet
-                    .set_state((*account_state.value()).into(), counter);
+                    .set_state((*account_state.value()).into(), counters.clone());
                 let tx = self
                     .wallet
                     .vote(
@@ -203,7 +202,7 @@ impl Controller {
                     )
                     .unwrap()
                     .to_vec();
-                counter += 1;
+                counters[0] += 1;
                 tx
             })
             .rev()
diff --git a/iapyx/src/load/multi_controller.rs b/iapyx/src/load/multi_controller.rs
index 18dee1e6..acedcf84 100644
--- a/iapyx/src/load/multi_controller.rs
+++ b/iapyx/src/load/multi_controller.rs
@@ -87,7 +87,7 @@ impl MultiController {
         for (idx, wallet) in self.wallets.iter_mut().enumerate() {
             let account_state = backend.account_state(wallet.id()).unwrap();
             println!("{}/{} Updating account state", idx + 1, count);
-            wallet.set_state((*account_state.value()).into(), account_state.counters()[0]);
+            wallet.set_state((*account_state.value()).into(), account_state.counters());
         }
     }
 
@@ -95,7 +95,7 @@ impl MultiController {
         let backend = self.backend().clone();
         let wallet = self.wallets.get_mut(wallet_index).unwrap();
         let account_state = backend.account_state(wallet.id()).unwrap();
-        wallet.set_state((*account_state.value()).into(), account_state.counters()[0]);
+        wallet.set_state((*account_state.value()).into(), account_state.counters());
     }
     pub fn update_wallet_state_if(
         &mut self,
@@ -137,12 +137,12 @@ impl MultiController {
         let wallet = self.wallets.get_mut(wallet_index).unwrap();
         let account_state = self.backend.account_state(wallet.id())?;
 
-        let mut counter = account_state.counters()[0];
+        let mut counters = account_state.counters();
         let settings = self.settings.clone();
         let txs = votes_data
             .into_iter()
             .map(|(p, c)| {
-                wallet.set_state((*account_state.value()).into(), counter);
+                wallet.set_state((*account_state.value()).into(), counters.clone());
                 let tx = wallet
                     .vote(
                         settings.clone(),
@@ -152,7 +152,7 @@ impl MultiController {
                     )
                     .unwrap()
                     .to_vec();
-                counter += 1;
+                counters[0] += 1;
                 tx
             })
             .rev()
@@ -179,7 +179,7 @@ impl MultiController {
         let wallet = self.wallets.get_mut(wallet_index).unwrap();
         let account_state = self.backend.account_state(wallet.id())?;
         let value: u64 = (*account_state.value()).into();
-        wallet.set_state(Value(value), account_state.counters()[0]);
+        wallet.set_state(Value(value), account_state.counters());
         Ok(())
     }
 
diff --git a/iapyx/src/load/request_generators/jormungandr/post/batch.rs b/iapyx/src/load/request_generators/jormungandr/post/batch.rs
index 44b6bb68..64e19de2 100644
--- a/iapyx/src/load/request_generators/jormungandr/post/batch.rs
+++ b/iapyx/src/load/request_generators/jormungandr/post/batch.rs
@@ -81,11 +81,11 @@ impl BatchWalletRequestGen {
         };
 
         // update state of wallet only before first vote.
-        // Then relay on mechanism of spending counter auto-update
+        // Then rely on mechanism of spending counter auto-update
         if self.update_account_before_vote {
             self.multi_controller
                 .update_wallet_state_if(wallet_index, &|wallet: &Wallet| {
-                    wallet.spending_counter() == 0
+                    wallet.spending_counter()[0] == 0
                 });
         }
 
diff --git a/iapyx/src/load/request_generators/jormungandr/post/single.rs b/iapyx/src/load/request_generators/jormungandr/post/single.rs
index 11fed8a7..48e666d1 100644
--- a/iapyx/src/load/request_generators/jormungandr/post/single.rs
+++ b/iapyx/src/load/request_generators/jormungandr/post/single.rs
@@ -74,7 +74,9 @@ impl WalletRequestGen {
         // Then relay on mechanism of spending counter auto-update
         if self.update_account_before_vote {
             self.multi_controller
-                .update_wallet_state_if(index, &|wallet: &Wallet| wallet.spending_counter() == 0);
+                .update_wallet_state_if(index, &|wallet: &Wallet| {
+                    wallet.spending_counter()[0] == 0
+                });
         }
 
         let counter = self.vote_cast_counter.advance_single(index).unwrap();
diff --git a/iapyx/src/wallet.rs b/iapyx/src/wallet.rs
index 5377e7ab..35d1d477 100644
--- a/iapyx/src/wallet.rs
+++ b/iapyx/src/wallet.rs
@@ -77,11 +77,12 @@ impl Wallet {
         self.inner.total_value()
     }
 
-    pub fn set_state(&mut self, value: Value, counter: u32) {
-        self.inner.set_state(value, counter);
+    pub fn set_state(&mut self, value: Value, counter: Vec<u32>) {
+        //TODO map error instead of unwrapping
+        self.inner.set_state(value, counter).unwrap();
     }
 
-    pub fn spending_counter(&self) -> u32 {
+    pub fn spending_counter(&self) -> Vec<u32> {
         self.inner.spending_counter()
     }
 
@@ -93,7 +94,7 @@ impl Wallet {
         valid_until: &BlockDate,
     ) -> Result<Box<[u8]>, Error> {
         self.inner
-            .vote(settings, proposal, choice, valid_until)
+            .vote(settings, proposal, choice, valid_until, 0u8)
             .map_err(|e| Error::CannotSendVote(e.to_string()))
     }
 
diff --git a/integration-tests/src/backend/features/batch.rs b/integration-tests/src/backend/features/batch.rs
index cb1c7945..cc210de6 100644
--- a/integration-tests/src/backend/features/batch.rs
+++ b/integration-tests/src/backend/features/batch.rs
@@ -65,7 +65,7 @@ pub fn transactions_are_send_between_nodes_with_correct_order() {
         .map(|item| item.to_string())
         .collect();
 
-    time::wait_for_epoch(10, nodes[0].rest());
+    time::wait_for_epoch(1, nodes[0].rest());
 
     let statuses = nodes[0].rest().fragments_statuses(fragment_ids).unwrap();
     assert!(statuses
diff --git a/integration-tests/src/backend/rewards/active_voters_rewards.rs b/integration-tests/src/backend/rewards/active_voters_rewards.rs
index c0568ea0..0953e89d 100644
--- a/integration-tests/src/backend/rewards/active_voters_rewards.rs
+++ b/integration-tests/src/backend/rewards/active_voters_rewards.rs
@@ -23,9 +23,9 @@ pub fn voters_with_at_least_one_vote() {
     let clarice_wallet = MainnetWallet::new(stake);
 
     let raw_snapshot = vec![
-        alice_wallet.as_catalyst_registration(),
-        bob_wallet.as_catalyst_registration(),
-        clarice_wallet.as_catalyst_registration(),
+        alice_wallet.as_voting_registration(),
+        bob_wallet.as_voting_registration(),
+        clarice_wallet.as_voting_registration(),
     ];
 
     let snapshot = Snapshot::from_raw_snapshot(RawSnapshot::from(raw_snapshot), 450.into());
diff --git a/integration-tests/src/common/mainnet.rs b/integration-tests/src/common/mainnet.rs
index af703b3a..a0d7f787 100644
--- a/integration-tests/src/common/mainnet.rs
+++ b/integration-tests/src/common/mainnet.rs
@@ -1,4 +1,4 @@
-use catalyst_toolbox::snapshot::CatalystRegistration;
+use catalyst_toolbox::snapshot::registration::{Delegations, VotingRegistration};
 use chain_addr::Discrimination;
 use jormungandr_lib::crypto::account::SigningKey;
 use vitup::config::InitialEntry;
@@ -39,12 +39,13 @@ impl MainnetWallet {
         self.inner.secret_key()
     }
 
-    pub fn as_catalyst_registration(&self) -> CatalystRegistration {
-        CatalystRegistration {
+    pub fn as_voting_registration(&self) -> VotingRegistration {
+        VotingRegistration {
             stake_public_key: self.stake_public_key(),
             voting_power: self.stake.into(),
             reward_address: self.reward_address(),
-            voting_public_key: self.inner.identifier().into(),
+            delegations: Delegations::Legacy(self.inner.identifier().into()),
+            voting_purpose: 0,
         }
     }
 
diff --git a/vitup/src/cli/validate/ideascale.rs b/vitup/src/cli/validate/ideascale.rs
index 46e28a88..01675d85 100644
--- a/vitup/src/cli/validate/ideascale.rs
+++ b/vitup/src/cli/validate/ideascale.rs
@@ -304,7 +304,7 @@ impl IdeascaleValidateCommand {
 
     pub fn check_and_eventually_fix_private_data(
         &self,
-        data: &mut Vec<Value>,
+        data: &mut [Value],
         fix: bool,
         mail_replacement: String,
     ) {
@@ -327,7 +327,7 @@ impl IdeascaleValidateCommand {
 
     pub fn check_and_eventually_fix_proposal_funds(
         &self,
-        data: &mut Vec<Value>,
+        data: &mut [Value],
         fix: bool,
     ) -> Result<(), ProposalError> {
         let illegal_char = ",";
@@ -361,7 +361,7 @@ impl IdeascaleValidateCommand {
 
     pub fn check_proposals_wrong_syntax(
         &self,
-        data: &mut Vec<Value>,
+        data: &mut [Value],
         challenges: LinkedList<ChallengeTemplate>,
     ) -> Result<(), ProposalError> {
         for (idx, proposal) in data.iter_mut().enumerate() {