grassrootseconomics
/
cic-stack
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
662 Commits 1 Branch 31 Tags 7.7 MiB
Commit Graph

662 Commits

Author SHA1 Message Date
Spencer Ofwiti ac264314c0 Merge branch 'spencer/cic-meta-exports' into 'master' 
Add exports to interface with CICADA.

See merge request grassrootseconomics/cic-internal-integration!43
 2021-02-25 09:58:43 +00:00
Spencer Ofwiti 84c1d11b48 Add exports to interface with CICADA. 2021-02-25 09:58:43 +00:00
Blair Vanderlugt f940d4a961 meta isn't using this. The entrypoin is in the Dockerfile 2021-02-24 06:47:34 -08:00
Spencer Ofwiti 6fe87652ce Merge branch 'spencer/update-cic-meta' into 'master' 
Add changes from stand-alone cic-meta repo.

See merge request grassrootseconomics/cic-internal-integration!41
 2021-02-24 12:29:41 +00:00
Spencer Ofwiti 8f65be16b1 Add changes from stand-alone cic-meta repo. 2021-02-24 15:14:17 +03:00
Louis Holbrook 34a48a6c6c Merge branch 'lash/fix-imports-again' into 'master' 
Rehabilitate import scripts after leak fixes

See merge request grassrootseconomics/cic-internal-integration!37
 2021-02-22 20:00:18 +00:00
Louis Holbrook c68d9d8404 Rehabilitate import scripts after leak fixes 2021-02-22 20:00:18 +00:00
Blair Vanderlugt dd8d4b01e2 Merge branch 'bvander/cic-ussd-workdir' into 'master' 
change workdir so ussd can run tasker

See merge request grassrootseconomics/cic-internal-integration!39
 2021-02-22 18:07:33 +00:00
Blair Vanderlugt 4d3cc85573 change workdir so it can run tasker 2021-02-22 09:51:57 -08:00
Blair Vanderlugt 10717df7d1 Merge branch 'bvander/fixes-to-contract-migration-deps' into 'master' 
run reset.sh outside docker and fix deps

See merge request grassrootseconomics/cic-internal-integration!38
 2021-02-22 15:14:36 +00:00
Blair Vanderlugt 3f2e0f5b2e run reset.sh outside docker and fix deps 2021-02-22 06:27:59 -08:00
Louis Holbrook 42ae8e5ed3 Merge branch 'lash/import-scripts-refactor' into 'master' 
Refactor import scripts

See merge request grassrootseconomics/cic-internal-integration!28
 2021-02-21 15:41:37 +00:00
Louis Holbrook 96b4ad4a72 Refactor import scripts 2021-02-21 15:41:37 +00:00
Blair Vanderlugt 1274958493 rename docker latest tag 2021-02-20 04:12:18 +00:00
Louis Holbrook b38ff7629d Merge branch 'lash/audit-postgres-sessions' into 'master' 
Improve reuse of db sessions

See merge request grassrootseconomics/cic-internal-integration!36
 2021-02-19 07:06:05 +00:00
Louis Holbrook fe499de1e4 Fix last(?) leak in syncer 
Signed-off-by: nolash <dev@holbrook.no>
 2021-02-19 07:06:05 +00:00
Blair Vanderlugt 2657ed58d3 Merge branch 'bvander/cic-cache-build-2' into 'master' 
cic cache build

See merge request grassrootseconomics/cic-internal-integration!35
 2021-02-18 05:04:30 +00:00
Blair Vanderlugt b26a14e8ca cic cache build 2021-02-18 05:04:30 +00:00
Louis Holbrook 725ef54cf5 Merge branch 'lash/replace-faucet' into 'master' 
Replace faucet

See merge request grassrootseconomics/cic-internal-integration!32
 2021-02-17 10:29:44 +00:00
Louis Holbrook 3ef39fb393 Replace faucet 2021-02-17 10:29:44 +00:00
Louis Holbrook 6c1382aac6 Merge branch 'lash/complex-balance' into 'master' 
cic-eth: Complex balance

See merge request grassrootseconomics/cic-internal-integration!29
 2021-02-17 10:04:21 +00:00
Louis Holbrook ab7b5fbeb9 cic-eth: Complex balance 2021-02-17 10:04:21 +00:00
Louis Holbrook c6bcda8832 Merge branch 'lash/cic-eth-cic-cache-txs' into 'master' 
cic-eth: Integrate transaction list queries

See merge request grassrootseconomics/cic-internal-integration!30
 2021-02-17 09:33:18 +00:00
Louis Holbrook be3c59a780 cic-eth: Integrate transaction list queries 2021-02-17 09:33:18 +00:00
Louis Holbrook fcde3d0bb2 Merge branch 'lash/cic-eth-revert-hex-values-db' into 'master' 
cic-eth: Revert number as hex in tx-cache

