Merge branch 'main' into add/website-e2e-tests

usecannon · May 29, 2024 · 0fa9796 · 0fa9796
2 parents ce3cb6a + c6792f9
commit 0fa9796
Show file tree

Hide file tree

Showing 37 changed files with 4,683 additions and 10,195 deletions.
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
diff --git a/_redirects b/_redirects
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/builder/src/package.test.ts b/packages/builder/src/package.test.ts
@@ -146,7 +146,8 @@ describe('package.ts', () => {
       expect(toLoader.put).toBeCalledWith(testPkgData);
       expect(toLoader.put).toBeCalledWith({ misc: 'info' });
       expect(await toRegistry.getUrl(testPkg, 1)).toStrictEqual('https://usecannon.com');
-      expect(await toRegistry.getMetaUrl(testPkg, 1)).toStrictEqual('https://usecannon.com/meta');
+      // TODO: temp meta url is disabled due to cannon registry support
+      //expect(await toRegistry.getMetaUrl(testPkg, 1)).toStrictEqual('https://usecannon.com/meta');
 
       // didnt recurse
       expect(await toRegistry.getUrl(nestedPkg, 1)).toBeFalsy();

diff --git a/packages/builder/src/package.ts b/packages/builder/src/package.ts
@@ -248,25 +248,27 @@ export async function publishPackage({
 
     debug('copy ipfs for', curFullPackageRef, oldUrl, newUrl);
 
+    const url = await toStorage.putBlob(deployInfo!);
     const newMiscUrl = await toStorage.putBlob(await fromStorage.readBlob(deployInfo!.miscUrl));
 
+    if (newMiscUrl !== deployInfo.miscUrl) {
+      debug(`WARN new misc url does not match recorded one: ${newMiscUrl} vs ${deployInfo.miscUrl}`);
+    }
+
     // TODO: This metaUrl block is being called on each loop, but it always uses the same parameters.
     //       Should it be called outside the scoped copyIpfs() function?
     const metaUrl = await fromStorage.registry.getMetaUrl(curFullPackageRef, chainId);
-    let newMetaUrl = metaUrl;
+    //let newMetaUrl = metaUrl;
 
     if (metaUrl) {
-      newMetaUrl = await toStorage.putBlob(await fromStorage.readBlob(metaUrl));
+      // TODO: figure out metaurl handling
+      /*newMetaUrl = await toStorage.putBlob(await fromStorage.readBlob(metaUrl));
 
       if (!newMetaUrl) {
         throw new Error('error while writing new misc blob');
-      }
+      }*/
     }
 
-    deployInfo.miscUrl = newMiscUrl || '';
-
-    const url = await toStorage.putBlob(deployInfo!);
-
     if (!url) {
       throw new Error('uploaded url is invalid');
     }
@@ -277,7 +279,7 @@ export async function publishPackage({
       ),
       chainId,
       url,
-      metaUrl: newMetaUrl || '',
+      metaUrl: '',
     };
 
     alreadyCopiedIpfs.set(checkKey, returnVal);

diff --git a/packages/cli/src/commands/interact.ts b/packages/cli/src/commands/interact.ts
@@ -350,7 +350,7 @@ async function execTxn({
       chain,
       to: contract.address,
       data: callData,
-      value: value.toString() || '0',
+      value: value || 0,
     })) as any;
 
     console.log(gray(`  > calldata: ${txn!.data}`));

diff --git a/packages/cli/src/util/provider.ts b/packages/cli/src/util/provider.ts
@@ -192,6 +192,7 @@ export async function resolveProviderAndSigners({
       publicClient = (
         viem
           .createPublicClient({
+            chain: getChainById(chainId),
             transport: viem.custom(rawProvider),
           })
           .extend(viem.walletActions) as any

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -53,6 +53,7 @@
     "just-entries": "^2.3.0",
     "lodash": "^4.17.21",
     "next": "^14.2.1",
+    "next-seo": "^6.5.0",
     "nextjs-toploader": "^1.6.12",
     "pako": "^2.1.0",
     "react": "^18.2.0",

diff --git a/packages/website/public/_redirects b/packages/website/public/_redirects
@@ -1,4 +1,4 @@
-/packages/:name /packages/[name]/index.html 200
+/packages/:name /packages/[name].html 200
 /packages/:name/:tag/:variant /packages/[name]/[tag]/[variant].html 200
 /packages/:name/:tag/:variant/code /packages/[name]/[tag]/[variant]/code.html 200
 /packages/:name/:tag/:variant/code/:moduleName /packages/[name]/[tag]/[variant]/code/[moduleName].html 200

diff --git a/packages/website/src/constants/defaultSeo.ts b/packages/website/src/constants/defaultSeo.ts
@@ -0,0 +1,19 @@
+const defaultSEO = {
+  title: 'Cannon',
+  description: 'Cannon',
+  openGraph: {
+    title: 'Cannon',
+    description: 'Cannon',
+    url: 'https://usecannon.com',
+    siteName: 'Cannon',
+    locale: 'en_US',
+    type: 'website',
+    images: [
+      {
+        url: 'https://usecannon.com/images/og.png',
+      },
+    ],
+  },
+};
+
+export default defaultSEO;
diff --git a/packages/website/src/pages/_app.tsx b/packages/website/src/pages/_app.tsx
@@ -8,7 +8,9 @@ import NextTopLoader from 'nextjs-toploader';
 import { Inter, Miriam_Libre, Roboto_Mono } from 'next/font/google';
 import { ReactElement } from 'react';
 import Providers from './_providers';
+import { DefaultSeo } from 'next-seo';
 import '@/styles/globals.css';
+import defaultSEO from '@/constants/defaultSeo';
 
 const miriam = Miriam_Libre({
   subsets: ['latin'],
@@ -36,6 +38,7 @@ export default function RootLayout({
   const getLayout = Component.getLayout ?? ((page: ReactElement) => page);
   return (
     <>
+      <DefaultSeo {...defaultSEO} />
       <style jsx global>
         {`
           :root {

diff --git a/packages/website/src/pages/_document.tsx b/packages/website/src/pages/_document.tsx
@@ -38,6 +38,11 @@ export default class CustomDocument extends Document {
       <Html lang="en">
         <Head>
           <GoogleAnalytics measurementId="G-C96791F6NC" />
+          <style>{`
+            body {
+              background-color: rgb(14, 17, 22);
+            }
+          `}</style>
         </Head>
         <body>
           <ColorModeScript />

diff --git a/packages/website/src/pages/deploy/gitops/index.tsx b/packages/website/src/pages/deploy/gitops/index.tsx
@@ -1,7 +1,8 @@
-//import { Metadata } from 'next';
 import dynamic from 'next/dynamic';
 import { ReactElement } from 'react';
 import Layout from '../_layout';
+import { NextSeo } from 'next-seo';
+import defaultSEO from '@/constants/defaultSeo';
 
 const NoSSR = dynamic(
   async () => {
@@ -22,7 +23,21 @@ const NoSSR = dynamic(
   };*/
 
 export default function QueueFromGitOps() {
-  return <NoSSR />;
+  return (
+    <>
+      <NextSeo
+        {...defaultSEO}
+        title="Cannon | Queue From GitOps"
+        description="Queue From GitOps"
+        openGraph={{
+          ...defaultSEO.openGraph,
+          title: 'Cannon | Queue From GitOps',
+          description: 'Queue From GitOps',
+        }}
+      />
+      <NoSSR />
+    </>
+  );
 }
 QueueFromGitOps.getLayout = function getLayout(page: ReactElement) {
   return <Layout>{page}</Layout>;

diff --git a/packages/website/src/pages/deploy/index.tsx b/packages/website/src/pages/deploy/index.tsx
@@ -1,23 +1,29 @@
-//import { Metadata } from 'next';
 import dynamic from 'next/dynamic';
 import { ReactElement } from 'react';
 import Layout from './_layout';
+import { NextSeo } from 'next-seo';
+import defaultSEO from '@/constants/defaultSeo';
 
 const NoSSR = dynamic(() => import('@/features/Deploy/SignTransactionsPage'), {
   ssr: false,
 });
 
-/*export const metadata: Metadata = {
-  title: 'Cannon | Sign Transactions',
-  description: 'Sign Transactions',
-  openGraph: {
-    title: 'Cannon | Sign Transactions',
-    description: 'Sign Transactions',
-  },
-  };*/
-
 export default function SignTransactions() {
-  return <NoSSR />;
+  return (
+    <>
+      <NextSeo
+        {...defaultSEO}
+        title="Cannon | Sign Transactions"
+        description="Sign Transactions"
+        openGraph={{
+          ...defaultSEO.openGraph,
+          title: 'Cannon | Sign Transactions',
+          description: 'Sign Transactions',
+        }}
+      />
+      <NoSSR />
+    </>
+  );
 }
 SignTransactions.getLayout = function getLayout(page: ReactElement) {
   return <Layout>{page}</Layout>;

diff --git a/packages/website/src/pages/deploy/queue/index.tsx b/packages/website/src/pages/deploy/queue/index.tsx
@@ -3,7 +3,8 @@ import { Box, Container, Heading } from '@chakra-ui/react';
 import { ReactElement } from 'react';
 import Layout from '../_layout';
 import { QueuedTxns } from '@/features/Deploy/QueueDrawer';
-//import { Metadata } from 'next';
+import { NextSeo } from 'next-seo';
+import defaultSEO from '@/constants/defaultSeo';
 
 /*export const metadata: Metadata = {
   title: 'Cannon | Queue Transactions',
@@ -16,14 +17,26 @@ import { QueuedTxns } from '@/features/Deploy/QueueDrawer';
 
 const QueueTransactions = () => {
   return (
-    <Container maxWidth="container.md" py={8}>
-      <Box mb={6}>
-        <Heading size="lg" mb={2}>
-          Stage Transactions
-        </Heading>
-      </Box>
-      <QueuedTxns />
-    </Container>
+    <>
+      <NextSeo
+        {...defaultSEO}
+        title="Cannon | Queue Transactions"
+        description="Queue Transactions"
+        openGraph={{
+          ...defaultSEO.openGraph,
+          title: 'Cannon | Queue Transactions',
+          description: 'Queue Transactions',
+        }}
+      />
+      <Container maxWidth="container.md" py={8}>
+        <Box mb={6}>
+          <Heading size="lg" mb={2}>
+            Stage Transactions
+          </Heading>
+        </Box>
+        <QueuedTxns />
+      </Container>
+    </>
   );
 };
 QueueTransactions.getLayout = function getLayout(page: ReactElement) {

diff --git a/packages/website/src/pages/deploy/txn/[chainId]/[safeAddress]/[nonce]/[sigHash]/index.tsx b/packages/website/src/pages/deploy/txn/[chainId]/[safeAddress]/[nonce]/[sigHash]/index.tsx
@@ -1,8 +1,9 @@
-//import { Metadata } from 'next';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 import { ReactElement } from 'react';
 import Layout from '../../../../../_layout';
+import { NextSeo } from 'next-seo';
+import defaultSEO from '@/constants/defaultSeo';
 
 const NoSSR = dynamic(
   async () => {
@@ -13,24 +14,27 @@ const NoSSR = dynamic(
   }
 );
 
-/*export const metadata: Metadata = {
-  title: 'Cannon | Transaction Details',
-  description: 'Transaction Details',
-  openGraph: {
-    title: 'Cannon | Transaction Details',
-    description: 'Transaction Details',
-  },
-  };*/
-
 export default function TransactionDetails() {
   const params = useRouter().query;
   return (
-    <NoSSR
-      safeAddress={params.safeAddress as string}
-      chainId={params.chainId as string}
-      nonce={params.nonce as string}
-      sigHash={params.sigHash as string}
-    />
+    <>
+      <NextSeo
+        {...defaultSEO}
+        title="Cannon | Transaction Details"
+        description="Transaction Details"
+        openGraph={{
+          ...defaultSEO.openGraph,
+          title: 'Cannon | Transaction Details',
+          description: 'Transaction Details',
+        }}
+      />
+      <NoSSR
+        safeAddress={params.safeAddress as string}
+        chainId={params.chainId as string}
+        nonce={params.nonce as string}
+        sigHash={params.sigHash as string}
+      />
+    </>
   );
 }
 TransactionDetails.getLayout = function getLayout(page: ReactElement) {

diff --git a/packages/website/src/pages/index.tsx b/packages/website/src/pages/index.tsx
@@ -1,23 +1,4 @@
 import HomePage from '@/features/HomePage/HomePage';
-//import { Metadata } from 'next';
-
-/*export const metadata: Metadata = {
-  title: 'Cannon',
-  description: 'Cannon',
-  openGraph: {
-    title: 'Cannon',
-    description: 'Cannon',
-    url: 'https://usecannon.com',
-    siteName: 'Cannon',
-    locale: 'en_US',
-    type: 'website',
-    images: [
-      {
-        url: 'https://usecannon.com/images/og.png',
-      },
-    ],
-  },
-  };*/
 
 export default function Home() {
   return <HomePage />;