Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
FletcherMan committed Dec 5, 2023
1 parent 2456a0c commit 1101a0c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.morph
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG VERSION=""
ARG BUILDNUM=""

# Build libzkp dependency
FROM morphism/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as chef
FROM morph/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as chef
WORKDIR /app

FROM chef as planner
Expand All @@ -21,7 +21,7 @@ COPY ./rollup/circuitcapacitychecker/libzkp .
RUN cargo build --release
RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/

FROM morphism/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as builder
FROM morph/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as builder

ADD . /go-ethereum
COPY --from=zkp-builder /app/target/release/libzkp.so /usr/local/lib/
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
build:
context: .
dockerfile: Dockerfile
image: morphism-geth:latest
image: morph-geth:latest
ports:
- "8545:8545"
- "8546:8546"
Expand Down
2 changes: 1 addition & 1 deletion miner/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
return
}
// we do not need this resubmit loop to acquire higher price transactions here in our cases
// todo use morphism config instead later
// todo use morph config instead later
if !w.chainConfig.Scroll.UseZktrie {
timer.Reset(recommit)
}
Expand Down
4 changes: 2 additions & 2 deletions run-testnet-sentry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#script for sentry entrypoint
set -ex

GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}"
GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morph/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morph/setup/jwt-secret.txt}"
DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5"
CHAIN_ID="${CHAIN_ID:-2710}"
GETH_LOG_FILE="${GETH_LOG_FILE:-/data/logs/geth.log}"
Expand Down
4 changes: 2 additions & 2 deletions run-testnet-sequencer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#script for sequencer entrypoint
set -ex

GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}"
GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morph/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morph/setup/jwt-secret.txt}"
DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5"
CHAIN_ID="${CHAIN_ID:-2710}"
GETH_LOG_FILE="${GETH_LOG_FILE:-/data/logs/geth.log}"
Expand Down
4 changes: 2 additions & 2 deletions run-testnet-validator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#script for validator entrypoint
set -ex

GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morphism/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morphism/setup/jwt-secret.txt}"
GETH_DATA_DIR="${GETH_DATA_DIR:-/data/morph/setup/geth-data}"
JWT_SECRET_PATH="${JWT_SECRET_PATH:-/data/morph/setup/jwt-secret.txt}"
DEFAULE_MINER_ETHERBASE="0x0e87cd091e091562F25CB1cf4641065dA2C049F5"
CHAIN_ID="${CHAIN_ID:-2710}"
GETH_LOG_FILE="${GETH_LOG_FILE:-/data/logs/geth.log}"
Expand Down
8 changes: 4 additions & 4 deletions testnet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
build:
context: ..
dockerfile: ./Dockerfile
image: morphism_geth:latest
image: morph_geth:latest
ports:
- "8545:8545"
- "8546:8546"
Expand All @@ -32,7 +32,7 @@ services:
build:
context: ..
dockerfile: ./Dockerfile
image: morphism_geth:latest
image: morph_geth:latest
ports:
- "8645:8545"
- "8646:8546"
Expand All @@ -55,7 +55,7 @@ services:
build:
context: ..
dockerfile: ./Dockerfile
image: morphism_geth:latest
image: morph_geth:latest
ports:
- "8745:8545"
- "8746:8546"
Expand All @@ -78,7 +78,7 @@ services:
build:
context: ..
dockerfile: ./Dockerfile
image: morphism_geth:latest
image: morph_geth:latest
ports:
- "8845:8545"
- "8846:8546"
Expand Down

0 comments on commit 1101a0c

Please sign in to comment.