From 27781369cc101e282ba1bce0f7b4f1a804c6e045 Mon Sep 17 00:00:00 2001
From: poma <semenov.roma@gmail.com>
Date: Wed, 4 Nov 2020 20:42:54 +0300
Subject: [PATCH] add ens bulk resolve

---
 contracts/Aggregator.sol |  3 ++-
 package.json             |  2 +-
 test/echoer.test.js      | 32 --------------------------------
 yarn.lock                |  4 ++--
 4 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 test/echoer.test.js

diff --git a/contracts/Aggregator.sol b/contracts/Aggregator.sol
index c9cef1e..2b17ab5 100644
--- a/contracts/Aggregator.sol
+++ b/contracts/Aggregator.sol
@@ -7,8 +7,9 @@ import "./GovernanceAggregator.sol";
 import "./PriceAggregator.sol";
 import "./SwapAggregator.sol";
 import "./MinerAggregator.sol";
+import "torn-token/contracts/ENS.sol";
 
-contract Aggregator is GovernanceAggregator, PriceAggregator, SwapAggregator, MinerAggregator {
+contract Aggregator is EnsResolve, GovernanceAggregator, PriceAggregator, SwapAggregator, MinerAggregator {
   function miningData(
     Miner miner,
     address[] calldata instances,
diff --git a/package.json b/package.json
index aae5100..727bf5a 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,6 @@
   "dependencies": {
     "tornado-anonymity-mining": "git+https://github.com/tornadocash/tornado-anonymity-mining.git#1e1a85192be4881b51f77ae1bf3a8194a09a0605",
     "tornado-governance": "git+https://github.com/tornadocash/governance.git#4c37f7b306d58eadfdc5e000f3bee56b3727a1b2",
-    "torn-token": "git+https://github.com/tornadocash/torn-token.git#dd6f782486a86653e60824da51d3b77d194398a5"
+    "torn-token": "git+https://github.com/tornadocash/torn-token.git#e119ff634fbe1b33b9643074bc2f6b08741c635f"
   }
 }
diff --git a/test/echoer.test.js b/test/echoer.test.js
deleted file mode 100644
index 98c5566..0000000
--- a/test/echoer.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* global artifacts, web3, contract */
-// require('chai').use(require('bn-chai')(web3.utils.BN)).use(require('chai-as-promised')).should()
-
-// const { takeSnapshot, revertSnapshot } = require('../scripts/ganacheHelper')
-// const Echoer = artifacts.require('./Echoer.sol')
-
-// contract('Echoer', (accounts) => {
-//   let echoer
-//   let snapshotId
-
-//   before(async () => {
-//     echoer = await Echoer.deployed()
-//     snapshotId = await takeSnapshot()
-//   })
-
-//   describe('#echo', () => {
-//     it('should work', async () => {
-//       const data = '0xbeef'
-//       const { logs } = await echoer.echo(data)
-
-//       logs[0].event.should.be.equal('Echo')
-//       logs[0].args.who.should.be.equal(accounts[0])
-//       logs[0].args.data.should.be.equal(data)
-//     })
-//   })
-
-//   afterEach(async () => {
-//     await revertSnapshot(snapshotId.result)
-//     // eslint-disable-next-line require-atomic-updates
-//     snapshotId = await takeSnapshot()
-//   })
-// })
diff --git a/yarn.lock b/yarn.lock
index 278347e..5657f48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4577,9 +4577,9 @@ toidentifier@1.0.0:
     ethereumjs-util "^7.0.3"
     web3 "^1.2.11"
 
-"torn-token@git+https://github.com/tornadocash/torn-token.git#dd6f782486a86653e60824da51d3b77d194398a5":
+"torn-token@git+https://github.com/tornadocash/torn-token.git#e119ff634fbe1b33b9643074bc2f6b08741c635f":
   version "1.0.0"
-  resolved "git+https://github.com/tornadocash/torn-token.git#dd6f782486a86653e60824da51d3b77d194398a5"
+  resolved "git+https://github.com/tornadocash/torn-token.git#e119ff634fbe1b33b9643074bc2f6b08741c635f"
   dependencies:
     "@openzeppelin/contracts" "^3.1.0"
     dotenv "^8.2.0"