Skip to content

Commit

Permalink
Merge pull request #1314 from irisnet/release0.12
Browse files Browse the repository at this point in the history
R4R: Release version 0.12.3
  • Loading branch information
wukongcheng committed Feb 27, 2019
2 parents aef11f8 + 8b54567 commit 7ea5ccc
Show file tree
Hide file tree
Showing 156 changed files with 492 additions and 547 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.12.3

*February 27th, 2019*

- Fix issue of build config for Ledger Nano
- Fix Dockerfile to be compatible with Ledger build
- Improve documents about address prefix/fee/chain-id for the mainnet


## 0.12.2

Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# > docker run -v $HOME/.iris:/root/.iris iris init
# > docker run -v $HOME/.iris:/root/.iris iris start

FROM golang:1.10-alpine3.7 as builder
FROM golang:1.11.5-alpine3.9 as builder

# Set up dependencies
ENV PACKAGES make gcc git libc-dev bash
ENV PACKAGES make gcc git libc-dev bash linux-headers eudev-dev

# Set up GOPATH & PATH

Expand All @@ -25,11 +25,9 @@ RUN cd $REPO_PATH && \
make get_tools && \
make get_vendor_deps && \
make test_unit && \
make build_linux && \
make install && \
make test_cli
make build_linux

FROM alpine:3.7
FROM alpine:3.9

# p2p port
EXPOSE 26656
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile-Testnet → Dockerfile-testnet
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# > docker run -v $HOME/.iris:/root/.iris iris init
# > docker run -v $HOME/.iris:/root/.iris iris start

FROM golang:1.10-alpine3.7 as builder
FROM golang:1.11.5-alpine3.9 as builder

# Set up dependencies
ENV PACKAGES make gcc git libc-dev bash
Expand All @@ -14,6 +14,8 @@ ENV GOPATH /root/go
ENV BASE_PATH $GOPATH/src/github.com/irisnet
ENV REPO_PATH $BASE_PATH/irishub
ENV PATH $GOPATH/bin:$PATH
ENV InvariantLevel panic
ENV NetworkType testnet

# Add source files
COPY . $REPO_PATH/
Expand All @@ -26,11 +28,10 @@ RUN cd $REPO_PATH && \
make get_vendor_deps && \
make test_unit && \
make build_linux && \
source scripts/setTestEnv.sh && \
make install && \
make test_cli

FROM alpine:3.7
FROM alpine:3.9

# p2p port
EXPOSE 26656
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ install: update_irislcd_swagger_docs echo_bech32_prefix
go install $(BUILD_FLAGS) ./cmd/iristool

build_linux: update_irislcd_swagger_docs echo_bech32_prefix
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iris ./cmd/iris && \
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iriscli ./cmd/iriscli && \
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/irislcd ./cmd/irislcd && \
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iristool ./cmd/iristool
GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iris ./cmd/iris && \
GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iriscli ./cmd/iriscli && \
GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/irislcd ./cmd/irislcd && \
GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/iristool ./cmd/iristool

build_cur: update_irislcd_swagger_docs echo_bech32_prefix
go build $(BUILD_FLAGS) -o build/iris ./cmd/iris && \
Expand Down
50 changes: 6 additions & 44 deletions docs/cli-client/bank/account.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ iriscli bank account [address] [flags]
### Query your account in trust-mode

```
iriscli bank account faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx --trust-node=true
iriscli bank account iaa19aamjx3xszzxgqhrh0yqd4hkurkea7f646vaym --trust-node=true
```

After that, you will get the detail info for the account.

