Skip to content
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

Jump to bottom

feat: Adding context to get current confirmation PR-3 #26645

Merged
merged 22 commits into from
Sep 3, 2024
Merged

feat: Adding context to get current confirmation PR-3 #26645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
119b0d4
Adding context to get current confirmation
jpuri Aug 22, 2024
52c9891
Adding context to get current confirmation
jpuri Aug 22, 2024
eb5c1ad
update
jpuri Aug 22, 2024
392aab8
update
jpuri Aug 22, 2024
62da84e
Merge branch 'confirmation_context' into confirmation_context_2
jpuri Aug 22, 2024
61fd4be
update
jpuri Aug 22, 2024
44d4888
update
jpuri Aug 22, 2024
c6b35fb
update
jpuri Aug 22, 2024
d06c812
update
jpuri Aug 23, 2024
abce1c3
Merge branch 'develop' into confirmation_context
jpuri Aug 26, 2024
166ac09
merge
jpuri Aug 26, 2024
aea945a
update
jpuri Aug 26, 2024
ca38007
update
jpuri Aug 26, 2024
69d6753
update
jpuri Aug 26, 2024
7b24f9f
update
jpuri Aug 26, 2024
c6280c2
Refactoring confirmation code to use currentConfirmation from confirm…
jpuri Aug 24, 2024
59d707a
update
jpuri Aug 26, 2024
ff470f1
merge
jpuri Sep 2, 2024
1ea4c39
merge
jpuri Sep 2, 2024
9d87c7b
update
jpuri Sep 2, 2024
1dea2e1
update
jpuri Sep 2, 2024
17a2c63
update
jpuri Sep 2, 2024
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
268 changes: 139 additions & 129 deletions test/data/confirmations/contract-interaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import {
TransactionType,
} from '@metamask/transaction-controller';
import { Hex } from '@metamask/utils';
import { Confirmation } from '../../../ui/pages/confirmations/types/confirm';
import {
Confirmation,
SignatureRequestType,
} from '../../../ui/pages/confirmations/types/confirm';

export const PAYMASTER_AND_DATA =
'0x9d6ac51b972544251fcc0f2902e633e3f9bd3f2900000000000000000000000000000000000000000000000000000000666bfd410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003498a76eb88b702e5e52b00fbc16a36baf89ebe3e0dd23170949cffc0a623011383cced660ff67930308c22e5aa746a2d586629ddbd87046a146225bf80e9d6f1b';
Expand All @@ -13,153 +16,160 @@ export const CONTRACT_INTERACTION_SENDER_ADDRESS =

export const DEPOSIT_METHOD_DATA = '0xd0e30db0';

export const CHAIN_ID = '0xaa36a7';

