314
315
316
-317|
+317
+318
+319 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -397,19 +462,8 @@
-5×
-5×
-5×
-5×
-5×
-5×
-4×
-4×
-2×
-2×
-2×
@@ -431,19 +485,8 @@
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
@@ -465,19 +508,8 @@
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
@@ -499,20 +531,9 @@
-2×
-2×
-2×
-2×
-2×
-2×
-2×
-2×
-1×
-1×
-1×
@@ -536,21 +557,9 @@
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
-1×
@@ -575,7 +584,6 @@
-5×
@@ -599,7 +607,6 @@
-1×
@@ -623,7 +630,6 @@
-1×
@@ -647,7 +653,6 @@
-2×
@@ -673,10 +678,11 @@
-1×
| pragma solidity ^0.4.24;
-
+/*
+ THIS CONTRACT IS OBSOLETE AND REMAINS ONLY FOR UPGRADABILITY/STORAGE CONSIDERATIONS
+*/
import "zos-lib/contracts/Initializable.sol";
import "openzeppelin-eth/contracts/token/ERC20/ERC20.sol";
import { ECDSA } from "openzeppelin-eth/contracts/cryptography/ECDSA.sol";
@@ -694,310 +700,310 @@
/* hashed tx of transfers performed */
mapping(bytes32 => bool) hashedTxs;
- /**
- * @dev Submit a presigned transfer
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _signature bytes The signature, issued by the owner.
- * @param _to address The address which you want to transfer to.
- * @param _value uint256 The amount of tokens to be transferred.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function transferPreSigned(
- bytes _signature,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool)
- {
- Erequire(_to != address(0), "Invalid _to address");
+ // /**
+ // * @dev Submit a presigned transfer
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _signature bytes The signature, issued by the owner.
+ // * @param _to address The address which you want to transfer to.
+ // * @param _value uint256 The amount of tokens to be transferred.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function transferPreSigned(
+ // bytes _signature,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool)
+ // {
+ // require(_to != address(0), "Invalid _to address");
- bytes32 hashedParams = getTransferPreSignedHash(address(this), _to, _value, _fee, _nonce);
- address from = ECDSA.recover(hashedParams, _signature);
- Erequire(from != address(0), "Invalid from address recovered");
- bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
- require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
- hashedTxs[hashedTx] = true;
- _transfer(from, _to, _value);
- _transfer(from, msg.sender, _fee);
+ // bytes32 hashedParams = getTransferPreSignedHash(address(this), _to, _value, _fee, _nonce);
+ // address from = ECDSA.recover(hashedParams, _signature);
+ // require(from != address(0), "Invalid from address recovered");
+ // bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
+ // require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
+ // hashedTxs[hashedTx] = true;
+ // _transfer(from, _to, _value);
+ // _transfer(from, msg.sender, _fee);
- emit TransferPreSigned(from, _to, msg.sender, _value, _fee);
- return true;
- }
+ // emit TransferPreSigned(from, _to, msg.sender, _value, _fee);
+ // return true;
+ // }
- /**
- * @dev Submit a presigned approval
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _signature bytes The signature, issued by the owner.
- * @param _spender address The address which will spend the funds.
- * @param _value uint256 The amount of tokens to allow.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function approvePreSigned(
- bytes _signature,
- address _spender,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool)
- {
- Erequire(_spender != address(0),"Invalid _spender address");
+ // /**
+ // * @dev Submit a presigned approval
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _signature bytes The signature, issued by the owner.
+ // * @param _spender address The address which will spend the funds.
+ // * @param _value uint256 The amount of tokens to allow.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function approvePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool)
+ // {
+ // require(_spender != address(0),"Invalid _spender address");
- bytes32 hashedParams = getApprovePreSignedHash(address(this), _spender, _value, _fee, _nonce);
- address from = ECDSA.recover(hashedParams, _signature);
- Erequire(from != address(0),"Invalid from address recovered");
- bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
- Erequire(hashedTxs[hashedTx] == false,"Transaction hash was already used");
- hashedTxs[hashedTx] = true;
- _approve(from, _spender, _value);
- _transfer(from, msg.sender, _fee);
+ // bytes32 hashedParams = getApprovePreSignedHash(address(this), _spender, _value, _fee, _nonce);
+ // address from = ECDSA.recover(hashedParams, _signature);
+ // require(from != address(0),"Invalid from address recovered");
+ // bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
+ // require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
+ // hashedTxs[hashedTx] = true;
+ // _approve(from, _spender, _value);
+ // _transfer(from, msg.sender, _fee);
- emit ApprovalPreSigned(from, _spender, msg.sender, _value, _fee);
- return true;
- }
+ // emit ApprovalPreSigned(from, _spender, msg.sender, _value, _fee);
+ // return true;
+ // }
- /**
- * @dev Increase the amount of tokens that an owner allowed to a spender.
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _signature bytes The signature, issued by the owner.
- * @param _spender address The address which will spend the funds.
- * @param _addedValue uint256 The amount of tokens to increase the allowance by.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function increaseAllowancePreSigned(
- bytes _signature,
- address _spender,
- uint256 _addedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool)
- {
- Erequire(_spender != address(0),"Invalid _spender address");
+ // /**
+ // * @dev Increase the amount of tokens that an owner allowed to a spender.
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _signature bytes The signature, issued by the owner.
+ // * @param _spender address The address which will spend the funds.
+ // * @param _addedValue uint256 The amount of tokens to increase the allowance by.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function increaseAllowancePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _addedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool)
+ // {
+ // require(_spender != address(0),"Invalid _spender address");
- bytes32 hashedParams = getIncreaseAllowancePreSignedHash(address(this), _spender, _addedValue, _fee, _nonce);
- address from = ECDSA.recover(hashedParams, _signature);
- Erequire(from != address(0),"Invalid from address recovered");
- bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
- Erequire(hashedTxs[hashedTx] == false,"Transaction hash was already used");
- hashedTxs[hashedTx] = true;
- _approve(from, _spender, allowance(from, _spender).add(_addedValue));
- _transfer(from, msg.sender, _fee);
+ // bytes32 hashedParams = getIncreaseAllowancePreSignedHash(address(this), _spender, _addedValue, _fee, _nonce);
+ // address from = ECDSA.recover(hashedParams, _signature);
+ // require(from != address(0),"Invalid from address recovered");
+ // bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
+ // require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
+ // hashedTxs[hashedTx] = true;
+ // _approve(from, _spender, allowance(from, _spender).add(_addedValue));
+ // _transfer(from, msg.sender, _fee);
- emit ApprovalPreSigned(from, _spender, msg.sender, allowance(from, _spender), _fee);
- return true;
- }
+ // emit ApprovalPreSigned(from, _spender, msg.sender, allowance(from, _spender), _fee);
+ // return true;
+ // }
- /**
- * @dev Decrease the amount of tokens that an owner allowed to a spender.
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _signature bytes The signature, issued by the owner
- * @param _spender address The address which will spend the funds.
- * @param _subtractedValue uint256 The amount of tokens to decrease the allowance by.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function decreaseAllowancePreSigned(
- bytes _signature,
- address _spender,
- uint256 _subtractedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool)
- {
- Erequire(_spender != address(0),"Invalid _spender address");
+ // /**
+ // * @dev Decrease the amount of tokens that an owner allowed to a spender.
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _signature bytes The signature, issued by the owner
+ // * @param _spender address The address which will spend the funds.
+ // * @param _subtractedValue uint256 The amount of tokens to decrease the allowance by.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function decreaseAllowancePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _subtractedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool)
+ // {
+ // require(_spender != address(0),"Invalid _spender address");
- bytes32 hashedParams = getDecreaseAllowancePreSignedHash(address(this), _spender, _subtractedValue, _fee, _nonce);
- address from = ECDSA.recover(hashedParams, _signature);
- Erequire(from != address(0),"Invalid from address recovered");
- bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
- Erequire(hashedTxs[hashedTx] == false,"Transaction hash was already used");
- // if substractedValue is greater than allowance will fail as allowance is uint256
- hashedTxs[hashedTx] = true;
- _approve(from, _spender, allowance(from,_spender).sub(_subtractedValue));
- _transfer(from, msg.sender, _fee);
+ // bytes32 hashedParams = getDecreaseAllowancePreSignedHash(address(this), _spender, _subtractedValue, _fee, _nonce);
+ // address from = ECDSA.recover(hashedParams, _signature);
+ // require(from != address(0),"Invalid from address recovered");
+ // bytes32 hashedTx = keccak256(abi.encodePacked(from, hashedParams));
+ // require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
+ // // if substractedValue is greater than allowance will fail as allowance is uint256
+ // hashedTxs[hashedTx] = true;
+ // _approve(from, _spender, allowance(from,_spender).sub(_subtractedValue));
+ // _transfer(from, msg.sender, _fee);
- emit ApprovalPreSigned(from, _spender, msg.sender, allowance(from, _spender), _fee);
- return true;
- }
+ // emit ApprovalPreSigned(from, _spender, msg.sender, allowance(from, _spender), _fee);
+ // return true;
+ // }
- /**
- * @dev Transfer tokens from one address to another
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _signature bytes The signature, issued by the spender.
- * @param _from address The address which you want to send tokens from.
- * @param _to address The address which you want to transfer to.
- * @param _value uint256 The amount of tokens to be transferred.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the spender.
- * @param _nonce uint256 Presigned transaction number.
- */
- function transferFromPreSigned(
- bytes _signature,
- address _from,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool)
- {
- Erequire(_to != address(0),"Invalid _to address");
+ // /**
+ // * @dev Transfer tokens from one address to another
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _signature bytes The signature, issued by the spender.
+ // * @param _from address The address which you want to send tokens from.
+ // * @param _to address The address which you want to transfer to.
+ // * @param _value uint256 The amount of tokens to be transferred.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the spender.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function transferFromPreSigned(
+ // bytes _signature,
+ // address _from,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool)
+ // {
+ // require(_to != address(0),"Invalid _to address");
- bytes32 hashedParams = getTransferFromPreSignedHash(address(this), _from, _to, _value, _fee, _nonce);
+ // bytes32 hashedParams = getTransferFromPreSignedHash(address(this), _from, _to, _value, _fee, _nonce);
- address spender = ECDSA.recover(hashedParams, _signature);
- Erequire(spender != address(0),"Invalid spender address recovered");
- bytes32 hashedTx = keccak256(abi.encodePacked(spender, hashedParams));
- Erequire(hashedTxs[hashedTx] == false,"Transaction hash was already used");
- hashedTxs[hashedTx] = true;
- _transfer(_from, _to, _value);
- _approve(_from, spender, allowance(_from, spender).sub(_value));
- _transfer(spender, msg.sender, _fee);
+ // address spender = ECDSA.recover(hashedParams, _signature);
+ // require(spender != address(0),"Invalid spender address recovered");
+ // bytes32 hashedTx = keccak256(abi.encodePacked(spender, hashedParams));
+ // require(hashedTxs[hashedTx] == false,"Transaction hash was already used");
+ // hashedTxs[hashedTx] = true;
+ // _transfer(_from, _to, _value);
+ // _approve(_from, spender, allowance(_from, spender).sub(_value));
+ // _transfer(spender, msg.sender, _fee);
- emit TransferPreSigned(_from, _to, msg.sender, _value, _fee);
- return true;
- }
+ // emit TransferPreSigned(_from, _to, msg.sender, _value, _fee);
+ // return true;
+ // }
- /**
- * @dev Hash (keccak256) of the payload used by transferPreSigned
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _token address The address of the token.
- * @param _to address The address which you want to transfer to.
- * @param _value uint256 The amount of tokens to be transferred.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function getTransferPreSignedHash(
- address _token,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- pure
- returns (bytes32)
- {
- /* "0d98dcb1": getTransferPreSignedHash(address,address,uint256,uint256,uint256) */
- return keccak256(abi.encodePacked(bytes4(0x0d98dcb1), _token, _to, _value, _fee, _nonce));
- }
+ // /**
+ // * @dev Hash (keccak256) of the payload used by transferPreSigned
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _token address The address of the token.
+ // * @param _to address The address which you want to transfer to.
+ // * @param _value uint256 The amount of tokens to be transferred.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function getTransferPreSignedHash(
+ // address _token,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // pure
+ // returns (bytes32)
+ // {
+ // /* "0d98dcb1": getTransferPreSignedHash(address,address,uint256,uint256,uint256) */
+ // return keccak256(abi.encodePacked(bytes4(0x0d98dcb1), _token, _to, _value, _fee, _nonce));
+ // }
- /**
- * @dev Hash (keccak256) of the payload used by approvePreSigned
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _token address The address of the token
- * @param _spender address The address which will spend the funds.
- * @param _value uint256 The amount of tokens to allow.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function getApprovePreSignedHash(
- address _token,
- address _spender,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- pure
- returns (bytes32)
- {
- /* "79250dcf": getApprovePreSignedHash(address,address,uint256,uint256,uint256) */
- return keccak256(abi.encodePacked(bytes4(0x79250dcf), _token, _spender, _value, _fee, _nonce));
- }
+ // /**
+ // * @dev Hash (keccak256) of the payload used by approvePreSigned
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _token address The address of the token
+ // * @param _spender address The address which will spend the funds.
+ // * @param _value uint256 The amount of tokens to allow.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function getApprovePreSignedHash(
+ // address _token,
+ // address _spender,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // pure
+ // returns (bytes32)
+ // {
+ // /* "79250dcf": getApprovePreSignedHash(address,address,uint256,uint256,uint256) */
+ // return keccak256(abi.encodePacked(bytes4(0x79250dcf), _token, _spender, _value, _fee, _nonce));
+ // }
- /**
- * @dev Hash (keccak256) of the payload used by increaseAllowancePreSigned
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _token address The address of the token
- * @param _spender address The address which will spend the funds.
- * @param _addedValue uint256 The amount of tokens to increase the allowance by.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function getIncreaseAllowancePreSignedHash(
- address _token,
- address _spender,
- uint256 _addedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- pure
- returns (bytes32)
- {
- /* "138e8da1": getIncreaseAllowancePreSignedHash(address,address,uint256,uint256,uint256) */
- return keccak256(abi.encodePacked(bytes4(0x138e8da1), _token, _spender, _addedValue, _fee, _nonce));
- }
+ // /**
+ // * @dev Hash (keccak256) of the payload used by increaseAllowancePreSigned
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _token address The address of the token
+ // * @param _spender address The address which will spend the funds.
+ // * @param _addedValue uint256 The amount of tokens to increase the allowance by.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function getIncreaseAllowancePreSignedHash(
+ // address _token,
+ // address _spender,
+ // uint256 _addedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // pure
+ // returns (bytes32)
+ // {
+ // /* "138e8da1": getIncreaseAllowancePreSignedHash(address,address,uint256,uint256,uint256) */
+ // return keccak256(abi.encodePacked(bytes4(0x138e8da1), _token, _spender, _addedValue, _fee, _nonce));
+ // }
- /**
- * @dev Hash (keccak256) of the payload used by decreaseAllowancePreSigned
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _token address The address of the token
- * @param _spender address The address which will spend the funds.
- * @param _subtractedValue uint256 The amount of tokens to decrease the allowance by.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
- * @param _nonce uint256 Presigned transaction number.
- */
- function getDecreaseAllowancePreSignedHash(
- address _token,
- address _spender,
- uint256 _subtractedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- pure
- returns (bytes32)
- {
- /* "5229c56f": getDecreaseAllowancePreSignedHash(address,address,uint256,uint256,uint256) */
- return keccak256(abi.encodePacked(bytes4(0x5229c56f), _token, _spender, _subtractedValue, _fee, _nonce));
- }
+ // /**
+ // * @dev Hash (keccak256) of the payload used by decreaseAllowancePreSigned
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _token address The address of the token
+ // * @param _spender address The address which will spend the funds.
+ // * @param _subtractedValue uint256 The amount of tokens to decrease the allowance by.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the owner.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function getDecreaseAllowancePreSignedHash(
+ // address _token,
+ // address _spender,
+ // uint256 _subtractedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // pure
+ // returns (bytes32)
+ // {
+ // /* "5229c56f": getDecreaseAllowancePreSignedHash(address,address,uint256,uint256,uint256) */
+ // return keccak256(abi.encodePacked(bytes4(0x5229c56f), _token, _spender, _subtractedValue, _fee, _nonce));
+ // }
- /**
- * @dev Hash (keccak256) of the payload used by transferFromPreSigned
- * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
- * @param _token address The address of the token
- * @param _from address The address which you want to send tokens from.
- * @param _to address The address which you want to transfer to.
- * @param _value uint256 The amount of tokens to be transferred.
- * @param _fee uint256 The amount of tokens paid to msg.sender, by the spender.
- * @param _nonce uint256 Presigned transaction number.
- */
- function getTransferFromPreSignedHash(
- address _token,
- address _from,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- pure
- returns (bytes32)
- {
- /* "a70c41b4": getTransferFromPreSignedHash(address,address,address,uint256,uint256,uint256) */
- return keccak256(abi.encodePacked(bytes4(0xa70c41b4), _token, _from, _to, _value, _fee, _nonce));
- }
+ // /**
+ // * @dev Hash (keccak256) of the payload used by transferFromPreSigned
+ // * @notice fee will be given to sender if it's a smart contract make sure it can accept funds
+ // * @param _token address The address of the token
+ // * @param _from address The address which you want to send tokens from.
+ // * @param _to address The address which you want to transfer to.
+ // * @param _value uint256 The amount of tokens to be transferred.
+ // * @param _fee uint256 The amount of tokens paid to msg.sender, by the spender.
+ // * @param _nonce uint256 Presigned transaction number.
+ // */
+ // function getTransferFromPreSignedHash(
+ // address _token,
+ // address _from,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // pure
+ // returns (bytes32)
+ // {
+ // /* "a70c41b4": getTransferFromPreSignedHash(address,address,address,uint256,uint256,uint256) */
+ // return keccak256(abi.encodePacked(bytes4(0xa70c41b4), _token, _from, _to, _value, _fee, _nonce));
+ // }
} |
diff --git a/coverage/token/IERC865.sol.html b/coverage/token/IERC865.sol.html
index e6bff168..929556e4 100644
--- a/coverage/token/IERC865.sol.html
+++ b/coverage/token/IERC865.sol.html
@@ -106,7 +106,11 @@
61
62
63
-64|
+64
+65
+66 |
+
+
@@ -170,7 +174,9 @@
| pragma solidity ^0.4.24;
-
+/*
+ THIS CONTRACT IS OBSOLETE AND REMAINS ONLY FOR UPGRADABILITY/STORAGE CONSIDERATIONS
+*/
/**
* @title ERC865 Interface
* @dev see https://github.com/ethereum/EIPs/issues/865
@@ -179,66 +185,66 @@
contract IERC865 {
- event TransferPreSigned(address indexed from, address indexed to, address indexed delegate, uint256 amount, uint256 fee);
- event ApprovalPreSigned(address indexed from, address indexed to, address indexed delegate, uint256 amount, uint256 fee);
+ // event TransferPreSigned(address indexed from, address indexed to, address indexed delegate, uint256 amount, uint256 fee);
+ // event ApprovalPreSigned(address indexed from, address indexed to, address indexed delegate, uint256 amount, uint256 fee);
- function transferPreSigned(
- bytes _signature,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool);
+ // function transferPreSigned(
+ // bytes _signature,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool);
- function approvePreSigned(
- bytes _signature,
- address _spender,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool);
+ // function approvePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool);
- function increaseAllowancePreSigned(
- bytes _signature,
- address _spender,
- uint256 _addedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool);
+ // function increaseAllowancePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _addedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool);
- function decreaseAllowancePreSigned(
- bytes _signature,
- address _spender,
- uint256 _subtractedValue,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool);
+ // function decreaseAllowancePreSigned(
+ // bytes _signature,
+ // address _spender,
+ // uint256 _subtractedValue,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool);
- function transferFromPreSigned(
- bytes _signature,
- address _from,
- address _to,
- uint256 _value,
- uint256 _fee,
- uint256 _nonce
- )
- public
- returns (bool);
+ // function transferFromPreSigned(
+ // bytes _signature,
+ // address _from,
+ // address _to,
+ // uint256 _value,
+ // uint256 _fee,
+ // uint256 _nonce
+ // )
+ // public
+ // returns (bool);
} |
diff --git a/coverage/token/PropsRewards.sol.html b/coverage/token/PropsRewards.sol.html
index d4683aae..56c005c9 100644
--- a/coverage/token/PropsRewards.sol.html
+++ b/coverage/token/PropsRewards.sol.html
@@ -22,22 +22,22 @@
100%
Statements
- 40/40
+ 25/25
- 91.67%
+ 66.67%
Branches
- 11/12
+ 12/18
100%
Functions
- 13/13
+ 10/10
100%
Lines
- 50/50
+ 29/29
@@ -240,167 +240,7 @@
195
196
197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-288
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327
-328
-329
-330
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353
-354
-355
-356
-357
-358|
+198 |
@@ -439,97 +279,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15×
-
-
-
-12×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-4×
-
-
-
-
-
-
-
-
-
+9×
5×
-4×
-4×
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-3×
-3×
-
-
@@ -537,10 +291,11 @@
+2×
+2×
-8×
@@ -548,9 +303,14 @@
+2×
+2×
+2×
+2×
+2×
@@ -560,19 +320,14 @@
-22×
-19×
-19×
-1×
-22×
@@ -580,23 +335,18 @@
-14×
-4×
-14×
+1×
+1×
-14×
-3×
-14×
-14×
@@ -627,36 +377,10 @@
-
-
-
-
-8×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
2×
2×
-
-
-
-
-
2×
+1×
@@ -669,67 +393,20 @@
+1×
+1×
+1×
-10×
-10×
-10×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-4×
-
-4×
-
-4×
-
-4×
-
-4×
-
-
-4×
-4×
-4×
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-4×
-11×
+1×
-4×
-4×
+1×
@@ -738,9 +415,12 @@
+3×
+1×
+1×
@@ -749,19 +429,20 @@
+2×
-4×
-12×
+2×
-4×
+2×
| pragma solidity ^0.4.24;
import "zos-lib/contracts/Initializable.sol";
import "openzeppelin-eth/contracts/math/SafeMath.sol";
import "openzeppelin-eth/contracts/token/ERC20/ERC20.sol";
+import "openzeppelin-eth/contracts/token/ERC20/SafeERC20.sol";
import { PropsRewardsLib } from "./PropsRewardsLib.sol";
/**
@@ -770,53 +451,10 @@
**/
contract PropsRewards is Initializable, ERC20 {
using SafeMath for uint256;
+ using SafeERC20 for ERC20;
/*
* Events
- */
- event DailyRewardsSubmitted(
- uint256 indexed rewardsDay,
- bytes32 indexed rewardsHash,
- address indexed validator
- );
-
- event DailyRewardsApplicationsMinted(
- uint256 indexed rewardsDay,
- bytes32 indexed rewardsHash,
- uint256 numOfApplications,
- uint256 amount
- );
-
- event DailyRewardsValidatorsMinted(
- uint256 indexed rewardsDay,
- bytes32 indexed rewardsHash,
- uint256 numOfValidators,
- uint256 amount
- );
-
- event EntityUpdated(
- address indexed id,
- PropsRewardsLib.RewardedEntityType indexed entityType,
- bytes32 name,
- address rewardsAddress,
- address indexed sidechainAddress
- );
-
- event ParameterUpdated(
- PropsRewardsLib.ParameterName param,
- uint256 newValue,
- uint256 oldValue,
- uint256 rewardsDay
- );
-
- event ValidatorsListUpdated(
- address[] validatorsList,
- uint256 indexed rewardsDay
- );
-
- event ApplicationsListUpdated(
- address[] applicationsList,
- uint256 indexed rewardsDay
- );
+ */
event ControllerUpdated(address indexed newController);
@@ -828,7 +466,12 @@
uint256 public maxTotalSupply;
uint256 public rewardsStartTimestamp;
address public controller; // controller entity
-
+ mapping(address => bool) public minters;
+ bytes32 public DOMAIN_SEPARATOR;
+ // keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
+ bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
+ mapping(address => uint256) public nonces;
+ uint256 public MY_CHAIN_ID;
/*
* Modifiers
*/
@@ -841,121 +484,102 @@
}
/**
- * @dev The initializer function for upgrade as initialize was already called, get the decimals used in the token to initialize the params
- * @param _controller address that will have controller functionality on rewards protocol
- * @param _minSecondsBetweenDays uint256 seconds required to pass between consecutive rewards day
- * @param _rewardsStartTimestamp uint256 day 0 timestamp
- */
- function initializePostRewardsUpgrade1(
- address _controller,
- uint256 _minSecondsBetweenDays,
- uint256 _rewardsStartTimestamp
- )
- public
- {
+ * @dev The initializer function for upgrade as initialize was already called, get the decimals used in the token to initialize the params
+ * @param _controller address that will have controller functionality on token
+ */
+ function initialize(address _controller) public {
uint256 decimals = 18;
- _initializePostRewardsUpgrade1(_controller, decimals, _minSecondsBetweenDays, _rewardsStartTimestamp);
+ _initialize(_controller, decimals);
}
/**
- * @dev Set new validators list
- * @param _rewardsDay uint256 the rewards day from which this change should take effect
- * @param _validators address[] array of validators
- */
- function setValidators(uint256 _rewardsDay, address[] _validators)
+ * @dev Initialize post separation of rewards contract upgrade
+ * @param _tokenName string token name
+ */
+ function initializePermitUpgrade(string memory _tokenName)
public
- onlyController
- returns (bool)
+ initializer
{
- PropsRewardsLib.setValidators(rewardsLibData, _rewardsDay, _validators);
- emit ValidatorsListUpdated(_validators, _rewardsDay);
- return true;
- }
-
- /**
- * @dev Set new applications list
- * @param _rewardsDay uint256 the rewards day from which this change should take effect
- * @param _applications address[] array of validators
- */
- function setApplications(uint256 _rewardsDay, address[] _applications)
- public
- onlyController
- returns (bool)
- {
- PropsRewardsLib.setApplications(rewardsLibData, _rewardsDay, _applications);
- emit ApplicationsListUpdated(_applications, _rewardsDay);
- return true;
- }
+ uint256 chainId;
+ string memory one = "1";
+ assembly {
+ chainId := chainId
+ }
- /**
- * @dev Get the applications or validators list
- * @param _entityType RewardedEntityType either application (0) or validator (1)
- * @param _rewardsDay uint256 the rewards day to use for this value
- */
- function getEntities(PropsRewardsLib.RewardedEntityType _entityType, uint256 _rewardsDay)
- public
- view
- returns (address[])
- {
- return PropsRewardsLib.getEntities(rewardsLibData, _entityType, _rewardsDay);
+ MY_CHAIN_ID = chainId;
+ DOMAIN_SEPARATOR = keccak256(
+ abi.encode(
+ keccak256(
+ "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
+ ),
+ keccak256(bytes(_tokenName)),
+ keccak256(bytes(one)),
+ chainId,
+ address(this)
+ )
+ );
}
/**
- * @dev The function is called by validators with the calculation of the daily rewards
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _applications address[] array of application addresses getting the daily reward
- * @param _amounts uint256[] array of amounts each app should get
- */
- function submitDailyRewards(
- uint256 _rewardsDay,
- bytes32 _rewardsHash,
- address[] _applications,
- uint256[] _amounts
- )
- public
- returns (bool)
- {
- // if submission is for a new day check if previous day validator rewards were given if not give to participating ones
- if (_rewardsDay > 0 && (_rewardsDay > rewardsLibData.dailyRewards.lastRewardsDay)) {
- uint256 previousDayValidatorRewardsAmount = PropsRewardsLib.calculateValidatorRewards(
- rewardsLibData,
- rewardsLibData.dailyRewards.lastRewardsDay,
- rewardsLibData.dailyRewards.lastConfirmedRewardsHash,
- false
+ * @dev Allows for approvals to be made via secp256k1 signatures
+ * @param _owner address owner
+ * @param _spender address spender
+ * @param _amount uint spender
+ * @param _deadline uint spender
+ * @param _v uint8 spender
+ * @param _r bytes32 spender
+ * @param _s bytes32 spender
+ */
+ function permit(
+ address _owner,
+ address _spender,
+ uint256 _amount,
+ uint256 _deadline,
+ uint8 _v,
+ bytes32 _r,
+ bytes32 _s
+ ) external {
+ Erequire(_deadline >= block.timestamp, "Permit Expired");
+ bytes32 digest =
+ keccak256(
+ abi.encodePacked(
+ "\x19\x01",
+ DOMAIN_SEPARATOR,
+ keccak256(
+ abi.encode(
+ PERMIT_TYPEHASH,
+ _owner,
+ _spender,
+ _amount,
+ nonces[_owner]++,
+ _deadline
+ )
+ )
+ )
);
- if (previousDayValidatorRewardsAmount > 0) {
- _mintDailyRewardsForValidators(rewardsLibData.dailyRewards.lastRewardsDay, rewardsLibData.dailyRewards.lastConfirmedRewardsHash, previousDayValidatorRewardsAmount);
- }
- }
- // check and give application rewards if majority of validators agree
- uint256 appRewardsSum = PropsRewardsLib.calculateApplicationRewards(
- rewardsLibData,
- _rewardsDay,
- _rewardsHash,
- _applications,
- _amounts,
- totalSupply()
+ address recoveredAddress = ecrecover(digest, _v, _r, _s);
+ Erequire(
+ recoveredAddress != address(0) && recoveredAddress == _owner,
+ "Invalid Signature"
);
- if (appRewardsSum > 0) {
- _mintDailyRewardsForApps(_rewardsDay, _rewardsHash, _applications, _amounts, appRewardsSum);
- }
-
- // check and give validator rewards if all validators submitted
- uint256 validatorRewardsAmount = PropsRewardsLib.calculateValidatorRewards(
- rewardsLibData,
- _rewardsDay,
- _rewardsHash,
- true
- );
- if (validatorRewardsAmount > 0) {
- _mintDailyRewardsForValidators(_rewardsDay, _rewardsHash, validatorRewardsAmount);
- }
-
- emit DailyRewardsSubmitted(_rewardsDay, _rewardsHash, msg.sender);
- return true;
+ _approve(_owner, _spender, _amount);
}
+ /**
+ * @dev Reclaim all ERC20 compatible tokens
+ * @param _token ERC20 The address of the token contract
+ */
+ function reclaimToken(
+ ERC20 _token,
+ address _to,
+ uint256 _amount
+ ) external onlyController {
+ Erequire(_to != address(0), "Must transfer to recipient");
+ uint256 balance = _token.balanceOf(this);
+ require(_amount <= balance, "Cannot transfer more than balance");
+ _token.safeTransfer(_to, _amount);
+ }
+
/**
* @dev Allows the controller/owner to update to a new controller
* @param _controller address address of the new controller
@@ -965,154 +589,50 @@
)
public
onlyController
- returns (bool)
{
+ Erequire(_controller != address(0), "Controller cannot be the zero address");
controller = _controller;
emit ControllerUpdated
(
_controller
);
- return true;
}
- /**
- * @dev Allows getting a parameter value based on timestamp
- * @param _name ParameterName name of the parameter
- * @param _rewardsDay uint256 starting when should this parameter use the current value
- */
- function getParameter(
- PropsRewardsLib.ParameterName _name,
- uint256 _rewardsDay
- )
- public
- view
- returns (uint256)
- {
- return PropsRewardsLib.getParameterValue(rewardsLibData, _name, _rewardsDay);
+ function addMinter(address _minter) public onlyController {
+ minters[_minter] = true;
}
- /**
- * @dev Allows the controller/owner to update rewards parameters
- * @param _name ParameterName name of the parameter
- * @param _value uint256 new value for the parameter
- * @param _rewardsDay uint256 starting when should this parameter use the current value
- */
- function updateParameter(
- PropsRewardsLib.ParameterName _name,
- uint256 _value,
- uint256 _rewardsDay
- )
- public
- onlyController
- returns (bool)
- {
- PropsRewardsLib.updateParameter(rewardsLibData, _name, _value, _rewardsDay);
- emit ParameterUpdated(
- _name,
- rewardsLibData.parameters[uint256(_name)].currentValue,
- rewardsLibData.parameters[uint256(_name)].previousValue,
- rewardsLibData.parameters[uint256(_name)].rewardsDay
- );
- return true;
+ function removeMinter(address _minter) public onlyController {
+ minters[_minter] = false;
}
/**
- * @dev Allows an application or validator to add/update its details
- * @param _entityType RewardedEntityType either application (0) or validator (1)
- * @param _name bytes32 name of the app
- * @param _rewardsAddress address an address for the app to receive the rewards
- * @param _sidechainAddress address the address used for using the sidechain
- */
- function updateEntity(
- PropsRewardsLib.RewardedEntityType _entityType,
- bytes32 _name,
- address _rewardsAddress,
- address _sidechainAddress
- )
- public
- returns (bool)
- {
- PropsRewardsLib.updateEntity(rewardsLibData, _entityType, _name, _rewardsAddress, _sidechainAddress);
- emit EntityUpdated(msg.sender, _entityType, _name, _rewardsAddress, _sidechainAddress);
- return true;
+ * @dev Allows minters to mint tokens to a given address
+ * @param _account address of the receiving account
+ * @param _amount uint256 how much to mint
+ */
+ function mint(address _account, uint256 _amount) public {
+ require(minters[msg.sender], "Mint fn can be called only by minter");
+ Erequire(
+ totalSupply().add(_amount) <= maxTotalSupply,
+ "Max total supply exceeded"
+ );
+ _mint(_account, _amount);
}
-
+
/**
- * @dev internal intialize rewards upgrade1
- * @param _controller address that will have controller functionality on rewards protocol
- * @param _decimals uint256 number of decimals used in total supply
- * @param _minSecondsBetweenDays uint256 seconds required to pass between consecutive rewards day
- * @param _rewardsStartTimestamp uint256 day 0 timestamp
- */
- function _initializePostRewardsUpgrade1(
- address _controller,
- uint256 _decimals,
- uint256 _minSecondsBetweenDays,
- uint256 _rewardsStartTimestamp
- )
- internal
- {
- Erequire(maxTotalSupply==0, "Initialize rewards upgrade1 can happen only once");
+ * @dev internal intialize
+ * @param _controller address that will have controller functionality on rewards protocol
+ * @param _decimals uint256 number of decimals used in total supply
+ */
+ function _initialize(address _controller, uint256 _decimals) internal {
+ Erequire(
+ maxTotalSupply == 0,
+ "Initialize rewards upgrade1 can happen only once"
+ );
controller = _controller;
- // ApplicationRewardsPercent pphm ==> 0.03475%
- PropsRewardsLib.updateParameter(rewardsLibData, PropsRewardsLib.ParameterName.ApplicationRewardsPercent, 34750, 0);
- // // ApplicationRewardsMaxVariationPercent pphm ==> 150%
- PropsRewardsLib.updateParameter(rewardsLibData, PropsRewardsLib.ParameterName.ApplicationRewardsMaxVariationPercent, 150 * 1e6, 0);
- // // ValidatorMajorityPercent pphm ==> 50%
- PropsRewardsLib.updateParameter(rewardsLibData, PropsRewardsLib.ParameterName.ValidatorMajorityPercent, 50 * 1e6, 0);
- // // ValidatorRewardsPercent pphm ==> 0.001829%
- PropsRewardsLib.updateParameter(rewardsLibData, PropsRewardsLib.ParameterName.ValidatorRewardsPercent, 1829, 0);
-
// max total supply is 1,000,000,000 PROPS specified in AttoPROPS
- rewardsLibData.maxTotalSupply = maxTotalSupply = 1 * 1e9 * (10 ** uint256(_decimals));
- rewardsLibData.rewardsStartTimestamp = rewardsStartTimestamp = _rewardsStartTimestamp;
- rewardsLibData.minSecondsBetweenDays = _minSecondsBetweenDays;
-
- }
-
- /**
- * @dev Mint rewards for validators
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _amount uint256 amount each validator should get
- */
- function _mintDailyRewardsForValidators(uint256 _rewardsDay, bytes32 _rewardsHash, uint256 _amount)
- internal
- {
- uint256 validatorsCount = rewardsLibData.dailyRewards.submissions[_rewardsHash].validatorsList.length;
- for (uint256 i = 0; i < validatorsCount; i++) {
- _mint(rewardsLibData.validators[rewardsLibData.dailyRewards.submissions[_rewardsHash].validatorsList[i]].rewardsAddress,_amount);
- }
- PropsRewardsLib._resetDailyRewards(rewardsLibData);
- emit DailyRewardsValidatorsMinted(
- _rewardsDay,
- _rewardsHash,
- validatorsCount,
- (_amount * validatorsCount)
- );
- }
-
- /**
- * @dev Mint rewards for apps
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _applications address[] array of application addresses getting the daily reward
- * @param _amounts uint256[] array of amounts each app should get
- * @param _sum uint256 the sum of all application rewards given
- */
- function _mintDailyRewardsForApps(
- uint256 _rewardsDay,
- bytes32 _rewardsHash,
- address[] _applications,
- uint256[] _amounts,
- uint256 _sum
- )
- internal
- {
- for (uint256 i = 0; i < _applications.length; i++) {
- _mint(rewardsLibData.applications[_applications[i]].rewardsAddress, _amounts[i]);
- }
- emit DailyRewardsApplicationsMinted(_rewardsDay, _rewardsHash, _applications.length, _sum);
+ maxTotalSupply = 1 * 1e9 * (10**_decimals);
}
} |
@@ -1120,7 +640,7 @@
diff --git a/coverage/token/PropsRewardsLib.sol.html b/coverage/token/PropsRewardsLib.sol.html
index 9dcd9b17..8e6d427f 100644
--- a/coverage/token/PropsRewardsLib.sol.html
+++ b/coverage/token/PropsRewardsLib.sol.html
@@ -20,24 +20,24 @@
- 99.24%
+ 100%
Statements
- 130/131
+ 0/0
- 94.44%
+ 100%
Branches
- 68/72
+ 0/0
100%
Functions
- 31/31
+ 0/0
- 99.34%
+ 100%
Lines
- 151/152
+ 0/0
@@ -130,965 +130,7 @@
85
86
87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-288
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327
-328
-329
-330
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353
-354
-355
-356
-357
-358
-359
-360
-361
-362
-363
-364
-365
-366
-367
-368
-369
-370
-371
-372
-373
-374
-375
-376
-377
-378
-379
-380
-381
-382
-383
-384
-385
-386
-387
-388
-389
-390
-391
-392
-393
-394
-395
-396
-397
-398
-399
-400
-401
-402
-403
-404
-405
-406
-407
-408
-409
-410
-411
-412
-413
-414
-415
-416
-417
-418
-419
-420
-421
-422
-423
-424
-425
-426
-427
-428
-429
-430
-431
-432
-433
-434
-435
-436
-437
-438
-439
-440
-441
-442
-443
-444
-445
-446
-447
-448
-449
-450
-451
-452
-453
-454
-455
-456
-457
-458
-459
-460
-461
-462
-463
-464
-465
-466
-467
-468
-469
-470
-471
-472
-473
-474
-475
-476
-477
-478
-479
-480
-481
-482
-483
-484
-485
-486
-487
-488
-489
-490
-491
-492
-493
-494
-495
-496
-497
-498
-499
-500
-501
-502
-503
-504
-505
-506
-507
-508
-509
-510
-511
-512
-513
-514
-515
-516
-517
-518
-519
-520
-521
-522
-523
-524
-525
-526
-527
-528
-529
-530
-531
-532
-533
-534
-535
-536
-537
-538
-539
-540
-541
-542
-543
-544
-545
-546
-547
-548
-549
-550
-551
-552
-553
-554
-555
-556
-557
-558
-559
-560
-561
-562
-563
-564
-565
-566
-567
-568
-569
-570
-571
-572
-573
-574
-575
-576
-577
-578
-579
-580
-581
-582
-583
-584
-585
-586
-587
-588
-589
-590
-591
-592
-593
-594
-595
-596
-597
-598
-599
-600
-601
-602
-603
-604
-605
-606
-607
-608
-609
-610
-611
-612
-613
-614
-615
-616
-617
-618
-619
-620
-621
-622
-623
-624
-625
-626
-627
-628
-629
-630
-631
-632
-633
-634
-635
-636
-637
-638
-639
-640
-641
-642
-643
-644
-645
-646
-647
-648
-649
-650
-651
-652
-653
-654
-655
-656
-657
-658
-659
-660
-661
-662
-663
-664
-665
-666
-667
-668
-669
-670
-671
-672
-673
-674
-675
-676
-677
-678
-679
-680
-681
-682
-683
-684
-685
-686
-687
-688
-689
-690
-691
-692
-693
-694
-695
-696
-697
-698
-699
-700
-701
-702
-703
-704
-705
-706
-707
-708
-709
-710
-711
-712
-713
-714
-715
-716
-717
-718
-719
-720
-721
-722
-723
-724
-725
-726
-727
-728
-729
-730
-731
-732
-733
-734
-735
-736
-737
-738|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-20×
-
-
-
-19×
-
-
-
-4×
-11×
-
-
-
-
-3×
-
-
-
-5×
-14×
-
-
-
-
-4×
-
-
-
-19×
-5×
-
-
-
-
-14×
-
-
-
-
-18×
-
-
-
-22×
-
-
-
-20×
-
-
-
-27×
-
-
-
-27×
-
-
-
-10×
-
-
-
-
-10×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-33×
-33×
-
-7×
-6×
-6×
-
-1×
-
-4×
-4×
-
-26×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18×
-
-
-
-17×
-7×
-7×
-
-17×
-17×
-17×
-
-17×
-7×
-6×
-
-
-
-4×
-4×
-
-10×
-
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-4×
-4×
-4×
-4×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-41×
-35×
-
-6×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18×
-16×
-16×
-
-2×
-2×
-2×
-
-18×
-
-
-
-
-
-
-
-
+88 |
@@ -1102,12 +144,8 @@
-10×
-5×
-5×
-10×
@@ -1126,15 +164,7 @@
-5×
-5×
-5×
-5×
-4×
-4×
-4×
-5×
@@ -1153,15 +183,7 @@
-5×
-5×
-5×
-5×
-4×
-4×
-4×
-5×
@@ -1181,12 +203,7 @@
-4×
-2×
-4×
-4×
-4×
@@ -1200,325 +217,10 @@
-
-
-
-
-
-
-3×
-1×
-3×
-3×
-3×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8×
-4×
-2×
-
-2×
-
-
-4×
-2×
-
-2×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-50×
-16×
-
-34×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7×
-7×
-7×
-21×
-21×
-
-7×
-
-
-
-6×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6×
-2×
-
-4×
-
-
-
-
-
-
-
-
-
-
-
-
-
-17×
-5×
-
-12×
-
-
-
-
-
-
-
-
-
-
-
-
-
-49×
-33×
-
-16×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7×
-7×
-3×
-3×
-
-
-7×
-19×
-13×
-
-6×
-
-19×
-
-7×
-
-
-
-
-
-
-
-
-
-
-3×
-3×
-
-
-
-1×
-1×
-
-3×
-10×
-10×
-
-
-
-10×
-
-3×
-
-
-
-
-
-
-
-
-
-
-3×
-10×
-
-3×
-3×
-
-
-
-
-
-
-
-
-
-
-1×
-3×
-
-1×
-1×
-
-
-
-
-
-
-
-
-
-
-
-
-4×
-4×
-4×
-7×
-14×
-
-
-
-7×
-7×
-7×
-7×
-
-4×
-
| pragma solidity ^0.4.24;
-
+/*
+ THIS CONTRACT IS OBSOLETE AND REMAINS ONLY FOR UPGRADABILITY/STORAGE CONSIDERATIONS
+*/
import "openzeppelin-eth/contracts/math/SafeMath.sol";
/**
@@ -1569,14 +271,14 @@
bytes32[] submittedRewardsHashes;
uint256 totalSupply;
bytes32 lastConfirmedRewardsHash;
- uint256 lastRewardsDay;
+ uint256 lastApplicationsRewardsDay;
}
struct Submission {
mapping (address => bool) validators;
address[] validatorsList;
uint256 confirmations;
- uint256 finalized;
+ uint256 finalizedStatus; // 0 - initialized, 1 - finalized
bool isInitializedState; // A way to check if there's something in the map and whether it is already added to the list
}
@@ -1600,667 +302,15 @@
uint256 minSecondsBetweenDays;
uint256 rewardsStartTimestamp;
uint256 maxTotalSupply;
- uint256 lastRewardsDay;
- }
- /*
- * Modifiers
- */
- modifier onlyOneRewardsHashPerValidator(Data storage _self, bytes32 _rewardsHash) {
- require(
- !_self.dailyRewards.submissions[_rewardsHash].validators[msg.sender],
- "Must be one submission per validator"
- );
- _;
- }
-
- modifier onlyExistingApplications(Data storage _self, address[] _entities) {
- for (uint256 i = 0; i < _entities.length; i++) {
- require(
- _self.applications[_entities[i]].isInitializedState,
- "Application must exist"
- );
- }
- _;
- }
-
- modifier onlyExistingValidators(Data storage _self, address[] _entities) {
- for (uint256 i = 0; i < _entities.length; i++) {
- require(
- _self.validators[_entities[i]].isInitializedState,
- "Validator must exist"
- );
- }
- _;
- }
-
- modifier onlySelectedValidators(Data storage _self, uint256 _rewardsDay) {
- if (_getSelectedRewardedEntityListType(_self.selectedValidators, _rewardsDay) == 0) {
- Erequire (
- _self.selectedValidators.current[msg.sender],
- "Must be a current selected validator"
- );
- } else {
- require (
- _self.selectedValidators.previous[msg.sender],
- "Must be a previous selected validator"
- );
- }
- _;
- }
-
- modifier onlyValidRewardsDay(Data storage _self, uint256 _rewardsDay) {
- require(
- _currentRewardsDay(_self) == _rewardsDay && _rewardsDay > _self.lastRewardsDay,
- "Must be for current day"
- );
- _;
- }
-
- modifier onlyValidFutureRewardsDay(Data storage _self, uint256 _rewardsDay) {
- Erequire(
- _rewardsDay >= _currentRewardsDay(_self),
- "Must be future rewardsDay"
- );
- _;
- }
-
- modifier onlyValidAddresses(address _rewardsAddress, address _sidechainAddress) {
- Erequire(
- _rewardsAddress != address(0) &&
- _sidechainAddress != address(0),
- "Must have valid rewards and sidechain addresses"
- );
- _;
- }
-
- /**
- * @dev The function is called by validators with the calculation of the daily rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _allValidators bool should the calculation be based on all the validators or just those which submitted
- */
- function calculateValidatorRewards(
- Data storage _self,
- uint256 _rewardsDay,
- bytes32 _rewardsHash,
- bool _allValidators
- )
- public
- view
- returns (uint256)
- {
- uint256 numOfValidators;
- if (_self.dailyRewards.submissions[_rewardsHash].finalized == 1)
- {
- if (_allValidators) {
- numOfValidators = _requiredValidatorsForValidatorsRewards(_self, _rewardsDay);
- if (numOfValidators > _self.dailyRewards.submissions[_rewardsHash].confirmations) return 0;
- } else {
- numOfValidators = _self.dailyRewards.submissions[_rewardsHash].confirmations;
- }
- uint256 rewardsPerValidator = _getValidatorRewardsDailyAmountPerValidator(_self, _rewardsDay, numOfValidators);
- return rewardsPerValidator;
- }
- return 0;
- }
-
- /**
- * @dev The function is called by validators with the calculation of the daily rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _applications address[] array of application addresses getting the daily reward
- * @param _amounts uint256[] array of amounts each app should get
- * @param _currentTotalSupply uint256 current total supply
- */
- function calculateApplicationRewards(
- Data storage _self,
- uint256 _rewardsDay,
- bytes32 _rewardsHash,
- address[] _applications,
- uint256[] _amounts,
- uint256 _currentTotalSupply
- )
- public
- onlyValidRewardsDay(_self, _rewardsDay)
- onlyOneRewardsHashPerValidator(_self, _rewardsHash)
- onlySelectedValidators(_self, _rewardsDay)
- returns (uint256)
- {
- require(
- _rewardsHashIsValid(_rewardsDay, _rewardsHash, _applications, _amounts),
- "Rewards Hash is invalid"
- );
- if (!_self.dailyRewards.submissions[_rewardsHash].isInitializedState) {
- _self.dailyRewards.submissions[_rewardsHash].isInitializedState = true;
- _self.dailyRewards.submittedRewardsHashes.push(_rewardsHash);
- }
- _self.dailyRewards.submissions[_rewardsHash].validators[msg.sender] = true;
- _self.dailyRewards.submissions[_rewardsHash].validatorsList.push(msg.sender);
- _self.dailyRewards.submissions[_rewardsHash].confirmations++;
-
- if (_self.dailyRewards.submissions[_rewardsHash].confirmations == _requiredValidatorsForAppRewards(_self, _rewardsDay)) {
- uint256 sum = _validateSubmittedData(_self, _applications, _amounts);
- require(
- sum <= _getMaxAppRewardsDailyAmount(_self, _rewardsDay, _currentTotalSupply),
- "Rewards data is invalid - exceed daily variation"
- );
- _finalizeDailyApplicationRewards(_self, _rewardsDay, _rewardsHash, _currentTotalSupply);
- return sum;
- }
- return 0;
- }
-
- /**
- * @dev Finalizes the state, rewards Hash, total supply and block timestamp for the day
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 the daily rewards hash
- * @param _currentTotalSupply uint256 the current total supply
- */
- function _finalizeDailyApplicationRewards(Data storage _self, uint256 _rewardsDay, bytes32 _rewardsHash, uint256 _currentTotalSupply)
- public
- returns (bool)
- {
- _self.dailyRewards.totalSupply = _currentTotalSupply;
- _self.dailyRewards.lastConfirmedRewardsHash = _rewardsHash;
- _self.dailyRewards.lastRewardsDay = _rewardsDay;
- _self.dailyRewards.submissions[_rewardsHash].finalized = 1;
- return true;
- }
-
- /**
- * @dev Get parameter's value
- * @param _self Data pointer to storage
- * @param _name ParameterName name of the parameter
- * @param _rewardsDay uint256 the rewards day
- */
- function getParameterValue(
- Data storage _self,
- ParameterName _name,
- uint256 _rewardsDay
- )
- public
- view
- returns (uint256)
- {
- if (_rewardsDay >= _self.parameters[uint256(_name)].rewardsDay) {
- return _self.parameters[uint256(_name)].currentValue;
- } else {
- return _self.parameters[uint256(_name)].previousValue;
- }
- }
-
- /**
- * @dev Allows the controller/owner to update rewards parameters
- * @param _self Data pointer to storage
- * @param _name ParameterName name of the parameter
- * @param _value uint256 new value for the parameter
- * @param _rewardsDay uint256 the rewards day
- */
- function updateParameter(
- Data storage _self,
- ParameterName _name,
- uint256 _value,
- uint256 _rewardsDay
- )
- public
- onlyValidFutureRewardsDay(_self, _rewardsDay)
- returns (bool)
- {
- if (_rewardsDay <= _self.parameters[uint256(_name)].rewardsDay) {
- _self.parameters[uint256(_name)].currentValue = _value;
- _self.parameters[uint256(_name)].rewardsDay = _rewardsDay;
- } else {
- _self.parameters[uint256(_name)].previousValue = _self.parameters[uint256(_name)].currentValue;
- _self.parameters[uint256(_name)].currentValue = _value;
- _self.parameters[uint256(_name)].rewardsDay = _rewardsDay;
- }
- return true;
- }
-
- /**
- * @dev Allows an application to add/update its details
- * @param _self Data pointer to storage
- * @param _entityType RewardedEntityType either application (0) or validator (1)
- * @param _name bytes32 name of the app
- * @param _rewardsAddress address an address for the app to receive the rewards
- * @param _sidechainAddress address the address used for using the sidechain
- */
- function updateEntity(
- Data storage _self,
- RewardedEntityType _entityType,
- bytes32 _name,
- address _rewardsAddress,
- address _sidechainAddress
- )
- public
- onlyValidAddresses(_rewardsAddress, _sidechainAddress)
- returns (bool)
- {
- if (_entityType == RewardedEntityType.Application) {
- updateApplication(_self, _name, _rewardsAddress, _sidechainAddress);
- } else {
- updateValidator(_self, _name, _rewardsAddress, _sidechainAddress);
- }
- return true;
- }
-
- /**
- * @dev Allows an application to add/update its details
- * @param _self Data pointer to storage
- * @param _name bytes32 name of the app
- * @param _rewardsAddress address an address for the app to receive the rewards
- * @param _sidechainAddress address the address used for using the sidechain
- */
- function updateApplication(
- Data storage _self,
- bytes32 _name,
- address _rewardsAddress,
- address _sidechainAddress
- )
- public
- returns (uint256)
- {
- _self.applications[msg.sender].name = _name;
- _self.applications[msg.sender].rewardsAddress = _rewardsAddress;
- _self.applications[msg.sender].sidechainAddress = _sidechainAddress;
- if (!_self.applications[msg.sender].isInitializedState) {
- _self.applicationsList.push(msg.sender);
- _self.applications[msg.sender].isInitializedState = true;
- _self.applications[msg.sender].entityType = RewardedEntityType.Application;
- }
- return uint256(RewardedEntityType.Application);
- }
-
- /**
- * @dev Allows a validator to add/update its details
- * @param _self Data pointer to storage
- * @param _name bytes32 name of the validator
- * @param _rewardsAddress address an address for the validator to receive the rewards
- * @param _sidechainAddress address the address used for using the sidechain
- */
- function updateValidator(
- Data storage _self,
- bytes32 _name,
- address _rewardsAddress,
- address _sidechainAddress
- )
- public
- returns (uint256)
- {
- _self.validators[msg.sender].name = _name;
- _self.validators[msg.sender].rewardsAddress = _rewardsAddress;
- _self.validators[msg.sender].sidechainAddress = _sidechainAddress;
- if (!_self.validators[msg.sender].isInitializedState) {
- _self.validatorsList.push(msg.sender);
- _self.validators[msg.sender].isInitializedState = true;
- _self.validators[msg.sender].entityType = RewardedEntityType.Validator;
- }
- return uint256(RewardedEntityType.Validator);
- }
-
- /**
- * @dev Set new validators list
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day from which the list should be active
- * @param _validators address[] array of validators
- */
- function setValidators(
- Data storage _self,
- uint256 _rewardsDay,
- address[] _validators
- )
- public
- onlyValidFutureRewardsDay(_self, _rewardsDay)
- onlyExistingValidators(_self, _validators)
- returns (bool)
- {
- // no need to update the previous if its' the first time or second update in the same day
- if (_rewardsDay > _self.selectedValidators.rewardsDay && _self.selectedValidators.currentList.length > 0)
- _updatePreviousEntityList(_self.selectedValidators);
-
- _updateCurrentEntityList(_self.selectedValidators, _validators);
- _self.selectedValidators.rewardsDay = _rewardsDay;
- return true;
- }
-
- /**
- * @dev Set new applications list
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day from which the list should be active
- * @param _applications address[] array of applications
- */
- function setApplications(
- Data storage _self,
- uint256 _rewardsDay,
- address[] _applications
- )
- public
- onlyValidFutureRewardsDay(_self, _rewardsDay)
- onlyExistingApplications(_self, _applications)
- returns (bool)
- {
-
- if (_rewardsDay > _self.selectedApplications.rewardsDay && _self.selectedApplications.currentList.length > 0)
- _updatePreviousEntityList(_self.selectedApplications);
- _updateCurrentEntityList(_self.selectedApplications, _applications);
- _self.selectedApplications.rewardsDay = _rewardsDay;
- return true;
- }
-
- /**
- * @dev Get applications or validators list
- * @param _self Data pointer to storage
- * @param _entityType RewardedEntityType either application (0) or validator (1)
- * @param _rewardsDay uint256 the rewards day to determine which list to get
- */
- function getEntities(
- Data storage _self,
- RewardedEntityType _entityType,
- uint256 _rewardsDay
- )
- public
- view
- returns (address[])
- {
- if (_entityType == RewardedEntityType.Application) {
- if (_getSelectedRewardedEntityListType(_self.selectedApplications, _rewardsDay) == 0) {
- return _self.selectedApplications.currentList;
- } else {
- return _self.selectedApplications.previousList;
- }
- } else {
- if (_getSelectedRewardedEntityListType(_self.selectedValidators, _rewardsDay) == 0) {
- return _self.selectedValidators.currentList;
- } else {
- return _self.selectedValidators.previousList;
- }
- }
- }
-
- /**
- * @dev Get which entity list to use. Current = 0, previous = 1
- * @param _rewardedEntitylist RewardedEntityList pointer to storage
- * @param _rewardsDay uint256 the rewards day to determine which list to get
- */
- function _getSelectedRewardedEntityListType(RewardedEntityList _rewardedEntitylist, uint256 _rewardsDay)
- internal
- pure
- returns (uint256)
- {
- if (_rewardsDay >= _rewardedEntitylist.rewardsDay) {
- return 0;
- } else {
- return 1;
- }
- }
-
- /**
- * @dev Checks how many validators are needed for app rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- * @param _currentTotalSupply uint256 current total supply
- */
- function _getMaxAppRewardsDailyAmount(
- Data storage _self,
- uint256 _rewardsDay,
- uint256 _currentTotalSupply
- )
- public
- view
- returns (uint256)
- {
- return ((_self.maxTotalSupply.sub(_currentTotalSupply)).mul(
- getParameterValue(_self, ParameterName.ApplicationRewardsPercent, _rewardsDay)).mul(
- getParameterValue(_self, ParameterName.ApplicationRewardsMaxVariationPercent, _rewardsDay))).div(1e16);
- }
-
-
- /**
- * @dev Checks how many validators are needed for app rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- * @param _numOfValidators uint256 number of validators
- */
- function _getValidatorRewardsDailyAmountPerValidator(
- Data storage _self,
- uint256 _rewardsDay,
- uint256 _numOfValidators
- )
- public
- view
- returns (uint256)
- {
- return (((_self.maxTotalSupply.sub(_self.dailyRewards.totalSupply)).mul(
- getParameterValue(_self, ParameterName.ValidatorRewardsPercent, _rewardsDay))).div(1e8)).div(_numOfValidators);
- }
-
- /**
- * @dev Checks if app daily rewards amount is valid
- * @param _self Data pointer to storage
- * @param _applications address[] array of application addresses getting the daily rewards
- * @param _amounts uint256[] array of amounts each app should get
- */
- function _validateSubmittedData(
- Data storage _self,
- address[] _applications,
- uint256[] _amounts
- )
- public
- view
- returns (uint256)
- {
- uint256 sum;
- bool valid = true;
- for (uint256 i = 0; i < _amounts.length; i++) {
- sum = sum.add(_amounts[i]);
- if (!_self.applications[_applications[i]].isInitializedState) valid = false;
- }
- require(
- sum > 0 && valid,
- "Sum zero or none existing app submitted"
- );
- return sum;
- }
-
- /**
- * @dev Checks if submitted data matches rewards hash
- * @param _rewardsDay uint256 the rewards day
- * @param _rewardsHash bytes32 hash of the rewards data
- * @param _applications address[] array of application addresses getting the daily rewards
- * @param _amounts uint256[] array of amounts each app should get
- */
- function _rewardsHashIsValid(
- uint256 _rewardsDay,
- bytes32 _rewardsHash,
- address[] _applications,
- uint256[] _amounts
- )
- public
- pure
- returns (bool)
- {
- return
- _applications.length > 0 &&
- _applications.length == _amounts.length &&
- keccak256(abi.encodePacked(_rewardsDay, _applications.length, _amounts.length, _applications, _amounts)) == _rewardsHash;
- }
-
- /**
- * @dev Checks how many validators are needed for app rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- */
- function _requiredValidatorsForValidatorsRewards(Data storage _self, uint256 _rewardsDay)
- public
- view
- returns (uint256)
- {
- if (_getSelectedRewardedEntityListType(_self.selectedValidators, _rewardsDay) == 0) {
- return _self.selectedValidators.currentList.length;
- } else {
- return _self.selectedValidators.previousList.length;
- }
- }
-
- /**
- * @dev Checks how many validators are needed for app rewards
- * @param _self Data pointer to storage
- * @param _rewardsDay uint256 the rewards day
- */
- function _requiredValidatorsForAppRewards(Data storage _self, uint256 _rewardsDay)
- public
- view
- returns (uint256)
- {
- if (_getSelectedRewardedEntityListType(_self.selectedValidators, _rewardsDay) == 0) {
- return ((_self.selectedValidators.currentList.length.mul(getParameterValue(_self, ParameterName.ValidatorMajorityPercent, _rewardsDay))).div(1e8)).add(1);
- } else {
- return ((_self.selectedValidators.previousList.length.mul(getParameterValue(_self, ParameterName.ValidatorMajorityPercent, _rewardsDay))).div(1e8)).add(1);
- }
- }
-
- /**
- * @dev Get rewards day from block.timestamp
- * @param _self Data pointer to storage
- */
- function _currentRewardsDay(Data storage _self)
- public
- view
- returns (uint256)
- {
- //the the start time - floor timestamp to previous midnight divided by seconds in a day will give the rewards day number
- if (_self.minSecondsBetweenDays > 0) {
- return (block.timestamp.sub(_self.rewardsStartTimestamp)).div(_self.minSecondsBetweenDays).add(1);
- } else {
- return 0;
- }
- }
-
- /**
- * @dev Update current daily applications list.
- * If new, push.
- * If same size, replace
- * If different size, delete, and then push.
- * @param _rewardedEntitylist RewardedEntityList pointer to storage
- * @param _entities address[] array of entities
- */
- //_updateCurrentEntityList(_rewardedEntitylist, _entities,_rewardedEntityType),
- function _updateCurrentEntityList(
- RewardedEntityList storage _rewardedEntitylist,
- address[] _entities
- )
- internal
- returns (bool)
- {
- bool emptyCurrentList = _rewardedEntitylist.currentList.length == 0;
- if (!emptyCurrentList && _rewardedEntitylist.currentList.length != _entities.length) {
- _deleteCurrentEntityList(_rewardedEntitylist);
- emptyCurrentList = true;
- }
-
- for (uint256 i = 0; i < _entities.length; i++) {
- if (emptyCurrentList) {
- _rewardedEntitylist.currentList.push(_entities[i]);
- } else {
- _rewardedEntitylist.currentList[i] = _entities[i];
- }
- _rewardedEntitylist.current[_entities[i]] = true;
- }
- return true;
- }
-
- /**
- * @dev Update previous daily list
- * @param _rewardedEntitylist RewardedEntityList pointer to storage
- */
- function _updatePreviousEntityList(RewardedEntityList storage _rewardedEntitylist)
- internal
- returns (bool)
- {
- bool emptyPreviousList = _rewardedEntitylist.previousList.length == 0;
- if (
- !emptyPreviousList &&
- _rewardedEntitylist.previousList.length != _rewardedEntitylist.currentList.length
- ) {
- _deletePreviousEntityList(_rewardedEntitylist);
- emptyPreviousList = true;
- }
- for (uint256 i = 0; i < _rewardedEntitylist.currentList.length; i++) {
- Eif (emptyPreviousList) {
- _rewardedEntitylist.previousList.push(_rewardedEntitylist.currentList[i]);
- } else {
- _rewardedEntitylist.previousList[i] = _rewardedEntitylist.currentList[i];
- }
- _rewardedEntitylist.previous[_rewardedEntitylist.currentList[i]] = true;
- }
- return true;
- }
-
- /**
- * @dev Delete existing values from the current list
- * @param _rewardedEntitylist RewardedEntityList pointer to storage
- */
- function _deleteCurrentEntityList(RewardedEntityList storage _rewardedEntitylist)
- internal
- returns (bool)
- {
- for (uint256 i = 0; i < _rewardedEntitylist.currentList.length ; i++) {
- delete _rewardedEntitylist.current[_rewardedEntitylist.currentList[i]];
- }
- delete _rewardedEntitylist.currentList;
- return true;
- }
-
- /**
- * @dev Delete existing values from the previous applications list
- * @param _rewardedEntitylist RewardedEntityList pointer to storage
- */
- function _deletePreviousEntityList(RewardedEntityList storage _rewardedEntitylist)
- internal
- returns (bool)
- {
- for (uint256 i = 0; i < _rewardedEntitylist.previousList.length ; i++) {
- delete _rewardedEntitylist.previous[_rewardedEntitylist.previousList[i]];
- }
- delete _rewardedEntitylist.previousList;
- return true;
- }
-
- /**
- * @dev Deletes rewards day submission data
- * @param _self Data pointer to storage
- */
- function _resetDailyRewards(
- Data storage _self
- )
- public
- returns (bool)
- {
- _self.lastRewardsDay = _self.dailyRewards.lastRewardsDay;
- bytes32[] memory rewardsHashes = _self.dailyRewards.submittedRewardsHashes;
- for (uint256 i = 0; i < rewardsHashes.length; i++) {
- for (uint256 j = 0; j < _self.dailyRewards.submissions[rewardsHashes[i]].validatorsList.length; j++) {
- delete(
- _self.dailyRewards.submissions[rewardsHashes[i]].validators[_self.dailyRewards.submissions[rewardsHashes[i]].validatorsList[j]]
- );
- }
- delete _self.dailyRewards.submissions[rewardsHashes[i]].validatorsList;
- _self.dailyRewards.submissions[rewardsHashes[i]].confirmations = 0;
- _self.dailyRewards.submissions[rewardsHashes[i]].finalized = 0;
- _self.dailyRewards.submissions[rewardsHashes[i]].isInitializedState = false;
- }
- delete _self.dailyRewards.submittedRewardsHashes;
- }
+ uint256 lastValidatorsRewardsDay;
+ }
} |
diff --git a/coverage/token/PropsTimeBasedTransfers.sol.html b/coverage/token/PropsTimeBasedTransfers.sol.html
index d33b1447..e823934e 100644
--- a/coverage/token/PropsTimeBasedTransfers.sol.html
+++ b/coverage/token/PropsTimeBasedTransfers.sol.html
@@ -120,7 +120,11 @@
75
76
77
-78|
+78
+79
+80 |
+
+
@@ -198,7 +202,9 @@
| pragma solidity ^0.4.24;
-
+/*
+ THIS CONTRACT IS OBSOLETE AND REMAINS ONLY FOR UPGRADABILITY/STORAGE CONSIDERATIONS
+*/
import "zos-lib/contracts/Initializable.sol";
import "openzeppelin-eth/contracts/token/ERC20/ERC20.sol";
@@ -280,7 +286,7 @@
diff --git a/coverage/token/PropsToken.sol.html b/coverage/token/PropsToken.sol.html
index a607c3e7..eaaa7438 100644
--- a/coverage/token/PropsToken.sol.html
+++ b/coverage/token/PropsToken.sol.html
@@ -37,7 +37,7 @@
100%
Lines
- 5/5
+ 6/6
@@ -90,13 +90,7 @@
45
46
47
-48
-49
-50
-51
-52
-53
-54 |
+48 |
@@ -134,20 +128,14 @@
+2×
+2×
-
-
-
-
-
-4×
-
-4×
-
-4×
-4×
-4×
+2×
+2×
+2×
+2×
| pragma solidity ^0.4.24;
@@ -181,16 +169,9 @@
/**
* @dev Initializer function. Called only once when a proxy for the contract is created.
* @param _holder address that will receive its initial supply and be able to transfer before transfers start time
- * @param _controller address that will have controller functionality on rewards protocol
- * @param _minSecondsBetweenDays uint256 seconds required to pass between consecutive rewards day
- * @param _rewardsStartTimestamp uint256 day 0 timestamp
+ * @param _controller address that will have controller functionality on rewards protocol
*/
- function initialize(
- address _holder,
- address _controller,
- uint256 _minSecondsBetweenDays,
- uint256 _rewardsStartTimestamp
- )
+ function initialize(address _holder, address _controller)
public
initializer
{
@@ -199,7 +180,8 @@
uint256 totalSupply = 0.6 * 1e9 * (10 ** uint256(decimals));
ERC20Detailed.initialize("Props Token", "PROPS", decimals);
- PropsRewards.initializePostRewardsUpgrade1(_controller, _minSecondsBetweenDays, _rewardsStartTimestamp);
+ PropsRewards.initialize(_controller);
+ PropsRewards.initializePermitUpgrade("Props Token");
_mint(_holder, totalSupply);
}
} |
@@ -208,7 +190,7 @@
diff --git a/coverage/token/index.html b/coverage/token/index.html
index dba99cfa..2e110f79 100644
--- a/coverage/token/index.html
+++ b/coverage/token/index.html
@@ -20,24 +20,24 @@
- 99.57%
+ 100%
Statements
- 234/235
+ 28/28
- 83.33%
+ 66.67%
Branches
- 95/114
+ 12/18
100%
Functions
- 55/55
+ 11/11
- 99.63%
+ 100%
Lines
- 267/268
+ 35/35
@@ -62,13 +62,13 @@
| ERC865Token.sol |
|
100% |
- 61/61 |
- 53.33% |
- 16/30 |
+ 0/0 |
100% |
- 10/10 |
+ 0/0 |
100% |
- 61/61 |
+ 0/0 |
+ 100% |
+ 0/0 |
@@ -88,26 +88,26 @@
| PropsRewards.sol |
|
100% |
- 40/40 |
- 91.67% |
- 11/12 |
+ 25/25 |
+ 66.67% |
+ 12/18 |
100% |
- 13/13 |
+ 10/10 |
100% |
- 50/50 |
+ 29/29 |
| PropsRewardsLib.sol |
- |
- 99.24% |
- 130/131 |
- 94.44% |
- 68/72 |
- 100% |
- 31/31 |
- 99.34% |
- 151/152 |
+ |
+ 100% |
+ 0/0 |
+ 100% |
+ 0/0 |
+ 100% |
+ 0/0 |
+ 100% |
+ 0/0 |
@@ -133,7 +133,7 @@
| 100% |
1/1 |
100% |
- 5/5 |
+ 6/6 |
@@ -142,7 +142,7 @@
diff --git a/package-lock.json b/package-lock.json
index 6e38105b..dc98fcf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,416 @@
}
}
},
+ "@ethersproject/abi": {
+ "version": "5.0.13",
+ "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.13.tgz",
+ "integrity": "sha512-2coOH3D7ra1lwamKEH0HVc+Jbcsw5yfeCgmY8ekhCDualEiyyovD2qDcMBBcY3+kjoLHVTmo7ost6MNClxdOrg==",
+ "requires": {
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/hash": "^5.0.10",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8"
+ }
+ },
+ "@ethersproject/abstract-provider": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.0.10.tgz",
+ "integrity": "sha512-OSReY5iz94iIaPlRvLiJP8YVIvQLx4aUvMMnHWSaA/vTU8QHZmgNlt4OBdYV1+aFY8Xl+VRYiWBHq72ZDKXXCQ==",
+ "requires": {
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/networks": "^5.0.7",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/transactions": "^5.0.9",
+ "@ethersproject/web": "^5.0.12"
+ }
+ },
+ "@ethersproject/abstract-signer": {
+ "version": "5.0.14",
+ "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.14.tgz",
+ "integrity": "sha512-JztBwVO7o5OHLh2vyjordlS4/1EjRyaECtc8vPdXTF1i4dXN+J0coeRoPN6ZFbBvi/YbaB6br2fvqhst1VQD/g==",
+ "requires": {
+ "@ethersproject/abstract-provider": "^5.0.8",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7"
+ }
+ },
+ "@ethersproject/address": {
+ "version": "5.0.11",
+ "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.0.11.tgz",
+ "integrity": "sha512-Et4GBdD8/tsBGjCEOKee9upN29qjL5kbRcmJifb4Penmiuh9GARXL2/xpXvEp5EW+EIW/rfCHFJrkYBgoQFQBw==",
+ "requires": {
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/rlp": "^5.0.7"
+ }
+ },
+ "@ethersproject/base64": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.9.tgz",
+ "integrity": "sha512-37RBz5LEZ9SlTNGiWCYFttnIN9J7qVs9Xo2EbqGqDH5LfW9EIji66S+YDMpXVo1zWDax1FkEldAoatxHK2gfgA==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9"
+ }
+ },
+ "@ethersproject/basex": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.0.9.tgz",
+ "integrity": "sha512-FANswl1IN3PS0eltQxH2aM2+utPrkLUVG4XVFi6SafRG9EpAqXCgycxC8PU90mPGhigYTpg9cnTB5mCZ6ejQjw==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/properties": "^5.0.7"
+ }
+ },
+ "@ethersproject/bignumber": {
+ "version": "5.0.15",
+ "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.15.tgz",
+ "integrity": "sha512-MTADqnyacvdRwtKh7o9ujwNDSM1SDJjYDMYAzjIgjoi9rh6TY4suMbhCa3i2vh3SUXiXSICyTI8ui+NPdrZ9Lw==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "bn.js": "^4.4.0"
+ }
+ },
+ "@ethersproject/bytes": {
+ "version": "5.0.11",
+ "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.0.11.tgz",
+ "integrity": "sha512-D51plLYY5qF05AsoVQwIZVLqlBkaTPVHVP/1WmmBIWyHB0cRW0C9kh0kx5Exo51rB63Hk8PfHxc7SmpoaQFEyg==",
+ "requires": {
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/constants": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.0.10.tgz",
+ "integrity": "sha512-OSo8jxkHLDXieCy8bgOFR7lMfgPxEzKvSDdP+WAWHCDM8+orwch0B6wzkTmiQFgryAtIctrBt5glAdJikZ3hGw==",
+ "requires": {
+ "@ethersproject/bignumber": "^5.0.13"
+ }
+ },
+ "@ethersproject/contracts": {
+ "version": "5.0.12",
+ "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.12.tgz",
+ "integrity": "sha512-srijy31idjz8bE+gL1I6IRj2H4I9dUwfQ+QroLrIgNdGArqY8y2iFUKa3QTy+JBX26fJsdYiCQi1kKkaNpnMpQ==",
+ "requires": {
+ "@ethersproject/abi": "^5.0.10",
+ "@ethersproject/abstract-provider": "^5.0.8",
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7"
+ }
+ },
+ "@ethersproject/hash": {
+ "version": "5.0.12",
+ "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.0.12.tgz",
+ "integrity": "sha512-kn4QN+fhNFbUgX3XZTZUaQixi0oyfIEY+hfW+KtkHu+rq7dV76oAIvaLEEynu1/4npOL38E4X4YI42gGZk+C0Q==",
+ "requires": {
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8"
+ }
+ },
+ "@ethersproject/hdnode": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.10.tgz",
+ "integrity": "sha512-ZLwMtIcXK7xz2lSITDCl40W04CtRq4K9NwBxhCzdzPdaz6XnoJMwGz2YMVLg+8ksseq+RYtTwIIXtlK6vyvQyg==",
+ "requires": {
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/basex": "^5.0.7",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/pbkdf2": "^5.0.7",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/sha2": "^5.0.7",
+ "@ethersproject/signing-key": "^5.0.8",
+ "@ethersproject/strings": "^5.0.8",
+ "@ethersproject/transactions": "^5.0.9",
+ "@ethersproject/wordlists": "^5.0.8"
+ }
+ },
+ "@ethersproject/json-wallets": {
+ "version": "5.0.12",
+ "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.12.tgz",
+ "integrity": "sha512-nac553zGZnOewpjlqbfy7WBl8m3y7qudzRsI2dCxrediYtPIVIs9f6Pbnou8vDmmp8X4/U4W788d+Ma88o+Gbg==",
+ "requires": {
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/hdnode": "^5.0.8",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/pbkdf2": "^5.0.7",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/random": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8",
+ "@ethersproject/transactions": "^5.0.9",
+ "aes-js": "3.0.0",
+ "scrypt-js": "3.0.1"
+ }
+ },
+ "@ethersproject/keccak256": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.0.9.tgz",
+ "integrity": "sha512-zhdUTj6RGtCJSgU+bDrWF6cGbvW453LoIC1DSNWrTlXzC7WuH4a+EiPrgc7/kNoRxerKuA/cxYlI8GwNtVtDlw==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "js-sha3": "0.5.7"
+ },
+ "dependencies": {
+ "js-sha3": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+ "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
+ }
+ }
+ },
+ "@ethersproject/logger": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.10.tgz",
+ "integrity": "sha512-0y2T2NqykDrbPM3Zw9RSbPkDOxwChAL8detXaom76CfYoGxsOnRP/zTX8OUAV+x9LdwzgbWvWmeXrc0M7SuDZw=="
+ },
+ "@ethersproject/networks": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.0.9.tgz",
+ "integrity": "sha512-L8+VCQwArBLGkxZb/5Ns/OH/OxP38AcaveXIxhUTq+VWpXYjrObG3E7RDQIKkUx1S1IcQl/UWTz5w4DK0UitJg==",
+ "requires": {
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/pbkdf2": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.0.9.tgz",
+ "integrity": "sha512-ItE/wQ/WVw/ajEHPUVgfu0aEvksPgOQc+278bke8sGKnGO3ppjmqp0MHh17tHc1EBTzJbSms5aLIqc56qZ/oiA==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/sha2": "^5.0.7"
+ }
+ },
+ "@ethersproject/properties": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.9.tgz",
+ "integrity": "sha512-ZCjzbHYTw+rF1Pn8FDCEmx3gQttwIHcm/6Xee8g/M3Ga3SfW4tccNMbs5zqnBH0E4RoOPaeNgyg1O68TaF0tlg==",
+ "requires": {
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/providers": {
+ "version": "5.0.24",
+ "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.24.tgz",
+ "integrity": "sha512-M4Iw1r4gGJkt7ZUa++iREuviKL/DIpmIMsaUlVlXtV+ZrUXeN8xQ3zOTrbz7R4h9W9oljBZM7i4D3Kn1krJ30A==",
+ "requires": {
+ "@ethersproject/abstract-provider": "^5.0.8",
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/basex": "^5.0.7",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/hash": "^5.0.10",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/networks": "^5.0.7",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/random": "^5.0.7",
+ "@ethersproject/rlp": "^5.0.7",
+ "@ethersproject/sha2": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8",
+ "@ethersproject/transactions": "^5.0.9",
+ "@ethersproject/web": "^5.0.12",
+ "bech32": "1.1.4",
+ "ws": "7.2.3"
+ },
+ "dependencies": {
+ "ws": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
+ "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="
+ }
+ }
+ },
+ "@ethersproject/random": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.0.9.tgz",
+ "integrity": "sha512-DANG8THsKqFbJOantrxumtG6gyETNE54VfbsWa+SQAT8WKpDo9W/X5Zhh73KuhClaey1UI32uVmISZeq/Zxn1A==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/rlp": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.0.9.tgz",
+ "integrity": "sha512-ns1U7ZMVeruUW6JXc4om+1w3w4ynHN/0fpwmeNTsAjwGKoF8SAUgue6ylKpHKWSti2idx7jDxbn8hNNFHk67CA==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/sha2": {
+ "version": "5.0.9",
+ "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.0.9.tgz",
+ "integrity": "sha512-5FH4s47gM7N1fFAYQ1+m7aX0SbLg0Xr+6tvqndmNqc382/qBIbzXiGlUookrsjlPb6gLNurnTssCXjNM72J6lQ==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "hash.js": "1.1.3"
+ }
+ },
+ "@ethersproject/signing-key": {
+ "version": "5.0.11",
+ "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.11.tgz",
+ "integrity": "sha512-Jfcru/BGwdkXhLxT+8WCZtFy7LL0TPFZw05FAb5asxB/MyVsEfNdNxGDtjVE9zXfmRSPe/EusXYY4K7wcygOyQ==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "elliptic": "6.5.4"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+ },
+ "elliptic": {
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+ "requires": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+ }
+ }
+ },
+ "@ethersproject/solidity": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.0.10.tgz",
+ "integrity": "sha512-8OG3HLqynWXDA6mVIHuHfF/ojTTwBahON7hc9GAKCqglzXCkVA3OpyxOJXPzjHClRIAUUiU7r9oy9Z/nsjtT/g==",
+ "requires": {
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/sha2": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8"
+ }
+ },
+ "@ethersproject/strings": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.0.10.tgz",
+ "integrity": "sha512-KAeoS1tZ9/5ECXiIZA6S6hywbD0so2VmuW+Wfyo5EDXeyZ6Na1nxTPhTnW7voQmjbeYJffCrOc0qLFJeylyg7w==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/transactions": {
+ "version": "5.0.11",
+ "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.11.tgz",
+ "integrity": "sha512-ftsRvR9+gQp7L63F6+XmstvsZ4w8GtWvQB08e/zB+oB86Fnhq8+i/tkgpJplSHC8I/qgiCisva+M3u2GVhDFPA==",
+ "requires": {
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/rlp": "^5.0.7",
+ "@ethersproject/signing-key": "^5.0.8"
+ }
+ },
+ "@ethersproject/units": {
+ "version": "5.0.11",
+ "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.0.11.tgz",
+ "integrity": "sha512-nOSPmcCWyB/dwoBRhhTtPGCsTbiXqmc7Q0Adwvafc432AC7hy3Fj3IFZtnSXsbtJ/GdHCIUIoA8gtvxSsFuBJg==",
+ "requires": {
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/constants": "^5.0.8",
+ "@ethersproject/logger": "^5.0.8"
+ }
+ },
+ "@ethersproject/wallet": {
+ "version": "5.0.12",
+ "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.12.tgz",
+ "integrity": "sha512-rboJebGf47/KPZrKZQdYg9BAYuXbc/OwcUyML1K1f2jnJeo1ObWV11U1PAWTjTbhhSy6/Fg+34GO2yMb5Dt1Rw==",
+ "requires": {
+ "@ethersproject/abstract-provider": "^5.0.8",
+ "@ethersproject/abstract-signer": "^5.0.10",
+ "@ethersproject/address": "^5.0.9",
+ "@ethersproject/bignumber": "^5.0.13",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/hash": "^5.0.10",
+ "@ethersproject/hdnode": "^5.0.8",
+ "@ethersproject/json-wallets": "^5.0.10",
+ "@ethersproject/keccak256": "^5.0.7",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/random": "^5.0.7",
+ "@ethersproject/signing-key": "^5.0.8",
+ "@ethersproject/transactions": "^5.0.9",
+ "@ethersproject/wordlists": "^5.0.8"
+ }
+ },
+ "@ethersproject/web": {
+ "version": "5.0.14",
+ "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.14.tgz",
+ "integrity": "sha512-QpTgplslwZ0Sp9oKNLoRuS6TKxnkwfaEk3gr7zd7XLF8XBsYejsrQO/03fNfnMx/TAT/RR6WEw/mbOwpRSeVRA==",
+ "requires": {
+ "@ethersproject/base64": "^5.0.7",
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8"
+ }
+ },
+ "@ethersproject/wordlists": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.0.10.tgz",
+ "integrity": "sha512-jWsEm1iJzpg9SCXnNfFz+tcp4Ofzv0TJb6mj+soCNcar9GcT0yGz62ZsHC3pLQWaF4LkCzGwRJHJTXKjHQfG1A==",
+ "requires": {
+ "@ethersproject/bytes": "^5.0.9",
+ "@ethersproject/hash": "^5.0.10",
+ "@ethersproject/logger": "^5.0.8",
+ "@ethersproject/properties": "^5.0.7",
+ "@ethersproject/strings": "^5.0.8"
+ }
+ },
"@resolver-engine/core": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/@resolver-engine/core/-/core-0.2.1.tgz",
@@ -151,6 +561,22 @@
"@types/node": "*"
}
},
+ "@types/pbkdf2": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
+ "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
+ "requires": {
+ "@types/node": "*"
+ }
+ },
+ "@types/secp256k1": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.1.tgz",
+ "integrity": "sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog==",
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@types/semver": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
@@ -1135,6 +1561,11 @@
"tweetnacl": "^0.14.3"
}
},
+ "bech32": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+ "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+ },
"bignumber.js": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz",
@@ -1197,6 +1628,11 @@
}
}
},
+ "blakejs": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
+ "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U="
+ },
"block-stream": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -3341,12 +3777,210 @@
"resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
"integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8="
},
+ "ethereum-cryptography": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz",
+ "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
+ "requires": {
+ "@types/pbkdf2": "^3.0.0",
+ "@types/secp256k1": "^4.0.1",
+ "blakejs": "^1.1.0",
+ "browserify-aes": "^1.2.0",
+ "bs58check": "^2.1.2",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "hash.js": "^1.1.7",
+ "keccak": "^3.0.0",
+ "pbkdf2": "^3.0.17",
+ "randombytes": "^2.1.0",
+ "safe-buffer": "^5.1.2",
+ "scrypt-js": "^3.0.0",
+ "secp256k1": "^4.0.1",
+ "setimmediate": "^1.0.5"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+ },
+ "browserify-aes": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+ "requires": {
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "create-hash": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+ "requires": {
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
+ }
+ },
+ "create-hmac": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+ "requires": {
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
+ "elliptic": {
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+ "requires": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ }
+ }
+ },
+ "hash.js": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.1"
+ }
+ },
+ "keccak": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
+ "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
+ "requires": {
+ "node-addon-api": "^2.0.0",
+ "node-gyp-build": "^4.2.0"
+ }
+ },
+ "minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+ },
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "requires": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ },
+ "secp256k1": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz",
+ "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==",
+ "requires": {
+ "elliptic": "^6.5.2",
+ "node-addon-api": "^2.0.0",
+ "node-gyp-build": "^4.2.0"
+ }
+ }
+ }
+ },
"ethereumjs-abi": {
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
- "bn.js": "^4.10.0",
- "ethereumjs-util": "^5.0.0"
+ "bn.js": "^4.11.8",
+ "ethereumjs-util": "^6.0.0"
+ },
+ "dependencies": {
+ "elliptic": {
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+ "requires": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+ }
+ }
+ },
+ "ethereumjs-util": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+ "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+ "requires": {
+ "@types/bn.js": "^4.11.3",
+ "bn.js": "^4.11.0",
+ "create-hash": "^1.1.2",
+ "elliptic": "^6.5.2",
+ "ethereum-cryptography": "^0.1.3",
+ "ethjs-util": "0.1.6",
+ "rlp": "^2.2.3"
+ }
+ },
+ "ethjs-util": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+ "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+ "requires": {
+ "is-hex-prefixed": "1.0.0",
+ "strip-hex-prefix": "1.0.0"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+ },
+ "rlp": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.6.tgz",
+ "integrity": "sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==",
+ "requires": {
+ "bn.js": "^4.11.1"
+ }
+ }
}
},
"ethereumjs-account": {
@@ -3559,48 +4193,40 @@
}
},
"ethers": {
- "version": "4.0.0-beta.1",
- "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.1.tgz",
- "integrity": "sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw==",
- "requires": {
- "@types/node": "^10.3.2",
- "aes-js": "3.0.0",
- "bn.js": "^4.4.0",
- "elliptic": "6.3.3",
- "hash.js": "1.1.3",
- "js-sha3": "0.5.7",
- "scrypt-js": "2.0.3",
- "setimmediate": "1.0.4",
- "uuid": "2.0.1",
- "xmlhttprequest": "1.8.0"
- },
- "dependencies": {
- "elliptic": {
- "version": "6.3.3",
- "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz",
- "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=",
- "requires": {
- "bn.js": "^4.4.0",
- "brorand": "^1.0.1",
- "hash.js": "^1.0.0",
- "inherits": "^2.0.1"
- }
- },
- "js-sha3": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
- "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
- },
- "setimmediate": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
- "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48="
- },
- "uuid": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
- "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
- }
+ "version": "5.0.32",
+ "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.0.32.tgz",
+ "integrity": "sha512-rORfGWR0HsA4pjKMMcWZorw12DHsXqfIAuPVHJsXt+vI24jvXcVqx+rLsSvgOoLdaCMdxiN5qlIq2+4axKG31g==",
+ "requires": {
+ "@ethersproject/abi": "5.0.13",
+ "@ethersproject/abstract-provider": "5.0.10",
+ "@ethersproject/abstract-signer": "5.0.14",
+ "@ethersproject/address": "5.0.11",
+ "@ethersproject/base64": "5.0.9",
+ "@ethersproject/basex": "5.0.9",
+ "@ethersproject/bignumber": "5.0.15",
+ "@ethersproject/bytes": "5.0.11",
+ "@ethersproject/constants": "5.0.10",
+ "@ethersproject/contracts": "5.0.12",
+ "@ethersproject/hash": "5.0.12",
+ "@ethersproject/hdnode": "5.0.10",
+ "@ethersproject/json-wallets": "5.0.12",
+ "@ethersproject/keccak256": "5.0.9",
+ "@ethersproject/logger": "5.0.10",
+ "@ethersproject/networks": "5.0.9",
+ "@ethersproject/pbkdf2": "5.0.9",
+ "@ethersproject/properties": "5.0.9",
+ "@ethersproject/providers": "5.0.24",
+ "@ethersproject/random": "5.0.9",
+ "@ethersproject/rlp": "5.0.9",
+ "@ethersproject/sha2": "5.0.9",
+ "@ethersproject/signing-key": "5.0.11",
+ "@ethersproject/solidity": "5.0.10",
+ "@ethersproject/strings": "5.0.10",
+ "@ethersproject/transactions": "5.0.11",
+ "@ethersproject/units": "5.0.11",
+ "@ethersproject/wallet": "5.0.12",
+ "@ethersproject/web": "5.0.14",
+ "@ethersproject/wordlists": "5.0.10"
}
},
"ethjs-abi": {
@@ -7069,11 +7695,21 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
+ "node-addon-api": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
+ "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
+ },
"node-fetch": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
"integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U="
},
+ "node-gyp-build": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
+ "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="
+ },
"nodemon": {
"version": "1.14.11",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz",
@@ -8147,9 +8783,9 @@
}
},
"scrypt-js": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz",
- "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q="
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
+ "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA=="
},
"scrypt.js": {
"version": "0.2.0",
@@ -10737,10 +11373,58 @@
"web3-utils": "1.0.0-beta.37"
},
"dependencies": {
+ "elliptic": {
+ "version": "6.3.3",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz",
+ "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=",
+ "requires": {
+ "bn.js": "^4.4.0",
+ "brorand": "^1.0.1",
+ "hash.js": "^1.0.0",
+ "inherits": "^2.0.1"
+ }
+ },
+ "ethers": {
+ "version": "4.0.0-beta.1",
+ "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.1.tgz",
+ "integrity": "sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw==",
+ "requires": {
+ "@types/node": "^10.3.2",
+ "aes-js": "3.0.0",
+ "bn.js": "^4.4.0",
+ "elliptic": "6.3.3",
+ "hash.js": "1.1.3",
+ "js-sha3": "0.5.7",
+ "scrypt-js": "2.0.3",
+ "setimmediate": "1.0.4",
+ "uuid": "2.0.1",
+ "xmlhttprequest": "1.8.0"
+ }
+ },
+ "js-sha3": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
+ "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
+ },
+ "scrypt-js": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz",
+ "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q="
+ },
+ "setimmediate": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+ "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48="
+ },
"underscore": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+ },
+ "uuid": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+ "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
}
}
},
diff --git a/package.json b/package.json
index 25f8019a..93fa08ab 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,7 @@
"tdd": "nodemon --watch contracts --watch test --exec 'truffle test --network test'",
"ganache-cli": "ganache-cli -a 50 -p 8545 -m \"asset member awake bring mosquito lab sustain muscle elephant equip someone obvious\" > /dev/null &",
"compile": "truffle compile",
- "test": "NODE_ENV=test truffle test ./test/*.test.js --network test --exit",
- "testrewards": "NODE_ENV=test truffle test ./test/propstoken-0-rewards.test.js --network test --exit",
+ "test": "NODE_ENV=test truffle test ./test/*.test.js --network test --exit",
"coverage": "./node_modules/.bin/solidity-coverage",
"postinstall": "cp pending-contracts/openzeppelin-eth-modified/ERC20.sol node_modules/openzeppelin-eth/contracts/token/ERC20/ERC20.sol"
},
@@ -16,6 +15,7 @@
"bignumber.js": "^8.0.2",
"child_process": "^1.0.2",
"ethereumjs-util": "^5.1.3",
+ "ethers": "^5.0.10",
"fast-csv": "^2.4.1",
"html-to-text": "^4.0.0",
"mongodb": "^2.2.33",
diff --git a/scripts/distribution/0_deploy_token.js b/scripts/distribution/0_deploy_token.js
index 6c8ecfa5..3f9b7163 100644
--- a/scripts/distribution/0_deploy_token.js
+++ b/scripts/distribution/0_deploy_token.js
@@ -5,9 +5,7 @@ const Web3 = require('web3');
const connectionConfig = require('../../truffle');
const networkProvider = process.argv[2];
-const transferStartTime = process.argv[3];
-const minSecondsBetweenDailySubmissions = process.argv[4];
-const rewardsStartTimestamp = process.argv[5];
+const minterAddress = process.argv[3];
let networkInUse;
let addressInUse;
let cmd;
@@ -17,18 +15,8 @@ if (typeof (networkProvider) === 'undefined') {
process.exit(0);
}
-if (typeof (transferStartTime) === 'undefined') {
- console.log('Must supply transfer start time');
- process.exit(0);
-}
-
-if (typeof (minSecondsBetweenDailySubmissions) === 'undefined') {
- console.log('Must supply minSecondsBetweenDailySubmissions');
- process.exit(0);
-}
-
-if (typeof (rewardsStartTimestamp) === 'undefined') {
- console.log('Must supply rewardsStartTimestamp');
+if (typeof (minterAddress) === 'undefined') {
+ console.log('Must supply minterAddress');
process.exit(0);
}
@@ -75,7 +63,7 @@ async function main() {
addressPropsHolder = connectionConfig.networks[`${networkProvider}2`].wallet_address;
}
- cmd = `zos create PropsToken -v --init initialize --args ${addressPropsHolder},${addressPropsHolder},${minSecondsBetweenDailySubmissions},${rewardsStartTimestamp} --network ${networkInUse} --from ${addressInUse}`;
+ cmd = `zos create PropsToken -v --init initialize --args ${addressPropsHolder},${addressPropsHolder},${minterAddress} --network ${networkInUse} --from ${addressInUse}`;
try {
console.log(`Executing ${cmd}`);
const cmdOutput = execSync(cmd).toString();
diff --git a/scripts/setup/0_set_validators.js b/scripts/setup/0_set_validators.js
deleted file mode 100644
index d0cefdb5..00000000
--- a/scripts/setup/0_set_validators.js
+++ /dev/null
@@ -1,173 +0,0 @@
-const Web3 = require('web3');
-const zos = require('zos-lib');
-// const BigNumber = require('bignumber.js');
-const fs = require('fs');
-// eslint-disable-next-line prefer-destructuring
-const proxyContractABI = require('zos-lib/build/contracts/AdminUpgradeabilityProxy.json');
-const propsTokenContractABI = require('../../build/contracts/PropsToken.json');
-const connectionConfig = require('../../truffle');
-const utils = require('../../scripts_utils/utils');
-
-const networkProvider = process.argv[2];
-const multisigWalletForPropsTokenProxy = process.argv[3];
-const validators = String(process.argv[4]).split(",");
-const tokenContract = process.argv[5];
-
-let networkInUse;
-let web3;
-
-if (typeof (networkProvider) === 'undefined') {
- console.log('Must supply networkProvider');
- process.exit(0);
-}
-
-if (typeof (multisigWalletForPropsTokenProxy) === 'undefined') {
- console.log('Must supply multisigWalletForPropsTokenProxy');
- process.exit(0);
-}
-
-if (validators.length == 0) {
- console.log('Must supply validators comma delimited list');
- process.exit(0);
-}
-let PropsTokenContractAddress;
-if (tokenContract.length > 0) {
- PropsTokenContractAddress = tokenContract;
-} else {
- const zosDataFileName = networkProvider === 'test' ? 'zos.dev-5777.json' : `zos.${networkProvider}.json`;
- const zosData = JSON.parse(fs.readFileSync(zosDataFileName, 'utf8'));
- PropsTokenContractAddress = zosData.proxies['PropsToken/PropsToken'][0].address;
-}
-
-console.log('1');
-
-const multisigWalletABI = require('./MultiSigWallet.json');
-
-const setupMetadataFilename = `output/setup-${networkProvider}.json`;
-let setupData;
-try {
- // eslint-disable-next-line import/no-dynamic-require,global-require
- setupData = require(`../../${setupMetadataFilename}`);
-} catch (error) {
- setupData = {};
-}
-console.log('2');
-if (typeof (setupData.steps) === 'undefined') {
- setupData.steps = [];
-}
-
-const setupDataEntry = {
- date: utils.timeStamp(),
-};
-
-async function main() {
- // instantiate multisig wallet
- console.log('3');
- let providerDevOps1;
- let DevOps1MultiSigOwnerAddress;
- networkInUse = networkProvider === 'test' ? networkProvider : `${networkProvider}1`;
- if (typeof connectionConfig.networks[networkInUse].provider === 'function') {
- providerDevOps1 = connectionConfig.networks[networkInUse].provider();
- web3 = new Web3(providerDevOps1);
- }
- if (typeof (connectionConfig.networks[networkInUse].wallet_address) === 'undefined') {
- web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${connectionConfig.networks[networkInUse].host}:${connectionConfig.networks[networkInUse].port}`));
- accounts = await web3.eth.getAccounts();
- // eslint-disable-next-line prefer-destructuring
- DevOps1MultiSigOwnerAddress = accounts[2];
- } else {
- DevOps1MultiSigOwnerAddress = connectionConfig.networks[networkInUse].wallet_address;
- }
- let multiSigContractInstance;
- if (multisigWalletForPropsTokenProxy != 'none') {
- console.log(`3.1 using multsigWallet >${multisigWalletForPropsTokenProxy}<`);
- multiSigContractInstance = new web3.eth.Contract(multisigWalletABI.abi, multisigWalletForPropsTokenProxy);
- }
- let propsContractInstance;
- console.log(`4 >${PropsTokenContractAddress}<`);
- try {
- propsContractInstance = new web3.eth.Contract(propsTokenContractABI.abi, PropsTokenContractAddress);
- } catch (e) {
- console.log(`4 err ${JSON.stringify(e)}`);
- }
- // const propsContractInstance = new web3.eth.Contract(proxyContractABI.abi, PropsTokenContractAddress);
- //get current rewards day
- //const rewardsStartVal = (await instance.methods.rewardsStartTimestamp().call());
- const rewardsTimestamp = await propsContractInstance.methods.rewardsStartTimestamp().call();
- const secondsInDay = networkProvider == 'mainnet' ? 86400 : 3600;
- console.log(`5 ${rewardsTimestamp}, ${secondsInDay}`);
- const currentTimestamp = Math.floor(Date.now()/1000);
- // return (block.timestamp.sub(_self.rewardsStartTimestamp)).div(_self.minSecondsBetweenDays).add(1);
- const rewardsDay = Math.floor((currentTimestamp - rewardsTimestamp) / secondsInDay) + 1;
- console.log(`Got rewardsTimestamp=${rewardsTimestamp}, secondsInDay=${secondsInDay}, currentTimestamp=${currentTimestamp}, rewardsDay=${rewardsDay}`);
-
- const encodedData = await propsContractInstance.methods.setValidators(
- rewardsDay,
- validators
- ).encodeABI();
-
- const upgradeToEncoded = zos.encodeCall('setValidators', ['uint256','address[]'], [rewardsDay,validators]);
-
- console.log(`encodedData=${encodedData}`);
- if (multisigWalletForPropsTokenProxy === 'none') {
- await propsContractInstance.methods.setValidators(
- rewardsDay,
- validators,
- ).send({
- from: DevOps1MultiSigOwnerAddress,
- gas: utils.gasLimit('deployJurisdiction'),
- gasPrice: utils.gasPrice(),
- // eslint-disable-next-line no-loop-func
- }).then((receipt) => {
- setupDataEntry.newValidators = validators;
- setupDataEntry.rewardsDay = rewardsDay;
- setupDataEntry.txHash = receipt.transactionHash;
- console.log(`Transaction for set validators ${JSON.stringify(receipt)}`);
- }).catch((error) => {
- console.warn(`Error sending transaction:${JSON.stringify(error)}`);
- });
- } else {
-// const upgradeToEncoded = await propsContractInstance.methods.upgradeTo(NewPropsTokenLogicContractAddress)encodeABI();
- // eslint-disable-next-line no-await-in-loop
- await multiSigContractInstance.methods.submitTransaction(
- PropsTokenContractAddress,
- 0,
- upgradeToEncoded,
- ).send({
- from: DevOps1MultiSigOwnerAddress,
- gas: utils.gasLimit('setEntitiesViaMultisig'),
- gasPrice: utils.gasPrice(),
- // eslint-disable-next-line no-loop-func
- }).then((receipt) => {
- setupDataEntry.newValidators = validators;
- setupDataEntry.rewardsDay = rewardsDay;
- setupDataEntry.multisigTx = receipt.transactionHash;
- console.log('Multisig transaction for set validators');
- }).catch((error) => {
- console.warn(`Error sending multisig transaction:${error}`);
- });
- }
-
-
- setupData.steps.push(setupDataEntry);
- fs.writeFile(
- setupMetadataFilename,
- JSON.stringify(setupData),
- { flag: 'w' },
- (err) => {
- if (err) {
- console.error(err);
- process.exit(1);
- }
- console.log(`metadata written to ${setupMetadataFilename}`);
- console.log(JSON.stringify(setupData, null, 2));
- process.exit(0);
- },
- );
-}
-
-try {
- main();
-} catch (err) {
- console.warn(err);
-}
diff --git a/scripts/setup/1_set_applications.js b/scripts/setup/1_set_applications.js
deleted file mode 100644
index a54f7447..00000000
--- a/scripts/setup/1_set_applications.js
+++ /dev/null
@@ -1,162 +0,0 @@
-const Web3 = require('web3');
-const zos = require('zos-lib');
-// const BigNumber = require('bignumber.js');
-const fs = require('fs');
-// eslint-disable-next-line prefer-destructuring
-const proxyContractABI = require('zos-lib/build/contracts/AdminUpgradeabilityProxy.json');
-const propsTokenContractABI = require('../../build/contracts/PropsToken.json');
-const connectionConfig = require('../../truffle');
-const utils = require('../../scripts_utils/utils');
-
-const networkProvider = process.argv[2];
-const multisigWalletForPropsTokenProxy = process.argv[3];
-const applications = String(process.argv[4]).split(",");
-const tokenContract = process.argv[5];
-
-let networkInUse;
-let web3;
-
-if (typeof (networkProvider) === 'undefined') {
- console.log('Must supply networkProvider');
- process.exit(0);
-}
-
-if (typeof (multisigWalletForPropsTokenProxy) === 'undefined') {
- console.log('Must supply multisigWalletForPropsTokenProxy');
- process.exit(0);
-}
-
-if (applications.length == 0) {
- console.log('Must supply applications comma delimited list');
- process.exit(0);
-}
-
-let PropsTokenContractAddress;
-if (tokenContract.length > 0) {
- PropsTokenContractAddress = tokenContract;
-} else {
- const zosDataFileName = networkProvider === 'test' ? 'zos.dev-5777.json' : `zos.${networkProvider}.json`;
- const zosData = JSON.parse(fs.readFileSync(zosDataFileName, 'utf8'));
- PropsTokenContractAddress = zosData.proxies['PropsToken/PropsToken'][0].address;
-}
-
-const multisigWalletABI = require('./MultiSigWallet.json');
-
-const setupMetadataFilename = `output/setup-${networkProvider}.json`;
-let setupData;
-try {
- // eslint-disable-next-line import/no-dynamic-require,global-require
- setupData = require(`../../${setupMetadataFilename}`);
-} catch (error) {
- setupData = {};
-}
-
-if (typeof (setupData.steps) === 'undefined') {
- setupData.steps = [];
-}
-
-const setupDataEntry = {
- date: utils.timeStamp(),
-};
-
-async function main() {
- // instantiate multisig wallet
- let providerDevOps1;
- let DevOps1MultiSigOwnerAddress;
- networkInUse = networkProvider === 'test' ? networkProvider : `${networkProvider}1`;
- if (typeof connectionConfig.networks[networkInUse].provider === 'function') {
- providerDevOps1 = connectionConfig.networks[networkInUse].provider();
- web3 = new Web3(providerDevOps1);
- }
- if (typeof (connectionConfig.networks[networkInUse].wallet_address) === 'undefined') {
- web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${connectionConfig.networks[networkInUse].host}:${connectionConfig.networks[networkInUse].port}`));
- accounts = await web3.eth.getAccounts();
- // eslint-disable-next-line prefer-destructuring
- DevOps1MultiSigOwnerAddress = accounts[2];
- } else {
- DevOps1MultiSigOwnerAddress = connectionConfig.networks[networkInUse].wallet_address;
- }
-
- let multiSigContractInstance;
- if (multisigWalletForPropsTokenProxy != 'none') {
- multiSigContractInstance = new web3.eth.Contract(multisigWalletABI.abi, multisigWalletForPropsTokenProxy);
- }
-
- const propsContractInstance = new web3.eth.Contract(propsTokenContractABI.abi, PropsTokenContractAddress);
- // const propsContractInstance = new web3.eth.Contract(proxyContractABI.abi, PropsTokenContractAddress);
- //get current rewards day
- //const rewardsStartVal = (await instance.methods.rewardsStartTimestamp().call());
- const rewardsTimestamp = await propsContractInstance.methods.rewardsStartTimestamp().call();
- const secondsInDay = networkProvider == 'mainnet' ? 86400 : 3600;
- const currentTimestamp = Math.floor(Date.now()/1000);
- // return (block.timestamp.sub(_self.rewardsStartTimestamp)).div(_self.minSecondsBetweenDays).add(1);
- const rewardsDay = Math.floor((currentTimestamp - rewardsTimestamp) / secondsInDay) + 1;
- console.log(`Got rewardsTimestamp=${rewardsTimestamp}, secondsInDay=${secondsInDay}, currentTimestamp=${currentTimestamp}, rewardsDay=${rewardsDay}`);
- const upgradeToEncoded = zos.encodeCall('setApplications', ['uint256','address[]'], [rewardsDay,applications]);
-
- const encodedData = await propsContractInstance.methods.setApplications(
- rewardsDay,
- applications
- ).encodeABI();
-
- if (multisigWalletForPropsTokenProxy === 'none') {
- await propsContractInstance.methods.setApplications(
- rewardsDay,
- applications,
- ).send({
- from: DevOps1MultiSigOwnerAddress,
- gas: utils.gasLimit('deployJurisdiction'),
- gasPrice: utils.gasPrice(),
- // eslint-disable-next-line no-loop-func
- }).then((receipt) => {
- setupDataEntry.newApplications = applications;
- setupDataEntry.rewardsDay = rewardsDay;
- setupDataEntry.txHash = receipt.transactionHash;
- console.log(`Transaction for set applications ${JSON.stringify(receipt)}`);
- }).catch((error) => {
- console.warn(`Error sending transaction:${JSON.stringify(error)}`);
- });
- } else {
- // const upgradeToEncoded = await propsContractInstance.methods.upgradeTo(NewPropsTokenLogicContractAddress)encodeABI();
- // eslint-disable-next-line no-await-in-loop
- await multiSigContractInstance.methods.submitTransaction(
- PropsTokenContractAddress,
- 0,
- upgradeToEncoded,
- ).send({
- from: DevOps1MultiSigOwnerAddress,
- gas: utils.gasLimit('setEntitiesViaMultisig'),
- gasPrice: utils.gasPrice(),
- // eslint-disable-next-line no-loop-func
- }).then((receipt) => {
- setupDataEntry.newApplications = applications;
- setupDataEntry.rewardsDay = rewardsDay;
- setupDataEntry.multisigTx = receipt.transactionHash;
- console.log('Multisig transaction for set application');
- }).catch((error) => {
- console.warn(`Error sending multisig transaction:${error}`);
- });
- }
-
- setupData.steps.push(setupDataEntry);
- fs.writeFile(
- setupMetadataFilename,
- JSON.stringify(setupData),
- { flag: 'w' },
- (err) => {
- if (err) {
- console.error(err);
- process.exit(1);
- }
- console.log(`metadata written to ${setupMetadataFilename}`);
- console.log(JSON.stringify(setupData, null, 2));
- process.exit(0);
- },
- );
-}
-
-try {
- main();
-} catch (err) {
- console.warn(err);
-}
diff --git a/scripts/tests/index.js b/scripts/tests/index.js
index e78f66c3..5c067189 100644
--- a/scripts/tests/index.js
+++ b/scripts/tests/index.js
@@ -6,29 +6,7 @@ global.web3 = web3;
const { Contracts, SimpleProject, ZWeb3 } = require('zos-lib');
ZWeb3.initialize(web3.currentProvider)
const PropsToken = Contracts.getFromLocal('PropsToken');
-const waitUntil = require('async-wait-until');
-const secondsDiffBetweenDays = global.secondsBetweenDailyRewards > 0 ? global.secondsBetweenDailyRewards : 15; // 5 seconds for testing purposes on the production contract itself should be around 86400 (24 hours)
-let currentTimestamp = Math.floor(Date.now()/1000);
-const rewardsStartTimestamp = global.rewardsStartTimestamp = (currentTimestamp - (currentTimestamp % secondsDiffBetweenDays) + secondsDiffBetweenDays); // in production this will be 24 hours (86400 seconds) per day
-
-const calcRewardsDay = function() {
- currentTimestamp = Math.floor(Date.now()/1000);
- const secondsLeft = currentTimestamp > rewardsStartTimestamp ?
- secondsDiffBetweenDays - ((currentTimestamp - rewardsStartTimestamp) % secondsDiffBetweenDays) :
- -currentTimestamp + rewardsStartTimestamp;
- $ret = {
- rewardsDay: (((currentTimestamp - (currentTimestamp % secondsDiffBetweenDays)) - rewardsStartTimestamp) / secondsDiffBetweenDays)+1,
- secondsLeft
- }
-
- // process.stdout.write('.');
- // process.stdout.clearLine();
- //process.stdout.cursorTo(0);
- // process.stdout.write("\n"); // end the line
- console.log(JSON.stringify($ret));
- return $ret;
-}
async function main(isRewardsTest) {
// web3.setProvider(ganache.provider({ mnemonic: 'asset member awake bring mosquito lab sustain muscle elephant equip someone obvious' }));
@@ -38,23 +16,12 @@ async function main(isRewardsTest) {
const tokenHolderAddress = web3.eth.accounts[3];
const myProject = new SimpleProject('PropsToken', { from: creatorAddress });
- console.log('Creating an upgradeable instance of PropsToken...');
+ console.log(`Creating an upgradeable instance of PropsToken... with creator=${creatorAddress}, controller=${controllerAddress}, holder=${tokenHolderAddress}`);
try {
MyLibrary = Contracts.getFromLocal("PropsRewardsLib")
const lib = await myProject.setImplementation(MyLibrary, "PropsRewardsLib");
PropsToken.link({ "PropsRewardsLib": lib.address });
- // console.log(`initializing contract ${global.timestamp}, ${controllerAddress}, ${secondsDiffBetweenDays}, ${rewardsStartTimestamp}`)
- if (isRewardsTest) {
- let rewardsDayInfo = calcRewardsDay();
- console.log(`will wait for day 1 to begin`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 1;
- }, 90000, 1000);
- }
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
- const instance = await myProject.createProxy(PropsToken, { initArgs: [tokenHolderAddress, controllerAddress, secondsDiffBetweenDays, rewardsStartTimestamp] });
+ const instance = await myProject.createProxy(PropsToken, { initArgs: [tokenHolderAddress, controllerAddress] });
return instance;
} catch (error) {
console.warn(`error=${error}`);
@@ -72,4 +39,3 @@ module.exports = function (callback) {
// Testing
module.exports.main = main;
-module.exports.calcRewardsDay = calcRewardsDay;
diff --git a/scripts/upgrade/3_permit_upgrade_initialize.js b/scripts/upgrade/3_permit_upgrade_initialize.js
new file mode 100644
index 00000000..7e54db02
--- /dev/null
+++ b/scripts/upgrade/3_permit_upgrade_initialize.js
@@ -0,0 +1,104 @@
+const Web3 = require('web3');
+const zos = require('zos-lib');
+const BigNumber = require('bignumber.js');
+const fs = require('fs');
+// eslint-disable-next-line prefer-destructuring
+const propsTokenContractABI = require('../../build/contracts/PropsToken.json');
+const connectionConfig = require('../../truffle');
+const utils = require('../../scripts_utils/utils');
+
+const networkProvider = process.argv[2];
+const minterAddress = process.argv[3];
+
+let networkInUse;
+let web3;
+
+if (typeof (networkProvider) === 'undefined') {
+ console.log('Must supply networkProvider');
+ process.exit(0);
+}
+
+if (typeof (minterAddress) === 'undefined') {
+ console.log('Must supply minter address');
+ process.exit(0);
+}
+
+const zosDataFileName = networkProvider === 'test' ? 'zos.dev-5777.json' : `zos.${networkProvider}.json`;
+const zosData = JSON.parse(fs.readFileSync(zosDataFileName, 'utf8'));
+const PropsTokenContractAddress = zosData.proxies['PropsToken/PropsToken'][0].address;
+
+const upgradeMetadataFilename = `output/upgrades-${networkProvider}.json`;
+let upgradeData;
+try {
+ // eslint-disable-next-line import/no-dynamic-require,global-require
+ upgradeData = require(`../../${upgradeMetadataFilename}`);
+} catch (error) {
+ upgradeData = {};
+}
+
+if (typeof (upgradeData.upgrades) === 'undefined') {
+ upgradeData.upgrades = [];
+}
+
+const upgradeDataEntry = {
+ date: utils.timeStamp(),
+};
+
+async function main() {
+ // instantiate multisig wallet
+ let providerDevOps1;
+ let DevOps1MultiSigOwnerAddress;
+ networkInUse = networkProvider === 'test' ? networkProvider : `${networkProvider}1`;
+ if (typeof connectionConfig.networks[networkInUse].provider === 'function') {
+ providerDevOps1 = connectionConfig.networks[networkInUse].provider();
+ web3 = new Web3(providerDevOps1);
+ }
+ if (typeof (connectionConfig.networks[networkInUse].wallet_address) === 'undefined') {
+ web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${connectionConfig.networks[networkInUse].host}:${connectionConfig.networks[networkInUse].port}`));
+ accounts = await web3.eth.getAccounts();
+ // eslint-disable-next-line prefer-destructuring
+ DevOps1MultiSigOwnerAddress = accounts[2];
+ } else {
+ DevOps1MultiSigOwnerAddress = connectionConfig.networks[networkInUse].wallet_address;
+ }
+
+ const propsContractInstance = new web3.eth.Contract(propsTokenContractABI.abi, PropsTokenContractAddress);
+
+ await propsContractInstance.methods.initializePermitUpgrade(
+ "Props Token", minterAddress
+ ).send({
+ from: DevOps1MultiSigOwnerAddress,
+ gas: utils.gasLimit('deployJurisdiction'),
+ gasPrice: utils.gasPrice(),
+ // eslint-disable-next-line no-loop-func
+ }).then((receipt) => {
+ upgradeDataEntry.initializeData = ["Props Token", minterAddress];
+ upgradeDataEntry.initializeTx = receipt.transactionHash;
+ console.log('Initialized permit upgrade contract');
+ }).catch((error) => {
+ console.warn(`Error initializing permit upgrade:${error}`);
+ });
+
+
+ upgradeData.upgrades.push(upgradeDataEntry);
+ fs.writeFile(
+ upgradeMetadataFilename,
+ JSON.stringify(upgradeData),
+ { flag: 'w' },
+ (err) => {
+ if (err) {
+ console.error(err);
+ process.exit(1);
+ }
+ console.log(`metadata written to ${upgradeMetadataFilename}`);
+ console.log(JSON.stringify(upgradeData, null, 2));
+ process.exit(0);
+ },
+ );
+}
+
+try {
+ main();
+} catch (err) {
+ console.warn(err);
+}
\ No newline at end of file
diff --git a/test/propstoken-0-rewards.test.js b/test/propstoken-0-rewards.test.js
deleted file mode 100644
index e8245c00..00000000
--- a/test/propstoken-0-rewards.test.js
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
-------------------------------------------------------------------
-This file tests the following propstoken contract functionalities:
-1. Application Management
-2. Validator Management
-3. Parameter Management
-4. Rewards Standard Case
-5. Rewards Late Validator Case
-------------------------------------------------------------------
-*/
-/* eslint-disable no-mixed-operators */
-/* eslint-disable no-unused-vars */
-/* eslint-disable func-names */
-/* eslint-disable no-undef */
-/* eslint-disable prefer-destructuring */
-global.timestamp = Math.floor(Date.now() / 1000) + 10; // now + 60 seconds to allow for further testing when not allowed
-const BigNumber = require('bignumber.js');
-const waitUntil = require('async-wait-until');
-const ethUtil = require('ethereumjs-util');
-const main = require('../scripts/tests/index.js').main;
-const calcRewardsDay = require('../scripts/tests/index.js').calcRewardsDay;
-const utils = require('../scripts_utils/utils');
-const { soliditySha3 } = require('web3-utils');
-
-let newControllerAddress;
-let txRes;
-let instance;
-const secondsBetweenDailyRewards = global.secondsBetweenDailyRewards = 15;
-const gasUsedStats = {};
-const logGasUsed = function(name, value) {
- // console.log(JSON.stringify(name)+'=>'+JSON.stringify(value));
- if (!(name in gasUsedStats)) {
- gasUsedStats[name] = new Array();
- }
- gasUsedStats[name].push(value);
-}
-const arrStats = function(arr) {
- let sum = 0;
- let max = 0;
- let min = 0;
- for (i = 0; i < arr.length; ++i) {
- sum += arr[i];
- if (arr[i] > max) {
- max = arr[i];
- }
- if (arr[i] < min || min == 0) {
- min = arr[i];
- }
- }
- const avg = sum / arr.length;
- return {avg, max, min, count: arr.length};
-}
-const gasSummary = function() {
- for (name in gasUsedStats) {
- console.log(name+'=>'+JSON.stringify(arrStats(gasUsedStats[name])));
- }
-}
-
-let maxTotalSupply;
-let currentTotalSupply;
-let rewardsDayInfo
-
-
-contract('main', (_accounts) => {
- const application1 = {
- account: _accounts[11],
- name: "application1",
- rewardsAddress: _accounts[12],
- sidechainAddress: _accounts[13],
- updatedName: "application1-update"
- }
-
- const application2 = {
- account: _accounts[14],
- name: "application2",
- rewardsAddress: _accounts[15],
- sidechainAddress: _accounts[16],
- }
-
- const application3 = {
- account: _accounts[17],
- name: "application3",
- rewardsAddress: _accounts[18],
- sidechainAddress: _accounts[19],
- }
-
- const application4 = {
- account: _accounts[20],
- name: "application4",
- rewardsAddress: _accounts[21],
- sidechainAddress: _accounts[22],
- }
-
- const application5 = {
- account: _accounts[23],
- name: "application5",
- rewardsAddress: _accounts[24],
- sidechainAddress: _accounts[25],
- }
-
- const validator1 = {
- account: _accounts[30],
- name: "validator1",
- rewardsAddress: _accounts[31],
- sidechainAddress: _accounts[32],
- updatedName: "validator1-update"
- }
-
- const validator2 = {
- account: _accounts[33],
- name: "validator2",
- rewardsAddress: _accounts[34],
- sidechainAddress: _accounts[35],
- }
-
- const validator3 = {
- account: _accounts[36],
- name: "validator3",
- rewardsAddress: _accounts[37],
- sidechainAddress: _accounts[38],
- }
-
- const validator4 = {
- account: _accounts[39],
- name: "validator4",
- rewardsAddress: _accounts[40],
- sidechainAddress: _accounts[41],
- }
-
- const validator5 = {
- account: _accounts[42],
- name: "validator5",
- rewardsAddress: _accounts[43],
- sidechainAddress: _accounts[44],
- }
- before(async () => {
- instance = await main(true);
- rewardsDayInfo = calcRewardsDay();
- console.log(`will wait for day 1 to begin ${rewardsDayInfo.secondsLeft} left`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 1;
- }, 90000, 1000);
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
- });
-
- describe('Initialization values are correct and generic controller function', async () => {
- const controllerAddress = _accounts[2];
- newControllerAddress = _accounts[4];
- it('Controller is properly set', async () => {
- const currentController = await instance.methods.controller().call();
- assert.equal(currentController.toLowerCase(), controllerAddress.toLowerCase());
- });
-
- it('Controller can be changed by controller', async () => {
- txRes = await instance.methods.updateController(newControllerAddress).send({ from: controllerAddress });
- logGasUsed('updateController', txRes.gasUsed);
- const currentController = await instance.methods.controller().call();
- assert.equal(currentController.toLowerCase(), newControllerAddress.toLowerCase());
- });
-
- it('ControllerUpdated Event Emitted', async () => {
- assert.equal(String(txRes.events['ControllerUpdated'].returnValues['0']).toLowerCase(),String(newControllerAddress).toLowerCase());
- });
-
- it('Controller cannot be changed by non controller', async () => {
- try {
- expect(await instance.methods.updateController(controllerAddress).send({ from: controllerAddress })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Max Supply is properly set', async () => {
- maxTotalSupply = (await instance.methods.maxTotalSupply().call());
- assert.equal(String(web3.fromWei(maxTotalSupply)), "1000000000");
- });
-
- it('Rewards Start Timestamp is properly set', async () => {
- const rewardsStartVal = (await instance.methods.rewardsStartTimestamp().call());
- assert.equal(String(rewardsStartVal), String(global.rewardsStartTimestamp));
- });
-
- // enum ParameterName { ApplicationRewardsPercent, ApplicationRewardsMaxVariationPercent, ValidatorMajorityPercent, ValidatorRewardsPercent}
- it('Parameter ApplicationRewardsPercent is properly set', async () => {
- const value = await instance.methods.getParameter(0, 0).call();
- assert.equal(value, 34750); //pphm
- });
-
- it('Parameter ApplicationRewardsMaxVariationPercent is properly set', async () => {
- const value = await instance.methods.getParameter(1, 0).call();
- assert.equal(value, 150000000); //pphm
- });
-
- it('Parameter ValidatorMajorityPercent is properly set', async () => {
- const value = await instance.methods.getParameter(2, 0).call();
- assert.equal(value, 50000000); //pphm
- });
-
- it('Parameter ValidatorRewardsPercent is properly set', async () => {
- const value = await instance.methods.getParameter(3, 0).call();
- assert.equal(value, 1829); //pphm
- });
- });
-
- describe('Parameter Management Tests', async () => {
- // enum ParameterName { ApplicationRewardsPercent, ApplicationRewardsMaxVariationPercent, ValidatorMajorityPercent, ValidatorRewardsPercent}
- it('Can update a parameter value and read both values', async () => {
- txRes = await instance.methods.updateParameter(3, 1830, 2).send({ from: newControllerAddress });
- logGasUsed('updateParameter', txRes.gasUsed);
- let value = await instance.methods.getParameter(3, 1).call();
- assert.equal(value, 1829); //pphm
- value = await instance.methods.getParameter(3, 2).call();
- assert.equal(value, 1830); //pphm
- });
-
- it('ParameterUpdated event was emitted', async () => {
- assert.equal(String(txRes.events['ParameterUpdated'].returnValues['0']),'3');
- assert.equal(String(txRes.events['ParameterUpdated'].returnValues['1']),'1830');
- assert.equal(String(txRes.events['ParameterUpdated'].returnValues['2']),'1829');
- assert.equal(String(txRes.events['ParameterUpdated'].returnValues['3']),'2');
-
- });
-
-
- it('Updating a parameter before the previous update took place', async () => {
- txRes = await instance.methods.updateParameter(0, 34752, 2).send({ from: newControllerAddress });
- logGasUsed('updateParameter', txRes.gasUsed);
- let value = await instance.methods.getParameter(0, 1).call();
- assert.equal(value, 34750); //pphm
- value = await instance.methods.getParameter(0, 2).call();
- assert.equal(value, 34752); //pphm
- });
- });
-
- describe('Application Management Tests', async () => {
- it('Application can add itself', async () => {
- txRes = await instance.methods.updateEntity(0,web3.fromAscii(application1.updatedName), application1.rewardsAddress, application1.sidechainAddress).send({ from: application1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['0']).toLowerCase(),String(application1.account).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['1']).toLowerCase(),'0');
- assert.equal(web3.toUtf8(String(txRes.events['EntityUpdated'].returnValues['2']).toLowerCase()),String(application1.updatedName).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['3']).toLowerCase(),String(application1.rewardsAddress).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['4']).toLowerCase(),String(application1.sidechainAddress).toLowerCase());
-
- //add the other applications needed for testing
- txRes = await instance.methods.updateEntity(0,web3.fromAscii(application2.name), application2.rewardsAddress, application2.sidechainAddress).send({ from: application2.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- txRes = await instance.methods.updateEntity(0,web3.fromAscii(application3.name), application3.rewardsAddress, application3.sidechainAddress).send({ from: application3.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- txRes = await instance.methods.updateEntity(0,web3.fromAscii(application4.name), application4.rewardsAddress, application4.sidechainAddress).send({ from: application4.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- });
-
- it('Application must have valid addresses', async () => {
- try {
- expect(await instance.methods.updateEntity(0,web3.fromAscii(application2.name), '0x0', application2.sidechainAddress).send({ from: application2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
-
- try {
- expect(await instance.methods.updateEntity(0,web3.fromAscii(application2.name), application2.rewardsAddress, '0x0').send({ from: application2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Application can update itself', async () => {
- txRes = await instance.methods.updateEntity(0,web3.fromAscii(application1.name), application1.rewardsAddress, application1.sidechainAddress).send({ from: application1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['0']).toLowerCase(),String(application1.account).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['1']).toLowerCase(),'0');
- assert.equal(web3.toUtf8(String(txRes.events['EntityUpdated'].returnValues['2']).toLowerCase()),String(application1.name).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['3']).toLowerCase(),String(application1.rewardsAddress).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['4']).toLowerCase(),String(application1.sidechainAddress).toLowerCase());
- });
-
- it('Active applications list cannot be updated by non-controller', async () => {
- try {
- expect(await instance.methods.setApplications(1, [application1.account, application2.account]).send({ from: application2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Active applications list will fail if an app does not yet exist', async () => {
- try {
- expect(await instance.methods.setApplications(1, [application1.account, application2.account, application5.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Active applications list can be updated by controller', async () => {
- txRes = await instance.methods.setApplications(1, [application1.account, application2.account, application3.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setApplications', txRes.gasUsed);
- assert.deepEqual(txRes.events['ApplicationsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[application1.account, application2.account, application3.account]);
- assert.equal(String(txRes.events['ApplicationsListUpdated'].returnValues['1']).toLowerCase(),'1');
- });
-
- it('Active applications list can be updated for next day by controller', async () => {
- txRes = await instance.methods.setApplications(2, [application1.account, application2.account, application4.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setApplications', txRes.gasUsed);
- assert.deepEqual(txRes.events['ApplicationsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[application1.account, application2.account, application4.account]);
- assert.equal(String(txRes.events['ApplicationsListUpdated'].returnValues['1']).toLowerCase(),'2');
- });
-
- it('Correctly retrieve applications list based on rewards day', async () => {
- let value = await instance.methods.getEntities(0, 1).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [application1.account, application2.account, application3.account]);
- value = await instance.methods.getEntities(0, 2).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [application1.account, application2.account, application4.account]);
- });
-
- it('Active applications list can be updated for next day again with different count of applications by controller', async () => {
- txRes = await instance.methods.setApplications(2, [application1.account, application2.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setApplications', txRes.gasUsed);
- assert.deepEqual(txRes.events['ApplicationsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[application1.account, application2.account]);
- assert.equal(String(txRes.events['ApplicationsListUpdated'].returnValues['1']).toLowerCase(),'2');
- });
-
- it('Correctly retrieve applications list based on rewards day after second update', async () => {
- let value = await instance.methods.getEntities(0, 1).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [application1.account, application2.account, application3.account]);
- value = await instance.methods.getEntities(0, 2).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [application1.account, application2.account]);
- });
- });
-
- describe('Validator Management Tests', async () => {
- it('Validator can add itself', async () => {
- txRes = await instance.methods.updateEntity(1,web3.fromAscii(validator1.updatedName), validator1.rewardsAddress, validator1.sidechainAddress).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['0']).toLowerCase(),String(validator1.account).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['1']).toLowerCase(),'1');
- assert.equal(web3.toUtf8(String(txRes.events['EntityUpdated'].returnValues['2']).toLowerCase()),String(validator1.updatedName).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['3']).toLowerCase(),String(validator1.rewardsAddress).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['4']).toLowerCase(),String(validator1.sidechainAddress).toLowerCase());
- //add the other validators needed for testing
- txRes = await instance.methods.updateEntity(1,web3.fromAscii(validator2.name), validator2.rewardsAddress, validator2.sidechainAddress).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- txRes = await instance.methods.updateEntity(1,web3.fromAscii(validator3.name), validator3.rewardsAddress, validator3.sidechainAddress).send({ from: validator3.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- txRes = await instance.methods.updateEntity(1,web3.fromAscii(validator4.name), validator4.rewardsAddress, validator4.sidechainAddress).send({ from: validator4.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- });
-
- it('Validator must have valid addresses', async () => {
- try {
- expect(await instance.methods.updateEntity(1,web3.fromAscii(validator2.name), '0x0', validator2.sidechainAddress).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
-
- try {
- expect(await instance.methods.updateEntity(1,web3.fromAscii(validator2.name), validator2.rewardsAddress, '0x0').send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Validator can update itself', async () => {
- txRes = await instance.methods.updateEntity(1,web3.fromAscii(validator1.name), validator1.rewardsAddress, validator1.sidechainAddress).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('updateEntity', txRes.gasUsed);
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['0']).toLowerCase(),String(validator1.account).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['1']).toLowerCase(),'1');
- assert.equal(web3.toUtf8(String(txRes.events['EntityUpdated'].returnValues['2']).toLowerCase()),String(validator1.name).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['3']).toLowerCase(),String(validator1.rewardsAddress).toLowerCase());
- assert.equal(String(txRes.events['EntityUpdated'].returnValues['4']).toLowerCase(),String(validator1.sidechainAddress).toLowerCase());
- });
-
- it('Active validators list cannot be updated by non-controller', async () => {
- try {
- expect(await instance.methods.setValidators(1, [validator1.account, validator2.account]).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Active validators list will fail if an app does not yet exist', async () => {
- try {
-
- expect(await instance.methods.setValidators(1, [validator1.account, validator2.account, validator5.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Active validators list can be updated by controller', async () => {
- txRes = await instance.methods.setValidators(1, [validator1.account, validator2.account, validator3.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setValidators', txRes.gasUsed);
- assert.deepEqual(txRes.events['ValidatorsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[validator1.account, validator2.account, validator3.account]);
- assert.equal(String(txRes.events['ValidatorsListUpdated'].returnValues['1']).toLowerCase(),'1');
- });
-
- it('Active validators list can be updated for next day by controller', async () => {
- txRes = await instance.methods.setValidators(2, [validator1.account, validator2.account, validator4.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setValidators', txRes.gasUsed);
- assert.deepEqual(txRes.events['ValidatorsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[validator1.account, validator2.account, validator4.account]);
- assert.equal(String(txRes.events['ValidatorsListUpdated'].returnValues['1']).toLowerCase(),'2');
- });
-
- it('Correctly retrieve validators list based on rewards day', async () => {
- let value = await instance.methods.getEntities(1, 1).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [validator1.account, validator2.account, validator3.account]);
- value = await instance.methods.getEntities(1, 2).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [validator1.account, validator2.account, validator4.account]);
- });
-
- it('Active validators list can be updated for next day again with different count of validators by controller', async () => {
- txRes = await instance.methods.setValidators(2, [validator1.account, validator2.account, validator3.account, validator4.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setValidators', txRes.gasUsed);
- assert.deepEqual(txRes.events['ValidatorsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[validator1.account, validator2.account, validator3.account, validator4.account]);
- assert.equal(String(txRes.events['ValidatorsListUpdated'].returnValues['1']).toLowerCase(),'2');
- });
-
- it('Correctly retrieve validators list based on rewards day after second update', async () => {
- let value = await instance.methods.getEntities(1, 1).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [validator1.account, validator2.account, validator3.account]);
- value = await instance.methods.getEntities(1, 2).call();
- assert.deepEqual(value.map(function(item) { return item.toLowerCase()}), [validator1.account, validator2.account, validator3.account, validator4.account]);
- });
- });
-
- describe('Settlement', async () => {
- // transfer props to application1 so it can settle with
- const applicationPropsAmount = 100;
- const applicationUserId = "someuserid123";
- const applicationUserWallet = _accounts[49];
- const settlementAmount = 50;
- it('Can settle from an application rewards address when values are correct', async () => {
- txRes = await instance.methods.transfer(application1.rewardsAddress, web3.toWei(applicationPropsAmount)).send({ from: web3.eth.accounts[3] });
- txRes = await instance.methods.settle(application1.account, web3.fromAscii(applicationUserId), applicationUserWallet, web3.toWei(settlementAmount)).send({ from: application1.rewardsAddress });
- logGasUsed('settle', txRes.gasUsed);
- newApplicationBalance = web3.fromWei(await instance.methods.balanceOf(application1.rewardsAddress).call());
- newApplicationUserWalletBalance = web3.fromWei(await instance.methods.balanceOf(applicationUserWallet).call());
- assert.equal(Number(newApplicationBalance), Number(applicationPropsAmount) - Number(settlementAmount));
- assert.equal(Number(newApplicationUserWalletBalance), Number(settlementAmount));
- });
-
- it('Settlement event was emitted', async () => {
- // console.log(JSON.stringify(txRes.events));
- assert.equal(String(txRes.events['Settlement'].returnValues['0']).toLowerCase(),String(application1.account).toLowerCase());
- assert.equal(web3.toUtf8(txRes.events['Settlement'].returnValues['1']),applicationUserId);
- assert.equal(String(txRes.events['Settlement'].returnValues['2']).toLowerCase(),String(applicationUserWallet).toLowerCase());
- assert.equal(Number(web3.fromWei(txRes.events['Settlement'].returnValues['3'])),settlementAmount);
- assert.equal(String(txRes.events['Settlement'].returnValues['4']).toLowerCase(),String(application1.rewardsAddress).toLowerCase());
- });
-
- it('Settlment will fail if application does not exist', async () => {
- try {
- expect(await instance.methods.settle(validator1.account, web3.fromAscii(applicationUserId), applicationUserWallet, web3.toWei(settlementAmount)).send({ from: validator1.rewardsAddress })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Settlment will fail if application reward address does not match the account', async () => {
- try {
- expect(await instance.methods.settle(application2.account, web3.fromAscii(applicationUserId), applicationUserWallet, web3.toWei(settlementAmount)).send({ from: application1.rewardsAddress })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
-
- try {
- expect(await instance.methods.settle(application1.account, web3.fromAscii(applicationUserId), applicationUserWallet, web3.toWei(settlementAmount)).send({ from: application2.rewardsAddress })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- });
-
- describe('Submissions and Rewards Tests', async () => {
- const formatArrayForSha3 = function(arr, type) {
- return { type, value: arr};
- }
- BigNumber.config({ EXPONENTIAL_AT: 1e+9 })
-
- const validApplicationRewards = {
- applications: [application1.account, application2.account, application3.account],
- amounts: [web3.toWei(100000), web3.toWei(72000), web3.toWei(36000)]
- }
- const exceedMaxApplicationRewards = {
- applications: [application1.account, application2.account, application3.account],
- amounts: [web3.toWei(120000), web3.toWei(72000), web3.toWei(36000)]
- }
- const nonExistentAppApplicationRewards = {
- applications: [application1.account, application2.account, application5.account],
- amounts: [web3.toWei(120000), web3.toWei(72000), web3.toWei(36000)]
- }
- const appExistsButNotInListApplicationRewards = {
- applications: [application1.account, application2.account, application4.account],
- amounts: [web3.toWei(120000), web3.toWei(72000), web3.toWei(36000)]
- }
-
- const day1SelectedValidators = [validator1, validator2, validator3];
- const day1ValidApplicationRewardsHash = soliditySha3(1, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const day2ValidApplicationRewardsHash = soliditySha3(2, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const day3ValidApplicationRewardsHash = soliditySha3(3, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const day4ValidApplicationRewardsHash = soliditySha3(4, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const day5ValidApplicationRewardsHash = soliditySha3(5, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const day6ValidApplicationRewardsHash = soliditySha3(6, validApplicationRewards.applications.length, validApplicationRewards.amounts.length, formatArrayForSha3(validApplicationRewards.applications, 'address'), formatArrayForSha3(validApplicationRewards.amounts, 'uint256'));
- const exceedMaxApplicationRewardsHash = soliditySha3(1, exceedMaxApplicationRewards.applications.length, exceedMaxApplicationRewards.amounts.length, formatArrayForSha3(exceedMaxApplicationRewards.applications, 'address'), formatArrayForSha3(exceedMaxApplicationRewards.amounts, 'uint256'));
- const nonExistentAppApplicationRewardsHash = soliditySha3(1, nonExistentAppApplicationRewards.applications.length, nonExistentAppApplicationRewards.amounts.length, formatArrayForSha3(nonExistentAppApplicationRewards.applications, 'address'), formatArrayForSha3(nonExistentAppApplicationRewards.amounts, 'uint256'));
- const appExistsButNotInListApplicationRewardsHash = soliditySha3(1, appExistsButNotInListApplicationRewards.applications.length, appExistsButNotInListApplicationRewards.amounts.length, formatArrayForSha3(appExistsButNotInListApplicationRewards.applications, 'address'), formatArrayForSha3(appExistsButNotInListApplicationRewards.amounts, 'uint256'));
-
- it('Reward hash must match submitted data', async () => {
- try {
- expect(await instance.methods.submitDailyRewards(1, exceedMaxApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Validator on the list cannot submit valid data if day has not ended', async() => {
- try {
- expect(await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Validator on the list can submit valid data for yesterday', async() => {
- console.log(`will wait for ${rewardsDayInfo.secondsLeft} seconds before submitting day 1`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 2;
- }, 90000, 1000);
- txRes = await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['1']).toLowerCase(),day1ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['2']).toLowerCase(),String(validator1.account).toLowerCase());
- });
-
- it('Validator not on the list cannot submit', async () => {
- try {
-
- expect(await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator4.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Validator cannot submit more than once', async () => {
- try {
-
- expect(await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error);
- } catch (error) {
- //
- }
- });
-
- it('Cannot submit with non existent application', async() => {
- try {
- expect(txRes = await instance.methods.submitDailyRewards(1, nonExistentAppApplicationRewardsHash, nonExistentAppApplicationRewards.applications, nonExistentAppApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error)
- }
- catch (error) {
- //
- }
-
- });
-
- it('Cannot submit with existing application but not active', async() => {
- try {
- expect(txRes = await instance.methods.submitDailyRewards(1, appExistsButNotInListApplicationRewardsHash, appExistsButNotInListApplicationRewards.applications, appExistsButNotInListApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error)
- }
- catch (error) {
- //
- }
- });
-
- it('Reaching Validator majority with amount that exceeds allowed is rejected', async() => {
- txRes = await instance.methods.submitDailyRewards(1, exceedMaxApplicationRewardsHash, exceedMaxApplicationRewards.applications, exceedMaxApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // exepct DailyRewardsSubmitted
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['1']).toLowerCase(),exceedMaxApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['2']).toLowerCase(),String(validator1.account).toLowerCase());
- try {
- expect(txRes = await instance.methods.submitDailyRewards(1, exceedMaxApplicationRewardsHash, exceedMaxApplicationRewards.applications, exceedMaxApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error)
- }
- catch (error) {
- //
- }
- });
-
- it('Reaching Validator majority mints rewards for apps and no validator rewards', async() => {
- // get current total supply before minting
- currentTotalSupply = await instance.methods.totalSupply().call();
- // get current props balances for rewarded applications
- const application1Balance = (await instance.methods.balanceOf(application1.rewardsAddress).call());
- const application2Balance = (await instance.methods.balanceOf(application2.rewardsAddress).call());
- const application3Balance = (await instance.methods.balanceOf(application3.rewardsAddress).call());
- txRes = await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // exepct DailyRewardsSubmitted
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['1']).toLowerCase(),day1ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['2']).toLowerCase(),String(validator2.account).toLowerCase());
- // expect DailyRewardsApplicationsMinted
- assert.equal(String(txRes.events['DailyRewardsApplicationsMinted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsApplicationsMinted'].returnValues['1']).toLowerCase(),day1ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsApplicationsMinted'].returnValues['2']).toLowerCase(),String(validApplicationRewards.applications.length));
- assert.equal(String(txRes.events['DailyRewardsApplicationsMinted'].returnValues['3']).toLowerCase(),BigNumber.sum.apply(null, validApplicationRewards.amounts).toString());
- // expect no DailyRewardsValidatorsMinted event
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, false);
- // expect application balances to change
- const newApplication1Balance = (await instance.methods.balanceOf(application1.rewardsAddress).call());
- const newApplication2Balance = (await instance.methods.balanceOf(application2.rewardsAddress).call());
- const newApplication3Balance = (await instance.methods.balanceOf(application3.rewardsAddress).call());
- assert.equal(newApplication1Balance, BigNumber.sum(application1Balance, validApplicationRewards.amounts[0]));
- assert.equal(newApplication2Balance, BigNumber.sum(application2Balance, validApplicationRewards.amounts[1]));
- assert.equal(newApplication3Balance, BigNumber.sum(application3Balance, validApplicationRewards.amounts[2]));
- });
-
- it('Reaching All Validators submitted mints rewards for validators', async() => {
- const expectedValidatorRewardsAmountPerValidator = (new BigNumber(maxTotalSupply)).minus(currentTotalSupply).times(1829).div(1e8).div(day1SelectedValidators.length).integerValue(BigNumber.ROUND_DOWN);
- const expectedValidatorRewardsAmountSum = expectedValidatorRewardsAmountPerValidator.times(day1SelectedValidators.length);
- const validator1Balance = (await instance.methods.balanceOf(validator1.rewardsAddress).call());
- const validator2Balance = (await instance.methods.balanceOf(validator2.rewardsAddress).call());
- const validator3Balance = (await instance.methods.balanceOf(validator3.rewardsAddress).call());
- txRes = await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator3.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // exepct DailyRewardsSubmitted
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['1']).toLowerCase(),day1ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsSubmitted'].returnValues['2']).toLowerCase(),String(validator3.account).toLowerCase());
- // expect no DailyRewardsApplicationsMinted event
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, false);
- // expect DailyRewardsValidatorsMinted
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['0']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['1']).toLowerCase(),day1ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['2']).toLowerCase(),String(day1SelectedValidators.length));
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['3']).toLowerCase(),expectedValidatorRewardsAmountSum.toString());
- // expect validators balances to change
- const newValidator1Balance = (await instance.methods.balanceOf(validator1.rewardsAddress).call());
- const newValidator2Balance = (await instance.methods.balanceOf(validator2.rewardsAddress).call());
- const newValidator3Balance = (await instance.methods.balanceOf(validator3.rewardsAddress).call());
- assert.equal(newValidator1Balance, BigNumber.sum(validator1Balance, expectedValidatorRewardsAmountPerValidator));
- assert.equal(newValidator2Balance, BigNumber.sum(validator2Balance, expectedValidatorRewardsAmountPerValidator));
- assert.equal(newValidator3Balance, BigNumber.sum(validator3Balance, expectedValidatorRewardsAmountPerValidator));
- });
-
- it('Trying to submit for the same day after daily rewards were reset by all validator', async() => {
- try {
- expect(txRes = await instance.methods.submitDailyRewards(1, day1ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error)
- }
- catch (error) {
- //
- }
- });
-
- it(`Submitting next day rewards before 24 hours (using ${secondsBetweenDailyRewards} in test) is rejected`, async() => {
- try {
- expect(txRes = await instance.methods.submitDailyRewards(2, day2ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') })).to.be.rejectedWith(Error)
- }
- catch (error) {
- //
- }
- });
-
- it('Submitting next day rewards when not all validators submitted will give the submitting validators from yesterdays their rewards using the new validator reward percent param', async() => {
- rewardsDayInfo = calcRewardsDay();
- console.log(`will wait for ${rewardsDayInfo.secondsLeft} seconds before submitting day 2`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 3;
- }, 90000, 1000);
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
-
- // get current total supply before minting tomorrow
- currentTotalSupply = await instance.methods.totalSupply().call();
-
- txRes = await instance.methods.submitDailyRewards(2, day2ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- txRes = await instance.methods.submitDailyRewards(2, day2ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- txRes = await instance.methods.submitDailyRewards(2, day2ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator3.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- assert.equal(String(txRes.events['DailyRewardsApplicationsMinted'].returnValues['0']).toLowerCase(),'2');
- // expect no DailyRewardsValidatorsMinted event
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, false);
- // application rewards were given here now submit for next day
- rewardsDayInfo = calcRewardsDay();
- console.log(`Submitted for day 2 will wait for ${rewardsDayInfo.secondsLeft} seconds beofre day 3`);
- result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 4;
- }, 90000, 1000);
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
-
- txRes = await instance.methods.submitDailyRewards(3, day3ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // expect no DailyRewardsApplicationsMinted event
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, false);
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, true);
- // expect DailyRewardsValidatorsMinted for tomorrowTimestamp for only 3 validators out of 4
- const expectedValidatorRewardsAmountPerValidator = (new BigNumber(maxTotalSupply)).minus(currentTotalSupply).times(1830).div(1e8).div(3).integerValue(BigNumber.ROUND_DOWN);
- const expectedValidatorRewardsAmountSum = expectedValidatorRewardsAmountPerValidator.times(3);
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['0']).toLowerCase(),'2');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['1']).toLowerCase(),day2ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['2']).toLowerCase(),'3');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['3']).toLowerCase(),expectedValidatorRewardsAmountSum.toString());
- });
-
- it('App rewards and validator rewards work with 1 validator', async() => {
- txRes = await instance.methods.setValidators(4, [validator1.account]).send({ from: newControllerAddress, gas: utils.gasLimit('rewardtest') });
- logGasUsed('setValidators', txRes.gasUsed);
- assert.deepEqual(txRes.events['ValidatorsListUpdated'].returnValues['0'].map(function(item) { return item.toLowerCase()}),[validator1.account]);
- assert.equal(String(txRes.events['ValidatorsListUpdated'].returnValues['1']).toLowerCase(),'4');
- // finish day 2
- txRes = await instance.methods.submitDailyRewards(3, day3ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator2.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- txRes = await instance.methods.submitDailyRewards(3, day3ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator3.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, true);
- txRes = await instance.methods.submitDailyRewards(3, day3ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator4.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, false);
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, true);
- currentTotalSupply = await instance.methods.totalSupply().call();
- console.log(`will wait for ${rewardsDayInfo.secondsLeft} seconds before submitting day 4`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 5;
- }, 90000, 1000);
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
-
- txRes = await instance.methods.submitDailyRewards(4, day4ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // expect both applications and validators to be minted
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, true);
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, true);
- const expectedValidatorRewardsAmountSum = (new BigNumber(maxTotalSupply)).minus(currentTotalSupply).times(1830).div(1e8).integerValue(BigNumber.ROUND_DOWN);
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['0']).toLowerCase(),'4');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['1']).toLowerCase(),day4ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['2']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['3']).toLowerCase(),expectedValidatorRewardsAmountSum.toString());
- });
-
- it('App rewards and validator rewards work after a gap in the days', async() => {
- console.log(`will wait for ${rewardsDayInfo.secondsLeft*2} seconds before submitting day 6`);
- let result = await waitUntil(() => {
- rewardsDayInfo = calcRewardsDay();
- return rewardsDayInfo.rewardsDay == 7;
- }, 90000, 1000);
- // process.stdout.clearLine();
- // process.stdout.cursorTo(0);
- currentTotalSupply = await instance.methods.totalSupply().call();
- txRes = await instance.methods.submitDailyRewards(6, day6ValidApplicationRewardsHash, validApplicationRewards.applications, validApplicationRewards.amounts).send({ from: validator1.account, gas: utils.gasLimit('rewardtest') });
- logGasUsed('submitDailyRewards', txRes.gasUsed);
- // expect both applications and validators to be minted
- assert.equal('DailyRewardsApplicationsMinted' in txRes.events, true);
- assert.equal('DailyRewardsValidatorsMinted' in txRes.events, true);
- const expectedValidatorRewardsAmountSum = (new BigNumber(maxTotalSupply)).minus(currentTotalSupply).times(1830).div(1e8).integerValue(BigNumber.ROUND_DOWN);
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['0']).toLowerCase(),'6');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['1']).toLowerCase(),day6ValidApplicationRewardsHash.toLowerCase());
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['2']).toLowerCase(),'1');
- assert.equal(String(txRes.events['DailyRewardsValidatorsMinted'].returnValues['3']).toLowerCase(),expectedValidatorRewardsAmountSum.toString());
- });
- });
- after(async () => {
- gasSummary();
- });
-
-});
-
-
diff --git a/test/propstoken-1-main.test.js b/test/propstoken-1-main.test.js
index 8475f3b4..ee761eab 100644
--- a/test/propstoken-1-main.test.js
+++ b/test/propstoken-1-main.test.js
@@ -12,17 +12,56 @@ This file tests the following propstoken contract functionalities:
/* eslint-disable no-undef */
/* eslint-disable prefer-destructuring */
global.timestamp = Math.floor(Date.now() / 1000) + 20; // now + 60 seconds to allow for further testing when not allowed
-const BigNumber = require('bignumber.js');
-const waitUntil = require('async-wait-until');
+const BigNumberJS = require('bignumber.js');
const ethUtil = require('ethereumjs-util');
const main = require('../scripts/tests/index.js').main;
const utils = require('../scripts_utils/utils');
+const { assert } = require('chai');
+const { keccak256, defaultAbiCoder, toUtf8Bytes, solidityPack, hexlify } = require('ethers').utils;
+const { BigNumber } = require('ethers');
+const { MaxUint256 } = require('ethers').constants;
const formattedAddress = address => Buffer.from(ethUtil.stripHexPrefix(address), 'hex');
const formattedInt = int => ethUtil.setLengthLeft(int, 32);
const formattedBytes32 = bytes => ethUtil.addHexPrefix(bytes.toString('hex'));
const hashedTightPacked = args => ethUtil.sha3(Buffer.concat(args));
+const getApprovalDigest = async (name, address, approvalObj, nonce, deadline, chainId) => {
+ const DOMAIN_SEPARATOR = getDomainSeparator(name, address, chainId);
+ const permitTypeHash = await instance.methods.PERMIT_TYPEHASH().call();
+ return keccak256(
+ solidityPack(
+ ['bytes1', 'bytes1', 'bytes32', 'bytes32'],
+ [
+ '0x19',
+ '0x01',
+ DOMAIN_SEPARATOR,
+ keccak256(
+ defaultAbiCoder.encode(
+ ['bytes32', 'address', 'address', 'uint256', 'uint256', 'uint256'],
+ [permitTypeHash, approvalObj.owner, approvalObj.spender, BigNumber.from(approvalObj.value), BigNumber.from(nonce), BigNumber.from(deadline)]
+ )
+ )
+ ]
+ )
+ )
+}
+
+
+const getDomainSeparator = function (name, tokenAddress, chainId) {
+ return keccak256(
+ defaultAbiCoder.encode(
+ ['bytes32', 'bytes32', 'bytes32', 'uint256', 'address'],
+ [
+ keccak256(toUtf8Bytes('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)')),
+ keccak256(toUtf8Bytes(name)),
+ keccak256(toUtf8Bytes('1')),
+ chainId,
+ tokenAddress
+ ]
+ )
+ )
+}
let instance;
contract('main', (_accounts) => {
@@ -47,29 +86,52 @@ contract('main', (_accounts) => {
});
it('Total Supply is correct', async () => {
- const totalSupply = new BigNumber(await instance.methods.totalSupply().call());
- const expectedTotalSupply = new BigNumber(0.6 * (10 ** 9) * (1 * 10 ** 18));
+ const totalSupply = new BigNumberJS(await instance.methods.totalSupply().call());
+ const expectedTotalSupply = new BigNumberJS(0.6 * (10 ** 9) * (1 * 10 ** 18));
// console.log(`totalSupply=${totalSupply.toString()} expectedTotalSupply=${expectedTotalSupply.toString()}`);
const isEqual = totalSupply.isEqualTo(expectedTotalSupply);
assert.equal(isEqual, true);
});
it('Total Supply owned by tokenHolder', async () => {
- const totalSupply = new BigNumber(await instance.methods.totalSupply().call());
+ const totalSupply = new BigNumberJS(await instance.methods.totalSupply().call());
const tokenHolderBalance = await instance.methods.balanceOf(web3.eth.accounts[3]).call();
const isEqual = totalSupply.isEqualTo(tokenHolderBalance);
assert.equal(isEqual, true);
});
- // it('Transfer start time is correct', async () => {
- // const transferStartTime = await instance.methods.transfersStartTime().call();
- // assert.equal(transferStartTime, global.timestamp);
- // });
+ it('Max Supply is properly set', async () => {
+ maxTotalSupply = (await instance.methods.maxTotalSupply().call());
+ assert.equal(String(web3.fromWei(maxTotalSupply)), "1000000000");
+ });
+ });
+
+ describe('Controller Tests', async () => {
+ const controllerAddress = _accounts[2];
+ const newControllerAddress = _accounts[4];
+
+ it('Controller is properly set', async () => {
+ const currentController = await instance.methods.controller().call();
+ assert.equal(currentController.toLowerCase(), controllerAddress.toLowerCase());
+ });
+
+ it('Controller can be changed by controller', async () => {
+ txRes = await instance.methods.updateController(newControllerAddress).send({ from: controllerAddress });
+ const currentController = await instance.methods.controller().call();
+ assert.equal(currentController.toLowerCase(), newControllerAddress.toLowerCase());
+ });
+
+ it('ControllerUpdated Event Emitted', async () => {
+ assert.equal(String(txRes.events['ControllerUpdated'].returnValues['0']).toLowerCase(),String(newControllerAddress).toLowerCase());
+ });
- // it('Transfer start time exception address is correct', async () => {
- // const canTransferExceptionAddress = await instance.methods.canTransferBeforeStartTime().call();
- // assert.equal(String(canTransferExceptionAddress).toLowerCase(), String(web3.eth.accounts[3]).toLowerCase());
- // });
+ it('Controller cannot be changed by non controller', async () => {
+ try {
+ expect(await instance.methods.updateController(controllerAddress).send({ from: controllerAddress })).to.be.rejectedWith(Error);
+ } catch (error) {
+ //
+ }
+ });
});
describe('ERC20 Tests', async () => {
@@ -94,379 +156,190 @@ contract('main', (_accounts) => {
});
});
- // describe('Timebase transfer logic', async () => {
- // let newAccount3Balance;
- // let newAccount4Balance;
- // it('transfer fails if non holder account before transfer start time', async () => {
- // const amount = 10;
- // try {
- // expect(await instance.methods.transfer(web3.eth.accounts[3], web3.toWei(amount)).send({ from: web3.eth.accounts[4] })).to.be.rejectedWith(Error);
- // } catch (error) {
- // //
- // }
- // });
-
- // it('transfer succeeds with holder account before transfer start time', async () => {
- // const amount = 10;
- // const account3Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[3]).call());
- // const account4Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[4]).call());
- // const result = await instance.methods.transfer(web3.eth.accounts[4], web3.toWei(amount)).send({ from: web3.eth.accounts[3] });
- // newAccount3Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[3]).call());
- // newAccount4Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[4]).call());
- // assert.equal(Number(newAccount3Balance), Number(account3Balance) - Number(amount));
- // assert.equal(Number(newAccount4Balance), Number(account4Balance) + Number(amount));
- // });
-
- // it('transfer succeeds with non holder accoutn after after tranfer start time', async () => {
- // // Wait for some async operation to end
- // try {
- // console.log(`will wait for ${global.timestamp - Math.floor(Date.now() / 1000)} seconds...`);
- // const result = await waitUntil(() => {
- // const timePassed = global.timestamp - Math.floor(Date.now() / 1000);
- // return timePassed < 0;
- // }, 90000, 1000);
-
- // // Here are the operations to be done after predicate
- // const amount = 10;
- // const account3Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[3]).call());
- // const account4Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[4]).call());
- // const res = await instance.methods.transfer(web3.eth.accounts[3], web3.toWei(amount)).send({ from: web3.eth.accounts[4] });
- // newAccount3Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[3]).call());
- // newAccount4Balance = web3.fromWei(await instance.methods.balanceOf(web3.eth.accounts[4]).call());
- // assert.equal(Number(newAccount3Balance), Number(account3Balance) + Number(amount));
- // assert.equal(Number(newAccount4Balance), Number(account4Balance) - Number(amount));
- // } catch (error) {
- // // Here are the operations to be done if predicate didn't succeed in the timeout
- // console.log('Async operation failed: ', error);
- // }
- // });
- // });
-
- const alice = { address: '0x1c77BCe3fAc2d7023aB3f9A6369c100FB8B6c7B5', pk: 'c79b0f20fac88d078d1ab0908fcafb31708e83a46fabfe7601d5b0d7bd5b2974' };
- const bob = { address: web3.eth.accounts[8], pk: 'f34381274ac5cca8a465209bdeafeed0274ddcf7ba1df080df772b73ccad032a' };
- const charlie = { address: web3.eth.accounts[9], pk: '5027f6ea1ab6cd9fe2bc5c2bbb07d5ec77524529964aafe0d02a76aabaa4917f' };
- const damien = { address: web3.eth.accounts[7], pk: 'c79b0f20fac88d078d1ab0908fcafb31708e83a46fabfe7601d5b0d7bd5b2974' };
- const to = bob.address;
- const delegate = charlie.address;
- const fee = 10;
- const amount = 100;
- const propsInWallet = 5000;
- const alicePrivateKey = Buffer.from(alice.pk, 'hex');
- let components;
- let nonce;
- describe('ERC865 compatible logic', async () => {
- it('Charlie transfers 100 tokens from Alice to Bob (fee=10)', async () => {
- // give alice some props
-
- await instance.methods.transfer(alice.address, propsInWallet).send( { from: web3.eth.accounts[3] });
-
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('0d98dcb1', 'hex'),
- formattedAddress(instance._address),
- formattedAddress(to),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- await instance.methods.transferPreSigned(sig,to,amount,fee,nonce).send({ from: charlie.address, gas:1000000});
-
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- bobBalance = await instance.methods.balanceOf(bob.address).call();
- charlieBalance = await instance.methods.balanceOf(charlie.address).call();
-
- assert.equal(Number(aliceBalance), propsInWallet - (amount + fee));
- assert.equal(Number(bobBalance), amount);
- assert.equal(Number(charlieBalance), fee);
+ describe('Uniswap Permit Tests', async () => {
+
+ let txRes, bobBalance, damienBalance, aliceBalance;
+ const bob = { address: web3.eth.accounts[8], pk: 'f34381274ac5cca8a465209bdeafeed0274ddcf7ba1df080df772b73ccad032a' };
+ const damien = { address: web3.eth.accounts[7], pk: 'c79b0f20fac88d078d1ab0908fcafb31708e83a46fabfe7601d5b0d7bd5b2974' };
+ const alice = { address: web3.eth.accounts[9], pk: '5027f6ea1ab6cd9fe2bc5c2bbb07d5ec77524529964aafe0d02a76aabaa4917f' };
+ const amount = 1000;
+
+ it('PERMIT_TYPEHASH is correct', async () => {
+ const permitTypeHash = await instance.methods.PERMIT_TYPEHASH().call();
+ assert.equal(permitTypeHash, keccak256(toUtf8Bytes('Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)')));
});
- it('Damien tries to replay transfer and fails', async () => {
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
+ it('DOMAIN_SEPARATOR is correct', async () => {
+ const domainSeparator = await instance.methods.DOMAIN_SEPARATOR().call();
+ const name = await instance.methods.name().call();
+ const chainId = await instance.methods.MY_CHAIN_ID().call();
+ const expectedResult = getDomainSeparator(name, instance.address, chainId);
+ assert.equal(domainSeparator, expectedResult);
+ });
+
+ // in this scenario we have damien and bob funded with 1000 tokens
+ // damien is allowing bob to transfer half of this amount from his (damien) wallet
+ it('Permit works', async () => {
+ const name = await instance.methods.name().call();
+ const chainId = await instance.methods.MY_CHAIN_ID().call();
+ const tokenHolderAddress = web3.eth.accounts[3];
+ const nonce = await instance.methods.nonces(damien.address).call();
+ await instance.methods.transfer(bob.address, web3.toWei(amount)).send({ from: tokenHolderAddress});
+ await instance.methods.transfer(damien.address, web3.toWei(amount)).send({ from: tokenHolderAddress});
+ const deadline = MaxUint256
+ // console.log(`getApprovalDigest(${name}),${instance.address},{${damien.address},${bob.address},${web3.toWei(amount/2)}}, ${nonce}, ${deadline}`);
+ const digest = await getApprovalDigest(name, instance.address,
+ { owner: damien.address, spender: bob.address, value: web3.toWei(amount / 2) },
+ nonce,
+ deadline,
+ chainId
+ )
+
+ const { v, r, s } = ethUtil.ecsign(Buffer.from(digest.slice(2), 'hex'), Buffer.from(damien.pk, 'hex'))
try {
- const tx = await instance.methods.transferPreSigned(
- sig,
- to,
- amount,
- fee,
- nonce).send(
- { from: charlie.address, gas:1000000 }
- );
- assert.equal(tx.receipt.status, '0x00');
+ txRes = await instance.methods.permit(damien.address, bob.address, web3.toWei(amount / 2), deadline, v, hexlify(r), hexlify(s)).send({ from: damien.address});
} catch (error) {
- // console.log(`error:${error}`);
+ console.log(`Permit tx failed:${error}`);
+ //
}
- });
-
- it('Charlie approves Damien to spend 100 tokens on behalf of Alice to Bob (fee=10)', async () => {
- // give alice some props
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- const oldAliceBalance = aliceBalance;
- const oldCharlieBalance = charlieBalance;
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('79250dcf', 'hex'),
- formattedAddress(instance.address),
- formattedAddress(damien.address),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- // console.log(`${instance.address},${to},${amount},${fee},${nonce},${sig}`);
- await instance.methods.approvePreSigned(
- sig,
- damien.address,
- amount,
- fee,
- nonce).send(
- { from: charlie.address , gas:1000000}
- );
-
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- charlieBalance = await instance.methods.balanceOf(charlie.address).call();
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- assert.equal(Number(aliceBalance), Number(oldAliceBalance) - fee);
- assert.equal(Number(charlieBalance), Number(oldCharlieBalance) + fee);
+ // await expect(token.permit(damien.address, bob.address, amount/2, deadline, v, hexlify(r), hexlify(s)))
+ // .to.emit(token, 'Approval')
+ // .withArgs(wallet.address, other.address, TEST_AMOUNT)
+ const allowanceDamien = web3.fromWei(await instance.methods.allowance(damien.address, bob.address).call());
+ const nonceDamien = await instance.methods.nonces(damien.address).call();
+ // console.log(`allowanceDamien:${allowanceDamien}`);
+ // console.log(`nonceDamien:${nonceDamien}`);
+ assert.equal(allowanceDamien, String(amount / 2));
+ assert.equal(nonceDamien,'1');
});
-
- it('Damien transfers half of approved tokens from Alice to Bob', async () => {
- const oldAliceBalance = aliceBalance;
- const oldBobBalance = bobBalance;
- await instance.methods.transferFrom(alice.address, bob.address, amount / 2).send({ from: damien.address });
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- bobBalance = await instance.methods.balanceOf(bob.address).call();
- assert.equal(Number(aliceBalance), Number(oldAliceBalance) - (amount / 2));
- assert.equal(Number(bobBalance), Number(oldBobBalance) + (amount / 2));
+
+ it('Approval Event Emitted', async () => {
+ //Approval
+ assert.equal(String(txRes.events['Approval'].returnValues['1']).toLowerCase(),String(bob.address).toLowerCase());
+ assert.equal(String(txRes.events['Approval'].returnValues['0']).toLowerCase(),String(damien.address).toLowerCase());
+ assert.equal(Number(web3.fromWei(txRes.events['Approval'].returnValues['2'])), String(amount/2));
});
- it('Charlie performs transferFrom of 50 tokens on behalf of damien from Alice to Bob (fee=10)', async () => {
- // nonce = await web3.eth.getTransactionCount(alice.address);
- const oldAliceBalance = aliceBalance;
- const oldBobBalance = bobBalance;
- const oldCharlieBalance = charlieBalance;
- const oldDamienBalance = await instance.methods.balanceOf(damien.address).call();
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[7]);
- components = [
- Buffer.from('a70c41b4', 'hex'),
- formattedAddress(instance.address),
- formattedAddress(alice.address),
- formattedAddress(bob.address),
- formattedInt(amount / 2),
- formattedInt(fee),
- formattedInt(nonce),
- ];
- // console.log(`components instance.address=${instance.address}, alice.address=${alice.address}, `)
- const vrs = ethUtil.ecsign(hashedTightPacked(components), Buffer.from(damien.pk, 'hex'));
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- await instance.methods.transferFromPreSigned(
- sig,
- alice.address,
- bob.address,
- amount / 2,
- fee,
- nonce).send(
- { from: charlie.address, gas:1000000 }
- );
-
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- bobBalance = await instance.methods.balanceOf(bob.address).call();
- charlieBalance = await instance.methods.balanceOf(charlie.address).call();
- damienBalance = await instance.methods.balanceOf(damien.address).call();
-
- assert.equal(Number(aliceBalance), Number(oldAliceBalance) - ((amount / 2) + fee));
- assert.equal(Number(bobBalance), Number(oldBobBalance) + (amount / 2));
- assert.equal(Number(charlieBalance), Number(oldCharlieBalance) + fee);
+ // this scenario follows up on the permit function above
+ // damien allowed bob to transfer up {amount/2} tokens bob is now transferring
+ it('TranferFrom fail if trying to transfer more than allowed', async () => {
+ try {
+ expect(await instance.methods.transferFrom(damien.address, alice.address, web3.toWei(amount + 1)).send({ from: bob.address })).to.be.rejectedWith(Error);
+ } catch (error) {
+ //
+ }
});
-
- it('Charlie increase allowance of Damien to spend 100 tokens on behalf of Alice to Bob (fee=10)', async () => {
- // give alice some props
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
+ // this scenario follows up on the permit function above
+ // damien allowed bob to transfer up {amount/2} tokens bob is now transferring
+ it('Can use tranferFrom after permit with amount <= allowed', async () => {
+ bobBalance = web3.fromWei(await instance.methods.balanceOf(bob.address).call());
+ damienBalance = web3.fromWei(await instance.methods.balanceOf(damien.address).call());
+ aliceBalance = web3.fromWei(await instance.methods.balanceOf(alice.address).call());
+ const oldBobBalance = bobBalance;
+ const oldDamienBalance = damienBalance;
const oldAliceBalance = aliceBalance;
- const oldCharlieBalance = charlieBalance;
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('138e8da1', 'hex'),
- formattedAddress(instance.address),
- formattedAddress(damien.address),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- // console.log(`${instance.address},${to},${amount},${fee},${nonce},${sig}`);
- await instance.methods.increaseAllowancePreSigned(
- sig,
- damien.address,
- amount,
- fee,
- nonce).send(
- { from: charlie.address, gas:1000000 }
- );
-
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- charlieBalance = await instance.methods.balanceOf(charlie.address).call();
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- assert.equal(Number(aliceBalance), Number(oldAliceBalance) - fee);
- assert.equal(Number(charlieBalance), Number(oldCharlieBalance) + fee);
- const allowance = await instance.methods.allowance(alice.address, damien.address).call();
- assert.equal(Number(allowance), amount);
+ const txRes = await instance.methods.transferFrom(damien.address, alice.address, web3.toWei(amount / 2)).send({ from: bob.address });
+ // console.log(`transferFrom event? ${JSON.stringify(txRes.events['Transfer'].returnValues)}`);
+ bobBalance = web3.fromWei(await instance.methods.balanceOf(bob.address).call());
+ damienBalance = web3.fromWei(await instance.methods.balanceOf(damien.address).call());
+ aliceBalance = web3.fromWei(await instance.methods.balanceOf(alice.address).call());
+ assert.equal(Number(aliceBalance), Number(oldAliceBalance) + (amount / 2));
+ assert.equal(Number(bobBalance), Number(oldBobBalance));
+ assert.equal(Number(damienBalance), Number(oldDamienBalance) - (amount / 2));
});
-
- it('Charlie decreases allowance of Damien to spend 50 tokens on behalf of Alice to Bob (fee=10)', async () => {
- // give alice some props
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- const oldAliceBalance = aliceBalance;
- const oldCharlieBalance = charlieBalance;
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('5229c56f', 'hex'),
- formattedAddress(instance.address),
- formattedAddress(damien.address),
- formattedInt(amount / 2),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- // console.log(`${instance.address},${to},${amount},${fee},${nonce},${sig}`);
- await instance.methods.decreaseAllowancePreSigned(
- sig,
- damien.address,
- amount / 2,
- fee,
- nonce).send(
- { from: charlie.address, gas:1000000 }
- );
-
- aliceBalance = await instance.methods.balanceOf(alice.address).call();
- charlieBalance = await instance.methods.balanceOf(charlie.address).call();
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- assert.equal(Number(aliceBalance), Number(oldAliceBalance) - fee);
- assert.equal(Number(charlieBalance), Number(oldCharlieBalance) + fee);
- const allowance = await instance.methods.allowance(alice.address, damien.address).call();
- assert.equal(Number(allowance), amount / 2);
+ });
+
+ describe('Reclaim Contract Tokens', async () => {
+ const amount = 1000;
+ let controllerBalance, transferResult, contractBalance, randomWalletBalance, controllerAddress;
+ const tokenHolderAddress = web3.eth.accounts[3];
+ const randomWalletAddress = web3.eth.accounts[5];
+ it('Contract address can receive tokens', async () => {
+ controllerAddress = await instance.methods.controller().call(); // web3.eth.accounts[2];
+ controllerBalance = web3.fromWei(await instance.methods.balanceOf(controllerAddress).call());
+ transferResult = await instance.methods.transfer(instance.address, web3.toWei(amount)).send({ from: tokenHolderAddress});
+ contractBalance = web3.fromWei(await instance.methods.balanceOf(instance.address).call());
+ assert.equal(String(contractBalance), String(amount));
});
- it('Charlie decreases allowance of Damien by 100 when only 50 are allowed is rejected', async () => {
- // give alice some props
- // console.log(`Balances: aliceBalance=${aliceBalance.toNumber()},bobBalance=${bobBalance.toNumber()},charlieBalance=${charlieBalance.toNumber()}`);
- const oldAliceBalance = aliceBalance;
- const oldCharlieBalance = charlieBalance;
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('5229c56f', 'hex'),
- formattedAddress(instance.address),
- formattedAddress(damien.address),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
- // console.log(`${instance.address},${to},${amount},${fee},${nonce},${sig}`);
+ it('Cannot be reclaimed by non controller', async () => {
try {
- expect(await instance.methods.decreaseAllowancePreSigned(
- sig,
- damien.address,
- amount,
- fee,
- nonce).send(
- { from: charlie.address, gas:1000000 }
- )).to.be.rejectedWith(Error);
+ expect(await instance.methods.reclaimToken(instance.address, controllerAddress, web3.toWei(amount)).send({ from: randomWalletAddress })).to.be.rejectedWith(Error);
} catch (error) {
//
}
});
- it('Charlie tries to transfer more tokens than alice has to Bob (fee=10)', async () => {
-
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('0d98dcb1', 'hex'),
- formattedAddress(instance._address),
- formattedAddress(to),
- formattedInt(amount*1000000),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
+
+ it('Amount reclaimed cannot exceed balance', async () => {
try {
- const tx = await instance.methods.transferPreSigned(sig,to,amount,fee,nonce).send({ from: charlie.address, gas:1000000});
- assert.equal(tx.receipt.status, '0x00');
+ expect(await instance.methods.reclaimToken(instance.address, randomWalletAddress, web3.toWei(amount + 10)).send({ from: controllerAddress })).to.be.rejectedWith(Error);
} catch (error) {
- // console.log(`error:${error}`);
+ //
}
});
- it('Charlie tries to transfer tokens from alice has to no-one', async () => {
-
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('0d98dcb1', 'hex'),
- formattedAddress(instance._address),
- formattedAddress('0x0'),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), alicePrivateKey);
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
+ it('Reclaim works if done by controller', async () => {
+ const reclaimResult = await instance.methods.reclaimToken(instance.address, randomWalletAddress, web3.toWei(amount)).send({ from: controllerAddress })
+ randomWalletBalance = web3.fromWei(await instance.methods.balanceOf(randomWalletAddress).call());
+ contractBalance = web3.fromWei(await instance.methods.balanceOf(instance.address).call());
+ assert.equal(String(randomWalletBalance), String(amount));
+ assert.equal(String(contractBalance), "0");
+ });
+ });
+
+ describe('Minter role test', async () => {
+ const amount = 1000;
+ let controllerBalance, transferResult, contractBalance, randomWalletBalance, prevRandomWalletBalance;
+ const tokenHolderAddress = web3.eth.accounts[3];
+ const randomWalletAddress = web3.eth.accounts[5];
+ const controllerAddress = web3.eth.accounts[4];
+ const minterAddress1 = web3.eth.accounts[6];
+ const minterAddress2 = web3.eth.accounts[7];
+ it('Controller can add a minter address', async() => {
+ const addMinterResult = await instance.methods.addMinter(minterAddress1).send({ from: controllerAddress});
+ });
+ it('Non controller cannot add a minter address', async() => {
try {
- const tx = await instance.methods.transferPreSigned(sig,to,amount,fee,nonce).send({ from: charlie.address, gas:1000000});
- assert.equal(tx.receipt.status, '0x00');
+ expect(await instance.methods.addMinter(minterAddress2).send({ from: randomWalletAddress})).to.be.rejectedWith(Error);
} catch (error) {
- // console.log(`error:${error}`);
- }
+ //
+ }
+ });
+
+ it('Cannot mint by non minter address', async () => {
+ try {
+ expect(await instance.methods.mint(randomWalletAddress, web3.toWei(amount)).send({ from: randomWalletAddress })).to.be.rejectedWith(Error);
+ } catch (error) {
+ //
+ }
+ });
+
+ it('Mint works by minter', async () => {
+ prevRandomWalletBalance = web3.fromWei(await instance.methods.balanceOf(randomWalletAddress).call());
+ await instance.methods.mint(randomWalletAddress, web3.toWei(amount)).send({ from: minterAddress1 })
+ randomWalletBalance = web3.fromWei(await instance.methods.balanceOf(randomWalletAddress).call());
+ assert.equal(String(randomWalletBalance), String(Number(amount)+Number(prevRandomWalletBalance)));
+ });
+
+ it('Minter can be removed by controller', async () => {
+ await instance.methods.removeMinter(minterAddress1).send({ from: controllerAddress })
});
- it('Charlie tries to transfer tokens with bad signature from alice to bob', async () => {
-
- // nonce = await web3.eth.getTransactionCount(alice.address);
- nonce = await web3.eth.getTransactionCount(web3.eth.accounts[9]);
-
- components = [
- Buffer.from('0d98dcb1', 'hex'),
- formattedAddress(instance._address),
- formattedAddress(to),
- formattedInt(amount),
- formattedInt(fee),
- formattedInt(nonce),
- ];
-
- const vrs = ethUtil.ecsign(hashedTightPacked(components), Buffer.from(alice.pk, 'hex'));
- const sig = ethUtil.toRpcSig(vrs.v, vrs.r, vrs.s);
+ it('Minter cannot be removed by non-controller', async () => {
try {
- const tx = await instance.methods.transferPreSigned(sig,to,amount,fee,nonce).send({ from: charlie.address, gas:1000000});
- assert.equal(tx.receipt.status, '0x00');
+ expect(await instance.methods.removeMinter(minterAddress1).send({ from: randomWalletAddress })).to.be.rejectedWith(Error);
} catch (error) {
- // console.log(`error:${error}`);
- }
+ //
+ }
+ });
+
+ it('Removed minter can no longer mint', async () => {
+ try {
+ expect(await instance.methods.mint(randomWalletAddress, web3.toWei(amount)).send({ from: minterAddress1 })).to.be.rejectedWith(Error);
+ } catch (error) {
+ //
+ }
});
});
+
});