philip
004e30af31
Merge branch 'master' of gitlab.com:grassrootseconomics/cic-internal-integration into lash/improve-cache
2022-01-04 18:59:11 +03:00
Mohamed Sohail
b5653a704c
Merge branch 'lash/rules-of-engagement' into 'master'
...
Add updated version of old rules of engagement for core team
See merge request grassrootseconomics/cic-internal-integration!321
2022-01-03 06:36:52 +00:00
3b6ea6db77
Add updated version of old rules of engagement for core team
2022-01-03 06:36:52 +00:00
7618abcda3
Bump deps
2021-12-22 21:31:39 +00:00
94d8ddb164
Amend okota dependency conflict
2021-12-22 20:34:12 +00:00
7f958d4be8
Rehabiliate test for balance incoming check (already counted from PENDING state)
2021-12-22 20:23:02 +00:00
03b06ca8c1
Merge remote-tracking branch 'origin/master' into lash/improve-cache
2021-12-22 20:09:54 +00:00
14449f5c6d
Rehabilitate tests for cic-eth
2021-12-22 20:02:05 +00:00
15618fa061
Rehabilitate tests after url format change
2021-12-22 19:12:08 +00:00
Philip Wafula
7d3ff89fe5
Merge branch 'lash/token-checksum-address-fix' into 'master'
...
bug: Normalize token addresses in db for erc20 operations
See merge request grassrootseconomics/cic-internal-integration!304
2021-12-22 18:25:29 +00:00
dceae4e5d8
bug: Normalize token addresses in db for erc20 operations
2021-12-22 18:25:29 +00:00
Philip Wafula
46a4ccfd9c
Merge branch 'lash/bloxberg-seeding' into 'master'
...
migrations: Enable deployment and data seeding to Bloxberg
See merge request grassrootseconomics/cic-internal-integration!301
2021-12-22 18:24:05 +00:00
d7c4cb71eb
migrations: Enable deployment and data seeding to Bloxberg
2021-12-22 18:24:05 +00:00
3a52a78e93
Change poker method
2021-12-21 14:23:33 +00:00
6562d37a30
Add demurrage poker script
2021-12-21 14:19:26 +00:00
c5efa56885
Loosen requirements restrictions, fix missing explicit nonce in global contract deploy last step
2021-12-21 14:18:09 +00:00
philip
d6346bb87b
Merge "origin/master" into "lash/improve-cache"
2021-12-20 11:14:04 +03:00
philip
9050d331cd
Bumps lib versions
2021-12-20 11:12:39 +03:00
philip
99997df248
Bumps deps
2021-12-20 11:11:23 +03:00
philip
d04a4bf5c6
Adds missing import: tempfile
2021-12-20 11:10:35 +03:00
philip
43c49dd527
Adds minor fixes:
...
- Added appropriate imports:
- from okota.token_index.index import to_identifier
- from cic_eth.error import SignerError
- cleaned up balance func.
2021-12-20 11:07:41 +03:00
philip
511557c242
Cleaned up docker-compose.yml:
...
- Added ETH_MIN_FEE_LIMIT.
- Removed "" from callback task definitions.
2021-12-20 11:03:23 +03:00
philip
887799962f
Couldn't get `python setup.py install` to work without it fussing:
...
```
=> => # Processing dependencies for cic-cache==0.3.1
=> => # Searching for eth-contract-registry~=0.7.1a2
=> => # Reading https://pypi.org/simple/eth-contract-registry/
=> => # Couldn't retrieve index page for 'eth-contract-registry'
=> => # Scanning index of all packages (this may take a while)
=> => # Reading https://pypi.org/simple/
```
2021-12-20 11:01:39 +03:00
philip
3acc3cf417
Bumps deps.
2021-12-20 10:58:21 +03:00
philip
ceeb246ce2
Retires unused override_requirements.txt file.
2021-12-20 10:56:30 +03:00
philip
45499ec839
Refactor to match proof checked for by verify_proofs task.
2021-12-20 10:56:01 +03:00
philip
77bdee049c
Adds token decimals to demurrage token deployment.
2021-12-20 10:54:28 +03:00
Blair Vanderlugt
b15cfee1c9
Merge branch 'sohail/pip-url-fix' into 'master'
...
fix: update default pip to new url
Closes #171
See merge request grassrootseconomics/cic-internal-integration!316
2021-12-10 14:55:50 +00:00
Mohamed Sohail
efb1967f46
fix: update default pip to new url
2021-12-10 14:55:50 +00:00
Will Ruddick
019824d1f4
Merge branch 'bvander/docs-updates' into 'master'
...
documentation: updated the docs with new links and getting started
See merge request grassrootseconomics/cic-internal-integration!314
2021-12-09 09:20:03 +00:00
Blair Vanderlugt
d4c7fd3d7e
documentation: updated the docs with new links and getting started
2021-12-09 09:20:03 +00:00
0cf6489f49
Merge remote-tracking branch 'origin/master' into lash/improve-cache
2021-12-08 06:44:31 +01:00
31256b3650
Remove custom port in pip url in dockers
2021-12-07 21:54:04 +01:00
380550cb84
Add higher fee limit in base task
2021-12-07 21:45:07 +01:00
a356585c6a
Remove port from pip
2021-12-06 17:45:44 +01:00
4809bc8c22
Bump confini
2021-12-06 14:21:26 +01:00
760f618943
WIP upgrade deps
2021-12-04 11:39:13 +01:00
Blair Vanderlugt
4b87a40cc2
Fixing path because it was messed up in the mr
2021-12-02 20:52:06 +00:00
Blair Vanderlugt
9f9d557c73
Merge branch 'blairv/bug-template' into 'master'
...
Update bug.md
See merge request grassrootseconomics/cic-internal-integration!313
2021-12-02 20:49:00 +00:00
Blair Vanderlugt
9814da78b8
Update bug.md
2021-12-02 20:47:11 +00:00
Philip Wafula
cd102807a6
Merge branch 'philip/social-pin-recovery' into 'master'
...
Philip/social pin recovery
See merge request grassrootseconomics/cic-internal-integration!311
2021-11-29 21:24:38 +00:00
Philip Wafula
c3c43c28a5
Philip/social pin recovery
2021-11-29 21:24:37 +00:00
Philip Wafula
e132e534d3
Merge branch 'philip/multi-token-v1' into 'master'
...
Philip/multi token v1
See merge request grassrootseconomics/cic-internal-integration!309
2021-11-29 15:04:50 +00:00
Philip Wafula
e426f7b451
Philip/multi token v1
2021-11-29 15:04:50 +00:00
Blair Vanderlugt
b368b022c1
Merge branch 'bvander/contributing' into 'master'
...
improvement: adopt a new contribution guide
See merge request grassrootseconomics/cic-internal-integration!306
2021-11-24 21:03:57 +00:00
Blair Vanderlugt
bd266ac8dd
improvement: adopt a new contribution guide
2021-11-24 21:03:57 +00:00
Blair Vanderlugt
69dbbcb6a9
fix: path in base image url
2021-11-23 21:43:32 +00:00
Blair Vanderlugt
dd709d7d47
Update .gitlab-ci.yml
2021-11-23 21:09:16 +00:00
Blair Vanderlugt
a9c84bb2b1
Merge branch 'fix-image-paths' into 'master'
...
bug: image paths are decoupled from the args that drive pulls, also fixes base path
See merge request grassrootseconomics/cic-internal-integration!310
2021-11-23 20:56:19 +00:00
85aa1f3066
bug: image paths are decoupled from the args that drive pulls, also fixes base path
2021-11-23 12:54:11 -08:00
philip
Mohamed Sohail
Louis Holbrook
nolash
Blair Vanderlugt
Will Ruddick
semvervot