Merge branch 'main' into invalid_block_tx

taikoxyz · Dec 24, 2022 · 2b2da46 · 2b2da46
2 parents 8681baf + 552cd22
commit 2b2da46
Show file tree

Hide file tree

Showing 47 changed files with 1,886 additions and 1,980 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
@@ -1,6 +1,7 @@
 {
-  "name": "@taiko/ui",
+  "name": "@taiko/bridge-ui",
   "version": "0.0.0",
+  "private": true,
   "type": "module",
   "scripts": {
     "start": "pnpm run dev",

diff --git a/packages/protocol/.eslintrc.js b/packages/protocol/.eslintrc.js
@@ -26,4 +26,4 @@ module.exports = {
     "node/no-missing-require": "off",
     "no-unused-expressions": "off",
   },
-}
+};
diff --git a/packages/protocol/.prettierrc.json b/packages/protocol/.prettierrc.json
@@ -1,5 +1,4 @@
 {
-  "semi": false,
   "overrides": [
     {
       "files": ["*.sol", "*.ts"],

diff --git a/packages/protocol/.solcover.js b/packages/protocol/.solcover.js
@@ -6,7 +6,7 @@ module.exports = {
     "test/libs/TestLibReceiptDecoder.sol", //integration tests
     "test/thirdparty/TestLibBlockHeaderDecoder.sol", // assembly too long
   ],
-  mocha:{
-    grep: '^[^integration]'
-  }
+  mocha: {
+    grep: "^[^integration]",
+  },
 };
diff --git a/packages/protocol/hardhat.config.ts b/packages/protocol/hardhat.config.ts
@@ -1,17 +1,17 @@
-import "@nomiclabs/hardhat-etherscan"
-import "@nomiclabs/hardhat-waffle"
-import "@openzeppelin/hardhat-upgrades"
-import "@typechain/hardhat"
-import "hardhat-abi-exporter"
-import "hardhat-gas-reporter"
-import "hardhat-preprocessor"
-import { HardhatUserConfig } from "hardhat/config"
-import "solidity-coverage"
-import "solidity-docgen"
-import "./tasks/deploy_L1"
+import "@nomiclabs/hardhat-etherscan";
+import "@nomiclabs/hardhat-waffle";
+import "@openzeppelin/hardhat-upgrades";
+import "@typechain/hardhat";
+import "hardhat-abi-exporter";
+import "hardhat-gas-reporter";
+import "hardhat-preprocessor";
+import { HardhatUserConfig } from "hardhat/config";
+import "solidity-coverage";
+import "solidity-docgen";
+import "./tasks/deploy_L1";
 
 const hardhatMnemonic =
-    "test test test test test test test test test test test taik"
+    "test test test test test test test test test test test taik";
 const config: HardhatUserConfig = {
     docgen: {
         exclude: [
@@ -114,15 +114,15 @@ const config: HardhatUserConfig = {
                     ) {
                         return `${line.slice(0, line.indexOf(" ="))} = ${
                             process.env[constantName]
-                        };`
+                        };`;
                     }
                 }
 
-                return line
+                return line;
             },
             files: "libs/LibConstants.sol",
         }),
     },
-}
+};
 
-export default config
+export default config;
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@taiko/proto",
-  "version": "1.0.0",
-  "description": "Taiko L2 Protocol",
+  "name": "@taiko/protocol",
+  "version": "0.0.0",
+  "private": true,
   "scripts": {
     "compile": "pnpm hardhat preprocess && pnpm hardhat compile",
     "export:abi": "pnpm hardhat clear-abi && pnpm hardhat export-abi",

diff --git a/packages/protocol/tasks/config.ts b/packages/protocol/tasks/config.ts
@@ -1,3 +1,3 @@
 // https://github.com/ethereum-lists/chains/pull/1611
-export const K_CHAIN_ID = 167
-export const K_DEPLOY_CONFIRMATIONS = 12
+export const K_CHAIN_ID = 167;
+export const K_DEPLOY_CONFIRMATIONS = 12;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ module.exports = { @@
         "node/no-missing-require": "off",
         "no-unused-expressions": "off",
       },
-    }
+    };