```
{
"address": "faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx",
"address": "iaa19aamjx3xszzxgqhrh0yqd4hkurkea7f646vaym",
"coins": [
Expand Down Expand Up @@ -75,13 +75,13 @@ After that, you will get the detail info for the account.

If you query an wrong account, you will get the follow information.
```
iriscli bank account faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429zz
ERROR: decoding bech32 failed: checksum failed. Expected 100, got 0.
iriscli bank account iaa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429zz
ERROR: decoding bech32 failed: checksum failed. Expected 46vaym, got d429zz.
```
If you query an empty account, you will get the follow error. But don't panic when you see the following error.
```
iriscli bank account faa1kenrwk5k4ng70e5s9zfsttxpnlesx5ps0gfdv7
ERROR: No account with address faa1kenrwk5k4ng70e5s9zfsttxpnlesx5ps0gfdv7 was found in the state.
iriscli bank account iaa1kenrwk5k4ng70e5s9zfsttxpnlesx5psh804vr
ERROR: No account with address iaa1kenrwk5k4ng70e5s9zfsttxpnlesx5psh804vr was found in the state.
Are you sure there has been a transaction involving it?
```

Expand All @@ -91,43 +91,5 @@ Are you sure there has been a transaction involving it?
Query your account in iris network. If you want to create a validator, you should use `iriscli bank account` to make sure
that your balance is above 0.

### Query your account in Fuxi testnet

If you want to query your account in test-irishub, you should use the following:

```
iriscli bank account faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx --chain-id=<chain-id>
```

After that, you will get the detail info for the account.

```
{
"address": "faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx",
"coins": [
"50iris"
],
"public_key": {
"type": "tendermint/PubKeySecp256k1",
"value": "AzlCwiA5Tvxwi7lMB/Hihfp2qnaks5Wrrgkg/Jy7sEkF"
},
"account_number": "0",
"sequence": "1"
}
```


2 changes: 1 addition & 1 deletion docs/cli-client/bank/burn.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ After that, you will get the detail info for the send
"codespace": "",
"tags": {
"action": "burn",
"burnFrom": "faa106nhdckyf996q69v3qdxwe6y7408pvyvufy0x2"
"burnFrom": "iaa106nhdckyf996q69v3qdxwe6y7408pvyvyxzhxh"
"burnAmount": "10iris"
}
})
Expand Down
6 changes: 3 additions & 3 deletions docs/cli-client/bank/send.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ iriscli bank send --to=<account address> --from <key name> --fee=0.3iris --chain
### Send token to a address

```
iriscli bank send --to=faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx --from=test --fee=0.3iris --chain-id=<chain-id> --amount=10iris
iriscli bank send --to=iaa19aamjx3xszzxgqhrh0yqd4hkurkea7f646vaym --from=test --fee=0.3iris --chain-id=<chain-id> --amount=10iris
```

After that, you will get the detail info for the send
Expand All @@ -42,8 +42,8 @@ After that, you will get the detail info for the send
"codespace": "",
"tags": {
"action": "send",
"recipient": "faa1893x4l2rdshytfzvfpduecpswz7qtpstpr9x4h",
"sender": "faa106nhdckyf996q69v3qdxwe6y7408pvyvufy0x2"
"recipient": "iaa1893x4l2rdshytfzvfpduecpswz7qtpstevr742",
"sender": "iaa106nhdckyf996q69v3qdxwe6y7408pvyvyxzhxh"
}
})
```
Expand Down
4 changes: 2 additions & 2 deletions docs/cli-client/bank/sign.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ iriscli bank sign <file> [flags]
First you must use **iriscli bank send** command with flag **--generate-only** to generate a send recorder. Just like this.

```shell
iriscli bank send --to=faa19aamjx3xszzxgqhrh0yqd4hkurkea7f6d429yx --from=test --fee=0.3iris --chain-id=<chain-id> --amount=10iris --generate-only > tx.json
iriscli bank send --to=iaa19aamjx3xszzxgqhrh0yqd4hkurkea7f646vaym --from=test --fee=0.3iris --chain-id=<chain-id> --amount=10iris --generate-only > tx.json
```


