@@ -26,7 +26,6 @@ const appActions = require('../../../js/actions/appActions')
26
26
// State
27
27
const ledgerState = require ( '../../common/state/ledgerState' )
28
28
const pageDataState = require ( '../../common/state/pageDataState' )
29
- const migrationState = require ( '../../common/state/migrationState' )
30
29
const updateState = require ( '../../common/state/updateState' )
31
30
32
31
// Constants
@@ -85,7 +84,6 @@ let verifiedTimeoutId = false
85
84
let v2RulesetDB
86
85
const v2RulesetPath = 'ledger-rulesV2.leveldb'
87
86
const statePath = 'ledger-state.json'
88
- const newClientPath = 'ledger-newstate.json'
89
87
90
88
// Definitions
91
89
const clientOptions = {
@@ -1223,8 +1221,6 @@ const checkPromotions = () => {
1223
1221
1224
1222
const enable = ( state , paymentsEnabled ) => {
1225
1223
if ( paymentsEnabled ) {
1226
- state = checkBtcBatMigrated ( state , paymentsEnabled )
1227
-
1228
1224
if ( ! getSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED ) ) {
1229
1225
appActions . changeSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED , true )
1230
1226
}
@@ -1912,19 +1908,6 @@ const onCallback = (state, result, delayTime) => {
1912
1908
// persist the new ledger state
1913
1909
muonWriter ( statePath , regularResults )
1914
1910
1915
- // delete the temp file used during transition (if it still exists)
1916
- if ( client && client . options && client . options . version === 'v2' ) {
1917
- const fs = require ( 'fs' )
1918
- fs . access ( pathName ( newClientPath ) , fs . FF_OK , ( err ) => {
1919
- if ( err ) {
1920
- return
1921
- }
1922
- fs . unlink ( pathName ( newClientPath ) , ( err ) => {
1923
- if ( err ) console . error ( 'unlink error: ' + err . toString ( ) )
1924
- } )
1925
- } )
1926
- }
1927
-
1928
1911
run ( state , delayTime )
1929
1912
1930
1913
return state
@@ -2016,7 +1999,6 @@ const initialize = (state, paymentsEnabled) => {
2016
1999
2017
2000
if ( ! paymentsEnabled ) {
2018
2001
client = null
2019
- newClient = false
2020
2002
return ledgerState . resetInfo ( state , true )
2021
2003
}
2022
2004
@@ -2390,147 +2372,6 @@ const deleteSynopsis = () => {
2390
2372
synopsis . publishers = { }
2391
2373
}
2392
2374
2393
- // fix for incorrectly persisted state (see #11585)
2394
- const yoDawg = ( stateState ) => {
2395
- while ( stateState . hasOwnProperty ( 'state' ) && stateState . state . persona ) {
2396
- stateState = stateState . state
2397
- }
2398
- return stateState
2399
- }
2400
-
2401
- const checkBtcBatMigrated = ( state , paymentsEnabled ) => {
2402
- if ( ! paymentsEnabled ) {
2403
- return state
2404
- }
2405
-
2406
- // One time conversion of wallet
2407
- const isNewInstall = migrationState . isNewInstall ( state )
2408
- const hasUpgradedWallet = migrationState . hasUpgradedWallet ( state )
2409
- if ( ! isNewInstall && ! hasUpgradedWallet ) {
2410
- state = migrationState . setTransitionStatus ( state , true )
2411
- module . exports . transitionWalletToBat ( )
2412
- } else {
2413
- state = migrationState . setTransitionStatus ( state , false )
2414
- }
2415
-
2416
- return state
2417
- }
2418
-
2419
- let newClient = null
2420
- const getNewClient = ( ) => {
2421
- return newClient
2422
- }
2423
-
2424
- let busyRetryCount = 0
2425
-
2426
- const transitionWalletToBat = ( ) => {
2427
- let newPaymentId , result
2428
-
2429
- if ( newClient === true ) return
2430
- clientprep ( )
2431
-
2432
- if ( ! client ) {
2433
- console . log ( 'Client is not initialized, will try again' )
2434
- return
2435
- }
2436
-
2437
- // only attempt this transition if the wallet is v1
2438
- if ( client . options && client . options . version !== 'v1' ) {
2439
- // older versions incorrectly marked this for transition
2440
- // this will clean them up (no more bouncy ball)
2441
- appActions . onBitcoinToBatTransitioned ( )
2442
- return
2443
- }
2444
-
2445
- // Restore newClient from the file (if one exists)
2446
- if ( ! newClient ) {
2447
- const fs = require ( 'fs' )
2448
- try {
2449
- fs . accessSync ( pathName ( newClientPath ) , fs . FF_OK )
2450
- fs . readFile ( pathName ( newClientPath ) , ( error , data ) => {
2451
- if ( error ) {
2452
- console . error ( `ledger client: can't read ${ newClientPath } to restore newClient` )
2453
- return
2454
- }
2455
- const parsedData = JSON . parse ( data )
2456
- const state = yoDawg ( parsedData )
2457
- newClient = ledgerClient ( state . personaId ,
2458
- underscore . extend ( state . options , { roundtrip : module . exports . roundtrip } , clientOptions ) ,
2459
- state )
2460
- transitionWalletToBat ( )
2461
- } )
2462
- return
2463
- } catch ( err ) { }
2464
- }
2465
-
2466
- // Create new client
2467
- if ( ! newClient ) {
2468
- try {
2469
- newClient = ledgerClient ( null , underscore . extend ( { roundtrip : module . exports . roundtrip } , clientOptions ) , null )
2470
- muonWriter ( newClientPath , newClient . state )
2471
- } catch ( ex ) {
2472
- console . error ( 'ledger client creation error(2): ' , ex )
2473
- return
2474
- }
2475
- }
2476
-
2477
- newPaymentId = newClient . getPaymentId ( )
2478
- if ( ! newPaymentId ) {
2479
- newClient . sync ( ( err , result , delayTime ) => {
2480
- if ( err ) {
2481
- return console . error ( 'ledger client error(3): ' + JSON . stringify ( err , null , 2 ) + ( err . stack ? ( '\n' + err . stack ) : '' ) )
2482
- }
2483
-
2484
- if ( typeof delayTime === 'undefined' ) delayTime = random . randomInt ( { min : 1 , max : 500 } )
2485
-
2486
- if ( newClient ) {
2487
- muonWriter ( newClientPath , newClient . state )
2488
- }
2489
-
2490
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2491
- } )
2492
- return
2493
- }
2494
-
2495
- if ( client . busyP ( ) ) {
2496
- if ( ++ busyRetryCount > 3 ) {
2497
- console . log ( 'ledger client is currently busy; transition will be retried on next launch' )
2498
- return
2499
- }
2500
- const delayTime = random . randomInt ( {
2501
- min : ledgerUtil . milliseconds . minute ,
2502
- max : 10 * ledgerUtil . milliseconds . minute
2503
- } )
2504
- console . log ( 'ledger client is currently busy; transition will be retried shortly (this was attempt ' + busyRetryCount + ')' )
2505
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2506
- return
2507
- }
2508
-
2509
- appActions . onBitcoinToBatBeginTransition ( )
2510
-
2511
- try {
2512
- client . transition ( newPaymentId , ( err , properties ) => {
2513
- if ( err || ! newClient ) {
2514
- console . error ( 'ledger client transition error: ' , err )
2515
- } else {
2516
- result = newClient . transitioned ( properties )
2517
- client = newClient
2518
- newClient = true
2519
- // NOTE: onLedgerCallback will save latest client to disk as ledger-state.json
2520
- appActions . onLedgerCallback ( result , random . randomInt ( {
2521
- min : ledgerUtil . milliseconds . minute ,
2522
- max : 10 * ledgerUtil . milliseconds . minute
2523
- } ) )
2524
- appActions . onBitcoinToBatTransitioned ( )
2525
- ledgerNotifications . showBraveWalletUpdated ( )
2526
- getPublisherTimestamp ( )
2527
- }
2528
- } )
2529
- } catch ( ex ) {
2530
- console . error ( 'exception during ledger client transition: ' , ex )
2531
- }
2532
- }
2533
-
2534
2375
let currentMediaKey = null
2535
2376
const onMediaRequest = ( state , xhr , type , tabId ) => {
2536
2377
if ( ! xhr || type == null ) {
@@ -2869,13 +2710,10 @@ const getMethods = () => {
2869
2710
migration,
2870
2711
onInitRead,
2871
2712
deleteSynopsis,
2872
- transitionWalletToBat,
2873
- getNewClient,
2874
2713
normalizePinned,
2875
2714
roundToTarget,
2876
2715
savePublisherData,
2877
2716
pruneSynopsis,
2878
- checkBtcBatMigrated,
2879
2717
onMediaRequest,
2880
2718
onMediaPublisher,
2881
2719
saveVisit,
@@ -2897,7 +2735,6 @@ const getMethods = () => {
2897
2735
privateMethods = {
2898
2736
enable,
2899
2737
addSiteVisit,
2900
- checkBtcBatMigrated,
2901
2738
clearVisitsByPublisher : function ( ) {
2902
2739
visitsByPublisher = { }
2903
2740
} ,
@@ -2908,9 +2745,6 @@ const getMethods = () => {
2908
2745
setSynopsis : ( data ) => {
2909
2746
synopsis = data
2910
2747
} ,
2911
- resetNewClient : ( ) => {
2912
- newClient = false
2913
- } ,
2914
2748
getClient : ( ) => {
2915
2749
return client
2916
2750
} ,
0 commit comments