Merge branch 'tmp' into dev-0.2.0

2025-01-06 00:57:33 +01:00 · 2023-03-20 10:49:20 +00:00 · 2023-03-20 10:49:20 +00:00 · 86652cc5f0
commit 86652cc5f0
parent 524d88a0c6 f7a5a5a900
8 changed files with 108 additions and 47 deletions
--- a/python/eth_faucet/data/EthFaucet.bin
+++ b/python/eth_faucet/data/EthFaucet.bin
--- a/python/eth_faucet/data/EthFaucet.json
+++ b/python/eth_faucet/data/EthFaucet.json
@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"FaucetAmountChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"FaucetFail","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_sealState","type":"uint256"},{"indexed":false,"internalType":"address","name":"_registry","type":"address"},{"indexed":false,"internalType":"address","name":"_periodChecker","type":"address"}],"name":"FaucetStateChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"FaucetUsed","type":"event"},{"anonymous":false,"inputs":[],"name":"ImNotGassy","type":"event"},{"inputs":[],"name":"amount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"check","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"gimme","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"giveTo","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodChecker","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"registry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_v","type":"uint256"}],"name":"setAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_checker","type":"address"}],"name":"setPeriodChecker","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_registry","type":"address"}],"name":"setRegistry","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"FaucetAmountChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"Give","type":"event"},{"anonymous":false,"inputs":[],"name":"ImNotGassy","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_sealState","type":"uint256"},{"indexed":false,"internalType":"address","name":"_registry","type":"address"},{"indexed":false,"internalType":"address","name":"_periodChecker","type":"address"}],"name":"SealStateChange","type":"event"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"check","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"gimme","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"giveTo","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"nextTime","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodChecker","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"registry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_v","type":"uint256"}],"name":"setAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_checker","type":"address"}],"name":"setPeriodChecker","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_registry","type":"address"}],"name":"setRegistry","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"token","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"tokenAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"stateMutability":"payable","type":"receive"}]
--- a/python/eth_faucet/data/PeriodSimple.bin
+++ b/python/eth_faucet/data/PeriodSimple.bin
--- a/python/eth_faucet/data/PeriodSimple.json
+++ b/python/eth_faucet/data/PeriodSimple.json
@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"BalanceThresholdChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"PeriodChange","type":"event"},{"inputs":[],"name":"balanceThreshold","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"check","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"lastUsed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"period","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"poke","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"poker","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_threshold","type":"uint256"}],"name":"setBalanceThreshold","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"setPeriod","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_poker","type":"address"}],"name":"setPoker","outputs":[],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"BalanceThresholdChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"PeriodChange","type":"event"},{"inputs":[],"name":"balanceThreshold","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"check","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"lastUsed","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"next","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"period","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"poke","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"poker","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_threshold","type":"uint256"}],"name":"setBalanceThreshold","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"setPeriod","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_poker","type":"address"}],"name":"setPoker","outputs":[],"stateMutability":"nonpayable","type":"function"}]
--- a/python/requirements.txt
+++ b/python/requirements.txt
@ -1,2 +1,2 @@
 chainlib-eth~=0.4.8
-erc20-faucet~=0.5.0
+erc20-faucet~=0.6.0
--- a/python/tests/test_period.py
+++ b/python/tests/test_period.py
@ -206,5 +206,35 @@ class TestFaucetPeriod(EthTesterCase):
        self.assertEqual(r['status'], 1)


