mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-03 03:59:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5793 from BlueWallet/torimport

Browse source 
Torimport
This commit is contained in:
GLaDOS 2023-10-30 18:37:45 +00:00 • committed by GitHub
commit 1dc8d9acc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
blue_modules/BlueElectrum.js
View file

@ -4,13 +4,14 @@ import { LegacyWallet, SegwitBech32Wallet, SegwitP2SHWallet, TaprootWallet } fro
import DefaultPreference from 'react-native-default-preference';
import loc from '../loc';
import WidgetCommunication from './WidgetCommunication';
import { isTorDaemonDisabled } from './environment';
import { isTorCapable, isTorDaemonDisabled } from './environment';
import alert from '../components/Alert';
const bitcoin = require('bitcoinjs-lib');
const ElectrumClient = require('electrum-client');
const reverse = require('buffer-reverse');
const BigNumber = require('bignumber.js');
const torrific = require('./torrific');
const torrific = isTorCapable ? require('./torrific') : require('../scripts/maccatalystpatches/torrific.js');
const Realm = require('realm');
const ELECTRUM_HOST = 'electrum_host';

1
blue_modules/environment.ts
View file

@ -11,6 +11,7 @@ const getIsTorCapable = (): boolean => {
} else if (isDesktop) {
capable = false;
}
console.log('getIsTorCapable', capable);
return capable;
};

5
class/lnurl.js
View file

@ -1,12 +1,13 @@
import { bech32 } from 'bech32';
import bolt11 from 'bolt11';
import { isTorDaemonDisabled } from '../blue_modules/environment';
import { isTorCapable, isTorDaemonDisabled } from '../blue_modules/environment';
import { parse } from 'url'; // eslint-disable-line n/no-deprecated-api
import { createHmac } from 'crypto';
import secp256k1 from 'secp256k1';
const CryptoJS = require('crypto-js');
const createHash = require('create-hash');
const torrific = require('../blue_modules/torrific');
const torrific = isTorCapable ? require('../blue_modules/torrific') : require('../scripts/maccatalystpatches/torrific.js');
const ONION_REGEX = /^(http:\/\/[^/:@]+\.onion(?::\d{1,5})?)(\/.*)?$/; // regex for onion URL
/**

5
class/wallets/lightning-custodian-wallet.js
View file

@ -2,8 +2,9 @@ import { LegacyWallet } from './legacy-wallet';
import Frisbee from 'frisbee';
import bolt11 from 'bolt11';
import { BitcoinUnit, Chain } from '../../models/bitcoinUnits';
import { isTorDaemonDisabled } from '../../blue_modules/environment';
const torrific = require('../../blue_modules/torrific');
import { isTorDaemonDisabled, isTorCapable } from '../../blue_modules/environment';
const torrific = isTorCapable ? require('../../blue_modules/torrific') : require('../../scripts/maccatalystpatches/torrific.js');
export class LightningCustodianWallet extends LegacyWallet {
static type = 'lightningCustodianWallet';
static typeReadable = 'Lightning';

3
screen/lnd/lndCreateInvoice.js
View file

@ -30,8 +30,9 @@ import alert from '../../components/Alert';
import { parse } from 'url'; // eslint-disable-line n/no-deprecated-api
import { requestCameraAuthorization } from '../../helpers/scan-qr';
import { useTheme } from '../../components/themes';
import { isTorCapable } from '../../blue_modules/environment';
const currency = require('../../blue_modules/currency');
const torrific = require('../../blue_modules/torrific');
const torrific = isTorCapable ? require('../../blue_modules/torrific') : require('../../scripts/maccatalystpatches/torrific.js');
const LNDCreateInvoice = () => {
const { wallets, saveToDisk, setSelectedWallet, isTorDisabled } = useContext(BlueStorageContext);

3
screen/send/confirm.js
View file

@ -17,11 +17,12 @@ import { Psbt } from 'bitcoinjs-lib';
import { useNavigation, useRoute } from '@react-navigation/native';
import alert from '../../components/Alert';
import { useTheme } from '../../components/themes';
import { isTorCapable } from '../../blue_modules/environment';
const currency = require('../../blue_modules/currency');
const BlueElectrum = require('../../blue_modules/BlueElectrum');
const Bignumber = require('bignumber.js');
const bitcoin = require('bitcoinjs-lib');
const torrific = require('../../blue_modules/torrific');
const torrific = isTorCapable ? require('../../blue_modules/torrific') : require('../../scripts/maccatalystpatches/torrific.js');
const Confirm = () => {
const { wallets, fetchAndSaveWalletTransactions, isElectrumDisabled, isTorDisabled } = useContext(BlueStorageContext);

5
screen/settings/torSettings.js
View file

@ -1,13 +1,14 @@
import React, { useState, useEffect, useContext } from 'react';
import { View } from 'react-native';
import { View } from 'react-native';
import navigationStyle from '../../components/navigationStyle';
import { BlueButton, BlueCard, BlueListItem, BlueLoading, BlueSpacing20, BlueText, SafeBlueArea } from '../../BlueComponents';
import loc from '../../loc';
import { BlueStorageContext } from '../../blue_modules/storage-context';
import alert from '../../components/Alert';
import { isTorCapable } from '../../blue_modules/environment';
const torrific = require('../../blue_modules/torrific');
const torrific = isTorCapable ? require('../../blue_modules/torrific') : require('../../scripts/maccatalystpatches/torrific.js');
/*
TorSettings is not displayed in Settings menu if isTorCapable is false. No need to provide code protection.

3
scripts/maccatalystpatches/applypatchesformaccatalyst.sh
View file

@ -7,8 +7,7 @@ sed -i '' 's/"patches": "patch -p1 < scripts\/react-native-tor.patch; patch -p1
rm -fr node_modules
echo "Re-installing node_modules"
npm i
echo "Deleting torrific.js and lightning-ldk-wallet.ts content"
cp scripts/maccatalystpatches/torrific.js blue_modules/torrific.js
echo "Deleting lightning-ldk-wallet.ts content"
cp scripts/maccatalystpatches/lightning-ldk-wallet.ts class/wallets/lightning-ldk-wallet.ts
echo "Updating Podfile"
cd ios && pod update && cd ..