Skip to content

Commit

Permalink
feat: Add re-simulation logic (#28104)
Browse files Browse the repository at this point in the history 
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR aims to add re-simulation logic which recently added at
MetaMask/core#4792

Patch note: 
Transaction controller patch adds the re-simulate feature, branched
belove to keep track.

https://github.com/MetaMask/core/tree/patch/extension-transaction-controller-37-2-0

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28104?quickstart=1)

## **Related issues**

Fixes: MetaMask/MetaMask-planning#3380

## **Manual testing steps**

TBD

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**


![1](https://github.com/user-attachments/assets/67fc06d4-2f01-4e95-b1da-e84f5145462e)

![2](https://github.com/user-attachments/assets/52153a4a-4c0d-44bd-990b-51f9b90eefb4)


## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <[email protected]>
  • Loading branch information
@OGPoyraz @metamaskbot
OGPoyraz and metamaskbot authored Oct 30, 2024
1 parent 7df5cef commit 2c86162
Show file tree
Hide file tree
Showing 18 changed files with 609 additions and 160 deletions.
6 changes: 6 additions & 0 deletions app/_locales/en/messages.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 47 additions & 8 deletions lavamoat/browserify/beta/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,15 +750,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2255,8 +2270,23 @@
},
"@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/rpc-errors>@metamask/utils": true,
"@metamask/rpc-errors>fast-safe-stringify": true
}
},
"@metamask/rpc-errors>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/rpc-methods-flask>nanoid": {
Expand Down Expand Up @@ -2833,9 +2863,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2861,10 +2891,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down
55 changes: 47 additions & 8 deletions lavamoat/browserify/flask/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,15 +750,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2255,8 +2270,23 @@
},
"@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/rpc-errors>@metamask/utils": true,
"@metamask/rpc-errors>fast-safe-stringify": true
}
},
"@metamask/rpc-errors>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/rpc-methods-flask>nanoid": {
Expand Down Expand Up @@ -2833,9 +2863,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2861,10 +2891,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down
55 changes: 47 additions & 8 deletions lavamoat/browserify/main/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,15 +750,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2255,8 +2270,23 @@
},
"@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/rpc-errors>@metamask/utils": true,
"@metamask/rpc-errors>fast-safe-stringify": true
}
},
"@metamask/rpc-errors>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/rpc-methods-flask>nanoid": {
Expand Down Expand Up @@ -2833,9 +2863,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2861,10 +2891,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down
55 changes: 47 additions & 8 deletions lavamoat/browserify/mmi/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,15 +842,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2347,8 +2362,23 @@
},
"@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/rpc-errors>@metamask/utils": true,
"@metamask/rpc-errors>fast-safe-stringify": true
}
},
"@metamask/rpc-errors>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/rpc-methods-flask>nanoid": {
Expand Down Expand Up @@ -2925,9 +2955,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2953,10 +2983,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down
Loading

0 comments on commit 2c86162

Please sign in to comment.