Commit Graph

662 Commits

Author SHA1 Message Date
Blair Vanderlugt 5128c7828c chore: clean old dockerfile and add docs for clearing cache 2021-09-20 09:59:12 +03:00
Philip Wafula 2f005195e5 Merge branch 'philip/ussd-cli-fix' into 'master'
Philip/ussd cli fix

See merge request grassrootseconomics/cic-internal-integration!275
2021-09-18 09:07:05 +00:00
Philip Wafula fb8db3ffd2 Philip/ussd cli fix 2021-09-18 09:07:05 +00:00
Philip Wafula b5f647c4aa Merge branch 'philip/ussd-demurrage' into 'master'
Philip/ussd demurrage

See merge request grassrootseconomics/cic-internal-integration!263
2021-09-17 11:15:43 +00:00
Philip Wafula 6019143ba1 Philip/ussd demurrage 2021-09-17 11:15:43 +00:00
Philip Wafula 610440b722 Merge branch 'lash/signer-missing-symbol' into 'master'
Update signer to fill in missing sign to wire symbol

See merge request grassrootseconomics/cic-internal-integration!273
2021-09-17 06:54:58 +00:00
Louis Holbrook d65455fc29 Update signer to fill in missing sign to wire symbol 2021-09-17 06:54:58 +00:00
Blair Vanderlugt 43f8d1c30c Merge branch 'bvander/docker-compose-restarts' into 'master'
chore: fix docker compose restarts

See merge request grassrootseconomics/cic-internal-integration!274
2021-09-16 11:17:42 +00:00
Blair Vanderlugt b855211eed chore: fix docker compose restarts 2021-09-16 13:06:53 +03:00
Blair Vanderlugt 1e0c475f39 Merge branch 'lash/contract-migration-dump' into 'master'
fix(contract-migration): Replace missing environment

See merge request grassrootseconomics/cic-internal-integration!271
2021-09-15 13:36:10 +00:00
Louis Holbrook 3e6cf594e3 fix(contract-migration): Replace missing environment 2021-09-15 13:36:09 +00:00
Blair Vanderlugt b8f79a2dd1 Merge branch 'bvander/extend-timoeout-contract-migration' into 'master'
chore: extend timeout for contract migration

See merge request grassrootseconomics/cic-internal-integration!272
2021-09-15 11:08:14 +00:00
Blair Vanderlugt 540c2fd950 chore: extend timeout for contract migration 2021-09-15 14:04:18 +03:00
Blair Vanderlugt b9b06eced8 Merge branch 'staging' into 'master'
feat: add multi-project build to trigger deploy-k8s-dev in the devops repo

See merge request grassrootseconomics/cic-internal-integration!268
2021-09-09 21:28:49 +00:00
Blair Vanderlugt 949bb29379 feat: add multi-project build to trigger deploy-k8s-dev in the devops repo 2021-09-09 21:28:49 +00:00
Louis Holbrook 0468906601 Merge branch 'lash/contract-migration-dump' into 'master'
fix(contract-migration): Make http signer work with local deployment

See merge request grassrootseconomics/cic-internal-integration!270
2021-09-09 13:38:10 +00:00
nolash 471243488e
Add latest crypto-dev-signer install explicitly in dockerfile for cic-eth 2021-09-09 14:27:47 +02:00
Blair Vanderlugt 3c4acd82ff test eth and meta only mrs 2021-09-07 11:56:17 -07:00
Blair Vanderlugt e07f992c5a Add new file 2021-09-07 18:38:20 +00:00
Blair Vanderlugt 17e95cb19c Merge branch 'bvander/signer-as-service' into 'master'
run signer as a service over http

See merge request grassrootseconomics/cic-internal-integration!265
2021-09-06 19:10:08 +00:00
Blair Vanderlugt 3c3a97ce15 run signer as a service over http 2021-09-06 12:07:57 -07:00
Philip Wafula a492be4927 Merge branch 'lash/contract-migration-config' into 'master'
Sanitize contract migration configs

See merge request grassrootseconomics/cic-internal-integration!262
2021-09-06 10:06:58 +00:00
Louis Holbrook 1f555748b0 Sanitize contract migration configs 2021-09-06 10:06:58 +00:00
Blair Vanderlugt 8aa4d20eea Update .gitlab-ci.yml 2021-09-01 20:00:44 +00:00
Louis Holbrook 90cf24dcee Merge branch 'lash/lockfix' into 'master'
Rehabilitate imports

