status-im/snt-gas-relay
2
0
Fork 0
mirror of https://github.com/status-im/snt-gas-relay.git synced 2025-02-17 00:16:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/150-gas-abstraction' into 000-gas-relayer-node

Browse Source
This commit is contained in:
Richard Ramos 2018-05-16 11:51:25 -04:00
commit b9b1197c8d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/identity/IdentityGasRelay.sol
View File

@ -20,7 +20,7 @@ contract IdentityGasRelay is IdentityKernel, MessageSigned {
/** /**
* @param _messageHash that is signed * @param _messageHash that is signed
* @param _required key purpose for this type of call * @param _requiredPurpose key purpose for this type of call
* @param _nonce current identity nonce * @param _nonce current identity nonce
* @param _gasPrice price in SNT paid back to msg.sender for each gas unit used * @param _gasPrice price in SNT paid back to msg.sender for each gas unit used
* @param _gasLimit minimal gasLimit required to execute this call * @param _gasLimit minimal gasLimit required to execute this call
@ -423,7 +423,7 @@ contract IdentityGasRelay is IdentityKernel, MessageSigned {
/** /**
* @notice creates new contract based on input `_code` and transfer `_value` ETH to this instance * @notice creates new contract based on input `_code` and transfer `_value` ETH to this instance
* @param _value amount ether in wei to sent to deployed address at its initialization * @param _value amount ether in wei to sent to deployed address at its initialization
* @param _data contract code * @param _code contract code
*/ */
function doCreate( function doCreate(
uint _value, uint _value,

6
contracts/token/MiniMeToken.sol
View File

@ -306,7 +306,7 @@ contract MiniMeToken is MiniMeTokenInterface, Controlled {
uint256 _amount, uint256 _amount,
bytes _extraData bytes _extraData
) )
external public
returns (bool success) returns (bool success)
{ {
require(doApprove(msg.sender, _spender, _amount)); require(doApprove(msg.sender, _spender, _amount));
@ -405,7 +405,7 @@ contract MiniMeToken is MiniMeTokenInterface, Controlled {
* @param _cloneTokenName Name of the clone token * @param _cloneTokenName Name of the clone token
* @param _cloneDecimalUnits Number of decimals of the smallest unit * @param _cloneDecimalUnits Number of decimals of the smallest unit
* @param _cloneTokenSymbol Symbol of the clone token * @param _cloneTokenSymbol Symbol of the clone token
* @param snapshotBlock Block when the distribution of the parent token is * @param _snapshotBlock Block when the distribution of the parent token is
* copied to set the initial distribution of the new clone token; * copied to set the initial distribution of the new clone token;
* if the block is zero than the actual block, the current block is used * if the block is zero than the actual block, the current block is used
* @param _transfersEnabled True if transfers are allowed in the clone * @param _transfersEnabled True if transfers are allowed in the clone
@ -634,4 +634,4 @@ contract MiniMeToken is MiniMeTokenInterface, Controlled {
uint256 _amount uint256 _amount
); );
} }