diff --git a/.cargo/config.toml b/.cargo/config.toml index ffe93273..bb42f7a5 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -30,69 +30,69 @@ jmt = { git = "https://github.com/penumbra-zone/jmt. [patch.crates-io.sov-modules-api] # path = "vendor/sovereign-sdk/module-system/sov-modules-api" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-state] # path = "vendor/sovereign-sdk/module-system/sov-state" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-bank] # path = "vendor/sovereign-sdk/module-system/module-implementations/sov-bank" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-sequencer-registry] # path = "vendor/sovereign-sdk/module-system/module-implementations/sov-sequencer-registry" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-db] # path = "vendor/sovereign-sdk/full-node/sov-db" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-rollup-interface] # path = "vendor/sovereign-sdk/rollup-interface" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-mock-zkvm] # path = "vendor/sovereign-sdk/adapters/mock-zkvm" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-prover-storage-manager] # path = "vendor/sovereign-sdk/full-node/sov-prover-storage-manager" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-kernels] # path = "vendor/sovereign-sdk/module-system/sov-kernels" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-modules-core] # path = "vendor/sovereign-sdk/module-system/sov-modules-core" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-celestia-adapter] # path = "vendor/sovereign-sdk/adapters/celestia" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-mock-da] # path = "vendor/sovereign-sdk/adapters/mock-da" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.const-rollup-config] # path = "vendor/sovereign-sdk/examples/const-rollup-config" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [patch.crates-io.sov-chain-state] # path = "vendor/sovereign-sdk/module-system/module-implementations/sov-chain-state" git = "ssh://git@github.com/informalsystems/sovereign-sdk-wip.git" -rev = "63fa5f11" +rev = "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" diff --git a/.gitignore b/.gitignore index b608ff59..2c0aa13d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ demo_data/ /ci/**/*.lock -result \ No newline at end of file +result + +.vscode diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 419935d5..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "rust-analyzer.linkedProjects": [ - "./clients/sov-celestia/cw-contract/Cargo.toml", - "./ci/risc0-check/methods/guest/Cargo.toml", - "./ci/risc0-check/host/Cargo.toml", - ], -} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4a29af54..4ef6430d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,47 +79,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -127,9 +128,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "argh" @@ -150,7 +151,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -219,7 +220,7 @@ dependencies = [ "ark-serialize 0.3.0", "ark-std 0.3.0", "derivative", - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-traits", "paste", "rustc_version 0.3.3", @@ -239,7 +240,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-traits", "paste", "rustc_version 0.4.0", @@ -272,7 +273,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-traits", "quote", "syn 1.0.109", @@ -284,7 +285,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-traits", "proc-macro2", "quote", @@ -350,7 +351,7 @@ dependencies = [ "ark-serialize-derive", "ark-std 0.4.0", "digest 0.10.7", - "num-bigint 0.4.4", + "num-bigint 0.4.5", ] [[package]] @@ -436,7 +437,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -447,7 +448,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -458,14 +459,14 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "autotools" @@ -707,7 +708,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -928,7 +929,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -959,9 +960,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", @@ -1089,7 +1090,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1100,15 +1101,15 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clru" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" +checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "console_error_panic_hook" @@ -1129,7 +1130,7 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-rollup-config" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" [[package]] name = "const_format" @@ -1536,7 +1537,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1572,7 +1573,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1583,7 +1584,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1715,7 +1716,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1907,7 +1908,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1928,7 +1929,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -2056,9 +2057,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2157,7 +2158,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -2222,9 +2223,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -2352,7 +2353,7 @@ dependencies = [ "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] @@ -2970,7 +2971,7 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=d5e3887770#d5e3887770d357 dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3179,6 +3180,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -3277,7 +3284,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", "url", "webpki-roots", @@ -3360,7 +3367,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower", "tracing", ] @@ -3446,7 +3453,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3469,9 +3476,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -3778,11 +3785,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3815,7 +3821,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3829,9 +3835,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3939,9 +3945,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "peeking_take_while" @@ -3984,9 +3990,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -4020,7 +4026,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4063,14 +4069,24 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettier-please" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be31b7957122175fcf33c6d8f54489a5262176020bf096026a86b308b7fa5b23" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4139,18 +4155,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -4219,7 +4235,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.60", + "syn 2.0.61", "tempfile", ] @@ -4233,7 +4249,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4708,7 +4724,7 @@ dependencies = [ "hex", "human-repr", "lazy-regex", - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-derive 0.4.2", "num-traits", "prost", @@ -4723,7 +4739,7 @@ dependencies = [ "risc0-zkvm-platform", "rrs-lib", "rustc-demangle", - "semver 1.0.22", + "semver 1.0.23", "serde", "sha2 0.10.8", "tempfile", @@ -4835,7 +4851,7 @@ dependencies = [ "ark-ff 0.4.2", "bytes", "fastrlp", - "num-bigint 0.4.4", + "num-bigint 0.4.5", "num-traits", "parity-scale-codec", "primitive-types", @@ -4856,9 +4872,9 @@ checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4887,7 +4903,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -4948,9 +4964,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rusty-fork" @@ -4977,9 +4993,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -5025,9 +5041,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" +checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" dependencies = [ "dyn-clone", "schemars_derive", @@ -5037,14 +5053,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" +checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -5091,11 +5107,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -5104,9 +5120,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -5114,9 +5130,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" @@ -5129,9 +5145,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" @@ -5150,9 +5166,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -5206,13 +5222,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -5223,7 +5239,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -5245,7 +5261,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -5422,7 +5438,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bech32 0.11.0", @@ -5441,7 +5457,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bincode", @@ -5462,7 +5478,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "async-trait", @@ -5544,7 +5560,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "borsh", @@ -5601,7 +5617,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "async-trait", @@ -5673,6 +5689,7 @@ dependencies = [ "sov-ibc", "sov-ibc-transfer", "sov-kernels", + "sov-mock-da", "sov-mock-zkvm", "sov-modules-api", "sov-prover-storage-manager", @@ -5738,7 +5755,7 @@ dependencies = [ [[package]] name = "sov-kernels" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "sov-blob-storage", @@ -5751,7 +5768,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "async-trait", @@ -5759,7 +5776,9 @@ dependencies = [ "bytes", "futures", "hex", + "schemars", "serde", + "serde_json", "sha2 0.10.8", "sov-rollup-interface", "tokio", @@ -5769,7 +5788,7 @@ dependencies = [ [[package]] name = "sov-mock-zkvm" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bincode", @@ -5787,7 +5806,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bech32 0.11.0", @@ -5812,7 +5831,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "async-trait", @@ -5826,6 +5845,7 @@ dependencies = [ "proptest", "schemars", "serde", + "serde_json", "sha2 0.10.8", "sov-db", "sov-rollup-interface", @@ -5835,13 +5855,15 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bech32 0.11.0", + "blake2", "borsh", "hex", "jsonrpsee", + "prettier-please", "proc-macro2", "quote", "schemars", @@ -5852,7 +5874,7 @@ dependencies = [ [[package]] name = "sov-prover-storage-manager" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "rockbound", @@ -5865,7 +5887,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "async-trait", @@ -5887,7 +5909,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "borsh", @@ -5901,12 +5923,13 @@ dependencies = [ "sov-modules-api", "sov-state", "thiserror", + "tracing", ] [[package]] name = "sov-state" version = "0.3.0" -source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=63fa5f11#63fa5f110ebb323100ff740e6b152ba42a6ae84c" +source = "git+ssh://git@github.com/informalsystems/sovereign-sdk-wip.git?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9#50a866c0dccf974c035cbaf3ca289b0e4a29fcc9" dependencies = [ "anyhow", "bcs", @@ -5992,9 +6015,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -6201,7 +6224,7 @@ dependencies = [ "pin-project", "rand", "reqwest", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_bytes", "serde_json", @@ -6247,9 +6270,9 @@ dependencies = [ [[package]] name = "test-log" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ "test-log-macros", "tracing-subscriber 0.3.18", @@ -6257,33 +6280,33 @@ dependencies = [ [[package]] name = "test-log-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f546451eaa38373f549093fe9fd05e7d2bade739e2ddf834b9968621d60107" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6375,7 +6398,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6415,9 +6438,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -6425,7 +6448,6 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -6479,7 +6501,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow 0.6.8", ] [[package]] @@ -6519,7 +6541,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6550,7 +6572,7 @@ dependencies = [ "rand", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-layer", "tower-service", "tracing", @@ -6607,7 +6629,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6691,7 +6713,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6721,7 +6743,7 @@ checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -6883,7 +6905,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", "wasm-bindgen-shared", ] @@ -6940,7 +6962,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6973,7 +6995,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -7387,9 +7409,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -7415,22 +7437,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -7450,7 +7472,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] diff --git a/flake.lock b/flake.lock index ec16193d..982ff02f 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714356894, - "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", + "lastModified": 1715048276, + "narHash": "sha256-SqWSTvCjNBBnV/WIQdaxVi5V9H3VJ7cOJAxPQdR1TBY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", + "rev": "b037d65c988421b54024e62691eace4f2fe623bc", "type": "github" }, "original": { @@ -98,16 +98,16 @@ "sovereign-sdk-src": { "flake": false, "locked": { - "lastModified": 1714386414, - "narHash": "sha256-Kuqyak82tSkhljNcjcch1rx2PwlfRf9+dhDEansvR58=", + "lastModified": 1715076804, + "narHash": "sha256-Fq7aqO0imLbech5BthxSDU6AmWRKjH/4Zpom9knIEeM=", "ref": "refs/heads/nightly", - "rev": "63fa5f110ebb323100ff740e6b152ba42a6ae84c", - "revCount": 977, + "rev": "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9", + "revCount": 997, "type": "git", "url": "ssh://git@github.com/informalsystems/sovereign-sdk-wip" }, "original": { - "rev": "63fa5f110ebb323100ff740e6b152ba42a6ae84c", + "rev": "50a866c0dccf974c035cbaf3ca289b0e4a29fcc9", "type": "git", "url": "ssh://git@github.com/informalsystems/sovereign-sdk-wip" } diff --git a/flake.nix b/flake.nix index 477c936e..a94d00c4 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ sovereign-sdk-src = { flake = false; - url = git+ssh://git@github.com/informalsystems/sovereign-sdk-wip?rev=63fa5f110ebb323100ff740e6b152ba42a6ae84c; + url = git+ssh://git@github.com/informalsystems/sovereign-sdk-wip?rev=50a866c0dccf974c035cbaf3ca289b0e4a29fcc9; }; }; diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml index 38a0214a..78bd4408 100644 --- a/mocks/Cargo.toml +++ b/mocks/Cargo.toml @@ -59,6 +59,7 @@ const-rollup-config = { workspace = true, optional = true } sov-kernels = { workspace = true, features = ["native"], optional = true } sov-mock-zkvm = { workspace = true, features = ["native"], optional = true } sov-prover-storage-manager = { workspace = true, features = ["test-utils"] } +sov-mock-da = { workspace = true, features = ["native"], optional = true } [dev-dependencies] test-log = { version = "0.2.14", default-features = false, features = ["trace"] } @@ -76,6 +77,7 @@ native = [ "sov-rollup-interface/native", "sov-mock-zkvm", "sov-kernels", + "sov-mock-da", ] mock-da = [ "native", diff --git a/mocks/src/configs.rs b/mocks/src/configs.rs index f2b82287..b2e52c45 100644 --- a/mocks/src/configs.rs +++ b/mocks/src/configs.rs @@ -13,7 +13,7 @@ use sov_consensus_state_tracker::CelestiaService; use sov_consensus_state_tracker::MockDaService; use sov_kernels::basic::BasicKernelGenesisConfig; use sov_mock_zkvm::MockZkVerifier; -use sov_modules_api::{Address, Spec}; +use sov_modules_api::Spec; use sov_rollup_interface::services::da::DaService; use typed_builder::TypedBuilder; @@ -109,7 +109,7 @@ pub struct TransferTestConfig { #[builder(default = GAS_TOKEN_ID.to_bech32().to_string())] pub sov_denom: String, /// An arbitrary user address on the rollup. - pub sov_address: Address, + pub sov_address: ::Address, /// The token name on the Cosmos chain. #[builder(default = "basecoin".to_string())] pub cos_denom: String, diff --git a/mocks/src/relayer/builder.rs b/mocks/src/relayer/builder.rs index 11058f70..38ee0b29 100644 --- a/mocks/src/relayer/builder.rs +++ b/mocks/src/relayer/builder.rs @@ -7,6 +7,7 @@ use sov_consensus_state_tracker::CelestiaService; use sov_consensus_state_tracker::HasConsensusState; #[cfg(feature = "mock-da")] use sov_consensus_state_tracker::MockDaService; +use sov_mock_da::MockFee; use sov_modules_api::{Context, Spec, WorkingSet}; use sov_prover_storage_manager::new_orphan_storage; use sov_rollup_interface::services::da::DaService; @@ -75,7 +76,7 @@ where pub async fn setup

(self) -> DefaultRelayer where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/relayer/handle/rollup.rs b/mocks/src/relayer/handle/rollup.rs index 159b5319..05f7b141 100644 --- a/mocks/src/relayer/handle/rollup.rs +++ b/mocks/src/relayer/handle/rollup.rs @@ -7,6 +7,7 @@ use ibc_core::host::ValidationContext; use ibc_query::core::channel::QueryPacketCommitmentRequest; use ibc_query::core::client::{QueryClientStateRequest, QueryConsensusStateRequest}; use sov_consensus_state_tracker::HasConsensusState; +use sov_mock_da::MockFee; use sov_modules_api::{Spec, WorkingSet}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage}; @@ -20,7 +21,7 @@ use crate::utils::{wait_for_block, MutexUtil}; impl Handle for MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, ::Spec: Clone, P: MerkleProofSpec + Clone + 'static, diff --git a/mocks/src/sovereign/manual.rs b/mocks/src/sovereign/manual.rs index 8034d974..323b54eb 100644 --- a/mocks/src/sovereign/manual.rs +++ b/mocks/src/sovereign/manual.rs @@ -21,6 +21,7 @@ use ibc_core::host::types::path::{ use ibc_core::host::{ExecutionContext, ValidationContext}; use sov_consensus_state_tracker::HasConsensusState; use sov_ibc::context::IbcContext; +use sov_mock_da::MockFee; use sov_modules_api::{Spec, StateCheckpoint}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage}; @@ -31,7 +32,7 @@ use crate::cosmos::{dummy_tm_client_state, dummy_tm_consensus_state}; impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/sovereign/rollup.rs b/mocks/src/sovereign/rollup.rs index 4e95a7e6..cc215f4c 100644 --- a/mocks/src/sovereign/rollup.rs +++ b/mocks/src/sovereign/rollup.rs @@ -14,6 +14,7 @@ use sov_consensus_state_tracker::{ConsensusStateTracker, HasConsensusState}; use sov_ibc::call::CallMessage as IbcCallMessage; use sov_ibc::context::IbcContext; use sov_kernels::basic::BasicKernel; +use sov_mock_da::MockFee; use sov_modules_api::{Context, Spec, WorkingSet}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage, Storage}; @@ -30,7 +31,7 @@ type Mempool = Vec>; pub struct MockRollup where S: Spec, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec, { @@ -47,7 +48,7 @@ where impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/sovereign/runner.rs b/mocks/src/sovereign/runner.rs index 0bf6c123..61b32144 100644 --- a/mocks/src/sovereign/runner.rs +++ b/mocks/src/sovereign/runner.rs @@ -2,6 +2,7 @@ use std::time::Duration; use sov_consensus_state_tracker::HasConsensusState; +use sov_mock_da::MockFee; use sov_modules_api::runtime::capabilities::{Kernel, KernelSlotHooks}; use sov_modules_api::{ CallResponse, DispatchCall, Gas, GasMeter, Genesis, KernelWorkingSet, SlotData, Spec, @@ -21,7 +22,7 @@ use crate::utils::{wait_for_block, MutexUtil}; impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, @@ -59,7 +60,10 @@ where let height = loop { self.da_core.grow_blocks(pre_state_root.as_ref().to_vec()); // Dummy transaction to trigger the block generation - self.da_service().send_transaction(&[0; 32]).await.unwrap(); + self.da_service() + .send_transaction(&[0; 32], MockFee::zero()) + .await + .unwrap(); tokio::time::sleep(Duration::from_millis(100)).await; match self.da_service().get_last_finalized_block_header().await { Ok(header) => { diff --git a/mocks/src/sovereign/runtime/config.rs b/mocks/src/sovereign/runtime/config.rs index d064638c..62e3f10e 100644 --- a/mocks/src/sovereign/runtime/config.rs +++ b/mocks/src/sovereign/runtime/config.rs @@ -5,8 +5,7 @@ use sov_bank::{BankConfig, GasTokenConfig}; use sov_chain_state::ChainStateConfig; use sov_ibc::ExampleModuleConfig; use sov_ibc_transfer::TransferConfig; -use sov_modules_api::utils::generate_address as gen_address_generic; -use sov_modules_api::{Spec, Zkvm}; +use sov_modules_api::{CryptoSpec, PrivateKey, Spec, Zkvm}; use sov_rollup_interface::da::Time; use sov_rollup_interface::zk::CodeCommitment; @@ -143,9 +142,11 @@ pub fn create_chain_state_config() -> ChainStateConfig { /// Creates a bank configuration with the given number of addresses and initial balance pub fn create_bank_config(addresses_count: u64, initial_balance: u64) -> BankConfig { let address_and_balances: Vec<_> = (0..addresses_count) - .map(|i| { - let key = format!("key_{i}"); - let addr = gen_address_generic::(&key); + .map(|_i| { + // FIXME(rano): use a deterministic `generate` method with format!("key_{i}"). + // let addr = gen_address_generic::(&key); + let private_key = <::PrivateKey as PrivateKey>::generate(); + let addr = (&private_key.pub_key()).into(); (addr, initial_balance) }) .collect(); diff --git a/mocks/src/sovereign/runtime/mod.rs b/mocks/src/sovereign/runtime/mod.rs index 08a2e984..7f185860 100644 --- a/mocks/src/sovereign/runtime/mod.rs +++ b/mocks/src/sovereign/runtime/mod.rs @@ -4,10 +4,9 @@ pub use config::*; use sov_bank::Bank; use sov_ibc::Ibc; use sov_ibc_transfer::IbcTransfer; -use sov_modules_api::macros::DefaultRuntime; use sov_modules_api::{DispatchCall, Genesis, MessageCodec, Spec}; -#[derive(Genesis, DispatchCall, MessageCodec, DefaultRuntime, Clone)] +#[derive(Genesis, DispatchCall, MessageCodec, Default, Clone)] #[serialization(serde::Serialize, serde::Deserialize)] #[serialization(borsh::BorshDeserialize, borsh::BorshSerialize)] pub struct Runtime diff --git a/modules/sov-ibc-transfer/src/context.rs b/modules/sov-ibc-transfer/src/context.rs index 279f7e66..ce2837ca 100644 --- a/modules/sov-ibc-transfer/src/context.rs +++ b/modules/sov-ibc-transfer/src/context.rs @@ -23,11 +23,11 @@ use ibc_core::primitives::Signer; use ibc_core::router::module::Module; use ibc_core::router::types::module::ModuleExtras; use sov_bank::{Coins, IntoPayable, Payable, TokenId}; -use sov_modules_api::{Context, Spec, WorkingSet}; +use sov_modules_api::{Context, ModuleId, Spec, WorkingSet}; use uint::FromDecStrErr; use super::IbcTransfer; -use crate::utils::{compute_escrow_address, compute_module_address}; +use crate::utils::compute_escrow_address; /// Using a different salt will result in a different token address. Since /// ICS-20 tokens coming from other chains are guaranteed to have unique names, @@ -137,7 +137,7 @@ impl<'ws, S: Spec> IbcTransferContext<'ws, S> { /// Obtains the escrow address for a given port and channel pair by looking /// up the cache. If the cache does not contain the address, it is computed /// and stored in the cache. - fn obtain_escrow_address(&self, port_id: &PortId, channel_id: &ChannelId) -> S::Address { + fn obtain_escrow_address(&self, port_id: &PortId, channel_id: &ChannelId) -> ModuleId { let mut working_set = self.working_set.borrow_mut(); self.ibc_transfer @@ -160,7 +160,7 @@ impl<'ws, S: Spec> IbcTransferContext<'ws, S> { fn validate_balance( &self, token_id: TokenId, - address: &S::Address, + address: impl Payable, amount: Amount, ) -> Result { let sender_balance: u64 = self @@ -197,15 +197,8 @@ impl<'ws, S: Spec> IbcTransferContext<'ws, S> { fn create_token( &self, token_name: String, - minter_address: &S::Address, + minter_address: impl Payable, ) -> Result { - // Make sure to use `ibc_transfer` address as the sender - let context = Context::new( - compute_module_address::(self.ibc_transfer.id.as_bytes()), - self.sdk_context.sequencer().clone(), - self.sdk_context.visible_slot_number(), - ); - let new_token_id = self .ibc_transfer .bank @@ -213,9 +206,9 @@ impl<'ws, S: Spec> IbcTransferContext<'ws, S> { token_name.clone(), SALT, 0, - minter_address.as_token_holder(), + minter_address, vec![self.ibc_transfer.id.to_payable()], - &context, + self.ibc_transfer.id.to_payable(), &mut self.working_set.borrow_mut(), ) .map_err(|err| TokenTransferError::Other(err.to_string()))?; @@ -229,8 +222,8 @@ impl<'ws, S: Spec> IbcTransferContext<'ws, S> { fn transfer( &self, token_id: TokenId, - from_account: &S::Address, - to_account: &S::Address, + from_account: impl Payable, + to_account: impl Payable, amount: &Amount, ) -> Result<(), TokenTransferError> { let amount: sov_bank::Amount = (*amount.as_ref()) @@ -363,7 +356,7 @@ where let escrow_address = self.obtain_escrow_address(port_id, channel_id); - self.validate_balance(token_id, &escrow_address, coin.amount)?; + self.validate_balance(token_id, escrow_address.to_payable(), coin.amount)?; Ok(()) } @@ -457,7 +450,7 @@ impl<'ws, S: Spec> TokenTransferExecutionContext for IbcTransferContext<'ws, S> self.transfer( token_id, &from_account.address, - &escrow_account, + escrow_account.to_payable(), &coin.amount, )?; @@ -483,7 +476,12 @@ impl<'ws, S: Spec> TokenTransferExecutionContext for IbcTransferContext<'ws, S> let escrow_account = self.obtain_escrow_address(port_id, channel_id); // transfer coins out of escrow account to `to_account` - self.transfer(token_id, &escrow_account, &to_account.address, &coin.amount)?; + self.transfer( + token_id, + escrow_account.to_payable(), + &to_account.address, + &coin.amount, + )?; Ok(()) } diff --git a/modules/sov-ibc-transfer/src/lib.rs b/modules/sov-ibc-transfer/src/lib.rs index 1373118e..dea3618e 100644 --- a/modules/sov-ibc-transfer/src/lib.rs +++ b/modules/sov-ibc-transfer/src/lib.rs @@ -46,7 +46,7 @@ pub struct IbcTransfer { /// channel pair, offering an efficient means to access these addresses /// without the need for recomputation during every packet processing. #[state] - escrow_address_cache: StateMap<(PortId, ChannelId), S::Address>, + escrow_address_cache: StateMap<(PortId, ChannelId), ModuleId>, } impl Module for IbcTransfer { diff --git a/modules/sov-ibc-transfer/src/utils.rs b/modules/sov-ibc-transfer/src/utils.rs index a070201e..267d5b42 100644 --- a/modules/sov-ibc-transfer/src/utils.rs +++ b/modules/sov-ibc-transfer/src/utils.rs @@ -1,13 +1,13 @@ use ibc_app_transfer::types::VERSION; use ibc_core::host::types::identifiers::{ChannelId, PortId}; use sov_modules_api::digest::Digest; -use sov_modules_api::{CryptoSpec, Spec}; +use sov_modules_api::{CryptoSpec, ModuleId, Spec}; /// The escrow address follows the format as outlined in Cosmos SDK's ADR 028: /// /// except that the `Hasher` function mandated by the `CryptoSpec` trait in the /// rollup implementation. -pub fn compute_escrow_address(port_id: &PortId, channel_id: &ChannelId) -> S::Address { +pub fn compute_escrow_address(port_id: &PortId, channel_id: &ChannelId) -> ModuleId { let escrow_account_bytes: [u8; 32] = { let mut hasher = ::Hasher::new(); hasher.update(VERSION); @@ -20,20 +20,3 @@ pub fn compute_escrow_address(port_id: &PortId, channel_id: &ChannelId) escrow_account_bytes.into() } - -pub fn compute_module_address(module_id_bytes: &[u8]) -> S::Address { - let escrow_account_bytes: [u8; 32] = { - let mut hasher = ::Hasher::new(); - hasher.update(b"module"); - hasher.update([0]); - hasher.update(module_id_bytes); - hasher.update([0]); - hasher.update(VERSION); - hasher.update([0]); - - let hash = hasher.finalize(); - *hash.as_ref() - }; - - escrow_account_bytes.into() -}