diff --git a/contrib/rosetta/README.md b/contrib/rosetta/README.md index 60c5059c1e..77955b1b43 100644 --- a/contrib/rosetta/README.md +++ b/contrib/rosetta/README.md @@ -17,11 +17,8 @@ Contains the required files to set up rosetta cli and make it work against its w ## Rosetta-ci -Contains the files for a deterministic network, with fixed keys and some actions on there, to test parsing of msgs and historical balances. This image is used to run a simapp node and to run the rosetta server. - -## Rosetta-cli - -The docker image for ./rosetta-cli/Dockerfile is on [docker hub](https://hub.docker.com/r/tendermintdev/rosetta-cli). Whenever rosetta-cli releases a new version, rosetta-cli/Dockerfile should be updated to reflect the new version and pushed to docker hub. +Contains the files for a deterministic network, with fixed keys and some actions on there, to test parsing of msgs and historical balances. This image is used to run a simapp node and to run the rosetta server and the rosetta-cli. +Whenever [rosetta-cli](https://github.com/coinbase/rosetta-cli) releases a new version, rosetta-ci/Dockerfile should be updated to reflect the new version. ## Notes diff --git a/contrib/rosetta/configuration/rosetta.json b/contrib/rosetta/configuration/rosetta.json index b4adc6a756..5802c3c90d 100644 --- a/contrib/rosetta/configuration/rosetta.json +++ b/contrib/rosetta/configuration/rosetta.json @@ -41,7 +41,7 @@ "bootstrap_balances": "bootstrap.json", "interesting_accounts": "", "reconciliation_disabled": false, - "inactive_discrepency_search_disabled": false, + "inactive_discrepancy_search_disabled": false, "balance_tracking_disabled": false, "coin_tracking_disabled": false, "end_conditions": { diff --git a/contrib/rosetta/docker-compose.yaml b/contrib/rosetta/docker-compose.yaml index fabb36b0aa..bfeca6a7ff 100644 --- a/contrib/rosetta/docker-compose.yaml +++ b/contrib/rosetta/docker-compose.yaml @@ -32,7 +32,7 @@ services: - 8080 test_rosetta: - image: tendermintdev/rosetta-cli:v0.6.7 + image: rosetta-ci:latest volumes: - ./configuration:/rosetta/config:z command: ["./config/run_tests.sh"] diff --git a/contrib/rosetta/rosetta-ci/Dockerfile b/contrib/rosetta/rosetta-ci/Dockerfile index 4b085ccaa0..951f135881 100644 --- a/contrib/rosetta/rosetta-ci/Dockerfile +++ b/contrib/rosetta/rosetta-ci/Dockerfile @@ -1,6 +1,14 @@ FROM golang:1.19-alpine as build -RUN apk add --no-cache tar git +RUN apk add git tar gcc libc-dev --no-cache + +ARG ROSETTA_VERSION="v0.10.0" + +# build rosetta CLI +WORKDIR /rosetta +RUN git clone https://github.com/coinbase/rosetta-cli . +RUN git checkout tags/$ROSETTA_VERSION +RUN go build -o rosetta-cli ./main.go # prepare node data WORKDIR /node @@ -17,6 +25,7 @@ RUN apk add gcc git libc-dev python3 --no-cache ENV PATH=$PATH:/bin +COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli COPY --from=build /simd/simapp/simd/simd /bin/simd WORKDIR /rosetta diff --git a/contrib/rosetta/rosetta-cli/Dockerfile b/contrib/rosetta/rosetta-cli/Dockerfile deleted file mode 100644 index f4fc15d9bc..0000000000 --- a/contrib/rosetta/rosetta-cli/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM golang:1.19-alpine as build - -RUN apk add git gcc libc-dev --no-cache - -ARG ROSETTA_VERSION="v0.7.3" - -# build rosetta CLI -WORKDIR /rosetta -RUN git clone https://github.com/coinbase/rosetta-cli . -RUN git checkout tags/$ROSETTA_VERSION -RUN go build -o rosetta-cli ./main.go - -FROM alpine -RUN apk add gcc libc-dev python3 --no-cache - -ENV PATH=$PATH:/bin - -COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli