eth-faucet

Gas token gifter with controls from time intervals, amounts and access
Log | Files | Refs | README

commit aafe47eb1994c03c5cf470f744243ce2b045aa54
parent daafa36f4ec3c73291191dbbb4702d1427d4089e
Author: lash <dev@holbrook.no>
Date:   Fri,  3 Feb 2023 07:21:38 +0000

Add backend sealing, external period checker

Diffstat:
Asolidity/EthFaucet.sol | 110+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asolidity/PeriodSimple.sol | 33+++++++++++++++++++++++++++++++++
Dsolidity/faucet.sol | 78------------------------------------------------------------------------------
3 files changed, 143 insertions(+), 78 deletions(-)

diff --git a/solidity/EthFaucet.sol b/solidity/EthFaucet.sol @@ -0,0 +1,110 @@ +pragma solidity >0.8.0; + +// SPDX-License-Identifier: GPL-3.0-or-later + +contract EthFacuet { + + address public owner; + address public registry; + address public periodChecker; + uint256 public sealState; + uint256 public value; + + uint8 constant REGISTRY_STATE = 1; + uint8 constant PERIODCHECKER_STATE = 2; + uint8 constant VALUE_STATE = 4; + uint256 constant public maxSealState = 7; + + event FaucetUsed(address indexed _recipient, address indexed _token, uint256 _value); + event FaucetFail(address indexed _recipient, address indexed _token, uint256 _value); + event FaucetAmountChange(uint256 _value); + event FaucetStateChange(uint256 indexed _sealState, address _registry, address _periodChecker); + + constructor() { + owner = msg.sender; + } + + function seal(uint256 _state) public returns(uint256) { + require(_state < 8, 'ERR_INVALID_STATE'); + require(_state & sealState == 0, 'ERR_ALREADY_LOCKED'); + sealState |= _state; + emit FaucetStateChange(sealState, registry, periodChecker); + return uint256(sealState); + } + + function setValue(uint256 _v) public returns(uint256) { + require(msg.sender == owner, 'ERR_NOT_OWNER'); + require(sealState & VALUE_STATE == 0, 'ERR_SEALED'); + value = _v; + emit FaucetAmountChange(value); + return value; + } + + function setPeriodChecker(address _checker) public { + require(msg.sender == owner, 'ERR_NOT_OWNER'); + require(sealState & PERIODCHECKER_STATE == 0, 'ERR_SEALED'); + periodChecker = _checker; + emit FaucetStateChange(sealState, registry, periodChecker); + } + + function setRegistry(address _registry) public { + require(msg.sender == owner, 'ERR_NOT_OWNER'); + require(sealState & REGISTRY_STATE == 0, 'ERR_SEALED'); + registry = _registry; + emit FaucetStateChange(sealState, registry, periodChecker); + } + + function checkPeriod(address _recipient) private returns(bool) { + bool _ok; + bytes memory _result; + + (_ok, _result) = periodChecker.call(abi.encodeWithSignature("check(address)", _recipient)); + if (!_ok) { + revert('ERR_PERIOD_BACKEND_ERROR'); + } + if (_result[31] == 0) { + revert('ERR_PERIOD_CHECK'); + } + return true; + } + + function checkRegistry(address _recipient) private returns(bool) { + bool _ok; + bytes memory _result; + + (_ok, _result) = registry.call(abi.encodeWithSignature("have(address)", _recipient)); + if (!_ok) { + emit FaucetFail(_recipient, address(0), value); + revert('ERR_TRANSFER'); + } + + emit FaucetUsed(_recipient, address(0), value); + return true; + } + + function check(address _recipient) private returns(bool) { + if (periodChecker != address(0)) { + checkPeriod(_recipient); + } + if (registry != address(0)) { + checkRegistry(_recipient); + } + return true; + } + + + function get() public returns(uint256) { + check(msg.sender); + payable(msg.sender).transfer(value); + return value; + } + + function to(address _recipient) public returns(uint256) { + check(_recipient); + payable(_recipient).transfer(value); + return value; + } + + receive () payable external { + } +} diff --git a/solidity/PeriodSimple.sol b/solidity/PeriodSimple.sol @@ -0,0 +1,33 @@ +pragma solidity >0.8.0; + +// SPDX-License-Identifier: GPL-3.0-or-later + +contract PeriodSimple { + + address public owner; + address public poker; + uint256 public period; + mapping (address => uint256) public lastUsed; + + event PeriodChange(uint256 _value); + + constructor() { + owner = msg.sender; + poker = owner; + } + + function setPeriod(uint256 _period) public { + require(owner == msg.sender, 'ERR_NOT_OWNER'); + period = _period; + } + + function check(address _subject) public view returns(bool) { + return block.timestamp < lastUsed[_subject] + period; + } + + function poke(address _subject) public { + require(msg.sender == owner || msg.sender == poker, 'ERR_ACCESS'); + require(check(_subject), 'ERR_PREMATURE'); + lastUsed[_subject] = block.timestamp; + } +} diff --git a/solidity/faucet.sol b/solidity/faucet.sol @@ -1,78 +0,0 @@ -pragma solidity >0.8.0; - -// SPDX-License-Identifier: GPL-3.0-or-later - -contract EthFacuet { - - address public owner; - address public registry; - uint256 public value; - uint256 public period; - - mapping (address => uint256) public lastUsed; - - event FaucetUsed(address indexed _recipient, address indexed _token, uint256 _value); - event FaucetFail(address indexed _recipient, address indexed _token, uint256 _value); - event FaucetAmountChange(uint256 _value); - - constructor(address _registry, uint256 periodMinutes) { - registry = _registry; - period = periodMinutes; - owner = msg.sender; - } - - function setValue(uint256 _v) public returns(uint256) { - require(msg.sender == owner, 'ERR_NOT_OWNER'); - value = _v; - emit FaucetAmountChange(value); - return value; - } - - function checkPeriod(address _recipient) private view returns(bool) { - if (lastUsed[_recipient] == 0) { - return true; - } - require(block.timestamp > lastUsed[_recipient] + period); - return true; - } - - function checkRegistry(address _recipient) private returns(bool) { - bool _ok; - bytes memory _result; - - (_ok, _result) = registry.call(abi.encodeWithSignature("have(address)", _recipient)); - if (!_ok) { - emit FaucetFail(_recipient, address(0), value); - revert('ERR_TRANSFER'); - } - - emit FaucetUsed(_recipient, address(0), value); - return true; - } - - function check(address _recipient) private returns(bool) { - if (period > 0) { - checkPeriod(_recipient); - } - if (registry != address(0)) { - checkRegistry(_recipient); - } - return true; - } - - - function get() public returns(uint256) { - check(msg.sender); - payable(msg.sender).transfer(value); - return value; - } - - function to(address _recipient) public returns(uint256) { - check(_recipient); - payable(_recipient).transfer(value); - return value; - } - - receive () payable external { - } -}