Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add elasticdb tvl #677

Merged
merged 62 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
4b50f19
fix: some fixs
AdriGeorge Aug 29, 2024
0fe5532
fix: type and eslint
AdriGeorge Sep 2, 2024
692fa2d
chore: strategy pattern
AdriGeorge Sep 3, 2024
4d1b408
fix: tests
AdriGeorge Sep 4, 2024
b9b054f
fix: update
AdriGeorge Sep 4, 2024
7c70bf2
chore: tests
AdriGeorge Sep 5, 2024
ad96ab4
fix: some fixs
AdriGeorge Sep 5, 2024
e702833
fix: formatting
AdriGeorge Sep 5, 2024
881f410
fix: formatting
AdriGeorge Sep 5, 2024
b300c03
fix: fix
AdriGeorge Sep 5, 2024
2ab3beb
fix: fix
AdriGeorge Sep 5, 2024
4c88a33
fix: fix
AdriGeorge Sep 5, 2024
0943620
fix: env
AdriGeorge Sep 5, 2024
67ed10d
fix: some tests
AdriGeorge Sep 11, 2024
95b6197
fix: lint
AdriGeorge Sep 11, 2024
7044ca9
fix: test
AdriGeorge Sep 11, 2024
2373266
fix: lint
AdriGeorge Sep 11, 2024
cb30888
chore: integration light
AdriGeorge Sep 12, 2024
32b2b9a
fix: ci
AdriGeorge Sep 12, 2024
4159621
fix: ci
AdriGeorge Sep 12, 2024
20d0458
fix: env test
AdriGeorge Sep 12, 2024
28135e8
fix: ci
AdriGeorge Sep 12, 2024
9797518
fix: ci
AdriGeorge Sep 12, 2024
ac2463c
fix: ci from main
AdriGeorge Sep 12, 2024
95b4d07
fix: ci
AdriGeorge Sep 12, 2024
2bb41ca
fix: ci
AdriGeorge Sep 12, 2024
c8d7bab
fix: db
AdriGeorge Sep 12, 2024
b5077ed
fix: some log in test
AdriGeorge Sep 12, 2024
04daf20
fix: test
AdriGeorge Sep 12, 2024
64c69f6
fix: test
AdriGeorge Sep 12, 2024
af0746c
fix: test
AdriGeorge Sep 12, 2024
e74dcdd
fix: test
AdriGeorge Sep 12, 2024
e13ae1e
fix: test
AdriGeorge Sep 12, 2024
d069e14
fix: test
AdriGeorge Sep 12, 2024
a869af1
fix: logs
AdriGeorge Sep 12, 2024
ed76d9a
fix: tests
AdriGeorge Sep 12, 2024
57964f9
fix: tests
AdriGeorge Sep 12, 2024
c2bb586
fix: update ddo with algo in test
AdriGeorge Sep 12, 2024
2d268eb
fix: tests
AdriGeorge Sep 12, 2024
276d7a4
fix: tests
AdriGeorge Sep 12, 2024
d4abc16
fix: logs
AdriGeorge Sep 12, 2024
3c3b88a
fix: logs
AdriGeorge Sep 12, 2024
007a5fe
fix: logs
AdriGeorge Sep 12, 2024
580464f
fix: logs
AdriGeorge Sep 12, 2024
60a183a
fix: timeout
AdriGeorge Sep 12, 2024
d53f690
fix: timeout
AdriGeorge Sep 12, 2024
d56e5e7
fix: index
AdriGeorge Sep 12, 2024
67c1346
fix: index
AdriGeorge Sep 12, 2024
b1419e3
fix: fix
AdriGeorge Sep 12, 2024
6eb74a9
fix: fix
AdriGeorge Sep 12, 2024
46e99f6
fix: fix
AdriGeorge Sep 12, 2024
ac1d919
fix: fix
AdriGeorge Sep 12, 2024
fde74fc
fix: fix
AdriGeorge Sep 12, 2024
956ed2c
fix: fix
AdriGeorge Sep 12, 2024
5222dcb
fix: fix
AdriGeorge Sep 12, 2024
4e70022
fix: fix
AdriGeorge Sep 12, 2024
e678fa9
fix: fix
AdriGeorge Sep 12, 2024
82e1950
fix: fix
AdriGeorge Sep 12, 2024
a78ac19
fix: removed logs
AdriGeorge Sep 12, 2024
7dd5e73
fix: lint
AdriGeorge Sep 12, 2024
81479f6
fix: lint
AdriGeorge Sep 12, 2024
deac79f
fix: some fixs
AdriGeorge Sep 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
DB_URL: 'http://localhost:8108/?apiKey=xyz'
FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: coverage
path: coverage/
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- name: Run Barge
working-directory: ${{ github.workspace }}/barge
run: |
bash -x start_ocean.sh --no-aquarius --no-provider --no-elasticsearch --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
bash -x start_ocean.sh --no-aquarius --no-provider --no-dashboard --with-c2d --with-typesense 2>&1 > start_ocean.log &
- run: npm ci
- run: npm run build
- run: docker image ls
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
- name: docker logs
run: docker logs ocean-ocean-contracts-1 && docker logs ocean-kindcluster-1 && docker logs ocean-computetodata-1 && docker logs ocean-typesense-1
if: ${{ failure() }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: coverage
path: coverage/
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
- name: Run Barge
working-directory: ${{ github.workspace }}/barge
run: |
bash -x start_ocean.sh --no-dashboard --no-aquarius --no-provider --no-elasticsearch --with-typesense --with-c2d 2>&1 > start_ocean.log &
bash -x start_ocean.sh --no-dashboard --no-aquarius --no-provider --with-typesense --no-elasticsearch --with-c2d 2>&1 > start_ocean.log &

- run: npm ci
- run: npm run build
Expand Down Expand Up @@ -276,10 +276,12 @@ jobs:
FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
AUTHORIZED_DECRYPTERS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
P2P_ENABLE_UPNP: 'false'
P2P_ENABLE_AUTONAT: 'false'
ALLOWED_ADMINS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
- name: Check Ocean Node is running
run: |
for i in $(seq 1 30); do
for i in $(seq 1 90); do
if curl --output /dev/null --silent --head --fail "http://localhost:8001"; then
echo "Ocean Node is up"
exit 0
Expand Down
12 changes: 6 additions & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"semi": false,
"singleQuote": true,
"printWidth": 90,
"trailingComma": "none",
"tabWidth": 2
}
"semi": false,
"singleQuote": true,
"printWidth": 90,
"trailingComma": "none",
"tabWidth": 2
}
Loading
Loading