diff --git a/cmd/root.go b/cmd/root.go index 269eb179a..fc940377f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -189,10 +189,10 @@ func newRootLogger(format string, debug bool) (*zap.Logger, error) { ll := lumberjack.Logger{ Filename: path.Join(defaultHome, "relay.log"), - MaxSize: 50, //MB + MaxSize: 10, //MB MaxBackups: 30, MaxAge: 28, //days - Compress: true, + Compress: false, } zap.RegisterSink("lumberjack", func(*url.URL) (zap.Sink, error) { return lumberjackSink{ diff --git a/examples/demo/configs/chains/ibc-wasm.json b/examples/demo/configs/chains/ibc-wasm.json index d0fb75941..b4f19e508 100644 --- a/examples/demo/configs/chains/ibc-wasm.json +++ b/examples/demo/configs/chains/ibc-wasm.json @@ -14,7 +14,7 @@ "timeout": "20s", "output-format": "json", "sign-mode": "direct", - "ibc-handler-address":"--", + "ibc-handler-address":"neutron1fde8lfydxgwg6p7xe9ugx5a6ysj37zfvn9m9z5rxt4mqvdcneczsczq2a4", "broadcast-mode": "batch", "block-timeout": "", "start-height":0, diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index a17dec281..6da6b5351 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "cosmossdk.io/math" "github.com/avast/retry-go/v4" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" @@ -143,7 +144,17 @@ func (icp *IconProvider) QueryBalance(ctx context.Context, keyName string) (sdk. // implementing is not required func (icp *IconProvider) QueryBalanceWithAddress(ctx context.Context, addr string) (sdk.Coins, error) { - panic(fmt.Sprintf("%s%s", icp.ChainName(), NOT_IMPLEMENTED)) + param := types.AddressParam{ + Address: types.Address(addr), + } + balance, err := icp.client.GetBalance(¶m) + if err != nil { + return nil, err + } + return sdk.Coins{sdk.Coin{ + Denom: "ICX", + Amount: math.NewInt(balance.Int64()), + }}, nil } func (icp *IconProvider) QueryUnbondingPeriod(context.Context) (time.Duration, error) { diff --git a/relayer/chains/wasm/event_parser.go b/relayer/chains/wasm/event_parser.go index 769d632a4..bfdf3313b 100644 --- a/relayer/chains/wasm/event_parser.go +++ b/relayer/chains/wasm/event_parser.go @@ -106,6 +106,10 @@ func parseIBCMessageFromEvent( return nil } + if !eventFromIBCContractAddress(event.Attributes[0], contractAddress) { + return nil + } + eventType := findEventType(event.Type) attrs := event.Attributes[1:] switch eventType { diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index 95c37cf27..47e12f9b4 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -807,8 +807,37 @@ func (ap *WasmProvider) GetCommitmentPrefixFromContract(ctx context.Context) ([] // ics 20 - transfer func (ap *WasmProvider) QueryDenomTrace(ctx context.Context, denom string) (*transfertypes.DenomTrace, error) { - panic(fmt.Sprintf("%s%s", ap.ChainName(), NOT_IMPLEMENTED)) + transfers, err := transfertypes.NewQueryClient(ap).DenomTrace(ctx, + &transfertypes.QueryDenomTraceRequest{ + Hash: denom, + }) + if err != nil { + return nil, err + } + return transfers.DenomTrace, nil } func (ap *WasmProvider) QueryDenomTraces(ctx context.Context, offset, limit uint64, height int64) ([]transfertypes.DenomTrace, error) { - panic(fmt.Sprintf("%s%s", ap.ChainName(), NOT_IMPLEMENTED)) + qc := transfertypes.NewQueryClient(ap) + p := DefaultPageRequest() + transfers := []transfertypes.DenomTrace{} + for { + res, err := qc.DenomTraces(ctx, + &transfertypes.QueryDenomTracesRequest{ + Pagination: p, + }) + + if err != nil || res == nil { + return nil, err + } + + transfers = append(transfers, res.DenomTraces...) + next := res.GetPagination().GetNextKey() + if len(next) == 0 { + break + } + + time.Sleep(PaginationDelay) + p.Key = next + } + return transfers, nil } diff --git a/relayer/chains/wasm/archway_chain_processor.go b/relayer/chains/wasm/wasm_chain_processor.go similarity index 100% rename from relayer/chains/wasm/archway_chain_processor.go rename to relayer/chains/wasm/wasm_chain_processor.go diff --git a/relayer/chains/wasm/archway_prefix.go b/relayer/chains/wasm/wasm_prefix.go similarity index 100% rename from relayer/chains/wasm/archway_prefix.go rename to relayer/chains/wasm/wasm_prefix.go diff --git a/relayer/query.go b/relayer/query.go index 24c40672a..b9601cc51 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -10,6 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" @@ -234,7 +235,7 @@ func QueryBalance(ctx context.Context, chain *Chain, address string, showDenoms return nil, err } - if showDenoms { + if showDenoms || chain.ChainProvider.Type() == common.IconModule { return coins, nil }