status-im/contracts
2
0
Fork 0
mirror of https://github.com/status-im/contracts.git synced 2025-02-23 12:08:47 +00:00
Code Issues Projects Releases Wiki Activity

fix constructor and signed message header

Browse Source
This commit is contained in:
Ricardo Guilherme Schmidt 2018-01-28 04:08:09 -02:00
parent d12683b9b4
commit 8cdb5d005a
3 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/status/SNTPreSigned.sol
View File

@ -9,9 +9,9 @@ import "../token/MiniMeTokenPreSignedFactory.sol";
contract SNTPreSigned is MiniMeTokenPreSigned {
// @dev SNT constructor just parametrizes the MiniMeIrrevocableVestedToken constructor
function SNTPreSigned(address _oldToken)
MiniMeToken(
new MiniMeTokenPreSignedFactory(),
function SNTPreSigned(address _newFactory, address _oldToken)
MiniMeTokenPreSigned(
_newFactory,
_oldToken, // parent token
block.number, // snapshot block
"Status Network Token", // Token name

2
contracts/token/MiniMeTokenFactory.sol
View File

@ -11,6 +11,8 @@ import "./MiniMeToken.sol";
/// same class
contract MiniMeTokenFactory {
/// @notice Update the DApp by creating a new token with new functionalities
/// the msg.sender becomes the controller of this clone token
/// @param _parentToken Address of the token being cloned

64
contracts/token/MiniMeTokenPreSigned.sol
View File

@ -9,6 +9,28 @@ import "./MiniMeToken.sol";
*/
contract MiniMeTokenPreSigned is MiniMeToken {
function MiniMeTokenPreSigned(
address _tokenFactory,
address _parentToken,
uint _parentSnapShotBlock,
string _tokenName,
uint8 _decimalUnits,
string _tokenSymbol,
bool _transfersEnabled
) MiniMeToken(
_tokenFactory,
_parentToken,
_parentSnapShotBlock,
_tokenName,
_decimalUnits,
_tokenSymbol,
_transfersEnabled
)
public
{
}
mapping (address => uint256) public nonce;
/**
@ -34,8 +56,9 @@ contract MiniMeTokenPreSigned is MiniMeToken {
{
uint256 _gas = msg.gas;
//"a9059cbb": "transfer(address,uint256)",
bytes32 txHash = keccak256(byte(0x19), byte(0), address(this), bytes4(0xa9059cbb), _to, _value, _gasPrice, _nonce);
address recovered = ecrecover(txHash, _sigV, _sigR, _sigS);
bytes32 txHash = keccak256(address(this), bytes4(0xa9059cbb), _to, _value, _gasPrice, _nonce);
bytes32 signedMsg = keccak256("\x19Ethereum Signed Message:\n32", txHash);
address recovered = ecrecover(signedMsg, _sigV, _sigR, _sigS);
require(recovered > 0x0);
require(nonce[recovered] == _nonce);
nonce[recovered]++;
@ -72,8 +95,9 @@ contract MiniMeTokenPreSigned is MiniMeToken {
uint256 _gas = msg.gas;
require(transfersEnabled);
//"cae9ca51": "approveAndCall(address,uint256,bytes)"
bytes32 txHash = keccak256(byte(0x19), byte(0), address(this), bytes4(0xcae9ca51), _spender, _amount, _extraData, _gasPrice, _nonce);
address recovered = ecrecover(txHash, _sigV, _sigR, _sigS);
bytes32 txHash = keccak256(address(this), bytes4(0xcae9ca51), _spender, _amount, _extraData, _gasPrice, _nonce);
bytes32 signedMsg = keccak256("\x19Ethereum Signed Message:\n32", txHash);
address recovered = ecrecover(signedMsg, _sigV, _sigR, _sigS);
require(recovered > 0x0);
require(nonce[recovered] == _nonce);
nonce[recovered]++;
@ -97,38 +121,6 @@ contract MiniMeTokenPreSigned is MiniMeToken {
}
/**
* @notice Include batches of presigned `approveAndCall(address,uint256,bytes)`
* @param _sigV Signature V
* @param _sigR Signature R
* @param _sigS Signature S
* @param _spender The address of the recipient
* @param _amount The amount of tokens to be transferred
* @param _extraData option data to send to contract
* @param _gasPrice How much tokens willing to pay per gas
* @param _nonce Presigned transaction number.
*/
function approveAndCallPreSigned(
uint8[] _sigV,
bytes32[] _sigR,
bytes32[] _sigS,
address[] _spender,
uint256[] _amount,
bytes[] _extraData,
uint256[] _gasPrice,
uint256[] _nonce
)
public
{
uint len = _sigR.length;
require(len == _sigS.length && len == _sigV.length);
for (uint i = 0; i < len; i++) {
approveAndCallPreSigned(_sigV[i], _sigR[i], _sigS[i], _spender[i], _amount[i], _extraData[i], _gasPrice[i], _nonce[i]);
}
}
/**
* @notice Include batches of presigned `transfer(address,uint256)`
* @param _sigV Signature V