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
feat(federation): add mainchain & sidechain listener (#170)
[bytom/vapor.git]
/
config
/
genesis.go
diff --git
a/config/genesis.go
b/config/genesis.go
index
58ad266
..
f714e7b
100644
(file)
--- a/
config/genesis.go
+++ b/
config/genesis.go
@@
-6,28
+6,20
@@
import (
log "github.com/sirupsen/logrus"
"github.com/vapor/consensus"
log "github.com/sirupsen/logrus"
"github.com/vapor/consensus"
- "github.com/vapor/crypto"
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/protocol/bc"
"github.com/vapor/protocol/bc/types"
"github.com/vapor/protocol/vm/vmutil"
)
"github.com/vapor/crypto/ed25519/chainkd"
"github.com/vapor/protocol/bc"
"github.com/vapor/protocol/bc/types"
"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
FederationProgrom
(c *Config) []byte {
+ xpubs := c.Federation.Xpubs
+ fedpegScript, 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)
-
- control, err := vmutil.P2WSHProgram(scriptHash)
- if err != nil {
- log.Panicf("Fail converts scriptHash to program on GenesisArguments: %v", err)
- }
-
- return control
+ return fedpegScript
}
func GenesisTx() *types.Tx {
}
func GenesisTx() *types.Tx {
@@
-36,7
+28,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 :=
FederationProgrom
(CommonConfig)
txData := types.TxData{
Version: 1,
txData := types.TxData{
Version: 1,
@@
-44,7
+36,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)