Merge pull request 'Merge dev' (#5) from dev into main

Reviewed-on: https://git.hush.is/hush/hush-android-wallet-sdk/pulls/5

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1430000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1430000",
+	"hash": "000000066375bf5edfb65bec45cfa47042b47e3aea87da9236da5b9f4ca70f84",
+	"time": 1689465399,
+	"saplingTree": "0175dcd1343c9d5e07f3195043b605626f81b88071c31f6a5fc0ae900f170ed205014359d75dc4c94f4048bf44a8a182a18768aa4c60167a1312aae55ea95ead8d56150001c424e72313147674d468d308382167f9812f682b5e9abeed33a21f6911dd2f7301ccde0679ebf8f4f20d9bb2e41f96fc394e106118267757dcf7d8f3336ffcc72b013065dc4f2f9786453772f66c3e71aeea04f38a9773259fb6ffaa71d9e7646802016f4efb90f63de4413a27b774b216cf614bf8b27e4fd041473bde68445d575b3b01ee5b354371c5b9cada16df0c120907ee2928681e9237384d1b49de85cd66b9390126c696517f1dba2a81a0e74099b1f8d3fa2a65ee991344e8fe94d4f53a624c56000001a2fc4b1843af353e9287fe23854906267e892a053f714d1eb472b7f1d3dafe010153aa5aafa9c11464a123d59badb7743bb67fc2686550452df004897abc2ef66401fcc633dd7d6fb7f00d1b2bd8c0a99db4be5c8c6393b84fd36d6b2562db3c60480134f45736d1336cb1f55432e553afb2843f58fbd53a1424f546bbb68f4926ce460000012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1440000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1440000",
+	"hash": "00000001025150e823cedbe98c30f09385017b229bc247420d43854ddb1c4ff0",
+	"time": 1690223450,
+	"saplingTree": "01c96fa25dd7e8d53195f97031006d2cb1f2758c4b12fef11b588de57c69784455001501d3c916889978629148d469916a9d9b5770ac23657d69989e3e4fde867ff6c04b016c46a62678cea4266cc095d7f287bb3f5bb5dcc0d408a921d210843cab43227201dc162e6835b6b9e5c930ae8bab60ecf12fe735ae20355e5681d6fb0d78a4254f0001a708465a549e5798486fe87a2dfb0732e35974248cf14ec7840cda4bf5424f6201935fcb60099ad7fdf6b06fe286c5d95e25210e4826ecfe432af130f7eb6da472000001c4954e9df77cc98c76c6ee8c266ddf7bb193e4284cd39f3f9288f55e72cd920300014b8ed9563d4cbd1fd3e278bc201509a95645ff5414ba8b5dc3734cd5dcd966210111921d0b1f05672fb165599bed630e0cf8267e832b4c4ec4e6154e880e100f3f00019309b9363ebf08e38aa5ba8a8937532af004fb2d0c77f0b306b1e928516f702800012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1450000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1450000",
+	"hash": "00000001ba8b62f62c313bad5f3e5e5b1068060e7b52855a703575e8b999e980",
+	"time": 1690981181,
+	"saplingTree": "01062fdf962638e40cdf292711483f13aacc7adb20970e698451554eb39f0c96550015018b2a0192536c7b078ebafba23cadc4553ce910882b1d533a2f393440bbea120a015e5702d657da65aae04535f90ba42480be7b9a80b1d407ea55d536e8b7de79150117eb1a826ddd4705151442d3b2d9e148b771ee3bcab6c71e6e2f12572556460900000001b470a160ac7c4cf0474f54d05b4759d67dfc1d53239f7325fc10b3b8e0a70e5800000001f0df59b96f31f8753d8c82b30652e05a95b887ccd20939be6721195307a9647301739a817c8780e31798dab9a36e7a234df3799f85ac127b0191d8033b92c1f005012f3bb696570f0ac464a701f0ba745eb269c66f99026909b1c596234950b2d919019309b9363ebf08e38aa5ba8a8937532af004fb2d0c77f0b306b1e928516f702800012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1460000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1460000",
+	"hash": "00000005153ae6e0e3f6dabd9ae9c3e02cbb2cdd61fc9cc697f94a943d3e7c31",
+	"time": 1691740887,
+	"saplingTree": "01d4bf8b5ab1566fbf2c641008a65776866da18d3a90ee79521fac2177c26ca43e01e03d8a0d3b4092d7406f72833dd0e0bafe98920301164c5e7b5c300e01dc4443150001437e540964f73c898e5405a1af51ae34367076bcef86503aae34d92ce289e064000001e238cd66315e1f88b7fca6049bc0c40ec8c5e31ac2d603f79e1358be5aa6e41a00000000000162890d418ca91fc1dce31a115ba58a3d543d3a5ce293549ad698e23e58ed1e6101db4441db6eaac29cd078df0685d7d7124d5d2889664550f0b9cca3c2731df958000001faf6cdafacc60ed1b3b10777af659d02de872c23760ab9284486f92b4670af5a012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1470000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1470000",
+	"hash": "00000001be9faf4c236b5925b9d82a843c98fdecb0db32a7b971c7f0e06ae686",
+	"time": 1692496311,
+	"saplingTree": "013fc66f1aaf5428876bcba3c13eaf73c600bcbabdf0c6876f815f547cdafb585c01555aa955ed996be9e1acbdfc1c1c90c66157148baec627d5b1854796c911633c1501ae5f94529f588c2a468e68376c11b671369638bed86f182c787eff05935c276b000001f9efa221186444b30c09adb18f50049cd2e75a55a8e5644669be0ff084d5470501cdeadb4714448e7102061689fa3dcda163270c0fd6e712ef8c0b70d5899cef37014431821f9f977b204a710d621173ea98a612cf1e3bc1d3574af9e0638ec09e5900000152622e13f673b2776139957e1d5ad6cfedfff470f6a35dcace7c2b37076da64c014e096a16bed1a93215733b76a130aaffb9fc0a47d1a6fd497f9b89b64189071e000129121619d51717862f03cacfb05221cebf0118cd359558e20067c5ecccc172500176334579d1b7828cac70c63961ef5ce2c2e057b76812cdaa377e9990f568bc3f0001faf6cdafacc60ed1b3b10777af659d02de872c23760ab9284486f92b4670af5a012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1480000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1480000",
+	"hash": "000000061fc1275ef78b285aec0a73edc82861a0d390503c3b4c5455d8242acc",
+	"time": 1693253685,
+	"saplingTree": "01e2c7c111a10f50427bc4bc897e4ec3663d8c8f35aa588e92e7ea044c53b8a7150015000000019f147addb25fa3b22db6d2629ec21d569f97e9cb99e72604d8d2fdb1e0d88c0f01bfcd48547222892d0a02ddb9d5c993ae28595d01e28daea9d75df186ee611e6d000173b557332d245327c0b1472cf4a28e058527f4781a16844931bce099d0a94c4e010c50783bdf7fe4edd6e8676b8ae3ad6770e67601d4b934395d3efe32efee9e5e000001548aea4e8877dfce4d1cf9146c1d995e01365effe75c59793db2eeaec04c112a0191bfe1bc84ec45224de2151bd3ff73c758afd19aba2710a1d5d5c68f9846af670001048eff1e2456fde7d076e192449cf565729879f1ad37393b5b0583c3597b636e01faf6cdafacc60ed1b3b10777af659d02de872c23760ab9284486f92b4670af5a012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1490000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1490000",
+	"hash": "00000002271c1f284ad47cfc27332ea820045602f62381dd10cdfe77cbf73cce",
+	"time": 1694011030,
+	"saplingTree": "01ee724ea0ccc38da9b996e7d4324ebc8fa96cf02584226835ed68ecb2734d9d240015000000000000000001731883b430616e3b2f973be6189d6555f14d3a4f4d48576b072bf635390cee210108037602f447ed3d39a212fdbd967e7e2b5a79ecd2f241d571cca1273308a72601acb845b8a7c6a288ec4534bfd55dec73eeb20b3b6b926482ed1bcdf8f205a2240152cbaf618ef392310700621cbd0158fc48718fd6b7933781c4c914f1709b135201a050d10929e616bdb7599d670fc08d44065d2ba307434443bacdfb3a467e391b01048eff1e2456fde7d076e192449cf565729879f1ad37393b5b0583c3597b636e01faf6cdafacc60ed1b3b10777af659d02de872c23760ab9284486f92b4670af5a012a5cc87bee766002799c55ceb4811e7f7393a1e6a4cbec47deffc5f5545c0e630129e917c1084ce9790872926426d49c072d65efba4028dc1d29c4ff163f2f794001007357498cf229fb2aa34a72ecff748d7aa6f1a4e486f3eecf8a57673ad0ce340001708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1500000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1500000",
+	"hash": "0000000015757461b6c1169980a8be062898c1aca4861e45290bb2f07edac0fa",
+	"time": 1694769330,
+	"saplingTree": "01ca0b0297a0cb17ca41bfee5396e1ef252485c9d07087b684ff52922a1fca6c230127ad4a6c7f09cbc7b26cb93a4d0be56bf9db0fd11f71e2984507a9928bf6135a150001bb5b561b4c49473ba301f931e1bfb70e71926e416906f1841d2a7769f23c07100001eab4cdc55c3ad81a08c4c0e7a8ed79f754881de4b44718ed4230fa20b3f33c4101c1ccf91e6f5272f8dcabb246b65faae325473a7cca1c6860a358b4c5852b227000013b7051ca25271585b515cb34b0c32a5d5c6957aba18b05a83fe24da5aee9fc1f0000011f91bb48e98e17dd128559e09c5725df99d204258274a7b716a2c421ef59d107000001b80be3abe749b80354f89195cad85c45d89e5b3ccffff88ca10e6eb4a0c37238000000000001491139c6c100cdd9176607c63fa695709727d919634d2983a9412c3010ed6d3d01708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1510000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1510000",
+	"hash": "00000003a10174289817f24b4c8f60378e2f075e6bba3fce06e766e5f6eb90f1",
+	"time": 1695526960,
+	"saplingTree": "01971f1e5c04ad6f515c265fb7ca287cd3e325ce679e99bf665688eb036972e4430015000001687da9f56edd4364dc7e7ee3e6887a2e7933e8111c80888e3c089b3974364e12000165b3b9949855b0caeca9057520d8d1ea313f85d880371ab9adc1a72f782b242f00010acf40cff2e4749c17f58352b9ebbfc93f3093320cdf16d6b1e052dd34012c35017cd2a09bb7b82061cf0a2f0aface1b1fadbef1bfc0118d2d74062cbf06406e2401ec221b063215234d84074ed3bce108f0067a39f0583da2c02944734e0f00597201ad177ae3fd3637c38a38b30b0909b5437dc54edbd7bfb29a3d3d86d12726e96e0155a16a02a55e3e59aec6e2b40b292636610c515a08f432e25e2a96b6d0ae757101447d962c014e0aa51c2939c259ca2bd31b7458f28c76d51073fa9d0505e5f01501b80be3abe749b80354f89195cad85c45d89e5b3ccffff88ca10e6eb4a0c37238000000000001491139c6c100cdd9176607c63fa695709727d919634d2983a9412c3010ed6d3d01708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1520000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1520000",
+	"hash": "00000007fba88eea7c09076fa7693b7ef39feb161bd7d96299deff6f16887ce7",
+	"time": 1696283960,
+	"saplingTree": "016da64c5c9b5db696dc386c9b230e60e3572f1baab569af0e3ae3800d920c3a34015a90e174da6cd71e7b9505d4efa1ed7a91e00904c931210b80eb95fa5dc19431150001461b3858cf8585506809f331942869ee7bc88cd01ea4fd3d3ddb6298f9ee882801f9f5dd3908aeb65b36afa6df68ed369dc3bb354f3f7a116f6c7c55cc02868c0c01fb4b292d6a79bd9b8a0d067986ee1ecfe82763b8c7d590bfc71ee21508778a26000001bce18fa0af931af2f6b448202692ad31d197de42e322b871b2d21eb36b3d4e1101770741860cf8ba2a06a6f36601463c51fd8a117f60a020c7acab47e3fd7ce84d000000016f50ed4e26245944913c521adfc3e08b600f4e14c120b38afe2a78b1dbd471560001637dc44b8bb875ee3dc2796619ab3bdab974206e4dbc44435cb6bd734c47f31f0000000001491139c6c100cdd9176607c63fa695709727d919634d2983a9412c3010ed6d3d01708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1530000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1530000",
+	"hash": "000000027efbba859044503a52fd35ea1a1fac64e6b159dbdcebcf861f521396",
+	"time": 1697038908,
+	"saplingTree": "01d700df59367140aeee819c9264ec44182a544bf1d61a44f5ae9801bc940523020015012145e4feee12794f1d91327ac04aaa7a5cf154c527265c60d12b31e86f31fc4201aa1fab9261488d0d5d12982fcf10ddadd4a13fca190729d3fb9ed4ad4afe902201c4a760b9cf362345ce4251c5058be602fc324f8e2ec7e81f30a617c5aebb3a01000000000000000000011f07cccbe7288652b08cbca3184e3a4f7963e5c090597806e5b5bd156c84132001637dc44b8bb875ee3dc2796619ab3bdab974206e4dbc44435cb6bd734c47f31f0000000001491139c6c100cdd9176607c63fa695709727d919634d2983a9412c3010ed6d3d01708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/assets/co.electriccoin.zcash/checkpoint/mainnet/1540000.json

@@ -0,0 +1,7 @@
+{
+	"network": "main",
+	"height": "1540000",
+	"hash": "000000093b7b4861ec7cf9c1262ac89815b515160e383819383ae2bce4d9d15a",
+	"time": 1697795052,
+	"saplingTree": "011342c13e4934fee3cf4ea3e2e40e7cf6430a0174f2715804085535f68ad7d90c00150000000001cc346113164aae165662668adf9cc53a91610dd04bd2a6b15a105d5b9d63a90f012061331d786c5f9f2e65b28dc34c87f66077aaf183189d261a739878891b0d42000001af41255e72b7762008ff731b1704c886dc54d587d6771411d4d60499e2b6176c0000013f9474168eaca54b4d736885e9169c891d9eba9bf22693dcfc7a87d29f2f206d011f07cccbe7288652b08cbca3184e3a4f7963e5c090597806e5b5bd156c84132001637dc44b8bb875ee3dc2796619ab3bdab974206e4dbc44435cb6bd734c47f31f0000000001491139c6c100cdd9176607c63fa695709727d919634d2983a9412c3010ed6d3d01708c9850eb440b259f233187662c5228804cb4500263949301b6fac8f6428f2301d6f84c424acdb1d10f8cef641662e0f63f954f07fe6199d504a61979c9ba3e13"
+}

sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ZcashSdk.kt

@@ -37,19 +37,19 @@ object ZcashSdk {
     // Because blocks are buffered in memory upon download and storage into SQLite, there is an upper bound
     // above which OutOfMemoryError is thrown. Experimentally, this value is below 50 blocks.
     // Back of the envelope calculation says the maximum block size is ~100kb.
-    const val DOWNLOAD_BATCH_SIZE = 10
+    const val DOWNLOAD_BATCH_SIZE = 50
 
     /**
      * Default size of batches of blocks to scan via librustzcash. The smaller this number the more granular information
      * can be provided about scan state. Unfortunately, it may also lead to a lot of overhead during scanning.
      */
-    val SCAN_BATCH_SIZE = 150
+    val SCAN_BATCH_SIZE = 500
 
     /**
      * Default amount of time, in milliseconds, to poll for new blocks. Typically, this should be about half the average
      * block time.
      */
-    val POLL_INTERVAL = 20_000L
+    val POLL_INTERVAL = 38_000L
 
     /**
      * Estimate of the time between blocks.
@@ -87,11 +87,13 @@ object ZcashSdk {
     val OUTPUT_PARAM_FILE_NAME = "sapling-output.params"
 
     /**
-     * The Url that is used by default in zcashd.
+     * The Url that is used by default in hushd.
      * We'll want to make this externally configurable, rather than baking it into the SDK but
-     * this will do for now, since we're using a cloudfront URL that already redirects.
+     * this will do for now
      */
-    val CLOUD_PARAM_DIR_URL = "https://z.cash/downloads/"
+    val CLOUD_PARAM_DIR_URL = listOf("https://storage.hush.land/hush3/",
+        "https://git.hush.is/hush/hush3/raw/branch/master/",
+        "https://github.com/hushmirror/hush3/raw/dev/")
 
     /**
      * The default memo to use when shielding transparent funds.

sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/SaplingParamTool.kt

@@ -57,7 +57,8 @@ class SaplingParamTool {
                 ZcashSdk.SPEND_PARAM_FILE_NAME,
                 ZcashSdk.OUTPUT_PARAM_FILE_NAME
             ).forEach { paramFileName ->
-                val url = "${ZcashSdk.CLOUD_PARAM_DIR_URL}/$paramFileName"
+                val url = "${ZcashSdk.CLOUD_PARAM_DIR_URL.random()}/$paramFileName"
+                twig("Downloading Sapling params from ${url}...")
                 val request = Request.Builder().url(url).build()
                 val response = withContext(Dispatchers.IO) { client.newCall(request).execute() }
                 if (response.isSuccessful) {