@@ -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 = {
@@ -1190,8 +1188,6 @@ const checkPromotions = () => {
1190
1188
1191
1189
const enable = ( state , paymentsEnabled ) => {
1192
1190
if ( paymentsEnabled ) {
1193
- state = checkBtcBatMigrated ( state , paymentsEnabled )
1194
-
1195
1191
if ( ! getSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED ) ) {
1196
1192
appActions . changeSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED , true )
1197
1193
}
@@ -1884,19 +1880,6 @@ const onCallback = (state, result, delayTime) => {
1884
1880
// persist the new ledger state
1885
1881
muonWriter ( statePath , regularResults )
1886
1882
1887
- // delete the temp file used during transition (if it still exists)
1888
- if ( client && client . options && client . options . version === 'v2' ) {
1889
- const fs = require ( 'fs' )
1890
- fs . access ( pathName ( newClientPath ) , fs . FF_OK , ( err ) => {
1891
- if ( err ) {
1892
- return
1893
- }
1894
- fs . unlink ( pathName ( newClientPath ) , ( err ) => {
1895
- if ( err ) console . error ( 'unlink error: ' + err . toString ( ) )
1896
- } )
1897
- } )
1898
- }
1899
-
1900
1883
run ( state , delayTime )
1901
1884
1902
1885
return state
@@ -1988,7 +1971,6 @@ const initialize = (state, paymentsEnabled) => {
1988
1971
1989
1972
if ( ! paymentsEnabled ) {
1990
1973
client = null
1991
- newClient = false
1992
1974
return ledgerState . resetInfo ( state , true )
1993
1975
}
1994
1976
@@ -2362,147 +2344,6 @@ const deleteSynopsis = () => {
2362
2344
synopsis . publishers = { }
2363
2345
}
2364
2346
2365
- // fix for incorrectly persisted state (see #11585)
2366
- const yoDawg = ( stateState ) => {
2367
- while ( stateState . hasOwnProperty ( 'state' ) && stateState . state . persona ) {
2368
- stateState = stateState . state
2369
- }
2370
- return stateState
2371
- }
2372
-
2373
- const checkBtcBatMigrated = ( state , paymentsEnabled ) => {
2374
- if ( ! paymentsEnabled ) {
2375
- return state
2376
- }
2377
-
2378
- // One time conversion of wallet
2379
- const isNewInstall = migrationState . isNewInstall ( state )
2380
- const hasUpgradedWallet = migrationState . hasUpgradedWallet ( state )
2381
- if ( ! isNewInstall && ! hasUpgradedWallet ) {
2382
- state = migrationState . setTransitionStatus ( state , true )
2383
- module . exports . transitionWalletToBat ( )
2384
- } else {
2385
- state = migrationState . setTransitionStatus ( state , false )
2386
- }
2387
-
2388
- return state
2389
- }
2390
-
2391
- let newClient = null
2392
- const getNewClient = ( ) => {
2393
- return newClient
2394
- }
2395
-
2396
- let busyRetryCount = 0
2397
-
2398
- const transitionWalletToBat = ( ) => {
2399
- let newPaymentId , result
2400
-
2401
- if ( newClient === true ) return
2402
- clientprep ( )
2403
-
2404
- if ( ! client ) {
2405
- console . log ( 'Client is not initialized, will try again' )
2406
- return
2407
- }
2408
-
2409
- // only attempt this transition if the wallet is v1
2410
- if ( client . options && client . options . version !== 'v1' ) {
2411
- // older versions incorrectly marked this for transition
2412
- // this will clean them up (no more bouncy ball)
2413
- appActions . onBitcoinToBatTransitioned ( )
2414
- return
2415
- }
2416
-
2417
- // Restore newClient from the file (if one exists)
2418
- if ( ! newClient ) {
2419
- const fs = require ( 'fs' )
2420
- try {
2421
- fs . accessSync ( pathName ( newClientPath ) , fs . FF_OK )
2422
- fs . readFile ( pathName ( newClientPath ) , ( error , data ) => {
2423
- if ( error ) {
2424
- console . error ( `ledger client: can't read ${ newClientPath } to restore newClient` )
2425
- return
2426
- }
2427
- const parsedData = JSON . parse ( data )
2428
- const state = yoDawg ( parsedData )
2429
- newClient = ledgerClient ( state . personaId ,
2430
- underscore . extend ( state . options , { roundtrip : module . exports . roundtrip } , clientOptions ) ,
2431
- state )
2432
- transitionWalletToBat ( )
2433
- } )
2434
- return
2435
- } catch ( err ) { }
2436
- }
2437
-
2438
- // Create new client
2439
- if ( ! newClient ) {
2440
- try {
2441
- newClient = ledgerClient ( null , underscore . extend ( { roundtrip : module . exports . roundtrip } , clientOptions ) , null )
2442
- muonWriter ( newClientPath , newClient . state )
2443
- } catch ( ex ) {
2444
- console . error ( 'ledger client creation error(2): ' , ex )
2445
- return
2446
- }
2447
- }
2448
-
2449
- newPaymentId = newClient . getPaymentId ( )
2450
- if ( ! newPaymentId ) {
2451
- newClient . sync ( ( err , result , delayTime ) => {
2452
- if ( err ) {
2453
- return console . error ( 'ledger client error(3): ' + JSON . stringify ( err , null , 2 ) + ( err . stack ? ( '\n' + err . stack ) : '' ) )
2454
- }
2455
-
2456
- if ( typeof delayTime === 'undefined' ) delayTime = random . randomInt ( { min : 1 , max : 500 } )
2457
-
2458
- if ( newClient ) {
2459
- muonWriter ( newClientPath , newClient . state )
2460
- }
2461
-
2462
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2463
- } )
2464
- return
2465
- }
2466
-
2467
- if ( client . busyP ( ) ) {
2468
- if ( ++ busyRetryCount > 3 ) {
2469
- console . log ( 'ledger client is currently busy; transition will be retried on next launch' )
2470
- return
2471
- }
2472
- const delayTime = random . randomInt ( {
2473
- min : ledgerUtil . milliseconds . minute ,
2474
- max : 10 * ledgerUtil . milliseconds . minute
2475
- } )
2476
- console . log ( 'ledger client is currently busy; transition will be retried shortly (this was attempt ' + busyRetryCount + ')' )
2477
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2478
- return
2479
- }
2480
-
2481
- appActions . onBitcoinToBatBeginTransition ( )
2482
-
2483
- try {
2484
- client . transition ( newPaymentId , ( err , properties ) => {
2485
- if ( err || ! newClient ) {
2486
- console . error ( 'ledger client transition error: ' , err )
2487
- } else {
2488
- result = newClient . transitioned ( properties )
2489
- client = newClient
2490
- newClient = true
2491
- // NOTE: onLedgerCallback will save latest client to disk as ledger-state.json
2492
- appActions . onLedgerCallback ( result , random . randomInt ( {
2493
- min : ledgerUtil . milliseconds . minute ,
2494
- max : 10 * ledgerUtil . milliseconds . minute
2495
- } ) )
2496
- appActions . onBitcoinToBatTransitioned ( )
2497
- ledgerNotifications . showBraveWalletUpdated ( )
2498
- getPublisherTimestamp ( )
2499
- }
2500
- } )
2501
- } catch ( ex ) {
2502
- console . error ( 'exception during ledger client transition: ' , ex )
2503
- }
2504
- }
2505
-
2506
2347
let currentMediaKey = null
2507
2348
const onMediaRequest = ( state , xhr , type , tabId ) => {
2508
2349
if ( ! xhr || type == null ) {
@@ -2843,13 +2684,10 @@ const getMethods = () => {
2843
2684
migration,
2844
2685
onInitRead,
2845
2686
deleteSynopsis,
2846
- transitionWalletToBat,
2847
- getNewClient,
2848
2687
normalizePinned,
2849
2688
roundToTarget,
2850
2689
savePublisherData,
2851
2690
pruneSynopsis,
2852
- checkBtcBatMigrated,
2853
2691
onMediaRequest,
2854
2692
onMediaPublisher,
2855
2693
saveVisit,
@@ -2871,7 +2709,6 @@ const getMethods = () => {
2871
2709
privateMethods = {
2872
2710
enable,
2873
2711
addSiteVisit,
2874
- checkBtcBatMigrated,
2875
2712
clearVisitsByPublisher : function ( ) {
2876
2713
visitsByPublisher = { }
2877
2714
} ,
@@ -2882,9 +2719,6 @@ const getMethods = () => {
2882
2719
setSynopsis : ( data ) => {
2883
2720
synopsis = data
2884
2721
} ,
2885
- resetNewClient : ( ) => {
2886
- newClient = false
2887
- } ,
2888
2722
getClient : ( ) => {
2889
2723
return client
2890
2724
} ,
0 commit comments