See merge request grassrootseconomics/cic-internal-integration!31
 2021-02-17 08:30:10 +00:00
Louis Holbrook 500f0c3a41 cic-eth: Revert number as hex in tx-cache 2021-02-17 08:30:10 +00:00
Louis Holbrook fa83c50ab5 Merge branch 'lash/cic-eth-address-translator' into 'master' 
cic-eth: Address translator task

See merge request grassrootseconomics/cic-internal-integration!34
 2021-02-17 08:19:42 +00:00
Louis Holbrook f154136dd3 cic-eth: Address translator task 2021-02-17 08:19:42 +00:00
Louis Holbrook d493cebc7c Merge branch 'lash/admin-api-account-check' into 'master' 
Add admin api account check method

See merge request grassrootseconomics/cic-internal-integration!27
 2021-02-15 11:06:28 +00:00
Louis Holbrook d798f78d7f Add admin api account check method 2021-02-15 11:06:28 +00:00
Louis Holbrook d872e78e39 Merge branch 'lash/cic-eth-status-enum-bitfield' into 'master' 
Translate StatusEnum to flags instead of number ranges

See merge request grassrootseconomics/cic-internal-integration!14
 2021-02-13 17:01:48 +00:00
Louis Holbrook 14f29c4c32 Translate StatusEnum to flags instead of number ranges 2021-02-13 17:01:48 +00:00
Blair Vanderlugt d042ce0dcd Merge branch 'lash/correct-db-names' into 'master' 
Correct db names and ports

See merge request grassrootseconomics/cic-internal-integration!25
 2021-02-12 02:27:29 +00:00
Louis Holbrook 22586a04bf Correct db names and ports 2021-02-12 02:27:29 +00:00
Blair Vanderlugt 449cd5830e keys in the wrong place 2021-02-11 07:33:13 -08:00
Blair Vanderlugt df3954fda5 Merge branch 'bvandernotify-build' into 'master' 
cic-notify build

See merge request grassrootseconomics/cic-internal-integration!23
 2021-02-11 15:24:34 +00:00
Louis Holbrook 6038d63501 Merge branch 'bvander/fix-mono-repo' into 'master' 
Bvander/fix mono repo

See merge request grassrootseconomics/cic-internal-integration!21
 2021-02-11 10:14:30 +00:00
Blair Vanderlugt d409306e5e Bvander/fix mono repo 2021-02-11 10:14:30 +00:00
Louis Holbrook b1c3629549 Merge branch 'lash/rename-chainlib' into 'master' 
Rename cic-tools to chainlib

See merge request grassrootseconomics/cic-internal-integration!24
 2021-02-11 08:30:21 +00:00
nolash 7b13725c26
Rename cic-tools to chainlib 2021-02-11 09:20:01 +01:00
Blair Vanderlugt ed063f0522 builds up 2021-02-10 20:44:15 -08:00
Blair Vanderlugt 98cdab4353 Merge branch 'philip/ussd-notify' into 'master' 
Philip/ussd notify

See merge request grassrootseconomics/cic-internal-integration!11
 2021-02-10 17:48:24 +00:00
Philip Wafula 6051b55b9a Philip/ussd notify 2021-02-10 17:48:24 +00:00
Louis Holbrook 9c9f41ed4c Merge branch 'lash/cic-eth-tasker-check-registry' into 'master' 
Add cic-eth and auxiliary contract seeding script

See merge request grassrootseconomics/cic-internal-integration!16
 2021-02-10 07:03:11 +00:00
Louis Holbrook 74e57b89ec Add cic-eth and auxiliary contract seeding script 2021-02-10 07:03:11 +00:00
Blair Vanderlugt 1360f4d5f4 Merge branch 'lash/activate-websocket-services' into 'master' 
bloxbergValidatorSetup: Expose all apis on websockets

See merge request grassrootseconomics/cic-internal-integration!20
 2021-02-10 03:04:09 +00:00
Blair Vanderlugt 6c2975b93f Merge branch 'bvanderlugt-master-patch-79072' into 'master' 
Update apps/cic-meta/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml,...

See merge request grassrootseconomics/cic-internal-integration!19
 2021-02-10 03:03:35 +00:00
Blair Vanderlugt 81e9128446 Update apps/cic-meta/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml, apps/contract-migration/.gitlab-ci.yml files 2021-02-10 03:03:35 +00:00
nolash 38781f1a4c
Expose all apis on websockets 2021-02-09 22:37:20 +01:00
Blair Vanderlugt d636181479 Merge branch 'bvander/cic-meta-docker-compose' into 'master' 
meta docker compose

See merge request grassrootseconomics/cic-internal-integration!18
 2021-02-09 17:32:36 +00:00