@layerzerolabs/protocol-stellar-v2 0.2.20 → 0.2.22

package/Cargo.lock

@@ -23,15 +23,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.100"
@@ -59,6 +50,17 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bn254"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
@@ -165,15 +167,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "assert_unordered"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74323b7881323eb351134e08ee5331594826789557afef8e309baf481b2264"
-dependencies = [
- "ansi_term",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -238,6 +231,12 @@ version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "bytes-lit"
 version = "0.0.5"
@@ -330,7 +329,6 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 name = "counter"
 version = "0.0.1"
 dependencies = [
- "assert_unordered",
  "common-macros",
  "dvn",
  "dvn-fee-lib",
@@ -352,7 +350,6 @@ dependencies = [
  "treasury",
  "uln302",
  "utils",
- "worker",
 ]
 
 [[package]]
@@ -609,7 +606,6 @@ dependencies = [
  "ed25519-dalek",
  "endpoint-v2",
  "fee-lib-interfaces",
- "insta",
  "k256",
  "message-lib-common",
  "rand",
@@ -623,9 +619,9 @@ dependencies = [
 name = "dvn-fee-lib"
 version = "0.0.1"
 dependencies = [
+ "cfg-if",
  "common-macros",
  "fee-lib-interfaces",
- "message-lib-common",
  "soroban-sdk",
  "utils",
 ]
@@ -741,9 +737,11 @@ version = "0.0.1"
 dependencies = [
  "cfg-if",
  "common-macros",
+ "ed25519-dalek",
  "endpoint-v2",
  "fee-lib-interfaces",
  "message-lib-common",
+ "rand",
  "soroban-sdk",
  "utils",
  "worker",
@@ -753,6 +751,7 @@ dependencies = [
 name = "executor-fee-lib"
 version = "0.0.1"
 dependencies = [
+ "cfg-if",
  "common-macros",
  "fee-lib-interfaces",
  "message-lib-common",
@@ -769,7 +768,6 @@ dependencies = [
  "executor",
  "soroban-sdk",
  "utils",
- "worker",
 ]
 
 [[package]]
@@ -848,6 +846,15 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -869,6 +876,16 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
+[[package]]
+name = "heapless"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1062,7 +1079,6 @@ dependencies = [
 name = "layerzero-views"
 version = "0.0.1"
 dependencies = [
- "cfg-if",
  "common-macros",
  "endpoint-v2",
  "message-lib-common",
@@ -1123,7 +1139,6 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 name = "message-lib-common"
 version = "0.0.1"
 dependencies = [
- "cfg-if",
  "common-macros",
  "endpoint-v2",
  "hex-literal 1.1.0",
@@ -1196,6 +1211,8 @@ name = "oapp-macros"
 version = "0.0.1"
 dependencies = [
  "heck 0.5.0",
+ "insta",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
@@ -1227,14 +1244,11 @@ version = "0.0.1"
 dependencies = [
  "common-macros",
  "endpoint-v2",
- "insta",
  "message-lib-common",
  "oapp",
  "oapp-macros",
  "simple-message-lib",
  "soroban-sdk",
- "stellar-macros",
- "stellar-tokens",
  "utils",
 ]
 
@@ -1307,6 +1321,7 @@ dependencies = [
 name = "price-feed"
 version = "0.0.1"
 dependencies = [
+ "cfg-if",
  "common-macros",
  "fee-lib-interfaces",
  "soroban-sdk",
@@ -1636,9 +1651,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "23.0.1"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9336adeabcd6f636a4e0889c8baf494658ef5a3c4e7e227569acd2ce9091e85"
+checksum = "7192e3a5551a7aeee90d2110b11b615798e81951fd8c8293c87ea7f88b0168f5"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
@@ -1648,9 +1663,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "23.0.1"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00067f52e8bbf1abf0de03fe3e2fbb06910893cfbe9a7d9093d6425658833ff3"
+checksum = "bfc49a80a68fc1005847308e63b9fce39874de731940b1807b721d472de3ff01"
 dependencies = [
  "arbitrary",
  "crate-git-revision",
@@ -1661,15 +1676,15 @@ dependencies = [
  "soroban-env-macros",
  "soroban-wasmi",
  "static_assertions",
- "stellar-xdr",
+ "stellar-xdr 25.0.0",
  "wasmparser",
 ]
 
 [[package]]
 name = "soroban-env-guest"
-version = "23.0.1"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd1e40963517b10963a8e404348d3fe6caf9c278ac47a6effd48771297374d6"
+checksum = "ea2334ba1cfe0a170ab744d96db0b4ca86934de9ff68187ceebc09dc342def55"
 dependencies = [
  "soroban-env-common",
  "static_assertions",
@@ -1677,11 +1692,12 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-host"
-version = "23.0.1"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9766c5ad78e9d8ae10afbc076301f7d610c16407a1ebb230766dbe007a48725"
+checksum = "43af5d53c57bc2f546e122adc0b1cca6f93942c718977379aa19ddd04f06fcec"
 dependencies = [
  "ark-bls12-381",
+ "ark-bn254",
  "ark-ec",
  "ark-ff",
  "ark-serialize",
@@ -1713,24 +1729,24 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-macros"
-version = "23.0.1"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0e6a1c5844257ce96f5f54ef976035d5bd0ee6edefaf9f5e0bcb8ea4b34228c"
+checksum = "a989167512e3592d455b1e204d703cfe578a36672a77ed2f9e6f7e1bbfd9cc5c"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "serde",
  "serde_json",
- "stellar-xdr",
+ "stellar-xdr 25.0.0",
  "syn 2.0.108",
 ]
 
 [[package]]
 name = "soroban-ledger-snapshot"
-version = "23.4.0"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9c4500634698292eabdc97ec7e98b817d8c343ca7ddcf1ae25f985b0f7ee4da"
+checksum = "af1d4de49c32b4285f63a84764c57f36b32a177dfb7dad02e06d9f8cc77d6115"
 dependencies = [
  "serde",
  "serde_json",
@@ -1742,9 +1758,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk"
-version = "23.4.0"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdaa5d2d75769a5df6015b476882bdf186414c7558c241911e79d75b39b515d"
+checksum = "0ce2a038346959b8073f3fcab7d608441ccb4a963e7261053f135adbee1972f8"
 dependencies = [
  "arbitrary",
  "bytes-lit",
@@ -1760,15 +1776,15 @@ dependencies = [
  "soroban-env-host",
  "soroban-ledger-snapshot",
  "soroban-sdk-macros",
- "stellar-strkey 0.0.13",
+ "stellar-strkey 0.0.16",
  "visibility",
 ]
 
 [[package]]
 name = "soroban-sdk-macros"
-version = "23.4.0"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ed4dc6b43003c278fe8a7a80d94542232eb1b56e311dd71b73f7d646e1e7a4"
+checksum = "17eab1ea0b58aa644cd9b37818a0c5ac23f02db7cd064a6914647116ca4a5480"
 dependencies = [
  "darling 0.20.11",
  "heck 0.5.0",
@@ -1778,9 +1794,9 @@ dependencies = [
  "quote",
  "sha2 0.10.9",
  "soroban-env-common",
- "soroban-spec",
+ "soroban-spec 25.0.1",
  "soroban-spec-rust",
- "stellar-xdr",
+ "stellar-xdr 25.0.0",
  "syn 2.0.108",
 ]
 
@@ -1791,23 +1807,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c55623057d24c2a5326f519b56a756463f2aeb7ae62af0978fa0b9bab59d732d"
 dependencies = [
  "base64 0.22.1",
- "stellar-xdr",
+ "stellar-xdr 23.0.0",
+ "thiserror",
+ "wasmparser",
+]
+
+[[package]]
+name = "soroban-spec"
+version = "25.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bb240973e06456393328d0bdb3397e86bbe7369972b0a94ad13e51b55eacd65"
+dependencies = [
+ "base64 0.22.1",
+ "stellar-xdr 25.0.0",
  "thiserror",
  "wasmparser",
 ]
 
 [[package]]
 name = "soroban-spec-rust"
-version = "23.4.0"
+version = "25.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9eec1039dfb0dda4c2fb8699a6e5a1c3c5a682432bdaee5fd6a7bb90c45db0c"
+checksum = "1ce64a5ae92b7c0fe5c995ca47dccb83b12c0a60b0409f3b919b87afa41f64e2"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "soroban-spec",
- "stellar-xdr",
+ "soroban-spec 25.0.1",
+ "stellar-xdr 25.0.0",
  "syn 2.0.108",
  "thiserror",
 ]
@@ -1827,8 +1855,8 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha2 0.9.9",
- "soroban-spec",
- "stellar-xdr",
+ "soroban-spec 23.4.0",
+ "stellar-xdr 23.0.0",
  "thiserror",
 ]
 
@@ -1861,30 +1889,18 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stellar-contract-utils"
-version = "0.5.1"
-source = "git+https://github.com/OpenZeppelin/stellar-contracts.git?tag=v0.5.1#372a162a6df8aed108befa5573d30a8ca49cb271"
-dependencies = [
- "soroban-sdk",
-]
-
-[[package]]
-name = "stellar-macros"
-version = "0.5.1"
-source = "git+https://github.com/OpenZeppelin/stellar-contracts.git?tag=v0.5.1#372a162a6df8aed108befa5573d30a8ca49cb271"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "stellar-strkey"
 version = "0.0.13"
@@ -1897,28 +1913,38 @@ dependencies = [
 
 [[package]]
 name = "stellar-strkey"
-version = "0.0.14"
+version = "0.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b7f19b1c8a8b98616479c71669633456b567898aef7c5367489c982dcb58a1"
+checksum = "084afcb0d458c3d5d5baa2d294b18f881e62cc258ef539d8fdf68be7dbe45520"
 dependencies = [
  "crate-git-revision",
  "data-encoding",
+ "heapless",
 ]
 
 [[package]]
-name = "stellar-tokens"
-version = "0.5.1"
-source = "git+https://github.com/OpenZeppelin/stellar-contracts.git?tag=v0.5.1#372a162a6df8aed108befa5573d30a8ca49cb271"
+name = "stellar-xdr"
+version = "23.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89d2848e1694b0c8db81fd812bfab5ea71ee28073e09ccc45620ef3cf7a75a9b"
 dependencies = [
- "soroban-sdk",
- "stellar-contract-utils",
+ "base64 0.22.1",
+ "cfg_eval",
+ "crate-git-revision",
+ "escape-bytes",
+ "ethnum",
+ "hex",
+ "serde",
+ "serde_with",
+ "sha2 0.10.9",
+ "stellar-strkey 0.0.13",
 ]
 
 [[package]]
 name = "stellar-xdr"
-version = "23.0.0"
+version = "25.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d2848e1694b0c8db81fd812bfab5ea71ee28073e09ccc45620ef3cf7a75a9b"
+checksum = "10d20dafed80076b227d4b17c0c508a4bbc4d5e4c3d4c1de7cd42242df4b1eaf"
 dependencies = [
  "arbitrary",
  "base64 0.22.1",
@@ -2078,8 +2104,6 @@ version = "0.0.1"
 dependencies = [
  "cfg-if",
  "common-macros",
- "endpoint-v2",
- "insta",
  "message-lib-common",
  "soroban-sdk",
  "utils",
@@ -2149,7 +2173,6 @@ version = "0.0.1"
 dependencies = [
  "common-macros",
  "soroban-sdk",
- "stellar-strkey 0.0.14",
 ]
 
 [[package]]
@@ -2257,22 +2280,6 @@ dependencies = [
  "indexmap-nostd",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -2282,12 +2289,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.62.2"

package/Cargo.toml

@@ -14,32 +14,46 @@ license = "MIT"
 version = "0.0.1"
 
 [workspace.dependencies]
-soroban-sdk = {version = "23.4.0", features = ["hazmat-address", "hazmat-crypto"]}
+soroban-sdk = { version = "25.0.1", features = ["hazmat-address", "hazmat-crypto"] }
+
+# Third-party dependencies (production)
 cfg-if = { version = "1.0", default-features = false }
+heck = "0.5"
+itertools = "0.14"
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "2.0", features = ["full", "extra-traits"] }
+
+# Third-party dependencies (testing only)
+ed25519-dalek = "2"
 hex-literal = "1.0.0"
-endpoint-v2 = { path = "contracts/endpoint-v2", default-features = false }
-utils = { path = "contracts/utils" }
+insta = "1.44.3"
+k256 = "0.13"
+prettyplease = "0.2.37"
+rand = "0.8"
+sha3 = "0.10"
+trybuild = "1.0.114"
+
+# Internal workspace dependencies
 common-macros = { path = "contracts/common-macros" }
-oapp-macros = { path = "contracts/oapps/oapp-macros" }
+dvn = { path = "contracts/workers/dvn" }
+dvn-fee-lib = { path = "contracts/workers/dvn-fee-lib" }
+endpoint-v2 = { path = "contracts/endpoint-v2", default-features = false }
+executor = { path = "contracts/workers/executor" }
+executor-fee-lib = { path = "contracts/workers/executor-fee-lib" }
+executor-helper = { path = "contracts/workers/executor-helper" }
+fee-lib-interfaces = { path = "contracts/workers/fee-lib-interfaces" }
 message-lib-common = { path = "contracts/message-libs/message-lib-common" }
-uln302 = { path = "contracts/message-libs/uln-302", default-features = false }
 oapp = { path = "contracts/oapps/oapp" }
+oapp-macros = { path = "contracts/oapps/oapp-macros" }
+oft = { path = "contracts/oapps/oft" }
+oft-core = { path = "contracts/oapps/oft-core" }
+price-feed = { path = "contracts/workers/price-feed" }
 simple-message-lib = { path = "contracts/message-libs/simple-message-lib" }
 treasury = { path = "contracts/message-libs/treasury" }
-fee-lib-interfaces = { path = "contracts/workers/fee-lib-interfaces" }
+uln302 = { path = "contracts/message-libs/uln-302", default-features = false }
+utils = { path = "contracts/utils" }
 worker = { path = "contracts/workers/worker" }
-executor = { path = "contracts/workers/executor" }
-executor-helper = { path = "contracts/workers/executor-helper" }
-executor-fee-lib = { path = "contracts/workers/executor-fee-lib" }
-dvn = { path = "contracts/workers/dvn" }
-dvn-fee-lib = { path = "contracts/workers/dvn-fee-lib" }
-price-feed = { path = "contracts/workers/price-feed" }
-oft-core = { path = "contracts/oapps/oft-core" }
-oft = { path = "contracts/oapps/oft" }
-stellar-macros = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }
-stellar-tokens = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }
-stellar-contract-utils = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }
-insta = "1.44.3"
 
 # Fast dev builds for testing
 [profile.dev]

package/contracts/common-macros/Cargo.toml

@@ -9,12 +9,12 @@ publish = false
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = { version = "2.0", features = ["full", "extra-traits"] }
-heck = "0.5"
-itertools = "0.14"
-prettyplease = "0.2.37"
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true }
+heck = { workspace = true }
+itertools = { workspace = true }
 
 [dev-dependencies]
-insta = { workspace = true }
+insta = { workspace = true }
+prettyplease = { workspace = true }

package/contracts/common-macros/src/auth.rs

@@ -22,35 +22,23 @@ use syn::{parse_quote, ItemFn, ItemStruct};
 pub fn generate_ownable_impl(input: TokenStream) -> TokenStream {
     let item_struct: ItemStruct = syn::parse2(input).unwrap_or_else(|e| panic!("failed to parse struct: {}", e));
     let name = &item_struct.ident;
-    let impl_mod = utils::impl_mod_ident(name, "ownable");
 
     quote! {
         #item_struct
 
-        use utils::{auth::Auth as _, ownable::{Ownable as _, OwnableInitializer as _}};
-
-        #[doc(hidden)]
-        mod #impl_mod {
-            use super::*;
-            use utils::{
-                auth::Auth,
-                errors::OwnableError,
-                option_ext::OptionExt as _,
-                ownable::{Ownable, OwnableInitializer},
-            };
-
-            impl OwnableInitializer for #name {}
-
-            #[common_macros::contract_impl]
-            impl Auth for #name {
-                fn authorizer(env: &soroban_sdk::Env) -> soroban_sdk::Address {
-                    <Self as Ownable>::owner(env).unwrap_or_panic(env, OwnableError::OwnerNotSet)
-                }
-            }
+        use utils::{auth::Auth as _, option_ext::OptionExt as _, ownable::{Ownable as _, OwnableInitializer as _}};
+
+        impl utils::ownable::OwnableInitializer for #name {}
 
-            #[common_macros::contract_impl(contracttrait)]
-            impl Ownable for #name {}
+        #[common_macros::contract_impl]
+        impl utils::auth::Auth for #name {
+            fn authorizer(env: &soroban_sdk::Env) -> soroban_sdk::Address {
+                <Self as utils::ownable::Ownable>::owner(env).unwrap_or_panic(env, utils::errors::OwnableError::OwnerNotSet)
+            }
         }
+
+        #[common_macros::contract_impl(contracttrait)]
+        impl utils::ownable::Ownable for #name {}
     }
 }
 
@@ -66,28 +54,21 @@ pub fn generate_ownable_impl(input: TokenStream) -> TokenStream {
 pub fn generate_multisig_impl(input: TokenStream) -> TokenStream {
     let item_struct: ItemStruct = syn::parse2(input).unwrap_or_else(|e| panic!("failed to parse struct: {}", e));
     let name = &item_struct.ident;
-    let impl_mod = utils::impl_mod_ident(name, "multisig");
 
     quote! {
         #item_struct
 
         use utils::{auth::Auth as _, multisig::Multisig as _};
 
-        #[doc(hidden)]
-        mod #impl_mod {
-            use super::*;
-            use utils::{auth::Auth, multisig::Multisig};
-
-            #[common_macros::contract_impl]
-            impl Auth for #name {
-                fn authorizer(env: &soroban_sdk::Env) -> soroban_sdk::Address {
-                    env.current_contract_address()
-                }
+        #[common_macros::contract_impl]
+        impl utils::auth::Auth for #name {
+            fn authorizer(env: &soroban_sdk::Env) -> soroban_sdk::Address {
+                env.current_contract_address()
             }
-
-            #[common_macros::contract_impl(contracttrait)]
-            impl Multisig for #name {}
         }
+
+        #[common_macros::contract_impl(contracttrait)]
+        impl utils::multisig::Multisig for #name {}
     }
 }