mmarcel/derohe-miniblock-mod
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DERO-HE STARGATE Mainnet Release46

Browse Source
This commit is contained in:
Captain 2022-02-28 05:14:56 +00:00
parent 7f180ddbae
commit c2113b6cae
No known key found for this signature in database
GPG Key ID: 18CDB3ED5E85D2D4
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/explorer/explorerlib/explorerlib.go
View File

@ -902,7 +902,7 @@ func fill_common_info(data map[string]interface{}, extra_data bool) error {
//fmt.Printf("get info %+v", info) //fmt.Printf("get info %+v", info)
data["Network_Difficulty"] = info.Difficulty 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["txpool_size"] = info.Tx_pool_size
data["testnet"] = info.Testnet data["testnet"] = info.Testnet
data["network"] = info.Network data["network"] = info.Network

2
cmd/explorer/explorerlib/templates/header.tmpl
View File

@ -183,7 +183,7 @@ input#toggle-1[type=checkbox]:checked ~ div#decoded-inputs {
<h3 style="font-size: 12px; margin-top: 5px; margin-bottom: 3"> <h3 style="font-size: 12px; margin-top: 5px; margin-bottom: 3">
Network difficulty: {{ .Network_Difficulty }} Network difficulty: {{ .Network_Difficulty }}
| Hash rate: {{ .hash_rate }} KH&#x2F;s | Hash rate: {{ .hash_rate }} MH&#x2F;s
| Average Block Time(50) {{.averageblocktime50}} sec | Average Block Time(50) {{.averageblocktime50}} sec
| Total supply : {{ .total_supply }} | Total supply : {{ .total_supply }}
| Mempool size : {{ .txpool_size }} | Mempool size : {{ .txpool_size }}

2
config/version.go
View File

@ -20,4 +20,4 @@ import "github.com/blang/semver/v4"
// right now it has to be manually changed // right now it has to be manually changed
// do we need to include git commitsha?? // 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")

3
proof/proof.go
View File

@ -18,6 +18,7 @@ package proof
import "fmt" import "fmt"
import "math/big" import "math/big"
import "strings"
import "encoding/hex" import "encoding/hex"
import "github.com/deroproject/derohe/cryptography/crypto" 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) { 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 var tx transaction.Transaction
addr, err := rpc.NewAddress(proof) addr, err := rpc.NewAddress(strings.TrimSpace(proof))
if err != nil { if err != nil {
return return
} }

2
walletapi/transaction_build.go
View File

@ -175,7 +175,7 @@ rebuild_tx:
shared_key := crypto.GenerateSharedSecret(r, publickeylist[i]) 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("buulding shared_key %x index of receiver %d\n",shared_key,i)
//fmt.Printf("building plaintext payload %x\n",asset.RPCPayload) //fmt.Printf("building plaintext payload %x\n",asset.RPCPayload)