tornadocash
/
tornado-core
mirror of https://github.com/tornadocash/tornado-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate

This commit is contained in:
Roman Storm 2019-12-16 14:11:57 -08:00
parent 08f8bfb070
commit fd173c5234
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/MigratableETHTornado.sol
View File

@ -14,7 +14,8 @@ contract MigratableETHTornado is ETHTornado {
} }
/** /**
@dev Migrate state from old instance to this one. @dev Migrate state from old v1 tornado.cash instance to this contract.
@dev only applies to eth 0.1 deposits
@param _commitments deposited commitments from previous contract @param _commitments deposited commitments from previous contract
@param _nullifierHashes spent nullifiers from previous contract @param _nullifierHashes spent nullifiers from previous contract
*/ */

12
migrationDeposits.js
View File

@ -3,7 +3,7 @@ const Web3 = require('web3')
// 1. edit here // 1. edit here
const SOURCE_RPC = 'https://mainnet.infura.io/v3/c7463beadf2144e68646ff049917b716' const SOURCE_RPC = 'https://mainnet.infura.io/v3/c7463beadf2144e68646ff049917b716'
const TARGET_RPC = 'https://kovan.poa.network' const TARGET_RPC = 'https://mainnet.infura.io/v3/c7463beadf2144e68646ff049917b716'
const HELPER_RPC = 'https://kovan.poa.network' const HELPER_RPC = 'https://kovan.poa.network'
const web3Source = new Web3(SOURCE_RPC, null, { transactionConfirmationBlocks: 1 }) const web3Source = new Web3(SOURCE_RPC, null, { transactionConfirmationBlocks: 1 })
const web3Target = new Web3(TARGET_RPC, null, { transactionConfirmationBlocks: 1 }) const web3Target = new Web3(TARGET_RPC, null, { transactionConfirmationBlocks: 1 })
@ -17,8 +17,8 @@ const { numberToHex, toWei } = require('web3-utils')
// 2. edit here // 2. edit here
const PREVIOUS_INSTANCE = '0xb541fc07bC7619fD4062A54d96268525cBC6FfEF' const PREVIOUS_INSTANCE = '0xb541fc07bC7619fD4062A54d96268525cBC6FfEF'
const HELPER_INSTANCE = '0x831822ad4A8AEbfC27DF0b915902de855E613eb2' const HELPER_INSTANCE = '0xAF1a4734e1234898a7e000fC7eBE8dcb2ca83472'
const NEW_INSTANCE = '0xcdA7FC8a05CFF618f7e323c547d6F2EF6c3578AA' const NEW_INSTANCE = '0x12D66f87A04A9E220743712cE6d9bB1B5616B8Fc'
function toHex(number, length = 32) { function toHex(number, length = 32) {
let str = number instanceof Buffer ? number.toString('hex') : bigInt(number).toString(16) let str = number instanceof Buffer ? number.toString('hex') : bigInt(number).toString(16)
@ -51,7 +51,7 @@ async function makeDeposit({ web3, privKey, instance, nonce, commitment }) {
from: web3Helper.eth.defaultAccount, from: web3Helper.eth.defaultAccount,
value: toWei('0.1'), value: toWei('0.1'),
gas: 2e6, gas: 2e6,
gasPrice: toHex(toWei('2', 'gwei')), gasPrice: toHex(toWei('12', 'gwei')),
to: instance._address, to: instance._address,
netId: await web3.eth.net.getId(), netId: await web3.eth.net.getId(),
data, data,
@ -93,7 +93,7 @@ async function migrateState({ subtrees, lastRoot, commitments, nullifiers, newIn
let nullifiersToLoad let nullifiersToLoad
await newInstance.methods.initializeTreeForMigration(subtrees, lastRoot).send({ await newInstance.methods.initializeTreeForMigration(subtrees, lastRoot).send({
gas: numberToHex(2500000), gas: numberToHex(2500000),
gasPrice: toHex(toWei('10', 'gwei')), gasPrice: toHex(toWei('12', 'gwei')),
from: web3Target.eth.defaultAccount from: web3Target.eth.defaultAccount
}) })
for(let i=0; i < commitments.length / loadBy; i++) { for(let i=0; i < commitments.length / loadBy; i++) {
@ -108,7 +108,7 @@ async function migrateState({ subtrees, lastRoot, commitments, nullifiers, newIn
nullifiersToLoad nullifiersToLoad
).send({ ).send({
gas: numberToHex(6500000), gas: numberToHex(6500000),
gasPrice: toHex(toWei('10', 'gwei')), gasPrice: toHex(toWei('12', 'gwei')),
from: web3Target.eth.defaultAccount from: web3Target.eth.defaultAccount
}) })
console.log('Gas used:', tx.gasUsed) console.log('Gas used:', tx.gasUsed)

4
migrations/4_deploy_eth_mixer.js
View File

@ -1,7 +1,7 @@
/* global artifacts */ /* global artifacts */
require('dotenv').config({ path: '../.env' }) require('dotenv').config({ path: '../.env' })
const ETHTornado = artifacts.require('ETHTornado') // const ETHTornado = artifacts.require('ETHTornado')
// const ETHTornado = artifacts.require('MigratableETHTornado') const ETHTornado = artifacts.require('MigratableETHTornado')
const Verifier = artifacts.require('Verifier') const Verifier = artifacts.require('Verifier')
const hasherContract = artifacts.require('Hasher') const hasherContract = artifacts.require('Hasher')