Merge branch 'main' into feat/add-type-signed-data-v4-with-salt

Author: dawnseeker8

.github/workflows/build-lint-test.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build-lint-test:
     name: Build, Lint, and Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [18.x, 20.x]
@@ -25,7 +25,7 @@ jobs:
       - run: yarn test
   all-jobs-pass:
     name: All jobs pass
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs:
       - build-lint-test
     steps:

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [9.3.0]
+### Added
+- feat: support version 2.0.0 of EIP-5792 ([#402](https://github.com/MetaMask/test-dapp/pull/402))
+
 ## [9.2.0]
 ### Changed
 - Support updated send calls result ([#396](https://github.com/MetaMask/test-dapp/pull/396))
@@ -249,7 +253,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix repository standardization issues ([#118](https://github.com/MetaMask/test-dapp/pull/118))
 - Fix addEthereumChain button disable logic ([#93](https://github.com/MetaMask/test-dapp/pull/93))
 
-[Unreleased]: https://github.com/MetaMask/test-dapp/compare/v9.2.0...HEAD
+[Unreleased]: https://github.com/MetaMask/test-dapp/compare/v9.3.0...HEAD
+[9.3.0]: https://github.com/MetaMask/test-dapp/compare/v9.2.0...v9.3.0
 [9.2.0]: https://github.com/MetaMask/test-dapp/compare/v9.1.0...v9.2.0
 [9.1.0]: https://github.com/MetaMask/test-dapp/compare/v9.0.0...v9.1.0
 [9.0.0]: https://github.com/MetaMask/test-dapp/compare/v8.13.0...v9.0.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/test-dapp",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "description": "A simple dapp used in MetaMask e2e tests.",
   "engines": {
     "node": ">= 18.0.0"

src/components/transactions/eip5792/getCapabilities.js

@@ -11,6 +11,14 @@ export function getCapabilitiesComponent(parentContainer) {
             id="eip5792AccountInput"
         />
     </div>
+    <div class="form-group">
+        <label>Chain IDs</label>
+        <input
+            class="form-control"
+            type="text"
+            id="eip5792ChainIdsInput"
+        />
+    </div>
 
     <button
         class="btn btn-primary btn-lg btn-block mb-3"
@@ -26,6 +34,7 @@ export function getCapabilitiesComponent(parentContainer) {
   );
 
   const accountInput = document.getElementById('eip5792AccountInput');
+  const chainIdsInput = document.getElementById('eip5792ChainIdsInput');
   const getCapabilitiesButton = document.getElementById(
     'eip5792GetCapabilitiesButton',
   );
@@ -46,9 +55,16 @@ export function getCapabilitiesComponent(parentContainer) {
 
   getCapabilitiesButton.onclick = async () => {
     try {
+      const params = [accountInput.value];
+
+      if (chainIdsInput.value) {
+        const chainIds = chainIdsInput.value.split(',').map((id) => id.trim());
+        params.push(chainIds);
+      }
+
       const result = await globalContext.provider.request({
         method: 'wallet_getCapabilities',
-        params: [accountInput.value],
+        params,
       });
 
       resultOutput.innerHTML = JSON.stringify(result, null, 2);

src/components/transactions/eip5792/sendCalls.js

@@ -1,6 +1,6 @@
 import globalContext from '../../..';
 
-const VERSION = '1.0';
+const VERSION = '2.0.0';
 
 const DEFAULT_CALLS = [
   {
@@ -148,6 +148,7 @@ export function sendCallsComponent(parentContainer) {
       version: VERSION,
       from,
       chainId,
+      atomicRequired: true,
       calls,
     };
   }