Commit Graph

435 Commits

Author SHA1 Message Date
nolash a5f9eace3f
Bump cic-notify 2021-06-30 18:43:58 +02:00
nolash a9f4f1ccda
Bump cic-eth dep for cic-ussd 2021-06-30 18:35:45 +02:00
nolash 67eb3137cf
bump cic-eth version 2021-06-30 18:34:46 +02:00
nolash ae870d175f
for real update requirements 2021-06-30 17:58:52 +02:00
nolash 2b43f8a47d
Upgrade eth-erc20 via cic-base 2021-06-30 17:44:52 +02:00
nolash a8291f49ab
Move test contract data to pytest module 2021-06-30 17:27:47 +02:00
nolash 2e3f8a0bf1 Merge remote-tracking branch 'origin/master' into lash/allowance 2021-06-30 16:45:06 +02:00
Louis Holbrook c852f41d76 Merge branch 'lash/move-to-chainlib-eth' into 'master'
Move to chainlib-eth dependency

See merge request grassrootseconomics/cic-internal-integration!199
2021-06-30 14:44:18 +00:00
Louis Holbrook f8e68cff96 Move to chainlib-eth dependency 2021-06-30 14:44:17 +00:00
Philip Wafula 7027d77836 Merge branch 'philip/refactor-integration-tests' into 'master'
Philip/refactor integration tests

See merge request grassrootseconomics/cic-internal-integration!182
2021-06-30 14:27:56 +00:00
Philip Wafula d356f8167d Philip/refactor integration tests 2021-06-30 14:27:56 +00:00
Blair Vanderlugt 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
nolash 407b29cef5
Add allowance and transfer from test 2021-06-29 15:08:05 +02:00
Philip Wafula 3b6e031746 Merge branch 'philip/db-session-management' into 'master'
Philip/db session management

Closes cic-ussd#53

See merge request grassrootseconomics/cic-internal-integration!193
2021-06-29 10:49:25 +00:00
Philip Wafula b1d5d45eef Philip/db session management 2021-06-29 10:49:25 +00:00
Philip Wafula 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
nolash 75c6609dff
Correct task conftest fixture path 2021-06-29 09:34:12 +02:00
nolash 6a45d5faa7
Move pytest fixtures to importable location, add allowance check for transfer from 2021-06-29 08:21:11 +02:00
Blair Vanderlugt 18382a1f35 Merge branch 'bvander/integration-notes' into 'master'
integration updates: meta imports

See merge request grassrootseconomics/cic-internal-integration!201
2021-06-28 22:40:54 +00:00
Blair Vanderlugt 29e91fafab integration updates: meta imports 2021-06-28 22:40:54 +00:00
Blair Vanderlugt 5b20a9a24a Merge branch 'bvander/better-data-seeding-container' into 'master'
add key store and vars

See merge request grassrootseconomics/cic-internal-integration!202
2021-06-28 22:40:04 +00:00
Blair Vanderlugt a252195bdc uses the new base image 2021-06-28 10:56:15 -07:00
Spencer Ofwiti f1be3b633c Merge branch 'lash/downgrade-chainsyncer' into 'master'
Downgrade chainsyncer

See merge request grassrootseconomics/cic-internal-integration!200
2021-06-28 15:36:56 +00:00
nolash e59a71188c
Downgrade chainsyncer 2021-06-28 17:18:52 +02:00
Blair Vanderlugt 1d0eb06f2f Merge branch 'bvander/data-seeding-keystore' into 'master'
add keystore

See merge request grassrootseconomics/cic-internal-integration!197
2021-06-26 17:12:46 +00:00
Blair Vanderlugt 57127132b5 add keystore 2021-06-26 09:50:58 -07:00
Blair Vanderlugt 0bf2c35fcd add key store and vars 2021-06-26 09:50:03 -07:00
Blair Vanderlugt d046595764 Merge branch 'philip/remove-hardcoded-import-script-configs' into 'master'
Refactors hardcoded config vars.

See merge request grassrootseconomics/cic-internal-integration!196
2021-06-26 15:58:07 +00:00
PhilipWafula 9dd7ec88fd
Refactors hardcoded config vars. 2021-06-26 18:51:25 +03:00
Blair Vanderlugt 282fd2ff52 Merge branch 'bvander/better-data-seeding-container' into 'master'
fix paths for data seeding container

See merge request grassrootseconomics/cic-internal-integration!195
2021-06-25 23:06:25 +00:00
Blair Vanderlugt 8f85598861 fix paths and stuff 2021-06-25 15:59:10 -07:00
Blair Vanderlugt 8529c349ca Merge branch 'philip/fix-import-script-pointers' into 'master'
Philip/fix import script pointers

See merge request grassrootseconomics/cic-internal-integration!194
2021-06-25 15:36:06 +00:00
Philip Wafula 4368d2bf59 Philip/fix import script pointers 2021-06-25 15:36:05 +00:00
Philip Wafula 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
Philip Wafula 82b1e87462 Philip/add age metadata 2021-06-23 13:25:09 +00:00
Philip Wafula 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
Philip Wafula 56b3bd751d Philip/custom metadata 2021-06-23 08:54:34 +00:00
Philip Wafula 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
Philip Wafula 07583f0c3b Handle empty string defaults in kubernetes secrets. 2021-06-23 07:02:22 +00:00
Philip Wafula 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
Philip Wafula 094f4d4298 Refactors handling of phone number inputs during transactions 2021-06-23 06:44:01 +00:00
Spencer Ofwiti 9471b1d8ab Merge branch 'spencer/fix-import-scripts-build' into 'master'
Fix build process for import scripts.

See merge request grassrootseconomics/cic-internal-integration!188
2021-06-23 05:49:06 +00:00
Spencer Ofwiti 57100366d8 Fix build process for import scripts. 2021-06-23 05:49:06 +00:00
Philip Wafula 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
Blair Vanderlugt a804552620 Merge branch 'bvander/add-venv-to-ignore' into 'master'
add .venv folder

See merge request grassrootseconomics/cic-internal-integration!191
2021-06-22 21:35:21 +00:00
Blair Vanderlugt 0319fa6076 add .venv folder 2021-06-22 14:26:41 -07:00
Blair Vanderlugt 91dfc51d54 Merge branch 'bvander/change-meta-key-dir' into 'master'
change pgp key dir

See merge request grassrootseconomics/cic-internal-integration!190
2021-06-22 21:25:58 +00:00
Blair Vanderlugt 4fd861f080 change pgp key dir 2021-06-22 14:15:38 -07:00
Louis Holbrook 28de7a4eac Merge branch 'lash/loglines' into 'master'
Loglines and dep bump

See merge request grassrootseconomics/cic-internal-integration!187
2021-06-19 06:49:42 +00:00