Commit 2b996d48 authored by libangzhu's avatar libangzhu

update ethcli

parent 6aa29569
...@@ -466,7 +466,9 @@ latter: ...@@ -466,7 +466,9 @@ latter:
case <-timer.C: case <-timer.C:
ethRelayer.procNewHeight(ctx, &continueFailCount) ethRelayer.procNewHeight(ctx, &continueFailCount)
case err := <-ethRelayer.bridgeBankSub.Err(): case err := <-ethRelayer.bridgeBankSub.Err():
panic("bridgeBankSub" + err.Error()) relayerLog.Error("proc", "bridgeBankSub err", err.Error())
ethRelayer.subscribeEvent()
case vLog := <-ethRelayer.bridgeBankLog: case vLog := <-ethRelayer.bridgeBankLog:
ethRelayer.storeBridgeBankLogs(vLog, true) ethRelayer.storeBridgeBankLogs(vLog, true)
case chain33Msg := <-ethRelayer.chain33MsgChan: case chain33Msg := <-ethRelayer.chain33MsgChan:
...@@ -582,13 +584,23 @@ func (ethRelayer *Relayer4Ethereum) procNewHeight(ctx context.Context, continueF ...@@ -582,13 +584,23 @@ func (ethRelayer *Relayer4Ethereum) procNewHeight(ctx context.Context, continueF
head, err := ethRelayer.clientSpec.HeaderByNumber(ctx, nil) head, err := ethRelayer.clientSpec.HeaderByNumber(ctx, nil)
if nil != err { if nil != err {
*continueFailCount++ *continueFailCount++
if *continueFailCount >= (12 * 5) { if *continueFailCount >= 5 {
panic(err.Error()) ethRelayer.clientSpec, err = ethtxs.SetupWebsocketEthClient(ethRelayer.providerHttp)
if err != nil {
relayerLog.Error("SetupWebsocketEthClient", "err", err)
return
} }
}
//retry
head, err = ethRelayer.clientSpec.HeaderByNumber(ctx, nil)
if err != nil {
relayerLog.Error("Failed to get ethereum height", "provider", ethRelayer.provider, relayerLog.Error("Failed to get ethereum height", "provider", ethRelayer.provider,
"continueFailCount", continueFailCount) "continueFailCount", continueFailCount, "err", err.Error())
return return
} }
}
ethRelayer.updateTxStatus() ethRelayer.updateTxStatus()
*continueFailCount = 0 *continueFailCount = 0
currentHeight := head.Number.Uint64() currentHeight := head.Number.Uint64()
......
...@@ -23,6 +23,5 @@ func prefixMessage(message common.Hash, key *ecdsa.PrivateKey) ([]byte, []byte) ...@@ -23,6 +23,5 @@ func prefixMessage(message common.Hash, key *ecdsa.PrivateKey) ([]byte, []byte)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return sig, prefixed return sig, prefixed
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment