@@ -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
31
30
// Constants
32
31
const settings = require ( '../../../js/constants/settings' )
@@ -81,7 +80,6 @@ let verifiedTimeoutId = false
81
80
let v2RulesetDB
82
81
const v2RulesetPath = 'ledger-rulesV2.leveldb'
83
82
const statePath = 'ledger-state.json'
84
- const newClientPath = 'ledger-newstate.json'
85
83
86
84
// Definitions
87
85
const clientOptions = {
@@ -1140,8 +1138,6 @@ const initSynopsis = (state) => {
1140
1138
1141
1139
const enable = ( state , paymentsEnabled ) => {
1142
1140
if ( paymentsEnabled ) {
1143
- state = checkBtcBatMigrated ( state , paymentsEnabled )
1144
-
1145
1141
if ( ! getSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED ) ) {
1146
1142
appActions . changeSetting ( settings . PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED , true )
1147
1143
}
@@ -1834,19 +1830,6 @@ const onCallback = (state, result, delayTime) => {
1834
1830
// persist the new ledger state
1835
1831
muonWriter ( statePath , regularResults )
1836
1832
1837
- // delete the temp file used during transition (if it still exists)
1838
- if ( client && client . options && client . options . version === 'v2' ) {
1839
- const fs = require ( 'fs' )
1840
- fs . access ( pathName ( newClientPath ) , fs . FF_OK , ( err ) => {
1841
- if ( err ) {
1842
- return
1843
- }
1844
- fs . unlink ( pathName ( newClientPath ) , ( err ) => {
1845
- if ( err ) console . error ( 'unlink error: ' + err . toString ( ) )
1846
- } )
1847
- } )
1848
- }
1849
-
1850
1833
run ( state , delayTime )
1851
1834
1852
1835
return state
@@ -1877,7 +1860,6 @@ const initialize = (state, paymentsEnabled) => {
1877
1860
1878
1861
if ( ! paymentsEnabled ) {
1879
1862
client = null
1880
- newClient = false
1881
1863
return ledgerState . resetInfo ( state , true )
1882
1864
}
1883
1865
@@ -1933,6 +1915,23 @@ const getContributionAmount = (state) => {
1933
1915
}
1934
1916
1935
1917
const onInitRead = ( state , parsedData ) => {
1918
+ // debugger
1919
+ const isBTC = parsedData &&
1920
+ parsedData . properties &&
1921
+ parsedData . properties . wallet &&
1922
+ parsedData . properties . wallet . keychains
1923
+
1924
+ if ( isBTC ) {
1925
+ const fs = require ( 'fs' )
1926
+ fs . renameSync ( pathName ( statePath ) , pathName ( 'ledger-state-btc.json' ) )
1927
+ state = ledgerState . resetInfo ( state , true )
1928
+ clientprep ( )
1929
+ client = ledgerClient ( null , underscore . extend ( { roundtrip : roundtrip } , clientOptions ) , null )
1930
+ parsedData = client . state
1931
+ muonWriter ( statePath , parsedData )
1932
+ return state
1933
+ }
1934
+
1936
1935
if ( Array . isArray ( parsedData . transactions ) ) {
1937
1936
parsedData . transactions . sort ( ( transaction1 , transaction2 ) => {
1938
1937
return transaction1 . submissionStamp - transaction2 . submissionStamp
@@ -2251,147 +2250,6 @@ const deleteSynopsis = () => {
2251
2250
synopsis . publishers = { }
2252
2251
}
2253
2252
2254
- // fix for incorrectly persisted state (see #11585)
2255
- const yoDawg = ( stateState ) => {
2256
- while ( stateState . hasOwnProperty ( 'state' ) && stateState . state . persona ) {
2257
- stateState = stateState . state
2258
- }
2259
- return stateState
2260
- }
2261
-
2262
- const checkBtcBatMigrated = ( state , paymentsEnabled ) => {
2263
- if ( ! paymentsEnabled ) {
2264
- return state
2265
- }
2266
-
2267
- // One time conversion of wallet
2268
- const isNewInstall = migrationState . isNewInstall ( state )
2269
- const hasUpgradedWallet = migrationState . hasUpgradedWallet ( state )
2270
- if ( ! isNewInstall && ! hasUpgradedWallet ) {
2271
- state = migrationState . setTransitionStatus ( state , true )
2272
- module . exports . transitionWalletToBat ( )
2273
- } else {
2274
- state = migrationState . setTransitionStatus ( state , false )
2275
- }
2276
-
2277
- return state
2278
- }
2279
-
2280
- let newClient = null
2281
- const getNewClient = ( ) => {
2282
- return newClient
2283
- }
2284
-
2285
- let busyRetryCount = 0
2286
-
2287
- const transitionWalletToBat = ( ) => {
2288
- let newPaymentId , result
2289
-
2290
- if ( newClient === true ) return
2291
- clientprep ( )
2292
-
2293
- if ( ! client ) {
2294
- console . log ( 'Client is not initialized, will try again' )
2295
- return
2296
- }
2297
-
2298
- // only attempt this transition if the wallet is v1
2299
- if ( client && client . options && client . options . version !== 'v1' ) {
2300
- // older versions incorrectly marked this for transition
2301
- // this will clean them up (no more bouncy ball)
2302
- appActions . onBitcoinToBatTransitioned ( )
2303
- return
2304
- }
2305
-
2306
- // Restore newClient from the file (if one exists)
2307
- if ( ! newClient ) {
2308
- const fs = require ( 'fs' )
2309
- try {
2310
- fs . accessSync ( pathName ( newClientPath ) , fs . FF_OK )
2311
- fs . readFile ( pathName ( newClientPath ) , ( error , data ) => {
2312
- if ( error ) {
2313
- console . error ( `ledger client: can't read ${ newClientPath } to restore newClient` )
2314
- return
2315
- }
2316
- const parsedData = JSON . parse ( data )
2317
- const state = yoDawg ( parsedData )
2318
- newClient = ledgerClient ( state . personaId ,
2319
- underscore . extend ( state . options , { roundtrip : roundtrip } , clientOptions ) ,
2320
- state )
2321
- transitionWalletToBat ( )
2322
- } )
2323
- return
2324
- } catch ( err ) { }
2325
- }
2326
-
2327
- // Create new client
2328
- if ( ! newClient ) {
2329
- try {
2330
- newClient = ledgerClient ( null , underscore . extend ( { roundtrip : roundtrip } , clientOptions ) , null )
2331
- muonWriter ( newClientPath , newClient . state )
2332
- } catch ( ex ) {
2333
- console . error ( 'ledger client creation error(2): ' , ex )
2334
- return
2335
- }
2336
- }
2337
-
2338
- newPaymentId = newClient . getPaymentId ( )
2339
- if ( ! newPaymentId ) {
2340
- newClient . sync ( ( err , result , delayTime ) => {
2341
- if ( err ) {
2342
- return console . error ( 'ledger client error(3): ' + JSON . stringify ( err , null , 2 ) + ( err . stack ? ( '\n' + err . stack ) : '' ) )
2343
- }
2344
-
2345
- if ( typeof delayTime === 'undefined' ) delayTime = random . randomInt ( { min : 1 , max : 500 } )
2346
-
2347
- if ( newClient ) {
2348
- muonWriter ( newClientPath , newClient . state )
2349
- }
2350
-
2351
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2352
- } )
2353
- return
2354
- }
2355
-
2356
- if ( client . busyP ( ) ) {
2357
- if ( ++ busyRetryCount > 3 ) {
2358
- console . log ( 'ledger client is currently busy; transition will be retried on next launch' )
2359
- return
2360
- }
2361
- const delayTime = random . randomInt ( {
2362
- min : ledgerUtil . milliseconds . minute ,
2363
- max : 10 * ledgerUtil . milliseconds . minute
2364
- } )
2365
- console . log ( 'ledger client is currently busy; transition will be retried shortly (this was attempt ' + busyRetryCount + ')' )
2366
- setTimeout ( ( ) => transitionWalletToBat ( ) , delayTime )
2367
- return
2368
- }
2369
-
2370
- appActions . onBitcoinToBatBeginTransition ( )
2371
-
2372
- try {
2373
- client . transition ( newPaymentId , ( err , properties ) => {
2374
- if ( err || ! newClient ) {
2375
- console . error ( 'ledger client transition error: ' , err )
2376
- } else {
2377
- result = newClient . transitioned ( properties )
2378
- client = newClient
2379
- newClient = true
2380
- // NOTE: onLedgerCallback will save latest client to disk as ledger-state.json
2381
- appActions . onLedgerCallback ( result , random . randomInt ( {
2382
- min : ledgerUtil . milliseconds . minute ,
2383
- max : 10 * ledgerUtil . milliseconds . minute
2384
- } ) )
2385
- appActions . onBitcoinToBatTransitioned ( )
2386
- ledgerNotifications . showBraveWalletUpdated ( )
2387
- getPublisherTimestamp ( )
2388
- }
2389
- } )
2390
- } catch ( ex ) {
2391
- console . error ( 'exception during ledger client transition: ' , ex )
2392
- }
2393
- }
2394
-
2395
2253
let currentMediaKey = null
2396
2254
const onMediaRequest = ( state , xhr , type , tabId ) => {
2397
2255
if ( ! xhr || type == null ) {
@@ -2657,11 +2515,8 @@ const getMethods = () => {
2657
2515
migration,
2658
2516
onInitRead,
2659
2517
deleteSynopsis,
2660
- transitionWalletToBat,
2661
- getNewClient,
2662
2518
savePublisherData,
2663
2519
pruneSynopsis,
2664
- checkBtcBatMigrated,
2665
2520
onMediaRequest,
2666
2521
onMediaPublisher,
2667
2522
saveVisit,
@@ -2680,7 +2535,6 @@ const getMethods = () => {
2680
2535
privateMethods = {
2681
2536
enable,
2682
2537
addSiteVisit,
2683
- checkBtcBatMigrated,
2684
2538
clearVisitsByPublisher : function ( ) {
2685
2539
visitsByPublisher = { }
2686
2540
} ,
@@ -2691,9 +2545,6 @@ const getMethods = () => {
2691
2545
setSynopsis : ( data ) => {
2692
2546
synopsis = data
2693
2547
} ,
2694
- resetNewClient : ( ) => {
2695
- newClient = false
2696
- } ,
2697
2548
getClient : ( ) => {
2698
2549
return client
2699
2550
} ,
0 commit comments