Skip to content

Commit

Permalink
Merge pull request #90 from MinterTeam/dev
Browse files Browse the repository at this point in the history
v0.2.4
  • Loading branch information
danil-lashin authored Aug 24, 2018
2 parents 6de666a + 59dfab1 commit 50d5466
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 12 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@

- [api] Add validators rewards to block api

## 0.2.4
*Aug 24th, 2018*

BUG FIXES

- [api] Fix estimateTxCommission endpoint

IMPROVEMENT

- [gui] Minor GUI updates

## 0.2.2
*Aug 23th, 2018*

Expand Down
6 changes: 3 additions & 3 deletions api/estimate_tx_commission.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ func EstimateTxCommission(w http.ResponseWriter, r *http.Request) {

query := r.URL.Query()
rawTx := query.Get("tx")
bytesTx, _ := hexutil.Decode(rawTx)
bytesTx, _ := hexutil.Decode("Mx" + rawTx)

tx, err := transaction.DecodeFromBytes(bytesTx)

if err != nil {
w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(Response{
Code: 0,
Code: 1,
Log: err.Error(),
})
return
Expand All @@ -40,7 +40,7 @@ func EstimateTxCommission(w http.ResponseWriter, r *http.Request) {

w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(Response{
Code: 0,
Code: 1,
Log: fmt.Sprintf("Coin reserve balance is not sufficient for transaction. Has: %s, required %s", coin.ReserveBalance().String(), commissionInBaseCoin.String()),
})
return
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.4"
services:
minter:
image: minterteam/minter:0.2.0
image: minterteam/minter:0.2.4
volumes:
- ~/.minter:/minter
ports:
Expand Down
2 changes: 1 addition & 1 deletion genesis/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func GetTestnetGenesis() (*tmtypes.GenesisDoc, error) {
}

genesis := tmtypes.GenesisDoc{
ChainID: "minter-test-network-18",
ChainID: "minter-test-network-19",
GenesisTime: time.Date(2018, 8, 22, 0, 0, 0, 0, time.UTC),
ConsensusParams: nil,
Validators: []tmtypes.GenesisValidator{
Expand Down
2 changes: 1 addition & 1 deletion gui/gui-packr.go

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions gui/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,22 @@ <h4 class="alert-heading">Error while connecting to local node</h4>
refresh() {
axios.all([
axios.get("//" + window.location.hostname + ':8841/api/status'),
axios.get("//" + window.location.hostname + ':8841/api/net_info'),
axios.get("https://minter-node-1.testnet.minter.network/api/status")
]).then(axios.spread(function (status, net_info, masterStatus) {
axios.get("//" + window.location.hostname + ':8841/api/net_info')
]).then(axios.spread(function (status, net_info) {
this.error = null

this.status = status.data.result.tm_status
this.version = status.data.result.version
this.net_info = net_info.data.result
this.masterStatus = masterStatus.data.result

setTimeout(this.refresh, 500)
}.bind(this))).catch(function (reason) {
this.error = reason.toString();
setTimeout(this.refresh, 500)
}.bind(this))

axios.get("https://minter-node-1.testnet.minter.network/api/status").then(function (masterStatus) {
this.masterStatus = masterStatus.data.result
}.bind(this))
}
}
Expand Down
15 changes: 15 additions & 0 deletions minterd.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[Unit]
Description=Minter Validator
After=network.target auditd.service

[Service]
ExecStart=/home/user/minter
Type=simple
KillMode=process
Restart=always
RestartSec=3
User=user

[Install]
WantedBy=multi-user.target
Alias=minter.service
4 changes: 2 additions & 2 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ package version
const (
Maj = "0"
Min = "2"
Fix = "3"
Fix = "4"
)

var (
// Must be a string because scripts like dist.sh read this file.
Version = "0.2.3"
Version = "0.2.4"

// GitCommit is the current HEAD set using ldflags.
GitCommit string
Expand Down

0 comments on commit 50d5466

Please sign in to comment.