Merge branch 'addtl_int_tests' into fix_mixHash

.github/workflows/lint-pr.yml

@@ -26,3 +26,4 @@ jobs:
             tokenomics
             website
             whitepaper
+          requireScope: true

packages/protocol/package.json

@@ -76,7 +76,7 @@
     "prettier-plugin-solidity": "^1.1.2",
     "rlp": "^3.0.0",
     "solhint": "^3.3.8",
-    "solidity-coverage": "github:cyberhorsey/solidity-coverage",
+    "solidity-coverage": "github:taikoxyz/solidity-coverage",
     "solidity-docgen": "^0.6.0-beta.34",
     "ts-node": "^10.5.0",
     "typechain": "^5.2.0",

packages/protocol/test/L1/TaikoL1.integration.test.ts

@@ -200,7 +200,7 @@ describe("integration:TaikoL1", function () {
             for await (const blockNumber of chan) {
                 if (
                     blockNumber >
-                    genesisHeight + config.maxNumBlocks.toNumber()
+                    genesisHeight + config.maxNumBlocks.toNumber() - 1
                 ) {
                     break;
                 }
@@ -233,7 +233,6 @@ describe("integration:TaikoL1", function () {
                 const verifiedEvent = await verifyBlocks(taikoL1, 1);
                 expect(verifiedEvent).not.to.be.undefined;
 
-                console.log(verifiedEvent.args);
                 forkChoice = await taikoL1.getForkChoice(
                     proposedEvent.args.id.toNumber(),
                     block.parentHash

packages/website/components/Footer.tsx

@@ -2,9 +2,9 @@ export default function Footer() {
   return (
     <footer className="bg-neutral-100 dark:bg-neutral-900">
       <div className="mx-auto max-w-[90rem]">
-        <div className="grid grid-cols-2 pl-[max(env(safe-area-inset-left),1.5rem)] pr-[max(env(safe-area-inset-right),1.5rem)] py-8 md:grid-cols-3 ">
+        <div className="grid grid-cols-2 pl-[max(env(safe-area-inset-left),1.5rem)] pr-[max(env(safe-area-inset-right),1.5rem)] py-8 md:grid-cols-3">
           <div>
-            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300">
+            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300 pt-3">
               About
             </h2>
             <ul className="text-neutral-500 dark:text-neutral-400">
@@ -38,7 +38,7 @@ export default function Footer() {
             </ul>
           </div>
           <div>
-            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300">
+            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300 pt-3">
               Developers
             </h2>
             <ul className="text-neutral-500 dark:text-neutral-400">
@@ -68,7 +68,7 @@ export default function Footer() {
             </ul>
           </div>
           <div>
-            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300">
+            <h2 className="mb-6 text-sm font-semibold text-neutral-500 uppercase dark:text-neutral-300 pt-3">
               Follow us
             </h2>
             <ul className="text-neutral-500 dark:text-neutral-400">

packages/website/pages/docs/learn/bridging.mdx

@@ -90,7 +90,7 @@ ERC-20 tokens originate from a canonical chain. To send a token and bridge it to
 
 Here are the overall steps for transferring canonical ERC-20 from a source chain to the destination chain:
 
-1. A contract for the ERC-20 must first be deployed on the destination chain
+1. A contract for the ERC-20 must first be deployed on the destination chain (will be done automatically by the TokenVault if not already deployed)
 
 2. Call sendERC20 on the source chain TokenVault, this will **transfer** the amount by using the `safeTransferFrom` function on the canonical ERC-20 contract, on the source chain, to the TokenVault.
 

packages/website/theme.config.tsx

@@ -16,6 +16,7 @@ export default {
   chat: {
     link: "https://discord.gg/taikoxyz",
   },
+  darkMode: true,
   docsRepositoryBase:
     "https://github.com/taikoxyz/taiko-mono/blob/main/packages/website",
   editLink: {
@@ -46,6 +47,9 @@ export default {
     );
   },
   logo: <ThemedImage />,
+  nextThemes: {
+    defaultTheme: "light",
+  },
   primaryHue: 315,
   project: {
     link: "https://github.com/taikoxyz",
@@ -55,5 +59,4 @@ export default {
       titleTemplate: "%s – Taiko",
     };
   },
-  darkMode: true,
 };