From 0c68154522413f20e078726014d753bbedcdbd2b Mon Sep 17 00:00:00 2001
From: srdtrk <59252793+srdtrk@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:06:10 +0200
Subject: [PATCH] deps: update alloy (#108)

* deps: updated alloy

* imp: fixed alloy complaints

* fix: fixed programs

* fix: all compilation errors fixed

* deps: updated ibc-rs

* Revert "deps: updated ibc-rs"

This reverts commit 0bb1fb1777ac50c46ab81d85fff52f3500a9436d.

* imp: patched ecdsa in case needed

* deps: added curve25519-dalek precompile

* imp: regenerated fixtures
---
 Cargo.lock                                    | 487 +++++++++++-------
 Cargo.toml                                    |  12 +-
 contracts/fixtures/memberships_fixture.json   |  16 +-
 ...ur_breaking_time_monotonicity_fixture.json |  14 +-
 .../misbehaviour_double_sign_fixture.json     |  12 +-
 .../fixtures/uc_and_memberships_fixture.json  |  16 +-
 contracts/fixtures/update_client_fixture.json |  18 +-
 contracts/script/genesis.json                 |  12 +-
 operator/src/helpers/light_block.rs           |   5 +-
 operator/src/prover.rs                        |   2 +-
 operator/src/runners/fixtures/membership.rs   |   7 +-
 operator/src/runners/fixtures/misbehaviour.rs |   6 +-
 operator/src/runners/fixtures/uc_and_mem.rs   |   8 +-
 .../src/runners/fixtures/update_client.rs     |   6 +-
 operator/src/runners/genesis.rs               |   2 +-
 operator/src/runners/operator.rs              |   5 +-
 packages/solidity/src/lib.rs                  |  27 +-
 programs/membership/src/lib.rs                |   2 +-
 programs/misbehaviour/src/lib.rs              |   4 +-
 programs/misbehaviour/src/main.rs             |   2 +-
 programs/misbehaviour/src/types/validation.rs |   2 +-
 programs/uc-and-membership/src/lib.rs         |   4 +-
 programs/uc-and-membership/src/main.rs        |   2 +-
 programs/update-client/src/lib.rs             |   5 +-
 programs/update-client/src/main.rs            |   2 +-
 .../update-client/src/types/validation.rs     |   2 +-
 26 files changed, 420 insertions(+), 260 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d689f8..c7c163c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,9 +78,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alloy"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100"
+checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -114,33 +114,35 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96"
+checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e"
 dependencies = [
  "alloy-eips",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-rlp",
  "alloy-serde",
+ "auto_impl",
  "c-kzg",
+ "derive_more 1.0.0",
  "serde",
 ]
 
 [[package]]
 name = "alloy-contract"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57"
+checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
  "alloy-network",
  "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-provider",
  "alloy-pubsub",
  "alloy-rpc-types-eth",
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "alloy-transport",
  "futures",
  "futures-util",
@@ -149,26 +151,27 @@ dependencies = [
 
 [[package]]
 name = "alloy-core"
-version = "0.7.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4"
+checksum = "5ce854562e7cafd5049189d0268d6e5cba05fe6c9cb7c6f8126a79b94800629c"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
- "alloy-primitives",
- "alloy-sol-types",
+ "alloy-primitives 0.8.5",
+ "alloy-rlp",
+ "alloy-sol-types 0.8.5",
 ]
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "0.7.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df"
+checksum = "0b499852e1d0e9b8c6db0f24c48998e647c0d5762a01090f955106a7700e4611"
 dependencies = [
  "alloy-json-abi",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-sol-type-parser",
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "const-hex",
  "itoa",
  "serde",
@@ -176,18 +179,42 @@ dependencies = [
  "winnow 0.6.20",
 ]
 
+[[package]]
+name = "alloy-eip2930"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41"
+dependencies = [
+ "alloy-primitives 0.8.5",
+ "alloy-rlp",
+ "serde",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04"
+dependencies = [
+ "alloy-primitives 0.8.5",
+ "alloy-rlp",
+ "k256",
+ "serde",
+]
+
 [[package]]
 name = "alloy-eips"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68"
+checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85"
 dependencies = [
- "alloy-primitives",
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives 0.8.5",
  "alloy-rlp",
  "alloy-serde",
  "c-kzg",
- "derive_more",
- "k256",
+ "derive_more 1.0.0",
  "once_cell",
  "serde",
  "sha2 0.10.8",
@@ -195,22 +222,22 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d"
+checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-json-abi"
-version = "0.7.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
+checksum = "a438d4486b5d525df3b3004188f9d5cd1d65cd30ecc41e5a3ccef6f6342e8af9"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-sol-type-parser",
  "serde",
  "serde_json",
@@ -218,12 +245,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2"
+checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7"
 dependencies = [
- "alloy-primitives",
- "alloy-sol-types",
+ "alloy-primitives 0.8.5",
+ "alloy-sol-types 0.8.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -232,19 +259,19 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede"
+checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-json-rpc",
  "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-rpc-types-eth",
  "alloy-serde",
  "alloy-signer",
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "async-trait",
  "auto_impl",
  "futures-utils-wasm",
@@ -253,24 +280,27 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9"
+checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd"
 dependencies = [
- "alloy-primitives",
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives 0.8.5",
  "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-node-bindings"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16faebb9ea31a244fd6ce3288d47df4be96797d9c3c020144b8f2c31543a4512"
+checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454"
 dependencies = [
  "alloy-genesis",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "k256",
+ "rand",
  "serde_json",
  "tempfile",
  "thiserror",
@@ -288,7 +318,7 @@ dependencies = [
  "bytes",
  "cfg-if",
  "const-hex",
- "derive_more",
+ "derive_more 0.99.18",
  "hex-literal",
  "itoa",
  "k256",
@@ -300,11 +330,38 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "alloy-primitives"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "260d3ff3bff0bb84599f032a2f2c6828180b0ea0cd41fdaf44f39cef3ba41861"
+dependencies = [
+ "alloy-rlp",
+ "bytes",
+ "cfg-if",
+ "const-hex",
+ "derive_more 1.0.0",
+ "hashbrown 0.14.5",
+ "hex-literal",
+ "indexmap 2.6.0",
+ "itoa",
+ "k256",
+ "keccak-asm",
+ "paste",
+ "proptest",
+ "rand",
+ "ruint",
+ "rustc-hash 2.0.0",
+ "serde",
+ "sha3",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "alloy-provider"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8"
+checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -313,7 +370,7 @@ dependencies = [
  "alloy-network",
  "alloy-network-primitives",
  "alloy-node-bindings",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-pubsub",
  "alloy-rpc-client",
  "alloy-rpc-types-anvil",
@@ -334,6 +391,7 @@ dependencies = [
  "reqwest 0.12.8",
  "serde",
  "serde_json",
+ "thiserror",
  "tokio",
  "tracing",
  "url",
@@ -341,12 +399,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281"
+checksum = "f32cef487122ae75c91eb50154c70801d71fabdb976fec6c49e0af5e6486ab15"
 dependencies = [
  "alloy-json-rpc",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-transport",
  "bimap",
  "futures",
@@ -354,7 +412,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tracing",
 ]
 
@@ -382,12 +440,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3"
+checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc"
 dependencies = [
  "alloy-json-rpc",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-pubsub",
  "alloy-transport",
  "alloy-transport-http",
@@ -400,17 +458,18 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "alloy-rpc-types"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521"
+checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06"
 dependencies = [
+ "alloy-primitives 0.8.5",
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
  "alloy-serde",
@@ -419,70 +478,66 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ab6509cd38b2e8c8da726e0f61c1e314a81df06a38d37ddec8bced3f8d25ed"
+checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7"
+checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-rlp",
- "alloy-rpc-types-eth",
- "alloy-serde",
- "jsonwebtoken 9.3.0",
- "rand",
- "serde",
- "thiserror",
+ "derive_more 1.0.0",
+ "strum",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef"
+checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-rlp",
  "alloy-serde",
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
+ "derive_more 1.0.0",
  "itertools 0.13.0",
  "serde",
  "serde_json",
- "thiserror",
 ]
 
 [[package]]
 name = "alloy-serde"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef"
+checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "alloy-signer"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47"
+checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "async-trait",
  "auto_impl",
  "elliptic-curve",
@@ -492,13 +547,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee"
+checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
- "alloy-primitives",
+ "alloy-primitives 0.8.5",
  "alloy-signer",
  "async-trait",
  "k256",
@@ -512,22 +567,35 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
 dependencies = [
- "alloy-sol-macro-expander",
- "alloy-sol-macro-input",
+ "alloy-sol-macro-expander 0.7.7",
+ "alloy-sol-macro-input 0.7.7",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn 2.0.79",
 ]
 
+[[package]]
+name = "alloy-sol-macro"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68e7f6e8fe5b443f82b3f1e15abfa191128f71569148428e49449d01f6f49e8b"
+dependencies = [
+ "alloy-sol-macro-expander 0.8.5",
+ "alloy-sol-macro-input 0.8.5",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "alloy-sol-macro-expander"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525"
 dependencies = [
- "alloy-json-abi",
- "alloy-sol-macro-input",
+ "alloy-sol-macro-input 0.7.7",
  "const-hex",
  "heck",
  "indexmap 2.6.0",
@@ -535,7 +603,26 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.79",
- "syn-solidity",
+ "syn-solidity 0.7.7",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "alloy-sol-macro-expander"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b96ce28d2fde09abb6135f410c41fad670a3a770b6776869bd852f1df102e6f"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-sol-macro-input 0.8.5",
+ "const-hex",
+ "heck",
+ "indexmap 2.6.0",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+ "syn-solidity 0.8.5",
  "tiny-keccak",
 ]
 
@@ -544,6 +631,21 @@ name = "alloy-sol-macro-input"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528"
+dependencies = [
+ "const-hex",
+ "dunce",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+ "syn-solidity 0.7.7",
+]
+
+[[package]]
+name = "alloy-sol-macro-input"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "906746396a8296537745711630d9185746c0b50c033d5e9d18b0a6eba3d53f90"
 dependencies = [
  "alloy-json-abi",
  "const-hex",
@@ -553,14 +655,14 @@ dependencies = [
  "quote",
  "serde_json",
  "syn 2.0.79",
- "syn-solidity",
+ "syn-solidity 0.8.5",
 ]
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "0.7.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
+checksum = "bc85178909a49c8827ffccfc9103a7ce1767ae66a801b69bdc326913870bf8e6"
 dependencies = [
  "serde",
  "winnow 0.6.20",
@@ -571,19 +673,31 @@ name = "alloy-sol-types"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-sol-macro 0.7.7",
+ "const-hex",
+ "serde",
+]
+
+[[package]]
+name = "alloy-sol-types"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86a533ce22525969661b25dfe296c112d35eb6861f188fd284f8bd4bb3842ae"
 dependencies = [
  "alloy-json-abi",
- "alloy-primitives",
- "alloy-sol-macro",
+ "alloy-primitives 0.8.5",
+ "alloy-sol-macro 0.8.5",
  "const-hex",
  "serde",
 ]
 
 [[package]]
 name = "alloy-transport"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae"
+checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904"
 dependencies = [
  "alloy-json-rpc",
  "base64 0.22.1",
@@ -593,31 +707,31 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "alloy-transport-http"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698"
+checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
  "reqwest 0.12.8",
  "serde_json",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c"
+checksum = "b90cf9cde7f2fce617da52768ee28f522264b282d148384a4ca0ea85af04fa3a"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -634,9 +748,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "0.2.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300"
+checksum = "7153b88690de6a50bba81c11e1d706bc41dbb90126d607404d60b763f6a3947f"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -1592,14 +1706,15 @@ dependencies = [
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+source = "git+https://github.com/sp1-patches/curve25519-dalek?branch=patch-curve25519-v4.1.3#1d73fd95f1a76bee8f46643cf78bbccc1fb06ede"
 dependencies = [
+ "anyhow",
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "fiat-crypto",
  "rustc_version 0.4.1",
+ "sp1-lib 1.2.0",
  "subtle",
  "zeroize",
 ]
@@ -1607,8 +1722,7 @@ dependencies = [
 [[package]]
 name = "curve25519-dalek-derive"
 version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+source = "git+https://github.com/sp1-patches/curve25519-dalek?branch=patch-curve25519-v4.1.3#1d73fd95f1a76bee8f46643cf78bbccc1fb06ede"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1667,11 +1781,12 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "5.5.3"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
+ "crossbeam-utils",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
@@ -1806,6 +1921,27 @@ dependencies = [
  "syn 2.0.79",
 ]
 
+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+ "unicode-xid",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1886,14 +2022,17 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#de1b108e8140dcb86ecf56f1215ac4b7fab6fcd8"
 dependencies = [
+ "anyhow",
+ "cfg-if",
  "der",
  "digest 0.10.7",
  "elliptic-curve",
+ "hex-literal",
  "rfc6979",
  "signature",
+ "sp1-lib 1.2.0",
  "spki",
 ]
 
@@ -2260,7 +2399,7 @@ dependencies = [
  "hashers",
  "http 0.2.12",
  "instant",
- "jsonwebtoken 8.3.0",
+ "jsonwebtoken",
  "once_cell",
  "pin-project",
  "reqwest 0.11.27",
@@ -3004,7 +3143,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631d60b8c1dbd74ba2609d5a7787ff73925fb4c444fe29ef62dbc7fa9b1bde94"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core",
  "ibc-proto",
@@ -3018,7 +3157,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3699afb0fd43f67b08318e48031c6e7efd40cd9dd2507e17cbc00e188ccef60f"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "ibc-client-tendermint-types",
  "ibc-core-client",
  "ibc-core-commitment-types",
@@ -3087,7 +3226,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d0c1d8da6c2f6843d951ec2ccfe0df93f32e96f136870bed90182981648cfb1"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-client-types",
  "ibc-core-commitment-types",
@@ -3121,7 +3260,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "969c1f3411b2ca4e6a041ab8e222937f2cea5a26b26beca45164d05468dc4de4"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-client-types",
  "ibc-core-commitment-types",
@@ -3138,7 +3277,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6799c8383872fd4bf523dceaadd8c884c2748ad1a542e84e93dcbbd667efc59"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-commitment-types",
  "ibc-core-host-types",
@@ -3155,7 +3294,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c6e681fc7336d546f7606670b107e8487fd99867f317c2add7eb79b41060d09"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-host-types",
  "ibc-primitives",
@@ -3184,7 +3323,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c07695b8fba97aded7003031480dd25bdb194fdc1f0cca02508f2dcefe10385"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-client-types",
  "ibc-core-commitment-types",
@@ -3218,7 +3357,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3931e41a6feae1819c59788d2a0a4a08fa51bac3024b63cec4fb88d13882dbee"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-channel-types",
  "ibc-core-client-types",
@@ -3239,7 +3378,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "856e37bcabd67cf26934bd127189844b9fc40004fb545b80bef899bef9092df3"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-channel-types",
  "ibc-core-client-context",
@@ -3258,7 +3397,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34b203c12236140e627270c4d7d469ab2e776a94c22da9051b020303bc6b21f"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-app-transfer-types",
  "ibc-client-tendermint",
@@ -3281,7 +3420,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e1b9b6000e8f55cc09e00f7552a7c4acb8c42548ef76088e2154ca839387aba"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-primitives",
  "serde",
@@ -3293,7 +3432,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "195c93f19d8c9c6e36e518656ca381cd4f86131515ad4e99f7e6d2a1836b7b7e"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-channel-types",
  "ibc-core-host-types",
@@ -3308,7 +3447,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90d27386ce69af9d3e3c63e590cf6e1d466f948c2b3e2b0911872cb6d88adf5b"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-core-host-types",
  "ibc-primitives",
@@ -3335,7 +3474,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95544f3bc56c8c9cc335910d5aa567a6743a3aeeb33084bb3e31dc6801936edb"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "displaydoc",
  "ibc-proto",
  "prost 0.13.3",
@@ -3588,28 +3727,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
 dependencies = [
  "base64 0.21.7",
- "pem 1.1.1",
+ "pem",
  "ring 0.16.20",
  "serde",
  "serde_json",
  "simple_asn1",
 ]
 
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
-dependencies = [
- "base64 0.21.7",
- "js-sys",
- "pem 3.0.4",
- "ring 0.17.8",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
 [[package]]
 name = "jubjub"
 version = "0.9.0"
@@ -4575,16 +4699,6 @@ dependencies = [
  "base64 0.13.1",
 ]
 
-[[package]]
-name = "pem"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
-dependencies = [
- "base64 0.22.1",
- "serde",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -4760,6 +4874,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -4931,6 +5067,7 @@ dependencies = [
  "libc",
  "rand_chacha",
  "rand_core",
+ "serde",
 ]
 
 [[package]]
@@ -5169,8 +5306,7 @@ dependencies = [
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#de1b108e8140dcb86ecf56f1215ac4b7fab6fcd8"
 dependencies = [
  "hmac",
  "subtle",
@@ -5465,7 +5601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
 dependencies = [
  "cfg-if",
- "derive_more",
+ "derive_more 0.99.18",
  "parity-scale-codec",
  "scale-info-derive",
 ]
@@ -6060,7 +6196,7 @@ dependencies = [
 name = "sp1-ics07-tendermint-membership"
 version = "0.1.0"
 dependencies = [
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "bincode",
  "ibc-core-commitment-types",
  "ibc-proto",
@@ -6072,7 +6208,7 @@ dependencies = [
 name = "sp1-ics07-tendermint-misbehaviour"
 version = "0.1.0"
 dependencies = [
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "bincode",
  "ibc-client-tendermint",
  "ibc-core-client",
@@ -6091,8 +6227,8 @@ name = "sp1-ics07-tendermint-operator"
 version = "0.1.0"
 dependencies = [
  "alloy",
- "alloy-primitives",
- "alloy-sol-types",
+ "alloy-primitives 0.8.5",
+ "alloy-sol-types 0.8.5",
  "anyhow",
  "async-trait",
  "bincode",
@@ -6131,7 +6267,7 @@ name = "sp1-ics07-tendermint-solidity"
 version = "0.1.0"
 dependencies = [
  "alloy-contract",
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "hex",
  "ibc-client-tendermint-types",
  "ibc-core-client-types",
@@ -6146,7 +6282,7 @@ dependencies = [
 name = "sp1-ics07-tendermint-uc-and-membership"
 version = "0.1.0"
 dependencies = [
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "bincode",
  "ibc-client-tendermint-types",
  "ibc-core-commitment-types",
@@ -6162,7 +6298,7 @@ dependencies = [
 name = "sp1-ics07-tendermint-update-client"
 version = "0.1.0"
 dependencies = [
- "alloy-sol-types",
+ "alloy-sol-types 0.8.5",
  "bincode",
  "ibc-client-tendermint",
  "ibc-core-client",
@@ -6482,7 +6618,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b289585392a3639f6541bce32dd89e03e7893f42e9b9bcf6bee7d54183d5e05"
 dependencies = [
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "anyhow",
  "async-trait",
  "bincode",
@@ -6697,6 +6833,18 @@ dependencies = [
  "syn 2.0.79",
 ]
 
+[[package]]
+name = "syn-solidity"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab661c8148c2261222a4d641ad5477fd4bea79406a99056096a0b41b35617a5"
+dependencies = [
+ "paste",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -6837,7 +6985,7 @@ version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90"
 dependencies = [
- "derive_more",
+ "derive_more 0.99.18",
  "flex-error",
  "serde",
  "tendermint",
@@ -7063,9 +7211,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
 dependencies = [
  "futures-util",
  "log",
@@ -7141,13 +7289,8 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -7271,9 +7414,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
 dependencies = [
  "byteorder",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index a9023fd..9c34a92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ ibc-core-commitment-types = { version = "0.54", default-features = false }
 # Other dependencies
 serde = { version = "1.0", default-features = false }
 sha2 = { version = "0.10", default-features = false }
-alloy-sol-types = "0.7"
+alloy-sol-types = "0.8"
 serde_cbor = "0.11"
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 
@@ -67,10 +67,10 @@ ibc-core-host-cosmos = { version = "0.54", default-features = false }
 reqwest = { version = "0.12", features = ["json"] }
 tokio = { version = "1", features = ["full"] }
 time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
-alloy-primitives = "0.7"
-alloy-contract = "0.2"
-alloy-node-bindings = "0.2"
-alloy = "0.2"
+alloy-primitives = "0.8"
+alloy-contract = "0.4"
+alloy-node-bindings = "0.4"
+alloy = "0.4"
 bincode = "1.3"
 dotenv = "0.15"
 subtle-encoding = "0.5"
@@ -87,5 +87,7 @@ serde_with = { version = "3.9", features = ["hex"] }
 sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-v0.9.8" }
 sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-v0.10.8" }
 ed25519-consensus = { git = "https://github.com/sp1-patches/ed25519-consensus", branch = "patch-v2.1.0" }
+ecdsa = { git = "https://github.com/sp1-patches/signatures", branch = "patch-ecdsa-v0.16.9" }
 curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", branch = "patch-v4.1.1" }
+curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", branch = "patch-curve25519-v4.1.3" }
 tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }
diff --git a/contracts/fixtures/memberships_fixture.json b/contracts/fixtures/memberships_fixture.json
index bc36c25..7e0874b 100644
--- a/contracts/fixtures/memberships_fixture.json
+++ b/contracts/fixtures/memberships_fixture.json
@@ -1,10 +1,10 @@
 {
-  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3",
-  "proofHeight": "000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94",
-  "membershipProof": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a490400ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000020d2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a10757067726164656449424353746174655001580100000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a1822ba4286911b3b9d6c7bd458bc5670cd2f2ca1323f9a0ed32185142d9ce4522d87ec7d4bb3ce4663607b2bca380c70d49b2c083269b73d5f01bd9f73b3b3370584258888f596c87020a50c9091775a7faf7d8576e3432f1c9b7ccbfeaa08bd15f3b88bc93af7961855cf1c2ee30198c21e82f70d4b067e7a4545634025000e2282eea92fc8b0e2f55727dbdef561cbf7cdf00719582d96ea561566fdb5509c1ff9969bbd07faafc270ea79f42f918b47ba4dc4d52239987ef392ed7204e100056744db49d0adc2602c1b747474238fe6d5f8f0b6bc49c757b4352ba038f371215ba796c2d288fe9bb9dd5742b46e1c339b52f81aede442b6e31cd4e58b14062861fb280691e8cdffda6ec707e41d58df3a583efd75bb50b61729b5b49f7486107da5a14b3a2581d117d00fb11cceaac3546b6a36ac1eb4f826f14c5e367ddb075c2e092d4a6e1573d5715dbc16b2ed990d681d3c9955e481c2b07870bb0b7607263554dd1f53dd37314fb67393570995265f783b422adef0252c6c6832342d1f6743284f84fd3c20b4b52e051d7f2a8986d6b7cf9dc39e447c440e9de8c43e108ac4ee758c3fcae64ddaba5807eafa79ba00440f6981fd70c4b5f95d47870822e9be09e484b3fc16a30b256fde095de8008d91d44eb178b57af0618efef7551ea49dc1897e6cbc09396b633a075597dd08d08e05b52f5a1bdda493f9c0ae7509a8bcce413910686e204a7d8ecde23ccc3d90084eb9a65ff4e231354d5d372006234b87711e269ca349053dd9e52a1f03d4d3e6ddb9fc8362f20ad7b6ae2ff4101b5a0cb8bcb1635c767026b8599824dcb69058a80abedbc292b3439d457789268b113471d42028a6ef692a0fe957bc73938a227d90665e0e4c9e6e408d11121af0290c07c46c817ee65d8fa8fa60f02284f7b4080d0e29d82b8890bb8fe33f18d619f8be1690af4a1a371a269b4bc0bf603b1b1bb7251351a40b8d267ef874000b106204080adbab7ec727bd6964d079f3a9f8dfee338baf1f5cb706061d8a108dd1e9bc9f7243813b8d8eba899697bba33cc4e846cd5ed1500509efb3a42e02c4c9095b5f00de14bcf71860aad81fbf8f62897735711a086b1c65c89eb56b04c95830e8e45b3037a5662033b11e6cf542cb80d95172ba9c52c063664f0f4d0221e4183535f493a934041b46f4e24b14fc6068e47553e50dea28e4cf0cebfb00000000000000000000000000000000000000000000000000000000"
+  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681",
+  "proofHeight": "000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9",
+  "membershipProof": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000020310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a2702000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a10757067726164656449424353746174655001580100000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a2b6555a8f5171f95bee460fa44e2ff15ebe597c2aecefdb46f76283763403757229f1cdbbd3e228b663650d939d4f1fb1dce3a5cb67d6f99e684c50dea2836d02e61791009519b23e5a86ab0b97e68d31ff4d29d5aae7929727d83eca270fb610f6d97db3572c223ae998afe4347929954c62c4da05519313fc41924afe59a061cb24ac6d5e57e920e6b0a1e2ae3de71814178e67f4c0882f4c7a588e732cb0e2a7f98e78a890b99e55dfbc997eaf4e7e94125d1c879bb14ad6620ab436c010a1defa5077865bc34bcc7c5f60da64431533ab84a9f2819abb3ed533dd17db68822699c6ae472290464fa66f2ca1d3d3a110dd0cdaf38f3624a9f44a8f897cc69081e90e908de3372a3fdaa161059c06692c2a9baa130079e5d85f7bef7f1a3830b3522438312d84ea581fa45a8803247fb6c413787bbc12e8ab9d095a7c112c015d32815b1f2517dcc870aa10c9639dcb34f97a7d215a4636983826caeae55e124b7dea46148eaab0e9bc55626b68dbdc32aeaa020ce923c10242c141411385705a8162f7469df368587f51fb52df70b316f50fd0a680ebb16e18f0325044c4219da57707aa15c8d363326bf0b15e95a277013b173f177a55daed0619cc81a701d9f4c54ee787e217ab07f54859b4f82b14af0550b8941f5ac9a264d137c37572fcccfde222beb58bc298dd729f330cd8b228a531002f552c0353fa3f21315212ca1f5e1e17aa8e0d5cd488b38d71c57c039af0f59a293d71e779c707ecc92502fbe4f03c83592728c780e8c5cf553070de75bd82a6dbd3512add4fe0c97a9b50360448bfed2d737fa7134d400ceaef322efe8acd40306edd8b4c55e1be48e1f086f80770e16d7bced9af931aaf93599d6fda02c00e8c1036e7840c9554a89281de7a4852e38ed43042de00a432c670eff76c98c0d2cf7e316aced8e6a59d91600613e5cbc80440b960ea8e1a6963cbc915f9f80ac3ab6600fc5dce31e4ace72201e4ebb431eb1c7bef4e37492a3ee18098b5cad435980f78d386cb6de5d8b2d293b1d05f4e97558ae6abb92f96bc03911e95c1d2c19d14987f23e634549e7f62ac3748b49f67f0ccfee42010fd25dae5c1ae5fb78626abc2dc52581a46bd4e81b8b2306e5fca15e92c5c0db4ba4a944531f4eaf951512b0bdc73ff0029f17551806731aadd8a903a99092ff6d011242f179c03cdccecf5e3458ff2f7022065600000000000000000000000000000000000000000000000000000000"
 }
\ No newline at end of file
diff --git a/contracts/fixtures/misbehaviour_breaking_time_monotonicity_fixture.json b/contracts/fixtures/misbehaviour_breaking_time_monotonicity_fixture.json
index 39ccdbb..914b45a 100644
--- a/contracts/fixtures/misbehaviour_breaking_time_monotonicity_fixture.json
+++ b/contracts/fixtures/misbehaviour_breaking_time_monotonicity_fixture.json
@@ -1,9 +1,9 @@
 {
-  "trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fda01c5ba0aea90e4f6ef2f0eaec7a18de7f20483812edc00adb707613ea126b4be4c58fe2b78c5c0f13fa3011f698b6c5c4b2e1d7f8ad8af3f7d1b015a2678271b0ed",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3",
-  "submitMsg": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000066fda01c5ba0aea90e4f6ef2f0eaec7a18de7f20483812edc00adb707613ea126b4be4c58fe2b78c5c0f13fa3011f698b6c5c4b2e1d7f8ad8af3f7d1b015a2678271b0ed0000000000000000000000000000000000000000000000000000000066fda01c5ba0aea90e4f6ef2f0eaec7a18de7f20483812edc00adb707613ea126b4be4c58fe2b78c5c0f13fa3011f698b6c5c4b2e1d7f8ad8af3f7d1b015a2678271b0ed00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275450000000000000000000000000000000000000000000000000000000066fda061000000000000000000000000000000000000000000000000000000000000000673696d642d31000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a2da2b58ab787310b7cd89f6e549a6747be66be313e8f2a4cc7affcccd153c8152ca082e444484978980e713bdb6c5c5908c42de1a29ebca5fd7f850abe277d89226e5ab25e9600866fa836f507a772ca402908b92a6751b66d9e343893562bda251ed19853f8eb923fe4ce678a9e56587a6c331a1c5027d9b53f9899b996809d141cac974e41038ea8628cc1d68064aa18012b9235f1ba2c8ccfffe74ef0984c235ce5ac6ceb61e20c5b2613bfbc17f12b721ff2b5945cc9e8b9d020820cef1617a3ca6f6ded3eda2ab216abda319b18367cbd289aaa05e7cb64fd3ef81895900a4bf07c43747bd14614bb6eafc64632c8f1f237b3493993c739750c0114d8581f38ee8c6c90b247d55a74ffe7056ce449f525df4ff591426901b51e959621cb0666b24eeb9617229fe157e658e29d8affdd339b82b0d427768b6d1a8867ff5e2efe7004b06b150c0e148d5fefeb3b900453d193614c0e40d00530131485d1b9123ab2f9cdb2502c4e6e8828e022b98919ecb9f34c2100384a4fa18e180291452668b1baae55799c0020794c4aa24a8ae173741f1164951212eb8e0ed64b771e0f8ec4fa013f4526325ad493ea2cca1f2cb1aa4ba01c4f3c1cf4e02726399f87216ceb061b310a8f348923668e38f850d410be0eef0f8b2be91ebef4a1dc953017cb313619ea112b511f7d7390674b1f5a25a76acb87ef4115fc5d647d806b0e147ff33a0602bcd308626ee022a143ea7890ba8b93020fffcf28ff84fac2b3982040c0003636e0428ec8344f98facca2636b6765656b667ebc48763ca6ab8fee1ef754391b3da772b552a9dd1f975bf57d2d481bc35a5595b2bb7955c17a81372fa7ce075abe249768c2965d60e1c767fd079492f82b7e7ba4f62c99704120aa2f1b12d818dca2ae02af6577bd2451a1bbea2f838c80715a1f4df459f8b2dd3e0568e04eba1b7af71386e539a007ed2765bcb5b762bfe7d01d6f971ea35441d506a82bd0822ed33fdb6fd0b297e3fc6ded9f21d0f775461ae18914e1845b0cea21adc43b1956816f168ab9a8c178a58ae936f4263d4d42267cddc6cd070b8ee103c051722ad88a93dd90a91130d237e9b96c32ccf823f12b80355ead03165f9207b15379d1d102ed6f79f2a9662e1b1af0c0bb266cd5c22a456c9284f4a166052b76c59fcb5f9091cd0a6d2b81377aadefee60ad204251cabe223f416812dca700000000000000000000000000000000000000000000000000000000"
+  "trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe705324693c5a7fc5c2e95d6b3e04ef6de62c866d0e6de27be6e789562fe9a2fc17d9c7a8f09141501bbc11fb7adb76f5e62126d7b7ab2a7c2b4394d0e1d5898297f7",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681",
+  "submitMsg": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000066fe705324693c5a7fc5c2e95d6b3e04ef6de62c866d0e6de27be6e789562fe9a2fc17d9c7a8f09141501bbc11fb7adb76f5e62126d7b7ab2a7c2b4394d0e1d5898297f70000000000000000000000000000000000000000000000000000000066fe705324693c5a7fc5c2e95d6b3e04ef6de62c866d0e6de27be6e789562fe9a2fc17d9c7a8f09141501bbc11fb7adb76f5e62126d7b7ab2a7c2b4394d0e1d5898297f700000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275450000000000000000000000000000000000000000000000000000000066fe7098000000000000000000000000000000000000000000000000000000000000000673696d642d31000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a08623da6d58bceb56499ba66025a2183905b0b091f9e4683097e8eb2a74aa7771417dfa7e8f9d84d9288d4029995e0a9824faa81dc25d22315f6c4a1db7f635f24ce3c6a931ceb521ea5a464f27f8f274833e956277b404da66b1253d89c484807694d084104100d721824130807d4127a42eedc35421e0099e28d60ccc68e8b2949afd65706f783d27c4ee7195e499ad61e617ef7eee8765a46075692eba82e1a0ee272b724d40e7167a34085a63dd13bb7a66494055b1e72ccb3f228117eb40e09924fb4246d5bed102b9abbbacc89fdb935ee4830968cf910059a9245830614918cdc6af63023f751e1fd759886f07facecb3c528dbb70b73f3511ee595e003aaf8178e17175695e9fca5df1ea554fc0580d91b1120be2e11764f61d7fe3110f75c512b37cff2e267c211168ada73aca107f34560b3f6c4e12c9e93d9fbfc23b3ee97b366387b1941a46cf52724a786dc092e2dcf37eb1f85bfbed59ba450251aaca60e64b093e1d854501372ffff58ddfbac8c43ba0032cffd38144d8a9e269be801312cb4c295fc7fc1af592cd72fcb3a94470e742338a01276b9f57eb81898ad7fb3aad6130921e7e627a8c98192f7261a38b50beb3f8a02a7f7db283d0c3b44b01c12bfe296664e9852487cd15c0274584b714ca4a2ceb5038557f957070dd648f29be8708611a24237d976c978952d25dbdffee09be51678c555c3b707b0a7af7377934145b07cc4dbf2ed8859d5b13a2190dccd0f478bbe0520668c05deaeb6bcb916ac2fd846f0811b229f1e6d3a660ac1829c9ca6addcbe4e0ec20e657140f1a889bc1c590251d68c9a93d46b31733de3768680dfa10a3c8e287d0c6df85fb7697691096843ce3f10ae3cf7131aeaa577b1a444a0ce6b96d4b6491e42a29e2f6b6a14f38a7823d32b53e6ffd33b5f2c2e16323ee15f131a16fcaa293fb3127ab6c9e96f9a7be8cd6c685e49e472f8a854e9279b360569627e83ee267828de03f1f873ce3420ac48f197ef42f8bfb499cfa2feb03b8f64d5eb2a622bd79b08c9ec33303ad38a02e0d68283c9d072128c56be08256ec9e4dce305781d3ebf956b7524f08c00e934ef83391184d5c1775db7fff8a759d99580ded8dc126ecce9a7490366005bbbb752b5db99fcdffe54fa2fc5ec3d6b64636c357d781e3a3e2c08eae1922b1d1f628b014e86545d5bd00352954c19a77c795362dadf00000000000000000000000000000000000000000000000000000000"
 }
diff --git a/contracts/fixtures/misbehaviour_double_sign_fixture.json b/contracts/fixtures/misbehaviour_double_sign_fixture.json
index 0796eca..87839a0 100644
--- a/contracts/fixtures/misbehaviour_double_sign_fixture.json
+++ b/contracts/fixtures/misbehaviour_double_sign_fixture.json
@@ -1,9 +1,9 @@
 {
   "trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fd9eaf7c5cf69445dc578f2a40bab94a57d8110aac5cb895c4a786585710fd4e2d88e78b2d44938b6cfd9e83b4944bee52ed8408f8852b7b8d6b1c9370f568e75ce24f",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3",
-  "submitMsg": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000066fd9eaf7c5cf69445dc578f2a40bab94a57d8110aac5cb895c4a786585710fd4e2d88e78b2d44938b6cfd9e83b4944bee52ed8408f8852b7b8d6b1c9370f568e75ce24f0000000000000000000000000000000000000000000000000000000066fd9eaf7c5cf69445dc578f2a40bab94a57d8110aac5cb895c4a786585710fd4e2d88e78b2d44938b6cfd9e83b4944bee52ed8408f8852b7b8d6b1c9370f568e75ce24f00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275450000000000000000000000000000000000000000000000000000000066fd9f1b000000000000000000000000000000000000000000000000000000000000000673696d642d31000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a07acc7625ed2db39dfc93e1b96cfc974c1634528b977ba8fe6284d476e0aa61c212d0bfe8692a27bb778253dee06dc7480fd5479dbfc4863e889976cf9c41ee2218504f59705bc7dc5dd1db856d096efffde62963ccdc82d14537938eeed5fde20e6b36784b6d7729c4cc384a14abf012f2ee397bf738df9ad90f28a56451186033f5b1c450407eea9224da94a895231dde1e21d0692c4a43f4ef4f31e3b12ee2812ad6623da6ce4310f5d56c3dc294fc7e0f6c33a55a7ad601e3c24baa50b191ee33d0feada6fb7244d22833bd24a1bf50d6fd69b56cf67965c9fa2248df1e3083ccde12038205387d576b0a2a21929676bc33bc39e70eba973563a2eee6ed91f8177adb09d6ef7b169fbe7873a174416c2b335263c81417b7b54dc3c7d7c780e4bff64bf39e754b0e422b41e76b5903908631be9be97b75f74713ac3142bb702e18b8d151c9dae1f664f2a6e54cf6bdf88fa37c102235ba1df3c42b0cbe945197f93c91a3dffe791e80681b4fb1adc1c8cb771911da2968942832142b9f9250f7c3fc1b90ce06eafeef6a8d90c144535a06296e55f2c08312629d4a2f99dd90e88a131694d5435dd1ddc64d372cad571c89e815f48e96911f595c2ca475f4e15505c7a0f9f69d8c24552e74a76ff73c6e608beaa55bc1a6c1631d302cbf877136cfb1a015c0810cbebac3ed883714d081a397d013c1337272365308b2dbef822649f4c16b0ba1f24b2f7eba43726b9aaf458b12efec64e5b774a4644e02d1609fb2765966d917c415302dda8666e6bee90f84b2baa48cb4678815a632f152914a2bb250f9e14c8a8ed5a81b952d336c9939b80dba256303c7e344a8e446ff0041a1de1d300fbb830ada6eeb9e4ffa7f85478c3d296caf8329b84b42ea54afc0facb38e50d17acd3691ecced0bb1711da77f7e00d003d84f5197d02fc8f292d0f350b836201223ccf53e4e55cba86e4b8b9f6dc70b3fe2e2af0c630b7e537dc25a027e0cb1793f1bbecc9c76cff95ac09a6001f8397382b2cce6a8dc75457ac22d3eaf8ef98b38561b509f39927f34fdda7750ef692c80dc6cb0ffcaa8642e70ef6c37038c4456f3cf6db4385a666d13f19ce54000267a5eef0318c140caf35090bae68d1239045dac4468f463a57d3065d8eee81162d60d24ad1d4cdc4f5fd1ee7443146908327b81d54b99301cc2a034433a891a5a646e4d265024b529a6f00000000000000000000000000000000000000000000000000000000"
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe6eb926db5d2f7515e02c4a2d45f4155adf9292f225cae7ab66e622563c63514c5043467f29ca55ded6c2b25269cc07ed5f28207352dcc238b9dd6b7ecc1a66796634",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681",
+  "submitMsg": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000066fe6eb926db5d2f7515e02c4a2d45f4155adf9292f225cae7ab66e622563c63514c5043467f29ca55ded6c2b25269cc07ed5f28207352dcc238b9dd6b7ecc1a667966340000000000000000000000000000000000000000000000000000000066fe6eb926db5d2f7515e02c4a2d45f4155adf9292f225cae7ab66e622563c63514c5043467f29ca55ded6c2b25269cc07ed5f28207352dcc238b9dd6b7ecc1a6679663400000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275450000000000000000000000000000000000000000000000000000000066fe6f24000000000000000000000000000000000000000000000000000000000000000673696d642d31000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a178459a845e35fd4dcf10fa0a8ecef5a455c7a017e7d0077faca5ca8b1fc4770280b8b0e7768d62ce139cb259e33bd71f7dc7395c0187229c2f185e841b75d121be1033bdbe86614569042535bdc8305097cbb450141fb9fd0c985cb08eded342192fcf46270b5cabdbf6f31d8d838fca167ae2dbf33e16c32a0364e0eb8877f0d24a5f6190ec626f8317d5b3c407d34f296d2a2261d0b1b900d5514c5c93fef2af177b501820499c2542911a2ed42fea52d4760d31b2f0bbefdb2d933c4ddff2af9192a1f622b55dcdbc6d16b72d433d0be8abdf74f0e29b6f1e8b259d31dbd2a106f1cd20feb4506a09d90d6188903eebce3b566d7fae60e03473d9aecba151c9d8cbc44f4eb66a3b78115187e838488fcd6d54784bc8f9c64ea4851bf84760f42d0feeb7734c80fb0d616607f0cac4830923f185fd35b539a358cd16bf40b144aecc30bf421f386d93a04606c02341e676b91ba9307caba903489cd71286718755079fa38646e975a117780c5515b5b19b5caa52931ce606ceed6d9337c6c1cb468aba5d5992ddbcd0c03e7aff1ffe05289f7482ba5e654892c4e220e934e0230b91d8136d7182bc66af0ce970201986292a6177c26d8193bac4fa2aa9f4e0d8034e2a567efc81abfc3fc5a955b3b4b6cdfec3c4de544d603870a05c860353005f8e8361942b95eda312142eaffb1e9cc3fa30564cd65f23f4564aa2623ea2f8082a8022d42f7e8dcd4fbb18dc5330ef878eeeb75a36f9eb8d1be2086c02c1d96884ee24e275552af337562f6e1111ca41a7f1a238cbd1d04026c83574e1f0e2a40a45de94216365a84fdc0f6cd0b1a38a1050b697f506eacf404a545fa651e020b0df7107c21745cee28ed3ecb682e6ca8f8c36bbc2e242a2d39f3d98e171e84a705a22561da2e849f4171f28da33ec8482f3120012ce66ec85c94368dd419a40a289767f0e5a31bb7affd7e41264d67737a108a3cb6a6cef536f092421d2b82905ff61053cb852c7fd41ee154a0e38a06bcad4c2100771d9b950c68e0e308b90c91093e992ee1c44131b9ec79b8dced42dcebaefbf640cd58a7a28fcf371418c45e2b4e2d451d77d614f4ba61e34bd38005319424ba0b6919d48de9248b2105572764eb6ef560e8b18dd6954f7fdba4c2d2f94b9ed9f173d3f1206bb903081cc3d17a163d983cd5022358a20a6bbf2ec01f6243d8aac61f0d3474ef8e7600000000000000000000000000000000000000000000000000000000"
 }
diff --git a/contracts/fixtures/uc_and_memberships_fixture.json b/contracts/fixtures/uc_and_memberships_fixture.json
index e37a61d..e512423 100644
--- a/contracts/fixtures/uc_and_memberships_fixture.json
+++ b/contracts/fixtures/uc_and_memberships_fixture.json
@@ -1,10 +1,10 @@
 {
-  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3",
-  "proofHeight": "000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3bee",
-  "membershipProof": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000ae00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b270000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000066fd9c95639a9919318d19255c9fd2e5f31803506f14a848939f50c16a495c404d768e6c0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3bee00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066fd9d4600000000000000000000000000000000000000000000000000000000000000076d6f6368612d340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a10757067726164656449424353746174655001580100000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a0394129692c430d948f5e21ed7dbf5b9db89852afa7890be9ff0bf09c96c35e52447695a9553d01ab9e20ce1ed9e6bae046734caa6b20d576cd73923bcc6f06a09b8fe4f0d8c9db3174efad82e498a950ee731cf1f4471908696dc3bbbb5982f03184b17ca6f48249f656a1862da647a748a5af9d4a8e9859cd681f5ab3804ba0065f42f3815451ad7f13973ba2b9c2d09f5a7eb3e6a01a235343e2f599a08fe03ba43b7d5aebc912d79da3de52859c7917610e68a738d3ef40655b8291fe05a06b67bd16bda872cc246c7e5ec9b8743dba05414f48d95e8de48820dc4c0ddaa189ebfbde368ef03cd1b9025c23704677af46e570faa1f33a50d6cb3e417a0be1649cb468c1ae053767f2a1b4d5b7e5e439ba0ca2fe1b8ffafe0cb07cb0c02e61b7a2a08ede57fe07825a3ebdb41255bc8b020b020842e085eb210d7a27b8ff705c29ae00a3be25e953dbc4821e244f6141f5c4f887ce5bc77d3db7f672de4152a287d3c06936032aadee4493ec15ab4ad16c31f64d8976e15741ef5316b296202722adbce49e0da279bb1d78d001f411de0c45786349b16195435298fcc813a0c314a8329005b13952e0ef1d7d5a6ebe3b9a8db143f0b4bc7ed4ee043aec46c290d52ad69e48d285c21b0b9423c54fd8bc1f6c21ab21f905ef40520c355b0bd1f4bba1dc5716e08182b0f69cdf6d5d5d61b2215aaa7a0424342e8779a4539f90ea9847ca8eac1974f4fc6d5925ec89d6ce96be05978240338212f33d974cbe418448e8fa060306395b10a2df1231664bb9a35cc7f9220171826618b950a37690a7922d8a75d14b086fabcdeae5480c034e1038951b1316a111bb004dcb9e72020acc734d9c06c0232519beb5acce288594eca2c2b09279f1dd4b5bdc51314ae041b09f9c76f5c7f0f02053b89bb943ddad63979bbe0436f6bc1462d10a0aaa10e0785b227dbc9909f2fa00b1a494abb090eab2365b3c2dde85517273a9be75c05a5cd071abe0ed02133643a6995216241b3803aca0301c5aeb2eac4a4244e0b1b96b546f3a94bf7b52e11cdaa21f7430884ad6f56dba173226e94a37871da322213a1d51530a21c072f0923d849ea83a42fd9ab71509452a136e1c669fe2acc07abfd8e577d46816538dbd37832345e4478a2f54c23eb2b449b7d9d0b4f7a6505ca188cdc8f78b0dfaa9baee513f5d2e3c94232f703659a417c10af8f1fa0d700000000000000000000000000000000000000000000000000000000"
+  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681",
+  "proofHeight": "000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4d03",
+  "membershipProof": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000ae0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b1800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000066fe6c4b42bfb610ae70586fac3acc547b046ff5b173c9b9727115653c2b9d4070066e390737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4d0300000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066fe6d0200000000000000000000000000000000000000000000000000000000000000076d6f6368612d340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a10757067726164656449424353746174655001580100000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000369626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a2a678674c3af207abd0fa0a368a0cb92f2a54ec798a8a0971b0d889b4628312c0f9a56b1797c6e61111b54cda60cec9489280dce1ef07677c3b295e7f2a54b4b246c249279bb5b5b6f86a2026ed68e1d4bce6a25392653724b320e50cc52334d190df06d17677567b86d5d317868c337bb4d5331d037fd00ed70ba07794355cf148e5e0d556f5b20ea811bee39f77a317f31ebcde66d8e2e48a9be4599b99a321ab3441a7d74123ffdbbe92d7171b51cdb2095766d8ebcfdeffb6792ec9020c32fe973bd259ae82620aec499a37d8bec5db419d8ed80a74a6a3991907eda0f392a725b02ca208e4ae2d58595b1c3163e2bd363e09e4c34fac66fb24dbfc707c1289f5fce188eb78778aa8a86a42d93ebd236b1b6176677e5f80097cc6602b0670acc9779e3614c5435297656fd5ba80560deafc55a0fbb5769ff3bf9f5f1c3f115b42b00fb5f790fc73c7e2dd49606550ee88094a8bbd66ac3e5af88877d1b370d075275bfc46b96c0d67d5c52fffa89e77c6afc61c5f7e50641a6e39d1c4e8e196b27cdcc56126bc0a74233af4deae7f94b6a9e94505f0d5724a5f2b2d221650024962f97e887aa4cd9575a6c3afb84138e0ef31c62b6911a7646a8603470d206d0dd01122c9a9f32590b9b3b0d3fefafcfe54bd66de1de1b9e363b8c601359157170749d97d6a6a1aafb92d24fe1cf33b34164ed5df6e455f0398b1d47e9602f6a277fb45677a52c10c6d3a0fbd2a0001d857b88a1ca2d84e1e169754d6dc819d55b54a9da58ed7d7df44b0154d33f6d878dfc7317b41ecb4edbb3b9ee0494251a054e57a6073be11d727ea1cb3e39df1e13a232f988d24defb799a8272d7b0426f54de798a6575f1c4233e1d0c2d4bf846ff5e818dd6145e2a195594c39bc19356bb4cac9a32e1e77dcce29e4edee793a65bc67b7eb4afdf5a2ecf7e9c5011d5aa54f2228f48744636b5454506ad381e79cb76e33276d8e38d629e7c5fa3e08884f3269bff3e5e0c3159114181611ff485efc9daa410a9bdda9a5352d45ea180f1a289cef03e22414b3b1654d349fbeb2e1df12f71e0a07139579f7222eed130bbb6b20df62aac59b7777e4feaad10be0ddd5818bbc3322ce83db981acb1b0dff6e2884fa3cd8608b95674b16f9211cdf6b77ff671eb6db597f2bd133e7180d9f4eee7bd8dfcef9aae7b6d65fb820b3d12be121309bf6b02aeafdb950245200000000000000000000000000000000000000000000000000000000"
 }
\ No newline at end of file
diff --git a/contracts/fixtures/update_client_fixture.json b/contracts/fixtures/update_client_fixture.json
index 35f6011..b301e91 100644
--- a/contracts/fixtures/update_client_fixture.json
+++ b/contracts/fixtures/update_client_fixture.json
@@ -1,11 +1,11 @@
 {
-  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3",
-  "targetConsensusState": "0000000000000000000000000000000000000000000000000000000066fd9c95639a9919318d19255c9fd2e5f31803506f14a848939f50c16a495c404d768e6c0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
-  "targetHeight": 2833390,
-  "updateMsg": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000066fd984ad2bb91ba3b0ad4ce3a7e28abe5f13e61c3388bc45c0b49f1817520f909f908fc0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000066fd9c95639a9919318d19255c9fd2e5f31803506f14a848939f50c16a495c404d768e6c0737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3b94000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b3bee00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066fd9d3500000000000000000000000000000000000000000000000000000000000000076d6f6368612d340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a06baedf6163f8ee1409a136392eb58428953da73d59785453d92e80cf692718d086d775f9cdb238a05ad4285d1b9271990f4dc5873d4c63627cf69f5050ab75b0ac9b29096bb20752a3b85ca8162e872378c72b5552900ea54897fc836d8bdab2b618773b9c2332a86362fe55480dbf75a3d3e004a14116f3e767d1be1420bd21bda62c5d7e58e674a4b44b88cee183813aac31c95e6755bf8316cc9b20ce62d2c07018ed8efc2ee681a68496a9cd1ea81473ce9e23c4d4d6f5897c4300097e41ba81b5892a8ac3b4fb3524577b6a78a31367990121bf157072ae9ea7d02c24e280101e446aa97f30d59c663ee1b322d377ef35351ac1a54575cdda92b7d4908040a213f2e7ef35fadea5d7570fae79bb0906a2613f86a4b82612a077d41f2072180022790f4c442355cb93c95a5c077760e111d5eb73119b5d0f42a162a8f6022e2e2e852941107c5a254b992dff6e5e664162d021c4c59dd7f8b54b351948401f975afed1b361e9f0aacdf2430f4e5209c0c1ece6eb403b4f6ed621ecf0de4238fb77a6dc8509c2d037a5ffda11d4ec2ef884b176a98f7ba800f44b7dd657d25fe7859c8f8295c04573b4f555200eeadbfd8dd38dd22c340f29272ea7a246217683d94423f85d164a44b6acea6e1b3607e5015de756a699643f951f7890fe207a3f7e590610ef7394c80bcf176014ca3e20ad73f07592581855dfcb289053d2d7ff96bde8733abd5e15a6699dac060774e2867f808946471d169bef03b25fa132df460b8fd16a0be1b0ea9f9b7828e49f8dcde4e3544e036338bf7530d3d7e14e68b54373c94c67639527ac86ae1b4fecb93d2b756deaf4b828f38d7a6932a0ffd156724121f82a036af73411d1cac2504edbe2b91494bf813979f6bcafe5007f0b0b148a6b3df5e012343f4b2cfdea248488dcade14c0cfe59348ef8878301d89d08f2d2293055fc663ea6a7a38c71c4d5dbfbdb4a5363a44302750bf793f087733364a25ef40b0b259e2ea07232a043ed05c99a751af2affadca935fe7240307ce2f55d29ede83bbd0923d3e2b698c973dcb5f9eef3759bc23acd7ea5c3d05dddad6c38ff298326843d7dc4e43b92f2da031c4d32a61a5f4268db871776a1114501d624e24977791353cd8eb3e28e57c03211eb102abed9d0ccd1d2aebba1acb7e38926448d6286cbf37d743a21a56530165c7c86fd6fe6db03b468626de00000000000000000000000000000000000000000000000000000000"
+  "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681",
+  "targetConsensusState": "0000000000000000000000000000000000000000000000000000000066fe6c4b42bfb610ae70586fac3acc547b046ff5b173c9b9727115653c2b9d4070066e390737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a4904",
+  "targetHeight": 2837763,
+  "updateMsg": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000066fe67ee310545bbc8d0e479c43f1932a069889dcfa4339b557d66ed0c1e0d73874a27020737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000066fe6c4b42bfb610ae70586fac3acc547b046ff5b173c9b9727115653c2b9d4070066e390737a627544ee53ab06349115f509d4bd5725cc361486e739231bc91ea8a49040000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4ca9000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002b4d0300000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066fe6cf100000000000000000000000000000000000000000000000000000000000000076d6f6368612d340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003644aca240a097d0e80b4d9b2823c0e459cdb0ed3e70cc4d1bbe4fddc1e8ef0d9bd1978b7c32a744279df014d871e1c34db5a24b271d84b18cf8582d60186538e05306624ca0d18b72295a4204a954e9a0a60da306b21f1941ef23db6d0c889d07f9017b0a3086fd8678d688631b12a3b90c3fdc8bf49fa11abb16f89719e6144d5539b69a91c3dad3baaf75b35643d9f1dafa26992729113a63f6ef65fbf43fc5350c0cdf51b4e2ed0fe816b69cbd825a468a23b765b7ae680d2b8f8b1c02c5269ec9f92f80c2d177616331ee1aab29b79b9f1fe682c178a5fea7a2aa67b77a902967559932262645d910b76b9522ccdb1bd30d88943678dc3191dfc2368c92cf373cdd38c15d21c2c2b89355d759b2707a0efedd9c3f6b29758ec1fc9e74ca9b79bb466cb3026db3e2f335f837025aa6da15d0aab85321ee03d279a3f2c4e0e21006454cb2cf9d9191d60f83ec2877b9189ca05f44f9ab07a16efac4d194886b9d5b0d8e627fe481e989b1876353f61bea2dd4326cb6c1951a0ff81b9df904785a39529a9140582f2f0f2a018f11a4a13fad216f90dc527319f7731afb642bba833acd7ef0b14ccafd49ce7d2889df6fb20a9a4937a935f0c622c6a6d2772921fa8df64c9294478f0c28136d12bcbfd5015e752dc10c45d42f9360c63db7ff612e876b0a9116aa5e361c94ad122b070537aa92a48e183607f61476b2ee55e9a83284c9cfa2fe22dbaf419ed2266f8df3d7c59966053598db02a6b6242182261e311f141f210f57bfdeb7d526fc56d5b4064f1242c4a3de64f73b315a41d9e5d8bf0fd28ce00ea84834be681dbaeb273295a19e033f8581339447b9ce733a6fd55a13310411cd661dcf484b727d7521cb1fd161fe09d48c7ce5ce6c450c8f76e93e94fdc0b19c490ac8ea3d1bc8bbee313ec0b693ae8a2fe329b29ca3bbeb1385cd2789d3a0786836eb97593166a8428b1433b8d3002ab331d77f3e7924767061dee6d408a0ad1c3d5c2564626092c9a96ac6a3bebe7e312b22b8b1ddcf1be9c542d7ba7f60b202f16bf9d56469d79b53277c4e3f3ce4231eb5c4e237885f866896e973cbf00c006d3cf70d7f8e7b12c3e56fe59372ac114484b7ebf0f36572fca94a376911089491394c3ebfcc42ce67d864f6c93bf0d269a45ed552ad389eef5f90fd06e19d637f48abd6d4d8f505a1b0597856ea4af577836d3731d1c79e9c11ffd301b00000000000000000000000000000000000000000000000000000000"
 }
\ No newline at end of file
diff --git a/contracts/script/genesis.json b/contracts/script/genesis.json
index 735958c..e789989 100644
--- a/contracts/script/genesis.json
+++ b/contracts/script/genesis.json
@@ -1,8 +1,8 @@
 {
-  "trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fda01c5ba0aea90e4f6ef2f0eaec7a18de7f20483812edc00adb707613ea126b4be4c58fe2b78c5c0f13fa3011f698b6c5c4b2e1d7f8ad8af3f7d1b015a2678271b0ed",
-  "updateClientVkey": "0x003fde0564a8cee495b2274aa0e0ed69fd65412ab21907dde520840257249685",
-  "membershipVkey": "0x00ee65bcb0c1b30d7f58178a06aae92df999ef24f9c65e48676b7f5777cceb00",
-  "ucAndMembershipVkey": "0x00ecbbe33253fbe1b537666b91100993fc2d4f30e55323cf7ad8f86bbdef5b27",
-  "misbehaviourVkey": "0x008518279004cc25e793502455e244b3905e4abc0f894116727c820e765160b3"
+  "trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066fe705324693c5a7fc5c2e95d6b3e04ef6de62c866d0e6de27be6e789562fe9a2fc17d9c7a8f09141501bbc11fb7adb76f5e62126d7b7ab2a7c2b4394d0e1d5898297f7",
+  "updateClientVkey": "0x00e983655058fc0461baa611927cc87955f8288c751b0d22c7ffabf18ff1c664",
+  "membershipVkey": "0x005029538c1c955aa2a20ff5c6ff4d998ad80df927ab1a4d5a49099c100b131a",
+  "ucAndMembershipVkey": "0x0023a5ccbeb5dcf75387531b19b91615393f231f111cae6c8a4ab6401ae5b180",
+  "misbehaviourVkey": "0x00b8dbd332adb232415f56f55eedebee82a15a9c47cf0ebf6f187da55b193681"
 }
\ No newline at end of file
diff --git a/operator/src/helpers/light_block.rs b/operator/src/helpers/light_block.rs
index a159f5d..8b627bd 100644
--- a/operator/src/helpers/light_block.rs
+++ b/operator/src/helpers/light_block.rs
@@ -4,7 +4,10 @@ use ibc_client_tendermint::types::{ConsensusState, Header};
 use ibc_core_client_types::Height as IbcHeight;
 use ibc_core_commitment_types::commitment::CommitmentRoot;
 use ibc_core_host_types::{error::IdentifierError, identifiers::ChainId};
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{ClientState, Height, TrustThreshold};
+use sp1_ics07_tendermint_solidity::{
+    IICS02ClientMsgs::Height,
+    IICS07TendermintMsgs::{ClientState, TrustThreshold},
+};
 use std::str::FromStr;
 use tendermint_light_client_verifier::types::LightBlock;
 
diff --git a/operator/src/prover.rs b/operator/src/prover.rs
index 079bcd1..81a6a30 100644
--- a/operator/src/prover.rs
+++ b/operator/src/prover.rs
@@ -7,7 +7,7 @@ use crate::programs::{
 use ibc_client_tendermint::types::{Header, Misbehaviour};
 use ibc_core_commitment_types::merkle::MerkleProof;
 use ibc_proto::Protobuf;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::{
     ConsensusState as SolConsensusState, Env,
 };
 use sp1_sdk::{ProverClient, SP1ProofWithPublicValues, SP1ProvingKey, SP1Stdin, SP1VerifyingKey};
diff --git a/operator/src/runners/fixtures/membership.rs b/operator/src/runners/fixtures/membership.rs
index 27f9d99..e7eff59 100644
--- a/operator/src/runners/fixtures/membership.rs
+++ b/operator/src/runners/fixtures/membership.rs
@@ -13,9 +13,10 @@ use ibc_core_commitment_types::merkle::MerkleProof;
 use ibc_core_host_cosmos::IBC_QUERY_PATH;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
-    ClientState, ConsensusState as SolConsensusState, MembershipOutput, MembershipProof,
-    SP1MembershipProof, SP1Proof,
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::{ClientState, ConsensusState as SolConsensusState},
+    IMembershipMsgs::{MembershipOutput, MembershipProof, SP1MembershipProof},
+    ISP1Msgs::SP1Proof,
 };
 use sp1_ics07_tendermint_utils::convert_tm_to_ics_merkle_proof;
 use sp1_sdk::HashableKey;
diff --git a/operator/src/runners/fixtures/misbehaviour.rs b/operator/src/runners/fixtures/misbehaviour.rs
index c1c0ce7..25a8859 100644
--- a/operator/src/runners/fixtures/misbehaviour.rs
+++ b/operator/src/runners/fixtures/misbehaviour.rs
@@ -12,8 +12,10 @@ use ibc_client_tendermint::types::Misbehaviour;
 use ibc_proto::ibc::lightclients::tendermint::v1::Misbehaviour as RawMisbehaviour;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
-    ClientState, ConsensusState, Env, MsgSubmitMisbehaviour, SP1Proof,
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::{ClientState, ConsensusState, Env},
+    IMisbehaviourMsgs::MsgSubmitMisbehaviour,
+    ISP1Msgs::SP1Proof,
 };
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
diff --git a/operator/src/runners/fixtures/uc_and_mem.rs b/operator/src/runners/fixtures/uc_and_mem.rs
index 3caefea..82e0393 100644
--- a/operator/src/runners/fixtures/uc_and_mem.rs
+++ b/operator/src/runners/fixtures/uc_and_mem.rs
@@ -14,9 +14,11 @@ use alloy_sol_types::SolValue;
 use ibc_client_tendermint::types::ConsensusState;
 use ibc_core_commitment_types::merkle::MerkleProof;
 use ibc_core_host_cosmos::IBC_QUERY_PATH;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
-    ClientState, ConsensusState as SolConsensusState, Env, MembershipProof,
-    SP1MembershipAndUpdateClientProof, SP1Proof, UcAndMembershipOutput,
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::{ClientState, ConsensusState as SolConsensusState, Env},
+    IMembershipMsgs::{MembershipProof, SP1MembershipAndUpdateClientProof},
+    ISP1Msgs::SP1Proof,
+    IUpdateClientAndMembershipMsgs::UcAndMembershipOutput,
 };
 use sp1_ics07_tendermint_utils::convert_tm_to_ics_merkle_proof;
 use sp1_sdk::HashableKey;
diff --git a/operator/src/runners/fixtures/update_client.rs b/operator/src/runners/fixtures/update_client.rs
index 5e8d709..21d5843 100644
--- a/operator/src/runners/fixtures/update_client.rs
+++ b/operator/src/runners/fixtures/update_client.rs
@@ -11,8 +11,10 @@ use crate::{
 use alloy_sol_types::SolValue;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
-    ClientState, ConsensusState, Env, MsgUpdateClient, SP1Proof, UpdateClientOutput,
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::{ClientState, ConsensusState, Env},
+    ISP1Msgs::SP1Proof,
+    IUpdateClientMsgs::{MsgUpdateClient, UpdateClientOutput},
 };
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
diff --git a/operator/src/runners/genesis.rs b/operator/src/runners/genesis.rs
index a11a9e9..d7ac468 100644
--- a/operator/src/runners/genesis.rs
+++ b/operator/src/runners/genesis.rs
@@ -11,7 +11,7 @@ use crate::{
 };
 use alloy_sol_types::SolValue;
 use serde_with::serde_as;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::ConsensusState as SolConsensusState;
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::ConsensusState as SolConsensusState;
 use sp1_sdk::{utils::setup_logger, HashableKey};
 use std::path::PathBuf;
 use tendermint_light_client_verifier::types::{LightBlock, TrustThreshold};
diff --git a/operator/src/runners/operator.rs b/operator/src/runners/operator.rs
index a6da569..6d56cdc 100644
--- a/operator/src/runners/operator.rs
+++ b/operator/src/runners/operator.rs
@@ -13,7 +13,10 @@ use alloy::providers::ProviderBuilder;
 use alloy_sol_types::SolValue;
 use log::{debug, info};
 use reqwest::Url;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{self, Env, MsgUpdateClient, SP1Proof};
+use sp1_ics07_tendermint_solidity::{
+    sp1_ics07_tendermint, IICS07TendermintMsgs::Env, ISP1Msgs::SP1Proof,
+    IUpdateClientMsgs::MsgUpdateClient,
+};
 use sp1_sdk::{utils::setup_logger, HashableKey};
 use tendermint_rpc::HttpClient;
 
diff --git a/packages/solidity/src/lib.rs b/packages/solidity/src/lib.rs
index 4ef4eb7..0c3885c 100644
--- a/packages/solidity/src/lib.rs
+++ b/packages/solidity/src/lib.rs
@@ -1,5 +1,4 @@
 #![doc = include_str!("../README.md")]
-#![deny(missing_docs)]
 #![deny(clippy::nursery, clippy::pedantic, warnings)]
 
 use alloy_sol_types::SolValue;
@@ -28,7 +27,7 @@ alloy_sol_types::sol!(
 );
 
 #[cfg(feature = "rpc")]
-impl sp1_ics07_tendermint::SP1Proof {
+impl ISP1Msgs::SP1Proof {
     /// Create a new [`sp1_ics07_tendermint::SP1Proof`] instance.
     ///
     /// # Panics
@@ -49,8 +48,8 @@ impl sp1_ics07_tendermint::SP1Proof {
 }
 
 #[allow(clippy::fallible_impl_from)]
-impl From<sp1_ics07_tendermint::TrustThreshold> for TendermintTrustThreshold {
-    fn from(trust_threshold: sp1_ics07_tendermint::TrustThreshold) -> Self {
+impl From<IICS07TendermintMsgs::TrustThreshold> for TendermintTrustThreshold {
+    fn from(trust_threshold: IICS07TendermintMsgs::TrustThreshold) -> Self {
         Self::new(
             trust_threshold.numerator.into(),
             trust_threshold.denominator.into(),
@@ -59,7 +58,7 @@ impl From<sp1_ics07_tendermint::TrustThreshold> for TendermintTrustThreshold {
     }
 }
 
-impl TryFrom<TendermintTrustThreshold> for sp1_ics07_tendermint::TrustThreshold {
+impl TryFrom<TendermintTrustThreshold> for IICS07TendermintMsgs::TrustThreshold {
     type Error = <u64 as TryInto<u32>>::Error;
 
     fn try_from(trust_threshold: TendermintTrustThreshold) -> Result<Self, Self::Error> {
@@ -71,7 +70,7 @@ impl TryFrom<TendermintTrustThreshold> for sp1_ics07_tendermint::TrustThreshold
 }
 
 #[allow(clippy::fallible_impl_from)]
-impl From<ICS07TendermintConsensusState> for sp1_ics07_tendermint::ConsensusState {
+impl From<ICS07TendermintConsensusState> for IICS07TendermintMsgs::ConsensusState {
     fn from(ics07_tendermint_consensus_state: ICS07TendermintConsensusState) -> Self {
         let root: [u8; 32] = ics07_tendermint_consensus_state
             .root
@@ -93,8 +92,8 @@ impl From<ICS07TendermintConsensusState> for sp1_ics07_tendermint::ConsensusStat
 }
 
 #[allow(clippy::fallible_impl_from)]
-impl From<sp1_ics07_tendermint::ConsensusState> for ICS07TendermintConsensusState {
-    fn from(consensus_state: sp1_ics07_tendermint::ConsensusState) -> Self {
+impl From<IICS07TendermintMsgs::ConsensusState> for ICS07TendermintConsensusState {
+    fn from(consensus_state: IICS07TendermintMsgs::ConsensusState) -> Self {
         let time =
             OffsetDateTime::from_unix_timestamp(consensus_state.timestamp.try_into().unwrap())
                 .unwrap();
@@ -112,8 +111,8 @@ impl From<sp1_ics07_tendermint::ConsensusState> for ICS07TendermintConsensusStat
     }
 }
 
-impl From<sp1_ics07_tendermint::SP1MembershipProof> for sp1_ics07_tendermint::MembershipProof {
-    fn from(proof: sp1_ics07_tendermint::SP1MembershipProof) -> Self {
+impl From<IMembershipMsgs::SP1MembershipProof> for IMembershipMsgs::MembershipProof {
+    fn from(proof: IMembershipMsgs::SP1MembershipProof) -> Self {
         Self {
             proofType: 0,
             proof: proof.abi_encode().into(),
@@ -121,10 +120,8 @@ impl From<sp1_ics07_tendermint::SP1MembershipProof> for sp1_ics07_tendermint::Me
     }
 }
 
-impl From<sp1_ics07_tendermint::SP1MembershipAndUpdateClientProof>
-    for sp1_ics07_tendermint::MembershipProof
-{
-    fn from(proof: sp1_ics07_tendermint::SP1MembershipAndUpdateClientProof) -> Self {
+impl From<IMembershipMsgs::SP1MembershipAndUpdateClientProof> for IMembershipMsgs::MembershipProof {
+    fn from(proof: IMembershipMsgs::SP1MembershipAndUpdateClientProof) -> Self {
         Self {
             proofType: 1,
             proof: proof.abi_encode().into(),
@@ -132,7 +129,7 @@ impl From<sp1_ics07_tendermint::SP1MembershipAndUpdateClientProof>
     }
 }
 
-impl TryFrom<ibc_core_client_types::Height> for sp1_ics07_tendermint::Height {
+impl TryFrom<ibc_core_client_types::Height> for IICS02ClientMsgs::Height {
     type Error = <u64 as TryInto<u32>>::Error;
 
     fn try_from(height: ibc_core_client_types::Height) -> Result<Self, Self::Error> {
diff --git a/programs/membership/src/lib.rs b/programs/membership/src/lib.rs
index 1c3f2b4..c393d7c 100644
--- a/programs/membership/src/lib.rs
+++ b/programs/membership/src/lib.rs
@@ -1,7 +1,7 @@
 //! The crate that contains the types and utilities for `sp1-ics07-tendermint-membership` program.
 #![deny(missing_docs, clippy::nursery, clippy::pedantic, warnings)]
 
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{KVPair, MembershipOutput};
+use sp1_ics07_tendermint_solidity::IMembershipMsgs::{KVPair, MembershipOutput};
 
 use ibc_core_commitment_types::{
     commitment::CommitmentRoot,
diff --git a/programs/misbehaviour/src/lib.rs b/programs/misbehaviour/src/lib.rs
index cb7f072..09f3305 100644
--- a/programs/misbehaviour/src/lib.rs
+++ b/programs/misbehaviour/src/lib.rs
@@ -9,7 +9,9 @@ use ibc_client_tendermint::client_state::{
 };
 use ibc_client_tendermint::types::{ConsensusState, Misbehaviour, TENDERMINT_CLIENT_TYPE};
 use ibc_core_host_types::identifiers::{ChainId, ClientId};
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{Env, MisbehaviourOutput};
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::Env, IMisbehaviourMsgs::MisbehaviourOutput,
+};
 use std::collections::HashMap;
 use std::time::Duration;
 use tendermint_light_client_verifier::options::Options;
diff --git a/programs/misbehaviour/src/main.rs b/programs/misbehaviour/src/main.rs
index 4963f1b..f9e2370 100644
--- a/programs/misbehaviour/src/main.rs
+++ b/programs/misbehaviour/src/main.rs
@@ -12,7 +12,7 @@ sp1_zkvm::entrypoint!(main);
 use alloy_sol_types::SolValue;
 use ibc_client_tendermint::types::Misbehaviour;
 use sp1_ics07_tendermint_misbehaviour::check_for_misbehaviour;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::{
     ConsensusState as SolConsensusState, Env,
 };
 
diff --git a/programs/misbehaviour/src/types/validation.rs b/programs/misbehaviour/src/types/validation.rs
index 0cf679f..1c43ba2 100644
--- a/programs/misbehaviour/src/types/validation.rs
+++ b/programs/misbehaviour/src/types/validation.rs
@@ -7,7 +7,7 @@ use ibc_client_tendermint::{
 use ibc_core_client::context::{ClientValidationContext, ExtClientValidationContext};
 use ibc_core_handler_types::error::ContextError;
 use ibc_primitives::Timestamp;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::Env;
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::Env;
 use std::collections::HashMap;
 
 /// The client validation context.
diff --git a/programs/uc-and-membership/src/lib.rs b/programs/uc-and-membership/src/lib.rs
index d012b0f..f8b8c57 100644
--- a/programs/uc-and-membership/src/lib.rs
+++ b/programs/uc-and-membership/src/lib.rs
@@ -1,7 +1,9 @@
 //! The crate that contains the types and utilities for `sp1-ics07-tendermint-membership` program.
 #![deny(missing_docs, clippy::nursery, clippy::pedantic, warnings)]
 
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{Env, UcAndMembershipOutput};
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::Env, IUpdateClientAndMembershipMsgs::UcAndMembershipOutput,
+};
 
 use ibc_client_tendermint_types::{ConsensusState, Header};
 
diff --git a/programs/uc-and-membership/src/main.rs b/programs/uc-and-membership/src/main.rs
index d611fc1..9dc1827 100644
--- a/programs/uc-and-membership/src/main.rs
+++ b/programs/uc-and-membership/src/main.rs
@@ -17,7 +17,7 @@ use sp1_ics07_tendermint_uc_and_membership::update_client_and_membership;
 use ibc_core_commitment_types::merkle::MerkleProof;
 
 use ibc_client_tendermint_types::Header;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::{
     ConsensusState as SolConsensusState, Env,
 };
 
diff --git a/programs/update-client/src/lib.rs b/programs/update-client/src/lib.rs
index 9095a81..7ef8f75 100644
--- a/programs/update-client/src/lib.rs
+++ b/programs/update-client/src/lib.rs
@@ -11,7 +11,9 @@ use ibc_client_tendermint::{
     types::{ConsensusState, Header, TENDERMINT_CLIENT_TYPE},
 };
 use ibc_core_host_types::identifiers::{ChainId, ClientId};
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{Env, UpdateClientOutput};
+use sp1_ics07_tendermint_solidity::{
+    IICS07TendermintMsgs::Env, IUpdateClientMsgs::UpdateClientOutput,
+};
 
 use tendermint_light_client_verifier::{options::Options, ProdVerifier};
 
@@ -45,7 +47,6 @@ pub fn update_client(
 
     let trusted_height = proposed_header.trusted_height.try_into().unwrap();
     let new_height = proposed_header.height().try_into().unwrap();
-
     let new_consensus_state = ConsensusState::from(proposed_header);
 
     UpdateClientOutput {
diff --git a/programs/update-client/src/main.rs b/programs/update-client/src/main.rs
index 8f50b30..818bffb 100644
--- a/programs/update-client/src/main.rs
+++ b/programs/update-client/src/main.rs
@@ -13,7 +13,7 @@ sp1_zkvm::entrypoint!(main);
 
 use alloy_sol_types::SolValue;
 use ibc_client_tendermint::types::Header;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::{
     ConsensusState as SolConsensusState, Env,
 };
 use sp1_ics07_tendermint_update_client::update_client;
diff --git a/programs/update-client/src/types/validation.rs b/programs/update-client/src/types/validation.rs
index bd4037c..8b52584 100644
--- a/programs/update-client/src/types/validation.rs
+++ b/programs/update-client/src/types/validation.rs
@@ -7,7 +7,7 @@ use ibc_client_tendermint::{
 use ibc_core_client::context::{ClientValidationContext, ExtClientValidationContext};
 use ibc_core_handler_types::error::ContextError;
 use ibc_primitives::Timestamp;
-use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::Env;
+use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::Env;
 
 /// The client validation context.
 pub struct ClientValidationCtx<'a, 'b> {