Skip to content
This repository has been archived by the owner on Nov 5, 2023. It is now read-only.

Commit

Permalink
WIP Fix ethers versioning, revert some other things.
Browse files Browse the repository at this point in the history
  • Loading branch information
jacque006 committed Mar 15, 2022
1 parent 2f1ef6c commit 24481fe
Show file tree
Hide file tree
Showing 9 changed files with 564 additions and 497 deletions.
6 changes: 3 additions & 3 deletions aggregator/deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export {
Contract,
ethers,
Wallet,
} from "https://esm.sh/[email protected].3";
} from "https://esm.sh/[email protected].4";

import { ethers } from "https://esm.sh/[email protected].3";
import { ethers } from "https://esm.sh/[email protected].4";
export type {
BaseContract,
BigNumberish,
BytesLike,
} from "https://esm.sh/[email protected].3";
} from "https://esm.sh/[email protected].4";
export const keccak256 = ethers.utils.keccak256;

export type {
Expand Down
6 changes: 4 additions & 2 deletions aggregator/src/helpers/Rng.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BigNumber } from "../../deps.ts";
import { BigNumber, keccak256 } from "../../deps.ts";

import words from "./words.ts";

Expand All @@ -8,7 +8,9 @@ function byteToHex(byte: number): string {

function hash(data: string) {
const byteValues = Array.from(new TextEncoder().encode(data));
return `0x${byteValues.map(byteToHex).join("")}`;
const hex = `0x${byteValues.map(byteToHex).join("")}`;

return keccak256(hex);
}

export default class Rng {
Expand Down
2 changes: 1 addition & 1 deletion contracts/clients/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@thehubbleproject/bls": "^0.5.1",
"ethers": "5.5.3"
"ethers": "5.5.4"
},
"devDependencies": {
"@types/chai": "^4.3.0",
Expand Down
1 change: 1 addition & 0 deletions contracts/clients/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type { MockERC20 } from "../typechain/MockERC20";
import { NetworkConfig, getConfig, validateConfig } from "./NetworkConfig";

export * from "./signer";

export {
Aggregator,
BlsWalletWrapper,
Expand Down
473 changes: 428 additions & 45 deletions contracts/clients/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",
"ethereum-waffle": "^3.0.0",
"ethers": "5.5.3",
"ethers": "5.5.4",
"hardhat": "^2.6.7",
"hardhat-gas-reporter": "^1.0.4",
"mcl-wasm": "^0.8.0",
Expand Down
Loading

0 comments on commit 24481fe

Please sign in to comment.