Relative daily limit

contracts/upgradeable_contracts/RelativeDailyLimit.sol

@@ -0,0 +1,48 @@
+pragma solidity 0.4.24;
+
+import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "./BasicTokenBridge.sol";
+
+contract RelativeDailyLimit is BasicTokenBridge {
+    using SafeMath for uint256;
+
+    event TargetLimitChanged(uint256 newLimit);
+    event ThresholdChanged(uint256 newThreshold);
+
+    bytes32 internal constant TARGET_LIMIT = keccak256(abi.encodePacked("targetLimit"));
+    bytes32 internal constant THRESHOLD = keccak256(abi.encodePacked("threshold"));
+
+    function dailyLimit() public view returns (uint256) {
+        uint256 balance = _getTokenBalance();
+        uint256 minBalance = targetLimit().mul(threshold()).div(100);
+        uint256 limit;
+        if (balance < minBalance) {
+            limit = 100;
+        } else if (balance >= minBalance && balance < threshold()) {
+            limit = targetLimit().mul(threshold()).div(balance);
+        } else {
+            limit = targetLimit();
+        }
+        return balance.mul(limit).div(100);
+    }
+
+    function targetLimit() public view returns (uint256) {
+        return uintStorage[TARGET_LIMIT];
+    }
+
+    function threshold() public view returns (uint256) {
+        return uintStorage[THRESHOLD];
+    }
+
+    function setTargetLimit(uint256 _targetLimit) external onlyOwner {
+        uintStorage[TARGET_LIMIT] = _targetLimit;
+        emit TargetLimitChanged(_targetLimit);
+    }
+
+    function setThreshold(uint256 _threshold) external onlyOwner {
+        uintStorage[THRESHOLD] = _threshold;
+        emit ThresholdChanged(_threshold);
+    }
+
+    function _getTokenBalance() internal view returns (uint256);
+}

contracts/upgradeable_contracts/amb_erc677_to_erc677/ForeignAMBErc677ToErc677RelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./ForeignAMBErc677ToErc677.sol";
+import "../RelativeDailyLimit.sol";
+
+contract ForeignAMBErc677ToErc677RelativeDailyLimit is ForeignAMBErc677ToErc677, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc677token().balanceOf(address(this));
+    }
+}

contracts/upgradeable_contracts/amb_erc677_to_erc677/HomeAMBErc677ToErc677RelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./HomeAMBErc677ToErc677.sol";
+import "../RelativeDailyLimit.sol";
+
+contract HomeAMBErc677ToErc677RelativeDailyLimit is HomeAMBErc677ToErc677, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc677token().totalSupply();
+    }
+}

contracts/upgradeable_contracts/erc20_to_erc20/BasicForeignBridgeErcToErcRelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./BasicForeignBridgeErcToErc.sol";
+import "../RelativeDailyLimit.sol";
+
+contract BasicForeignBridgeErcToErcRelativeDailyLimit is BasicForeignBridgeErcToErc, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc20token().balanceOf(address(this));
+    }
+}

contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErc677ToErc677RelativeDailyLimit.sol

@@ -0,0 +1,9 @@
+pragma solidity 0.4.24;
+
+import "./ForeignBridgeErc677ToErc677.sol";
+import "./BasicForeignBridgeErcToErcRelativeDailyLimit.sol";
+
+// solhint-disable-next-line no-empty-blocks
+contract ForeignBridgeErc677ToErc677RelativeDailyLimit is
+    BasicForeignBridgeErcToErcRelativeDailyLimit,
+    ForeignBridgeErc677ToErc677 {}

contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErcRelativeDailyLimit.sol

@@ -0,0 +1,9 @@
+pragma solidity 0.4.24;
+
+import "./ForeignBridgeErcToErc.sol";
+import "./BasicForeignBridgeErcToErcRelativeDailyLimit.sol";
+
+// solhint-disable-next-line no-empty-blocks
+contract ForeignBridgeErcToErcRelativeDailyLimit is
+    BasicForeignBridgeErcToErcRelativeDailyLimit,
+    ForeignBridgeErcToErc {}

contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErcPOSDAORelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./HomeBridgeErcToErcPOSDAO.sol";
+import "./HomeBridgeErcToErcRelativeDailyLimit.sol";
+
+// solhint-disable-next-line no-empty-blocks
+contract HomeBridgeErcToErcPOSDAORelativeDailyLimit is
+    HomeBridgeErcToErcRelativeDailyLimit,
+    HomeBridgeErcToErcPOSDAO {}
+

contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErcRelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./HomeBridgeErcToErc.sol";
+import "../RelativeDailyLimit.sol";
+
+contract HomeBridgeErcToErcRelativeDailyLimit is HomeBridgeErcToErc, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc677token().totalSupply();
+    }
+}

contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNativeRelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./ForeignBridgeErcToNative.sol";
+import "../RelativeDailyLimit.sol";
+
+contract ForeignBridgeErcToNativeRelativeDailyLimit is ForeignBridgeErcToNative, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc20token().balanceOf(address(this));
+    }
+}

contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNativeRelativeDailyLimit.sol

@@ -0,0 +1,13 @@
+pragma solidity 0.4.24;
+
+import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "./HomeBridgeErcToNative.sol";
+import "../RelativeDailyLimit.sol";
+
+contract HomeBridgeErcToNativeRelativeDailyLimit is HomeBridgeErcToNative, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        uint256 totalMinted = blockRewardContract().mintedTotallyByBridge(address(this));
+        uint256 totalBurnt = totalBurntCoins();
+        return totalMinted.sub(totalBurnt);
+    }
+}

contracts/upgradeable_contracts/native_to_erc20/ClassicHomeBridgeNativeToErcRelativeDailyLimit.sol

@@ -0,0 +1,11 @@
+pragma solidity 0.4.24;
+
+import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "./ClassicHomeBridgeNativeToErc.sol";
+import "../RelativeDailyLimit.sol";
+
+contract ClassicHomeBridgeNativeToErcRelativeDailyLimit is ClassicHomeBridgeNativeToErc, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return address(this).balance;
+    }
+}

contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErcRelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./ForeignBridgeNativeToErc.sol";
+import "../RelativeDailyLimit.sol";
+
+contract ForeignBridgeNativeToErcRelativeDailyLimit is ForeignBridgeNativeToErc, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return erc677token().totalSupply();
+    }
+}

contracts/upgradeable_contracts/native_to_erc20/HomeBridgeNativeToErcRelativeDailyLimit.sol

@@ -0,0 +1,10 @@
+pragma solidity 0.4.24;
+
+import "./HomeBridgeNativeToErc.sol";
+import "../RelativeDailyLimit.sol";
+
+contract HomeBridgeNativeToErcRelativeDailyLimit is HomeBridgeNativeToErc, RelativeDailyLimit {
+    function _getTokenBalance() internal view returns (uint256) {
+        return address(this).balance;
+    }
+}

deploy/.env.example

@@ -58,6 +58,9 @@ FOREIGN_REWARDABLE=false
 #E.g. VALIDATORS_REWARD_ACCOUNTS=0x 0x 0x
 VALIDATORS_REWARD_ACCOUNTS=0x
 
+# Relative or fixed daily limit
+RELATIVE_DAILY_LIMIT=false
+
 # Fee to be taken for every transaction directed from the Home network to the Foreign network
 # E.g. 0.1% fee
 HOME_TRANSACTIONS_FEE=0.001

deploy/src/amb_erc677_to_erc677/foreign.js

@@ -2,9 +2,16 @@ const Web3Utils = require('web3-utils')
 const { web3Foreign, FOREIGN_RPC_URL } = require('../web3')
 const { deployContract, privateKeyToAddress, upgradeProxy } = require('../deploymentUtils')
 const {
-  foreignContracts: { EternalStorageProxy, ForeignAMBErc677ToErc677: ForeignBridge }
+  foreignContracts: {
+    EternalStorageProxy,
+    ForeignAMBErc677ToErc677: ForeignBridge,
+    ForeignAMBErc677ToErc677RelativeDailyLimit: ForeignBridgeRelativeDailyLimit,
+  }
 } = require('../loadContracts')
-const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = require('../loadEnv')
+const {
+  DEPLOYMENT_ACCOUNT_PRIVATE_KEY,
+  RELATIVE_DAILY_LIMIT,
+} = require('../loadEnv')
 
 const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
 
