diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66739712..47f59bfb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: uses: baptiste0928/cargo-install@v3 with: crate: tauri-cli - version: "2.0.0-beta.15" + version: "2.0.0-rc.0" - uses: tauri-apps/tauri-action@v0 env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb7259d3..8bae9f1d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,7 @@ jobs: uses: baptiste0928/cargo-install@v3 with: crate: tauri-cli - version: "2.0.0-beta.15" + version: "2.0.0-rc.0" - uses: tauri-apps/tauri-action@v0 env: diff --git a/package-lock.json b/package-lock.json index 537813f6..cf19f776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2651,11 +2651,25 @@ } }, "node_modules/@tauri-apps/plugin-deep-link": { - "version": "2.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-deep-link/-/plugin-deep-link-2.0.0-beta.3.tgz", - "integrity": "sha512-PCaIyr5vi8VQkw8hWgLe5EH9ZI1w9UI5kyzn7E1grlKbBA9NZwwdtSCqc9I4Ywd9/H8Ek3KQJwnSnsOoAUs5XQ==", + "version": "2.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-deep-link/-/plugin-deep-link-2.0.0-rc.0.tgz", + "integrity": "sha512-LdwxGeQAkxbOYBcamfOT6hAokstkhKz7t5mZcm5wCoUSTPIzMX/+7lNS8hsQouiTg7EXCXGaLW3nzwF9qwMA6g==", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.11" + "@tauri-apps/api": "^2.0.0-rc.0" + } + }, + "node_modules/@tauri-apps/plugin-deep-link/node_modules/@tauri-apps/api": { + "version": "2.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-rc.0.tgz", + "integrity": "sha512-v454Qs3REHc3Za59U+/eSmBsdmF+3NE5+76+lFDaitVqN4ZglDHENDaMARYKGJVZuxiSkzyqG0SeG7lLQjVkPA==", + "engines": { + "node": ">= 18.18", + "npm": ">= 6.6.0", + "yarn": ">= 1.19.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/tauri" } }, "node_modules/@tauri-apps/plugin-process": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index cedb0ae3..84f201b6 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -250,6 +250,15 @@ dependencies = [ "xdg", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -422,7 +431,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avail-common" version = "0.6.0" -source = "git+https://github.com/availx/avail-lib?rev=9093fad#9093fadbfbbc95cebdb7001e38110d9d0b325773" +source = "git+https://github.com/availx/avail-lib?rev=ac15b80#ac15b80f03484ef6911d200cec142732a95e1192" dependencies = [ "aes-gcm", "app_dirs2", @@ -443,6 +452,7 @@ dependencies = [ "serde", "serde_json", "snarkvm", + "time", "tokio", "tracing", "ureq", @@ -452,7 +462,7 @@ dependencies = [ [[package]] name = "avail_wallet" -version = "0.4.3" +version = "0.4.4" dependencies = [ "app_dirs2", "avail-common", @@ -490,6 +500,7 @@ dependencies = [ "tauri-plugin-updater", "tauri-utils", "tid-rs", + "time", "tiny-bip39", "tokio", "tokio-rayon", @@ -526,12 +537,6 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bech32" version = "0.9.1" @@ -579,7 +584,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -590,7 +595,7 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -696,27 +701,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cairo-rs" version = "0.18.5" @@ -789,10 +773,6 @@ name = "cc" version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" -dependencies = [ - "jobserver", - "libc", -] [[package]] name = "cesu8" @@ -986,10 +966,24 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "tiny-keccak", +] [[package]] name = "constant_time_eq" @@ -1082,9 +1076,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1125,12 +1119,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1266,6 +1257,16 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1277,6 +1278,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.49", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1319,16 +1331,6 @@ dependencies = [ "dirs-sys 0.4.1", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" version = "0.3.7" @@ -1352,23 +1354,23 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dispatch" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.49", +] + [[package]] name = "dlib" version = "0.5.2" @@ -1401,6 +1403,15 @@ dependencies = [ "syn 2.0.49", ] +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + [[package]] name = "dotenv" version = "0.15.0" @@ -1566,6 +1577,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.8" @@ -2651,15 +2672,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.64" @@ -2915,9 +2927,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2978,9 +2990,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ "cocoa", "crossbeam-channel", @@ -3120,6 +3132,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -3340,6 +3358,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown 0.14.5", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -3410,17 +3438,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -3434,9 +3451,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest", - "hmac", - "password-hash", - "sha2", ] [[package]] @@ -3678,6 +3692,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4175,10 +4195,21 @@ checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc" dependencies = [ "base64 0.21.2", "blake2b_simd", - "constant_time_eq 0.3.0", + "constant_time_eq", "crossbeam-utils", ] +[[package]] +name = "rust-ini" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" +dependencies = [ + "cfg-if", + "ordered-multimap", + "trim-in-place", +] + [[package]] name = "rust_decimal" version = "1.32.0" @@ -4348,9 +4379,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -4362,14 +4393,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote 1.0.35", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.49", ] [[package]] @@ -4525,6 +4556,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + [[package]] name = "serde_derive" version = "1.0.196" @@ -4538,13 +4580,13 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.49", ] [[package]] @@ -4740,7 +4782,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "anstyle", "anyhow", @@ -4769,7 +4811,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -4799,7 +4841,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4813,7 +4855,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -4824,7 +4866,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4834,7 +4876,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4844,7 +4886,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "itertools", @@ -4862,12 +4904,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4878,7 +4920,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4893,7 +4935,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4908,7 +4950,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4921,7 +4963,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4930,7 +4972,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4940,7 +4982,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4952,7 +4994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4964,7 +5006,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4975,7 +5017,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4987,7 +5029,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -5000,7 +5042,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "bs58", "snarkvm-console-network", @@ -5011,7 +5053,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "blake2s_simd", "smallvec", @@ -5024,7 +5066,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "rayon", @@ -5035,7 +5077,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -5058,7 +5100,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "anyhow", "bech32", @@ -5076,7 +5118,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "enum-iterator", "enum_index", @@ -5098,7 +5140,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -5113,7 +5155,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5124,7 +5166,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", ] @@ -5132,7 +5174,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5142,7 +5184,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5153,7 +5195,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5164,7 +5206,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5175,7 +5217,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5186,7 +5228,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "rand 0.8.5", "rayon", @@ -5200,7 +5242,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5217,7 +5259,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5241,7 +5283,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "anyhow", "rand 0.8.5", @@ -5253,7 +5295,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "rayon", @@ -5262,6 +5304,7 @@ dependencies = [ "snarkvm-ledger-authority", "snarkvm-ledger-committee", "snarkvm-ledger-narwhal-batch-header", + "snarkvm-ledger-narwhal-data", "snarkvm-ledger-narwhal-subdag", "snarkvm-ledger-narwhal-transmission-id", "snarkvm-ledger-puzzle", @@ -5272,7 +5315,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "rayon", @@ -5284,7 +5327,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -5297,7 +5340,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "rayon", @@ -5310,7 +5353,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "rayon", @@ -5322,7 +5365,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "bytes", "serde_json", @@ -5333,7 +5376,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "rayon", @@ -5348,7 +5391,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "bytes", "serde_json", @@ -5361,7 +5404,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -5370,7 +5413,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5390,7 +5433,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5411,7 +5454,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "async-trait", "reqwest 0.11.20", @@ -5424,7 +5467,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std-storage", "anyhow", @@ -5447,7 +5490,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5472,7 +5515,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5488,6 +5531,7 @@ dependencies = [ "snarkvm-console", "snarkvm-ledger-block", "snarkvm-ledger-committee", + "snarkvm-ledger-narwhal-data", "snarkvm-ledger-puzzle", "snarkvm-ledger-puzzle-epoch", "snarkvm-ledger-query", @@ -5502,7 +5546,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "colored", @@ -5525,7 +5569,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "indexmap 2.2.6", "paste", @@ -5539,7 +5583,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "bincode", "once_cell", @@ -5552,7 +5596,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "aleo-std", "anyhow", @@ -5573,7 +5617,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoNet/snarkVM?rev=d170a9f#d170a9f7c5ef980f9392301dc899dee355599ca6" +source = "git+https://github.com/AleoNet/snarkVM?rev=be171ce#be171ce0720544c2bc51e27e1674a62fff585adc" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -5840,9 +5884,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.27.1" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bcf8885e147b56d6e26751263b45876284f32ca404703f6d3b8f80d16ff4dd" +checksum = "ea538df05fbc2dcbbd740ba0cfe8607688535f4798d213cbbfa13ce494f3451f" dependencies = [ "bitflags 2.4.0", "cocoa", @@ -5871,7 +5915,7 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.56.0", + "windows 0.57.0", "windows-core", "windows-version", "x11-dl", @@ -5907,14 +5951,14 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" -version = "2.0.0-beta.17" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266" +checksum = "255e746089a370802ec4eb896dccc6f27c1dd2a203c1dc484fd996db954e2300" dependencies = [ "anyhow", "bytes", "cocoa", - "dirs-next", + "dirs 5.0.1", "dunce", "embed_plist", "futures-util", @@ -5951,18 +5995,18 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "tauri-build" -version = "2.0.0-beta.13" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abcf98a9b4527567c3e5ca9723431d121e001c2145651b3fa044d22b5e025a7e" +checksum = "85ceb8d082c3b17b4b2eb134a39363a22c696ddba473d6e5c0ab1caadad4cfca" dependencies = [ "anyhow", "cargo_toml", - "dirs-next", + "dirs 5.0.1", "glob", "heck 0.5.0", "json-patch", @@ -5978,9 +6022,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.13" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b383f341efb803852b0235a2f330ca90c4c113f422dd6d646b888685b372cace" +checksum = "2407c7d37a491b16e530445c9611d91091cae198eea2ed424913b740215605f2" dependencies = [ "base64 0.22.0", "brotli", @@ -6005,11 +6049,11 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.13" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71be71718cfe48b149507157bfbad0e2ba0e98ea51658be26c7c677eb188fb0c" +checksum = "d210893b693be00f569b4f54456803debe104b7675f368205f2b6e94bac09b34" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote 1.0.35", "syn 2.0.49", @@ -6019,9 +6063,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.13" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6baaee0a083db1e04a1b7a3b0670d86a4d95dd2a54e7cbfb5547762b8ed098d9" +checksum = "b352e4478af27bd7c76724bb426ebb32fc51baafb2186afabed4e706dc9e39d4" dependencies = [ "anyhow", "glob", @@ -6036,24 +6080,29 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "2.0.0-beta.3" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1aee2af6aec05ace816d46da0b0c0bdb4fcd0c985c0f14634a50c860824435" +checksum = "3db97f4b54f2e6f24681c3fffbcb7e9cfff24003b92bb8d3944a39072b8a1178" dependencies = [ + "dunce", "log", + "rust-ini", "serde", "serde_json", "tauri", "tauri-plugin", + "tauri-utils", "thiserror", "url", + "windows-registry", + "windows-result 0.2.0", ] [[package]] name = "tauri-plugin-fs" -version = "2.0.0-beta.7" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35377195c6923beda5f29482a16b492d431de964389fca9aaf81a0f7e908023f" +checksum = "5df6b25b1f2b7b61565e66c4dbee9eb39e5635d2a763206e380e07cc3f601a67" dependencies = [ "anyhow", "glob", @@ -6070,9 +6119,9 @@ dependencies = [ [[package]] name = "tauri-plugin-http" -version = "2.0.0-beta.7" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2c535106b7a8c2e7c5abdb4b81568b185f0b00bb0d64c37e06a5f0a9729155" +checksum = "1eef17218eaa8bd0fc6cafb7831c63d82ef83b3950d59dc817d92d5320c4f20c" dependencies = [ "data-url", "http 1.1.0", @@ -6085,15 +6134,16 @@ dependencies = [ "tauri-plugin", "tauri-plugin-fs", "thiserror", + "tokio", "url", "urlpattern", ] [[package]] name = "tauri-plugin-process" -version = "2.0.0-beta.3" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11215c3615299090e97f37341ae4b01f518bc1d43e9c4391144c0e5e3b7d4f01" +checksum = "96d3663df0cd3e96feb37d46aad5d499d2edfcca5c62548ad34f1684e0019168" dependencies = [ "tauri", "tauri-plugin", @@ -6101,12 +6151,12 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-beta.5" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1a632f5b0cc00911c3f379b0b69a4ccf5fd22eb10d022010dfb02717d5b6bc" +checksum = "5b5f10ba18d2fc65e16bdf053b7beccb621dcf880c52d2ab08bdeb2d685e3e14" dependencies = [ "base64 0.22.0", - "dirs-next", + "dirs 5.0.1", "flate2", "futures-util", "http 1.1.0", @@ -6130,9 +6180,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.14" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148b6e6aff8e63fe5d4ae1d50159d50cfc0b4309abdeca64833c887c6b5631ef" +checksum = "6624fdf383ccafc9e8ad9205fe6e5c976b318efcd6b3662dde658c74e4254792" dependencies = [ "dpi", "gtk", @@ -6144,14 +6194,14 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.14" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398d065c6e0fbf3c4304583759b6e153bc1e0daeb033bede6834ebe4df371fc3" +checksum = "9fd1a785c4281f8231b091593393b40cb3a800810c407b1ffed52de27ff1640a" dependencies = [ "cocoa", "gtk", @@ -6167,22 +6217,21 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.56.0", + "windows 0.57.0", "wry", ] [[package]] name = "tauri-utils" -version = "2.0.0-beta.13" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4709765385f035338ecc330f3fba753b8ee283c659c235da9768949cdb25469" +checksum = "6f435eeaae1e69cf93cf19da0f727989eed2e5eb6fc63a8d21432f59dd3ac4ac" dependencies = [ "brotli", "cargo_metadata", "ctor", "dunce", "glob", - "heck 0.5.0", "html5ever", "infer", "json-patch", @@ -6196,6 +6245,7 @@ dependencies = [ "schemars", "semver", "serde", + "serde-untagged", "serde_json", "serde_with", "swift-rs", @@ -6248,18 +6298,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -6292,11 +6342,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa 1.0.6", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -6304,16 +6357,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -6587,14 +6641,14 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c" +checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60" dependencies = [ "cocoa", "core-graphics", "crossbeam-channel", - "dirs-next", + "dirs 5.0.1", "libappindicator", "muda", "objc", @@ -6614,12 +6668,24 @@ dependencies = [ "serde_json", ] +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + [[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -7087,13 +7153,13 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c914dd492a52f0377bef56fd1b6e74a79090f9ee631d625d5b505a00e4538b6" +checksum = "6516cfa64c6b3212686080eeec378e662c2af54bb2a5b2a22749673f5cb2226f" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.56.0", + "windows 0.57.0", "windows-core", "windows-implement", "windows-interface", @@ -7112,12 +7178,12 @@ dependencies = [ [[package]] name = "webview2-com-sys" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a46bcf03482ec28eeb764ca788f67998cde4213adfbbfa90462622058530f5e" +checksum = "c76d5b77320ff155660be1df3e6588bc85c75f1a9feef938cc4dc4dd60d1d7cf" dependencies = [ "thiserror", - "windows 0.56.0", + "windows 0.57.0", "windows-core", ] @@ -7186,31 +7252,31 @@ dependencies = [ [[package]] name = "windows" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement", "windows-interface", - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.1", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -7219,22 +7285,52 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote 1.0.35", "syn 2.0.49", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -7261,7 +7357,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7296,18 +7392,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -7316,7 +7412,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7333,9 +7429,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -7351,9 +7447,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -7369,15 +7465,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -7393,9 +7489,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -7411,9 +7507,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -7429,9 +7525,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -7447,9 +7543,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -7501,9 +7597,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.39.3" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e180ac2740d6cb4d5cec0abf63eacbea90f1b7e5e3803043b13c1c84c4b7884" +checksum = "68b00c945786b02d7805d09a969fa36d0eee4e0bd4fb3ec2a79d2bf45a1b44cd" dependencies = [ "base64 0.22.0", "block", @@ -7535,7 +7631,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.56.0", + "windows 0.57.0", "windows-core", "windows-version", "x11-dl", @@ -7697,51 +7793,17 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" dependencies = [ - "aes 0.8.3", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", + "arbitrary", "crc32fast", "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", + "displaydoc", + "indexmap 2.2.6", + "memchr", + "thiserror", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4cf9692a..59da2f01 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avail_wallet" -version = "0.4.3" +version = "0.4.4" description = "Avail Wallet | Make it yours." authors = ["Avail"] license = "Apache-2.0" @@ -14,14 +14,14 @@ crate-type = ["staticlib", "cdylib", "rlib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-plugin-fs = { version = "=2.0.0-beta.7", features = [] } -tauri-plugin = { version = "=2.0.0-beta.13", features = [] } -tauri-utils = { version = "=2.0.0-beta.13", features = [] } -tauri-build = { version = "=2.0.0-beta.13", features = [] } +tauri-plugin-fs = { version = "=2.0.0-rc.0", features = [] } +tauri-plugin = { version = "=2.0.0-rc.0", features = [] } +tauri-utils = { version = "=2.0.0-rc.0", features = [] } +tauri-build = { version = "=2.0.0-rc.0", features = [] } [dependencies] -avail-common = { git = "https://github.com/availx/avail-lib", rev = "9093fad", features = [ +avail-common = { git = "https://github.com/availx/avail-lib", rev = "ac15b80", features = [ "snarkvm", ] } app_dirs = { package = "app_dirs2", version = "2.5" } @@ -44,14 +44,15 @@ rusqlite = { version = "0.29.0", features = ["bundled", "chrono"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.120" snarkvm = { features = [ -], git = "https://github.com/AleoNet/snarkVM", rev = "d170a9f" } +], git = "https://github.com/AleoNet/snarkVM", rev = "be171ce" } ssss = "0.2.0" -tauri = { version = "2.0.0-beta.17", features = [] } -tauri-plugin-deep-link = "=2.0.0-beta.3" -tauri-plugin-http = { version = "2.0.0-beta.7", features = ["cookies"] } -tauri-plugin-updater = { version = "2.0.0-beta.5", features = [] } -tauri-plugin-process = "=2.0.0-beta.3" +tauri = { version = "2.0.0-rc.0", features = [] } +tauri-plugin-deep-link = "=2.0.0-rc.0" +tauri-plugin-http = { version = "2.0.0-rc.0", features = ["cookies"] } +tauri-plugin-updater = { version = "2.0.0-rc.0", features = [] } +tauri-plugin-process = "2.0.0-rc.0" tiny-bip39 = "1.0.0" +time = "0.3.36" tokio = { version = "1.29.1", features = ["full"] } tokio-rayon = "2.1.0" ureq = { version = "2.7.1", features = ["json"] } @@ -62,6 +63,8 @@ zeroize = { version = "1.7.0", features = [ "zeroize_derive", "alloc", ] } +# tauri-plugin-deep-link = "0.1.2" +# tauri-plugin-deep-link = "2.0.0-beta.3" [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] keyring = "2.0.5" diff --git a/src-tauri/Info.plist b/src-tauri/Info.plist deleted file mode 100644 index f861e2cf..00000000 --- a/src-tauri/Info.plist +++ /dev/null @@ -1,47 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - Avail - CFBundleExecutable - Avail - CFBundleIconFile - icon.icns - CFBundleIdentifier - com.avail.wallet - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Avail - CFBundlePackageType - APPL - CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLName - com.example.avail - CFBundleURLSchemes - - avail - - - - CFBundleShortVersionString - 0.4.3 - CFBundleVersion - 20240222.152850 - CSResourcesFileMapped - - LSMinimumSystemVersion - 10.13 - LSRequiresCarbon - - NSHighResolutionCapable - - - \ No newline at end of file diff --git a/src-tauri/capabilities/capabilities.toml b/src-tauri/capabilities/capabilities.toml index e0f74f0f..61e4a561 100644 --- a/src-tauri/capabilities/capabilities.toml +++ b/src-tauri/capabilities/capabilities.toml @@ -1,25 +1,26 @@ -"$schema" = "./schemas/desktop-schema.toml" -identifier = "main-capability" -description = "Capability for the main window" -windows = ["main", "wallet-connect"] permissions = [ - "path:default", - "event:default", - "event:allow-listen", - "window:default", - "window:allow-create", - "window:allow-close", + "core:default", + # "core:path:default", + # "core:event:default", + "core:event:allow-listen", + # "core:window:default", + "core:window:allow-create", + "core:window:allow-close", "updater:allow-check", - "updater:default", + # "core:updater:default", "process:allow-restart", - "window:allow-set-title", - "window:allow-destroy", - "webview:allow-create-webview-window", - "webview:allow-create-webview", - "webview:allow-webview-close", - "webview:default", - "app:default", - "resources:default", - "menu:default", - "tray:default", + "core:window:allow-set-title", + "core:window:allow-destroy", + "core:webview:allow-create-webview-window", + "core:webview:allow-create-webview", + "core:webview:allow-webview-close", + # "core:webview:default", + # "core:app:default", + "core:resources:default", + # "core:menu:default", + # "core:tray:default", ] +"$schema" = "./schemas/desktop-schema.toml" +identifier = "main-capability" +description = "Capability for the main window" +windows = ["main", "wallet-connect"] diff --git a/src-tauri/entitlements.plist b/src-tauri/entitlements.plist new file mode 100644 index 00000000..07643a31 --- /dev/null +++ b/src-tauri/entitlements.plist @@ -0,0 +1,8 @@ + + + + + com.apple.security.device.camera + + + \ No newline at end of file diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c58f1308..4278352e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -37,6 +37,8 @@ use services::record_handling::{ sync::{blocks_sync, sync_backup, txs_sync}, transfer::{pre_install_inclusion_prover, transfer}, }; +use tauri::Emitter; +use tauri::Listener; use tauri::Manager; use tauri_plugin_deep_link::DeepLinkExt; // wallet connect services diff --git a/src-tauri/src/models/pointers/record.rs b/src-tauri/src/models/pointers/record.rs index db11d5af..90f5f425 100644 --- a/src-tauri/src/models/pointers/record.rs +++ b/src-tauri/src/models/pointers/record.rs @@ -92,7 +92,7 @@ impl AvailRecord { ) -> AvailResult { let encrypted_struct = encrypted_data_record.to_enrypted_struct::()?; let record = decrypt::(encrypted_struct)?; - let api_client = setup_local_client::(); + let api_client = setup_client::()?; let ts = api_client .get_block(record.pointer.block_height)? .timestamp(); diff --git a/src-tauri/src/models/pointers/transition.rs b/src-tauri/src/models/pointers/transition.rs index 3732bf92..d1a97dc0 100644 --- a/src-tauri/src/models/pointers/transition.rs +++ b/src-tauri/src/models/pointers/transition.rs @@ -126,7 +126,7 @@ impl TransitionPointer { let address = get_address::()?; let encrypted_struct = encrypted_data_record.to_enrypted_struct::()?; let record = decrypt::(encrypted_struct)?; - let api_client = setup_local_client::(); + let api_client = setup_client::()?; let ts = api_client.get_block(record.block_height)?.timestamp(); let created_at: DateTime = get_timestamp_from_i64(ts)?.with_timezone(&Utc); println!( diff --git a/src-tauri/src/services/record_handling/records.rs b/src-tauri/src/services/record_handling/records.rs index 2e93cb5f..82e084ad 100644 --- a/src-tauri/src/services/record_handling/records.rs +++ b/src-tauri/src/services/record_handling/records.rs @@ -9,13 +9,6 @@ use snarkvm::{ use std::ops::Sub; use tauri::{Manager, Window}; -use rayon::prelude::*; -use std::sync::{ - atomic::{AtomicBool, AtomicUsize, Ordering}, - Arc, Mutex, -}; -use std::time::Duration; - use crate::{ api::{ aleo_client::{setup_aleo_client, setup_client, setup_local_client}, @@ -47,6 +40,13 @@ use crate::{ }, }, }; +use rayon::prelude::*; +use std::sync::{ + atomic::{AtomicBool, AtomicUsize, Ordering}, + Arc, Mutex, +}; +use std::time::Duration; +use tauri::Emitter; use avail_common::{ aleo_tools::program_manager::Credits, diff --git a/src-tauri/src/services/record_handling/sync.rs b/src-tauri/src/services/record_handling/sync.rs index 96458b72..38d86af7 100644 --- a/src-tauri/src/services/record_handling/sync.rs +++ b/src-tauri/src/services/record_handling/sync.rs @@ -264,8 +264,8 @@ pub async fn sync_backup() -> AvailResult<()> { // get timestamp from block let api_client = match SupportedNetworks::from_str(&network)? { - SupportedNetworks::Testnet => setup_local_client::(), - _ => setup_local_client::(), + SupportedNetworks::Testnet => setup_client::()?, + _ => setup_client::()?, }; let block = api_client.get_block(last_sync)?; diff --git a/src-tauri/src/services/record_handling/transfer.rs b/src-tauri/src/services/record_handling/transfer.rs index e21aa251..242a8cde 100644 --- a/src-tauri/src/services/record_handling/transfer.rs +++ b/src-tauri/src/services/record_handling/transfer.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Local}; use dirs; use snarkvm::{ledger::transactions::ConfirmedTransaction, prelude::*}; -use tauri::{Manager, Window}; +use tauri::{Emitter, Manager, Window}; use tauri_plugin_http::reqwest; use std::{fs, path::PathBuf}; diff --git a/src-tauri/src/services/record_handling/utils.rs b/src-tauri/src/services/record_handling/utils.rs index 2d2e45cb..e899681a 100644 --- a/src-tauri/src/services/record_handling/utils.rs +++ b/src-tauri/src/services/record_handling/utils.rs @@ -13,6 +13,7 @@ use snarkvm::utilities::ToBits; use std::collections::HashMap; use std::ops::Sub; use std::str::FromStr; +use tauri::Emitter; use tauri::{Manager, Window}; use crate::api::{ diff --git a/src-tauri/src/services/wallet_connect_api.rs b/src-tauri/src/services/wallet_connect_api.rs index d78d30b4..3e9b2b0d 100644 --- a/src-tauri/src/services/wallet_connect_api.rs +++ b/src-tauri/src/services/wallet_connect_api.rs @@ -38,6 +38,7 @@ use crate::models::wallet_connect::{ }; use chrono::Local; use std::str::FromStr; +use tauri::Emitter; use snarkvm::circuit::Aleo; use snarkvm::{ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 334004a9..4b262a5d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -16,7 +16,13 @@ "icons/icon.icns", "icons/icon.ico" ], - "targets": "all" + "targets": "all", + "createUpdaterArtifacts": "v1Compatible", + "macOS": { + "signingIdentity": "-", + "entitlements": "entitlements.plist", + "hardenedRuntime": true + } }, "plugins": { "updater": { @@ -33,7 +39,20 @@ "avail://" ] } - ] + ], + "mobile": [ + { + "host": "com.avail.wallet", + "pathPrefix": [ + "avail://" + ] + } + ], + "desktop": { + "schemes": [ + "avail" + ] + } } }, "app": { @@ -53,4 +72,4 @@ } ] } -} +} \ No newline at end of file