Skip to content

Commit 342a671

Browse files
authored
chore: remove solana-relay and relay from monorepo (#14312)
1 parent a15bbea commit 342a671

63 files changed

Lines changed: 20288 additions & 33394 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
- ./packages/ddex-entrypoint/node_modules
9292
- ./packages/create-audius-app/node_modules
9393
- ./packages/dotenv-linter/bin
94-
- ./packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules
9594

9695
generate-release-branch:
9796
working_directory: ~/apps

.circleci/scripts/docker-tag-images.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ discovery=(
4040
discovery-provider-notifications
4141
discovery-provider-openresty
4242
es-indexer
43-
solana-relay
4443
staking
4544
anti-abuse
4645
archiver

.circleci/src/jobs/@integration-jobs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ e2e-init:
2626
- packages/libs/dist
2727
- packages/sdk/node_modules
2828
- packages/sdk/dist
29-
- packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules
3029

3130
e2e-test:
3231
machine: true

.circleci/src/workflows/discovery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
- push-docker-image:
44
name: push-discovery-provider
55
context: [Vercel, dockerhub]
6-
service: discovery-provider discovery-provider-openresty discovery-provider-notifications staking solana-relay es-indexer anti-abuse archiver
6+
service: discovery-provider discovery-provider-openresty discovery-provider-notifications staking es-indexer anti-abuse archiver
77
filters:
88
branches:
99
only: main

.circleci/src/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- push-docker-image:
99
name: push-discovery-provider
1010
context: [Vercel, dockerhub, slack-secrets]
11-
service: discovery-provider discovery-provider-notifications discovery-provider-openresty solana-relay staking es-indexer anti-abuse archiver
11+
service: discovery-provider discovery-provider-notifications discovery-provider-openresty staking es-indexer anti-abuse archiver
1212
notify_slack_on_failure: true
1313
- commit-audius-docker-compose-and-notify:
1414
context: [slack-secrets, github]

dev-tools/compose/docker-compose.pedalboard.dev.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ services:
3535
volumes:
3636
- ${PROJECT_ROOT}:/app
3737

38-
solana-relay:
39-
extends:
40-
file: docker-compose.pedalboard.prod.yml
41-
service: solana-relay
42-
build:
43-
dockerfile: ${PROJECT_ROOT}/packages/discovery-provider/plugins/pedalboard/docker/Dockerfile.dev
44-
volumes:
45-
- ${PROJECT_ROOT}:/app
46-
4738
archiver:
4839
user: ${DOCKER_UID:-root}:${DOCKER_GID:-root}
4940
extends:

dev-tools/compose/docker-compose.pedalboard.prod.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,6 @@ services:
4545
profiles:
4646
- pedalboard
4747

48-
solana-relay:
49-
build:
50-
context: ${PROJECT_ROOT}
51-
dockerfile: ${PROJECT_ROOT}/packages/discovery-provider/plugins/pedalboard/docker/Dockerfile.prod
52-
args:
53-
app_name: solana-relay
54-
TURBO_TEAM: '${TURBO_TEAM:-}'
55-
TURBO_TOKEN: '${TURBO_TOKEN:-}'
56-
env_file: .env # used by the startup script
57-
environment:
58-
audius_solana_rewards_manager_program_address: '${SOLANA_REWARD_MANAGER_PUBLIC_KEY}'
59-
audius_solana_rewards_manager_account: '${SOLANA_REWARD_MANAGER_PDA_PUBLIC_KEY}'
60-
audius_solana_user_bank_program_address: '${SOLANA_CLAIMABLE_TOKENS_PUBLIC_KEY}'
61-
audius_solana_payment_router_program_address: '${SOLANA_PAYMENT_ROUTER_PUBLIC_KEY}'
62-
audius_solana_waudio_mint: '${SOLANA_TOKEN_MINT_PUBLIC_KEY}'
63-
audius_solana_usdc_mint: '${SOLANA_USDC_TOKEN_MINT_PUBLIC_KEY}'
64-
audius_solana_fee_payer_wallets: '[{"privateKey":${SOLANA_FEEPAYER_SECRET_KEY}}]'
65-
restart: always
66-
profiles:
67-
- discovery
68-
deploy:
69-
mode: replicated
70-
replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
71-
healthcheck:
72-
test: ['CMD', 'curl', '-f', 'http://127.0.0.1:6002/solana/health_check']
73-
interval: 1s
74-
timeout: 1s
75-
retries: 120
76-
depends_on:
77-
db:
78-
condition: service_healthy
79-
discovery-provider-redis:
80-
condition: service_healthy
81-
solana-test-validator:
82-
condition: service_healthy
83-
8448
archiver:
8549
container_name: archiver
8650
build:

dev-tools/compose/docker-compose.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ services:
172172
service: staking
173173
<<: *common
174174

175-
solana-relay:
176-
extends:
177-
file: docker-compose.pedalboard.${DOCKERCOMPOSE_ENV_TYPE:-dev}.yml
178-
service: solana-relay
179-
<<: *common
180-
181175
anti-abuse:
182176
extends:
183177
file: docker-compose.pedalboard.${DOCKERCOMPOSE_ENV_TYPE:-dev}.yml

dev-tools/compose/nginx_ingress.conf

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ server {
2222
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
2323
}
2424

25-
location ~ ^/solana(/.*)?$ {
26-
resolver 127.0.0.11 valid=30s;
27-
proxy_pass http://audius-solana-relay-1:6002/solana$1;
28-
proxy_set_header Host $http_host;
29-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
30-
}
31-
3225
location ~ ^/console(/.*)?$ {
3326
resolver 127.0.0.11 valid=30s;
3427
proxy_pass http://audiusd-1:26659/console$1;
@@ -64,13 +57,6 @@ server {
6457
proxy_set_header Host $http_host;
6558
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
6659
}
67-
68-
location ~ ^/solana(/.*)?$ {
69-
resolver 127.0.0.11 valid=30s;
70-
proxy_pass http://audius-solana-relay-2:6002/solana$1;
71-
proxy_set_header Host $http_host;
72-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
73-
}
7460
}
7561

7662
server {
@@ -84,13 +70,6 @@ server {
8470
proxy_set_header Host $http_host;
8571
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
8672
}
87-
88-
location ~ ^/solana(/.*)?$ {
89-
resolver 127.0.0.11 valid=30s;
90-
proxy_pass http://audius-solana-relay-3:6002/solana$1;
91-
proxy_set_header Host $http_host;
92-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
93-
}
9473
}
9574

9675
#

monitoring/vector/vector.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
"notifications",
1313
"chain",
1414
"mediorum",
15-
"relay",
16-
"solana-relay",
1715
"core",
1816
"audiusd"
1917
]

0 commit comments

Comments
 (0)