Commit Graph

267 Commits

Author SHA1 Message Date
e68f10fac5 Update apps/cic-eth/docker/Dockerfile 2021-07-05 20:22:39 +00:00
6a86238cb6 Update apps/cic-eth/docker/Dockerfile 2021-07-05 20:19:12 +00:00
5fcef25bdd Update apps/cic-eth/docker/Dockerfile 2021-07-05 20:17:56 +00:00
3e526ba1ac Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files 2021-07-05 20:15:07 +00:00
52239e2e82 Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files 2021-07-05 20:12:04 +00:00
868a0e836c Update apps/cic-eth/.gitlab-ci.yml, apps/cic-eth/docker/Dockerfile, ci_templates/.cic-template.yml files 2021-07-05 19:59:27 +00:00
dadab0a20b Update apps/cic-eth/docker/Dockerfile 2021-07-05 19:26:23 +00:00
nolash
a4b00545d3 Merge remote-tracking branch 'origin/master' into lash/free-api 2021-07-05 19:28: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
08aef8804b Merge remote-tracking branch 'origin/master' into lash/free-api 2021-07-05 13:03:54 +02:00
Louis Holbrook
aa667951be Add flavors of demurrage token to dev deployment 2021-07-05 10:58:08 +00:00
nolash
8fef8c98db
Correct the admin import path correction 2021-07-05 12:27:52 +02:00
nolash
54b857d286 Merge remote-tracking branch 'origin/master' into lash/free-api 2021-07-05 12:25:05 +02:00
nolash
b917070155
Correct admin api import path in tests 2021-07-05 12:22:53 +02:00
nolash
ae3a8de2d4
Add redis to test reqs 2021-07-05 12:02:37 +02:00
nolash
ceaafeb513
Add eth-erc20 dep to tests reqs 2021-07-05 11:32:28 +02:00
nolash
7cd2fc4622
Add eth-erc20 dep 2021-07-05 11:32:00 +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
70704b09ec Improves import scripts logging 2021-07-03 16:55:51 +00:00
nolash
2144bec1ef
Bump cic-eth version in data seeding, ussd 2021-07-01 21:30:08 +02:00
nolash
4897007bf9
Split out tools, admin and services setup 2021-07-01 21:16:37 +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
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
da3c812bf5 Merge branch 'philip/add-age-metadata' into 'master'
Philip/add age metadata

See merge request grassrootseconomics/cic-internal-integration!186
2021-06-23 13:25:09 +00:00
82b1e87462 Philip/add age metadata 2021-06-23 13:25:09 +00:00
e13c423daf Merge branch 'philip/custom-metadata' into 'master'
Philip/custom metadata

See merge request grassrootseconomics/cic-internal-integration!192
2021-06-23 08:54:34 +00:00
56b3bd751d Philip/custom metadata 2021-06-23 08:54:34 +00:00
4f41c5bacf Merge branch 'philip/notify-sender-id-resolution' into 'master'
Handle empty string defaults in kubernetes secrets.

See merge request grassrootseconomics/cic-internal-integration!183
2021-06-23 07:02:22 +00:00
07583f0c3b Handle empty string defaults in kubernetes secrets. 2021-06-23 07:02:22 +00:00
0ae912082c Merge branch 'philip/refactor-phone-number-input-handling' into 'master'
Refactors handling of phone number inputs during transactions

See merge request grassrootseconomics/cic-internal-integration!185
2021-06-23 06:44:01 +00:00
094f4d4298 Refactors handling of phone number inputs during transactions 2021-06-23 06:44:01 +00:00
Spencer Ofwiti
57100366d8 Fix build process for import scripts. 2021-06-23 05:49:06 +00:00
71e0973020 Merge branch 'lash/check-import-ussd' into 'master'
Rehabilitate ussd import scripts

Closes #57

See merge request grassrootseconomics/cic-internal-integration!166
2021-06-23 04:29:39 +00:00
Louis Holbrook
12ab5c2f66 Rehabilitate ussd import scripts 2021-06-23 04:29:38 +00:00