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.

Sign up for GitHub

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

Jump to bottom

v3 #219

Merged
merged 58 commits into from
Oct 27, 2020
Merged

v3 #219

merged 58 commits into from
Oct 27, 2020

Conversation

kremalicious
Copy link
Contributor

@kremalicious kremalicious commented Sep 8, 2020 •
edited
Loading

It changes everything™. Just not the dolphin. The README changeset is the best place to see what got changed. The market UI is not included in the beginning, so barge is mainly used for local development of market.

This branch is currently in use for integration testing of:

  • ocean.js
  • ocean.py
  • react
  • market

Screen Shot 2020-09-08 at 18 34 35

Closes #218

alexcos20 and others added 30 commits June 26, 2020 08:37
@alexcos20
first cut
a4e32d3
@alexcos20
fix provider
c9a32ed
@alexcos20
fix provider
acc399f
@alexcos20
add ganache
b6df445
@alexcos20
make dashboard optional
96a0df6
@alexcos20
fix elastic
13733f2
@alexcos20
fix mongodb
76477e8
@alexcos20
Update start_ocean.sh
1b5acb5
@alexcos20
more ganache options
9083915
@alexcos20
more ganache options
10e29cc
update envvar
a42e4bb
@alexcos20
Update start_ocean.sh
fbf261e
@alexcos20
Update start_ocean.sh
5118cbe
@alexcos20
Update provider.yml
b2fa3c1
Fix provider issue, remove references to keeper
c148e44
Merge remote-tracking branch 'origin/v3' into v3
a1d8c24
Remove extra line.
0299f33
@alexcos20
temporary provider will use one worker
b623171
Support decentralized ddo
07131ce
Make ganache run persist with db cache
528df38
@kremalicious
add discord link
12d6e01
@kremalicious
script cleanup, sync script and docs
09c97c7
add ocean-contracts compose file.
99640d2
fix errors, remove ganache blockTime option.
1b5deda
use ocean-contracts:test docker image until it is merged to master.
b4bd7bd
set contracts version in start_ocean
da93e10
Use aquarius latest tag.
7ee85c9
Update readme file, fix error in setting default ocean-contracts vers…
b61407d 
…ion.
update aquarius default version.
fc40685
@alexcos20
small fixes
5215ee5
Merge branch 'feature/did-datatoken' into v3
f5691db 
# Conflicts:
#	start_ocean.sh
kremalicious
kremalicious commented Sep 25, 2020
View reviewed changes
start_ocean.sh Outdated Show resolved Hide resolved
@alexcos20 alexcos20 marked this pull request as ready for review October 27, 2020 11:18
@alexcos20 alexcos20 requested a review from a team October 27, 2020 11:18
@alexcos20 alexcos20 requested a review from a team as a code owner October 27, 2020 11:18
alexcos20
alexcos20 approved these changes Oct 27, 2020
View reviewed changes
Copy link
Member

@alexcos20 alexcos20 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@alexcos20 alexcos20 merged commit fe587a3 into master Oct 27, 2020
@alexcos20 alexcos20 deleted the v3 branch October 27, 2020 11:20
@alexcos20 alexcos20 restored the v3 branch October 27, 2020 11:20
@kremalicious kremalicious deleted the v3 branch February 3, 2021 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcos20 alexcos20 alexcos20 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Barge for v3
2 participants
@kremalicious @alexcos20