diff --git a/.github/workflows/binary.yml b/.github/workflows/binary.yml index 07c406331..13b9b4895 100644 --- a/.github/workflows/binary.yml +++ b/.github/workflows/binary.yml @@ -24,9 +24,9 @@ jobs: - run: | go mod download - cd cmd/jpyxd + cd cmd/ununifid go build . - uses: actions/upload-artifact@v2 with: - name: jpyxd-${{ matrix.targetos }}-${{ matrix.arch }} - path: cmd/jpyxd/jpyxd + name: ununifid-${{ matrix.targetos }}-${{ matrix.arch }} + path: cmd/ununifid/ununifid diff --git a/Dockerfile b/Dockerfile index dd34abacd..77adacf63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Simple usage with a mounted data directory: # > docker build -t jpyx . -# > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.ununifi:/root/.ununifi jpyx jpyxd init -# > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.ununifi:/root/.ununifi jpyx jpyxd start +# > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.ununifi:/root/.ununifi jpyx ununifid init +# > docker run -it -p 26656:26656 -p 26657:26657 -v ~/.ununifi:/root/.ununifi jpyx ununifid start FROM golang:1.17-alpine AS build-env # Set up dependencies @@ -28,7 +28,7 @@ RUN apk add --update ca-certificates WORKDIR /root # Copy over binaries from the build-env -COPY --from=build-env /go/bin/jpyxd /usr/bin/jpyxd +COPY --from=build-env /go/bin/ununifid /usr/bin/ununifid -# Run jpyxd by default, omit entrypoint to ease using container with jpyxcli -CMD ["jpyxd"] \ No newline at end of file +# Run ununifid by default, omit entrypoint to ease using container with jpyxcli +CMD ["ununifid"] \ No newline at end of file diff --git a/Makefile b/Makefile index 4234415e3..6fe6de7e8 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags)) # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=jpyx \ - -X github.com/cosmos/cosmos-sdk/version.AppName=jpyxd \ + -X github.com/cosmos/cosmos-sdk/version.AppName=ununifid \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ @@ -108,7 +108,7 @@ build-reproducible: go.sum $(DOCKER) rm latest-build || true $(DOCKER) run --volume=$(CURDIR):/sources:ro \ --env TARGET_PLATFORMS='linux/amd64 darwin/amd64 linux/arm64 windows/amd64' \ - --env APP=jpyxd \ + --env APP=ununifid \ --env VERSION=$(VERSION) \ --env COMMIT=$(COMMIT) \ --env LEDGER_ENABLED=$(LEDGER_ENABLED) \ @@ -133,7 +133,7 @@ go.sum: go.mod draw-deps: @# requires brew install graphviz or apt-get install graphviz go get github.com/RobotsAndPencils/goviz - @goviz -i ./cmd/jpyxd -d 2 | dot -Tpng -o dependency-graph.png + @goviz -i ./cmd/ununifid -d 2 | dot -Tpng -o dependency-graph.png clean: rm -rf $(BUILDDIR)/ artifacts/ diff --git a/README.md b/README.md index a3afe5326..58c1816d7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ sudo systemctl restart docker ### Join network ```bash -docker run -v ~/.ununifi:/root/.ununifi ghcr.io/ununifi/ununifid jpyxd init [moniker] --chain-id [chain-id] +docker run -v ~/.ununifi:/root/.ununifi ghcr.io/ununifi/ununifid ununifid init [moniker] --chain-id [chain-id] mkdir jpyx cd jpyx curl -L https://raw.githubusercontent.com/UnUniFi/chain/main/launch/[chain-id]/genesis.json -o ~/.ununifi/config/genesis.json @@ -57,14 +57,14 @@ make install ### Config daemon ```bash -jpyxd init [moniker] --chain-id [chain-id] +ununifid init [moniker] --chain-id [chain-id] cp launch/[chain-id]/genesis.json ~/.ununifi/config/genesis.json ``` ### Register daemon service ```bash -vi /etc/systemd/system/jpyxd.service +vi /etc/systemd/system/ununifid.service ``` ```txt @@ -74,7 +74,7 @@ After=network-online.target [Service] User=root -ExecStart=/root/go/bin/jpyxd start +ExecStart=/root/go/bin/ununifid start Restart=always RestartSec=3 LimitNOFILE=4096 @@ -84,7 +84,7 @@ WantedBy=multi-user.target ``` ```bash -systemctl enable jpyxd +systemctl enable ununifid ``` ## License diff --git a/cmd/jpyxd/main.go b/cmd/jpyxd/main.go index 88e20315d..258ead0e1 100644 --- a/cmd/jpyxd/main.go +++ b/cmd/jpyxd/main.go @@ -4,7 +4,7 @@ import ( "os" "github.com/UnUniFi/chain/app" - "github.com/UnUniFi/chain/cmd/jpyxd/cmd" + "github.com/UnUniFi/chain/cmd/ununifid/cmd" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" ) diff --git a/docker-compose.yml b/docker-compose.yml index a4a6dea05..93b132a7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" services: - jpyxd: - container_name: jpyxd + ununifid: + container_name: ununifid image: ghcr.io/ununifi/ununifid # ports: # - 1317:1317 @@ -11,6 +11,6 @@ services: # - 26657:26657 volumes: - ~/.ununifi:/root/.ununifi - command: jpyxd start + command: ununifid start network_mode: host restart: always diff --git a/docs/README.md b/docs/README.md index 98e75988f..2005c4b05 100644 --- a/docs/README.md +++ b/docs/README.md @@ -28,7 +28,7 @@ make install ## Setup genesis.json ```shell -jpyxd init [moniker] --chain-id jpyx-1 +ununifid init [moniker] --chain-id jpyx-1 cd /usr/local/src/github.com/UnUniFi/chain cp launch/genesis.json ~/.ununifid/config/genesis.json ``` @@ -43,7 +43,7 @@ jpyxcli config trust-node true ### Daemon service ```shell -vi /etc/systemd/system/jpyxd.service +vi /etc/systemd/system/ununifid.service ``` ```txt @@ -53,7 +53,7 @@ After=network-online.target [Service] User=root -ExecStart=/root/go/bin/jpyxd start +ExecStart=/root/go/bin/ununifid start Restart=always RestartSec=3 LimitNOFILE=4096 @@ -63,7 +63,7 @@ WantedBy=multi-user.target ``` ```shell -systemctl enable jpyxd +systemctl enable ununifid ``` ### REST service diff --git a/faucet/deploy.sh b/faucet/deploy.sh index 9fbac8901..8b907968a 100644 --- a/faucet/deploy.sh +++ b/faucet/deploy.sh @@ -5,5 +5,5 @@ docker-compose down curl -O https://raw.githubusercontent.com/UnUniFi/chain/main/faucet/docker-compose.yml curl -O https://raw.githubusercontent.com/UnUniFi/chain/main/faucet/nginx.conf -docker cp $(docker ps -qf "name=jpyxd"):/usr/bin/jpyxd ~/faucet/jpyxd +docker cp $(docker ps -qf "name=ununifid"):/usr/bin/ununifid ~/faucet/ununifid docker-compose up -d diff --git a/faucet/docker-compose.yml b/faucet/docker-compose.yml index a9acddbd2..578ca8fb3 100644 --- a/faucet/docker-compose.yml +++ b/faucet/docker-compose.yml @@ -5,9 +5,9 @@ services: container_name: faucet-ubtc image: ghcr.io/tendermint/faucet volumes: - - ~/faucet/jpyxd:/usr/local/bin/jpyxd + - ~/faucet/ununifid:/usr/local/bin/ununifid - ~/.ununifi:/root/.ununifi - command: faucet --cli-name jpyxd --denoms ubtc --keyring-backend test --account-name faucet --port 7000 --credit-amount=100 --max-credit=99 + command: faucet --cli-name ununifid --denoms ubtc --keyring-backend test --account-name faucet --port 7000 --credit-amount=100 --max-credit=99 # ports: # - 7000:7000 network_mode: host @@ -16,9 +16,9 @@ services: container_name: faucet-ujcbn image: ghcr.io/tendermint/faucet volumes: - - ~/faucet/jpyxd:/usr/local/bin/jpyxd + - ~/faucet/ununifid:/usr/local/bin/ununifid - ~/.ununifi:/root/.ununifi - command: faucet --cli-name jpyxd --denoms ujcbn --keyring-backend test --account-name faucet --port 7002 --credit-amount=2000000 --max-credit=1999999 + command: faucet --cli-name ununifid --denoms ujcbn --keyring-backend test --account-name faucet --port 7002 --credit-amount=2000000 --max-credit=1999999 # ports: # - 7002:7002 network_mode: host @@ -27,9 +27,9 @@ services: container_name: faucet-jpyx image: ghcr.io/tendermint/faucet volumes: - - ~/faucet/jpyxd:/usr/local/bin/jpyxd + - ~/faucet/ununifid:/usr/local/bin/ununifid - ~/.ununifi:/root/.ununifi - command: faucet --cli-name jpyxd --denoms jpyx --keyring-backend test --account-name faucet --port 7004 --credit-amount=10 --max-credit=9 + command: faucet --cli-name ununifid --denoms jpyx --keyring-backend test --account-name faucet --port 7004 --credit-amount=10 --max-credit=9 # ports: # - 7004:7004 network_mode: host diff --git a/simulations/Dockerfile b/simulations/Dockerfile index 279462bc1..ca4f255d2 100644 --- a/simulations/Dockerfile +++ b/simulations/Dockerfile @@ -29,4 +29,4 @@ COPY Makefile . COPY simulations simulations -# jpyxd and kcli binaries are not necessary for running the simulations \ No newline at end of file +# ununifid and kcli binaries are not necessary for running the simulations \ No newline at end of file