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
modify config (#265)
[bytom/vapor.git]
/
federation
/
synchron
/
sidechain_keeper.go
diff --git
a/federation/synchron/sidechain_keeper.go
b/federation/synchron/sidechain_keeper.go
index
8c53816
..
89a3bd9
100644
(file)
--- a/
federation/synchron/sidechain_keeper.go
+++ b/
federation/synchron/sidechain_keeper.go
@@
-230,11
+230,11
@@
func (s *sidechainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types
switch {
case segwit.IsP2WPKHScript(inputCP):
if pubHash, err := segwit.GetHashFromStandardProg(inputCP); err == nil {
switch {
case segwit.IsP2WPKHScript(inputCP):
if pubHash, err := segwit.GetHashFromStandardProg(inputCP); err == nil {
- fromAddress = wallet.BuildP2PKHAddress(pubHash, &consensus.
Vapor
NetParams)
+ fromAddress = wallet.BuildP2PKHAddress(pubHash, &consensus.
Main
NetParams)
}
case segwit.IsP2WSHScript(inputCP):
if scriptHash, err := segwit.GetHashFromStandardProg(inputCP); err == nil {
}
case segwit.IsP2WSHScript(inputCP):
if scriptHash, err := segwit.GetHashFromStandardProg(inputCP); err == nil {
- fromAddress = wallet.BuildP2SHAddress(scriptHash, &consensus.
Vapor
NetParams)
+ fromAddress = wallet.BuildP2SHAddress(scriptHash, &consensus.
Main
NetParams)
}
}
}
}
@@
-259,11
+259,11
@@
func (s *sidechainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types
switch {
case segwit.IsP2WPKHScript(outputCP):
if pubHash, err := segwit.GetHashFromStandardProg(outputCP); err == nil {
switch {
case segwit.IsP2WPKHScript(outputCP):
if pubHash, err := segwit.GetHashFromStandardProg(outputCP); err == nil {
- toAddress = wallet.BuildP2PKHAddress(pubHash, &consensus.MainNetParams)
+ toAddress = wallet.BuildP2PKHAddress(pubHash, &consensus.
Bytom
MainNetParams)
}
case segwit.IsP2WSHScript(outputCP):
if scriptHash, err := segwit.GetHashFromStandardProg(outputCP); err == nil {
}
case segwit.IsP2WSHScript(outputCP):
if scriptHash, err := segwit.GetHashFromStandardProg(outputCP); err == nil {
- toAddress = wallet.BuildP2SHAddress(scriptHash, &consensus.MainNetParams)
+ toAddress = wallet.BuildP2SHAddress(scriptHash, &consensus.
Bytom
MainNetParams)
}
}
}
}