Commit Graph

191 Commits

Author SHA1 Message Date
lash 5317573b47
All tests pass! 2023-02-10 09:06:04 +00:00
lash 34af3b1b30
Rehabilitate redistribution unit 2023-02-10 06:21:32 +00:00
lash 555b0b1724
Rehabilitate change period 2023-02-10 05:02:24 +00:00
lash 3333d50f98
Rehabilitate test growth and amounts 2023-02-09 12:26:13 +00:00
lash e74a9cb594
test basic passes 2023-02-09 12:08:28 +00:00
lash f785925eb5
WIP rehabilitating test basic 2023-02-09 11:44:20 +00:00
lash ae2c1b4124
Rewrite base unittest module, reinstate more contract methods 2023-02-09 06:49:18 +00:00
lash ffc041c1a3
WIP Implement abdk math contract for constructor, decay 2023-02-09 05:09:57 +00:00
lash bcc957f861
Remove commented contract code, makefile single nocap only 2023-02-08 08:51:57 +00:00
lash 84b1a5b439
Return redistributions type correctly 2023-02-08 08:44:43 +00:00
Mohamed Sohail 3ebb645077 Merge branch 'lash/safe-decay' into 'master'
Add burn method + minor bug fixes

See merge request cicnet/erc20-demurrage-token!12
2023-02-04 14:41:40 +00:00
Louis Holbrook 5d01e2ae96 Add burn method + minor bug fixes 2023-02-04 14:41:40 +00:00
Mohamed Sohail 99a9915d11 Merge branch 'dev-0.2.0' into 'master'
Runaway redistribution

See merge request cicnet/erc20-demurrage-token!10
2022-05-30 07:53:22 +00:00
Louis Holbrook 20e3a783fd Runaway redistribution 2022-05-30 07:53:22 +00:00
lash 5941a6abdf Merge branch 'master' into dev-0.2.0 2022-05-30 07:51:34 +00:00
lash c5de0e3300
Reactivate test, expose sinkaddress 2022-05-28 09:28:10 +00:00
lash cc1a84f818
Add catch-up period test 2022-05-27 13:22:25 +00:00
lash ee871730dc
Remove unneeded demurragestart item 2022-05-27 12:53:11 +00:00
lash 31faa78346
Keep cumulative sink total in state and deduct from upcoming demurrage 2022-05-27 12:51:10 +00:00
lash 18ee9c5f9b
Make tests pass 2022-05-27 12:02:27 +00:00
lash a0557b35a0
Fix cumulative distribution calculation bug in SingleNocap 2022-05-27 11:10:31 +00:00
lash 127c67e665
Add steps option to demurrage cli 2022-05-03 18:19:28 +00:00
lash 1387451e01
Bump deps 2022-04-24 18:53:09 +00:00
William Luke 226f81fc5c Merge branch 'lash/apply-cli' into 'master'
Add apply demurrage cli tool

See merge request cicnet/erc20-demurrage-token!9
2022-03-14 12:58:45 +00:00
Louis Holbrook 370efb3192 Add apply demurrage cli tool 2022-03-14 12:58:45 +00:00
lash 3a1fb22631
Remove arg defaults 2022-03-02 13:32:31 +00:00
lash f1a2a78eb4 Merge branch 'master' into lash/apply-cli 2022-03-02 09:03:40 +00:00
Louis Holbrook 47ee1cfa45 Merge branch 'lash/gas-safety-valve' into 'master'
bug: Wrong redistribution amount + limited demurrage apply

Closes grassrootseconomics/cic-internal-integration#276, grassrootseconomics/cic-internal-integration#273, and grassrootseconomics/cic-internal-integration#272

See merge request cicnet/erc20-demurrage-token!7
2022-03-02 09:01:50 +00:00
Louis Holbrook db56e0d33f bug: Wrong redistribution amount + limited demurrage apply 2022-03-02 09:01:50 +00:00
Louis Holbrook d0c02eadbf Merge branch 'lum/add-ci' into 'master'
ci: add basic ci

See merge request cicnet/erc20-demurrage-token!8
2022-03-02 08:54:20 +00:00
William Luke ed60b5923b ci: add basic ci 2022-03-02 08:54:20 +00:00
lash 1e24ec1352
Add apply demurrage cli tool 2022-03-02 08:15:10 +00:00
nolash a04c826ba7
Bump deps, version 2021-12-22 20:12:42 +00:00
nolash 04f50cdede
Loosen dependencies 2021-12-21 10:47:38 +00:00
Philip Wafula 21d65522a8 Merge branch 'philip/bumps' into 'master'
Bumps versions of deps and dep.

See merge request cicnet/erc20-demurrage-token!6
2021-12-18 11:49:44 +00:00
philip 130b5ea587
Bumps lib version and deps. 2021-12-18 14:47:02 +03:00
philip e486e9f31a
Moves configs into data folder 2021-12-18 14:34:01 +03:00
philip 959b018247
Bumps deps version for conflict resolution. 2021-12-15 09:35:08 +03:00
philip 6ecacd60d4
Bumps lib patch version. 2021-12-15 09:34:50 +03:00
philip c40157318f
Bumps versions of deps and dep. 2021-12-15 06:18:38 +03:00
nolash 025ef614a5
WIP test rehabilitations 2021-11-15 14:45:46 +01:00
nolash 43b3d2b488
Use explicit pre-release signer 2021-08-24 21:49:06 +02:00
nolash 0e1613c5f6
Upgrade deps 2021-07-23 11:22:11 +02:00
nolash 899efb65fc
Upgrade deps 2021-07-14 13:17:45 +02:00
nolash f84edb5f3b
Include default config dir in data 2021-07-05 15:45:01 +02:00
nolash c6b5d9a8e0
Move test base to externally importable path 2021-07-05 10:26:39 +02:00
nolash abe82949ea
Add slow demurrage calc 2021-07-04 14:52:12 +02:00
nolash a6f53e7278
Correct demurrage emu minutes logline 2021-07-04 14:37:56 +02:00
nolash 98c460dc2f
Create demurrage calc from contract 2021-07-04 12:10:01 +02:00
nolash 00bb87e3ec
Add python demurrage calculator 2021-07-02 15:29:56 +02:00