Replace web3js with ethersjs

test/gas-report/poolsize.js

@@ -1,5 +1,5 @@
 import RPC from "../../utils/rpc"
-import {web3, ethers} from "hardhat"
+import {ethers} from "hardhat"
 import setupIntegrationTest from "../helpers/setupIntegrationTest"
 
 import chai from "chai"
@@ -40,7 +40,7 @@ describe("transcoder pool size gas report", () => {
     }
 
     before(async () => {
-        rpc = new RPC(web3)
+        rpc = new RPC(ethers.provider)
 
         const fixture = await setupIntegrationTest()
         controller = await ethers.getContractAt(

test/gas-report/redeemTicket.js

@@ -34,7 +34,7 @@ describe("redeem ticket gas report", () => {
     let signers
 
     before(async () => {
-        rpc = new RPC(web3)
+        rpc = new RPC(ethers.provider)
         signers = await ethers.getSigners()
         transcoder = signers[0]
         broadcaster = signers[1]

test/helpers/signMsg.js → test/helpers/signMsg.ts

@@ -1,50 +1,63 @@
-export const getLongSigV = signature => {
+import {Signer} from "ethers"
+import {ethers} from "hardhat"
+
+export const getLongSigV = (signature: string) => {
     return parseInt(signature.slice(signature.length - 2, signature.length), 16)
 }
 
-export const getEIP2098V = signature => {
+export const getEIP2098V = (signature: string) => {
     //     uint8 v = uint8((uint256(vs) >> 255) + 27);
-    const sigToBytes = web3.utils.hexToBytes(signature)
+    const sigToBytes = ethers.utils.arrayify(signature)
     const v = (sigToBytes[32] >> 7) + 27
     return v
 }
 
-export const fixSig = sig => {
+export const fixSig = (signature: string) => {
     // The recover() in ECDSA.sol from openzeppelin-solidity requires signatures to have a v-value that is 27/28
     // ETH clients that implement eth_sign will return a signature with a v-value that is 27/28 or 0/1 (geth returns 27/28 and ganache returns 0/1)
     // In order to support all ETH clients that implement eth_sign, we can fix the signature by ensuring that the v-value is 27/28
-    let v = getLongSigV(sig)
+    let v = getLongSigV(signature)
     if (v < 27) {
         v += 27
     }
 
-    return sig.slice(0, sig.length - 2) + v.toString(16)
+    return signature.slice(0, signature.length - 2) + v.toString(16)
 }
 
-export const web3Sign = async (msg, account) => {
-    return web3.eth.sign(msg, account)
+export const sign = async (msg: string, account: string | Signer) => {
+    if (typeof account === "string") {
+        const acc = ethers.provider.getSigner(account)
+        return acc.signMessage(ethers.utils.arrayify(msg))
+    } else {
+        return account.signMessage(ethers.utils.arrayify(msg))
+    }
 }
 
-export default async (msg, account) => {
-    return fixSig(await web3Sign(msg, account))
+export default async (msg: string, account: string) => {
+    return fixSig(await sign(msg, account))
 }
 
-export const flipV = sig => {
-    let v = parseInt(sig.slice(sig.length - 2, sig.length), 16)
+export const flipV = (signature: string) => {
+    let v = parseInt(
+        signature.slice(signature.length - 2, signature.length),
+        16
+    )
     if (v === 27) {
         v = 28
     } else if (v === 28) {
         v = 27
     } else {
         throw new Error(`unrecognized V value ${v}`)
     }
-    const result = sig.slice(0, sig.length - 2).concat(v.toString(16))
+    const result = signature
+        .slice(0, signature.length - 2)
+        .concat(v.toString(16))
     return result
 }
 
 // from openzeppelin [https://github.com/OpenZeppelin/openzeppelin-contracts/blob/5b28259dacf47fc208e03611eb3ba8eeaed63cc0/test/utils/cryptography/ECDSA.test.js#L12-L33]
-export function to2098Format(signature) {
-    const long = web3.utils.hexToBytes(signature)
+export function to2098Format(signature: string) {
+    const long = ethers.utils.arrayify(signature)
 
     if (long.length !== 65) {
         throw new Error("invalid signature length (expected long format)")
@@ -54,16 +67,19 @@ export function to2098Format(signature) {
     }
     const short = long.slice(0, 64)
     short[32] |= long[64] % 27 << 7 // set the first bit of the 32nd byte to the v parity bit
-    return web3.utils.bytesToHex(short)
+    return ethers.utils.hexlify(short)
 }
 
 // from openzeppelin [https://github.com/OpenZeppelin/openzeppelin-contracts/blob/5b28259dacf47fc208e03611eb3ba8eeaed63cc0/test/utils/cryptography/ECDSA.test.js#L12-L33]
-export function from2098Format(signature) {
-    const short = web3.utils.hexToBytes(signature)
+export function from2098Format(signature: string) {
+    const short = ethers.utils.arrayify(signature)
     if (short.length !== 64) {
         throw new Error("invalid signature length (expected short format)")
     }
-    short.push((short[32] >> 7) + 27)
-    short[32] &= (1 << 7) - 1 // zero out the first bit of 1 the 32nd byte
-    return web3.utils.bytesToHex(short)
+    const long = new Uint8Array(65)
+    long.set(short, 0)
+    long[64] = (short[32] >> 7) + 27
+
+    long[32] &= (1 << 7) - 1 // zero out the first bit of 1 the 32nd byte
+    return ethers.utils.hexlify(long)
 }

test/integration/PoolUpdatesWithHints.js

@@ -80,7 +80,7 @@ describe("PoolUpdatesWithHints", () => {
         transcoders = signers.slice(0, 10)
         delegator = signers[11]
         newTranscoder = signers[12]
-        rpc = new RPC(web3)
+        rpc = new RPC(ethers.provider)
 
         const fixture = await setupIntegrationTest()
         controller = await ethers.getContractAt(

test/unit/BondingManager.js

@@ -7,7 +7,7 @@ import {
 import {constants} from "../../utils/constants"
 import math from "../helpers/math"
 import {assert} from "chai"
-import {ethers, web3} from "hardhat"
+import {ethers} from "hardhat"
 const BigNumber = ethers.BigNumber
 import chai from "chai"
 import {solidity} from "ethereum-waffle"
@@ -49,7 +49,7 @@ describe("BondingManager", () => {
     let signers
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
 
         const llFac = await ethers.getContractFactory("SortedDoublyLL")

test/unit/Controller.js

@@ -1,6 +1,6 @@
 import Fixture from "./helpers/Fixture"
 import {contractId} from "../../utils/helpers"
-import {web3, ethers} from "hardhat"
+import {ethers} from "hardhat"
 
 import chai, {expect, assert} from "chai"
 import {solidity} from "ethereum-waffle"
@@ -14,7 +14,7 @@ describe("Controller", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
         controller = fixture.controller
         commitHash = fixture.commitHash

test/unit/Governor.js

@@ -16,7 +16,7 @@ describe("Governor", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
         const govFac = await ethers.getContractFactory("Governor")
         governor = await govFac.deploy()

test/unit/LivepeerTokenFaucet.js

@@ -15,7 +15,7 @@ describe("LivepeerTokenFaucet", () => {
     let signers
 
     before(async () => {
-        rpc = new RPC(web3)
+        rpc = new RPC(ethers.provider)
         signers = await ethers.getSigners()
         const tokenFac = await ethers.getContractFactory("LivepeerToken")
         const faucetFac = await ethers.getContractFactory("LivepeerTokenFaucet")

test/unit/ManagerProxy.js

@@ -38,7 +38,7 @@ describe("ManagerProxy", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
         await fixture.deployAndRegister(
             await ethers.getContractFactory("ManagerProxyTargetMockV1"),

test/unit/MerkleSnapshot.js

@@ -1,7 +1,7 @@
 import {keccak256, bufferToHex} from "ethereumjs-util"
 import MerkleTree from "../../utils/merkleTree"
 import Fixture from "./helpers/Fixture"
-import {web3, ethers} from "hardhat"
+import {ethers} from "hardhat"
 import chai, {expect, assert} from "chai"
 import {solidity} from "ethereum-waffle"
 chai.use(solidity)
@@ -13,7 +13,7 @@ describe("MerkleSnapshot", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
         const merkleFac = await ethers.getContractFactory("MerkleSnapshot")
         merkleSnapshot = await merkleFac.deploy(fixture.controller.address)

test/unit/Minter.js

@@ -98,7 +98,7 @@ describe("Minter", () => {
     })
 
     before(async () => {
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
 
         minter = await fixture.deployAndRegister(

test/unit/Poll.js

@@ -15,7 +15,7 @@ describe("Poll", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
     })
 
     beforeEach(async () => {

test/unit/PollCreator.js

@@ -1,5 +1,5 @@
 import Fixture from "./helpers/Fixture"
-import {web3, ethers} from "hardhat"
+import {ethers} from "hardhat"
 
 import {expect, use} from "chai"
 import {solidity} from "ethereum-waffle"
@@ -22,7 +22,7 @@ describe("PollCreator", () => {
     before(async () => {
         ;[, mockBondingManagerEOA] = await ethers.getSigners()
 
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
 
         bondingManagerMock = await smock.fake(
             "contracts/polling/PollCreator.sol:IBondingManager",

test/unit/RoundsManager.js

@@ -21,7 +21,7 @@ describe("RoundsManager", () => {
 
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
 
         roundsManager = await fixture.deployAndRegister(

test/unit/ServiceRegistry.js

@@ -1,5 +1,5 @@
 import Fixture from "./helpers/Fixture"
-import {web3, ethers} from "hardhat"
+import {ethers} from "hardhat"
 
 import chai, {expect, assert} from "chai"
 import {solidity} from "ethereum-waffle"
@@ -12,7 +12,7 @@ describe("ServiceRegistry", () => {
     let controller
     before(async () => {
         signers = await ethers.getSigners()
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         // Use dummy Controller in these unit tests
         // We are testing the logic of ServiceRegistry directly so we do not
         // interact with the contract via a proxy

test/unit/TicketBroker.js

@@ -43,7 +43,7 @@ describe("TicketBroker", () => {
         sender = signers[0].address
         recipient = signers[1].address
         funder = signers[3]
-        fixture = new Fixture(web3)
+        fixture = new Fixture(ethers.provider)
         await fixture.deploy()
 
         broker = await (
@@ -889,7 +889,7 @@ describe("TicketBroker", () => {
             const recipientRand = 5
             const recipientRandHash = web3.utils.soliditySha3(recipientRand)
 
-            const sig = await signMsg("junk", sender)
+            const sig = await signMsg("0xdabbad00", sender)
 
             await expect(
                 broker.redeemWinningTicket(

test/unit/helpers/Fixture.js

@@ -3,8 +3,8 @@ import {contractId} from "../../../utils/helpers"
 import {ethers} from "hardhat"
 
 export default class Fixture {
-    constructor(web3) {
-        this.rpc = new RPC(web3)
+    constructor(provider) {
+        this.rpc = new RPC(provider)
         this.commitHash = "0x3031323334353637383930313233343536373839"
     }