feat: use LDK backups

synonymdev · Feb 2, 2024 · a3c1153 · a3c1153
1 parent 08c7a8c
commit a3c1153
Show file tree

Hide file tree

Showing 22 changed files with 645 additions and 1,406 deletions.
diff --git a/__tests__/backups.ts b/__tests__/backups.ts
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -392,7 +392,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.2.2):
     - React-Core
-  - react-native-ldk (0.0.127):
+  - react-native-ldk (0.0.129):
     - React
   - react-native-mmkv (2.11.0):
     - MMKV (>= 1.2.13)
@@ -905,7 +905,7 @@ SPEC CHECKSUMS:
   react-native-flipper: 9c1957af24b76493ba74f46d000a5c1d485e7731
   react-native-image-picker: 2e2e82aba9b6a91a7c78f7d9afde341a2659c7b8
   react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
-  react-native-ldk: 4ab3d26d5e1356313c572814289cc516dc18dd88
+  react-native-ldk: 30a80ced71007307cfceb8a79e4996788ab413ea
   react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
   react-native-netinfo: 5ddbf20865bcffab6b43d0e4e1fd8b3896beb898
   react-native-quick-base64: a5dbe4528f1453e662fcf7351029500b8b63e7bb

diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "@synonymdev/blocktank-client": "0.0.50",
     "@synonymdev/blocktank-lsp-http-client": "0.13.1",
     "@synonymdev/feeds": "2.1.1",
-    "@synonymdev/react-native-ldk": "0.0.127",
+    "@synonymdev/react-native-ldk": "0.0.129",
     "@synonymdev/react-native-lnurl": "0.0.7",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-auth": "1.0.0-alpha.6",

diff --git a/src/assets/icons/wallet.ts b/src/assets/icons/wallet.ts
@@ -182,9 +182,6 @@ export const usersIcon = (color = 'white'): string =>
 export const userIcon = (color = 'white'): string =>
 	`<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><g fill="${color}"><path d="m16 20c4.4183 0 8-3.5817 8-8 0-4.41828-3.5817-8-8-8s-8 3.58172-8 8c0 4.4183 3.5817 8 8 8z" opacity=".2"/><g clip-rule="evenodd" fill-rule="evenodd"><path d="m16 5c-3.866 0-7 3.13401-7 7 0 3.866 3.134 7 7 7s7-3.134 7-7c0-3.86599-3.134-7-7-7zm-9 7c0-4.97056 4.0294-9 9-9s9 4.02944 9 9c0 4.9706-4.0294 9-9 9s-9-4.0294-9-9z"/><path d="m16.0001 21c-2.2822 0-4.5242.6005-6.5008 1.7413-1.97659 1.1408-3.61818 2.7817-4.75984 4.7578-.27628.4782-.88792.6419-1.36613.3656s-.64191-.8879-.36563-1.3661c1.31724-2.28 3.21128-4.1732 5.49186-5.4895 2.28054-1.3162 4.86734-2.0091 7.50054-2.0091s5.22.693 7.5005 2.0093c2.2806 1.3163 4.1746 3.2095 5.4918 5.4895.2762.4783.1125 1.0899-.3657 1.3662-.4782.2762-1.0899.1125-1.3661-.3657-1.1416-1.9761-2.7832-3.617-4.7598-4.7578-1.9765-1.1409-4.2185-1.7415-6.5007-1.7415z"/></g></g></svg>`;
 