Expand All @@ -48,6 +48,6 @@ iriscli bank sign /root/output/output/node0/test_send_10iris.txt --name=test --
```

```json
{"type":"auth/StdTx","value":{"msg":[{"type":"cosmos-sdk/Send","value":{"inputs":[{"address":"faa106nhdckyf996q69v3qdxwe6y7408pvyvufy0x2","coins":[{"denom":"iris-atto","amount":"10000000000000000000"}]}],"outputs":[{"address":"faa1893x4l2rdshytfzvfpduecpswz7qtpstpr9x4h","coins":[{"denom":"iris-atto","amount":"10000000000000000000"}]}]}}],"fee":{"amount":[{"denom":"iris-atto","amount":"40000000000000000"}],"gas":"200000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Auouudrg0P86v2kq2lykdr97AJYGHyD6BJXAQtjR1gzd"},"signature":"sJewd6lKjma49rAiGVfdT+V0YYerKNx6ZksdumVCvuItqGm24bEN9msh7IJ12Sil1lYjqQjdAcjVCX/77FKlIQ==","account_number":"0","sequence":"3"}],"memo":"test"}}```
{"type":"auth/StdTx","value":{"msg":[{"type":"cosmos-sdk/Send","value":{"inputs":[{"address":"iaa106nhdckyf996q69v3qdxwe6y7408pvyvyxzhxh","coins":[{"denom":"iris-atto","amount":"10000000000000000000"}]}],"outputs":[{"address":"iaa1893x4l2rdshytfzvfpduecpswz7qtpstevr742","coins":[{"denom":"iris-atto","amount":"10000000000000000000"}]}]}}],"fee":{"amount":[{"denom":"iris-atto","amount":"40000000000000000"}],"gas":"200000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Auouudrg0P86v2kq2lykdr97AJYGHyD6BJXAQtjR1gzd"},"signature":"sJewd6lKjma49rAiGVfdT+V0YYerKNx6ZksdumVCvuItqGm24bEN9msh7IJ12Sil1lYjqQjdAcjVCX/77FKlIQ==","account_number":"0","sequence":"3"}],"memo":"test"}}```
```
After signing a transaction, it could be broadcast to the network with [broadcastc command](./broadcast.md)
4 changes: 2 additions & 2 deletions docs/cli-client/distribution/delegation-distr-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ iriscli distribution delegation-distr-info --address-delegator=<delegator addres
Example response:
```json
{
"delegator_addr": "faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j",
"val_operator_addr": "fva1ezzh0humhy3329xg4avhcjtay985nll0hpyhf4",
"delegator_addr": "iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50",
"val_operator_addr": "iva1ezzh0humhy3329xg4avhcjtay985nll00wz0fg",
"del_pool_withdrawal_height": "4044"
}
```
8 changes: 4 additions & 4 deletions docs/cli-client/distribution/delegator-distr-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ Example response:
```json
[
{
"delegator_addr": "faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j",
"val_operator_addr": "fva14a70gzu0v2w8dlfx462c9sldvja24qaz6vv4sg",
"delegator_addr": "iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50",
"val_operator_addr": "iva14a70gzu0v2w8dlfx462c9sldvja24qazzr2ds4",
"del_pool_withdrawal_height": "10859"
},
{
"delegator_addr": "faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j",
"val_operator_addr": "fva1ezzh0humhy3329xg4avhcjtay985nll0hpyhf4",
"delegator_addr": "iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50",
"val_operator_addr": "iva1ezzh0humhy3329xg4avhcjtay985nll00wz0fg",
"del_pool_withdrawal_height": "4044"
}
]
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-client/distribution/set-withdraw-address.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Example response:
},
{
"key": "delegator",
"value": "faa1yclscskdtqu9rgufgws293wxp3njsesxtplqxd"
"value": "iaa1yclscskdtqu9rgufgws293wxp3njsesxnwecxs"
}
]
})
Expand Down
8 changes: 4 additions & 4 deletions docs/cli-client/distribution/validator-distr-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ Example response:
```json
[
{
"delegator_addr": "faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j",
"val_operator_addr": "fva14a70gzu0v2w8dlfx462c9sldvja24qaz6vv4sg",
"delegator_addr": "iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50",
"val_operator_addr": "iva14a70gzu0v2w8dlfx462c9sldvja24qazzr2ds4",
"del_pool_withdrawal_height": "10859"
},
{
"delegator_addr": "faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j",
"val_operator_addr": "fva1ezzh0humhy3329xg4avhcjtay985nll0hpyhf4",
"delegator_addr": "iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50",
"val_operator_addr": "iva1ezzh0humhy3329xg4avhcjtay985nll00wz0fg",
"del_pool_withdrawal_height": "4044"
}
]
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-client/distribution/withdraw-address.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ iriscli distribution withdraw-address [delegator address]
```
Example response:
```text
faa1ezzh0humhy3329xg4avhcjtay985nll0zswc5j
iaa1ezzh0humhy3329xg4avhcjtay985nll06lgq50
```
If the given delegator didn't specify other withdraw address, the query result will be empty.
4 changes: 2 additions & 2 deletions docs/cli-client/gov/deposit.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ iriscli gov deposit --help
### Deposit

```shell
iriscli gov deposit --chain-id=test --proposal-id=1 --deposit=50iris --from=node0 --fee=0.01iris
iriscli gov deposit --chain-id=<chain-id> --proposal-id=1 --deposit=50iris --from=node0 --fee=0.3iris
```

