adding blockaid byline and feedback form

.github/workflows/deployFreighterApiBeta.yml

@@ -35,7 +35,7 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@4e5fb42d249be6a45a298f3c9543b111b02f7907 #v2.3.0
+        uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 #v2.3.2
         env:
           MSG_MINIMAL: true
           SLACK_CHANNEL: team-wallet-eng

.github/workflows/deployFreighterApiProduction.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           title: Bump @stellar/freighter-api version to ${{ github.event.inputs.version }}
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@4e5fb42d249be6a45a298f3c9543b111b02f7907 #v2.3.0
+        uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 #v2.3.2
         env:
           MSG_MINIMAL: true
           SLACK_CHANNEL: release

.github/workflows/runTests.yml

@@ -20,7 +20,7 @@ jobs:
       - run: yarn build:freighter-api
       - run: yarn build:extension
       - run: yarn test:ci
-      - run: yarn test:e2e
+      - run: ${{ github.base_ref == 'master' && 'IS_INTEGRATION_MODE=true' || '' }} yarn test:e2e
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:

.github/workflows/submitSafari.yml

@@ -61,7 +61,7 @@ jobs:
       - name: Convert extension to Xcode project
         run: xcrun safari-web-extension-converter ./extension/build --project-location $GYM_PROJECT --macos-only
       - name: Set up ruby env
-        uses: ruby/setup-ruby@v1.203.0
+        uses: ruby/setup-ruby@v1.204.0
         with:
           ruby-version: 2.6.10
           bundler-cache: true

@shared/api/external.ts

