Merge branch 'develop' into fix/use-counter-pending-transactions

Author: matteoscurati

app/_locales/en/messages.json

@@ -10,7 +10,7 @@ const octokit = new Octokit({
 /**
  * This script is used to filter and group commits by teams based on unique commit messages.
  * It takes two branches as input and generates a CSV file with the commit message, author,PR link, team,release tag and commit hash
- * The teams and their members are defined in the 'authorTeams' object.
+ * The teams and their members are defined in the 'teams.json' file.
  *
  * Command to run the script: node development/generate-rc-commits.js origin/branchA origin/branchB
  *
@@ -19,96 +19,24 @@ const octokit = new Octokit({
  * Output: the generated commits will be in a file named 'commits.csv'.
  */
 
-// JSON mapping authors to teams
-const authorTeams = {
-  Accounts: [
-    'Owen Craston',
-    'Gustavo Antunes',
-    'Monte Lai',
-    'Daniel Rocha',
-    'Howard Braham',
-    'Kate Johnson',
-    'Xiaoming Wang',
-    'Charly Chevalier',
-    'Mike B',
-  ],
-  'Wallet UX': ['David Walsh', 'Nidhi Kumari', 'Jony Bursztyn'],
-  'Extension Platform': [
-    'chloeYue',
-    'Chloe Gao',
-    'danjm',
-    'Danica Shen',
-    'Brad Decker',
-    'hjetpoluru',
-    'Harika Jetpoluru',
-    'Marina Boboc',
-    'Gauthier Petetin',
-    'Dan Miller',
-    'Dan J Miller',
-    'David Murdoch',
-    'Niranjana Binoy',
-    'Victor Thomas',
-    'vthomas13',
-    'seaona',
-    'Norbert Elter',
-  ],
-  'Wallet API': ['tmashuang', 'jiexi', 'BelfordZ', 'Shane'],
-  Confirmations: [
-    'Pedro Figueiredo',
-    'Sylva Elendu',
-    'Olusegun Akintayo',
-    'Jyoti Puri',
-    'Ariella Vu',
-    'OGPoyraz',
-    'vinistevam',
-    'Matthew Walsh',
-    'cryptotavares',
-    'Vinicius Stevam',
-    'Derek Brans',
-    'sleepytanya',
-    'Priya',
-  ],
-  'Design Systems': [
-    'georgewrmarshall',
-    'Garrett Bear',
-    'George Marshall',
-    'Devin',
-  ],
-  Snaps: [
-    'David Drazic',
-    'hmalik88',
-    'Montoya',
-    'Mrtenz',
-    'Frederik Bolding',
-    'Bowen Sanders',
-    'Guillaume Roux',
-    'Hassan Malik',
-    'Maarten Zuidhoorn',
-    'Jonathan Ferreira',
-  ],
-  Assets: ['salimtb', 'sahar-fehri', 'Brian Bergeron'],
-  Linea: ['VGau', 'Victorien Gauch'],
-  lavamoat: ['weizman', 'legobeat', 'kumavis', 'LeoTM'],
-  'Wallet Framework': [
-    'Michele Esposito',
-    'Elliot Winkler',
-    'Gudahtt',
-    'Jongsun Suh',
-    'Mark Stacey',
-  ],
-  MMI: [
-    'António Regadas',
-    'Albert Olivé',
-    'Ramon AC',
-    'Shane T',
-    'Bernardo Garces Chapero',
-  ],
-  Swaps: ['Daniel', 'Davide Brocchetto', 'Nicolas Ferro', 'infiniteflower'],
-  Devex: ['Thomas Huang', 'Alex Donesky', 'jiexi', 'Zachary Belford'],
-  Notifications: ['Prithpal-Sooriya', 'Matteo Scurati', 'Prithpal Sooriya'],
-  Bridging: ['Bilal', 'micaelae', 'Ethan Wessel'],
-  Ramps: ['George Weiler'],
-};
+// Function to fetch author teams mapping file from teams.json
+async function fetchAuthorTeamsFile() {
+  try {
+    const { data } = await octokit.request(
+      'GET /repos/{owner}/{repo}/contents/{path}',
+      {
+        owner: 'MetaMask',
+        repo: 'MetaMask-planning',
+        path: 'teams.json',
+      },
+    );
+    const content = Buffer.from(data.content, 'base64').toString('utf-8');
+    return JSON.parse(content); // Assuming the file is in JSON format
+  } catch (error) {
+    console.error('Error fetching author teams mapping file:', error);
+    return {};
+  }
+}
 
 // Function to get PR labels
 async function getPRLabels(owner, repo, prNumber) {
@@ -129,18 +57,26 @@ async function getPRLabels(owner, repo, prNumber) {
   }
 }
 
-// Function to get the team for a given author
-function getTeamForAuthor(authorName) {
-  for (const [team, authors] of Object.entries(authorTeams)) {
-    if (authors.includes(authorName)) {
-      return team;
-    }
+// Function to get the GitHub username for a given commit hash
+async function getGitHubUsername(commitHash) {
+  try {
+    const { data } = await octokit.request(
+      'GET /repos/{owner}/{repo}/commits/{ref}',
+      {
+        owner: 'MetaMask',
+        repo: 'metamask-extension',
+        ref: commitHash,
+      },
+    );
+    return data.author ? data.author.login : null;
+  } catch (error) {
+    console.error('Error fetching GitHub username:', error);
+    return null;
   }
-  return 'Other/Unknown'; // Default team for unknown authors
 }
 
 // Function to filter commits based on unique commit messages and group by teams
-async function filterCommitsByTeam(branchA, branchB) {
+async function filterCommitsByTeam(branchA, branchB, authorTeams) {
   try {
     const git = simpleGit();
 
@@ -157,17 +93,27 @@ async function filterCommitsByTeam(branchA, branchB) {
     const log = await git.log(logOptions);
     const seenMessages = new Set();
     const commitsByTeam = {};
+    let processedCommits = 0;
 
     const MAX_COMMITS = 500; // Limit the number of commits to process
+
     console.log('Generation of the CSV file "commits.csv" is in progress...');
 
     for (const commit of log.all) {
-      const { author, message, hash } = commit;
-      if (commitsByTeam.length >= MAX_COMMITS) {
+      if (processedCommits >= MAX_COMMITS) {
         break;
       }
 
-      const team = getTeamForAuthor(author);
+      const { author, message, hash } = commit;
+      const githubUsername = await getGitHubUsername(hash);
+      let team = authorTeams[githubUsername] || 'Other/Unknown';
+
+      // Format the team label
+      team = team
+        .replace(/^team-/u, '') // Remove the "team-" prefix
+        .split('-') // Split the string into an array of words
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) // Capitalize the first letter of each word
+        .join(' '); // Join the words back into a string with spaces
 
       // Extract PR number from the commit message using regex
       const prMatch = message.match(/\(#(\d+)\)/u);
@@ -206,9 +152,9 @@ async function filterCommitsByTeam(branchA, branchB) {
           releaseLabel,
           hash: hash.substring(0, 10),
         });
+        processedCommits += 1;
       }
     }
-
     return commitsByTeam;
   } catch (error) {
     console.error(error);
@@ -233,7 +179,7 @@ function formatAsCSV(commitsByTeam) {
     });
   }
   csvContent.unshift(
-    'Commit Message,Author,PR Link,Team,Release Label, Commit Hash',
+    'Commit Message,Author,PR Link,Team,Release Label,Commit Hash',
   );
 
   return csvContent;
@@ -250,7 +196,14 @@ async function main() {
   const branchA = args[0];
   const branchB = args[1];
 
-  const commitsByTeam = await filterCommitsByTeam(branchA, branchB);
+  // Fetch author teams mapping from the teams.json file
+  const authorTeams = await fetchAuthorTeamsFile();
+
+  const commitsByTeam = await filterCommitsByTeam(
+    branchA,
+    branchB,
+    authorTeams,
+  );
 
   if (Object.keys(commitsByTeam).length === 0) {
     console.log('No unique commits found.');

development/generate-rc-commits.js

@@ -278,4 +278,72 @@ describe('transaction controller utils', () => {
       ).toBe(calcTokenAmount(logs[0].data, 8).toString(10), 6);
     });
   });
+
+  it('respects the precision argument for the default token', () => {
+    const preTxBalance = new Numeric('5000000', 10, EtherDenomination.WEI);
+    const postTxBalance = new Numeric(
+      '592624562452462456762123343',
+      10,
+      EtherDenomination.WEI,
+    );
+    const gasUsed = new Numeric('28000', 10).toPrefixedHexString();
+    const effectiveGasPrice = new Numeric('21', 10).toPrefixedHexString();
+    const gasCost = calcGasTotal(gasUsed, effectiveGasPrice);
+    const ethReceived = postTxBalance
+      .minus(preTxBalance.minus(gasCost, 16))
+      .toDenomination(EtherDenomination.ETH);
+
+    const get = (precision) =>
+      getSwapsTokensReceivedFromTxMeta(
+        'ETH',
+        {
+          txReceipt: {
+            gasUsed,
+            effectiveGasPrice,
+            type: TransactionEnvelopeType.feeMarket,
+          },
+          preTxBalance: preTxBalance.toPrefixedHexString(),
+          postTxBalance: postTxBalance.toPrefixedHexString(),
+          swapMetaData: { token_to_amount: '0x1' },
+        },
+        '0x00',
+        '0x00',
+        '8',
+        {},
+        CHAIN_IDS.MAINNET,
+        precision,
+      );
+
+    expect(get(null)).toBe(ethReceived.toString());
+    for (let precision = 1; precision < 10; precision++) {
+      expect(get(precision)).toBe(ethReceived.round(precision).toString());
+    }
+  });
+
+  it('respects the precision argument for a non-default token', () => {
+    const logs = [
+      {
+        topics: [TOKEN_TRANSFER_LOG_TOPIC_HASH, '', '0x00'],
+        address: '0x00',
+        data: new Numeric('123456789', 10).toPrefixedHexString(),
+      },
+    ];
+    const fullPrecision = calcTokenAmount(logs[0].data, 8);
+    const get = (precision) =>
+      getSwapsTokensReceivedFromTxMeta(
+        'USDC',
+        { txReceipt: { logs, status: '0x1' } },
+        '0x00',
+        '0x00',
+        '8',
+        { txReceipt: {} },
+        CHAIN_IDS.MAINNET,
+        precision,
+      );
+
+    expect(get(null)).toBe(fullPrecision.toString());
+    for (let precision = 1; precision < 10; precision++) {
+      expect(get(precision)).toBe(fullPrecision.toPrecision(precision));
+    }
+  });
 });

shared/lib/transaction-controller-utils.test.js

@@ -52,6 +52,7 @@ export function getSwapsTokensReceivedFromTxMeta(
   tokenDecimals,
   approvalTxMeta,
   chainId,
+  precision = 6,
 ) {
   const accountAddress = txMeta?.swapAndSendRecipient ?? senderAddress;
 
@@ -106,9 +107,11 @@ export function getSwapsTokensReceivedFromTxMeta(
     )
       .minus(preTxBalanceLessGasCost)
       .toDenomination(EtherDenomination.ETH)
-      .toBase(10)
-      .round(6);
-    return ethReceived.toString();
+      .toBase(10);
+
+    return (
+      precision === null ? ethReceived : ethReceived.round(precision)
+    ).toFixed();
   }
   const txReceiptLogs = txReceipt?.logs;
   if (txReceiptLogs && txReceipt?.status !== '0x0') {
@@ -127,12 +130,14 @@ export function getSwapsTokensReceivedFromTxMeta(
         isTransferFromGivenAddress
       );
     });
-    return tokenTransferLog
-      ? toPrecisionWithoutTrailingZeros(
-          calcTokenAmount(tokenTransferLog.data, tokenDecimals).toString(10),
-          6,
-        )
-      : '';
+
+    if (tokenTransferLog) {
+      const tokenAmount = calcTokenAmount(tokenTransferLog.data, tokenDecimals);
+      return precision === null
+        ? tokenAmount.toFixed()
+        : toPrecisionWithoutTrailingZeros(tokenAmount, precision);
+    }
+    return '';
   }
   return null;
 }

shared/lib/transactions-controller-utils.js

@@ -45,7 +45,10 @@ describe('Account Custom Name Persistence', function (this: Suite) {
           '[data-testid="multichain-account-menu-popover-add-account"]',
         );
         await driver.fill('[placeholder="Account 2"]', anotherAccountLabel);
-        await driver.clickElement({ text: 'Create', tag: 'button' });
+        await driver.clickElementAndWaitToDisappear({
+          text: 'Create',
+          tag: 'button',
+        });
         await locateAccountBalanceDOM(driver);
 
         // Verify initial custom account label after freshly added account was active

test/e2e/accounts/account-custom-name.spec.ts

@@ -85,6 +85,9 @@ export async function installSnapSimpleKeyring(
     tag: 'button',
   });
 
+  // Wait until popup is closed before proceeding
+  await driver.waitUntilXWindowHandles(2);
+
   await driver.switchToWindowWithTitle(WINDOW_TITLES.SnapSimpleKeyringDapp);
 
   await driver.waitForSelector({