Merge remote-tracking branch 'origin/master' into lash/fix-chainlib-upgrade

Merge branch 'lash/fix-chainlib-upgrade' into 'master'
Upgrade chainlib See merge request grassrootseconomics/cic-internal-integration!119
2021-04-25 14:11:08 +02:00 · 2021-04-25 12:08:40 +00:00 · 2021-04-25 12:08:40 +00:00 · 2021-04-25 14:08:19 +02:00 · 2021-04-25 13:52:03 +02:00 · 2021-04-25 12:37:31 +02:00
3 changed files with 5 additions and 5 deletions
--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@@ -10,7 +10,7 @@ version = (
        0,
        11,
        0,
-        'beta.8',
+        'beta.9',
        )

 version_object = semver.VersionInfo(
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,4 +1,4 @@
-cic-base==0.1.2b2
+cic-base==0.1.2b3
 celery==4.4.7
 crypto-dev-signer~=0.4.14b3
 confini~=0.3.6rc3
@@ -15,7 +15,7 @@ semver==2.13.0
 websocket-client==0.57.0
 moolb~=0.1.1b2
 eth-address-index~=0.1.1a9
-chainlib~=0.0.2a13
+chainlib~=0.0.2a18
 hexathon~=0.0.1a7
 chainsyncer[sql]~=0.0.2a2
 chainqueue~=0.0.1a7
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -1,4 +1,4 @@
-cic_base[full_graph]~=0.1.2a79
-cic-eth~=0.11.0b7
+cic_base[full_graph]~=0.1.2b2
+cic-eth~=0.11.0b9
 cic-notify~=0.4.0a4
 cic-types~=0.1.0a10
Author	SHA1	Message	Date
nolash	803d06d2e4	Merge remote-tracking branch 'origin/master' into lash/fix-chainlib-upgrade	2021-04-25 14:11:08 +02:00
Louis Holbrook	7504a899a1	Merge branch 'lash/fix-chainlib-upgrade' into 'master' Upgrade chainlib See merge request grassrootseconomics/cic-internal-integration!119	2021-04-25 12:08:40 +00:00
Louis Holbrook	c20c5af27c	Upgrade chainlib	2021-04-25 12:08:40 +00:00
nolash	5899348a54	Revert result extended setting	2021-04-25 14:08:19 +02:00
nolash	965aeeacb9	Patch up failed merge	2021-04-25 13:52:03 +02:00
nolash	3b1cc00c32	Merge remote-tracking branch 'origin/master' into lash/fix-chainlib-upgrade	2021-04-25 12:37:31 +02:00
nolash	da324ce7d6	Upgrade chainlib	2021-04-25 12:35:34 +02:00
Louis Holbrook	32b72274f5	Merge branch 'lash/emergency-shutdown-II' into 'master' Add remaining health checks and shutdown on critical errors See merge request grassrootseconomics/cic-internal-integration!115	2021-04-24 17:53:45 +00:00
Louis Holbrook	f50da54274	Add remaining health checks and shutdown on critical errors	2021-04-24 17:53:45 +00:00
Louis Holbrook	dd94b8a190	Merge branch 'lash/default-token' into 'master' cic-eth: Add default token setting to cic-eth with api See merge request grassrootseconomics/cic-internal-integration!113	2021-04-24 17:49:21 +00:00
Louis Holbrook	16dd210965	cic-eth: Add default token setting to cic-eth with api	2021-04-24 17:49:21 +00:00