After you enter the correct password, you could deposit 50iris to make your proposal active which can be voted, after you enter the correct password, you're done with depositing iris tokens for an activing proposal.
Expand All @@ -44,7 +44,7 @@ Committed at block 7 (tx hash: C1156A7D383492AE5C2EB1BADE0080C3A36BE8AED491DC5B2
"codespace": "",
"tags": {
"action": "deposit",
"depositor": "faa1x25y3ltr4jvp89upymegvfx7n0uduz5kmh5xuz",
"depositor": "iaa1x25y3ltr4jvp89upymegvfx7n0uduz5krcj7ul",
"proposal-id": "1",
"voting-period-start": "1"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/cli-client/gov/query-deposit.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ iriscli gov query-deposit --help
### Query deposit

```shell
iriscli gov query-deposit --chain-id=<chain-id> --proposal-id=1 --depositor=faa1c4kjt586r3t353ek9jtzwxum9x9fcgwetyca07
iriscli gov query-deposit --chain-id=<chain-id> --proposal-id=1 --depositor=iaa1c4kjt586r3t353ek9jtzwxum9x9fcgwent790r
```

You could query the deposited tokens on a specific proposal.

```txt
{
"depositor": "faa1c4kjt586r3t353ek9jtzwxum9x9fcgwetyca07",
"depositor": "iaa1c4kjt586r3t353ek9jtzwxum9x9fcgwent790r",
"proposal_id": "1",
"amount": [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-client/gov/query-deposits.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ You could query all the deposited tokens on a specific proposal, includes deposi
```txt
[
{
"depositor": "faa1c4kjt586r3t353ek9jtzwxum9x9fcgwetyca07",
"depositor": "iaa1c4kjt586r3t353ek9jtzwxum9x9fcgwent790r",
"proposal_id": "1",
"amount": [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-client/gov/query-proposal.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ iriscli gov query-proposal --help
### Query proposal

```shell
iriscli gov query-proposal --chain-id=test --proposal-id=1
iriscli gov query-proposal --chain-id=<chain-id> --proposal-id=1
```

You could query the details of a specific proposal.
Expand Down
6 changes: 3 additions & 3 deletions docs/cli-client/gov/query-proposals.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ iriscli gov query-proposals --help
### Query proposals

```shell
iriscli gov query-proposals --chain-id=test
iriscli gov query-proposals --chain-id=<chain-id>
```

You could query all the proposals by default.
Expand All @@ -44,10 +44,10 @@ You could query all the proposals by default.
Also you can query proposal by filters, such as:

```shell
gov query-proposals --chain-id=test --depositor=faa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fp9l7pgd
gov query-proposals --chain-id=<chain-id> --depositor=iaa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fpascegs
```

Finally, here shows the proposal who's depositor address is faa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fp9l7pgd.
Finally, here shows the proposal who's depositor address is iaa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fpascegs.

```txt
2 - new proposal
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-client/gov/query-tally.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ iriscli gov query-tally --help
### Query tally

```shell
iriscli gov query-tally --chain-id=test --proposal-id=1
iriscli gov query-tally --chain-id=<chain-id> --proposal-id=1
```

You could query the statistics of each voting option.
Expand Down
4 changes: 2 additions & 2 deletions docs/cli-client/gov/query-vote.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ iriscli gov query-vote --help
### Query vote

```shell
iriscli gov query-vote --chain-id=test --proposal-id=1 --voter=faa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fp9l7pgd
iriscli gov query-vote --chain-id=<chain-id> --proposal-id=1 --voter=iaa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fpascegs
```

You could query the voting by specifying the proposal and the voter.

```txt
{
"voter": "faa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fp9l7pgd",
"voter": "iaa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fpascegs",
"proposal_id": "1",
"option": "Yes"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/cli-client/gov/query-votes.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ iriscli gov query-votes --help
### Query votes

```shell
iriscli gov query-votes --chain-id=test --proposal-id=1
iriscli gov query-votes --chain-id=<chain-id> --proposal-id=1
```

You could query the voting of all the voters by specifying the proposal.

```txt
[
{
"voter": "faa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fp9l7pgd",
"voter": "iaa14q5rf9sl2dqd2uxrxykafxq3nu3lj2fpascegs",
"proposal_id": "1",
"option": "Yes"
}
Expand Down
Loading

0 comments on commit 7ea5ccc

Please sign in to comment.