Merge branch 'main' into peaq-evm-support

Author: lavish0000

typescript/packages/x402/src/shared/middleware.test.ts

@@ -344,6 +344,30 @@ describe("getDefaultAsset", () => {
     });
   });
 
+  it("should return Polygon Amoy USDC asset details", () => {
+    const result = getDefaultAsset("polygon-amoy");
+    expect(result).toEqual({
+      address: "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582",
+      decimals: 6,
+      eip712: {
+        name: "USDC",
+        version: "2",
+      },
+    });
+  });
+
+  it("should return Polygon mainnet USDC asset details", () => {
+    const result = getDefaultAsset("polygon");
+    expect(result).toEqual({
+      address: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+      decimals: 6,
+      eip712: {
+        name: "USD Coin",
+        version: "2",
+      },
+    });
+  });
+
   it("should handle unknown networks", () => {
     expect(() => getDefaultAsset("unknown" as Network)).toThrow("Unsupported network: unknown");
   });

typescript/packages/x402/src/types/shared/evm/config.ts

@@ -40,6 +40,14 @@ export const config: Record<string, ChainConfig> = {
     usdcAddress: "0xe15fc38f6d8c56af07bbcbe3baf5708a2bf42392",
     usdcName: "USDC",
   },
+  "137": {
+    usdcAddress: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+    usdcName: "USD Coin",
+  },
+  "80002": {
+    usdcAddress: "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582",
+    usdcName: "USDC",
+  },
   "3338": {
     usdcAddress: "0xbbA60da06c2c5424f03f7434542280FCAd453d10",
     usdcName: "USDC",

typescript/packages/x402/src/types/shared/evm/wallet.ts

@@ -10,7 +10,16 @@ import type {
   PublicClient,
   LocalAccount,
 } from "viem";
-import { baseSepolia, avalancheFuji, base, sei, seiTestnet, peaq } from "viem/chains";
+import {
+  baseSepolia,
+  avalancheFuji,
+  base,
+  sei,
+  seiTestnet,
+  polygon,
+  polygonAmoy,
+  peaq,
+} from "viem/chains";
 import { privateKeyToAccount } from "viem/accounts";
 import { Hex } from "viem";
 
@@ -187,6 +196,10 @@ function getChainFromNetwork(network: string | undefined): Chain {
       return sei;
     case "sei-testnet":
       return seiTestnet;
+    case "polygon":
+      return polygon;
+    case "polygon-amoy":
+      return polygonAmoy;
     case "peaq":
       return peaq;
     default:

typescript/packages/x402/src/types/shared/network.ts

@@ -10,6 +10,8 @@ export const NetworkSchema = z.enum([
   "solana",
   "sei",
   "sei-testnet",
+  "polygon",
+  "polygon-amoy",
   "peaq",
 ]);
 export type Network = z.infer<typeof NetworkSchema>;
@@ -23,6 +25,8 @@ export const SupportedEVMNetworks: Network[] = [
   "iotex",
   "sei",
   "sei-testnet",
+  "polygon",
+  "polygon-amoy",
   "peaq",
 ];
 export const EvmNetworkToChainId = new Map<Network, number>([
@@ -33,6 +37,8 @@ export const EvmNetworkToChainId = new Map<Network, number>([
   ["iotex", 4689],
   ["sei", 1329],
   ["sei-testnet", 1328],
+  ["polygon", 137],
+  ["polygon-amoy", 80002],
   ["peaq", 3338],
 ]);
 

typescript/site/app/components/NavBar.tsx

@@ -1,24 +1,24 @@
-import Link from 'next/link';
+import Link from "next/link";
 import {
   QuestionMarkCircleIcon,
   ArrowDownTrayIcon,
   BriefcaseIcon,
-} from '@heroicons/react/24/outline';
-import GithubIcon from '../assets/github.svg';
-import DiscordIcon from '../assets/discord.svg';
+} from "@heroicons/react/24/outline";
+import GithubIcon from "../assets/github.svg";
+import DiscordIcon from "../assets/discord.svg";
 
 const NavBar = () => {
   return (
     <section className="max-w-6xl mx-auto px-4 pt-4 relative z-20">
       <div className="flex gap-4 md:gap-8 justify-between sm:justify-end">
         <Link
-          href="https://docs.google.com/forms/d/e/1FAIpQLSeESQAfvSlmjzl8JTcAOdzYjcWZ2O2GZjhuSeb8vTPpNys7FQ/viewform"
+          href="https://forms.gle/VZKvX93ifiew1ksW9"
           target="_blank"
           rel="noopener noreferrer"
           className="font-mono hover:text-blue-400 transition-colors flex items-center gap-1 text-sm"
         >
           <QuestionMarkCircleIcon className="w-4 h-4 mr-1" />
-          Learn more
+          Get In Touch
         </Link>
         <Link
           href="/x402.pdf"
@@ -61,4 +61,4 @@ const NavBar = () => {
   );
 };
 
-export default NavBar; 
+export default NavBar;

typescript/site/app/layout.tsx

@@ -13,8 +13,8 @@ const geistMono = Geist_Mono({
 });
 
 export const metadata: Metadata = {
-  title: 'x402.org',
-  description: 'A chain-agnostic protocol for web payments',
+  title: "x402.org",
+  description: "An open standard for internet-native payments",
 };
 
 export default function RootLayout({
@@ -26,18 +26,11 @@ export default function RootLayout({
     <html lang="en">
       <head>
         <link rel="icon" type="image/png" href="/x402-icon-black.png" />
-        <link
-          rel="apple-touch-icon"
-          href="/x402-icon-black.png"
-        />
+        <link rel="apple-touch-icon" href="/x402-icon-black.png" />
         <meta name="apple-mobile-web-app-title" content="x402" />
         <link rel="manifest" href="/site.webmanifest" />
       </head>
-      <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
-      >
-        {children}
-      </body>
+      <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>{children}</body>
     </html>
   );
 }