diff --git a/Cargo.lock b/Cargo.lock index 20fe15a0..a88c92b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,9 +424,9 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94034ab4bf5d565ec6a57bb71033d68d98cb5c8581d7cdd548a9891b95c82ea" +checksum = "e5000c077cf07dc8128e5892a6dc1e01bac29a13efa7419b02a7021d61e41d3e" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e5bf435c72ae99a0a69a8ab551f3258192177a1715d29f34aae2afe83bbea9" +checksum = "3a5500a99c76c6d756aceb74c66475871d4a997b1538802e8736d5b9323dd015" dependencies = [ "ckb-logger", "ckb-spawn", @@ -463,15 +463,15 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f676ddce37812148df8a188ac0c04b508812ba56afdf310d7999e5a68f91973" +checksum = "eca18f6c998bac413cdc07481257d96e00c38a5bec48b492559dc58381644480" [[package]] name = "ckb-chain" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1837515d179e6a48ab9c715f03f20d52a9614aa4774527230172917b8353e054" +checksum = "32926b076ffba7461d53694de2ce14cd9b024ee4a6f068e75b1e43fe4e3bcfec" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -503,9 +503,9 @@ dependencies = [ [[package]] name = "ckb-chain-spec" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e8e0a043138e2dadf851d7c7c3377846951a9f35e28de0d27b1810fe759a70" +checksum = "09a05c9a585f23869ad2394d006a42fb6746de499d91a2d5e302139ada37578d" dependencies = [ "cacache", "ckb-constant", @@ -526,24 +526,27 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdf3f5242842f1735bfa1e38755f679ac071b2b451e0e8b87b9a80bf6147767" +checksum = "c2fd0ddde8f1b686e5b484cb0e1eb7cb1151f54665f28ae610b75cc4309caf84" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f4de41ddef453148c70bde26afc1cc26d2e22143e08555d7865e9cb0f523b1" +checksum = "59fd9af8f095f8b3466c3e4fc0263b4081e36e210e0064ea7eb77977a3b6744d" +dependencies = [ + "phf 0.12.1", +] [[package]] name = "ckb-crypto" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05df423a624b1d082ca0820c355d10b8855bb9699bf05154d613bf6693dbc1b7" +checksum = "ab6e4dda4c1ffbc459cc42b0d4588ca043ee1194b7c915e1c013dd9f54b51f1d" dependencies = [ "ckb-fixed-hash", "faster-hex", @@ -554,9 +557,9 @@ dependencies = [ [[package]] name = "ckb-dao" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d534da0d312cf36dfa097adb59f06959349686787d3ce4be6d74afa630752c" +checksum = "524892e4e57bef71856536e98acc973d4241c3e7aaf47443d2cd6063a9d5f584" dependencies = [ "byteorder", "ckb-chain-spec", @@ -567,9 +570,9 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75356f7744ea9c0012a1eb48a46e37b23beeaa59e575defc4dab59a27506d1b7" +checksum = "fa5f159facde270f3885407358dad02cc998877937ee89a3bd8cc4875807ea97" dependencies = [ "byteorder", "ckb-error", @@ -578,9 +581,9 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2271c7c24dd01d32a0fc99e25144710c791a2e7c8bafab8eeb98b572af5fb9a7" +checksum = "9eded35bd969838ae39bfdc4945212a2087b75ac33128ec42dd733d6c38d209c" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -592,9 +595,9 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba09fcfc49c5a999d1d16cefd17e074b223f8cef7ff86dbef19898a97c59e160" +checksum = "a646a3801da64026901928848684507dc4ac3fd43aebc6900ac6cb654a70e0f7" dependencies = [ "ckb-channel", "ckb-db", @@ -608,15 +611,15 @@ dependencies = [ [[package]] name = "ckb-db-schema" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60bd06462bff51a28d11a261fb6606dc00cddd0a880aff57fc185448bfc866bc" +checksum = "ddc558bd48064ccf256c9d94e5bb506f205b40c45fc593ece179bf7ba40b0c8f" [[package]] name = "ckb-error" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44f328a850d94e1d7a8843b7107fa245a083bcb263f5eb7da2e8892daa766c6" +checksum = "de47e9a184320eeacfe882c7d3080148a850448f4f1be33e2e3e4702d3a58499" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -626,9 +629,9 @@ dependencies = [ [[package]] name = "ckb-fee-estimator" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe3f7142ca8d71e21d91b06b4df903f1faf7010377d9bc15dea6b05301b9e84" +checksum = "b43845e200b7259b51e6ec4175507a326573a075fc5cbfd1a3268756a37d96e9" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -639,9 +642,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41ef9f1e9495ffa6cdc9694b7f438b0af360b958b543112c2d96b01ce3ca6f9" +checksum = "213d1978797e12679bd3f8fc6743319037f5a9e78b198df0f697ee1dd8637c2c" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -649,9 +652,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5338f04fcdd0b217203c43d05af4b5cc2971ce4f1ecb0df2162e06aa3779def" +checksum = "215c8367d8f8206f47bd77edfbed05ecb8053879b11548dff044739af3ad611c" dependencies = [ "ckb_schemars", "faster-hex", @@ -661,9 +664,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de2b2aeebd799da3170220c88dffc3f50257e657d276d59ffe38f533de26459" +checksum = "24c0410093f4c0c067b5f8d8f99db0bbf33700fb7df3fff6f8c2666de46fd416" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -673,9 +676,9 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5480f05bfba7cd3b4449333698dbe84761d574d702f0753cee91d709b8de4" +checksum = "f6728d4004e282fa57d25174af75a5f0f8e82fb7679efa5e2f5e95268c5dc4b4" dependencies = [ "ckb-error", "ckb-logger", @@ -690,9 +693,9 @@ dependencies = [ [[package]] name = "ckb-gen-types" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255da9cda52578622b7b8a437eb22942bfdbe90d7896f86a002fa8e4cc1804c8" +checksum = "e57ad8b6edc20d1614780e9034475e1edac24f3ef5edc197cbd6f0bc9b20eea6" dependencies = [ "cfg-if 1.0.0", "ckb-error", @@ -701,13 +704,15 @@ dependencies = [ "ckb-occupied-capacity", "molecule", "numext-fixed-uint", + "seq-macro", + "strum", ] [[package]] name = "ckb-hash" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a74fb43c0f092a5ea388d31e4579cada2cc14e45dd5818b996f348613efe202" +checksum = "96bc608fd850b8f88fa07ed6fd432175eef4d83ab093c82bb6800333181993bb" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -715,13 +720,14 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1fb6611ec4626ec5876b7dac828027faac9ab0289c90f630109eae23f1e3da" +checksum = "93fd050ea71b67f1e4d304b3450c939a87a30dea5b27ba30c0231e2b75d51959" dependencies = [ "ckb-types", "ckb_schemars", "faster-hex", + "seq-macro", "serde", "serde_json", ] @@ -826,18 +832,18 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dee2e03aff24f041876ba9e8c6c3389edd003041e82ab59c57e6e0674806fbc" +checksum = "ecd17904c92d089059dbdb036722422a5e7d0946a0ea47fc625e877bce6d5426" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c18e5a9f7fd8621bde8231718029361c49a7d0115b80776e17ba7bc1fa3797a" +checksum = "cdff81ea39d42c5013d16243ff0e3019df2e35a0cf97c4c959c1e7852acb341c" dependencies = [ "serde", ] @@ -853,9 +859,9 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1ca984572c23d80d14387f440f7d0d8217211d913bc733366fe2eb1e885315" +checksum = "37782b2932e253d6cc48978d217f140cd77503ac17c81ee613ace169970463bd" dependencies = [ "prometheus", "prometheus-static-metric", @@ -863,18 +869,18 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8ada517a5366010e7f2f1dd063c5b3a706ee1c468df98ec7780c557d988663" +checksum = "e525cff3b98467c373632b6deef0effd0487e963da2afbad3238c1797eb45aac" dependencies = [ "serde", ] [[package]] name = "ckb-migrate" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f92fecb897be251a11257d19c65225c7ce94adf3a07c57ad99f5f4f7b872a5" +checksum = "9539a94a886c0fd7ebe9dfa1cc09cb86054c4754f83281086fdcc38aaa85c340" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -892,9 +898,9 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace119f81414393a6d95b1f3e40793fac3e51172df5e9e7801fe603f7e05fc0f" +checksum = "c9c5f5df0aff921e831169895928a0f38490a36342f8065e78982669e97fc81c" dependencies = [ "quote", "syn 2.0.96", @@ -902,9 +908,9 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d169aaeb07affbfe00f2b0800aea7a460dd39d7a5a32f7e2a5a9d1ed4ad55aca" +checksum = "07f424d1e8f8472573b6ed6d236e403c571f49c08bd677a0f7e960ea98304d8d" dependencies = [ "bitflags 2.9.1", "bloom-filters", @@ -934,9 +940,9 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cedcd75d17185ad91b1ef0e517fda7c1ef674bd50a890147996259ae74828d81" +checksum = "88326904d7eb8da370c9e2a425b705492eab8168d3f0d8c4c621b5749bbbfa85" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -948,9 +954,9 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d80645639dd38cf0c91d06cd2e8bd3489557479968e6fb8ed2d35d7fdde5dd" +checksum = "5e67f664b639e30bd21597e917d552a506a3d95e3c90b3eae8c8967e430a3f5e" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -958,18 +964,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af825d54b795fab2b9e934ab5b5f9fa1090f69b98cc60e3a6d363336b5ee1726" +checksum = "48ad9c557a7500b3dfcfbb20a2419faddc172cf86ca9ca6e805eafdf532429ac" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca553126a0269427c31b3dbca8d720a4c79267a80c9a0e6c589a86d460a6201b" +checksum = "fd78121f24a35ed4a33030da00b07d7adf479204c2b44067f222ff6eb97e7e6e" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -978,9 +984,9 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b4deffe39636e0f55bb888612b48026db58dd10dca1efadf7a54827b8b61fe" +checksum = "2d34cfa54433ce70a9965bd377a692be20e0579e2e3366fe539c1b1a2f024faf" dependencies = [ "byteorder", "ckb-hash", @@ -992,9 +998,9 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd024fd44761a9e480e4c430974959a3478e61783ba61a0aa0189ee729e956d6" +checksum = "b75c5d38302aa6ae6ed942075eae07a9309375b11d85ece000eed0caf6410781" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -1003,9 +1009,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd60f92eafb05be8fd7ec091841c7e28503a61e061b54e1010b2d0f3a0b13763" +checksum = "284f8728233280773075f9f8a1e90b246f5cd43a896cdc4e1eff58496a34dbca" dependencies = [ "numext-fixed-uint", "serde", @@ -1013,24 +1019,24 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893c593af418c218c4f2cea26d6964e3289651a887b049c0370fbb14392e92c1" +checksum = "4e2616e521eaf99a349516c5e5c6ee56d4a91da60cd6fa3aa7d50e08acfd67be" dependencies = [ "ckb-system-scripts", "ckb-types", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", "serde", "walkdir", ] [[package]] name = "ckb-reward-calculator" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9c2f3dfb89105e2df8e3a130f256f9ea1f16a530807a7aa7075af85ba3463e" +checksum = "a40dc1db396df11f6ac47c7cd1aecd04547a516e0f612c8d33b65e00e65b0e12" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1053,9 +1059,9 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e392689735f78ecd624b5583c9c9be560c2ff444e0f9114461fa061d5ff4c1be" +checksum = "8806961e94e46bca8c9f1612237fa49a479b43116627c25030b77e72cd3f0bed" dependencies = [ "byteorder", "ckb-chain-spec", @@ -1072,9 +1078,9 @@ dependencies = [ [[package]] name = "ckb-shared" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ab30972f5b6019f1c4bec2c120fd78fd08efdb7c38f72cc167b723c0362d7a" +checksum = "b6f9565664af5d5a333d9b955a76e21d5a64f840608cb7b1baa4dc6f988fb109" dependencies = [ "arc-swap", "bitflags 2.9.1", @@ -1108,9 +1114,9 @@ dependencies = [ [[package]] name = "ckb-snapshot" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f037512c2a33248a0d39a70c03783af3d2eb4118c22c256245d8e72538003274" +checksum = "addf792f2ed4f6a03e763253e3965116cf06fbcf54ab96be8349dc3d01a3411d" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1126,15 +1132,15 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d693e5156b9dc0a9c8ccfd071302501af3963c41a90a0d160a89c11da0a12b70" +checksum = "de68288fdc54b7ac90da87d4b2aeabb43c5f253bc31617ea125723ce8fab102c" [[package]] name = "ckb-stop-handler" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a7be986682a0de519b63cd77b7c6e69fc78156132fc236d093dde5352905d6" +checksum = "f06ebf607e02cc0e9e8016e7eeb55074a7b0141040397be5008ddba0b049423c" dependencies = [ "ckb-async-runtime", "ckb-channel", @@ -1146,9 +1152,9 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c566fc0c86dcee19bbcdeedc7292e824da92ef9f5c2d6f6dd2fb379b9dd2de63" +checksum = "b7c062d83f4df20549002836c9d2745f42b3cf95fe4d21ec8f7a737697ed0447" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1173,32 +1179,32 @@ dependencies = [ "faster-hex", "includedir", "includedir_codegen", - "phf", + "phf 0.8.0", ] [[package]] name = "ckb-systemtime" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a190f4c7f21836db1a9649934d883030b8debabf870257c9a8a17e390b8effc5" +checksum = "86d1e8565359cac5f15052fd60d716183f5d21976f0d728f4697f6cb75921082" dependencies = [ "web-time", ] [[package]] name = "ckb-traits" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fcf192e9832c5b1213a2f4dcc58812ad77ae9599aec3170652db07d9c2fb0f" +checksum = "5d6f061d2788746ab9cd596fb9aa39d92ae3abce730c1792c2a2e064165c1ced" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb7613728ab0b4a04c4e9cbda52a2c61eaa7b5f2b88b21ee727a35fadc939b" +checksum = "b8cb37c7382f0bb59cd4661138dda9b5def84cb88254158e4f3c4571e97fa0dd" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1237,13 +1243,12 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bd5b5b4a2d991ee05852641c8272498df27abd0cef0f16979f6af6cb5fd97d" +checksum = "90a5f1e62fa0e969386928163607d22dd3563857ec134440ffe46a5ca68bb8fc" dependencies = [ "bit-vec", "bytes", - "ckb-channel", "ckb-constant", "ckb-error", "ckb-fixed-hash", @@ -1262,22 +1267,22 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ad33025a25b46ec8d28abde909953cad5442d6cc4b2c951f0c0859df6c14b6" +checksum = "a8bef9c44650fc332dc72d419a60d25ccde5d6f9cc3bbbad33483ff55b305ae5" dependencies = [ "linked-hash-map", "parking_lot 0.12.3", - "regex", ] [[package]] name = "ckb-verification" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fc0d24b27bd2ccb209cae0accf7c6b47ce22c7122d1fb1bbf3ef9bac2420c17" +checksum = "0c563789a1b0779d666a1d60e6cf98e70d26f6475905e9a66412bc21d2d5170c" dependencies = [ "ckb-chain-spec", + "ckb-constant", "ckb-dao", "ckb-dao-utils", "ckb-error", @@ -1294,9 +1299,9 @@ dependencies = [ [[package]] name = "ckb-verification-contextual" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb22b8af6851f8570b1639cf6c94696f5c8a5a51560796adab7add11878a04e" +checksum = "0a0f0e4e4d5452e957f1c568bad13334cb2177cc817e968264a820c6ce366c75" dependencies = [ "ckb-async-runtime", "ckb-chain-spec", @@ -1318,9 +1323,9 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.202.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3711e30c9f6724d97d4ee73b61f854e2a3cbe8e49f4508011a3b72ece7736d" +checksum = "ff48948ffe82561345bc2fdcf383decaa0aef0acbd9f5342b3c8614f7b227033" dependencies = [ "bitflags 2.9.1", "ckb-error", @@ -2103,7 +2108,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2208,6 +2213,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -2556,7 +2567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afd126bd778c00c43a9dc76d1609a0894bf4222088088b2217ccc0ce9e816db7" dependencies = [ "flate2", - "phf", + "phf 0.8.0", ] [[package]] @@ -3258,7 +3269,18 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_macros", + "phf_shared 0.12.1", + "serde", ] [[package]] @@ -3267,8 +3289,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] @@ -3277,17 +3299,49 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +dependencies = [ + "fastrand", + "phf_shared 0.12.1", +] + +[[package]] +name = "phf_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +dependencies = [ + "phf_generator 0.12.1", + "phf_shared 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "phf_shared" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher", + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher 1.0.1", ] [[package]] @@ -3790,6 +3844,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + [[package]] name = "serde" version = "1.0.217" @@ -3907,6 +3967,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -3998,6 +4064,27 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "subtle" version = "2.6.1" diff --git a/light-client-bin/Cargo.toml b/light-client-bin/Cargo.toml index e8b5ce40..48cfd171 100644 --- a/light-client-bin/Cargo.toml +++ b/light-client-bin/Cargo.toml @@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb-light-client" repository = "https://github.com/nervosnetwork/ckb-light-client" [dependencies] -ckb-async-runtime = "0.202.0" -ckb-chain-spec = "0.202.0" -ckb-network = "0.202.0" -ckb-stop-handler = "0.202.0" -ckb-resource = "0.202.0" -ckb-jsonrpc-types = "0.202.0" -ckb-types = "0.202.0" -ckb-traits = "0.202.0" -ckb-systemtime = "0.202.0" +ckb-async-runtime = "1" +ckb-chain-spec = "1" +ckb-network = "1" +ckb-stop-handler = "1" +ckb-resource = "1" +ckb-jsonrpc-types = "1" +ckb-types = "1" +ckb-traits = "1" +ckb-systemtime = "1" ckb-light-client-lib = { path = "../light-client-lib" } clap = { version = "4", features = ["cargo"] } diff --git a/light-client-bin/src/tests/service.rs b/light-client-bin/src/tests/service.rs index eb8364f8..a1cf2b28 100644 --- a/light-client-bin/src/tests/service.rs +++ b/light-client-bin/src/tests/service.rs @@ -43,31 +43,31 @@ fn rpc() { // setup test data let lock_script1 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script1".to_vec()).pack()) .build(); let lock_script2 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Type.into()) + .hash_type(ScriptHashType::Type) .args(Bytes::from(b"lock_script2".to_vec()).pack()) .build(); let lock_script3 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Type.into()) + .hash_type(ScriptHashType::Type) .args(Bytes::from(b"lock_script3".to_vec()).pack()) .build(); let type_script1 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"type_script1".to_vec()).pack()) .build(); let type_script2 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Type.into()) + .hash_type(ScriptHashType::Type) .args(Bytes::from(b"type_script2".to_vec()).pack()) .build(); @@ -112,7 +112,7 @@ fn rpc() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 0, 1000).pack()) - .number(0.pack()) + .number(0) .build(), ) .build(); @@ -213,7 +213,7 @@ fn rpc() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, pre_block.number() + 1, 1000).pack()) - .number((pre_block.number() + 1).pack()) + .number(pre_block.number() + 1) .parent_hash(pre_block.hash()) .build(), ) @@ -752,14 +752,14 @@ fn rpc() { // test get_header rpc let extra_header = HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 500, 1000).pack()) - .number(500.pack()) + .number(500) .build(); let fetched_headers: Vec = [0xaa11, 0xaa77, 0xaa88] .into_iter() .map(|nonce| { - let header = Header::new_builder().nonce(nonce.pack()).build(); + let header = Header::new_builder().nonce(nonce).build(); let hash = header.calc_header_hash().unpack(); - let extension = (nonce + 1).to_le_bytes().to_vec(); + let extension = (nonce + 1u128).to_le_bytes().to_vec(); storage.add_fetched_header(&HeaderWithExtension { header: header, extension: Some(extension.pack()), @@ -827,7 +827,7 @@ fn rpc() { rv, FetchStatus::Fetched { data: Header::new_builder() - .nonce(0xaa11.pack()) + .nonce(0xaa11) .build() .into_view() .into() @@ -1075,7 +1075,7 @@ fn get_cells_capacity_bug() { // setup test data let lock_script1 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script1".to_vec()).pack()) .build(); @@ -1101,7 +1101,7 @@ fn get_cells_capacity_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 0, 1000).pack()) - .number(0.pack()) + .number(0) .build(), ) .build(); @@ -1117,7 +1117,7 @@ fn get_cells_capacity_bug() { let lock_script2 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script2".to_vec()).pack()) .build(); @@ -1143,7 +1143,7 @@ fn get_cells_capacity_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 1, 1000).pack()) - .number(1.pack()) + .number(1) .build(), ) .build(); @@ -1173,7 +1173,7 @@ fn get_cells_capacity_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 2, 1000).pack()) - .number(2.pack()) + .number(2) .build(), ) .build(); @@ -1200,13 +1200,13 @@ fn get_cells_after_rollback_bug() { // setup test data let lock_script1 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script1".to_vec()).pack()) .build(); let lock_script2 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script2".to_vec()).pack()) .build(); @@ -1232,7 +1232,7 @@ fn get_cells_after_rollback_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 0, 1000).pack()) - .number(0.pack()) + .number(0) .build(), ) .build(); @@ -1275,7 +1275,7 @@ fn get_cells_after_rollback_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 1, 1000).pack()) - .number(1.pack()) + .number(1) .build(), ) .build(); @@ -1306,7 +1306,7 @@ fn get_cells_after_rollback_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 2, 1000).pack()) - .number(2.pack()) + .number(2) .build(), ) .build(); @@ -1627,13 +1627,13 @@ fn test_chain_txs_in_same_block_bug() { // setup test data let lock_script1 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script1".to_vec()).pack()) .build(); let lock_script2 = ScriptBuilder::default() .code_hash(H256(rand::random()).pack()) - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .args(Bytes::from(b"lock_script2".to_vec()).pack()) .build(); @@ -1659,7 +1659,7 @@ fn test_chain_txs_in_same_block_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 0, 1000).pack()) - .number(0.pack()) + .number(0) .build(), ) .build(); @@ -1707,7 +1707,7 @@ fn test_chain_txs_in_same_block_bug() { .header( HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(0, 1, 1000).pack()) - .number(1.pack()) + .number(1) .build(), ) .build(); diff --git a/light-client-lib/Cargo.toml b/light-client-lib/Cargo.toml index 43f5ee17..d7ce695b 100644 --- a/light-client-lib/Cargo.toml +++ b/light-client-lib/Cargo.toml @@ -12,21 +12,21 @@ repository = "https://github.com/nervosnetwork/ckb-light-client" crate-type = ["cdylib", "rlib"] [dependencies] -ckb-app-config = "0.202.0" -ckb-constant = "0.202.0" -ckb-types = "0.202.0" -ckb-network = "0.202.0" -ckb-jsonrpc-types = "0.202.0" -ckb-error = "0.202.0" -ckb-script = "0.202.0" -ckb-chain-spec = "0.202.0" -ckb-traits = "0.202.0" -ckb-resource = "0.202.0" -ckb-verification = "0.202.0" -ckb-hash = "0.202.0" -ckb-systemtime = "0.202.0" -ckb-dao-utils = "0.202.0" -ckb-dao = "0.202.0" +ckb-app-config = "1" +ckb-constant = "1" +ckb-types = "1" +ckb-network = "1" +ckb-jsonrpc-types = "1" +ckb-error = "1" +ckb-script = "1" +ckb-chain-spec = "1" +ckb-traits = "1" +ckb-resource = "1" +ckb-verification = "1" +ckb-hash = "1" +ckb-systemtime = "1" +ckb-dao-utils = "1" +ckb-dao = "1" log = "0.4.14" path-clean = "0.1.0" @@ -67,15 +67,15 @@ serde_json = "1.0.134" wasm-bindgen-test = "0.3.45" [dev-dependencies] -ckb-shared = "0.202.0" -ckb-chain = "0.202.0" -ckb-tx-pool = "0.202.0" -ckb-store = "0.202.0" -ckb-systemtime = { version = "0.202.0", features = ["enable_faketime"] } +ckb-shared = "1" +ckb-chain = "1" +ckb-tx-pool = "1" +ckb-store = "1" +ckb-systemtime = { version = "1", features = ["enable_faketime"] } tempfile = "3.0" rand = "0.8" serde_json = "1.0" lazy_static = "1.3.0" env_logger = "0.11" -ckb-db = "0.202.0" -ckb-db-schema = "0.202.0" +ckb-db = "1" +ckb-db-schema = "1" diff --git a/light-client-lib/src/protocols/filter/block_filter.rs b/light-client-lib/src/protocols/filter/block_filter.rs index b0bf5746..43d616ca 100644 --- a/light-client-lib/src/protocols/filter/block_filter.rs +++ b/light-client-lib/src/protocols/filter/block_filter.rs @@ -268,7 +268,7 @@ impl FilterProtocol { start_number ); let content = packed::GetBlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .build(); let message = packed::BlockFilterMessage::new_builder() .set(content) @@ -291,7 +291,7 @@ impl FilterProtocol { start_number ); let content = packed::GetBlockFilterHashes::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .build(); let message = packed::BlockFilterMessage::new_builder() .set(content) @@ -314,7 +314,7 @@ impl FilterProtocol { start_number ); let content = packed::GetBlockFilterCheckPoints::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .build(); let message = packed::BlockFilterMessage::new_builder() .set(content) diff --git a/light-client-lib/src/protocols/light_client/mod.rs b/light-client-lib/src/protocols/light_client/mod.rs index b00430ef..013754e1 100644 --- a/light-client-lib/src/protocols/light_client/mod.rs +++ b/light-client-lib/src/protocols/light_client/mod.rs @@ -857,7 +857,7 @@ impl LightClientProtocol { } let builder = packed::GetLastStateProof::new_builder() .last_hash(last_header.header().hash()) - .last_n_blocks(last_n_blocks.pack()); + .last_n_blocks(last_n_blocks); let content = if last_number - start_number <= last_n_blocks { let last_n_headers = self.storage.get_last_n_headers(); @@ -868,7 +868,7 @@ impl LightClientProtocol { builder .start_hash(real_start_hash) - .start_number(real_start_number.pack()) + .start_number(real_start_number) .difficulty_boundary(start_total_difficulty.pack()) } else { let (difficulty_boundary, difficulties) = sampling::sample_blocks( @@ -880,7 +880,7 @@ impl LightClientProtocol { ); builder .start_hash(start_hash) - .start_number(start_number.pack()) + .start_number(start_number) .difficulty_boundary(difficulty_boundary.pack()) .difficulties(difficulties.into_iter().map(|inner| inner.pack()).pack()) } @@ -905,8 +905,8 @@ impl LightClientProtocol { let builder = packed::GetLastStateProof::new_builder() .last_hash(last_header.header().hash()) .start_hash(start_hash) - .start_number(start_number.pack()) - .last_n_blocks(last_n_blocks.pack()); + .start_number(start_number) + .last_n_blocks(last_n_blocks); let content = if last_number - start_number <= last_n_blocks { builder.difficulty_boundary(start_total_difficulty.pack()) } else { diff --git a/light-client-lib/src/protocols/relayer.rs b/light-client-lib/src/protocols/relayer.rs index e29d0e4f..b007c66c 100644 --- a/light-client-lib/src/protocols/relayer.rs +++ b/light-client-lib/src/protocols/relayer.rs @@ -205,7 +205,7 @@ impl CKBProtocolHandler for RelayProtocol { .map(|(tx, cycles, _)| { packed::RelayTransaction::new_builder() .transaction(tx) - .cycles(cycles.pack()) + .cycles(cycles) .build() }) }) diff --git a/light-client-lib/src/tests/mod.rs b/light-client-lib/src/tests/mod.rs index 19798a49..f7b5d6ad 100644 --- a/light-client-lib/src/tests/mod.rs +++ b/light-client-lib/src/tests/mod.rs @@ -18,7 +18,7 @@ pub const ALWAYS_SUCCESS_BIN: &[u8] = include_bytes!("specs/cells/always_success lazy_static::lazy_static! { pub static ref ALWAYS_SUCCESS_SCRIPT: Script = Script::new_builder() - .hash_type(ScriptHashType::Data.into()) + .hash_type(ScriptHashType::Data) .code_hash(CellOutput::calc_data_hash(ALWAYS_SUCCESS_BIN)) .build(); } diff --git a/light-client-lib/src/tests/prelude.rs b/light-client-lib/src/tests/prelude.rs index 5f94aeb5..2fb2e19a 100644 --- a/light-client-lib/src/tests/prelude.rs +++ b/light-client-lib/src/tests/prelude.rs @@ -224,7 +224,7 @@ pub(crate) trait RunningChainExt: ChainExt { .map(|(idx, _)| { let out_point = packed::OutPoint::new_builder() .tx_hash(tx.hash()) - .index((idx as u32).pack()) + .index(idx as u32) .build(); packed::CellDep::new_builder().out_point(out_point).build() }) @@ -387,8 +387,8 @@ pub(crate) trait RunningChainExt: ChainExt { packed::GetLastStateProof::new_builder() .last_hash(last_header.header().hash()) .start_hash(start_header.hash()) - .start_number(start_header.number().pack()) - .last_n_blocks(last_n_blocks.pack()) + .start_number(start_header.number()) + .last_n_blocks(last_n_blocks) .difficulty_boundary(difficulty_boundary.pack()) .difficulties(difficulties.pack()) .build() diff --git a/light-client-lib/src/tests/protocols/block_filter.rs b/light-client-lib/src/tests/protocols/block_filter.rs index fa929a00..12cd0c35 100644 --- a/light-client-lib/src/tests/protocols/block_filter.rs +++ b/light-client-lib/src/tests/protocols/block_filter.rs @@ -59,8 +59,8 @@ async fn test_block_filter_ignore_start_number() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number((min_filtered_block_number + 1).pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number + 1) .build(), Default::default(), None, @@ -73,7 +73,7 @@ async fn test_block_filter_ignore_start_number() { }; let mut protocol = chain.create_filter_protocol(peers); let content = packed::BlockFilters::new_builder() - .start_number((min_filtered_block_number - 1).pack()) + .start_number(min_filtered_block_number - 1) .block_hashes(vec![H256(rand::random()).pack(), H256(rand::random()).pack()].pack()) .filters(vec![Bytes::from("abc").pack(), Bytes::from("def").pack()].pack()) .build(); @@ -108,8 +108,8 @@ async fn test_block_filter_empty_filters() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number((min_filtered_block_number + 1).pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number + 1) .build(), Default::default(), None, @@ -122,9 +122,9 @@ async fn test_block_filter_empty_filters() { }; let mut protocol = chain.create_filter_protocol(peers); let content = packed::BlockFilters::new_builder() - .start_number((min_filtered_block_number + 1).pack()) - .block_hashes(vec![].pack()) - .filters(vec![].pack()) + .start_number(min_filtered_block_number + 1) + .block_hashes(vec![]) + .filters(vec![]) .build(); let message = packed::BlockFilterMessage::new_builder() .set(content) @@ -158,8 +158,8 @@ async fn test_block_filter_invalid_filters_count() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number((min_filtered_block_number + 1).pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number + 1) .build(), Default::default(), None, @@ -172,9 +172,9 @@ async fn test_block_filter_invalid_filters_count() { }; let mut protocol = chain.create_filter_protocol(peers); let content = packed::BlockFilters::new_builder() - .start_number((min_filtered_block_number + 1).pack()) + .start_number(min_filtered_block_number + 1) .block_hashes(vec![H256(rand::random()).pack(), H256(rand::random()).pack()].pack()) - .filters(vec![].pack()) + .filters(vec![]) .build(); let message = packed::BlockFilterMessage::new_builder() .set(content) @@ -211,8 +211,8 @@ async fn test_block_filter_start_number_greater_then_proved_number() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number(proved_number.pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(proved_number) .build(), Default::default(), None, @@ -225,7 +225,7 @@ async fn test_block_filter_start_number_greater_then_proved_number() { }; let mut protocol = chain.create_filter_protocol(Arc::clone(&peers)); let content = packed::BlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .block_hashes(vec![H256(rand::random()).pack(), H256(rand::random()).pack()].pack()) .filters(vec![Bytes::from("abc").pack(), Bytes::from("def").pack()].pack()) .build(); @@ -303,7 +303,7 @@ async fn test_block_filter_ok_with_blocks_not_matched() { let blocks_count = block_hashes.len(); let content = packed::BlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .block_hashes(block_hashes.pack()) .filters(filters.pack()) .build(); @@ -324,7 +324,7 @@ async fn test_block_filter_ok_with_blocks_not_matched() { ); let message = { let content = packed::GetBlockFilters::new_builder() - .start_number((filtered_block_number + 1).pack()) + .start_number(filtered_block_number + 1) .build(); packed::BlockFilterMessage::new_builder() .set(content) @@ -416,7 +416,7 @@ async fn test_block_filter_ok_with_blocks_matched() { }; let content = packed::BlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .block_hashes(vec![block_hash_1.clone(), block_hash_2].pack()) .filters(vec![filter_data_1, filter_data_2].pack()) .build(); @@ -444,7 +444,7 @@ async fn test_block_filter_ok_with_blocks_matched() { let blocks_count = 2; let new_start_number = start_number - 1 + blocks_count + 1; let content = packed::GetBlockFilters::new_builder() - .start_number(new_start_number.pack()) + .start_number(new_start_number) .build(); packed::BlockFilterMessage::new_builder() .set(content) @@ -488,8 +488,8 @@ async fn test_block_filter_notify_ask_filters() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number((min_filtered_block_number + 1).pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number + 1) .build(), Default::default(), None, @@ -511,7 +511,7 @@ async fn test_block_filter_notify_ask_filters() { let message = { let start_number: u64 = min_filtered_block_number + 1; let content = packed::GetBlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .build(); packed::BlockFilterMessage::new_builder() .set(content) @@ -566,8 +566,8 @@ async fn test_block_filter_notify_not_reach_ask() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number(5u64.pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(5u64) .build(), Default::default(), None, @@ -606,8 +606,8 @@ async fn test_block_filter_notify_proved_number_not_big_enough() { let peers = { let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number(min_filtered_block_number.pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number) .build(), Default::default(), None, @@ -638,8 +638,8 @@ async fn test_block_filter_notify_recover_matched_blocks() { let peer_index = PeerIndex::new(3); let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number((min_filtered_block_number + 2).pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(min_filtered_block_number + 2) .build(), Default::default(), None, @@ -695,7 +695,7 @@ async fn test_block_filter_notify_recover_matched_blocks() { let get_block_filters_message = { let start_number: u64 = min_filtered_block_number + 1; let content = packed::GetBlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .build(); packed::BlockFilterMessage::new_builder() .set(content) @@ -800,7 +800,7 @@ async fn test_block_filter_without_enough_hashes() { }; let content = packed::BlockFilters::new_builder() - .start_number(start_number.pack()) + .start_number(start_number) .block_hashes(vec![block_hash_1.clone(), block_hash_2].pack()) .filters(vec![filter_data_1, filter_data_2].pack()) .build(); diff --git a/light-client-lib/src/tests/protocols/light_client/mod.rs b/light-client-lib/src/tests/protocols/light_client/mod.rs index 15e71333..58d54179 100644 --- a/light-client-lib/src/tests/protocols/light_client/mod.rs +++ b/light-client-lib/src/tests/protocols/light_client/mod.rs @@ -64,7 +64,7 @@ async fn build_prove_request_content() { { let epoch = EpochNumberWithFraction::new(0, last_number, epoch_length); let header = HeaderBuilder::default() - .number(last_number.pack()) + .number(last_number) .epoch(epoch.pack()) .build(); let last_total_difficulty = U256::from(last_total_difficulty); @@ -77,9 +77,9 @@ async fn build_prove_request_content() { let new_last_number = last_number + 1; let epoch = EpochNumberWithFraction::new(0, new_last_number, epoch_length); HeaderBuilder::default() - .number(new_last_number.pack()) + .number(new_last_number) .epoch(epoch.pack()) - .compact_target(default_compact_target.pack()) + .compact_target(default_compact_target) .build() }; for diff in 1u64..10 { @@ -121,7 +121,7 @@ async fn build_prove_request_content() { let verifiable_header = { let epoch = EpochNumberWithFraction::new(0, new_last_number, epoch_length); let header = HeaderBuilder::default() - .number(new_last_number.pack()) + .number(new_last_number) .epoch(epoch.pack()) .build(); let parent_chain_root = packed::HeaderDigest::new_builder() @@ -139,7 +139,7 @@ async fn build_prove_request_content() { let verifiable_header = { let epoch = EpochNumberWithFraction::new(0, new_last_number, epoch_length); let header = HeaderBuilder::default() - .number(new_last_number.pack()) + .number(new_last_number) .epoch(epoch.pack()) .build(); let parent_chain_root = packed::HeaderDigest::new_builder() @@ -173,8 +173,8 @@ async fn test_light_client_get_idle_matched_blocks() { let peer_index = PeerIndex::new(3); let tip_header = VerifiableHeader::new( HeaderBuilder::default() - .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value().pack()) - .number(3u64.pack()) + .epoch(EpochNumberWithFraction::new(0, 0, 100).full_value()) + .number(3u64) .build(), Default::default(), None, diff --git a/light-client-lib/src/tests/protocols/light_client/send_last_state.rs b/light-client-lib/src/tests/protocols/light_client/send_last_state.rs index 0fdecdba..189283f3 100644 --- a/light-client-lib/src/tests/protocols/light_client/send_last_state.rs +++ b/light-client-lib/src/tests/protocols/light_client/send_last_state.rs @@ -81,7 +81,7 @@ async fn invalid_chain_root() { let data = { let header = HeaderBuilder::default() .epoch(EpochNumberWithFraction::new(1, 1, 10).pack()) - .number(11u64.pack()) + .number(11u64) .build(); let last_header = packed::VerifiableHeader::new_builder() .header(header.data()) @@ -445,7 +445,7 @@ async fn update_to_continuous_but_forked_last_state() { let block_number: u64 = block.header().raw().number().unpack(); block .as_advanced_builder() - .timestamp((100 + block_number).pack()) + .timestamp(100 + block_number) .build() }); @@ -503,7 +503,7 @@ async fn update_to_continuous_but_forked_last_state() { let block_number: u64 = block.header().raw().number().unpack(); block .as_advanced_builder() - .timestamp((200 + block_number).pack()) + .timestamp(200 + block_number) .build() }); assert_eq!(chain.shared().snapshot().tip_number(), num); diff --git a/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs b/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs index 8dbb5944..138c7866 100644 --- a/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs +++ b/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs @@ -273,8 +273,8 @@ async fn headers_should_be_sorted() { packed::GetLastStateProof::new_builder() .last_hash(last_header.header().hash()) .start_hash(genesis_block.hash()) - .start_number(genesis_block.number().pack()) - .last_n_blocks(protocol.last_n_blocks().pack()) + .start_number(genesis_block.number()) + .last_n_blocks(protocol.last_n_blocks()) .difficulty_boundary(U256::zero().pack()) .build() }; @@ -574,8 +574,8 @@ async fn valid_proof_with_no_matched_sample() { packed::GetLastStateProof::new_builder() .last_hash(last_header.header().hash()) .start_hash(start_header.hash()) - .start_number(start_header.number().pack()) - .last_n_blocks(protocol.last_n_blocks().pack()) + .start_number(start_header.number()) + .last_n_blocks(protocol.last_n_blocks()) .difficulty_boundary(difficulty_boundary.pack()) .difficulties(difficulties.pack()) .build() @@ -1726,7 +1726,7 @@ async fn test_with_reorg_blocks(param: ReorgTestParameter) { let block_number: u64 = block.header().raw().number().unpack(); block .as_advanced_builder() - .timestamp((100 + block_number).pack()) + .timestamp(100 + block_number) .build() }); assert_eq!(chain.shared().snapshot().tip_number(), last_number); @@ -1838,7 +1838,7 @@ async fn test_with_reorg_blocks(param: ReorgTestParameter) { let block_number: u64 = block.header().raw().number().unpack(); block .as_advanced_builder() - .timestamp((500 + block_number).pack()) + .timestamp(500 + block_number) .build() }); assert_eq!(chain.shared().snapshot().tip_number(), last_number); diff --git a/light-client-lib/src/tests/utils/network_context.rs b/light-client-lib/src/tests/utils/network_context.rs index 00cd0db9..7ef8ed24 100644 --- a/light-client-lib/src/tests/utils/network_context.rs +++ b/light-client-lib/src/tests/utils/network_context.rs @@ -7,7 +7,7 @@ use std::time::Duration; use ckb_network::{ async_trait, bytes::Bytes as P2pBytes, Behaviour, CKBProtocolContext, Error, Peer, PeerIndex, - ProtocolId, SupportProtocols, TargetSession, + ProtocolId, SessionId, SupportProtocols, TargetSession, }; use crate::protocols::{Status, StatusCode}; @@ -223,8 +223,7 @@ impl CKBProtocolContext for MockProtocolContext { fn protocol_id(&self) -> ProtocolId { self.protocol.protocol_id() } - - fn ckb2023(&self) -> bool { - unimplemented!(); + fn full_relay_connected_peers(&self) -> Vec { + Vec::new() } } diff --git a/wasm/light-client-wasm/Cargo.toml b/wasm/light-client-wasm/Cargo.toml index eb99a9b9..8ce967f5 100644 --- a/wasm/light-client-wasm/Cargo.toml +++ b/wasm/light-client-wasm/Cargo.toml @@ -22,15 +22,15 @@ log = "0.4" wasm-logger = "0.2" serde-wasm-bindgen = "0.6.5" -ckb-chain-spec = "0.202.0" -ckb-resource = "0.202.0" -ckb-network = "0.202.0" -ckb-async-runtime = "0.202.0" -ckb-types = "0.202.0" -ckb-jsonrpc-types = "0.202.0" -ckb-stop-handler = "0.202.0" -ckb-systemtime = "0.202.0" -ckb-app-config = "0.202.0" +ckb-chain-spec = "1" +ckb-resource = "1" +ckb-network = "1" +ckb-async-runtime = "1" +ckb-types = "1" +ckb-jsonrpc-types = "1" +ckb-stop-handler = "1" +ckb-systemtime = "1" +ckb-app-config = "1" getrandom = { version = "0.2", features = ["js"] }