export const genUnapprovedContractInteractionConfirmation = ({
address = CONTRACT_INTERACTION_SENDER_ADDRESS,
txData = DEPOSIT_METHOD_DATA,
chainId = CHAIN_ID,
}: {
address?: Hex;
txData?: Hex;
} = {}): Confirmation => ({
actionId: String(400855682),
chainId: '0xaa36a7',
dappSuggestedGasFees: {
gas: '0xab77',
},
defaultGasEstimates: {
estimateType: 'medium',
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
},
gasFeeEstimatesLoaded: true,
history: [
{
actionId: String(400855682),
chainId: '0xaa36a7',
dappSuggestedGasFees: {
gas: '0xab77',
},
defaultGasEstimates: {
estimateType: 'medium',
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
},
id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
origin: 'https://metamask.github.io',
securityAlertResponse: {
reason: 'loading',
result_type: 'validation_in_progress',
},
sendFlowHistory: [],
status: TransactionStatus.unapproved,
time: 1713534772044,
txParams: {
data: txData,
from: address,
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
value: '0x3782dace9d900000',
},
type: TransactionType.contractInteraction,
userEditedGasLimit: false,
userFeeLevel: 'medium',
verifiedOnBlockchain: false,
chainId?: string;
} = {}): Confirmation =>
({
actionId: String(400855682),
chainId,
dappSuggestedGasFees: {
gas: '0xab77',
},
[
defaultGasEstimates: {
estimateType: 'medium',
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
},
gasFeeEstimatesLoaded: true,
history: [
{
note: 'TransactionController#updateSimulationData - Update simulation data',
op: 'add',
path: '/simulationData',
timestamp: 1713534772417,
value: {
nativeBalanceChange: {
difference: '0x3782dace9d900000',
isDecrease: true,
newBalance: '0xcc0ea4fb7ffa87d',
previousBalance: '0x4443c51e558fa87d',
},
tokenBalanceChanges: [],
actionId: String(400855682),
chainId,
dappSuggestedGasFees: {
gas: '0xab77',
},
defaultGasEstimates: {
estimateType: 'medium',
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
},
id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
origin: 'https://metamask.github.io',
securityAlertResponse: {
reason: 'loading',
result_type: 'validation_in_progress',
},
sendFlowHistory: [],
status: TransactionStatus.unapproved,
time: 1713534772044,
txParams: {
data: txData,
from: address,
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
value: '0x3782dace9d900000',
},
type: TransactionType.contractInteraction,
userEditedGasLimit: false,
userFeeLevel: 'medium',
verifiedOnBlockchain: false,
},
{
op: 'add',
path: '/gasFeeEstimatesLoaded',
value: true,
},
[
{
note: 'TransactionController#updateSimulationData - Update simulation data',
op: 'add',
path: '/simulationData',
timestamp: 1713534772417,
value: {
nativeBalanceChange: {
difference: '0x3782dace9d900000',
isDecrease: true,
newBalance: '0xcc0ea4fb7ffa87d',
previousBalance: '0x4443c51e558fa87d',
},
tokenBalanceChanges: [],
},
},
{
op: 'add',
path: '/gasFeeEstimatesLoaded',
value: true,
},
],
[
{
note: 'TransactionController:updatesecurityAlertResponse - securityAlertResponse updated',
op: 'replace',
path: '/securityAlertResponse/result_type',
timestamp: 1713534773213,
value: 'Benign',
},
{
op: 'replace',
path: '/securityAlertResponse/reason',
value: '',
},
{
op: 'add',
path: '/securityAlertResponse/description',
value: '',
},
{
op: 'add',
path: '/securityAlertResponse/features',
value: [],
},
{
op: 'add',
path: '/securityAlertResponse/block',
value: 5732063,
},
],
],
[
{
note: 'TransactionController:updatesecurityAlertResponse - securityAlertResponse updated',
op: 'replace',
path: '/securityAlertResponse/result_type',
timestamp: 1713534773213,
value: 'Benign',
},
{
op: 'replace',
path: '/securityAlertResponse/reason',
value: '',
},
{
op: 'add',
path: '/securityAlertResponse/description',
value: '',
},
{
op: 'add',
path: '/securityAlertResponse/features',
value: [],
},
{
op: 'add',
path: '/securityAlertResponse/block',
value: 5732063,
id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
origin: 'https://metamask.github.io',
securityAlertResponse: {
features: [],
reason: '',
result_type: 'Benign',
},
sendFlowHistory: [],
simulationData: {
nativeBalanceChange: {
difference: '0x3782dace9d900000',
isDecrease: true,
newBalance: '0xcc0ea4fb7ffa87d',
previousBalance: '0x4443c51e558fa87d',
},
],
],
id: '1d7c08c0-fe54-11ee-9243-91b1e533746a',
origin: 'https://metamask.github.io',
securityAlertResponse: {
features: [],
reason: '',
result_type: 'Benign',
},
sendFlowHistory: [],
simulationData: {
nativeBalanceChange: {
difference: '0x3782dace9d900000',
isDecrease: true,
newBalance: '0xcc0ea4fb7ffa87d',
previousBalance: '0x4443c51e558fa87d',
tokenBalanceChanges: [],
},
tokenBalanceChanges: [],
},
status: TransactionStatus.unapproved,
time: 1713534772044,
txParams: {
data: txData,
from: address,
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
value: '0x3782dace9d900000',
},
type: TransactionType.contractInteraction,
userEditedGasLimit: false,
userFeeLevel: 'medium',
verifiedOnBlockchain: false,
});
status: TransactionStatus.unapproved,
time: 1713534772044,
txParams: {
data: txData,
from: address,
gas: '0xab77',
maxFeePerGas: '0xaa350353',
maxPriorityFeePerGas: '0x59682f00',
to: '0x88aa6343307ec9a652ccddda3646e62b2f1a5125',
value: '0x3782dace9d900000',
},
type: TransactionType.contractInteraction,
userEditedGasLimit: false,
userFeeLevel: 'medium',
verifiedOnBlockchain: false,
} as SignatureRequestType);

export const genUnapprovedApproveConfirmation = ({
address = CONTRACT_INTERACTION_SENDER_ADDRESS,
chainId = CHAIN_ID,
}: {
address?: Hex;
chainId?: string;
} = {}) => ({
...genUnapprovedContractInteractionConfirmation(),
...genUnapprovedContractInteractionConfirmation({ chainId }),
txParams: {
from: address,
data: '0x095ea7b30000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000001',
Expand Down
Loading