Skip to content

feat: replace assets state references confirmations #29726

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.

Sign up for GitHub

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

Merged
bergarces merged 6 commits into from
May 7, 2026
+23 −8
Merged

feat: replace assets state references confirmations #29726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85e8340
replace assets state references confirmations
bergarces May 5, 2026
325394d
correction
bergarces May 5, 2026
526e46c
fix tests
bergarces May 5, 2026
8e8bc28
safe method
bergarces May 5, 2026
cfc7cf4
fix
bergarces May 5, 2026
f71e6c6
Merge branch 'main' into replace-assets-state-references-confirmations
bergarces May 5, 2026
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
20 changes: 15 additions & 5 deletions app/core/Engine/controllers/transaction-controller/metrics_properties/gas.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@ const mockGetNativeTokenAddress = getNativeTokenAddress as jest.MockedFunction<
typeof getNativeTokenAddress
>;

const MOCK_CHECKSUMMED_ADDRESS = '0x44934055428d2eF7E3F97D98187f2459007fa49F';

const createMockState = (
balance: string = '0x100000000000000000',
chainId: string = '0x1',
address: string = '0xuser',
address: string = MOCK_CHECKSUMMED_ADDRESS,
): RootState =>
({
engine: {
backgroundState: {
AccountTrackerController: {
accountsByChainId: {
[chainId]: {
[address.toLowerCase()]: { balance },
[address]: { balance },
},
},
},
Expand All @@ -40,7 +42,11 @@ const createMockRequest = (
eventType: TRANSACTION_EVENTS.TRANSACTION_FINALIZED,
transactionMeta: {
chainId: '0x1',
txParams: { from: '0xuser', gas: '0x5208', gasPrice: '0x1' },
txParams: {
from: MOCK_CHECKSUMMED_ADDRESS,
gas: '0x5208',
gasPrice: '0x1',
},
...overrides,
} as TransactionMeta,
allTransactions: [],
Expand Down Expand Up @@ -139,7 +145,7 @@ describe('getGasMetricsProperties', () => {
const request = createMockRequest(
{
txParams: {
from: '0xuser',
from: MOCK_CHECKSUMMED_ADDRESS,
gas: '0x5208',
gasPrice: '0x100000000000000000',
},
Expand All @@ -156,7 +162,11 @@ describe('getGasMetricsProperties', () => {
const state = createMockState('0x100000000000000000');
const request = createMockRequest(
{
txParams: { from: '0xuser', gas: '0x1', gasPrice: '0x1' },
txParams: {
from: MOCK_CHECKSUMMED_ADDRESS,
gas: '0x1',
gasPrice: '0x1',
},
},
state,
);
Expand Down
11 changes: 8 additions & 3 deletions app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import type {
TransactionMetricsBuilderRequest,
} from '../types';
import type { RootState } from '../../../../../reducers';
import { selectAccountsByChainId } from '../../../../../selectors/accountTrackerController';
import { safeToChecksumAddress } from '../../../../../util/address';

export function getGasMetricsProperties({
transactionMeta,
Expand Down Expand Up @@ -88,10 +90,13 @@ function getNativeBalance(
chainId: string,
address: string,
): BigNumber {
const accountsByChainId =
state.engine?.backgroundState?.AccountTrackerController?.accountsByChainId;
const accountsByChainId = selectAccountsByChainId(state);
Comment thread
cursor[bot] marked this conversation as resolved.

const account = accountsByChainId?.[chainId]?.[address?.toLowerCase()];
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was broken. In the current state, the addresses in accountsByChainId are stored in checksum format.

const checksummedAddress = safeToChecksumAddress(address);
const account =
checksummedAddress !== undefined
? accountsByChainId?.[chainId]?.[checksummedAddress]
: undefined;

return new BigNumber((account?.balance as Hex) ?? '0x0');
}
Loading