+    def test_period_front(self):
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+        c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        enc = ABIContractEncoder()
+        enc.method('setPeriod')
+        enc.typ(ABIContractType.UINT256)
+        enc.uint256(100)
+        data = enc.get()
+        tx = c.template(self.accounts[0], self.period_store_address, use_nonce=True)
+        tx = c.set_code(tx, data)
+        (tx_hash_hex, o) = c.finalize(tx)
+        self.conn.do(o)
+   
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+        c = EthFaucet(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.gimme(self.address, self.accounts[0])
+        self.conn.do(o)
+        o = receipt(tx_hash_hex)
+        r = self.conn.do(o)
+        o = block_by_number(r['block_number'])
+        r = self.conn.do(o)
+        thistime = r['timestamp']
+
+        o = c.next_time(self.address, self.accounts[0], sender_address=self.accounts[0])
+        r = self.conn.do(o)
+        nexttime = int(r, 16)
+
+        self.assertEqual(nexttime, thistime+100)
+
+
 if __name__ == '__main__':
    unittest.main()
--- a/solidity/EthFaucet.sol
+++ b/solidity/EthFaucet.sol
@ -8,17 +8,16 @@ contract EthFacuet {
 	address public registry;
 	address public periodChecker;
 	uint256 public sealState;
-	uint256 public amount;
+	uint256 amount;

 	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 _amount);
-	event FaucetFail(address indexed _recipient, address indexed _token, uint256 _amount);
+	event Give(address indexed _recipient, address indexed _token, uint256 _amount);
 	event FaucetAmountChange(uint256 _amount);
-	event FaucetStateChange(uint256 indexed _sealState, address _registry, address _periodChecker);
+	event SealStateChange(uint256 indexed _sealState, address _registry, address _periodChecker);
 	event ImNotGassy();

 	constructor() {
@ -29,7 +28,7 @@ contract EthFacuet {
 		require(_state < 8, 'ERR_INVALID_STATE');
 		require(_state & sealState == 0, 'ERR_ALREADY_LOCKED');
 		sealState |= _state;
-		emit FaucetStateChange(sealState, registry, periodChecker);
+		emit SealStateChange(sealState, registry, periodChecker);
 		return uint256(sealState);
 	}

@ -45,91 +44,119 @@ contract EthFacuet {
 		require(msg.sender == owner, 'ERR_NOT_OWNER');
 		require(sealState & PERIODCHECKER_STATE == 0, 'ERR_SEALED');
 		periodChecker = _checker;
-		emit FaucetStateChange(sealState, registry, periodChecker);
+		emit SealStateChange(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);
+		emit SealStateChange(sealState, registry, periodChecker);
 	}

 	function checkPeriod(address _recipient) private returns(bool) {
 		bool _ok;
 		bytes memory _result;

+		if (periodChecker == address(0)) {
+			return true;
+		}
+
 		(_ok, _result) = periodChecker.call(abi.encodeWithSignature("check(address)", _recipient));
 		if (!_ok) {
 			revert('ERR_PERIOD_BACKEND');
 		}
-		if (_result[31] == 0) {
-			return false;
-		}
-
-			}
+		return _result[31] == 0x01;
+	}

 	function checkRegistry(address _recipient) private returns(bool) {
 		bool _ok;
 		bytes memory _result;

+		if (registry == address(0)) {
+			return true;
+		}
+
 		(_ok, _result) = registry.call(abi.encodeWithSignature("have(address)", _recipient));
 		if (!_ok) {
-			emit FaucetFail(_recipient, address(0), amount);
 			revert('ERR_REGISTRY_BACKEND');
 		}
-		if (_result[31] == 0) {
-			emit FaucetFail(_recipient, address(0), amount);
-			revert('ERR_REGISTRY_CHECK');
-		}
-
-		emit FaucetUsed(_recipient, address(0), amount);
-		return true;
+		return _result[31] == 0x01;
 	}

-	function checkBalance() private returns(bool) {
-		if (amount > address(this).balance) {
+	function checkBalance() private view returns(bool) {
+		return amount >= address(this).balance;
+	}
+
+	function check(address _recipient) public returns(bool) {
+		if (!checkPeriod(_recipient)) {
 			return false;
-			emit ImNotGassy();
-			revert('ERR_ITSNOTAGAS');
 		}
-	}
-
-	function checkCanPoke(address _recipient) private returns(uint256) {
-		if (periodChecker != address(0)) {
-			checkPeriod(_recipient);
+		if (!checkRegistry(_recipient)) {
+			return false;
 		}
-		if (registry != address(0)) {
-			checkRegistry(_recipient);
-		}
-		checkBalance();
-		return true;
+		return checkBalance();
 	}
 	
-	function check(address _recipient) public returns(bool){
+	function checkAndPoke(address _recipient) private returns(bool){
 		bool _ok;
 		bytes memory _result;

+		if (!checkBalance()) {
+			revert('ERR_INSUFFICIENT_BALANCE');
+		}
+
+		if (!checkRegistry(_recipient)) {
+			revert('ERR_NOT_IN_WHITELIST');
+		}
+
+		if (periodChecker == address(0)) {
+			return true;
+		}
+
 		(_ok, _result) = periodChecker.call(abi.encodeWithSignature("poke(address)", _recipient));
 		if (!_ok) {
-			emit FaucetFail(_recipient, address(0), amount);
 			revert('ERR_PERIOD_BACKEND');
+		} 
+		if (_result[31] == 0) {
+			revert('ERR_PERIOD_CHECK');
 		}
 		return true;
 	}

 	function gimme() public returns(uint256) {
-		require(checkCanPoke(msg.sender));
+		require(checkAndPoke(msg.sender));
 		payable(msg.sender).transfer(amount);
+		emit Give(msg.sender, address(0), amount);
 		return amount;
 	}

 	function giveTo(address _recipient) public returns(uint256) {
-		require(checkCanPoke(_recipient));
+		require(checkAndPoke(_recipient));
 		payable(_recipient).transfer(amount);
+		emit Give(_recipient, address(0), amount);
 		return amount;
 	}

+	function nextTime(address _subject) public returns(uint256) {
+		bool _ok;
+		bytes memory _result;
+
+		(_ok, _result) = periodChecker.call(abi.encodeWithSignature("next(address)", _subject));
+		if (!_ok) {
+			revert('ERR_PERIOD_BACKEND_ERROR');
+		}
+		return uint256(bytes32(_result));
+	}
+
+	function tokenAmount() public view returns(uint256) {
+		return amount;
+	}
+
+	function token() public pure returns(address) {
+		return address(0);
+	}
+
 	receive () payable external {
 	}
 }
--- a/solidity/PeriodSimple.sol
+++ b/solidity/PeriodSimple.sol
@ -34,17 +34,21 @@ contract PeriodSimple {
 		emit BalanceThresholdChange(_threshold);
 	}

-	function check(address _subject) public view returns(bool) {
+	function next(address _subject) external view returns(uint256) {
+		return lastUsed[_subject] + period;
+	}
+	
+	function check(address _subject) external view returns(bool) {
 		require(_subject.balance >= balanceThreshold);
 		if (lastUsed[_subject] == 0) {
 			return true;
 		}
-		return block.timestamp > lastUsed[_subject] + period;
+		return block.timestamp > this.next(_subject);
 	}

-	function poke(address _subject) public {
+	function poke(address _subject) external {
 		require(msg.sender == owner || msg.sender == poker, 'ERR_ACCESS');
-		require(check(_subject), 'ERR_PREMATURE');
+		require(this.check(_subject), 'ERR_PREMATURE');
 		lastUsed[_subject] = block.timestamp;
 	}
 }