Merge branch 'main' into all-contributors/add-davidtaikocha

taikoxyz · Nov 22, 2022 · a1609a1 · a1609a1
2 parents 3506e83 + fb91e0d
commit a1609a1
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 15 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -24,6 +24,76 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "dantaik",
+      "name": "dantaik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/99078276?v=4",
+      "profile": "http://taiko.xyz",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "cyberhorsey",
+      "name": "cyberhorsey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/113397187?v=4",
+      "profile": "https://github.com/cyberhorsey",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "RogerLamTd",
+      "name": "RogerLamTd",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50648015?v=4",
+      "profile": "https://github.com/RogerLamTd",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "alexshliu",
+      "name": "alexshliu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104080237?v=4",
+      "profile": "https://github.com/alexshliu",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "kirataik",
+      "name": "kirataik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104244966?v=4",
+      "profile": "https://github.com/kirataik",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "mfinestone",
+      "name": "mfinestone",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36642873?v=4",
+      "profile": "https://github.com/mfinestone",
+      "contributions": [
+        "business",
+        "content"
+      ]
+    },
+    {
+      "login": "shadab-taiko",
+      "name": "shadab-taiko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108871478?v=4",
+      "profile": "https://github.com/shadab-taiko",
+      "contributions": [
+        "doc",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/README.md b/README.md
@@ -51,6 +51,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center"><a href="https://github.com/d1onys1us"><img src="https://avatars.githubusercontent.com/u/13951458?v=4?s=100" width="100px;" alt="d1onys1us"/><br /><sub><b>d1onys1us</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=d1onys1us" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/davidtaikocha"><img src="https://avatars.githubusercontent.com/u/104078303?v=4?s=100" width="100px;" alt="David"/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=davidtaikocha" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=davidtaikocha" title="Code">💻</a></td>
+      <td align="center"><a href="http://taiko.xyz"><img src="https://avatars.githubusercontent.com/u/99078276?v=4?s=100" width="100px;" alt="dantaik"/><br /><sub><b>dantaik</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=dantaik" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=dantaik" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/cyberhorsey"><img src="https://avatars.githubusercontent.com/u/113397187?v=4?s=100" width="100px;" alt="cyberhorsey"/><br /><sub><b>cyberhorsey</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=cyberhorsey" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=cyberhorsey" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/RogerLamTd"><img src="https://avatars.githubusercontent.com/u/50648015?v=4?s=100" width="100px;" alt="RogerLamTd"/><br /><sub><b>RogerLamTd</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=RogerLamTd" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=RogerLamTd" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/alexshliu"><img src="https://avatars.githubusercontent.com/u/104080237?v=4?s=100" width="100px;" alt="alexshliu"/><br /><sub><b>alexshliu</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=alexshliu" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=alexshliu" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/kirataik"><img src="https://avatars.githubusercontent.com/u/104244966?v=4?s=100" width="100px;" alt="kirataik"/><br /><sub><b>kirataik</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=kirataik" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=kirataik" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/mfinestone"><img src="https://avatars.githubusercontent.com/u/36642873?v=4?s=100" width="100px;" alt="mfinestone"/><br /><sub><b>mfinestone</b></sub></a><br /><a href="#business-mfinestone" title="Business development">💼</a> <a href="#content-mfinestone" title="Content">🖋</a></td>
+      <td align="center"><a href="https://github.com/shadab-taiko"><img src="https://avatars.githubusercontent.com/u/108871478?v=4?s=100" width="100px;" alt="shadab-taiko"/><br /><sub><b>shadab-taiko</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=shadab-taiko" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=shadab-taiko" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/packages/protocol/test/bridge/Bridge.test.ts b/packages/protocol/test/bridge/Bridge.test.ts
@@ -1,12 +1,10 @@
 import { expect } from "chai"
-import { AddressManager, Bridge, EtherVault } from "../../typechain"
-import { ethers } from "hardhat"
 import { BigNumber, Signer } from "ethers"
+import { ethers } from "hardhat"
+import RLP from "rlp"
+import { AddressManager, Bridge, EtherVault } from "../../typechain"
 import { Message } from "../utils/message"
 import { Block, BlockHeader, EthGetProofResponse } from "../utils/rpc"
-// import { getSlot, MessageStatus } from "../../tasks/utils"
-import RLP from "rlp"
-// const helpers = require("@nomicfoundation/hardhat-network-helpers")
 
 async function deployBridge(
     signer: Signer,
@@ -860,7 +858,7 @@ describe("integration:Bridge", function () {
             const storageValue = await ethers.provider.getStorageAt(
                 l1Bridge.address,
                 key,
-                block.hash
+                block.number
             )
             // make sure it equals 1 so our proof will pass
             expect(storageValue).to.be.eq(
@@ -984,7 +982,7 @@ describe("integration:Bridge", function () {
             const storageValue = await ethers.provider.getStorageAt(
                 l1Bridge.address,
                 key,
-                block.hash
+                block.number
             )
             // make sure it equals 1 so our proof will pass
             expect(storageValue).to.be.eq(

diff --git a/packages/protocol/test/bridge/libs/LibBridgeInvoke.test.ts b/packages/protocol/test/bridge/libs/LibBridgeInvoke.test.ts
@@ -1,4 +1,3 @@
-// import { expect } from "chai"
 import { expect } from "chai"
 import { ethers } from "hardhat"
 import { Message } from "../../utils/message"

diff --git a/packages/protocol/test/bridge/libs/LibBridgeProcess.test.ts b/packages/protocol/test/bridge/libs/LibBridgeProcess.test.ts
@@ -1,11 +1,11 @@
+import * as helpers from "@nomicfoundation/hardhat-network-helpers"
 import { expect } from "chai"
-import hre, { ethers } from "hardhat"
-import { Message } from "../../utils/message"
-import { AddressManager, Bridge } from "../../../typechain"
-import { getSlot } from "../../../tasks/utils"
 import * as fs from "fs"
+import hre, { ethers } from "hardhat"
 import * as path from "path"
-const helpers = require("@nomicfoundation/hardhat-network-helpers")
+import { getSlot } from "../../../tasks/utils"
+import { AddressManager, Bridge } from "../../../typechain"
+import { Message } from "../../utils/message"
 
 describe("LibBridgeProcess", function () {
     function getStateSlot() {

diff --git a/packages/protocol/test/bridge/libs/LibBridgeRetry.test.ts b/packages/protocol/test/bridge/libs/LibBridgeRetry.test.ts
@@ -1,8 +1,8 @@
+import * as helpers from "@nomicfoundation/hardhat-network-helpers"
 import { expect } from "chai"
 import hre, { ethers } from "hardhat"
+import { decode, getSlot } from "../../../tasks/utils"
 import { Message } from "../../utils/message"
-import { getSlot, decode } from "../../../tasks/utils"
-const helpers = require("@nomicfoundation/hardhat-network-helpers")
 
 describe("LibBridgeRetry", function () {
     async function deployLibBridgeRetryFixture() {