diff --git a/cmd/explorer/explorerlib/explorerlib.go b/cmd/explorer/explorerlib/explorerlib.go index 494b998..0a5f2f9 100644 --- a/cmd/explorer/explorerlib/explorerlib.go +++ b/cmd/explorer/explorerlib/explorerlib.go @@ -902,7 +902,7 @@ func fill_common_info(data map[string]interface{}, extra_data bool) error { //fmt.Printf("get info %+v", info) data["Network_Difficulty"] = info.Difficulty - data["hash_rate"] = fmt.Sprintf("%.03f", float32(info.Difficulty/1000000)/float32(info.Target)) + data["hash_rate"] = fmt.Sprintf("%.03f", float32(info.Difficulty/1000000)) data["txpool_size"] = info.Tx_pool_size data["testnet"] = info.Testnet data["network"] = info.Network diff --git a/cmd/explorer/explorerlib/templates/header.tmpl b/cmd/explorer/explorerlib/templates/header.tmpl index 20ca1eb..6f24324 100644 --- a/cmd/explorer/explorerlib/templates/header.tmpl +++ b/cmd/explorer/explorerlib/templates/header.tmpl @@ -183,7 +183,7 @@ input#toggle-1[type=checkbox]:checked ~ div#decoded-inputs {

Network difficulty: {{ .Network_Difficulty }} - | Hash rate: {{ .hash_rate }} KH/s + | Hash rate: {{ .hash_rate }} MH/s | Average Block Time(50) {{.averageblocktime50}} sec | Total supply : {{ .total_supply }} | Mempool size : {{ .txpool_size }} diff --git a/config/version.go b/config/version.go index 6263d89..960e48e 100644 --- a/config/version.go +++ b/config/version.go @@ -20,4 +20,4 @@ import "github.com/blang/semver/v4" // right now it has to be manually changed // do we need to include git commitsha?? -var Version = semver.MustParse("3.4.120-0.DEROHE.STARGATE+26022022") +var Version = semver.MustParse("3.4.123-0.DEROHE.STARGATE+26022022") diff --git a/proof/proof.go b/proof/proof.go index d072c03..efa5c83 100644 --- a/proof/proof.go +++ b/proof/proof.go @@ -18,6 +18,7 @@ package proof import "fmt" import "math/big" +import "strings" import "encoding/hex" import "github.com/deroproject/derohe/cryptography/crypto" @@ -31,7 +32,7 @@ import "github.com/deroproject/derohe/transaction" func Prove(proof string, input_tx string, ring_string [][]string, mainnet bool) (receivers []string, amounts []uint64, payload_raw [][]byte, payload_decoded []string, err error) { var tx transaction.Transaction - addr, err := rpc.NewAddress(proof) + addr, err := rpc.NewAddress(strings.TrimSpace(proof)) if err != nil { return } diff --git a/walletapi/transaction_build.go b/walletapi/transaction_build.go index 7ea6d5b..e292836 100644 --- a/walletapi/transaction_build.go +++ b/walletapi/transaction_build.go @@ -175,7 +175,7 @@ rebuild_tx: shared_key := crypto.GenerateSharedSecret(r, publickeylist[i]) - asset.RPCPayload = append([]byte{byte(uint(witness_index[0]))}, data...) + asset.RPCPayload = append([]byte{byte(uint(witness_index[1]))}, data...) //fmt.Printf("buulding shared_key %x index of receiver %d\n",shared_key,i) //fmt.Printf("building plaintext payload %x\n",asset.RPCPayload)