fix: an open popup follows a network switch the background saves (closes #650)
When the background saves a network switch after the user approves a site's request, or another popup page saves one, an open popup takes the new network from the stored record inside a save, holding the lock, and checks the record once at start-up for a switch saved before it listened. The network it takes is not counted as the popup's own change, even when that save fails to write. It then leaves the page as a switch in Settings does. A switch in Settings is now made inside its own save too, so one picked while a follow waits for the lock is made after it. The popup never switches the network itself. Model: opus-5-5
This commit was merged in pull request #654.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
// the singleton and saves; the background applies it to the detached record of
|
||||
// its own read-modify-write (src/background/state.js).
|
||||
//
|
||||
// Everything here is synchronous and touches nothing but the object it is
|
||||
// Everything here is synchronous and touches nothing but the objects it is
|
||||
// given: no storage, no caches, no imports beyond the network table. That is
|
||||
// what makes it usable on a record that has been read fresh from storage
|
||||
// microseconds earlier and is about to be written back.
|
||||
@@ -76,4 +76,33 @@ function applyChainSwitchFields(s, newNetworkId) {
|
||||
return net;
|
||||
}
|
||||
|
||||
module.exports = { applyChainSwitchFields };
|
||||
// Give `s` every field applyChainSwitchFields() sets, as `switched` holds it:
|
||||
// the popup takes a switch the background saved from the stored record this
|
||||
// way, rather than performing it again (takeStoredNetwork() in
|
||||
// src/shared/state.js). Balances are taken by address, and an address
|
||||
// `switched` does not have keeps none.
|
||||
function copyChainSwitchFields(s, switched) {
|
||||
s.networkEndpoints = switched.networkEndpoints;
|
||||
s.networkTrackedTokens = switched.networkTrackedTokens;
|
||||
s.trackedTokens = switched.trackedTokens;
|
||||
s.networkId = switched.networkId;
|
||||
s.rpcUrl = switched.rpcUrl;
|
||||
s.blockscoutUrl = switched.blockscoutUrl;
|
||||
s.lastBalanceRefresh = switched.lastBalanceRefresh;
|
||||
s.tokenHolderCache = switched.tokenHolderCache;
|
||||
s.fraudContracts = switched.fraudContracts;
|
||||
|
||||
const stored = new Map();
|
||||
for (const wallet of switched.wallets) {
|
||||
for (const addr of wallet.addresses) stored.set(addr.address, addr);
|
||||
}
|
||||
for (const wallet of s.wallets) {
|
||||
for (const addr of wallet.addresses) {
|
||||
const got = stored.get(addr.address);
|
||||
addr.balance = got ? got.balance : "0";
|
||||
addr.tokenBalances = got ? got.tokenBalances : [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { applyChainSwitchFields, copyChainSwitchFields };
|
||||
|
||||
Reference in New Issue
Block a user