tornadocash/tornado-nova
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-nova synced 2024-02-02 14:53:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

add ternary opr + fix deploy addresses

Browse Source
This commit is contained in:
Drygin 2022-02-14 16:45:51 +03:00
parent 0530f00af5
commit d052e51095
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -27,8 +27,8 @@ Check config.js for actual values.
With `salt` = `0x0000000000000000000000000000000000000000000000000000000047941987` addresses must be: With `salt` = `0x0000000000000000000000000000000000000000000000000000000047941987` addresses must be:
1. `L1Unwrapper` - `0xfEADF5e7e453c664D903d1b1945c524c4328e1c5` 1. `L1Unwrapper` - `0x03AF49dBa3F607BAD4646F0745a6C6473dF9c22d`
2. `TornadoPool` - `0x6a1c06C4Af066a35291117611fd0418411c0dbD0` 2. `TornadoPool` - `0xAEE471D6FD5c6B3f377f45B0a3c705505d172090`
Check addresses with current config: Check addresses with current config:

2
config.js
View File

@ -19,7 +19,7 @@ module.exports = {
hasher: '0x94c92f096437ab9958fc0a37f09348f30389ae79', hasher: '0x94c92f096437ab9958fc0a37f09348f30389ae79',
gcWeth: '0x6a023ccd1ff6f2045c3309768ead9e68f978f6e1', gcWeth: '0x6a023ccd1ff6f2045c3309768ead9e68f978f6e1',
gcOmniBridge: '0xf6a78083ca3e2a662d6dd1703c939c8ace2e268d', gcOmniBridge: '0xf6a78083ca3e2a662d6dd1703c939c8ace2e268d',
l1Unwrapper: '0xfEADF5e7e453c664D903d1b1945c524c4328e1c5', l1Unwrapper: '0x03AF49dBa3F607BAD4646F0745a6C6473dF9c22d',
govAddress: '0x5efda50f22d34f262c29268506c5fa42cb56a1ce', govAddress: '0x5efda50f22d34f262c29268506c5fa42cb56a1ce',
l1ChainId: 1, l1ChainId: 1,
gcMultisig: '0x1f727de610030a88863d7da45bdea4eb84655b52', gcMultisig: '0x1f727de610030a88863d7da45bdea4eb84655b52',

7
contracts/bridge/L1Unwrapper.sol
View File

@ -96,12 +96,7 @@ contract L1Unwrapper is WETHOmnibridgeRouter {
AddressHelper.safeSendValue(payable(BytesHelper.bytesToAddress(_data)), _value.sub(l1Fee)); AddressHelper.safeSendValue(payable(BytesHelper.bytesToAddress(_data)), _value.sub(l1Fee));
address payable l1FeeTo; address payable l1FeeTo = (l1FeeReceiver != payable(address(0))) ? l1FeeReceiver : payable(tx.origin);
if (l1FeeReceiver != payable(address(0))) {
l1FeeTo = l1FeeReceiver;
} else {
l1FeeTo = payable(tx.origin);
}
AddressHelper.safeSendValue(l1FeeTo, l1Fee); AddressHelper.safeSendValue(l1FeeTo, l1Fee);
} }