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

Feat/gardenv1 #6

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Feat/gardenv1 #6

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9230d71
add services for v1 stack
yash1io Aug 9, 2024
b8ee0ce
updated to use garden watchers
yash1io Sep 4, 2024
afde747
remove binary
yash1io Sep 4, 2024
87f0169
Merge branch 'main' into feat/gardenv1
yash1io Sep 9, 2024
a122d18
add bit ponder
yash1io Sep 19, 2024
9d6f8a2
add cobiv2 support
Revantark Sep 22, 2024
b49a426
fund cobiv2 addresses
Revantark Sep 23, 2024
c2f2b26
update cobi evm address
Revantark Sep 23, 2024
9dbb181
add relayer support
Revantark Sep 26, 2024
68810df
update relayer docker config
Revantark Oct 1, 2024
d4e4a5f
resolved conflicts with main
Oct 3, 2024
6cfbca1
add support for quote server
Revantark Oct 13, 2024
a965b4e
fix fund
Revantark Oct 21, 2024
bcfaf94
add solana validator
Revantark Nov 18, 2024
8dfe3be
add solana services
Revantark Nov 20, 2024
bd2c85e
Update ports for solana validator, relayer
harshasingamshetty1 Nov 21, 2024
65592ac
feat/faucet: Add Solana support (#7)
skr4n Nov 21, 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
4 changes: 2 additions & 2 deletions go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func (m *Merry) Start() error {
}
composePath := filepath.Join(home, ".merry", "docker-compose.yml")

bashCmd := runDockerCompose(composePath, "up", "-d", "cobi", "esplora", "ethereum-explorer", "arbitrum-explorer")
bashCmd := runDockerCompose(composePath, "up", "-d", "cobi", "esplora", "ethereum-explorer", "arbitrum-explorer", "garden-evm-watcher", "garden-db", "matcher")
if m.IsHeadless && m.IsBare {
bashCmd = runDockerCompose(composePath, "up", "-d", "chopsticks", "ethereum", "arbitrum")
} else if m.IsHeadless {
Expand All @@ -39,7 +39,7 @@ func (m *Merry) Start() error {
fmt.Println("ENDPOINTS")
for name, endpoint := range m.Services {
if m.IsBare {
if name == "cobi" || name == "redis" || name == "orderbook" || name == "postgres" {
if name == "cobi" || name == "redis" || name == "orderbook" || name == "postgres" || name == "garden-evm-watcher" || name == "garden-db" || name == "matcher" {
continue
}
}
Expand Down
34 changes: 34 additions & 0 deletions resources/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ services:
volumes:
- ./volumes/orderbook_data:/var/lib/postgresql/data

garden-db:
image: postgres:alpine
container_name: garden-db
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: garden
ports:
- 5433:5432
volumes:
- ./volumes/ponder_data:/var/lib/postgresql/data

redis:
image: redis:alpine
container_name: redis
Expand Down Expand Up @@ -160,6 +172,28 @@ services:
restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"

Copy link

Choose a reason for hiding this comment

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

Remove trailing spaces.

There are trailing spaces on lines 175 and 188. These should be removed to adhere to best coding practices and to prevent potential issues in YAML parsing.

Apply this diff to remove the trailing spaces:

-  # following services will be part of gardenv2 stack
+  # following services will be part of gardenv2 stack
-      - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"

Also applies to: 188-188

Tools
yamllint

[error] 175-175: trailing spaces

(trailing-spaces)

# following services will be part of gardenv2 stack
garden-evm-watcher:
image: ghcr.io/catalogfi/garden-evm-watcher:latest
container_name: garden-evm-watcher
depends_on:
- ethereum
- arbitrum
- chopsticks
- garden-db
restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"

matcher:
image: ghcr.io/catalogfi/matcher:latest
container_name: matcher
depends_on:
- garden-evm-watcher
restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"

networks:
default:
Expand Down