@@ -21,7 +28,8 @@ async function deployForeign() {
   console.log('[Foreign] ForeignBridge Storage: ', foreignBridgeStorage.options.address)
 
   console.log('\n[Foreign] Deploying foreignBridge implementation\n')
-  const foreignBridgeImplementation = await deployContract(ForeignBridge, [], {
+  const ForeignBridgeContract = RELATIVE_DAILY_LIMIT ? ForeignBridgeRelativeDailyLimit : ForeignBridge
+  const foreignBridgeImplementation = await deployContract(ForeignBridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     network: 'foreign',
     nonce

deploy/src/amb_erc677_to_erc677/home.js

@@ -17,13 +17,15 @@ const {
   DEPLOYMENT_ACCOUNT_PRIVATE_KEY,
   DEPLOY_REWARDABLE_TOKEN,
   BLOCK_REWARD_ADDRESS,
-  DPOS_STAKING_ADDRESS
+  DPOS_STAKING_ADDRESS,
+  RELATIVE_DAILY_LIMIT,
 } = require('../loadEnv')
 
 const {
   homeContracts: {
     EternalStorageProxy,
     HomeAMBErc677ToErc677: HomeBridge,
+    HomeAMBErc677ToErc677RelativeDailyLimit: HomeBridgeRelativeDailyLimit,
     ERC677BridgeToken,
     ERC677BridgeTokenRewardable
   }
@@ -43,7 +45,8 @@ async function deployHome() {
   console.log('[Home] HomeBridge Storage: ', homeBridgeStorage.options.address)
 
   console.log('\n[Home] Deploying homeBridge implementation\n')
-  const homeBridgeImplementation = await deployContract(HomeBridge, [], {
+  const HomeBridgeContract = RELATIVE_DAILY_LIMIT ? HomeBridgeRelativeDailyLimit : HomeBridge
+  const homeBridgeImplementation = await deployContract(HomeBridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     nonce
   })

deploy/src/erc_to_erc/foreign.js

@@ -17,7 +17,9 @@ const {
     EternalStorageProxy,
     BridgeValidators,
     ForeignBridgeErcToErc: ForeignBridge,
-    ForeignBridgeErc677ToErc677
+    ForeignBridgeErcToErcRelativeDailyLimit: ForeignBridgeRelativeDailyLimit,
+    ForeignBridgeErc677ToErc677,
+    ForeignBridgeErc677ToErc677: ForeignBridgeErc677ToErc677RelativeDailyLimit,
   }
 } = require('../loadContracts')
 
@@ -38,7 +40,8 @@ const {
   FOREIGN_MIN_AMOUNT_PER_TX,
   FOREIGN_DAILY_LIMIT,
   ERC20_EXTENDED_BY_ERC677,
-  FOREIGN_TO_HOME_DECIMAL_SHIFT
+  FOREIGN_TO_HOME_DECIMAL_SHIFT,
+  RELATIVE_DAILY_LIMIT,
 } = env
 
 const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
@@ -169,7 +172,13 @@ async function deployForeign() {
   console.log('[Foreign] ForeignBridge Storage: ', foreignBridgeStorage.options.address)
 
   console.log('\ndeploying foreignBridge implementation\n')
-  const bridgeContract = ERC20_EXTENDED_BY_ERC677 ? ForeignBridgeErc677ToErc677 : ForeignBridge
+  let ForeignBridgeErc677ToErc677Contract = ForeignBridgeErc677ToErc677
+  let ForeignBridgeContract = ForeignBridge
+  if (RELATIVE_DAILY_LIMIT) {
+    ForeignBridgeErc677ToErc677Contract = ForeignBridgeErc677ToErc677RelativeDailyLimit
+    ForeignBridgeContract = ForeignBridgeRelativeDailyLimit
+  }
+  const bridgeContract = ERC20_EXTENDED_BY_ERC677 ? ForeignBridgeErc677ToErc677Contract : ForeignBridgeContract
   const foreignBridgeImplementation = await deployContract(bridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     network: 'foreign',

deploy/src/erc_to_erc/home.js

@@ -23,7 +23,9 @@ const {
     RewardableValidators,
     FeeManagerErcToErcPOSDAO,
     HomeBridgeErcToErc: HomeBridge,
+    HomeBridgeErcToErcRelativeDailyLimit: HomeBridgeRelativeDailyLimit,
     HomeBridgeErcToErcPOSDAO,
+    HomeBridgeErcToErcPOSDAORelativeDailyLimit: HomeBridgeErcToErcPOSDAORelativeDailyLimit,
     ERC677BridgeToken,
     ERC677BridgeTokenRewardable
   }
@@ -53,7 +55,8 @@ const {
   HOME_REWARDABLE,
   HOME_TRANSACTIONS_FEE,
   FOREIGN_TRANSACTIONS_FEE,
-  FOREIGN_TO_HOME_DECIMAL_SHIFT
+  FOREIGN_TO_HOME_DECIMAL_SHIFT,
+  RELATIVE_DAILY_LIMIT,
 } = env
 
 const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
@@ -209,8 +212,14 @@ async function deployHome() {
   console.log('[Home] HomeBridge Storage: ', homeBridgeStorage.options.address)
 
   console.log('\ndeploying homeBridge implementation\n')
+  let HomeBridgeErcToErcPOSDAOContract = HomeBridgeErcToErcPOSDAO
+  let HomeBridgeContract = HomeBridge
+  if (RELATIVE_DAILY_LIMIT) {
+    HomeBridgeErcToErcPOSDAOContract = HomeBridgeErcToErcPOSDAORelativeDailyLimit
+    HomeBridgeContract = HomeBridgeRelativeDailyLimit
+  }
   const bridgeContract =
-    isRewardableBridge && BLOCK_REWARD_ADDRESS !== ZERO_ADDRESS ? HomeBridgeErcToErcPOSDAO : HomeBridge
+    isRewardableBridge && BLOCK_REWARD_ADDRESS !== ZERO_ADDRESS ? HomeBridgeErcToErcPOSDAOContract : HomeBridgeContract
   const homeBridgeImplementation = await deployContract(bridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     nonce

deploy/src/erc_to_native/foreign.js

@@ -13,7 +13,12 @@ const {
 } = require('../deploymentUtils')
 const { web3Foreign, deploymentPrivateKey, FOREIGN_RPC_URL } = require('../web3')
 const {
-  foreignContracts: { EternalStorageProxy, BridgeValidators, ForeignBridgeErcToNative: ForeignBridge }
+  foreignContracts: {
+    EternalStorageProxy,
+    BridgeValidators,
+    ForeignBridgeErcToNative: ForeignBridge,
+    ForeignBridgeErcToNativeRelativeDailyLimit: ForeignBridgeRelativeDailyLimit,
+  }
 } = require('../loadContracts')
 
 const VALIDATORS = env.VALIDATORS.split(' ')
@@ -30,7 +35,8 @@ const {
   FOREIGN_MAX_AMOUNT_PER_TX,
   HOME_DAILY_LIMIT,
   HOME_MAX_AMOUNT_PER_TX,
-  FOREIGN_TO_HOME_DECIMAL_SHIFT
+  FOREIGN_TO_HOME_DECIMAL_SHIFT,
+  RELATIVE_DAILY_LIMIT,
 } = env
 
 const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
@@ -144,7 +150,8 @@ async function deployForeign() {
   console.log('[Foreign] ForeignBridge Storage: ', foreignBridgeStorage.options.address)
 
   console.log('\ndeploying foreignBridge implementation\n')
-  const foreignBridgeImplementation = await deployContract(ForeignBridge, [], {
+  const ForeignBridgeContract = RELATIVE_DAILY_LIMIT ? ForeignBridgeRelativeDailyLimit : ForeignBridge
+  const foreignBridgeImplementation = await deployContract(ForeignBridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     network: 'foreign',
     nonce

deploy/src/erc_to_native/home.js

@@ -19,6 +19,7 @@ const {
     RewardableValidators,
     FeeManagerErcToNative,
     HomeBridgeErcToNative: HomeBridge,
+    HomeBridgeErcToNativeRelativeDailyLimit: HomeBridgeRelativeDailyLimit,
     FeeManagerErcToNativePOSDAO
   }
 } = require('../loadContracts')
@@ -43,7 +44,8 @@ const {
   HOME_TRANSACTIONS_FEE,
   FOREIGN_TRANSACTIONS_FEE,
   HOME_FEE_MANAGER_TYPE,
-  FOREIGN_TO_HOME_DECIMAL_SHIFT
+  FOREIGN_TO_HOME_DECIMAL_SHIFT,
+  RELATIVE_DAILY_LIMIT,
 } = env
 
 const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
@@ -210,9 +212,9 @@ async function deployHome() {
   })
   nonce++
   console.log('[Home] HomeBridge Storage: ', homeBridgeStorage.options.address)
-
   console.log('\ndeploying homeBridge implementation\n')
-  const homeBridgeImplementation = await deployContract(HomeBridge, [], {
+  const HomeBridgeContract = RELATIVE_DAILY_LIMIT ? HomeBridgeRelativeDailyLimit : HomeBridge
+  const homeBridgeImplementation = await deployContract(HomeBridgeContract, [], {
     from: DEPLOYMENT_ACCOUNT_ADDRESS,
     nonce
   })