Commit Graph

621 Commits

Author SHA1 Message Date
William Luke
c48177c78c Merge branch 'cic-eth-server' of https://github.com/williamluke4/cic-internal-integration into cic-eth-server 2021-11-09 11:48:52 +03:00
b31433dcb5 add database debug 2021-11-09 10:26:04 +03:00
15ea02f540 Merge branch 'lash/token-checksum-address-fix' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 12:57:24 +03:00
nolash
8600e282b3
Remove incoming balance in network check 2021-11-08 10:56:11 +01:00
d62cced0a8 Merge branch 'lash/token-checksum-address-fix' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 12:44:11 +03:00
nolash
a42efb2529
Non-checksum address in erc20 tx_caches 2021-11-08 10:43:02 +01:00
66b2cb039b Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 11:57:17 +03:00
Louis Holbrook
8855ccd3d2 Merge branch 'lash/better-meta-logging' into 'master'
bug: False 404 in cic-meta logging

See merge request grassrootseconomics/cic-internal-integration!302
2021-11-02 17:45:09 +00:00
Louis Holbrook
09dfdbb38a bug: False 404 in cic-meta logging 2021-11-02 17:45:09 +00:00
f265108485 add eth-server 2021-11-02 18:50:14 +03:00
f28ba1098f revert api_task:balance changes 2021-11-01 13:56:12 +03:00
7c73c8b30f Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-01 10:49:07 +03:00
c85692ab9e graphql server 2021-11-01 10:48:05 +03:00
1abb642361 Merge branch 'feat/automation/add-semver' into 'master'
feat: (automation) add semver

See merge request grassrootseconomics/cic-internal-integration!266
2021-10-29 23:33:46 +00:00
93bcbd7d51 feat: (automation) add semver 2021-10-29 23:33:46 +00:00
William Luke
68a3d9fe3c save 2021-10-29 15:10:56 +03:00
William Luke
9dd442e716 Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-10-29 15:10:05 +03:00
Louis Holbrook
818899670a Merge branch 'lash/local-dev-improve' into 'master'
feat: Enable parallell contract transactions in bootstrap

See merge request grassrootseconomics/cic-internal-integration!295
2021-10-29 09:36:14 +00:00
Louis Holbrook
1882910a8e feat: Enable parallell contract transactions in bootstrap 2021-10-29 09:36:14 +00:00
William Luke
0c84e970ad misc 2021-10-29 11:34:37 +03:00
3cc909c936 Merge branch 'philip/bump-ussd-version' into 'master'
Philip/bump ussd version

See merge request grassrootseconomics/cic-internal-integration!300
2021-10-27 14:42:49 +00:00
60b6e1abdb Philip/bump ussd version 2021-10-27 14:42:49 +00:00
Louis Holbrook
9c7e72f71c Merge branch 'lash/fix-docs' into 'master'
refactor: Make texinfo docs buildable with makeinfo <6.0

See merge request grassrootseconomics/cic-internal-integration!299
2021-10-26 20:01:19 +00:00
Louis Holbrook
e3acc1757a refactor: Make texinfo docs buildable with makeinfo <6.0 2021-10-26 20:01:19 +00:00
Louis Holbrook
8250b15d32 Merge branch 'lash/fix-docs' into 'master'
Lash/fix docs

See merge request grassrootseconomics/cic-internal-integration!298
2021-10-26 14:59:50 +00:00
Louis Holbrook
31d7cf5789 Lash/fix docs 2021-10-26 14:59:50 +00:00
Louis Holbrook
2544c159c2 Merge branch 'lash/fix-docs' into 'master'
refactor: Confirm to external cross-repo texinfo doc maker structure

See merge request grassrootseconomics/cic-internal-integration!297
2021-10-26 14:17:27 +00:00
Louis Holbrook
7691d9a127 refactor: Confirm to external cross-repo texinfo doc maker structure 2021-10-26 14:17:27 +00:00
William Luke
f856ca3f68 init graphene 2021-10-26 15:48:25 +03:00
Louis Holbrook
a2a3634683 Merge branch 'lash/meta-immutable' into 'master'
feat: Add immutable pointers to meta

Closes cic-meta#11

See merge request grassrootseconomics/cic-internal-integration!296
2021-10-25 18:51:08 +00:00
Louis Holbrook
fe0835a4e7 feat: Add immutable pointers to meta 2021-10-25 18:51:08 +00:00
William Luke
4a1008e75e feat(cic-eth): initial server setup 2021-10-25 17:51:45 +03:00
d8f51c5bdd Merge branch 'lash/split-migration' into 'master'
feat: Split and improve contract migration steps

See merge request grassrootseconomics/cic-internal-integration!292
2021-10-20 15:02:37 +00:00
Louis Holbrook
13fb67d2d8 feat: Split and improve contract migration steps 2021-10-20 15:02:36 +00:00
Louis Holbrook
8f1afa094d Merge branch 'lash/update-aux-deps' into 'master'
Update aux deps

See merge request grassrootseconomics/cic-internal-integration!264
2021-10-15 20:16:49 +00:00
Louis Holbrook
1d9f134125 Update aux deps 2021-10-15 20:16:49 +00:00
Louis Holbrook
b6a4bab1c8 Merge branch 'philip/ussd-cic-types-meta-tool' into 'master'
Philip/ussd cic types meta tool

See merge request grassrootseconomics/cic-internal-integration!294
2021-10-15 11:21:42 +00:00
805fc56c7b Philip/ussd cic types meta tool 2021-10-15 11:21:41 +00:00
Louis Holbrook
e3d39a2144 Merge branch 'lash/no-none-callbacks' into 'master'
bug: Do not call none callbacks on token proof check

See merge request grassrootseconomics/cic-internal-integration!293
2021-10-14 13:42:09 +00:00
Louis Holbrook
90176f2806 bug: Do not call none callbacks on token proof check 2021-10-14 13:42:09 +00:00
f42f223ce9 Merge branch 'lash/api-choose-token' into 'master'
feat: Add token metadata API

Closes #118

See merge request grassrootseconomics/cic-internal-integration!289
2021-10-14 13:24:51 +00:00
Louis Holbrook
045a279ac2 feat: Add token metadata API 2021-10-14 13:24:51 +00:00
Louis Holbrook
6b59c87f68 Merge branch 'lash/okota' into 'master'
feat: Integrate okota

See merge request grassrootseconomics/cic-internal-integration!286
2021-10-07 21:05:58 +00:00
Louis Holbrook
9ee42b908d feat: Integrate okota 2021-10-07 21:05:58 +00:00
3343c4163e Merge branch 'lash/more-case-case' into 'master'
bug: cic-eth transaction listings

See merge request grassrootseconomics/cic-internal-integration!285
2021-10-07 15:12:35 +00:00
Louis Holbrook
f5bfc8ace2 bug: cic-eth transaction listings 2021-10-07 15:12:35 +00:00
8a9d2ee0be Merge branch 'bvander/default-docker-compose' into 'master'
chore: gift defaults

See merge request grassrootseconomics/cic-internal-integration!282
2021-09-27 13:15:21 +00:00
3608fd1fc7 chore: gift defaults 2021-09-27 16:14:31 +03:00
0d275f358b Merge branch 'philip/removes-docker-compose-profiles' into 'master'
removes profile attrs from docker-compose file.

See merge request grassrootseconomics/cic-internal-integration!281
2021-09-27 12:33:19 +00:00
3aef2aa65f
removes profile attrs from docker-compose file. 2021-09-27 15:26:22 +03:00