-export const userRectangleIcon = (color = 'white'): string =>
-	`<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><g fill="${color}"><path d="m27 6h-22c-.26522 0-.51957.10536-.70711.29289-.18753.18754-.29289.44189-.29289.70711v18c0 .2652.10536.5196.29289.7071.18754.1875.44189.2929.70711.2929h2.51232v-.0005c.62108-1.7547 1.77073-3.2738 3.29068-4.3482 1.52-1.0744 3.3356-1.6513 5.197-1.6513-.9889 0-1.9556-.2932-2.7779-.8427-.8222-.5494-1.4631-1.3303-1.8415-2.2439s-.4775-1.9189-.2845-2.8889c.1929-.9699.6691-1.8608 1.3684-2.56.6992-.6993 1.5901-1.1755 2.56-1.3684.97-.19295 1.9753-.0939 2.8889.2845s1.6945 1.0193 2.2439 1.8415c.5495.8223.8427 1.789.8427 2.7779 0 1.3261-.5268 2.5979-1.4645 3.5355-.9376.9377-2.2094 1.4645-3.5355 1.4645 1.8614 0 3.677.5769 5.197 1.6513s2.6696 2.5935 3.2907 4.3482v.0005h2.5123c.2652 0 .5196-.1054.7071-.2929s.2929-.4419.2929-.7071v-18c0-.26522-.1054-.51957-.2929-.70711-.1875-.18753-.4419-.29289-.7071-.29289z" opacity=".2"/><g clip-rule="evenodd" fill-rule="evenodd"><path d="m16 11c-2.2091 0-4 1.7909-4 4s1.7909 4 4 4 4-1.7909 4-4-1.7909-4-4-4zm-6 4c0-3.3137 2.6863-6 6-6s6 2.6863 6 6-2.6863 6-6 6-6-2.6863-6-6z"/><path d="m3 7c0-1.10457.89543-2 2-2h22c1.1046 0 2 .89543 2 2v18c0 1.1046-.8954 2-2 2h-22c-1.10457 0-2-.8954-2-2zm24 0h-22v18h22z"/><path d="m16 21c-1.6546 0-3.2686.5128-4.6197 1.4679-1.3512.955-2.37315 2.3054-2.92525 3.8652-.18428.5206-.75573.7933-1.27636.609-.52064-.1843-.7933-.7557-.60902-1.2763.69006-1.9496 1.96739-3.6374 3.65623-4.8311 1.6888-1.1937 3.706-1.8347 5.7741-1.8347s4.0854.641 5.7742 1.8347 2.9662 2.8815 3.6562 4.8311c.1843.5206-.0884 1.092-.609 1.2763s-1.0921-.0884-1.2764-.609c-.5521-1.5598-1.574-2.9102-2.9252-3.8652-1.3512-.9551-2.9651-1.4679-4.6198-1.4679z"/></g></g></svg>`;
-
 export const speedFastIcon = (color = 'white'): string =>
 	`<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><g fill="${color}"><path clip-rule="evenodd" d="m4 22h24c0-6.6274-5.3726-12-12-12-6.62742 0-12 5.3726-12 12z" fill-rule="evenodd" opacity=".2"/><path d="m14.9882 22.8829c-1.2589.8351-1.4707 2.3682-.4113 3.465 1.0844 1.0595 2.605.8227 3.4525-.4362l4.188-6.1697c.5484-.8226-.2369-1.6079-1.0595-1.0595z"/><path clip-rule="evenodd" d="m5 22c0-6.0751 4.92487-11 11-11 6.0751 0 11 4.9249 11 11h2c0-7.1797-5.8203-13-13-13s-13 5.8203-13 13z" fill-rule="evenodd"/></g></svg>`;
 

diff --git a/src/screens/Recovery/Lightning.tsx b/src/screens/Recovery/Lightning.tsx
@@ -17,7 +17,7 @@ import { useSelectedSlashtag } from '../../hooks/slashtags';
 import { SlashtagsProvider } from '../../components/SlashtagsProvider';
 import { SlashtagsProvider2 } from '../../components/SlashtagsProvider2';
 import {
-	EBackupCategories,
+	EBackupCategoriesOld,
 	fetchBackup,
 	listBackups,
 } from '../../utils/backup/backpack';
@@ -70,7 +70,7 @@ const LightningWithSlashtags = ({
 		const listLdkBackups = async (): Promise<void> => {
 			const res = await listBackups(
 				slashtag.slashtag,
-				EBackupCategories.ldkComplete,
+				EBackupCategoriesOld.ldkComplete,
 				__DEV__ ? selectedNetwork : EAvailableNetwork.bitcoin,
 			);
 
@@ -116,7 +116,7 @@ const LightningWithSlashtags = ({
 		const res = await fetchBackup(
 			slashtag.slashtag,
 			timestamp,
-			EBackupCategories.ldkComplete,
+			EBackupCategoriesOld.ldkComplete,
 			selectedNetwork,
 		);