Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions framework/.changeset/v0.10.27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Blockscout Geth variant + internal transactions + verifier
10 changes: 8 additions & 2 deletions framework/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@ func main() {
Aliases: []string{"u"},
Description: "Spins up Blockscout stack",
Action: func(c *cli.Context) error {
return framework.BlockScoutUp(c.String("rpc"))
return framework.BlockScoutUp(
c.String("rpc"),
c.String("chain-id"),
)
},
},
{
Expand All @@ -169,7 +172,10 @@ func main() {
if err := framework.BlockScoutDown(rpc); err != nil {
return err
}
return framework.BlockScoutUp(rpc)
return framework.BlockScoutUp(
c.String("rpc"),
c.String("chain-id"),
)
},
},
},
Expand Down
14 changes: 4 additions & 10 deletions framework/observability.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@ func extractAllFiles(embeddedDir string) error {
return err
}

func BlockScoutUp(url string) error {
func BlockScoutUp(url, chainID string) error {
L.Info().Msg("Creating local Blockscout stack")
if err := extractAllFiles("observability"); err != nil {
return err
}
os.Setenv("BLOCKSCOUT_RPC_URL", url)
os.Setenv("BLOCKSCOUT_CHAID_ID", chainID)
// old migrations for v15 is still applied somehow, cleaning up DB helps
if err := RunCommand("bash", "-c", fmt.Sprintf(`
cd %s && \
Expand Down Expand Up @@ -117,14 +118,7 @@ func BlockScoutDown(url string) error {
if err != nil {
return err
}
return RunCommand("bash", "-c", fmt.Sprintf(`
cd %s && \
rm -rf blockscout-db-data && \
rm -rf logs && \
rm -rf redis-data && \
rm -rf stats-db-data && \
rm -rf dets
`, filepath.Join("blockscout", "services")))
return RunCommand("bash", "-c", "rm -rf blockscout/")
}

func ObservabilityUp() error {
Expand Down Expand Up @@ -186,5 +180,5 @@ func ObservabilityDown() error {
if err != nil {
return err
}
return nil
return RunCommand("bash", "-c", "rm -rf compose/")
}
20 changes: 16 additions & 4 deletions framework/observability/blockscout/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ services:
file: ./services/db.yml
service: db

sc-verifier:
extends:
file: ./services/smart-contract-verifier.yml
service: smart-contract-verifier
ports:
- 8082:8050

backend:
depends_on:
- db
Expand All @@ -32,10 +39,14 @@ services:
links:
- db:database
environment:
ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/
ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/
ETHEREUM_JSONRPC_WS_URL: ws://host.docker.internal:8545/
CHAIN_ID: '1337'
# 'anvil' do not support internal transactions
ETHEREUM_JSONRPC_VARIANT: 'geth'
ETHEREUM_JSONRPC_HTTP_URL: ${BLOCKSCOUT_RPC_URL}
ETHEREUM_JSONRPC_TRACE_URL: ${BLOCKSCOUT_RPC_URL}
CHAIN_ID: ${BLOCKSCOUT_CHAIN_ID:-1337}
MICROSERVICE_SC_VERIFIER_ENABLED: true
MICROSERVICE_SC_VERIFIER_URL: http://smart-contract-verifier:8050/
MICROSERVICE_SC_VERIFIER_TYPE: sc_verifier

nft_media_handler:
depends_on:
Expand Down Expand Up @@ -103,3 +114,4 @@ services:
extends:
file: ./services/nginx.yml
service: proxy

2 changes: 1 addition & 1 deletion framework/observability/blockscout/services/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.9'

services:
backend:
image: ghcr.io/blockscout/${DOCKER_REPO:-blockscout}:${DOCKER_TAG:-latest}
image: ghcr.io/blockscout/${DOCKER_REPO:-blockscout}:${DOCKER_TAG:-9.0.2.commit.2ab549a6}
pull_policy: always
restart: always
stop_grace_period: 5m
Expand Down
Loading