From bcf5ae9f1a3dda1820c5cae36c40bf0e1cc42d7a Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 18 Aug 2020 11:00:04 +0200 Subject: [PATCH] Rename cosmwasm-faucet -> cosmos-faucet --- CHANGELOG.md | 1 + docs/faucet.Dockerfile | 8 ++++---- packages/faucet/README.md | 14 +++++++------- .../faucet/bin/{cosmwasm-faucet => cosmos-faucet} | 0 packages/faucet/package.json | 11 +++++++---- packages/faucet/src/constants.ts | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) rename packages/faucet/bin/{cosmwasm-faucet => cosmos-faucet} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9297ceca..5cf29564 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - @cosmjs/tendermint-rpc: Change type of `GenesisResponse.appState` to `Record | undefined`. - @cosmjs/utils: Add `assertDefined`. +- @cosmjs/faucet: Rename binary from `cosmwasm-faucet` to `cosmos-faucet`. ## 0.22.2 (2020-08-11) diff --git a/docs/faucet.Dockerfile b/docs/faucet.Dockerfile index d2bbd599..7546b5e1 100644 --- a/docs/faucet.Dockerfile +++ b/docs/faucet.Dockerfile @@ -3,13 +3,13 @@ # This file will be outdated very soon, but should work as a template for your custom docker setup. # Coose from https://hub.docker.com/_/node/ -FROM node:12.14.1-alpine +FROM node:12.18.3-alpine -RUN yarn global add @cosmjs/faucet@0.0.8 +RUN yarn global add @cosmjs/faucet@0.23.0 # Check it exists -RUN /usr/local/bin/cosmwasm-faucet version +RUN /usr/local/bin/cosmos-faucet version EXPOSE 8000 -ENTRYPOINT ["/usr/local/bin/cosmwasm-faucet"] +ENTRYPOINT ["/usr/local/bin/cosmos-faucet"] CMD [""] diff --git a/packages/faucet/README.md b/packages/faucet/README.md index c0549afc..eda63418 100644 --- a/packages/faucet/README.md +++ b/packages/faucet/README.md @@ -23,13 +23,13 @@ FAUCET_CREDIT_AMOUNT_COSM=10 \ FAUCET_CREDIT_AMOUNT_STAKE=5 \ FAUCET_CONCURRENCY=3 \ FAUCET_MNEMONIC="economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone" \ - ./bin/cosmwasm-faucet start "http://localhost:1317" + ./bin/cosmos-faucet start "http://localhost:1317" ``` ## Usage ``` -Usage: cosmwasm-faucet action [arguments...] +Usage: cosmos-faucet action [arguments...] Positional arguments per action are listed below. Arguments in parentheses are optional. @@ -70,7 +70,7 @@ The faucet uses standard HD paths for each blockchain, e.g. ``` IOV m/44'/234'/a' Lisk m/44'/134'/a' -CosmWasm m/44'/118'/0'/0/a +Cosmos m/44'/118'/0'/0/a ``` where `a` is a 0-based index of the account. Account 0 is the token holder and @@ -91,14 +91,14 @@ it up-to-date. ```sh cd docs -docker build -t local-cosmwasm-faucet:manual --file faucet.Dockerfile . +docker build -t local-cosmos-faucet:manual --file faucet.Dockerfile . ``` - Version and help ```sh -docker run --read-only --rm local-cosmwasm-faucet:manual version -docker run --read-only --rm local-cosmwasm-faucet:manual help +docker run --read-only --rm local-cosmos-faucet:manual version +docker run --read-only --rm local-cosmos-faucet:manual help ``` - Run faucet locally @@ -110,7 +110,7 @@ DOCKER_HOST_IP=$(docker run --read-only --rm alpine ip route | awk 'NR==1 {print -e FAUCET_MNEMONIC \ -e FAUCET_CONCURRENCY \ -p 8000:8000 \ - local-cosmwasm-faucet:manual \ + local-cosmos-faucet:manual \ start "http://$DOCKER_HOST_IP:1317" ``` diff --git a/packages/faucet/bin/cosmwasm-faucet b/packages/faucet/bin/cosmos-faucet similarity index 100% rename from packages/faucet/bin/cosmwasm-faucet rename to packages/faucet/bin/cosmos-faucet diff --git a/packages/faucet/package.json b/packages/faucet/package.json index 716a04a5..0818f60e 100644 --- a/packages/faucet/package.json +++ b/packages/faucet/package.json @@ -2,10 +2,13 @@ "name": "@cosmjs/faucet", "version": "0.22.2", "description": "The faucet", - "author": "Ethan Frey ", + "contributors":[ + "Ethan Frey ", + "Simon Warta " + ], "license": "Apache-2.0", "bin": { - "cosmwasm-faucet": "bin/cosmwasm-faucet" + "cosmos-faucet": "bin/cosmos-faucet" }, "files": [ "build/", @@ -33,8 +36,8 @@ "test-node": "node jasmine-testrunner.js", "test": "yarn build-or-skip && yarn test-node", "coverage": "nyc --reporter=text --reporter=lcov yarn test --quiet", - "start-dev": "FAUCET_CREDIT_AMOUNT_COSM=10 FAUCET_CREDIT_AMOUNT_STAKE=5 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosmwasm-faucet start \"http://localhost:1317\"", - "start-coralnet": "FAUCET_ADDRESS_PREFIX=coral FAUCET_TOKENS=\"SHELL=10^6ushell, REEF=10^6ureef\" FAUCET_CREDIT_AMOUNT_SHELL=10 FAUCET_CREDIT_AMOUNT_REEF=2 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosmwasm-faucet start \"https://lcd.coralnet.cosmwasm.com\"" + "start-dev": "FAUCET_CREDIT_AMOUNT_COSM=10 FAUCET_CREDIT_AMOUNT_STAKE=5 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosmos-faucet start \"http://localhost:1317\"", + "start-coralnet": "FAUCET_ADDRESS_PREFIX=coral FAUCET_TOKENS=\"SHELL=10^6ushell, REEF=10^6ureef\" FAUCET_CREDIT_AMOUNT_SHELL=10 FAUCET_CREDIT_AMOUNT_REEF=2 FAUCET_CONCURRENCY=3 FAUCET_MNEMONIC=\"economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone\" ./bin/cosmos-faucet start \"https://lcd.coralnet.cosmwasm.com\"" }, "dependencies": { "@cosmjs/crypto": "^0.22.2", diff --git a/packages/faucet/src/constants.ts b/packages/faucet/src/constants.ts index e4e8be1d..b20ef9af 100644 --- a/packages/faucet/src/constants.ts +++ b/packages/faucet/src/constants.ts @@ -3,7 +3,7 @@ import { Coin, parseCoins } from "@cosmjs/launchpad"; import { TokenConfiguration } from "./tokenmanager"; import { parseBankTokens } from "./tokens"; -export const binaryName = "cosmwasm-faucet"; +export const binaryName = "cosmos-faucet"; export const memo: string | undefined = process.env.FAUCET_MEMO; export const fee: readonly Coin[] = parseCoins(process.env.FAUCET_FEE || "2000ucosm"); export const gas: string = process.env.FAUCET_GAS || "80000";