tornadocash/tornado-aggregator
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-aggregator.git synced 2024-12-04 23:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

add ens bulk resolve

Browse Source
This commit is contained in:
poma 2020-11-04 20:42:54 +03:00
parent 6f21597bfc
commit 27781369cc
No known key found for this signature in database
GPG Key ID: BA20CB01FE165657
4 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/Aggregator.sol
View File

@ -7,8 +7,9 @@ import "./GovernanceAggregator.sol";
import "./PriceAggregator.sol"; import "./PriceAggregator.sol";
import "./SwapAggregator.sol"; import "./SwapAggregator.sol";
import "./MinerAggregator.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( function miningData(
Miner miner, Miner miner,
address[] calldata instances, address[] calldata instances,

2
package.json
View File

@ -47,6 +47,6 @@
"dependencies": { "dependencies": {
"tornado-anonymity-mining": "git+https://github.com/tornadocash/tornado-anonymity-mining.git#1e1a85192be4881b51f77ae1bf3a8194a09a0605", "tornado-anonymity-mining": "git+https://github.com/tornadocash/tornado-anonymity-mining.git#1e1a85192be4881b51f77ae1bf3a8194a09a0605",
"tornado-governance": "git+https://github.com/tornadocash/governance.git#4c37f7b306d58eadfdc5e000f3bee56b3727a1b2", "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"
} }
} }

32
test/echoer.test.js
View File

@ -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()
// })
// })

4
yarn.lock
View File

@ -4577,9 +4577,9 @@ toidentifier@1.0.0:
ethereumjs-util "^7.0.3" ethereumjs-util "^7.0.3"
web3 "^1.2.11" 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" 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: dependencies:
"@openzeppelin/contracts" "^3.1.0" "@openzeppelin/contracts" "^3.1.0"
dotenv "^8.2.0" dotenv "^8.2.0"