@@ -94,6 +94,7 @@ export const submitTransaction = async (
 
 export const submitMessage = async (
   blob: string,
+  version: string,
   opts?: {
     address?: string;
     networkPassphrase?: string;
@@ -110,6 +111,7 @@ export const submitMessage = async (
     response = await sendMessageToContentScript({
       blob,
       accountToSign,
+      apiVersion: version,
       type: EXTERNAL_SERVICE_TYPES.SUBMIT_BLOB,
     });
   } catch (e) {

@shared/api/internal.ts

@@ -1467,7 +1467,7 @@ export const modifyAssetsList = async ({
 export const simulateTokenTransfer = async (args: {
   address: string;
   publicKey: string;
-  memo: string;
+  memo?: string;
   params: {
     publicKey: string;
     destination: string;

@shared/api/types.ts

@@ -115,6 +115,7 @@ export interface ExternalRequestTx extends ExternalRequestBase {
 }
 
 export interface ExternalRequestBlob extends ExternalRequestBase {
+  apiVersion: string;
   blob: string;
 }
 
@@ -243,7 +244,9 @@ export interface Balance {
 export type BlockAidScanAssetResult = Blockaid.TokenScanResponse;
 
 export type BlockAidScanSiteResult = Blockaid.SiteScanResponse;
-export type BlockAidScanTxResult = Blockaid.StellarTransactionScanResponse;
+export type BlockAidScanTxResult = Blockaid.StellarTransactionScanResponse & {
+  request_id: string;
+};
 export type BlockAidBulkScanAssetResult = Blockaid.TokenBulkScanResponse;
 
 export interface AssetBalance extends Balance {

@stellar/freighter-api/package.json

@@ -15,7 +15,10 @@
     "start": "webpack --config webpack.dev.js --watch --mode development"
   },
   "types": "build/@stellar/freighter-api/src/index.d.ts",
-  "dependencies": {},
+  "dependencies": {
+    "buffer": "^6.0.3",
+    "semver": "^7.6.3"
+  },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^2.3.1"
   }

@stellar/freighter-api/src/signMessage.ts

@@ -1,21 +1,34 @@
+import packageJson from "../package.json";
+import { Buffer } from "buffer";
+
 import { submitMessage } from "@shared/api/external";
 import { FreighterApiError } from "@shared/api/types";
 import { FreighterApiNodeError } from "@shared/api/helpers/extensionMessaging";
 import { isBrowser } from ".";
 
+type SignMessageV3Response = {
+  signedMessage: Buffer | null;
+  signerAddress: string;
+} & {
+  error?: FreighterApiError;
+};
+
+type SignMessageV4Response = {
+  signedMessage: string;
+  signerAddress: string;
+} & {
+  error?: FreighterApiError;
+};
+
 export const signMessage = async (
   message: string,
   opts?: {
     networkPassphrase?: string;
     address?: string;
   }
-): Promise<
-  { signedMessage: Buffer | null; signerAddress: string } & {
-    error?: FreighterApiError;
-  }
-> => {
+): Promise<SignMessageV3Response | SignMessageV4Response> => {
   if (isBrowser) {
-    const req = await submitMessage(message, opts);
+    const req = await submitMessage(message, packageJson.version, opts);
 
     if (req.error) {
       return { signedMessage: null, signerAddress: "", error: req.error };

extension/e2e-tests/addAsset.test.ts

@@ -1,13 +1,13 @@
 import { test, expect, expectPageToHaveScreenshot } from "./test-fixtures";
 import { loginToTestAccount, PASSWORD } from "./helpers/login";
-import { TEST_TOKEN_ADDRESS } from "./helpers/test-token";
+import { TEST_TOKEN_ADDRESS, USDC_TOKEN_ADDRESS } from "./helpers/test-token";
 
-test.skip("Adding unverified Soroban token", async ({ page, extensionId }) => {
+test("Adding unverified Soroban token", async ({ page, extensionId }) => {
   test.slow();
   await loginToTestAccount({ page, extensionId });
 
   await page.getByTestId("account-options-dropdown").click();
-  await page.getByText("Manage Assets").click({ force: true });
+  await page.getByText("Manage assets").click({ force: true });
   await expect(page.getByText("Your assets")).toBeVisible();
   await expectPageToHaveScreenshot({
     page,
@@ -34,14 +34,6 @@ test.skip("Adding unverified Soroban token", async ({ page, extensionId }) => {
   await expect(page.getByTestId("account-view")).toContainText("E2E");
 });
 test("Adding Soroban verified token", async ({ page, extensionId }) => {
-  const assetsList = await fetch(
-    "https://api.stellar.expert/explorer/testnet/asset-list/top50",
-  );
-  const assetsListData = await assetsList.json();
-  const verifiedToken =
-    assetsListData?.assets[0]?.contract ||
-    "CBIELTK6YBZJU5UP2WWQEUCYKLPU6AUNZ2BQ4WWFEIE3USCIHMXQDAMA";
-
   test.slow();
   await loginToTestAccount({ page, extensionId });
 
@@ -51,7 +43,7 @@ test("Adding Soroban verified token", async ({ page, extensionId }) => {
   await expect(page.getByText("Your assets")).toBeVisible();
   await page.getByText("Add an asset").click({ force: true });
   await page.getByText("Add manually").click({ force: true });
-  await page.getByTestId("search-token-input").fill(verifiedToken);
+  await page.getByTestId("search-token-input").fill(USDC_TOKEN_ADDRESS);
   await expect(page.getByTestId("asset-notification")).toHaveText(
     "On your listsFreighter uses asset lists to check assets you interact with. You can define your own assets lists in Settings.",
   );
@@ -83,6 +75,7 @@ test("Adding Soroban verified token", async ({ page, extensionId }) => {
 });
 test.afterAll(async ({ page, extensionId }) => {
   if (
+    process.env.IS_INTEGRATION_MODE &&
     test.info().status !== test.info().expectedStatus &&
     test.info().title === "Adding Soroban verified token"
   ) {

extension/e2e-tests/helpers/stubs.ts

@@ -0,0 +1,22 @@
+import { USDC_TOKEN_ADDRESS } from "./test-token";
+
+export const STELLAR_EXPERT_ASSET_LIST_JSON = {
+  name: "StellarExpert Top 50",
+  provider: "StellarExpert",
+  description:
+    "Dynamically generated list based on technical asset metrics, including payments and trading volumes, interoperability, userbase, etc. Assets included in this list were not verified by StellarExpert team. StellarExpert is not affiliated with issuers, and does not endorse or advertise assets in the list. Assets reported for fraudulent activity removed from the list automatically.",
+  version: "1.0",
+  network: "testnet",
+  feedback: "https://stellar.expert",
+  assets: [
+    {
+      code: "USDC",
+      issuer: "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+      contract: USDC_TOKEN_ADDRESS,
+      name: "USDC",
+      org: "unknown",
+      domain: "centre.io",
+      decimals: 7,
+    },
+  ],
+};

extension/e2e-tests/helpers/test-token.ts

@@ -1,2 +1,5 @@
 export const TEST_TOKEN_ADDRESS =
-  "CC7YMFMYZM2HE6O3JT5CNTFBHVXCZTV7CEYT56IGBHR4XFNTGTN62CPT";
+  "CB5IKHNEXCADYXZMCS75IDR4F6HJY4PYYAGL6LUPJHRLWFA4BWUYLWZE";
+
+export const USDC_TOKEN_ADDRESS =
+  "CBIELTK6YBZJU5UP2WWQEUCYKLPU6AUNZ2BQ4WWFEIE3USCIHMXQDAMA";

extension/e2e-tests/sendPayment.test.ts

@@ -6,6 +6,7 @@ import {
   PASSWORD,
 } from "./helpers/login";
 import { TEST_TOKEN_ADDRESS } from "./helpers/test-token";
+import { toBeVisible } from "@testing-library/jest-dom/matchers";
 
 test("Swap doesn't throw error when account is unfunded", async ({
   page,
@@ -81,6 +82,7 @@ test("Send XLM payment to G address", async ({ page, extensionId }) => {
   await page.getByText("Review Send").click({ force: true });
 
   await expect(page.getByText("Confirm Send")).toBeVisible();
+  await expect(page.getByText("XDR")).toBeVisible();
   await expectPageToHaveScreenshot({
     page,
     screenshot: "send-payment-confirm.png",

extension/e2e-tests/test-fixtures.ts

@@ -1,9 +1,12 @@
-import { test as base, chromium, BrowserContext } from "@playwright/test";
+import { test as base, chromium, BrowserContext, Page } from "@playwright/test";
 import path from "path";
 
+import { STELLAR_EXPERT_ASSET_LIST_JSON } from "./helpers/stubs.ts";
+
 export const test = base.extend<{
   context: BrowserContext;
   extensionId: string;
+  page: Page;
 }>({
   context: async ({}, use) => {
     const pathToExtension = path.join(__dirname, "../build");
@@ -15,6 +18,7 @@ export const test = base.extend<{
         `--load-extension=${pathToExtension}`,
       ],
     });
+
     await use(context);
     await context.close();
   },
@@ -30,6 +34,15 @@ export const test = base.extend<{
     const extensionId = background.url().split("/")[2];
     await use(extensionId);
   },
+  page: async ({ page }, use) => {
+    if (!process.env.IS_INTEGRATION_MODE) {
+      await page.route("*/**/testnet/asset-list/top50", async (route) => {
+        const json = STELLAR_EXPERT_ASSET_LIST_JSON;
+        await route.fulfill({ json });
+      });
+    }
+    use(page);
+  },
 });
 
 export const expectPageToHaveScreenshot = async (

extension/package.json

@@ -22,7 +22,7 @@
     "@shared/api": "1.0.0",
     "@shared/constants": "1.0.0",
     "@shared/helpers": "1.0.0",
-    "@stellar/design-system": "2.0.0-beta.15",
+    "@stellar/design-system": "2.0.0-beta.17",
     "@stellar/typescript-wallet-sdk-km": "^1.0.1",
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^7.1.2",

extension/src/background/messageListener/freighterApiMessageListener.ts

@@ -3,6 +3,7 @@
 import * as StellarSdk from "stellar-sdk";
 import browser from "webextension-polyfill";
 import { Store } from "redux";
+import semver from "semver";
 
 import {
   ExternalRequestAuthEntry,
@@ -288,7 +289,7 @@ export const freighterApiMessageListener = (
 
   const submitBlob = async () => {
     try {
-      const { blob, accountToSign, address, networkPassphrase } =
+      const { apiVersion, blob, accountToSign, address, networkPassphrase } =
         request as ExternalRequestBlob;
 
       const { tab, url: tabUrl = "" } = sender;
@@ -339,6 +340,14 @@ export const freighterApiMessageListener = (
               allowList.push(punycodedDomain);
               localStore.setItem(ALLOWLIST_ID, allowList.join());
             }
+
+            if (semver.gte(apiVersion, "4.0.0")) {
+              resolve({
+                signedBlob: Buffer.from(signedBlob).toString("base64"),
+                signerAddress,
+              });
+              return;
+            }
             resolve({ signedBlob, signerAddress });
           }
 

extension/src/popup/__testHelpers__/index.tsx

@@ -98,6 +98,8 @@ export const mockBalances = {
       total: new BigNumber("100"),
       available: new BigNumber("100"),
       blockaidData: {
+        address:
+          "USDC-GCK3D3V2XNLLKRFGFFFDEJXA4O2J4X36HET2FE446AV3M4U7DPHO3PEM",
         result_type: "Spam",
         features: [{ feature_id: "METADATA", description: "baz" }],
       },