Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(wallet): Beignet Migration #1450

Merged
merged 63 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
0db90a2
refactor(wallet): Beignet Migration
coreyphillips Jan 2, 2024
5b73ae9
chore(wallet): Upgrade Beignet to 0.0.4
coreyphillips Jan 2, 2024
f74ff96
fix(profile): fix crash when saving profile (Android) (#1448)
pwltr Jan 2, 2024
06f3533
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 2, 2024
ccc122a
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 8, 2024
20574cd
fix(wallet): Fee Calculation Updates
coreyphillips Jan 9, 2024
aa3189b
fix(wallet): Fix Errors
coreyphillips Jan 9, 2024
de7b360
chore(wallet): Bump beignet version
coreyphillips Jan 9, 2024
c68ef2a
fix(wallet): Fix Restore Tests
coreyphillips Jan 9, 2024
349122a
fix(wallet): Fix Restore Tests
coreyphillips Jan 9, 2024
7817594
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 9, 2024
45aae65
fix(wallet): Add startWalletServices method to wallet-restore
coreyphillips Jan 9, 2024
d4c0f9f
fix(wallet): Remove connectToElectrum from wallet-restore.ts
coreyphillips Jan 9, 2024
68091a5
fix(wallet): Fix Send Flow
coreyphillips Jan 11, 2024
1007c58
Update src/store/reducers/wallet.ts
coreyphillips Jan 11, 2024
5ec5503
fix(wallet): Update updateExchangeRates Type
coreyphillips Jan 11, 2024
f345df4
fix(wallet): Update Regtest Fee Estimates
coreyphillips Jan 11, 2024
fa16542
fix(wallet): Fix updateAddressType
coreyphillips Jan 11, 2024
ca22585
fix(wallet): Remove startWalletServices from test
coreyphillips Jan 11, 2024
68434e0
fix(wallet): Add switchNetwork to restore test
coreyphillips Jan 11, 2024
f7d31df
fix(wallet): Add getCurrentWallet to updateOnChainActivityList
coreyphillips Jan 11, 2024
f0db5b2
fix(wallet): Add refreshWallet to restore test
coreyphillips Jan 11, 2024
03bc56d
fix(wallet): Add addressIndex check to restore test
coreyphillips Jan 11, 2024
1fe35a8
fix(wallet): Update getOnChainWallet in restore test
coreyphillips Jan 11, 2024
60afa21
fix(wallet): Updated address storage check in restore test
coreyphillips Jan 11, 2024
bf85905
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 11, 2024
712484b
fix(wallet): Fix updateOnChainActivityList
coreyphillips Jan 12, 2024
a3c0490
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 12, 2024
c0afe98
chore(wallet): Bump beignet version
coreyphillips Jan 12, 2024
3a09c12
chore(wallet): Pass network to restoreSeed
coreyphillips Jan 12, 2024
4143d17
fix(wallet): Update network param for setupOnChainWallet
coreyphillips Jan 12, 2024
7275a44
fix(wallet): Add refreshWallet to restore test
coreyphillips Jan 12, 2024
a573fd8
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 16, 2024
7ec6a41
fix(wallet): Update switchNetwork in Settings
coreyphillips Jan 17, 2024
a388c32
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 17, 2024
4709934
chore(wallet): Bump beignet to 0.0.12
coreyphillips Jan 17, 2024
3656834
fix: e2e/settings test derivation path
limpbrains Jan 18, 2024
06e77d8
fix(wallet): Prevent notification when switching networks
coreyphillips Jan 18, 2024
be763d0
fix(wallet): Update transactionReceived notification condition
coreyphillips Jan 18, 2024
99ebe19
fix(wallet): Update wallet-restore.ts
coreyphillips Jan 18, 2024
378a7c1
fix(wallet): Pass servers through restoreSeed method
coreyphillips Jan 18, 2024
5489631
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 18, 2024
c2b947c
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 19, 2024
e19b429
fix(wallet): Update FALLBACK_BLOCKTANK_PEERS
coreyphillips Jan 21, 2024
67bc0df
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 21, 2024
89521be
fix(wallet): Add lightningInvoice condition to sendNavigation onOpen
coreyphillips Jan 22, 2024
50fffed
fix(wallet): Remove setupOnChainWallet from restoreSeed
coreyphillips Jan 22, 2024
4290b20
fix(wallet): Bump beignet to 0.0.14
coreyphillips Jan 23, 2024
48dd353
fix(wallet): Migrate to new id
coreyphillips Jan 24, 2024
1edf711
chore(wallet): Bump beignet to 0.0.15
coreyphillips Jan 25, 2024
b2c789a
fix(wallet): Remove waitForElectrum from onchain e2e test
coreyphillips Jan 25, 2024
a4d41ab
fix: add forceExit to detox jest start arguments
limpbrains Jan 25, 2024
a47797e
fix(wallet): Update combinedUtxos
coreyphillips Jan 25, 2024
c7c08a6
fix(wallet): Fix linting errors
coreyphillips Jan 25, 2024
a135849
fix(wallet): Add waitForElectrum back to onchain e2e test
coreyphillips Jan 25, 2024
f414b07
fix(wallet): Update useEffect deps for number pad text in Amount comp…
coreyphillips Jan 25, 2024
75fa00b
fix(wallet): Restore initWaitForElectrumToSync logic in wallet restor…
coreyphillips Jan 25, 2024
5b64da8
fix(wallet): Remove dep from usEffect in Amount component
coreyphillips Jan 26, 2024
b6de952
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 26, 2024
abd5226
chore(wallet): Bump beignet to 0.0.16
coreyphillips Jan 27, 2024
4ba66c6
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 27, 2024
1ce3702
fix(wallet): Add condition to onOpen in SendNavigation.tsx
coreyphillips Jan 27, 2024
09e5e54
Merge remote-tracking branch 'origin/master' into beignet-migration
coreyphillips Jan 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .detoxrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
args: {
config: 'e2e/jest.config.js',
_: ['e2e'],
forceExit: true,
},
},
apps: {
Expand Down
2 changes: 1 addition & 1 deletion __tests__/fiat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('Pulls latest fiat exchange rates and checks the wallet store for valid
});

