OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wallet store interface (#217)
[bytom/vapor.git]
/
config
/
genesis.go
diff --git
a/config/genesis.go
b/config/genesis.go
index
58ad266
..
501e3e6
100644
(file)
--- a/
config/genesis.go
+++ b/
config/genesis.go
@@
-13,21
+13,25
@@
import (
"github.com/vapor/protocol/vm/vmutil"
)
"github.com/vapor/protocol/vm/vmutil"
)
-func
GenesisArguments
(c *Config) []byte {
- pubKeys := chainkd.XPubKeys(c.Federation.Xpubs)
-
fedpegScript, err := vmutil.P2SPMultiSigProgram(pubKeys
, c.Federation.Quorum)
+func
FederationPMultiSigScript
(c *Config) []byte {
+ xpubs := c.Federation.Xpubs
+
program, err := vmutil.P2SPMultiSigProgram(chainkd.XPubKeys(xpubs)
, c.Federation.Quorum)
if err != nil {
if err != nil {
- log.Panicf("fail
on decode genesis arguments for federation"
)
+ log.Panicf("fail
to generate federation scirpt for federation: %v", err
)
}
}
- scriptHash := crypto.Sha256(fedpegScript)
+ return program
+}
- control, err := vmutil.P2WSHProgram(scriptHash)
+func FederationWScript(c *Config) []byte {
+ script := FederationPMultiSigScript(c)
+ scriptHash := crypto.Sha256(script)
+ wscript, err := vmutil.P2WSHProgram(scriptHash)
if err != nil {
if err != nil {
- log.Panicf("Fail converts scriptHash to
program on GenesisArgument
s: %v", err)
+ log.Panicf("Fail converts scriptHash to
witnes
s: %v", err)
}
}
- return
control
+ return
wscript
}
func GenesisTx() *types.Tx {
}
func GenesisTx() *types.Tx {
@@
-36,7
+40,7
@@
func GenesisTx() *types.Tx {
log.Panicf("fail on decode genesis tx output control program")
}
log.Panicf("fail on decode genesis tx output control program")
}
- coinbaseInput :=
GenesisArguments
(CommonConfig)
+ coinbaseInput :=
FederationWScript
(CommonConfig)
txData := types.TxData{
Version: 1,
txData := types.TxData{
Version: 1,
@@
-44,7
+48,7
@@
func GenesisTx() *types.Tx {
types.NewCoinbaseInput(coinbaseInput[:]),
},
Outputs: []*types.TxOutput{
types.NewCoinbaseInput(coinbaseInput[:]),
},
Outputs: []*types.TxOutput{
- types.NewIntraChainOutput(*consensus.BTMAssetID, consensus.
InitialBlockSubsidy
, contract),
+ types.NewIntraChainOutput(*consensus.BTMAssetID, consensus.
BlockSubsidy(0)
, contract),
},
}
return types.NewTx(txData)
},
}
return types.NewTx(txData)
@@
-70,7
+74,7
@@
func mainNetGenesisBlock() *types.Block {
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
- Timestamp: 15
24549600000
,
+ Timestamp: 15
62571063002
,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,
@@
-101,7
+105,7
@@
func testNetGenesisBlock() *types.Block {
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
- Timestamp: 15
28945000000
,
+ Timestamp: 15
62571063001
,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,
@@
-132,7
+136,7
@@
func soloNetGenesisBlock() *types.Block {
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
BlockHeader: types.BlockHeader{
Version: 1,
Height: 0,
- Timestamp: 15
28945000
000,
+ Timestamp: 15
62571063
000,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,
BlockCommitment: types.BlockCommitment{
TransactionsMerkleRoot: merkleRoot,
TransactionStatusHash: txStatusHash,