Skip to content

Commit

Permalink
Revert "Feature/multiplayer (#1062)"
Browse files Browse the repository at this point in the history
This reverts commit bc39d56.
  • Loading branch information
efstajas committed Apr 19, 2024
1 parent bc39d56 commit 07011de
Show file tree
Hide file tree
Showing 118 changed files with 1,781 additions and 7,225 deletions.
4 changes: 0 additions & 4 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,3 @@ CACHE_REDIS_CONNECTION_STRING=string

# Optional base URL to use in local requests. Defaults to http://localhost:5173
PUBLIC_BASE_URL=string

# URL of the Drips Multiplayer API deployment to use. Set to the defaults below to use public Sepolia deployment.
MULTIPLAYER_API_URL=string # Default for sepolia https://multiplayer-sepolia.up.railway.app
MULTIPLAYER_API_ACCESS_TOKEN=string # Default for sepolia 992b2122-9a09-4a97-b2cc-2292d3dd23aa
4 changes: 1 addition & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:
envkey_GQL_ACCESS_TOKEN: afdb8b7e-8fa7-4de9-bd95-b650b839e745 # public token
envkey_PUBLIC_PINATA_GATEWAY_URL: http://localhost:3000
envkey_INFURA_KEY: 1234
envkey_MULTIPLAYER_API_ACCESS_TOKEN: 1234
envkey_MULTIPLAYER_API_URL: http://foobar:3000/

- name: Install dependencies
run: npm ci
Expand All @@ -47,4 +45,4 @@ jobs:
run: npm run build:graphql

- name: Run svelte-check
run: npm run check
run: npm run check -- --fail-on-warnings
2 changes: 0 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
envkey_GQL_ACCESS_TOKEN: afdb8b7e-8fa7-4de9-bd95-b650b839e745 # public token
envkey_PUBLIC_PINATA_GATEWAY_URL: http://localhost:3000
envkey_INFURA_KEY: 1234
envkey_MULTIPLAYER_API_ACCESS_TOKEN: 1234
envkey_MULTIPLAYER_API_URL: http://foobar:3000/

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:
postgres_pass: postgres
postgres_db: graph-node
ipfs: 'ipfs:5001'
ethereum: "sepolia:http://testnet:8545"
ethereum: "goerli:http://testnet:8545"
GRAPH_LOG: info

subgraph-deployer:
Expand Down
2 changes: 0 additions & 2 deletions docker/app-e2e-test-env
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ VITE_TEST_MODE=true
CACHE_REDIS_CONNECTION_STRING=redis://redis:6379
INFURA_KEY=1234
PUBLIC_BASE_URL=http://localhost:3001
MULTIPLAYER_API_URL=http://multiplayer:5001
MULTIPLAYER_API_ACCESS_TOKEN=1234
4 changes: 0 additions & 4 deletions docker/env-ports-exposed.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ services:
ports: [3000:3000]
redis:
ports: [6379:6379]
postgres-multiplayer:
ports: [5434:5432]
multiplayer:
ports: [5002:5002]
32 changes: 1 addition & 31 deletions docker/env.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
postgres_pass: postgres
postgres_db: graph-node
ipfs: 'ipfs:5001'
ethereum: "sepolia:http://testnet:8545"
ethereum: "goerli:http://testnet:8545"
GRAPH_LOG: info
ETHEREUM_REORG_THRESHOLD: 1
ETHEREUM_ANCESTOR_COUNT: 1
Expand Down Expand Up @@ -94,33 +94,3 @@ services:
context: .
ports:
- '3000:3000'

postgres-multiplayer:
image: postgres
command: ["postgres", "-cshared_preload_libraries=pg_stat_statements"]
volumes:
- ./services/multiplayer/db:/docker-entrypoint-initdb.d
environment:
POSTGRES_USER: user
POSTGRES_PASSWORD: admin
POSTGRES_DB: dripsdb
POSTGRES_INITDB_ARGS: -E UTF8 --locale=C
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
timeout: 5s
retries: 5

multiplayer:
build:
dockerfile: ./services/multiplayer/Dockerfile
context: .
args:
- MULTIPLAYER_BRANCH
depends_on:
- postgres-multiplayer
healthcheck:
test: ["CMD", "curl", "http://multiplayer:5002"]
interval: 2s
timeout: 20s
retries: 10
23 changes: 0 additions & 23 deletions docker/services/multiplayer/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion docker/services/multiplayer/db/schema.sql

This file was deleted.

14 changes: 0 additions & 14 deletions docker/services/multiplayer/envfile

This file was deleted.

9 changes: 0 additions & 9 deletions docker/services/multiplayer/start.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ git clone -b feature/dependency-funding --single-branch https://github.com/radic

echo "📁 Creating subgraph config file for local env"
cd ./drips-subgraph
printf '{ "network": "sepolia", "immutableSplitsDriver": { "address": "0xEC8493BdbBbBe22a6F54573cFeE23ac8Ab90dF77", "block": 0 }, "repoDriver": { "address": "0xb9C8e18E82687a564Ac4D26E22D28a4C95057CE9", "block": 0 }, "drips": { "address": "0xa0523b86472561f0859d84C094cc04e6c4B33169", "block": 0 }, "nftDriver": { "address": "0xc95eb214845d5693abc750692161CB008796ae5C", "block": 0 },"metaData": { "address": "0xC58cEa5a448A761d2dE80DFa8BfE298780e9dd66", "block": 0 } }' > config.json
printf '{ "network": "goerli", "immutableSplitsDriver": { "address": "0xEC8493BdbBbBe22a6F54573cFeE23ac8Ab90dF77", "block": 0 }, "repoDriver": { "address": "0xb9C8e18E82687a564Ac4D26E22D28a4C95057CE9", "block": 0 }, "drips": { "address": "0xa0523b86472561f0859d84C094cc04e6c4B33169", "block": 0 }, "nftDriver": { "address": "0xc95eb214845d5693abc750692161CB008796ae5C", "block": 0 },"metaData": { "address": "0xC58cEa5a448A761d2dE80DFa8BfE298780e9dd66", "block": 0 } }' > config.json
echo "🛠 Installing subgraph deps…"
npm install

Expand Down
2 changes: 1 addition & 1 deletion docker/services/testnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ FROM ghcr.io/foundry-rs/foundry:latest

COPY ./services/testnet/state state

ENTRYPOINT anvil --chain-id 11155111 --state ./state --mnemonic "fame elevator saddle renew match guilt seat duck seven buyer true smoke" --host 0.0.0.0 --block-time 2
ENTRYPOINT anvil --chain-id 5 --state ./state --mnemonic "fame elevator saddle renew match guilt seat duck seven buyer true smoke" --host 0.0.0.0 --block-time 2
Loading

0 comments on commit 07011de

Please sign in to comment.