it('Blocktank FX rates with default selected currency', async () => {
const res = await updateExchangeRates();
const res = await updateExchangeRates({});

expect(res.isOk()).toEqual(true);
if (res.isErr()) {
Expand Down
111 changes: 0 additions & 111 deletions __tests__/transactions.ts

This file was deleted.

6 changes: 6 additions & 0 deletions __tests__/utils/dummy-wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ export const walletState: IWallet = {
txid: '206962f8dcefbaf5a05c1dcc6cd0c214420c6be4e0e634bf71dbca518884bd51',
messages: [],
timestamp: 1620919862000,
vsize: 246,
vin: [],
},
'6927ef1dbc7afd90dde0969e8455411e8bf30303e5da470de2a2b37b8337e7d5': {
Expand All @@ -653,6 +654,7 @@ export const walletState: IWallet = {
txid: '6927ef1dbc7afd90dde0969e8455411e8bf30303e5da470de2a2b37b8337e7d5',
messages: [],
timestamp: 1620127029000,
vsize: 246,
vin: [],
},
'83c9769fcf970ae8806b18549b18d7ad05e1f7c7e546bb4e355c638262977da2': {
Expand All @@ -671,6 +673,7 @@ export const walletState: IWallet = {
txid: '83c9769fcf970ae8806b18549b18d7ad05e1f7c7e546bb4e355c638262977da2',
messages: [],
timestamp: 1620302817000,
vsize: 246,
vin: [],
},
ac3f19029332cbd2f2d01544dea8e0d98dd41f3082b05ee24aa84f4f6168e929: {
Expand All @@ -689,6 +692,7 @@ export const walletState: IWallet = {
txid: 'ac3f19029332cbd2f2d01544dea8e0d98dd41f3082b05ee24aa84f4f6168e929',
messages: [],
timestamp: 1620405043000,
vsize: 246,
vin: [],
},
bd08abb0fc42ea09fb53f12ba8286e753cf615a8665f9e23d995d4788489c610: {
Expand All @@ -707,6 +711,7 @@ export const walletState: IWallet = {
txid: 'bd08abb0fc42ea09fb53f12ba8286e753cf615a8665f9e23d995d4788489c610',
messages: [],
timestamp: 1620730909000,
vsize: 246,
vin: [],
},
'71c61ef6dd1af0a06cb6040459c3b7b2cbe2ab8ec9f4d8abd73eba4931ab0e0c': {
Expand All @@ -725,6 +730,7 @@ export const walletState: IWallet = {
txid: '71c61ef6dd1af0a06cb6040459c3b7b2cbe2ab8ec9f4d8abd73eba4931ab0e0c',
messages: [],
timestamp: 1628558272000,
vsize: 246,
vin: [],
},
},
Expand Down
3 changes: 2 additions & 1 deletion __tests__/utils/wait-for-electrum.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import net from 'net';
import BitcoinJsonRpc from 'bitcoin-json-rpc';
import ElectrumClient from 'electrum-client';
import { EProtocol } from 'beignet';

export const sleep = (ms): Promise<void> => {
return new Promise((resolve) => {
Expand All @@ -22,7 +23,7 @@ const initWaitForElectrumToSync = async (
false,
elAddr.port,
elAddr.host,
'tcp',
EProtocol.tcp,
);

electrum.subscribe.on('blockchain.headers.subscribe', (params) => {
Expand Down
Loading
Loading