|
|
55a4d14940
|
Merge branch 'master' into lash/ci-for-scripts
|
2021-05-02 10:26:56 -07:00 |
|
Louis Holbrook
|
298bcf89e5
|
Merge branch 'lash/chainlib-erc20-split' into 'master'
Update componens for chainlib erc20 split
See merge request grassrootseconomics/cic-internal-integration!135
|
2021-05-02 17:11:03 +00:00 |
|
Louis Holbrook
|
5d3d773f41
|
Update componens for chainlib erc20 split
|
2021-05-02 17:11:03 +00:00 |
|
Louis Holbrook
|
e71b2411d0
|
Merge branch 'lash/contract-interfaces' into 'master'
cic-eth: Update deps for contract standardization refactor
See merge request grassrootseconomics/cic-internal-integration!129
|
2021-05-02 17:02:45 +00:00 |
|
Louis Holbrook
|
b4bfb76634
|
cic-eth: Update deps for contract standardization refactor
|
2021-05-02 17:02:45 +00:00 |
|
|
|
aab5c8bf85
|
Merge branch 'contract-migration-include-data-scripts' into 'master'
puts the scripts in the container and take out the user
See merge request grassrootseconomics/cic-internal-integration!133
|
2021-05-02 16:56:08 +00:00 |
|
|
|
e1564574f7
|
puts the scripts in the container and take out the user
|
2021-05-02 16:56:08 +00:00 |
|
|
|
13253a2dcc
|
Update .cic-template.yml
|
2021-05-02 02:54:03 +00:00 |
|
|
|
9020fe1000
|
Update .cic-template.yml
|
2021-05-02 02:47:01 +00:00 |
|
|
|
a2e7d2973c
|
Merge branch 'fix-cic-meta-migration-onerror' into 'master'
meta exit error fixed
See merge request grassrootseconomics/cic-internal-integration!132
|
2021-05-01 19:52:30 +00:00 |
|
|
|
82f650e81d
|
meta exit error fixed
|
2021-05-01 12:52:03 -07:00 |
|
|
|
e77940d0de
|
Merge branch 'philip/metadata-salt' into 'master'
Update metadata pointer salt values
See merge request grassrootseconomics/cic-internal-integration!131
|
2021-05-01 14:52:54 +00:00 |
|
|
|
1df62717ef
|
Update metadata pointer salt values
|
2021-05-01 14:52:54 +00:00 |
|
|
|
c4919d56b1
|
Merge branch 'philip/default-token-integration' into 'master'
Philip/default token integration
See merge request grassrootseconomics/cic-internal-integration!128
|
2021-05-01 14:14:20 +00:00 |
|
|
|
6d44863a49
|
Philip/default token integration
|
2021-05-01 14:14:20 +00:00 |
|
Louis Holbrook
|
b02cdee1bd
|
Merge branch 'lash/cic-cache-tags' into 'master'
cic-cache: Add tx tags in persistent storage
Closes cic-cache#14
See merge request grassrootseconomics/cic-internal-integration!130
|
2021-05-01 13:20:14 +00:00 |
|
Louis Holbrook
|
75bf8f15be
|
cic-cache: Add tx tags in persistent storage
|
2021-05-01 13:20:14 +00:00 |
|
|
|
8db76dc0a8
|
Merge branch 'fix-cic-meta-migrations' into 'master'
fixed cic meta migration and removed pg schema stuff during init
See merge request grassrootseconomics/cic-internal-integration!127
|
2021-04-30 08:33:34 +00:00 |
|
|
|
a3261f2f0e
|
fixed cic meta migration and removed pg schema stuff during init
|
2021-04-30 08:33:33 +00:00 |
|
|
|
850dd15451
|
Merge branch 'philip/separate-telco-cicada-http-apis' into 'master'
Philip/separate telco cicada http apis
See merge request grassrootseconomics/cic-internal-integration!124
|
2021-04-30 08:15:03 +00:00 |
|
|
|
0c56e84704
|
Philip/separate telco cicada http apis
|
2021-04-30 08:15:03 +00:00 |
|
|
|
63cd8a4aab
|
Merge branch 'lash/contracts-kill' into 'master'
Remove cic-contracts references
See merge request grassrootseconomics/cic-internal-integration!126
|
2021-04-30 06:25:49 +00:00 |
|
Louis Holbrook
|
2c326f62ae
|
Remove cic-contracts references
|
2021-04-30 06:25:49 +00:00 |
|
|
|
9ed62c58ae
|
Merge branch 'lash/right-token' into 'master'
Correct default token env vars in deployment step 2
See merge request grassrootseconomics/cic-internal-integration!125
|
2021-04-28 17:31:49 +00:00 |
|
nolash
|
04e9f45feb
|
Correct default token env vars in deployment step 2
|
2021-04-28 19:24:33 +02:00 |
|
Spencer Ofwiti
|
9126a75c4a
|
Merge branch 'spencer/refactor-meta-library' into 'master'
Remove library files into crdt-meta.
See merge request grassrootseconomics/cic-internal-integration!98
|
2021-04-28 09:11:39 +00:00 |
|
Spencer Ofwiti
|
1bc29588a1
|
Remove library files into crdt-meta.
|
2021-04-28 09:11:39 +00:00 |
|
|
|
e6d57d3bbb
|
Merge branch 'fix-contract-migration-build' into 'master'
switch to deb solc package
See merge request grassrootseconomics/cic-internal-integration!123
|
2021-04-28 04:07:29 +00:00 |
|
|
|
f64ff1290c
|
switch to deb solc package
|
2021-04-27 21:01:58 -07:00 |
|
nolash
|
86193b123e
|
Merge remote-tracking branch 'origin/master' into lash/ci-for-scripts
|
2021-04-25 16:55:46 +02:00 |
|
Louis Holbrook
|
d5cbe9d113
|
Merge branch 'lash/rehabilitate-tests' into 'master'
cic-eth: Make failing tests pass again
See merge request grassrootseconomics/cic-internal-integration!117
|
2021-04-25 14:54:54 +00:00 |
|
Louis Holbrook
|
5663741ed4
|
cic-eth: Make failing tests pass again
|
2021-04-25 14:54:54 +00:00 |
|
nolash
|
14eb554ab2
|
Remove foreign update
|
2021-04-25 15:09:16 +02:00 |
|
nolash
|
4695cfa654
|
Update chainlib update for rpc construtors
|
2021-04-25 15:07:24 +02:00 |
|
nolash
|
bf179a5db7
|
Merge remote-tracking branch 'origin/master' into lash/ci-for-scripts
|
2021-04-25 14:27:33 +02:00 |
|
Louis Holbrook
|
0f6615a925
|
Merge branch 'lash/get-registry-api' into 'master'
Use task pool rpc for registry and eth queries with cic-eth view cli util
See merge request grassrootseconomics/cic-internal-integration!116
|
2021-04-25 12:24:17 +00:00 |
|
Louis Holbrook
|
aa15353d68
|
Use task pool rpc for registry and eth queries with cic-eth view cli util
|
2021-04-25 12:24:17 +00:00 |
|
Louis Holbrook
|
f7a69830ba
|
Merge branch 'lash/version-conflict' into 'master'
Fix cic-ussd cic-eth conflict
See merge request grassrootseconomics/cic-internal-integration!118
|
2021-04-25 12:14:55 +00:00 |
|
Louis Holbrook
|
7428420cda
|
Fix cic-ussd cic-eth conflict
|
2021-04-25 12:14:55 +00:00 |
|
nolash
|
b99b5bd4fa
|
Merge remote-tracking branch 'origin/master' into lash/version-conflict
|
2021-04-25 14:12:00 +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
|
8f33ce40e1
|
Final attempt before deferring to devops
|
2021-04-25 11:49:31 +02:00 |
|
nolash
|
3a63d0505f
|
Another attempt at running ci for scripts
|
2021-04-25 11:45:32 +02:00 |
|
nolash
|
334c63b1e6
|
Poking script setup as it doesnt work like it did before
|
2021-04-25 11:39:40 +02:00 |
|
nolash
|
b123e050c3
|
Add script invocation
|
2021-04-25 11:37:58 +02:00 |
|
nolash
|
e27d5d8b33
|
scripts ci typo
|
2021-04-25 11:33:23 +02:00 |
|
nolash
|
cc35c498c8
|
Attempt add script ci
|
2021-04-25 11:32:20 +02:00 |
|
nolash
|
dea7bc8a1c
|
Fix cic-ussd cic-eth conflict
|
2021-04-25 10:52:39 +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 |
|
