From c8f134ca6f31003ecfc9c6e9a777313366d42cde Mon Sep 17 00:00:00 2001 From: Lukas Korba Date: Fri, 14 Jun 2024 12:14:05 +0200 Subject: [PATCH] [#1449] Checkpoints and ffi update - FFI updated to 0.8.1 - Checkpoints updated - Changelog updated --- CHANGELOG.md | 13 +++++ .../xcshareddata/swiftpm/Package.resolved | 48 +++++++++---------- Package.swift | 2 +- .../checkpoints/mainnet/2532500.json | 8 ++++ .../checkpoints/mainnet/2535000.json | 8 ++++ .../checkpoints/mainnet/2537500.json | 8 ++++ .../checkpoints/mainnet/2540000.json | 8 ++++ 7 files changed, 70 insertions(+), 25 deletions(-) create mode 100644 Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2532500.json create mode 100644 Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2535000.json create mode 100644 Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2537500.json create mode 100644 Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2540000.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 457abfed..b443f1d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,19 @@ and this library adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Unreleased +## Fixed +- Further changes for compatibility with Xcode 15.3 and above. + +## Checkpoints + +Mainnet + +```` +Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2532500.json +... +Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2540000.json +```` + # 2.1.9 - 2024-06-05 ## Fixed diff --git a/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3681b337..8ab51ea9 100644 --- a/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/grpc/grpc-swift.git", "state" : { - "revision" : "393b02b1c39cc82fb24e57f24fa446f43e8124c9", - "version" : "1.22.0" + "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1", + "version" : "1.23.0" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/krimpedance/KRActivityIndicatorView.git", "state" : { - "revision" : "bcb0e841d6de0cd343a32bd5056580a56d06c0bc", - "version" : "3.0.7" + "revision" : "925de8a9c15d9d7c2ca746dbe198549241b8b2b2", + "version" : "3.0.8" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/krimpedance/KRProgressHUD.git", "state" : { - "revision" : "265142816d8f8ea93840accaf4ac7c49998e77c2", - "version" : "3.4.7" + "revision" : "2d6b0246682fce2c8e226235c9cd6065d0b95e00", + "version" : "3.4.8" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift.git", "state" : { - "revision" : "e5e833921a8f98870e547e428df017c266cd98f2", - "version" : "0.15.2" + "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", + "version" : "0.15.3" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb", - "version" : "1.1.0" + "revision" : "ee97538f5b81ae89698fd95938896dec5217b148", + "version" : "1.1.1" } }, { @@ -95,8 +95,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-http-types", "state" : { - "revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65", - "version" : "1.0.3" + "revision" : "9bee2fdb79cc740081abd8ebd80738063d632286", + "version" : "1.1.0" } }, { @@ -113,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "fc63f0cf4e55a4597407a9fc95b16a2bc44b4982", - "version" : "2.64.0" + "revision" : "9428f62793696d9a0cc1f26a63f63bb31da0516d", + "version" : "2.66.0" } }, { @@ -131,8 +131,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-http2.git", "state" : { - "revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87", - "version" : "1.30.0" + "revision" : "8d8eb609929aee75336a0a3d2417280786265868", + "version" : "1.32.0" } }, { @@ -140,8 +140,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-ssl.git", "state" : { - "revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5", - "version" : "2.26.0" + "revision" : "2b09805797f21c380f7dc9bedaab3157c5508efb", + "version" : "2.27.0" } }, { @@ -149,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-transport-services.git", "state" : { - "revision" : "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce", - "version" : "1.20.1" + "revision" : "38ac8221dd20674682148d6451367f89c2652980", + "version" : "1.21.0" } }, { @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-system.git", "state" : { - "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496", - "version" : "1.2.1" + "revision" : "f9266c85189c2751589a50ea5aec72799797e471", + "version" : "1.3.0" } }, { @@ -176,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/zcash-hackworks/zcash-light-client-ffi", "state" : { - "revision" : "9314c83d7a09d88e1c0bd3ff3738a50833325059", - "version" : "0.8.0" + "revision" : "f16fbed56fb3ba4f2cc53ead344a2eca77fa5aae", + "version" : "0.8.1" } } ], diff --git a/Package.swift b/Package.swift index 8dbf116a..2c92df60 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.19.1"), .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1"), - .package(url: "https://github.com/zcash-hackworks/zcash-light-client-ffi", exact: "0.8.0") + .package(url: "https://github.com/zcash-hackworks/zcash-light-client-ffi", exact: "0.8.1") ], targets: [ .target( diff --git a/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2532500.json b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2532500.json new file mode 100644 index 00000000..70649609 --- /dev/null +++ b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2532500.json @@ -0,0 +1,8 @@ +{ + "network": "main", + "height": "2532500", + "hash": "0000000000883adc2eeec0d588f9bb1059a72d18307705396083ad35ab9839c8", + "time": 1717746905, + "saplingTree": "01ca0e5ba700872b9631c15bc51db3481c84f795216dfd07e58bc88b81e7303f1401e2ad9e8862744c5393974452359bf74c99de48be8f5febcd119af455d51cc1201a010f479a4da235f6a36e2d1612fd1eae4a8ae5ece1a0c9ff94c26a32d93c8f040b01ae0754ccbb612b0bc37e3877b1a94c84945a509565035c6fd78859ec3bd3b4170135340625d0f19577c2cae8a6518a2632382624f6ee16f903f19476dd0c1ec80601b6598de70c4d0f913a185f2ae26778c72262cb226cd7b257fe9e242fa7831a33014ace5f3f07c40f25da1de7610962182258084a8b1517086ac032447d21b5b5420102c62653085fed9f88915b9e3706537e01bd65951f8ba82ce726a716ae88d67001f34ab6465f0bc6f1ce4362912a3a6e823f5f3e191a78b7236c98514030fc6e6d0000000114c60aaf95309cc4cc9f491ed1ebcfb17412a5eecb1b95c328910047f25fdd1a0001b2198c21e6d8a8134bfa0e2bfafc91b9c4c3b9310834823d169cf909d450206f0155dd7af340bd33c7adf3d2a79c945e062ba17c2b0be992050d1d5f1398bcca330000017f744067a47ada432e380f8bd4835c1e7c461dde6d4569a4379673491e33540a01d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e", + "orchardTree": "01c145c81295682e9b4447a58c05bd53a64e0dc848e73df2ffd5e86639cfdbf224001f01aae967c975e314eaeb84c8403373839967ef267fae27ece42b6dd9bb881c3939016045994bddceddf9bf9869d787b8e8542bbb0eddac09f3381041618850fc1f1801d9341c77a440f354f5cc7d4957dcab213482f44f6d39badd8570ad13bf5466130189dbded2b574809c8f75e3a8d4cd5e7e2591c362c4b2e9fc74630a6c821e5e0200015a82a4c149e458432b092886922307b4c61f6bd835cb16ea7bd2ddf8314e3a0201ab7d312839297e91dfe4c95137f53ceca1e3a595857169188ee7e55ef0124b2200017f96bf87a844a4550fc42d6262147eee2dd15d68179ce9eeff2fbf2a70b1993501a8dab8b5c38146a6df09dd568022725ca4c55c61aea61dfa1276d4c2588f6b2801a577df0edea2a49a7530b8d154dbc3e2968c0375a74aa8bc86c817486471af270001f2d4a7dfd20f817b7fac43c3988f27f376a96e829717bf851d729474857ce40000014085ca103411cf5d663ab76f084f16ff2b1080a5362c23b613e863b2c0749014012c8e24249acb30263d489e042527a751ab20eefdd6f28d6345d904d76e419e0300000160040850b766b126a2b4843fcdfdffa5d5cab3f53bc860a3bef68958b5f066170001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000" +} diff --git a/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2535000.json b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2535000.json new file mode 100644 index 00000000..9ecc125e --- /dev/null +++ b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2535000.json @@ -0,0 +1,8 @@ +{ + "network": "main", + "height": "2535000", + "hash": "00000000013d45406dad05b65e7c9427818fa44f44363d89bc0dd7c011e08f3b", + "time": 1717935114, + "saplingTree": "0187324c058bf5d9ae096865d9e51103d94f42b2e35c1162f459614cfac508d00d0180a4c6a1251c8fa6bf0e694b8d4fd5a7332d48c2602db3d955530cd9151f11121a016177fce45c5c2c1a1f6f9d559b98bbdd8394d90d5da1c834bc199a36ebbaaa4f01499f6201760033ace4a26a57aa835ac2d28b50c4479d2bcadf84d3c53cdfb20c012431e8c6fcb92686720e143c0034aac629fe038e7ad22772b7da35f234337341014fbff6819f40ef519ae86a806ea3188985e4ad96098d1a56bda86972312a3d6f00000000015a17579a87c1914376a49f63bc7610f989ccf2e8f9d37db479ce61c2665d6d1e0000011f9d940b8bf8f3ccfb98459ef3dda5fb635c6e39f9d0be1dfd55981fff18f43401b2198c21e6d8a8134bfa0e2bfafc91b9c4c3b9310834823d169cf909d450206f0155dd7af340bd33c7adf3d2a79c945e062ba17c2b0be992050d1d5f1398bcca330000017f744067a47ada432e380f8bd4835c1e7c461dde6d4569a4379673491e33540a01d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e", + "orchardTree": "014180ab0f14713581581c6e9052f0b06f1fb0e699a60bfb52393dd6fd27934a1b001f01712be10661baa9e80b7d428eb9ebb2e39fcbf836be76bd078340d664beb69a2200000000000001a72198a0aa68c71db313feb37f0acb751d0a14627b4f833cf89e98e0d341780f013c3b23831c9d962166584833bdb0bb0b29bc90c9900502c74e8cdb27599ef50e000186b186e192fa65cc206cfa5415a861cbb3d757b9007c5c7ce45822d79372723c019973c9e6278b081dcc25f2bca96f35231b93ebd69313acf9abf94b5a64857d3e01f2d4a7dfd20f817b7fac43c3988f27f376a96e829717bf851d729474857ce40000014085ca103411cf5d663ab76f084f16ff2b1080a5362c23b613e863b2c0749014012c8e24249acb30263d489e042527a751ab20eefdd6f28d6345d904d76e419e0300000160040850b766b126a2b4843fcdfdffa5d5cab3f53bc860a3bef68958b5f066170001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000" +} diff --git a/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2537500.json b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2537500.json new file mode 100644 index 00000000..4bc9e3da --- /dev/null +++ b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2537500.json @@ -0,0 +1,8 @@ +{ + "network": "main", + "height": "2537500", + "hash": "0000000000a3210643e8c28c44e584de9d09e5cfd3baf6507fdae4a9a64fc9a6", + "time": 1718123362, + "saplingTree": "01d0e6f60643d0544b8d8466e9aa64eefd60f471cab5beb0f640ffb3329211f7260167f71cb8c501f7b1f1c77637cf7318f70d726d8bfe77734804932ceea0b2741d1a00000140c1e9a2fe30dd3510d6b0ac17432e8259268e3db5a5d6bd40d88503af5edd39017cc9bb293df5fcf9b3ac547ca77b1fec786f6ceaacce334eedbd5068e943092b01c2041ac598e07c171d2f229105a14e109a77093a354e9b7d4f1a3f0e5831171300011e790a4675cc9b9025eaf5523db399be73d79a89fa9787e87f4fc04ba82580070001f921925101317f9023bc6b33dd7667f4ae15e5130355e2f0d5e155bf6db300180168a313727738db59bf1e33fdb92a7aea928f82f3d703dbe598eb37b8228bbc1e000000017e7405abc05ed6e5f6f44a5cca720c50fb2381ec4608c4652f3296942991ca140108a6c823c1c6c8b530387c69984c0f90902f7c9d646f7de3fa0acc228a3bf22100017f744067a47ada432e380f8bd4835c1e7c461dde6d4569a4379673491e33540a01d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e", + "orchardTree": "0158915d1e805de9b8eddcdbb2ce8d4c20e2fcb3d81dd387cae3c0901ff3f92934001f0110b4c216a9f2f52125bbe291c55c6dd36e258384f7eb22c5b0f63a89b557251600018a39c9fbb1214d2bc2bda593ac84f8eb010b044874d5e4d5cc3ff578c220753701c68390fc14a87e8e5fb9437c61e7fc6ebcc20eb959ad1e1ee4b69e15d078c73f0000016be1a4f7df97d89e5516d4cea3b0505bfc69974fe5d0abdea5ec55420378c415011079345dfd849a52a15ffe94460bcc2f92c4904d885792a2bd356db57d26823a019ebbb5aaddb80031bf9501ba1dc50cee89e7bd38144fc9cfd5dc21b62bd4311b01a946a862d495c5e3ebe215d275c06d78676c66cfcfd4b5ac9593cf0892bb373901547d24544c04ebd942a1799076ec8520682f0bebcdb5a8f3db22feb65692da2d0000014a25173fb726fea7e30f7be206b2154e91599fb43dcb2d99584cd897a7283f3f014085ca103411cf5d663ab76f084f16ff2b1080a5362c23b613e863b2c0749014012c8e24249acb30263d489e042527a751ab20eefdd6f28d6345d904d76e419e0300000160040850b766b126a2b4843fcdfdffa5d5cab3f53bc860a3bef68958b5f066170001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000" +} diff --git a/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2540000.json b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2540000.json new file mode 100644 index 00000000..425eb52c --- /dev/null +++ b/Sources/ZcashLightClientKit/Resources/checkpoints/mainnet/2540000.json @@ -0,0 +1,8 @@ +{ + "network": "main", + "height": "2540000", + "hash": "00000000005ae281988a2ffd3df3b922d8b1382c637840e47fe20dcf32562681", + "time": 1718311933, + "saplingTree": "01b2ffdb974048d0939822c6d07e7884cbb41fb82e5497ab3ed03141795599db5b01861c91bb5f86db9ecb4835d97179e4ce0e4cf7e6bac573bd5bdd140bf456475a1a0000013e8ff9e582ff2d8dfb14e1ae2d87c98107ca100872a7200bf57df34c360a414c0198a4c1ae0964f427f8a80ff8fba246419703c70efe6b7780ae81474400be6e3b0111adef74f63c1d506c3dc5752c1515babd3d97d7daf850ffdf0aeeabd4bd773301735f8ed6084807f281d65ab15784c18ff905b5179cf74f95f83604e74e5d001b01cd2f0a519ff2ac14207d6650e856dc291db7cbedc3dcb69f12c309ceb9197b4901bb67a6bb209595fb101f5ca1b23111a70eb7185d87a56c36c15189d5d9fb3908015db614af29ed37e6d0d57ac4382c3bc6554d97d84a71c1f252b46a95a6f8356700014e4f97012d24d406e5a2fd6d35d3f288b791f96a7d7520828b9b674e6964bf2601e2dd0aabc139c8cb502e86045a582a9b392d7b8b243e32dee31b58789966ae4000017e7405abc05ed6e5f6f44a5cca720c50fb2381ec4608c4652f3296942991ca140108a6c823c1c6c8b530387c69984c0f90902f7c9d646f7de3fa0acc228a3bf22100017f744067a47ada432e380f8bd4835c1e7c461dde6d4569a4379673491e33540a01d1b36bbba8e6e1be8f09baf2b829bafc4ccd89ad25fb730d2b8a995b60fc3a6701d8ccea507421a590ed38116b834189cdc22421b4764179fa4e364803dfa66d56018cf6f5034a55fed59d1d832620916a43c756d2379e50ef9440fc4c3e7a29aa2300011619f99023a69bb647eab2d2aa1a73c3673c74bb033c3c4930eacda19e6fd93b0000000160272b134ca494b602137d89e528c751c06d3ef4a87a45f33af343c15060cc1e", + "orchardTree": "0180f70456725d4f584184f8270059b0a0a36f6551540618b5a30e1a6ac7f4f900014ba753d81c3b58d52668f9da37e19e962cea8d2942d99f2e10134f45a5e4102c1f0100d98e152d964b6f3dcb9d13b8b3ea39d67571f28774a4d0e7509de40f82bd16000000015e885381fd1f7e030ff1dbd40b61db9832b14e24599442f38cc3f2b7fa4128040196039b1c280585302b9ef51f428af009e6dcb18a2c0c14fa0e6ba4d90bbc373a01c210802cb8d110fefb5b87df99163269c95b00675fb09ad45c14bbb3b1cf4639013806191f2ac88c376c269a3882746150ba702f7b29f3fa654eac618724112a2600000001429fd30c173ba10bcc64da9c5e352b942fc18fd13dd3f523f905dd62a5e9461500014a25173fb726fea7e30f7be206b2154e91599fb43dcb2d99584cd897a7283f3f014085ca103411cf5d663ab76f084f16ff2b1080a5362c23b613e863b2c0749014012c8e24249acb30263d489e042527a751ab20eefdd6f28d6345d904d76e419e0300000160040850b766b126a2b4843fcdfdffa5d5cab3f53bc860a3bef68958b5f066170001cc2dcaa338b312112db04b435a706d63244dd435238f0aa1e9e1598d35470810012dcc4273c8a0ed2337ecf7879380a07e7d427c7f9d82e538002bd1442978402c01daf63debf5b40df902dae98dadc029f281474d190cddecef1b10653248a234150001e2bca6a8d987d668defba89dc082196a922634ed88e065c669e526bb8815ee1b000000000000" +}