RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle Ethereum Classic transactions

Browse Source
This commit is contained in:
Martin Boehm 2018-09-10 23:23:41 +02:00
parent 80b28ed848
commit f829d21eeb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bchain/coins/eth/ethrpc.go
View File

@ -52,6 +52,7 @@ type EthereumRPC struct {
chanNewTx chan ethcommon.Hash chanNewTx chan ethcommon.Hash
newTxSubscription *rpc.ClientSubscription newTxSubscription *rpc.ClientSubscription
ChainConfig *Configuration ChainConfig *Configuration
isETC bool
} }
// NewEthereumRPC returns new EthRPC instance. // NewEthereumRPC returns new EthRPC instance.
@ -78,6 +79,9 @@ func NewEthereumRPC(config json.RawMessage, pushHandler func(bchain.Notification
s.Parser = NewEthereumParser() s.Parser = NewEthereumParser()
s.timeout = time.Duration(c.RPCTimeout) * time.Second s.timeout = time.Duration(c.RPCTimeout) * time.Second
// detect ethereum classic
s.isETC = s.ChainConfig.CoinName == "Ethereum Classic"
// new blocks notifications handling // new blocks notifications handling
// the subscription is done in Initialize // the subscription is done in Initialize
s.chanNewBlock = make(chan *ethtypes.Header) s.chanNewBlock = make(chan *ethtypes.Header)
@ -141,7 +145,7 @@ func (b *EthereumRPC) Initialize() error {
} }
glog.Info("rpc: block chain ", b.Network) glog.Info("rpc: block chain ", b.Network)
if b.ChainConfig.CoinName == "Ethereum Classic" { if b.isETC {
glog.Info(b.ChainConfig.CoinName, " does not support subscription to newHeads") glog.Info(b.ChainConfig.CoinName, " does not support subscription to newHeads")
} else { } else {
// subscriptions // subscriptions
@ -427,7 +431,11 @@ func (b *EthereumRPC) GetTransaction(txid string) (*bchain.Tx, error) {
} else if tx == nil { } else if tx == nil {
return nil, ethereum.NotFound return nil, ethereum.NotFound
} else if tx.R == "" { } else if tx.R == "" {
return nil, errors.Annotatef(fmt.Errorf("server returned transaction without signature"), "txid %v", txid) if !b.isETC {
return nil, errors.Annotatef(fmt.Errorf("server returned transaction without signature"), "txid %v", txid)
} else {
glog.Warning("server returned transaction without signature, txid ", txid)
}
} }
var btx *bchain.Tx var btx *bchain.Tx
if tx.BlockNumber == "" { if tx.BlockNumber == "" {