From e07f06d75fd2d7d4492daae5682487d084d65d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20Eng=C3=A9libert?= Date: Fri, 25 Jul 2025 18:02:57 +0200 Subject: [PATCH] Fix for gtest --- g1bridge/Cargo.lock | 344 ++++++++++++++++++++++-------------- g1bridge/res/metadata.scale | Bin 149943 -> 156554 bytes g1bridge/src/blockchain.rs | 45 +---- g1bridge/src/main.rs | 28 ++- 4 files changed, 235 insertions(+), 182 deletions(-) diff --git a/g1bridge/Cargo.lock b/g1bridge/Cargo.lock index 847d266..4895d35 100644 --- a/g1bridge/Cargo.lock +++ b/g1bridge/Cargo.lock @@ -89,7 +89,7 @@ dependencies = [ "proc-macro2", "pulldown-cmark", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -414,9 +414,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "async-channel" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" dependencies = [ "concurrent-queue", "event-listener-strategy", @@ -440,9 +440,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50" dependencies = [ "async-lock", "blocking", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3" +checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca" dependencies = [ "async-lock", "cfg-if", @@ -464,8 +464,7 @@ dependencies = [ "polling", "rustix", "slab", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -492,9 +491,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc" +checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00" dependencies = [ "async-channel", "async-io", @@ -506,14 +505,13 @@ dependencies = [ "event-listener 5.4.0", "futures-lite", "rustix", - "tracing", ] [[package]] name = "async-signal" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d" +checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1" dependencies = [ "async-io", "async-lock", @@ -524,7 +522,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -541,7 +539,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -558,9 +556,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "backtrace" @@ -654,9 +652,9 @@ dependencies = [ [[package]] name = "bip39" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387" +checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054" dependencies = [ "bitcoin_hashes", ] @@ -751,9 +749,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ "async-channel", "async-task", @@ -785,9 +783,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byte-slice-cast" @@ -809,9 +807,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.27" +version = "1.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" dependencies = [ "shlex", ] @@ -973,9 +971,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -1016,9 +1014,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-bigint" @@ -1077,7 +1075,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1125,7 +1123,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1147,7 +1145,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1188,18 +1186,18 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] name = "derive-where" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73f2692d4bd3cac41dca28934a39894200c9fabf49586d77d0e5954af1d7902" +checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1212,7 +1210,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1232,7 +1230,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1264,7 +1262,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1304,7 +1302,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.103", + "syn 2.0.104", "termcolor", "toml", "walkdir", @@ -1334,7 +1332,7 @@ checksum = "7e8671d54058979a37a26f3511fbf8d198ba1aa35ffb202c42587d918d77213a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1370,9 +1368,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -1446,12 +1444,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -1497,7 +1495,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1721,7 +1719,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -1862,9 +1860,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ "bytes", "fnv", @@ -2245,14 +2243,14 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown 0.15.4", @@ -2291,6 +2289,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags 2.9.1", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -2415,7 +2424,7 @@ dependencies = [ "http 1.3.1", "jsonrpsee-core 0.23.2", "pin-project", - "rustls 0.23.27", + "rustls 0.23.29", "rustls-pki-types", "rustls-platform-verifier", "soketto 0.8.1", @@ -2562,9 +2571,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.173" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libm" @@ -2898,7 +2907,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -2964,7 +2973,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3016,7 +3025,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.13", + "redox_syscall 0.5.15", "smallvec", "windows-targets 0.52.6", ] @@ -3072,7 +3081,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3138,7 +3147,7 @@ dependencies = [ "polkavm-common", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3148,22 +3157,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] name = "polling" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50" +checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", "rustix", - "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -3203,12 +3211,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" +checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a" dependencies = [ "proc-macro2", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3301,9 +3309,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "radium" @@ -3388,9 +3396,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" dependencies = [ "bitflags 2.9.1", ] @@ -3412,7 +3420,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3569,15 +3577,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags 2.9.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -3608,15 +3616,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.27" +version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" +checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ "log", "once_cell", "ring 0.17.14", "rustls-pki-types", - "rustls-webpki 0.103.3", + "rustls-webpki 0.103.4", "subtle", "zeroize", ] @@ -3684,7 +3692,7 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.27", + "rustls 0.23.29", "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", @@ -3723,9 +3731,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ "ring 0.17.14", "rustls-pki-types", @@ -3837,7 +3845,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3863,7 +3871,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -3885,7 +3893,7 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.103", + "syn 2.0.104", "thiserror", ] @@ -3932,9 +3940,9 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" +checksum = "6e9fcb6c2e176e86ec703e22560d99d65a5ee9056ae45a08e13e84ebf796296f" dependencies = [ "aead", "arrayref", @@ -4074,14 +4082,14 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" dependencies = [ "itoa", "memchr", @@ -4237,12 +4245,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "sled" @@ -4547,7 +4552,7 @@ source = "git+https://github.com/duniter/duniter-polkadot-sdk.git?branch=duniter dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -4557,7 +4562,7 @@ source = "git+https://github.com/duniter/duniter-polkadot-sdk#e3172c09434c095d44 dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -4701,7 +4706,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -4714,7 +4719,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -4974,7 +4979,7 @@ dependencies = [ "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.103", + "syn 2.0.104", "thiserror", "tokio", ] @@ -5034,7 +5039,7 @@ dependencies = [ "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -5062,9 +5067,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.103" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -5085,7 +5090,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -5154,7 +5159,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -5238,15 +5243,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", + "slab", "socket2", "tokio-macros", "windows-sys 0.52.0", @@ -5260,7 +5267,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -5300,7 +5307,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.27", + "rustls 0.23.29", "tokio", ] @@ -5411,13 +5418,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -5704,7 +5711,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", "wasm-bindgen-shared", ] @@ -5739,7 +5746,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5809,14 +5816,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.0", + "webpki-roots 1.0.2", ] [[package]] name = "webpki-roots" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ "rustls-pki-types", ] @@ -5879,6 +5886,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5903,13 +5919,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5922,6 +5954,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -5934,6 +5972,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5946,12 +5990,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -5964,6 +6020,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -5976,6 +6038,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -5988,6 +6056,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6001,10 +6075,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.7.11" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" dependencies = [ "memchr", ] @@ -6081,28 +6161,28 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -6122,7 +6202,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", "synstructure", ] @@ -6143,7 +6223,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] [[package]] @@ -6176,5 +6256,5 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.104", ] diff --git a/g1bridge/res/metadata.scale b/g1bridge/res/metadata.scale index aa2d5ecb9c31af40b6dae44102204e3278748bb9..96ad72c6261cda02d7829dc7e552487e1d9144c4 100644 GIT binary patch delta 17610 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 YA|*|iPVuIs_|Sn6!oyBc?J=|TpJ8h1?*IS* delta 12066 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 Xr{-(%VnKeqV0FEZY=_)k3hw^{_bOQE diff --git a/g1bridge/src/blockchain.rs b/g1bridge/src/blockchain.rs index 2248f9c..9930d2d 100644 --- a/g1bridge/src/blockchain.rs +++ b/g1bridge/src/blockchain.rs @@ -1,16 +1,7 @@ -use crate::{DebtG2B, Opt}; +use crate::DebtG2B; use log::error; -use runtime::balances::calls::types::TransferKeepAlive; -use subxt::{ - OnlineClient, - backend::{Backend, BackendExt}, - ext::sp_core::{ - Pair as _, - ed25519::{Pair, Public}, - }, - tx::{PairSigner, Signer}, -}; +use subxt::ext::sp_core::ed25519::Pair; use tokio::sync::mpsc::Receiver; use typed_sled::Tree; @@ -22,16 +13,9 @@ pub mod runtime {} pub type Client = subxt::OnlineClient; pub type AccountId = subxt::utils::AccountId32; -pub type IdtyId = u32; pub type BlockNumber = u32; -pub type TxProgress = subxt::tx::TxProgress; -pub type Balance = u64; -pub type AccountData = - runtime::runtime_types::pallet_duniter_account::types::AccountData; -pub type AccountInfo = runtime::runtime_types::frame_system::AccountInfo; pub type Hash = sp_core::H256; -// declare runtime types pub enum Runtime {} impl subxt::config::Config for Runtime { type AssetId = (); @@ -44,37 +28,16 @@ impl subxt::config::Config for Runtime { type ExtrinsicParams = subxt::config::DefaultExtrinsicParams; } -#[derive(Copy, Clone, Debug, Default, codec::Encode)] -pub struct Tip { - #[codec(compact)] - tip: u64, -} -impl Tip { - pub fn new(amount: u64) -> Self { - Tip { tip: amount } - } -} -impl From for Tip { - fn from(n: u64) -> Self { - Self::new(n) - } -} - -pub enum Msg { - NewDebt, - Timer, -} - pub async fn run( url: String, pair: Pair, mut recv: Receiver, tree_debt_g2b: Tree, ) { - let mut client = OnlineClient::::from_url(&url).await.ok(); + let mut client = Client::from_url(&url).await.ok(); while let Some(msg) = recv.recv().await { if client.is_none() { - client = OnlineClient::::from_url(&url).await.ok(); + client = Client::from_url(&url).await.ok(); } if let Some(client) = &client { match client diff --git a/g1bridge/src/main.rs b/g1bridge/src/main.rs index 97197df..565bb3d 100644 --- a/g1bridge/src/main.rs +++ b/g1bridge/src/main.rs @@ -5,19 +5,22 @@ mod indexer; mod response; use argp::FromArgs; +use log::error; use serde::{Deserialize, Serialize}; -use sp_core::Pair as _; +use sp_core::{ + Pair as _, + crypto::{Ss58AddressFormat, Ss58Codec, set_default_ss58_version}, +}; use std::{ - collections::{hash_map::Entry, HashMap}, io::{BufRead, Read}, str::FromStr, sync::Arc -}; -use subxt::{ - ext::sp_core::ed25519::Pair, - utils::AccountId32, + collections::{HashMap, hash_map::Entry}, + io::{BufRead, Read}, + str::FromStr, + sync::Arc, }; +use subxt::{ext::sp_core::ed25519::Pair, utils::AccountId32}; use tiny_http::{Response, ResponseBox, Server}; use tokio::sync::mpsc::{Sender, channel}; use typed_sled::Tree; -use log::error; /// Game to Blockchain const TREE_DEBT_G2B: &'static str = "debt_g2b"; @@ -30,7 +33,11 @@ struct Opt { db: String, /// Duniter indexer URL - #[argp(option, short = 'i', default = "String::from(\"https://squid.gdev.gyroi.de/v1/graphql\")")] + #[argp( + option, + short = 'i', + default = "String::from(\"https://gt-squid.axiom-team.fr/v1/graphql\")" + )] indexer: String, /// secret key is legacy (two passwords on the two first lines) @@ -85,8 +92,11 @@ async fn main() { .expect("Cannot read secret key file"); Pair::from_string(sk_content.trim(), None).expect("Cannot decode secret key") }; + + set_default_ss58_version(Ss58AddressFormat::custom(4450)); let pk: AccountId32 = pair.public().into(); - let pk_str = pk.to_string(); + let pk: sp_core::crypto::AccountId32 = pk.0.into(); + let pk_str = dbg!(pk.to_ss58check_with_version(Ss58AddressFormat::custom(4450))); simplelog::SimpleLogger::init(log::LevelFilter::Debug, simplelog::Config::default()).unwrap();