See merge request grassrootseconomics/cic-internal-integration!261
2021-09-01 16:54:10 +00:00
Louis Holbrook 75b711dbd5 Rehabilitate imports 2021-09-01 16:54:10 +00:00
Blair Vanderlugt c21c1eb2ef fix data seeding node installs 2021-08-31 11:43:01 -07:00
Blair Vanderlugt eb5e612105 minor update to import_ussd script 2021-08-30 11:09:47 -07:00
Blair Vanderlugt e017d11770 update readme 2021-08-30 10:14:22 -07:00
Philip Wafula e327af68e1 Merge branch 'philip/refactor-import-scripts' into 'master'
Consolidated ussd dataseeding script

See merge request grassrootseconomics/cic-internal-integration!252
2021-08-29 09:55:47 +00:00
Philip Wafula 92cc6a3f27 Consolidated ussd dataseeding script 2021-08-29 09:55:47 +00:00
Philip Wafula f42bf7754a Merge branch 'lash/lockfix' into 'master'
Normalize initial INIT lock address

See merge request grassrootseconomics/cic-internal-integration!260
2021-08-29 09:07:46 +00:00
nolash 7342927e91
Normalize initial INIT lock address 2021-08-29 10:43:12 +02:00
Blair Vanderlugt 17333af88f Merge branch 'bvander/docker-vm-builds' into 'master'
docker vm builds

See merge request grassrootseconomics/cic-internal-integration!259
2021-08-28 16:26:16 +00:00
Blair Vanderlugt 6a68d2ed32 docker vm builds 2021-08-28 16:26:16 +00:00
Louis Holbrook ef77f4c99a Merge branch 'lash/normalize-backend-tx' into 'master'
Normalize tx data for backend

Closes cic-eth#133

See merge request grassrootseconomics/cic-internal-integration!258
2021-08-28 11:10:18 +00:00
Louis Holbrook 56dbe8a502 Normalize tx data for backend 2021-08-28 11:10:18 +00:00
Louis Holbrook 2dc8ac6a12 Merge branch 'lash/upgrade-outer-tools' into 'master'
Upgrade outer tools

See merge request grassrootseconomics/cic-internal-integration!257
2021-08-27 13:13:00 +00:00
Louis Holbrook 0ced68e224 Upgrade outer tools 2021-08-27 13:13:00 +00:00
Philip Wafula 2afb20e715 Merge branch 'philip/ussd-post-test-bug-fixes' into 'master'
USSD post-test bug fixes

See merge request grassrootseconomics/cic-internal-integration!244
2021-08-25 10:33:35 +00:00
Philip Wafula 3b0113d0e4 USSD post-test bug fixes 2021-08-25 10:33:35 +00:00
Louis Holbrook ebf4743a84 Merge branch 'lash/traffic-script-rehab' into 'master'
Implement chainlib cli for traffic script

See merge request grassrootseconomics/cic-internal-integration!255
2021-08-25 09:33:23 +00:00
Louis Holbrook 3bf92e7a8a Implement chainlib cli for traffic script 2021-08-25 09:33:23 +00:00
Blair Vanderlugt f0b4c42c68 cleanup contract migration dockerfiles 2021-08-24 15:33:18 -07:00
Louis Holbrook b62d00180c Merge branch 'lash/cic-eth-seeding-fix' into 'master'
cic-eth data seeding rehab

See merge request grassrootseconomics/cic-internal-integration!254
2021-08-24 21:07:36 +00:00
Louis Holbrook a49978cc36 cic-eth data seeding rehab 2021-08-24 21:07:36 +00:00
Blair Vanderlugt 1b0ee269d0 add pre tag to contract-migration 2021-08-24 11:43:39 -07:00
Blair Vanderlugt aa2f363b27 fix em 2021-08-24 10:42:30 -07:00
Blair Vanderlugt 2a24ce6938 remove mount 2021-08-24 10:33:53 -07:00
Blair Vanderlugt 938a10b5c3 contract-migration ci parity 2021-08-24 10:26:09 -07:00