pack method

x/cronos/events/bindings/src/ICA.sol

@@ -3,6 +3,8 @@ pragma solidity ^0.8.4;
 
 interface IICAModule {
  event SubmitMsgsResult(uint64 seq);
+ event OnAcknowledgement(string indexed packetSenderAddress, bytes packet, bytes acknowledgement);
+ event OnTimeoutPacket(string indexed packetSenderAddress, bytes packet);
  function registerAccount(string calldata connectionID, string calldata version) external payable returns (bool);
  function queryAccount(string calldata connectionID, address addr) external view returns (string memory);
  function submitMsgs(string calldata connectionID, bytes calldata data, uint256 timeout) external payable returns (uint64);

x/cronos/events/types/types.go

@@ -1,6 +1,11 @@
 package types
 
 const (
- EventTypeSubmitMsgsResult = "submit_msgs_result"
- AttributeKeySeq = "seq"
+ EventTypeSubmitMsgsResult = "submit_msgs_result"
+ EventTypeOnAcknowledgement = "on_acknowledgement"
+ EventTypeOnTimeoutPacket = "on_timeoutPacket"
+ AttributeKeySeq = "seq"
+ AttributeKeyPacketSenderAddress = "packet_sender_address"
+ AttributeKeyPacket = "packet"
+ AttributeKeyAcknowledgement = "acknowledgement"
 )

x/cronos/keeper/keeper.go

@@ -19,6 +19,7 @@ import (
  clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
  channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
  ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+ cronosprecompiles "github.com/crypto-org-chain/cronos/v2/x/cronos/keeper/precompiles"
  "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
  "github.com/ethereum/go-ethereum/common"
  ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -297,23 +298,24 @@ func (k Keeper) IBCOnAcknowledgementPacketCallback(
  relayerAddr := common.BytesToAddress(relayer.Bytes())
  nonce := k.evmKeeper.GetNonce(ctx, relayerAddr)
  precompileAddr := common.HexToAddress(contractAddress)
+ data, err := cronosprecompiles.GetOnAcknowledgementPacketCallback(packet.Data, acknowledgement, packetSenderAddress)
+ if err != nil {
+ return err
+ }
  msg := ethtypes.NewMessage(
  types.EVMModuleAddress,
  &precompileAddr,
  nonce,
  big.NewInt(0), // amount
  DefaultGasCap,
  big.NewInt(0), nil, nil, // gasPrice
- packet.Data,
+ data,
  nil, // accessList
  false, // isFake
  )
- _, err := k.evmKeeper.ApplyMessage(ctx, msg, nil, true)
- if err != nil {
- return err
- }
- // return k.processMockCallback(ctx, callbacktypes.CallbackTypeAcknowledgementPacket, packetSenderAddress)
- return nil
+ ret, err := k.evmKeeper.ApplyMessage(ctx, msg, nil, true)
+ fmt.Println("mm-ret", ret, err)
+ return err
 }
 
 // IBCOnTimeoutPacketCallback returns nil if the gas meter has greater than