From fdaafd32eb617df1a7fe320a275c2f78eff094f8 Mon Sep 17 00:00:00 2001
From: Danil Kovtonyuk <danx.kov@gmail.com>
Date: Thu, 17 Mar 2022 19:55:47 +1000
Subject: [PATCH] fix ethers import

---
 build/main.cjs                | 29 ++++++++++++++---------------
 main.js                       |  2 +-
 src/eddsa.js                  |  2 +-
 src/evmasm.js                 |  3 +--
 src/mimc7.js                  |  3 +--
 src/mimc7_gencontract.js      |  2 +-
 src/mimcsponge.js             |  2 +-
 src/mimcsponge_gencontract.js |  2 +-
 src/poseidon_gencontract.js   |  2 +-
 test/mimc7contract.js         |  2 +-
 test/mimcspongecontract.js    |  2 +-
 test/poseidoncontract.js      |  2 +-
 12 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/build/main.cjs b/build/main.cjs
index a0a34d1..cfd4b70 100644
--- a/build/main.cjs
+++ b/build/main.cjs
@@ -12,7 +12,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var blake2b__default = /*#__PURE__*/_interopDefaultLegacy(blake2b);
 var createBlakeHash__default = /*#__PURE__*/_interopDefaultLegacy(createBlakeHash);
-var ethers__default = /*#__PURE__*/_interopDefaultLegacy(ethers);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 
 async function buildBabyJub() {
@@ -294,7 +293,7 @@ class Mimc7 {
     getIV(seed) {
         const F = this.F;
         if (typeof seed === "undefined") seed = SEED$1;
-        const c = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(seed+"_iv"));
+        const c = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(seed+"_iv"));
         const cn = ffjavascript.Scalar.e(c);
         const iv = ffjavascript.Scalar.mod(cn, F.p);
         return iv;
@@ -304,9 +303,9 @@ class Mimc7 {
         const F = this.F;
         if (typeof nRounds === "undefined") nRounds = NROUNDS$1;
         const cts = new Array(nRounds);
-        let c = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(SEED$1));
+        let c = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(SEED$1));
         for (let i=1; i<nRounds; i++) {
-            c = ethers__default["default"].utils.keccak256(c);
+            c = ethers.ethers.utils.keccak256(c);
 
             cts[i] = F.e(c);
         }
@@ -25268,7 +25267,7 @@ class MimcSponge {
     getIV (seed)  {
         const F = this.F;
         if (typeof seed === "undefined") seed = SEED;
-        const c = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(seed+"_iv"));
+        const c = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(seed+"_iv"));
         const cn = ffjavascript.Scalar.e(c);
         const iv = cn.mod(F.p);
         return iv;
@@ -25278,8 +25277,8 @@ class MimcSponge {
         const F = this.F;
         if (typeof nRounds === "undefined") nRounds = NROUNDS;
         const cts = new Array(nRounds);
-        let c = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(SEED));        for (let i=1; i<nRounds; i++) {
-            c = ethers__default["default"].utils.keccak256(c);
+        let c = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(SEED));        for (let i=1; i<nRounds; i++) {
+            c = ethers.ethers.utils.keccak256(c);
 
             cts[i] = F.e(c);
         }
@@ -25658,7 +25657,7 @@ class Contract {
             genLoadedLength = C.code.length;
         }
 
-        return ethers__default["default"].utils.hexlify(C.code.concat(this.code));
+        return ethers.ethers.utils.hexlify(C.code.concat(this.code));
     }
 
     stop() { this.code.push(0x00); }
@@ -25784,7 +25783,7 @@ class Contract {
             S = "0x" +S;
             data = S;
         }
-        const d = ethers__default["default"].utils.arrayify(data);
+        const d = ethers.ethers.utils.arrayify(data);
         if (d.length == 0 || d.length > 32) {
             throw new Error("Assertion failed");
         }
@@ -25830,7 +25829,7 @@ class Contract {
 
 function createCode$2(seed, n) {
 
-    let ci = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(seed));
+    let ci = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(seed));
     const C = new Contract();
 
     C.push(0x44);
