cicnet/erc20-demurrage-token
5
0
Fork 0
mirror of git://holbrook.no/erc20-demurrage-token synced 2026-11-11 03:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Define expiry in terms of period

Browse Source
This commit is contained in:
lash
2023-02-10 14:30:25 +00:00
parent 09b825808f
commit 1f0dc0aa5f
5 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin
+1 -1
View File
File diff suppressed because one or more lines are too long
python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.json
+1 -1
View File
File diff suppressed because one or more lines are too long
python/erc20_demurrage_token/expiry.py
+16 -2
View File
@@ -6,13 +6,16 @@ from chainlib.eth.tx import (
from chainlib.eth.contract import (
ABIContractEncoder,
ABIContractType,
abi_decode_single,
)
from chainlib.eth.constant import ZERO_ADDRESS
class ExpiryContract(TxFactory):
def set_expires(self, contract_address, sender_address, expire_timestamp, tx_format=TxFormat.JSONRPC):
def set_expires_period(self, contract_address, sender_address, expire_timestamp, tx_format=TxFormat.JSONRPC):
enc = ABIContractEncoder()
enc.method('setExpires')
enc.method('setExpirePeriod')
enc.typ(ABIContractType.UINT256)
enc.uint256(expire_timestamp)
data = enc.get()
@@ -20,3 +23,14 @@ class ExpiryContract(TxFactory):
tx = self.set_code(tx, data)
tx = self.finalize(tx, tx_format)
return tx
def expires(self, contract_address, sender_address=ZERO_ADDRESS):
return self.call_noarg('expires', contract_address, sender_address=sender_address)
@classmethod
def parse_expires(self, v):
return abi_decode_single(ABIContractType.UINT256, v)
python/tests/test_expiry.py
+14 -5
View File
@@ -37,19 +37,22 @@ class TestExpire(TestDemurrageDefault):
(tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[i+1], mint_amount)
r = self.rpc.do(o)
targetish_time = self.start_time + (self.period_seconds * 2)
(tx_hash, o) = c.set_expires(self.address, self.accounts[0], targetish_time)
(tx_hash, o) = c.set_expires_period(self.address, self.accounts[0], 2)
r = self.rpc.do(o)
o = receipt(tx_hash)
r = self.rpc.do(o)
self.assertEqual(r['status'], 1)
self.backend.time_travel(targetish_time + 60)
o = c.expires(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
expiry_time = c.parse_expires(r)
self.backend.time_travel(expiry_time + 60)
o = block_latest()
r = self.rpc.do(o)
o = block_by_number(r)
r = self.rpc.do(o)
self.assertGreaterEqual(r['timestamp'], targetish_time)
self.assertGreaterEqual(r['timestamp'], expiry_time)
nonce_oracle = RPCNonceOracle(self.sink_address, self.rpc)
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
@@ -59,6 +62,12 @@ class TestExpire(TestDemurrageDefault):
r = self.rpc.do(o)
self.assertEqual(r['status'], 1)
(tx_hash, o) = c.transfer(self.address, self.sink_address, self.accounts[2], 1)
r = self.rpc.do(o)
o = receipt(tx_hash)
r = self.rpc.do(o)
self.assertEqual(r['status'], 0)
o = c.balance_of(self.address, self.accounts[1], sender_address=self.accounts[0])
r = self.rpc.do(o)
balance = c.parse_balance(r)
@@ -78,7 +87,7 @@ class TestExpire(TestDemurrageDefault):
r = self.rpc.do(o)
balance = c.parse_balance(r)
o = c.decay_by(self.address, supply, int((targetish_time - self.start_time) / 60), sender_address=self.sink_address)
o = c.decay_by(self.address, supply, int((expiry_time - self.start_time) / 60), sender_address=self.sink_address)
r = self.rpc.do(o)
target_balance = c.parse_balance(r)