diff --git a/bin/printversion.ps1 b/bin/printversion.ps1 index d6d8122..5c7c9bb 100644 --- a/bin/printversion.ps1 +++ b/bin/printversion.ps1 @@ -1 +1 @@ -echo "VERSION=1.9.0" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append +echo "VERSION=1.10.2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append diff --git a/bin/printversion.sh b/bin/printversion.sh index e5baf1d..a0427df 100755 --- a/bin/printversion.sh +++ b/bin/printversion.sh @@ -1,3 +1,3 @@ #!/bin/bash -VERSION="1.9.0" +VERSION="1.10.2" echo "VERSION=$VERSION" >> $GITHUB_ENV diff --git a/native/Cargo.lock b/native/Cargo.lock index 7f26789..628620c 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -110,7 +110,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -121,7 +121,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -138,9 +138,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" +checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" +checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96" dependencies = [ "bindgen", "cc", @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c41b948da08fb481a94546cd874843adc1142278b0af4badf9b1b78599d68d" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -184,7 +184,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower 0.5.1", "tower-layer", "tower-service", @@ -205,7 +205,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -301,7 +301,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.87", + "syn 2.0.89", "which", ] @@ -425,7 +425,7 @@ dependencies = [ [[package]] name = "build_utils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" [[package]] name = "bumpalo" @@ -565,6 +565,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -573,9 +583,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -696,7 +706,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -738,7 +748,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -915,7 +925,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -978,7 +988,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1007,9 +1017,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1166,9 +1176,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -1390,7 +1400,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1487,9 +1497,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "jobserver" @@ -1555,9 +1565,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.162" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libloading" @@ -1744,7 +1754,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -1771,7 +1781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", "syn-mid", ] @@ -1890,7 +1900,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2070,7 +2080,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2133,7 +2143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2155,14 +2165,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2214,7 +2224,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.87", + "syn 2.0.89", "tempfile", ] @@ -2228,7 +2238,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2477,7 +2487,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration", "tokio", "tokio-native-tls", @@ -2533,7 +2543,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.87", + "syn 2.0.89", "walkdir", ] @@ -2561,9 +2571,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.40" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags", "errno", @@ -2574,9 +2584,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "aws-lc-rs", "log", @@ -2590,15 +2600,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ "openssl-probe", - "rustls-pemfile", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.0.1", ] [[package]] @@ -2695,9 +2704,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -2742,7 +2751,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -2797,14 +2819,14 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -2946,9 +2968,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -2963,7 +2985,7 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2974,9 +2996,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -2989,7 +3011,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2999,7 +3021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -3060,7 +3082,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3071,7 +3093,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "test-case-core", ] @@ -3092,7 +3114,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3185,7 +3207,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3264,7 +3286,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", ] [[package]] @@ -3278,7 +3300,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3347,7 +3369,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3426,9 +3448,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -3519,7 +3541,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3578,7 +3600,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -3612,7 +3634,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3641,9 +3663,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -3925,7 +3947,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -4132,7 +4154,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4152,7 +4174,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -4173,7 +4195,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4195,13 +4217,13 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "zingo-memo" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" dependencies = [ "zcash_address", "zcash_client_backend", @@ -4213,7 +4235,7 @@ dependencies = [ [[package]] name = "zingo-netutils" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" dependencies = [ "http", "http-body", @@ -4233,7 +4255,7 @@ dependencies = [ [[package]] name = "zingo-status" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" dependencies = [ "zcash_primitives", ] @@ -4241,7 +4263,7 @@ dependencies = [ [[package]] name = "zingo-sync" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" dependencies = [ "base58", "crossbeam-channel", @@ -4254,6 +4276,7 @@ dependencies = [ "sapling-crypto", "sha2", "shardtree", + "thiserror", "tokio", "tonic", "tracing", @@ -4269,7 +4292,7 @@ dependencies = [ [[package]] name = "zingolib" version = "0.2.0" -source = "git+https://github.com/zingolabs/zingolib?tag=1.9.0#5fcc9748b529528846703a8fd9c2836692688227" +source = "git+https://github.com/zingolabs/zingolib?tag=1.10.2#af354754bbf254aeadf48f057f653c2667c07cdd" dependencies = [ "append-only-vec", "base58", diff --git a/native/Cargo.toml b/native/Cargo.toml index e452941..6009517 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zingolib = { git="https://github.com/zingolabs/zingolib", default-features=true, tag = "1.9.0", features=["test-elevation"] } +zingolib = { git="https://github.com/zingolabs/zingolib", default-features=true, tag = "1.10.2", features=["test-elevation"] } http = "1.1.0" lazy_static = "1.4.0" tokio = { version = "1.24", features = ["full"] } diff --git a/package.json b/package.json index 429814f..760fc50 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zingo-pc", "productName": "Zingo PC", - "version": "1.9.0", + "version": "1.10.2", "private": true, "description": "Zingo PC", "license": "MIT", diff --git a/src/App.tsx b/src/App.tsx index dfcf5da..0b26f68 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -8,7 +8,7 @@ function App() {

Built using CRA electron-builder-typescript Template.

logo -

Zingo PC v1.9.0

+

Zingo PC v1.10.2

Edit public/electron.js or src/App.js and save to reload.

diff --git a/src/components/logo/Logo.tsx b/src/components/logo/Logo.tsx index 1f7b5fd..691beec 100644 --- a/src/components/logo/Logo.tsx +++ b/src/components/logo/Logo.tsx @@ -11,7 +11,7 @@ const Logo = ({ readOnly }: LogoProps) => { return ( <> -
Zingo PC v1.9.0
+
Zingo PC v1.10.2
logo {readOnly && ( diff --git a/src/components/send/components/ConfirmModal.tsx b/src/components/send/components/ConfirmModal.tsx index 29245eb..70fcf95 100644 --- a/src/components/send/components/ConfirmModal.tsx +++ b/src/components/send/components/ConfirmModal.tsx @@ -236,13 +236,13 @@ type ConfirmModalProps = {
{txids.length > 1 && ( -
Utils.openTxid(txids[1], info.currencyName)}> +
Utils.openTxid(txids[1], info.currencyName)}> View TXID  
)} {txids.length > 2 && ( -
Utils.openTxid(txids[2], info.currencyName)}> +
Utils.openTxid(txids[2], info.currencyName)}> View TXID  
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index f4e17e5..991f4b1 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -90,7 +90,7 @@ const Sidebar: React.FC = ({ openErrorModal( "Zingo PC",
-
Zingo PC v1.9.0
+
Zingo PC v1.10.2
Built with Electron. Copyright (c) 2024, ZingoLabs.
The MIT License (MIT) Copyright (c) 2024 ZingoLabs diff --git a/src/root/Routes.tsx b/src/root/Routes.tsx index 28f4f4a..0176dbd 100644 --- a/src/root/Routes.tsx +++ b/src/root/Routes.tsx @@ -41,7 +41,6 @@ import ServerSelectModal from "../components/serverselectmodal/ServerSelectModal import { ContextAppProvider, defaultAppState } from "../context/ContextAppState"; import native from "../native.node"; -import deepDiff from "deep-diff"; import { Messages } from "../components/messages"; type Props = {}; @@ -210,7 +209,7 @@ class Routes extends React.Component { }; setTotalBalance = (totalBalance: TotalBalance) => { - if (deepDiff(totalBalance, this.state.totalBalance)) { + if (!isEqual(totalBalance, this.state.totalBalance)) { console.log('=============== total balance', totalBalance); this.setState({ totalBalance }); } @@ -275,14 +274,14 @@ class Routes extends React.Component { }; setValueTransferList = (valueTransfers: ValueTransfer[]) => { - if (deepDiff(valueTransfers, this.state.valueTransfers)) { + if (!isEqual(valueTransfers, this.state.valueTransfers)) { console.log('=============== ValueTransfer list', valueTransfers); this.setState({ valueTransfers }); } }; setMessagesList = (messages: ValueTransfer[]) => { - if (deepDiff(messages, this.state.messages)) { + if (!isEqual(messages, this.state.messages)) { console.log('=============== ValueTransfer Messages list', messages); this.setState({ messages }); } @@ -553,13 +552,13 @@ class Routes extends React.Component {
{resultJSON.txids.length > 1 && ( -
Utils.openTxid(resultJSON.txids[1], this.state.info.currencyName)}> +
Utils.openTxid(resultJSON.txids[1], this.state.info.currencyName)}> View TXID  
)} {resultJSON.txids.length > 2 && ( -
Utils.openTxid(resultJSON.txids[2], this.state.info.currencyName)}> +
Utils.openTxid(resultJSON.txids[2], this.state.info.currencyName)}> View TXID  
diff --git a/src/rpc/rpc.ts b/src/rpc/rpc.ts index 706fa91..e3414ee 100644 --- a/src/rpc/rpc.ts +++ b/src/rpc/rpc.ts @@ -921,50 +921,12 @@ export default class RPC { //console.log(vtList); - // we need to sort this list for history... - // to sort the data here can be better - // we need to sort the array properly. - // by: - // - time - // - txid - // - address - // - pool - const vtListSorted = [...vtList].sort((a: any, b: any) => { - const timeComparison = b.time - a.time; - if (timeComparison === 0) { - // same time - const txidComparison = a.txid.localeCompare(b.txid); - if (txidComparison === 0) { - // same txid - const aAddress = a.address?.toString() || ''; - const bAddress = b.address?.toString() || ''; - const addressComparison = aAddress.localeCompare(bAddress); - if (addressComparison === 0) { - // same address - const aPoolType = a.poolType?.toString() || ''; - const bPoolType = b.poolType?.toString() || ''; - // last one sort criteria - poolType. - return aPoolType.localeCompare(bPoolType); - } else { - // different address - return addressComparison; - } - } else { - // different txid - return txidComparison; - } - } else { - // different time - return timeComparison; - } - }) - - this.fnSetValueTransfersList(vtListSorted); + this.fnSetValueTransfersList(vtList); } // Fetch all T and Z and O value transfers async fetchTandZandOMessages(latestBlockHeight: number) { - const MessagesJSON: any = await this.zingolibValueTransfers(); + const MessagesJSON: any = await this.zingolibMessages(); //console.log('value transfers antes ', valueTransfersJSON); @@ -1019,45 +981,7 @@ export default class RPC { //console.log(mList); - // we need to sort this list for messages... - // to sort the data here can be better - // we need to sort the array properly. - // by: - // - time (reverse) - // - txid - // - address - // - pool - const mListSorted = [...mList].sort((a: ValueTransfer, b: ValueTransfer) => { - const timeComparison = a.time - b.time; // reverse - if (timeComparison === 0) { - // same time - const txidComparison = a.txid.localeCompare(b.txid); - if (txidComparison === 0) { - // same txid - const aAddress = a.address?.toString() || ''; - const bAddress = b.address?.toString() || ''; - const addressComparison = aAddress.localeCompare(bAddress); - if (addressComparison === 0) { - // same address - const aPoolType = a.pool?.toString() || ''; - const bPoolType = b.pool?.toString() || ''; - // last one sort criteria - poolType. - return aPoolType.localeCompare(bPoolType); - } else { - // different address - return addressComparison; - } - } else { - // different txid - return txidComparison; - } - } else { - // different time - return timeComparison; - } - }); - - this.fnSetMessagesList(mListSorted); + this.fnSetMessagesList(mList); } // Send a transaction using the already constructed sendJson structure @@ -1091,7 +1015,7 @@ export default class RPC { if (respJSON.error) { console.log(`Error confirming Tx: ${respJSON.error}`); throw Error(respJSON.error); - } else if (respJSON.txids) { + } else if (respJSON.txids && respJSON.txids.length > 0) { sendTxids = respJSON.txids as string[]; } else { console.log(`Error confirming: no error, no txids `); @@ -1144,7 +1068,7 @@ export default class RPC { return; } - if (!progressJSON.txid && !progressJSON.error && !sendTxids) { + if ((!progressJSON.txids || progressJSON.txids.length === 0) && !progressJSON.error && !sendTxids) { // Still processing setSendProgress(updatedProgress); return; @@ -1154,12 +1078,11 @@ export default class RPC { clearInterval(intervalID); setSendProgress(undefined); - if (progressJSON.txid) { + if (progressJSON.txids && progressJSON.txids.length > 0) { // And refresh data (full refresh) this.refresh(true); - const progressTxids: string[] = progressJSON.txids; - resolve(progressTxids as string[]); + resolve(progressJSON.txids as string[]); } if (progressJSON.error) {