Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean migrations and contracts and enable maxPerToken #28

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion federator-env/mainnet-BSC-RSK/bmainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bridge": "0xdfc7127593c8af1a17146893f10e08528f4c2aa7",
"federation": "0x33f8743d5AFa519Dd373a75E7AA5C255e2c82468",
"multiSig": "0xec3fabc3517e64e07669dd1d2d673f466f93a328",
"allowTokens": "0x05b68e70168e876b2025f837bc8e0b2312d5327d",
"allowTokens": "0xc4b5178Cc086E764568AdfB2dacCBB0d973e8132",
"erc777Converter": "0x9D46B33171eA7124aEE472bFe61B5B7084B55069",
"host": "https://bsc-dataseed1.defibit.io/",
"fromBlock": 7912333
Expand Down
9 changes: 9 additions & 0 deletions federator-env/mainnet-BSC-RSK/bmainnet_v5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bridge": "0xdfc7127593c8af1a17146893f10e08528f4c2aa7",
"federation": "0x33f8743d5AFa519Dd373a75E7AA5C255e2c82468",
"multiSig": "0xec3fabc3517e64e07669dd1d2d673f466f93a328",
"allowTokens": "0x05b68e70168e876b2025f837bc8e0b2312d5327d",
"erc777Converter": "0x9D46B33171eA7124aEE472bFe61B5B7084B55069",
"host": "https://bsc-dataseed1.defibit.io/",
"fromBlock": 7912333
}
2 changes: 1 addition & 1 deletion federator-env/mainnet-BSC-RSK/rskmainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bridge": "0x971b97c8cc82e7d27bc467c2dc3f219c6ee2e350",
"federation": "0xA7938270C2bF99A9cF033c9d35156d2dDb097B12",
"multiSig": "0xee9ea57555d9533d71f6f77e0e480961f068a6c5",
"allowTokens": "0xa2f50a2c699c1aa3b9089f6b565d4999d45d8983",
"allowTokens": "0x200FD7a1cCEa4651F15008cC99bF82d7461EFd3F",
"erc777Converter": "0xc8149b1F15794D135Dfe2924955cb90709Ac7070",
"host": "http://18.221.155.102:4444/",
"fromBlock": 3398643
Expand Down
9 changes: 9 additions & 0 deletions federator-env/mainnet-BSC-RSK/rskmainnet_v5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bridge": "0x971b97c8cc82e7d27bc467c2dc3f219c6ee2e350",
"federation": "0xA7938270C2bF99A9cF033c9d35156d2dDb097B12",
"multiSig": "0xee9ea57555d9533d71f6f77e0e480961f068a6c5",
"allowTokens": "0xa2f50a2c699c1aa3b9089f6b565d4999d45d8983",
"erc777Converter": "0xc8149b1F15794D135Dfe2924955cb90709Ac7070",
"host": "http://18.221.155.102:4444/",
"fromBlock": 3398643
}
2 changes: 1 addition & 1 deletion federator-env/mainnet-ETH-RSK/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bridge": "0x33c0d33a0d4312562ad622f91d12b0ac47366ee1",
"federation": "0x74aa9b461CAd174cA066fc80AF2151c96Bd4D45f",
"multiSig": "0x062c74f9d27b1178bb76186c1756128ccb3ccd2e",
"allowTokens": "0x8df20c2c85bee0c3da250da96d892598c70aa1be",
"allowTokens": "0xf9A59a649859A27d664C8bDb51fA53bCb268545C",
"erc777Converter": "0xC0b2A9E31f69e4F0bC24584C678C582714a4fA1b",
"host": "https://mainnet.infura.io/v3/f02caaf003d14ad7bee83f33eeda2f5a",
"fromBlock": 12110034
Expand Down
9 changes: 9 additions & 0 deletions federator-env/mainnet-ETH-RSK/mainnet_v5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bridge": "0x33c0d33a0d4312562ad622f91d12b0ac47366ee1",
"federation": "0x74aa9b461CAd174cA066fc80AF2151c96Bd4D45f",
"multiSig": "0x062c74f9d27b1178bb76186c1756128ccb3ccd2e",
"allowTokens": "0x8df20c2c85bee0c3da250da96d892598c70aa1be",
"erc777Converter": "0xC0b2A9E31f69e4F0bC24584C678C582714a4fA1b",
"host": "https://mainnet.infura.io/v3/f02caaf003d14ad7bee83f33eeda2f5a",
"fromBlock": 12110034
}
2 changes: 1 addition & 1 deletion federator-env/mainnet-ETH-RSK/rskmainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bridge": "0x1ccad820b6d031b41c54f1f3da11c0d48b399581",
"federation": "0x5e2ee3cd18421838d066bd1dc02fb1f767d834dd",
"multiSig": "0xb64322e10b5ae1be121b8bb0dead560c53d9dbc3",
"allowTokens": "0xd2090fe759613c3a3e2962c6bb2ad046f62d32ff",
"allowTokens": "0x7DC1D73C620cF8eB167eDD32942DA0d01B70adC0",
"erc777Converter": "0xb86623c103843ccf75c6f0073d84bcfc0e34536c",
"host": "http://18.221.155.102:4444/",
"fromBlock": 3258718
Expand Down
9 changes: 9 additions & 0 deletions federator-env/mainnet-ETH-RSK/rskmainnet_v5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bridge": "0x1ccad820b6d031b41c54f1f3da11c0d48b399581",
"federation": "0x5e2ee3cd18421838d066bd1dc02fb1f767d834dd",
"multiSig": "0xb64322e10b5ae1be121b8bb0dead560c53d9dbc3",
"allowTokens": "0xd2090fe759613c3a3e2962c6bb2ad046f62d32ff",
"erc777Converter": "0xb86623c103843ccf75c6f0073d84bcfc0e34536c",
"host": "http://18.221.155.102:4444/",
"fromBlock": 3258718
}
4 changes: 2 additions & 2 deletions federator-env/testnet-BSC-RSK/btestnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"bridge": "0x862e8aff917319594cc7faaae5350d21196c086f",
"federation": "0x6E28bB6dbBAc8bBC11F5780E39f9Aca9F9737182",
"multiSig": "0x1d8cb60d35fcd42a8bd18d027386be9c0f9c509b",
"allowTokens": "0xeb23e848ceca88b7d0c019c7186bb86cefadd0bd",
"allowTokens": "0xC5681BE5d054167660cfF2d69c6f80521f249060",
"erc777Converter": "0x573CAF2cA648e22fE9721EDB5DdfBdF5645ffd18",
"host": "https://data-seed-prebsc-1-s1.binance.org:8545/",
"host": "http://bsctestnet1.sovryn.app:8575/",
"fromBlock": 16600000
}
9 changes: 9 additions & 0 deletions federator-env/testnet-BSC-RSK/btestnet_v5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bridge": "0x862e8aff917319594cc7faaae5350d21196c086f",
"federation": "0x6E28bB6dbBAc8bBC11F5780E39f9Aca9F9737182",
"multiSig": "0x1d8cb60d35fcd42a8bd18d027386be9c0f9c509b",
"allowTokens": "0xeb23e848ceca88b7d0c019c7186bb86cefadd0bd",
"erc777Converter": "0x573CAF2cA648e22fE9721EDB5DdfBdF5645ffd18",
"host": "https://data-seed-prebsc-1-s1.binance.org:8545/",
"fromBlock": 16600000
}
2 changes: 1 addition & 1 deletion sovryn-token-bridge/abis/AllowTokens.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"inputs":[{"internalType":"address","name":"_manager","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_tokenAddress","type":"address"}],"name":"AllowedTokenAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_tokenAddress","type":"address"}],"name":"AllowedTokenRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bool","name":"_enabled","type":"bool"}],"name":"AllowedTokenValidation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"dailyLimit","type":"uint256"}],"name":"DailyLimitChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_feeConst","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_minAmount","type":"uint256"}],"name":"FeeAndMinPerTokenChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_maxTokens","type":"uint256"}],"name":"MaxTokensAllowedChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_minTokens","type":"uint256"}],"name":"MinTokensAllowedChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"allowedTokens","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"dailyLimit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"feeConstToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"minAllowedToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"isValidatingAllowedTokens","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMaxTokensAllowed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMinTokensAllowed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"isTokenAllowed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"addAllowedToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"removeAllowedToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"enableAllowedTokensValidation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"disableAllowedTokensValidation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"maxTokens","type":"uint256"}],"name":"setMaxTokensAllowed","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"minTokens","type":"uint256"}],"name":"setMinTokensAllowed","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"_dailyLimit","type":"uint256"}],"name":"changeDailyLimit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"tokenToUse","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"spentToday","type":"uint256"},{"internalType":"bool","name":"isSideToken","type":"bool"}],"name":"isValidTokenTransfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"uint256","name":"spentToday","type":"uint256"}],"name":"calcMaxWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getMinPerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getFeePerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"_feeConst","type":"uint256"},{"internalType":"uint256","name":"_minAmount","type":"uint256"}],"name":"setFeeAndMinPerToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]
[{"inputs":[{"internalType":"address","name":"_manager","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_tokenAddress","type":"address"}],"name":"AllowedTokenAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_tokenAddress","type":"address"}],"name":"AllowedTokenRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bool","name":"_enabled","type":"bool"}],"name":"AllowedTokenValidation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"dailyLimit","type":"uint256"}],"name":"DailyLimitChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_feeConst","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_minAmount","type":"uint256"}],"name":"FeeAndMinPerTokenChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_maxAmount","type":"uint256"}],"name":"MaxPerTokenChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_maxTokens","type":"uint256"}],"name":"MaxTokensAllowedChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_minTokens","type":"uint256"}],"name":"MinTokensAllowedChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"allowedTokens","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"dailyLimit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"feeConstToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"maxAllowedToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"minAllowedToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"isValidatingAllowedTokens","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMaxTokensAllowed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMinTokensAllowed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"isTokenAllowed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"addAllowedToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"removeAllowedToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"enableAllowedTokensValidation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"disableAllowedTokensValidation","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"maxTokens","type":"uint256"}],"name":"setMaxTokensAllowed","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"minTokens","type":"uint256"}],"name":"setMinTokensAllowed","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"_dailyLimit","type":"uint256"}],"name":"changeDailyLimit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"tokenToUse","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"spentToday","type":"uint256"},{"internalType":"bool","name":"isSideToken","type":"bool"}],"name":"isValidTokenTransfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"uint256","name":"spentToday","type":"uint256"}],"name":"calcMaxWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getMinPerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getFeePerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"_feeConst","type":"uint256"},{"internalType":"uint256","name":"_minAmount","type":"uint256"}],"name":"setFeeAndMinPerToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"_maxAmount","type":"uint256"}],"name":"setMaxPerToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getMaxPerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"}]
4 changes: 2 additions & 2 deletions sovryn-token-bridge/bridge/.openzeppelin/.session
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"network": "rinkeby",
"expires": "2021-11-11T08:07:12.664Z"
"network": "development",
"expires": "2022-05-02T15:52:29.232Z"
}
Loading