fix: migrate to Blocktank client v2

Author: limpbrains

__tests__/todos.ts

@@ -1,7 +1,6 @@
 import assert from 'node:assert';
 import cloneDeep from 'lodash/cloneDeep';
-import { IBtOrder } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
+import { IBtOrder, BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client';
 
 import '../src/utils/i18n';
 import { todosFullSelector } from '../src/store/reselect/todos';

package.json

@@ -46,7 +46,7 @@
     "@react-navigation/native-stack": "6.10.1",
     "@reduxjs/toolkit": "2.2.6",
     "@shopify/react-native-skia": "1.3.11",
-    "@synonymdev/blocktank-lsp-http-client": "1.5.0",
+    "@synonymdev/blocktank-lsp-http-client": "2.0.0",
     "@synonymdev/feeds": "3.0.0",
     "@synonymdev/ledger": "0.0.5",
     "@synonymdev/react-native-keychain": "9.1.1",

src/screens/Settings/Lightning/ChannelDetails.tsx

@@ -1,11 +1,11 @@
 import Clipboard from '@react-native-clipboard/clipboard';
 import {
 	BtOpenChannelState,
+	BtOrderState2,
+	BtPaymentState2,
 	IBtOrder,
 	ICJitEntry,
 } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
-import { BtPaymentState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtPaymentState2';
 import React, { ReactElement, memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {

src/screens/Settings/Lightning/ChannelStatus.tsx

@@ -3,10 +3,10 @@ import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 import {
 	BtOpenChannelState,
+	BtOrderState2,
+	BtPaymentState2,
 	IBtOrder,
 } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
-import { BtPaymentState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtPaymentState2';
 
 import { EChannelStatus } from '../../../store/types/lightning';
 import { View as ThemedView } from '../../../styles/components';

src/screens/Settings/Lightning/Channels.tsx

@@ -9,8 +9,7 @@ import {
 import Share from 'react-native-share';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
-import { IBtOrder } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
+import { IBtOrder, BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client';
 
 import { AnimatedView, View as ThemedView } from '../../../styles/components';
 import { Caption13Up, BodyMSB } from '../../../styles/text';

src/store/reselect/blocktank.ts

@@ -1,8 +1,11 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { RootState } from '..';
 import { IBlocktank, TPaidBlocktankOrders } from '../types/blocktank';
-import { IBtInfo, IBtOrder } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
+import {
+	BtOrderState2,
+	IBtInfo,
+	IBtOrder,
+} from '@synonymdev/blocktank-lsp-http-client';
 
 const blocktankState = (state: RootState): IBlocktank => state.blocktank;
 

src/store/utils/blocktank.ts

@@ -1,13 +1,13 @@
 import { err, ok, Result } from '@synonymdev/result';
-import { CJitStateEnum } from '@synonymdev/blocktank-lsp-http-client/dist/shared/CJitStateEnum';
 import {
-	BtBolt11PaymentState,
+	BtBolt11InvoiceState,
 	BtOpenChannelState,
+	BtOrderState2,
+	BtPaymentState2,
+	CJitStateEnum,
 	IBtOrder,
 	ICJitEntry,
 } from '@synonymdev/blocktank-lsp-http-client';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
-import { BtPaymentState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtPaymentState2';
 import notifee, { TimestampTrigger, TriggerType } from '@notifee/react-native';
 
 import { __E2E__ } from '../../constants/env';
@@ -384,7 +384,7 @@ const handleOrderStateChange = (order: IBtOrder): void => {
 	}
 
 	// given up
-	if (order.payment.bolt11Invoice.state === BtBolt11PaymentState.FAILED) {
+	if (order.payment.bolt11Invoice.state === BtBolt11InvoiceState.CANCELED) {
 		showToast({
 			type: 'warning',
 			title: i18n.t('lightning:order_given_up_title'),

src/utils/blocktank/index.ts

@@ -1,13 +1,13 @@
 import {
 	BlocktankClient,
+	BtOrderState2,
+	CJitStateEnum,
+	IBt0ConfMinTxFeeWindow,
 	IBtInfo,
 	IBtOrder,
 	ICJitEntry,
 } from '@synonymdev/blocktank-lsp-http-client';
 import { err, ok, Result } from '@synonymdev/result';
-import { CJitStateEnum } from '@synonymdev/blocktank-lsp-http-client/dist/shared/CJitStateEnum';
-import { IBt0ConfMinTxFeeWindow } from '@synonymdev/blocktank-lsp-http-client/dist/shared/IBt0ConfMinTxFeeWindow';
-import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
 
 import { EAvailableNetwork } from '../networks';
 import { addPeers, getNodeId, refreshLdk } from '../lightning';
@@ -102,6 +102,7 @@ export const createOrder = async ({
 			nodeId,
 			source: options?.source ?? 'bitkit',
 			zeroReserve: true,
+			announceChannel: false,
 		});
 		if (buyRes?.id) {
 			await refreshOrder(buyRes.id);
@@ -246,11 +247,7 @@ export const openChannel = async (
 		}
 		//Attempt to sync and re-add peers prior to channel open.
 		await refreshLdk();
-		const finalizeChannelResponse = await bt.openChannel(
-			orderId,
-			nodeId.value,
-			false,
-		);
+		const finalizeChannelResponse = await bt.openChannel(orderId, nodeId.value);
 		if (finalizeChannelResponse) {
 			// Once finalized, refresh on-chain & lightning.
 			await refreshWallet();

yarn.lock

@@ -4894,12 +4894,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@synonymdev/blocktank-lsp-http-client@npm:1.5.0":
-  version: 1.5.0
-  resolution: "@synonymdev/blocktank-lsp-http-client@npm:1.5.0"
+"@synonymdev/blocktank-lsp-http-client@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@synonymdev/blocktank-lsp-http-client@npm:2.0.0"
   dependencies:
     axios: ^1.4.0
-  checksum: d2aa8b8d12a5b6e118056b054658b69c482b2c9dcee18248d61abc229ff652a042cf4f126078d638aacbea1da80f384aedbe26eba5d6473f672f919df8fe63ee
+  checksum: 05befc91b212ac5dc5f6478b376245b46af3aca0e8950aadf69e4f99eb45026ba0130ed058b4d6aa894bdc615778fa00f1835b3a4bf5aef3fc31c5af0c6ab4ef
   languageName: node
   linkType: hard
 
@@ -6602,7 +6602,7 @@ __metadata:
     "@react-navigation/native-stack": 6.10.1
     "@reduxjs/toolkit": 2.2.6
     "@shopify/react-native-skia": 1.3.11
-    "@synonymdev/blocktank-lsp-http-client": 1.5.0
+    "@synonymdev/blocktank-lsp-http-client": 2.0.0
     "@synonymdev/feeds": 3.0.0
     "@synonymdev/ledger": 0.0.5
     "@synonymdev/react-native-keychain": 9.1.1