diff --git a/Cargo.lock b/Cargo.lock
index e584260..740d9b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -130,7 +130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41058deaa38c9d9dd933d6d238d825227cffa668e2839b52879f6619c63eee3b"
 dependencies = [
  "futures",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "wasm-bindgen-futures",
 ]
 
@@ -176,7 +176,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -187,7 +187,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -207,7 +207,7 @@ dependencies = [
  "manyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -223,7 +223,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -253,8 +253,8 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
- "sync_wrapper 1.0.2",
- "tower 0.5.1",
+ "sync_wrapper",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
 ]
@@ -274,7 +274,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
 ]
@@ -659,20 +659,20 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-derive"
-version = "1.5.8"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e07de16c800ac82fd188d055ecdb923ead0cf33960d3350089260bb982c09f"
+checksum = "d67457e4acb04e738788d3489e343957455df2c4643f2b53050eb052ca631d19"
 dependencies = [
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.5.8"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d388adfa9cb449557a92e9318121ac1a481fc4f599213b03a5b62699b403b4"
+checksum = "13bf06bf1c7ea737f6b3d955d9cabeb8cbbe4dcb8dea392e30f6fab4493a4b7a"
 dependencies = [
- "cosmwasm-schema-derive 1.5.8",
+ "cosmwasm-schema-derive 1.5.9",
  "schemars",
  "serde",
  "serde_json",
@@ -681,11 +681,11 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b4d949b6041519c58993a73f4bbfba8083ba14f7001eae704865a09065845"
+checksum = "3e9a7b56d154870ec4b57b224509854f706c9744449548d8a3bf91ac75c59192"
 dependencies = [
- "cosmwasm-schema-derive 2.1.4",
+ "cosmwasm-schema-derive 2.2.0",
  "schemars",
  "serde",
  "serde_json",
@@ -694,9 +694,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.5.8"
+version = "1.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2411b389e56e6484f81ba955b758d02522d620c98fc960c4bd2251d48b7aa19f"
+checksum = "077fe378f16b54e3d0a57adb3f39a65bcf7bdbda6a5eade2f8ba7755c2fb1250"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -705,13 +705,13 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ef1b5835a65fcca3ab8b9a02b4f4dacc78e233a5c2f20b270efb9db0666d12"
+checksum = "edd3d80310cd7b86b09dbe886f4f2ca235a5ddb8d478493c6e50e720a3b38a42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -725,9 +725,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -815,7 +815,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -902,7 +902,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -922,7 +922,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -954,7 +954,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -1089,9 +1089,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -1099,9 +1099,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1275,7 +1275,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -1743,9 +1743,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hydration_context"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef13071fe13b55c85fe2b70246d2e3b49d2c6a764fd3e0edaf262cc385ff1854"
+checksum = "d35485b3dcbf7e044b8f28c73f04f13e7b509c2466fd10cb2a8a447e38f8a93a"
 dependencies = [
  "futures",
  "once_cell",
@@ -1757,9 +1757,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1955,7 +1955,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2062,9 +2062,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2112,15 +2112,17 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lb-interfaces"
-version = "0.0.1"
+version = "0.1.0"
 dependencies = [
- "cosmwasm-schema 1.5.8",
+ "base64 0.22.1",
+ "cosmwasm-schema 1.5.9",
  "ethnum",
  "lb-libraries 0.1.0",
  "schemars",
  "secret-cosmwasm-std",
  "secret-toolkit",
  "serde",
+ "serde-json-wasm 1.0.1",
  "shade-protocol",
  "snip1155",
  "thiserror 1.0.69",
@@ -2130,7 +2132,7 @@ dependencies = [
 name = "lb-libraries"
 version = "0.1.0"
 dependencies = [
- "cosmwasm-schema 1.5.8",
+ "cosmwasm-schema 1.5.9",
  "ethnum",
  "primitive-types",
  "schemars",
@@ -2146,7 +2148,7 @@ name = "lb-libraries"
 version = "0.1.0"
 source = "git+https://github.com/securesecrets/shade?branch=orderbook/library#9a9a2da00992848e76de70267bce354f1b6dae82"
 dependencies = [
- "cosmwasm-schema 2.1.4",
+ "cosmwasm-schema 2.2.0",
  "ethnum",
  "primitive-types",
  "schemars",
@@ -2158,9 +2160,9 @@ dependencies = [
 
 [[package]]
 name = "leptos"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5046c590aea121f6ad5e71fcb75453a933425d39527b9a3b1b295235afc8df"
+checksum = "5c4e32cac886183e0faf8dd30944072302359a8508380827f649ef9bbdd179ad"
 dependencies = [
  "any_spawner",
  "cfg-if",
@@ -2183,7 +2185,7 @@ dependencies = [
  "server_fn",
  "slotmap",
  "tachys",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "throw_error",
  "typed-builder",
  "typed-builder-macro",
@@ -2193,22 +2195,22 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2d64c43e2554108c26da3127f8384d92ca76c6f0b7288d1c09c8cc68152064"
+checksum = "1961b08a7dc3f4a559223be87c44b56bb565bf0b438909a0c3c31d88bfad0982"
 dependencies = [
  "config",
  "regex",
  "serde",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "typed-builder",
 ]
 
 [[package]]
 name = "leptos_dom"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c15aca81dc2edd040b51c46734f65c6f36e6ba8a31347c1354c94b958044ae0"
+checksum = "652ba5e3a5c4e703e5bd4b24b62de9dbeedca84e5f31aff045bf329014418496"
 dependencies = [
  "js-sys",
  "or_poisoned",
@@ -2221,9 +2223,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445f3a62696d2d66bef288911af34405718880b4b8dd6c5cfb7751fd8ffcc6b"
+checksum = "77bc67823a8eb1c961ee08dd7b3a814964c63928a64954e3521733b56dd7e66f"
 dependencies = [
  "anyhow",
  "camino",
@@ -2233,15 +2235,15 @@ dependencies = [
  "quote",
  "rstml",
  "serde",
- "syn 2.0.90",
+ "syn 2.0.91",
  "walkdir",
 ]
 
 [[package]]
 name = "leptos_macro"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92f690c955274f1722ee6c66463ace79301d53a8c2bf7f6e4e61b978ca239e20"
+checksum = "0d4b2418deac01fe9a3862d410a6a6beff235e4b124d9e874986bb22617aeea6"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -2255,15 +2257,15 @@ dependencies = [
  "quote",
  "rstml",
  "server_fn_macro",
- "syn 2.0.90",
+ "syn 2.0.91",
  "uuid",
 ]
 
 [[package]]
 name = "leptos_meta"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c651d788bbbf1c57ee95dd3835f9d433b85a409b6256f338c3c7146eb8b7f53"
+checksum = "446afa35482822d4a50a4af2cae11ac447193d769140e780701807ee5a9e2596"
 dependencies = [
  "futures",
  "indexmap 2.7.0",
@@ -2277,9 +2279,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4f1784486ebf36805dac22faee21e3e610aa64b6662a7386f065eeec27ae8"
+checksum = "c93e40eef0b39384dc8a9aceb0f598d36de8f40d9ad14ef431023fae9b40bc88"
 dependencies = [
  "any_spawner",
  "either_of",
@@ -2293,7 +2295,7 @@ dependencies = [
  "reactive_graph",
  "send_wrapper",
  "tachys",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "url",
  "wasm-bindgen",
  "web-sys",
@@ -2301,9 +2303,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router_macro"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee7ecef3f1c69b51864190c564e4873d84f200e44efb37934208f9525f02a5f"
+checksum = "757692288bd1aeb03d597481ec350c4eba26ffd98f06c5491e30a9c21ae9fbfb"
 dependencies = [
  "proc-macro-error2",
  "proc-macro2",
@@ -2312,9 +2314,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93450589df3b3e398c7f5ea64d8f1c8369b1ba9b90e1f70f6cb996b8d443ca3e"
+checksum = "5cc1e6a182eebf8b1739dff377e63688eb7ab08c133f657e939969daa356a275"
 dependencies = [
  "any_spawner",
  "base64 0.22.1",
@@ -2332,9 +2334,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libgit2-sys"
@@ -2413,7 +2415,7 @@ dependencies = [
  "manyhow-macros",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2453,9 +2455,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
  "adler2",
 ]
@@ -2543,9 +2545,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.5"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -2676,7 +2678,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2739,7 +2741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2794,7 +2796,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2825,7 +2827,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "version_check",
  "yansi",
 ]
@@ -2850,7 +2852,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2868,7 +2870,7 @@ version = "0.1.0"
 source = "git+https://github.com/securesecrets/query-authentication?branch=cosmwasm_v1_upgrade#024c13c08c8e4d25d890de2418fb1ae2c45425e9"
 dependencies = [
  "bech32 0.8.1",
- "cosmwasm-schema 1.5.8",
+ "cosmwasm-schema 1.5.9",
  "remain",
  "ripemd160",
  "schemars",
@@ -2907,7 +2909,7 @@ dependencies = [
  "proc-macro-utils",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -2958,9 +2960,9 @@ dependencies = [
 
 [[package]]
 name = "reactive_graph"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c27f54685c1416af1f323a0c40e71cbdae281a1ebc623591790d367222d0ac65"
+checksum = "04db00da5327bfd67a75b8d39dd1e8dff14509f375f0618110e30d28d4fbea0d"
 dependencies = [
  "any_spawner",
  "async-lock",
@@ -2973,15 +2975,15 @@ dependencies = [
  "send_wrapper",
  "serde",
  "slotmap",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "web-sys",
 ]
 
 [[package]]
 name = "reactive_stores"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efe3f866edc7647e19a68a229a2e5cc9730549836d722eeaa073116f2b07966e"
+checksum = "8285bcb6b1520dfc67a253ed6ca02dd9b9e3f8e98072e217585c8abfc6252050"
 dependencies = [
  "guardian",
  "itertools",
@@ -3002,14 +3004,14 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags",
 ]
@@ -3051,7 +3053,7 @@ checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -3113,7 +3115,6 @@ dependencies = [
 [[package]]
 name = "rsecret"
 version = "0.1.0"
-source = "git+https://github.com/kent-3/secret-clients?branch=0.50-update#4c8ef8145d417e5555a68e576eeead051fbe1365"
 dependencies = [
  "aes-siv",
  "async-trait",
@@ -3152,7 +3153,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "syn_derive",
  "thiserror 1.0.69",
 ]
@@ -3180,9 +3181,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "log",
  "once_cell",
@@ -3204,9 +3205,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustls-webpki"
@@ -3261,7 +3262,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -3384,9 +3385,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a84c4a219ead6b41d1f50febaf2caa83b38da30f7cbf1a6837994960f73c16"
+checksum = "6c4dcbfc5ef7c201479020f54a9dab1fe11cb64cd3c4d875a91dd491b265ed01"
 dependencies = [
  "secret-toolkit-crypto",
  "secret-toolkit-permit",
@@ -3400,11 +3401,12 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-crypto"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "319cb54c78052edfb1a25a61223577786be0c1e5cc78b138e76b0a284dfc0ba6"
+checksum = "2cead50c5e6bd178f8f1e7f7b6d3a14e86177d42b24f91a85543f1e1ae12a873"
 dependencies = [
  "cc",
+ "hkdf",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "secp256k1",
@@ -3414,9 +3416,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-permit"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0416c13a40a6918ce0c966ac5da01449f27f332b386f5124229e5ec39b566"
+checksum = "ca321f0c41ac6479f8988c88e1ace9aee2d566a8889f6b7cf45f60e741285cd6"
 dependencies = [
  "bech32 0.9.1",
  "remain",
@@ -3429,9 +3431,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-serialization"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63179059133cd554d5376c373553bb5c01a1e248254983467c5717839124b390"
+checksum = "2cd631b147752674789691135f536965f9118a1a69a9c6522064b71c777b8fa7"
 dependencies = [
  "bincode2",
  "schemars",
@@ -3441,9 +3443,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-snip20"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912924e240d624c904e6ea3d41c70a5d37f24a540c5f746a7c48725b78121755"
+checksum = "1b9a75e321b8f6115c4b9045e100c34950186276815701197257361b0acfaacf"
 dependencies = [
  "schemars",
  "secret-cosmwasm-std",
@@ -3453,9 +3455,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-snip721"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8619ce5d9301a1d3cd85d8af67f2a6c079a1a0adfe4173643b3f42345b4a11d"
+checksum = "97d9f85a0dfa7d7c33b490c90419e1c9457df7bc5c0f75ff4035f45d9ad24d22"
 dependencies = [
  "schemars",
  "secret-cosmwasm-std",
@@ -3465,9 +3467,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-storage"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "432689661e29ba7798e079c6b02da92382babdf3a9407fd767cb97d1c9e4fb5a"
+checksum = "9b1a38dc584baa4f2c9aa52844fd3d06258bdae22fcd8cbe635ffab480ba53a0"
 dependencies = [
  "secret-cosmwasm-std",
  "secret-cosmwasm-storage",
@@ -3477,9 +3479,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-utils"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702e6b9bc83282e9827263fe4c9856dc962bfecfe02cb2e4ed3aabd33021b76d"
+checksum = "ee464d607765ab148164b154eba2ee649bf77f2855c5c2691342f426c263704f"
 dependencies = [
  "schemars",
  "secret-cosmwasm-std",
@@ -3489,9 +3491,9 @@ dependencies = [
 
 [[package]]
 name = "secret-toolkit-viewing-key"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efd133dabbf5fdd63a42d5dba4d1378e6936cade903ce149f87b8df66f5788c"
+checksum = "350ab608f01fe4b61b74ccf205b251513edffe06fc432f7ecc4c762027b2bf5d"
 dependencies = [
  "base64 0.21.7",
  "schemars",
@@ -3537,9 +3539,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "send_wrapper"
@@ -3552,9 +3554,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
@@ -3577,6 +3579,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde-json-wasm"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde-wasm-bindgen"
 version = "0.5.0"
@@ -3610,13 +3621,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -3627,14 +3638,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
  "memchr",
@@ -3661,7 +3672,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -3687,9 +3698,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033cb8014aa86a7ce0c6ee58d23dce1a078b2e320dc6c53bb439663993199b1f"
+checksum = "1abb4001047ecff14681ec411bbd9a8a95a7b405e543ed043fece8f0c5a2f4fe"
 dependencies = [
  "bytes",
  "const_format",
@@ -3705,7 +3716,7 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "thiserror 2.0.4",
+ "thiserror 2.0.9",
  "throw_error",
  "url",
  "wasm-bindgen",
@@ -3717,26 +3728,26 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0249e8a55ca464a1e69f02a95d562f2c65e92e301093a02ebf15d21f68f2a99e"
+checksum = "7883cf3cb2522ce663df033e2fd3093a4497e9b8ed30f354200ef7058c9c792c"
 dependencies = [
  "const_format",
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91c54a6d43cd0f3d2bdf0c85b6119f378b6b89d528159af9cde77f229faeecbc"
+checksum = "a734ef90a83ee9517468b38a017f602a869b382c18e8e8b4118f3f1b88f2856c"
 dependencies = [
  "server_fn_macro",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -3772,7 +3783,7 @@ dependencies = [
  "chrono",
  "const_format",
  "contract-derive",
- "cosmwasm-schema 1.5.8",
+ "cosmwasm-schema 1.5.9",
  "ethnum",
  "lb-libraries 0.1.0 (git+https://github.com/securesecrets/shade?branch=orderbook/library)",
  "primitive-types",
@@ -3850,7 +3861,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 name = "snip1155"
 version = "0.0.1"
 dependencies = [
- "cosmwasm-schema 1.5.8",
+ "cosmwasm-schema 1.5.9",
  "secret-cosmwasm-std",
 ]
 
@@ -3955,9 +3966,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3973,15 +3984,9 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -3996,14 +4001,14 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "tachys"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be68dfd4abf192e11a1bdd484239daa84ffa6fcd27c25cf4f011b2b0fb27ddb"
+checksum = "e3a255ccf179898f7be8f4a9e8d66b632eff7fddcae55288ecd5bd6bd37e4d4f"
 dependencies = [
  "any_spawner",
  "const_str_slice_concat",
@@ -4087,11 +4092,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.4"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
 dependencies = [
- "thiserror-impl 2.0.4",
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
@@ -4102,18 +4107,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.4"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -4188,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4225,7 +4230,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -4376,14 +4381,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
 ]
@@ -4419,7 +4424,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -4485,6 +4490,7 @@ dependencies = [
  "leptos_meta",
  "leptos_router",
  "leptos_router_macro",
+ "prost",
  "rsecret",
  "secret-cosmwasm-std",
  "secret-toolkit-snip20",
@@ -4527,7 +4533,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -4676,9 +4682,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4687,24 +4693,23 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.47"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4715,9 +4720,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4725,22 +4730,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-streams"
@@ -4757,9 +4762,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4922,9 +4927,9 @@ dependencies = [
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.12"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
+checksum = "a08fd76779ae1883bbf1e46c2c46a75a0c4e37c445e68a24b01479d438f26ae6"
 
 [[package]]
 name = "yansi"
@@ -4952,7 +4957,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "synstructure",
 ]
 
@@ -4974,7 +4979,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -4994,7 +4999,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
  "synstructure",
 ]
 
@@ -5015,7 +5020,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -5037,5 +5042,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.91",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f41b912..68162b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ leptos_meta = { version = "0.7.0" }
 
 # gRPC
 tonic = { version = "0.12.2", default-features = false }
+prost = { version = "0.13.4" }
 
 # Web support
 console_error_panic_hook = "0.1.7"
@@ -98,9 +99,9 @@ secretrs = { git = "https://github.com/kent-3/secret-rust", branch = "sdk-upgrad
 
 # [patch."https://github.com/securesecrets/shade.git"]
 # shade-protocol = { path = "../shade/packages/shade_protocol" }
-#
-# [patch."https://github.com/kent-3/secret-clients.git"]
-# rsecret = { path = "../secret-clients/rsecret" }
+
+[patch."https://github.com/kent-3/secret-clients.git"]
+rsecret = { path = "../secret-clients/rsecret" }
 
 [patch."https://github.com/kent-3/liquidity-book.git"]
 lb-interfaces = { path = "../liquidity-book/packages/lb_interfaces" }
diff --git a/public/lb_contracts_dev.json b/public/lb_contracts_dev.json
index ad2ba68..078a380 100644
--- a/public/lb_contracts_dev.json
+++ b/public/lb_contracts_dev.json
@@ -1 +1,47 @@
-{"admin_auth":{"address":"secret1wy2zy8a6s883hyj9zartjrgltwh54d4xkg6hkw","code_hash":"99d0cf3119b5bf51cf2d97c5c0ea23a267bbbc46934c3d87f265756a55103c0f","code_id":32},"query_auth":{"address":"secret1vtvj4wkzkcgw0md09qx40rk8vaq8n0pee46uz2","code_hash":"ed32ac91e689afd6a6be6e21276df0c727803b288c4de5836bd6eab2d2cfb4d0","code_id":33},"snip20":{"address":"secret1vwrl64g3rekcmqa2vd8hkl6d67lupn8jcnh5f5","code_hash":"af74387e276be8874f07bec3a87023ee49b0e7ebe08178c49d0a49c3c98ed60e","code_id":35},"snip25":{"address":"secret16em8ptlwzm783lrme0cf4f8v7h5xkzn8aalzgm","code_hash":"9a00ca4ad505e9be7e6e6dddf8d939b7ec7e9ac8e109c8681f10db9cacb36d42","code_id":36},"lb_factory":{"address":"secret1nfkddac5l0e2k4gwk0m7hyx4qru4wlkmgdrq5d","code_hash":"91e0e3e9767ae5054e46d8d22337d8c56f2253a520366a2c09045a34cf191606","code_id":37},"lb_pair":{"address":"secret1rup2tx3hhwtv3ky9006lava9cc2p7as8ek7l88","code_hash":"6b4c948986af352d513f3604da32f613c8bac204550942ac548474d17ac3c10b","code_id":38},"lb_token":{"address":"","code_hash":"54386fc68452f78974896f5807d02b1d0203a952d5427b15a21f3bc8ee2aeb18","code_id":39},"lb_router":{"address":"","code_hash":"c4fb05ac146334275f752b20e75f2c05775d1ad0486ebaa73f2f0f641926c38e","code_id":40},"lb_staking":{"address":"","code_hash":"4e6d5a05e0364eebecc867488f96388fbc54b800799c7b4b915f0fd5c4755d02","code_id":41}}
\ No newline at end of file
+{
+  "admin_auth": {
+    "address": "secret1d5kpamqxv8unxad42c870qqyxzamtqvtu30yn5",
+    "code_hash": "99d0cf3119b5bf51cf2d97c5c0ea23a267bbbc46934c3d87f265756a55103c0f",
+    "code_id": 1
+  },
+  "query_auth": {
+    "address": "secret1g6a95raxwh8ury5nklfhhgk3v2f9060myjk04d",
+    "code_hash": "ed32ac91e689afd6a6be6e21276df0c727803b288c4de5836bd6eab2d2cfb4d0",
+    "code_id": 2
+  },
+  "snip20": {
+    "address": "secret1dppxlcxnj0pyvzsfrkuc36s9rdd3w9rzfcv40s",
+    "code_hash": "af74387e276be8874f07bec3a87023ee49b0e7ebe08178c49d0a49c3c98ed60e",
+    "code_id": 4
+  },
+  "snip25": {
+    "address": "secret1dn9wkuysmxax5gda9a6pshxaxnqwt2e23p764p",
+    "code_hash": "9a00ca4ad505e9be7e6e6dddf8d939b7ec7e9ac8e109c8681f10db9cacb36d42",
+    "code_id": 5
+  },
+  "lb_factory": {
+    "address": "secret1u5raanjhtam07qzyy5tpmesv3xw9x3223f5cdd",
+    "code_hash": "194a58d4a2948d7b5119d1b0552e35ab54b385846353396206b850904e778cc2",
+    "code_id": 6
+  },
+  "lb_pair": {
+    "address": "secret1qj7uvg473qya08kn99xvqx2dpuwj328658nypz",
+    "code_hash": "3913e96685abebc11ae75e49ab8feef02027a738d5a9b8b6acc4dbcb1761f935",
+    "code_id": 7
+  },
+  "lb_token": {
+    "address": "",
+    "code_hash": "9fb9197c1478004a73762aa9cfd4b33737a360b3b3a187ae832153aed1175d58",
+    "code_id": 8
+  },
+  "lb_router": {
+    "address": "secret1q595z8f6v5uhfptturs7vvftp4vdz4efwp8tmx",
+    "code_hash": "fa121f27a67ed4ea167d6bcd111f39c9dcd7c71ad811f00c9f2a0c214ed2f9bf",
+    "code_id": 9
+  },
+  "lb_quoter": {
+    "address": "secret16tsxhkx32pj8qxcvpj8deufpnm3mlgpc9h25h9",
+    "code_hash": "22b5eb4d88d5a27fecc1176d2768dc2171e92c107c22da56778860c8e1a64077",
+    "code_id": 10
+  }
+}
diff --git a/src/batch_query/mod.rs b/src/batch_query/mod.rs
index f706643..4ebab27 100644
--- a/src/batch_query/mod.rs
+++ b/src/batch_query/mod.rs
@@ -7,7 +7,8 @@ use tracing::{debug, info, trace};
 pub static BATCH_QUERY_ROUTER: LazyLock<ContractInfo> = LazyLock::new(|| {
     if CHAIN_ID == "secretdev-1" {
         ContractInfo {
-            address: Addr::unchecked("secret1qhvwkm7d24sj7qs52raln2qqleuz68pwr7nv7w"),
+            // FIXME: this address needs to be updated manually
+            address: Addr::unchecked("secret1rgqxfst0frq5mgmw3e5pzajpre4qwepc2uh22m"),
             code_hash: "1c7e86ba4fdb6760e70bf08a7df7f44b53eb0b23290e3e69ca96140810d4f432"
                 .to_string(),
         }
diff --git a/src/constants.rs b/src/constants.rs
index 984fba4..c5b88f1 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -24,14 +24,14 @@ pub struct Token {
 // WARN: This key is randomly generated when localsecret is started for the first time.
 // Reuse containers to avoid needing changing this every time.
 pub static DEVNET_IO_PUBKEY: [u8; 32] =
-    hex!("c74e52edac6cdffb50f876927140766fb81b1aa7ae89804a1666df84d9cf9e73");
+    hex!("c8a3ef51d2d4a285ce2a97ccf60a7372fb978e41768556ba4450ecc26247ac4b");
 
-// pub static CHAIN_ID: &str = "secretdev-1";
-// pub static GRPC_URL: &str = "http://localhost:1317";
+pub static CHAIN_ID: &str = "secretdev-1";
+pub static GRPC_URL: &str = "http://localhost:1317";
 
-pub static CHAIN_ID: &str = "pulsar-3";
+// pub static CHAIN_ID: &str = "pulsar-3";
 // pub static GRPC_URL: &str = "https://api.pulsar.scrttestnet.com";
-pub static GRPC_URL: &str = "https://grpc.testnet.secretsaturn.net";
+// pub static GRPC_URL: &str = "https://grpc.testnet.secretsaturn.net";
 
 // pub static CHAIN_ID: &str = "secret-4";
 // pub static LCD_URL: &str = "https://lcd.mainnet.secretsaturn.net";
diff --git a/src/keplr/signers.rs b/src/keplr/signers.rs
index 5fa5a8e..aa1bbed 100644
--- a/src/keplr/signers.rs
+++ b/src/keplr/signers.rs
@@ -13,22 +13,16 @@ use std::rc::Rc;
 use tracing::{debug, trace};
 use web_sys::js_sys;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct KeplrOfflineSigner {
-    inner: keplr_sys::KeplrOfflineSigner,
-}
-
-impl Clone for KeplrOfflineSigner {
-    fn clone(&self) -> Self {
-        KeplrOfflineSigner {
-            inner: self.inner.clone().into(),
-        }
-    }
+    inner: SendWrapper<Rc<keplr_sys::KeplrOfflineSigner>>,
 }
 
 impl From<keplr_sys::KeplrOfflineSigner> for KeplrOfflineSigner {
     fn from(value: keplr_sys::KeplrOfflineSigner) -> Self {
-        Self { inner: value }
+        Self {
+            inner: SendWrapper::new(Rc::new(value)),
+        }
     }
 }
 
diff --git a/src/liquidity_book/constants/addrs.rs b/src/liquidity_book/constants/addrs.rs
index e1f1a97..2524f76 100644
--- a/src/liquidity_book/constants/addrs.rs
+++ b/src/liquidity_book/constants/addrs.rs
@@ -22,7 +22,7 @@ pub struct DeployedContracts {
     pub lb_pair: DeployedContractInfo,
     pub lb_token: DeployedContractInfo,
     pub lb_router: DeployedContractInfo,
-    pub lb_staking: DeployedContractInfo,
+    pub lb_quoter: DeployedContractInfo,
 }
 
 // TODO: don't rely on this. this module should not depend on the main crate.
@@ -65,11 +65,18 @@ pub static LB_PAIR: LazyLock<Arc<ContractInfo>> = LazyLock::new(|| {
     .into()
 });
 
-// NOTE: This should not be a static value, but it is here for dev purposes.
-pub static LB_STAKING: LazyLock<Arc<ContractInfo>> = LazyLock::new(|| {
+pub static LB_ROUTER: LazyLock<Arc<ContractInfo>> = LazyLock::new(|| {
+    ContractInfo {
+        address: LB_CONTRACTS.lb_router.address.clone(),
+        code_hash: LB_CONTRACTS.lb_router.code_hash.clone(),
+    }
+    .into()
+});
+
+pub static LB_QUOTER: LazyLock<Arc<ContractInfo>> = LazyLock::new(|| {
     ContractInfo {
-        address: LB_CONTRACTS.lb_staking.address.clone(),
-        code_hash: LB_CONTRACTS.lb_staking.code_hash.clone(),
+        address: LB_CONTRACTS.lb_quoter.address.clone(),
+        code_hash: LB_CONTRACTS.lb_quoter.code_hash.clone(),
     }
     .into()
 });
diff --git a/src/routes/pool/add_liquidity.rs b/src/routes/pool/add_liquidity.rs
index b5010c5..a7d3497 100644
--- a/src/routes/pool/add_liquidity.rs
+++ b/src/routes/pool/add_liquidity.rs
@@ -3,15 +3,15 @@ use crate::{
     keplr::Keplr,
     liquidity_book::{
         constants::{
-            addrs::{LB_CONTRACTS, LB_FACTORY, LB_PAIR},
+            addrs::{LB_CONTRACTS, LB_FACTORY, LB_PAIR, LB_ROUTER},
             liquidity_config::{
                 LiquidityConfiguration, LiquidityShape, BID_ASK, CURVE, SPOT_UNIFORM, WIDE,
             },
         },
         contract_interfaces::{
             lb_factory,
-            // TODO: rename all LB* to Lb*
             lb_pair::{self, LbPair, LbPairInformation, LiquidityParameters},
+            lb_router,
         },
         utils::{get_id_from_price, get_price_from_id},
         Querier,
@@ -21,8 +21,11 @@ use crate::{
     utils::{alert, latest_block},
 };
 use cosmwasm_std::{Addr, ContractInfo, Uint128, Uint64};
-use lb_interfaces::lb_factory::{LbPairInformationResponse, QueryMsg::GetLbPairInformation};
-use lb_libraries::math::liquidity_configurations::LiquidityConfigurations;
+use lb_interfaces::lb_router::CreateLbPairResponse;
+use lb_interfaces::{
+    lb_factory::{LbPairInformationResponse, QueryMsg::GetLbPairInformation},
+    lb_router::AddLiquidityResponse,
+};
 use leptos::logging::*;
 use leptos::prelude::*;
 use leptos_router::{
@@ -30,12 +33,16 @@ use leptos_router::{
     hooks::{query_signal_with_options, use_params, use_params_map, use_query_map},
     NavigateOptions,
 };
+use prost::Message;
 use rsecret::{
     query::tendermint::TendermintQuerier,
     secret_client::CreateTxSenderOptions,
+    secret_client::TxResponse,
     tx::{compute::MsgExecuteContractRaw, ComputeServiceClient},
     TxOptions,
 };
+use secretrs::compute::MsgExecuteContractResponse;
+use secretrs::tx::Msg;
 use secretrs::AccountId;
 use send_wrapper::SendWrapper;
 use shade_protocol::swap::core::TokenType;
@@ -158,9 +165,9 @@ pub fn AddLiquidity() -> impl IntoView {
         let lb_pair_information = lb_pair_information
             .get()
             .expect("Unverified LB Pair information");
-        // FIXME: The tokens are backwards!
-        let token_x = lb_pair_information.lb_pair.token_y;
-        let token_y = lb_pair_information.lb_pair.token_x;
+        // FIXME: The tokens are not always in the expected order!
+        let token_x = lb_pair_information.lb_pair.token_x;
+        let token_y = lb_pair_information.lb_pair.token_y;
         let bin_step = lb_pair_information.bin_step;
 
         let amount_x = token_x_amount.get();
@@ -203,7 +210,6 @@ pub fn AddLiquidity() -> impl IntoView {
             token_x,
             token_y,
             bin_step,
-            // This Uint128 buisiness seems unneccesary
             amount_x: Uint128::from_str(&amount_x).unwrap(),
             amount_y: Uint128::from_str(&amount_y).unwrap(),
             amount_x_min: Uint128::from(amount_x_min),
@@ -214,6 +220,8 @@ pub fn AddLiquidity() -> impl IntoView {
             delta_ids,
             distribution_x,
             distribution_y,
+            to: "todo".to_string(),
+            refund_to: "todo".to_string(),
             deadline,
         };
 
@@ -237,7 +245,8 @@ pub fn AddLiquidity() -> impl IntoView {
 
             let key = Keplr::get_key(&chain_id).await?;
             keplr.enabled.set(true);
-            let wallet = Keplr::get_offline_signer_only_amino(&chain_id);
+            // let wallet = Keplr::get_offline_signer_only_amino(&chain_id);
+            let wallet = Keplr::get_offline_signer(&chain_id);
             let enigma_utils = Keplr::get_enigma_utils(&chain_id).into();
 
             // TODO: I guess I need to make this type use Strings instead of &'static str, because the
@@ -259,21 +268,23 @@ pub fn AddLiquidity() -> impl IntoView {
                 .await
                 .map(|block| block.header.time.unix_timestamp() as u64)
                 .map_err(Error::from)?;
+
             liquidity_parameters.deadline = (latest_block_time + 100).into();
+            liquidity_parameters.to = key.bech32_address.clone().into();
+            liquidity_parameters.refund_to = key.bech32_address.clone().into();
 
-            let lb_pair_contract = lb_pair_information.await.lb_pair.contract;
+            let lb_router_contract = &LB_ROUTER;
 
             let msg = MsgExecuteContractRaw {
                 // sender: AccountId::new("secret", &key.address)?,
                 sender: AccountId::from_str(key.bech32_address.as_ref())?,
-                contract: AccountId::from_str(lb_pair_contract.address.as_ref())?,
-                msg: lb_pair::ExecuteMsg::AddLiquidity {
+                contract: AccountId::from_str(lb_router_contract.address.as_ref())?,
+                msg: lb_router::ExecuteMsg::AddLiquidity {
                     liquidity_parameters,
                 },
                 sent_funds: vec![],
             };
 
-            debug!("{:#?}", lb_pair_information.get());
             debug!("{:#?}", msg);
 
             let tx_options = TxOptions {
@@ -282,7 +293,7 @@ pub fn AddLiquidity() -> impl IntoView {
             };
 
             let tx = compute_service_client
-                .execute_contract(msg, lb_pair_contract.code_hash, tx_options)
+                .execute_contract(msg, lb_router_contract.code_hash.clone(), tx_options)
                 .await
                 .map_err(Error::from)
                 .inspect(|tx_response| info!("{tx_response:?}"))
@@ -292,6 +303,17 @@ pub fn AddLiquidity() -> impl IntoView {
                 error!("{}", tx.raw_log);
             }
 
+            debug!("hello");
+            let data = MsgExecuteContractResponse::from_any(&tx.data[0])
+                .inspect_err(|e| error! {"{e}"})?
+                .data;
+            debug!("hello");
+            let add_liquidity_response = serde_json::from_slice::<AddLiquidityResponse>(&data)?;
+            debug!("hello");
+
+            debug!("X: {}", add_liquidity_response.amount_x_added);
+            debug!("Y: {}", add_liquidity_response.amount_y_added);
+
             Ok(())
         })
     });
diff --git a/src/routes/pool/pool_manager.rs b/src/routes/pool/pool_manager.rs
index 5d9984c..77876d7 100644
--- a/src/routes/pool/pool_manager.rs
+++ b/src/routes/pool/pool_manager.rs
@@ -13,8 +13,8 @@ use crate::{
         contract_interfaces::{
             lb_factory,
             lb_pair::{
-                ActiveIdResponse, BinResponse, LbPairInformation, NextNonEmptyBinResponse,
-                QueryMsg, TotalSupplyResponse,
+                ActiveIdResponse, BinResponse, LbPairInformation, LbTokenSupplyResponse,
+                NextNonEmptyBinResponse, QueryMsg,
             },
         },
         Querier,
@@ -201,11 +201,11 @@ pub fn PoolManager() -> impl IntoView {
     // TODO: Figure out why this number is so huge, for example:
     //       12243017097593870802128434755484640756287535340
     async fn query_total_supply(lb_pair_contract: &ContractInfo, id: u32) -> Result<String, Error> {
-        QueryMsg::TotalSupply { id }
+        QueryMsg::GetLbTokenSupply { id }
             .do_query(lb_pair_contract)
             .await
             .inspect(|response| trace!("{:?}", response))
-            .and_then(|response| Ok(serde_json::from_str::<TotalSupplyResponse>(&response)?))
+            .and_then(|response| Ok(serde_json::from_str::<LbTokenSupplyResponse>(&response)?))
             .map(|x| x.total_supply.to_string())
     }