Skip to content

Commit

Permalink
logs and update handler
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkCherepovskyi committed Aug 30, 2024
1 parent fe49868 commit 8c5d155
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 4 deletions.
7 changes: 7 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,13 @@ func New(
},
)

app.UpgradeKeeper.SetUpgradeHandler(
"v1.1.4-rc3",
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
},
)

if loadLatest {
if err := app.LoadLatestVersion(); err != nil {
tmos.Exit(err.Error())
Expand Down
3 changes: 3 additions & 0 deletions x/rootupdater/keeper/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ func (k Keeper) EndBlocker(ctx sdk.Context) {
params := k.GetParams(ctx)

if params.Root == params.LastSignedRoot && params.Root != "" {
k.Logger(ctx).Info("root is not updated. Skipping end block")
return
}

k.Logger(ctx).Info("root is updated. Operation creating")

// Creating operation to be signed by TSS parties
index, err := k.rarimo.CreateRootUpdateOperation(ctx, types.ModuleName, &rarimocoremoduletypes.PassportRootUpdate{
ContractAddress: params.ContractAddress,
Expand Down
23 changes: 19 additions & 4 deletions x/rootupdater/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down Expand Up @@ -57,39 +58,53 @@ func NewKeeper(
func (k Keeper) PostTxProcessing(ctx sdk.Context, msg core.Message, receipt *ethtypes.Receipt) error {
params := k.GetParams(ctx)

k.Logger(ctx).Error("PostTxProcessing", "msg", msg, "receipt", receipt)

stateV2, err := abi.JSON(strings.NewReader(state.PoseidonSMTABI))
if err != nil {
k.Logger(ctx).Error("failed to marshal poseidon smart abi", "error", err)
return err
}

contractAddress, err := hexutil.Decode(params.ContractAddress)
if err != nil {
// If return an error here, the whole EVM module won't work
k.Logger(ctx).Debug("failed to decode contract address")
k.Logger(ctx).Info("failed to decode contract address")
return nil
}

// Validating message receiver address (should be our state smart contract)
if msg.To() == nil || bytes.Compare(msg.To().Bytes(), contractAddress) != 0 {
k.Logger(ctx).Info("inappropriate contract address")
return nil
}

var commonError error
// https://docs.evmos.org/protocol/modules/evm#posttxprocessing

if len(receipt.Logs) == 0 {
k.Logger(ctx).Error("logs is empty")
}

for _, log := range receipt.Logs {
eventId := log.Topics[0]

event, err := stateV2.EventByID(eventId)
if err != nil {
k.Logger(ctx).Error("failed to get event by ID")
commonError = errors.Wrap(commonError, errors.Wrapf(err, "failed to get event by id %s", eventId).Error())
continue
}

if event.Name != params.EventName {
k.Logger(ctx).Info("unmatched event: got %s, expected %s", event.Name, params.EventName)
continue
}

eventBody := state.PoseidonSMTRootUpdated{}
if err := utils.UnpackLog(stateV2, &eventBody, event.Name, log); err != nil {
return err
k.Logger(ctx).Error("failed to unpack event body")
commonError = errors.Wrap(commonError, errors.Wrapf(err, "failed to unpack event %s", eventId).Error())
continue
}

params.Root = hexutil.Encode(eventBody.Root[:])
Expand All @@ -100,7 +115,7 @@ func (k Keeper) PostTxProcessing(ctx sdk.Context, msg core.Message, receipt *eth
k.SetParams(ctx, params)
}

return nil
return commonError
}

func (k Keeper) Logger(ctx sdk.Context) log.Logger {
Expand Down

0 comments on commit 8c5d155

Please sign in to comment.