Commit Graph

282 Commits

Author SHA1 Message Date
nolash
2c0f65ed73
Remove hardcoded value 2021-07-07 17:42:47 +02:00
nolash
3f6fbc1c61
Noop calc for non-demurrage token in aux 2021-07-07 14:17:50 +02:00
nolash
d26af206cb
Add correct extras selector for contract migration cic-eth include 2021-07-07 13:52:19 +02:00
nolash
36085f218f
Add necessary services requirements 2021-07-07 11:59:51 +02:00
nolash
d1d680c9aa
Add aux-all to tasker in local cluster 2021-07-07 10:32:01 +02:00
nolash
abd4024322
Bump version 2021-07-07 09:59:20 +02:00
nolash
644b9ec4ec Merge remote-tracking branch 'origin/master' into lash/demurrage-task 2021-07-07 09:58:57 +02:00
Louis Holbrook
ed029a936c Add explicit token type toggle in contract migration 2021-07-07 07:56:45 +00:00
nolash
bc52e46620 Merge remote-tracking branch 'origin/master' into lash/demurrage-task 2021-07-07 09:47:09 +02:00
Louis Holbrook
9b79034ed3 Minimal dependencies in cic-eth api setup 2021-07-07 07:45:21 +00:00
nolash
ba729a0a54
Properly fix mock path in cic-eth test 2021-07-07 09:32:52 +02:00
nolash
cb4927edc9
Correct mocks path in cic tests, faulty contract-migration build 2021-07-07 09:24:40 +02:00
b7d5c6799f Merge branch 'bvander/data-seeding-updates' into 'master'
data-seeding image updates and tweak meta import

See merge request grassrootseconomics/cic-internal-integration!212
2021-07-05 17:14:47 +00:00
eef8bb2cf7 data-seeding image updates and tweak meta import 2021-07-05 17:14:46 +00:00
9740963431 refactor contract-migration and add buildkit caching 2021-07-05 17:13:26 +00:00
nolash
185458e320 Merge remote-tracking branch 'origin/master' into lash/demurrage-task 2021-07-05 13:05:02 +02:00
Louis Holbrook
aa667951be Add flavors of demurrage token to dev deployment 2021-07-05 10:58:08 +00:00
nolash
d9214ddd62
Bump cic-eth dep to future build 2021-07-05 11:59:52 +02:00
nolash
b5d6d80d8e
Add demurrage token task api 2021-07-05 11:58:07 +02:00
nolash
2f09ac9110
Change aux module to unpopulated base module name 2021-07-05 11:28:27 +02:00
nolash
4e18060589
Remove dev dockerfile 2021-07-05 10:40:32 +02:00
nolash
08a77f9818
Move cic-eth token fixture to package, add demurrage token calc task 2021-07-05 10:29:33 +02:00
Louis Holbrook
c2459cfd65 Merge branch 'lash/traffic' into 'master'
data-seeding: Rehabilitate traffic scripts

See merge request grassrootseconomics/cic-internal-integration!213
2021-07-04 17:19:21 +00:00
Louis Holbrook
e7102ff02d data-seeding: Rehabilitate traffic scripts 2021-07-04 17:19:21 +00:00
nolash
5fab939270
Upgrade erc20 demurrage token deploy, explicit multi mode flag 2021-07-04 13:53:03 +02:00
nolash
51109db487 Merge branch 'lash/new-sarafu-token' into lash/demurrage-task 2021-07-04 13:26:22 +02:00
nolash
f44e2c8b45
Move registry initialization before aux 2021-07-04 13:21:07 +02:00
70704b09ec Improves import scripts logging 2021-07-03 16:55:51 +00:00
nolash
40a7eec6ad
Add aux requirement for demurrage task 2021-07-02 21:32:48 +02:00
nolash
6a75ce37c4
Add demurrage token amount adjust task 2021-07-02 21:25:47 +02:00
nolash
9b2f2ab0b1
Reduce profanity 2021-07-01 11:05:31 +02:00
nolash
98a38b7117
Upgrade cic-base for contract-migration 2021-06-30 22:51:23 +02:00
nolash
a2ca61355d Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token 2021-06-30 22:01:07 +02:00
nolash
b0638f2262
Rename env var for token symbol in contract migration 2021-06-30 21:16:06 +02:00
Louis Holbrook
a075c55957 Merge branch 'lash/allowance' into 'master'
Add allowance check and transferFrom task

See merge request grassrootseconomics/cic-internal-integration!203
2021-06-30 18:15:40 +00:00
Louis Holbrook
6464f651ec Add allowance check and transferFrom task 2021-06-30 18:15:40 +00:00
nolash
1e87f2ed31
Consider faucet amount in verify balance 2021-06-30 17:22:26 +02:00
nolash
ea4c68f311 Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token 2021-06-30 16:47:36 +02:00
Louis Holbrook
f8e68cff96 Move to chainlib-eth dependency 2021-06-30 14:44:17 +00:00
d356f8167d Philip/refactor integration tests 2021-06-30 14:27:56 +00:00
753d21fe95 Merge branch 'bvander/data-seeding-build-improvements' into 'master'
uses the new base image

See merge request grassrootseconomics/cic-internal-integration!204
2021-06-29 17:17:18 +00:00
b1d5d45eef Philip/db session management 2021-06-29 10:49:25 +00:00
53317cb912 Merge branch 'philip/notify-queue-setting' into 'master'
Enable api level setting of queue value.

See merge request grassrootseconomics/cic-internal-integration!184
2021-06-29 10:21:43 +00:00
29e91fafab integration updates: meta imports 2021-06-28 22:40:54 +00:00
a252195bdc uses the new base image 2021-06-28 10:56:15 -07:00
nolash
e59a71188c
Downgrade chainsyncer 2021-06-28 17:18:52 +02:00
57127132b5 add keystore 2021-06-26 09:50:58 -07:00
9dd7ec88fd
Refactors hardcoded config vars. 2021-06-26 18:51:25 +03:00
8f85598861 fix paths and stuff 2021-06-25 15:59:10 -07:00
4368d2bf59 Philip/fix import script pointers 2021-06-25 15:36:05 +00:00