eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-07-04 12:03:41 +02:00
Code Releases Activity

app/ship_processor.go: Make sure we set act.Data to a go object and not json byte slice.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-05-09 17:04:00 +02:00
parent 6e47fc1a3c
commit 57a31996d3
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/ship_processor.go
View file

@ -1,12 +1,15 @@
package app package app
import ( import (
"encoding/json"
"github.com/eosswedenorg/thalos/api" "github.com/eosswedenorg/thalos/api"
"github.com/eosswedenorg/thalos/api/message" "github.com/eosswedenorg/thalos/api/message"
"github.com/eosswedenorg/thalos/app/abi" "github.com/eosswedenorg/thalos/app/abi"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/eoscanada/eos-go"
"github.com/eoscanada/eos-go/ship" "github.com/eoscanada/eos-go/ship"
shipclient "github.com/eosswedenorg-go/antelope-ship-client" shipclient "github.com/eosswedenorg-go/antelope-ship-client"
) )
@ -64,6 +67,14 @@ func (processor *ShipProcessor) encodeQueue(channel api.Channel, v interface{})
return false return false
} }
func decode(abi *eos.ABI, act *ship.Action, v any) error {
jsondata, err := abi.DecodeAction(act.Data, act.Name)
if err != nil {
return err
}
return json.Unmarshal(jsondata, v)
}
func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) {
if block.ThisBlock.BlockNum%100 == 0 { if block.ThisBlock.BlockNum%100 == 0 {
log.Infof("Current: %d, Head: %d", block.ThisBlock.BlockNum, block.Head.BlockNum) log.Infof("Current: %d, Head: %d", block.ThisBlock.BlockNum, block.Head.BlockNum)
@ -127,11 +138,9 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) {
ABI, err := processor.abi.GetAbi(act_trace.Act.Account) ABI, err := processor.abi.GetAbi(act_trace.Act.Account)
if err == nil { if err == nil {
data, err := ABI.DecodeAction(act_trace.Act.Data, act_trace.Act.Name) if err = decode(ABI, act_trace.Act, &act.Data); err != nil {
if err != nil {
log.WithError(err).Warn("Failed to decode action") log.WithError(err).Warn("Failed to decode action")
} }
act.Data = data
} else { } else {
log.WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account) log.WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account)
} }