@@ -25872,7 +25871,7 @@ function createCode$2(seed, n) {
     C.mulmod();         // r=t^7 k q
 
     for (let i=0; i<n-1; i++) {
-        ci = ethers__default["default"].utils.keccak256(ci);
+        ci = ethers.ethers.utils.keccak256(ci);
         C.dup(2);       // q r k q
         C.dup(0);       // q q r k q
         C.dup(0);       // q q q r k q
@@ -25940,7 +25939,7 @@ var _mimc7Contract = /*#__PURE__*/Object.freeze({
 
 function createCode$1(seed, n) {
 
-    let ci = ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(seed));
+    let ci = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(seed));
 
     const C = new Contract();
 
@@ -25983,7 +25982,7 @@ function createCode$1(seed, n) {
 
     for (let i=0; i<n-1; i++) {
         if (i < n-2) {
-          ci = ethers__default["default"].utils.keccak256(ci);
+          ci = ethers.ethers.utils.keccak256(ci);
         } else {
           ci = "0x00";
         }
@@ -26366,10 +26365,10 @@ function createCode(nInputs) {
     C.calldataload();
     C.div();
     C.dup(0);
-    C.push(ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(`poseidon(uint256[${nInputs}])`)).slice(0, 10)); // poseidon(uint256[n])
+    C.push(ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(`poseidon(uint256[${nInputs}])`)).slice(0, 10)); // poseidon(uint256[n])
     C.eq();
     C.swap(1);
-    C.push(ethers__default["default"].utils.keccak256(ethers__default["default"].utils.toUtf8Bytes(`poseidon(bytes32[${nInputs}])`)).slice(0, 10)); // poseidon(bytes32[n])
+    C.push(ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(`poseidon(bytes32[${nInputs}])`)).slice(0, 10)); // poseidon(bytes32[n])
     C.eq();
     C.or();
     C.jmpi("start");
diff --git a/main.js b/main.js
index 35b0557..0d36cd3 100644
--- a/main.js
+++ b/main.js
@@ -10,7 +10,7 @@ export {default as buildMimcSponge} from "./src/mimcsponge.js";
 import * as _mimcSpongeContract  from "./src/mimcsponge_gencontract.js";
 export const mimcSpongecontract=_mimcSpongeContract;
 
-export {default as buildPedersenHash} from "./src/pedersenhash.js";
+export { default as buildPedersenHash } from "./src/pedersenHash.js";
 
 export {default as buildPoseidon} from "./src/poseidon.js";
 import * as _poseidonContract  from "./src/poseidon_gencontract.js";
diff --git a/src/eddsa.js b/src/eddsa.js
index d4e054a..0df2153 100644
--- a/src/eddsa.js
+++ b/src/eddsa.js
@@ -1,6 +1,6 @@
 import { Scalar } from "ffjavascript";
 import buildBabyJub from "./babyjub.js";
-import buildPedersenHash from "./pedersenhash.js";
+import buildPedersenHash from "./pedersenHash.js";
 import buildMimc7 from "./mimc7.js";
 import buildPoseidon from "./poseidon.js";
 import buildMimcSponge from "./mimcsponge.js";
diff --git a/src/evmasm.js b/src/evmasm.js
index 4fb55b9..708158d 100644
--- a/src/evmasm.js
+++ b/src/evmasm.js
@@ -2,8 +2,7 @@
 // License: LGPL-3.0+
 //
 
-
-import ethers from "ethers";
+import { ethers } from "ethers";
 import {Scalar} from "ffjavascript";
 
 export default class Contract {
diff --git a/src/mimc7.js b/src/mimc7.js
index d90eb02..c4d7652 100644
--- a/src/mimc7.js
+++ b/src/mimc7.js
@@ -1,7 +1,6 @@
 import {getCurveFromName, Scalar} from "ffjavascript";
 
-
-import ethers from "ethers";
+import { ethers } from "ethers";
 
 const SEED = "mimc";
 const NROUNDS = 91;
diff --git a/src/mimc7_gencontract.js b/src/mimc7_gencontract.js
index 4147c65..f06d6c4 100644
--- a/src/mimc7_gencontract.js
+++ b/src/mimc7_gencontract.js
@@ -2,7 +2,7 @@
 // License: LGPL-3.0+
 //
 
-import ethers from "ethers";
+import { ethers } from "ethers";
 
 import Contract from "./evmasm.js";
 
diff --git a/src/mimcsponge.js b/src/mimcsponge.js
index 63a71ce..44e2b3c 100644
--- a/src/mimcsponge.js
+++ b/src/mimcsponge.js
@@ -1,5 +1,5 @@
 import { Scalar, getCurveFromName } from "ffjavascript";
-import ethers from "ethers";
+import { ethers } from "ethers";
 
 const SEED = "mimcsponge";
 const NROUNDS = 220;
diff --git a/src/mimcsponge_gencontract.js b/src/mimcsponge_gencontract.js
index 0671475..90f515b 100644
--- a/src/mimcsponge_gencontract.js
+++ b/src/mimcsponge_gencontract.js
@@ -2,7 +2,7 @@
 // License: LGPL-3.0+
 //
 
-import ethers from "ethers";
+import { ethers } from "ethers";
 
 import Contract from "./evmasm.js";
 
diff --git a/src/poseidon_gencontract.js b/src/poseidon_gencontract.js
index 4348990..fdfc712 100644
--- a/src/poseidon_gencontract.js
+++ b/src/poseidon_gencontract.js
@@ -5,7 +5,7 @@
 import Contract from "./evmasm.js";
 import { utils } from "ffjavascript";
 const { unstringifyBigInts } = utils;
-import ethers from "ethers";
+import { ethers } from "ethers";
 
 import poseidonConstants from "./poseidon_constants.js";
 
diff --git a/test/mimc7contract.js b/test/mimc7contract.js
index ebfff8f..63efc68 100644
--- a/test/mimc7contract.js
+++ b/test/mimc7contract.js
@@ -1,6 +1,6 @@
 import chai from "chai";
 import {createCode, abi} from "../src/mimc7_gencontract.js";
-import ethers from "ethers";
+import { ethers } from "ethers";
 import ganache from "ganache-cli";
 
 import buildMimc7 from "../src/mimc7.js";
diff --git a/test/mimcspongecontract.js b/test/mimcspongecontract.js
index 7385dea..fe6a56a 100644
--- a/test/mimcspongecontract.js
+++ b/test/mimcspongecontract.js
@@ -1,6 +1,6 @@
 import chai from "chai";
 import {createCode, abi} from "../src/mimcsponge_gencontract.js";
-import ethers from "ethers";
+import { ethers } from "ethers";
 import ganache from "ganache-cli";
 
 import buildMimcSponge from "../src/mimcsponge.js";
diff --git a/test/poseidoncontract.js b/test/poseidoncontract.js
index 55b3924..86f04ff 100644
--- a/test/poseidoncontract.js
+++ b/test/poseidoncontract.js
@@ -1,7 +1,7 @@
 import chai from "chai";
 import {createCode, generateABI} from "../src/poseidon_gencontract.js";
 import buildPoseidon from "../src/poseidon.js";
-import ethers from "ethers";
+import { ethers } from "ethers";
 import ganache from "ganache-cli";
 
 const assert = chai.assert;