Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wasm next seq recv type conversion method #165

Merged
merged 1 commit into from
Sep 11, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion relayer/chains/wasm/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,44 +316,44 @@
}

func (ap *WasmProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) {

consensusStateParam, err := types.NewConsensusStateByHeight(clientid, uint64(clientHeight.GetRevisionHeight())).Bytes()

Check warning on line 320 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L319-L320

Added lines #L319 - L320 were not covered by tests
consensusState, err := ap.QueryIBCHandlerContractProcessed(ctx, consensusStateParam)
if err != nil {
return nil, err
}

cdc := codec.NewProtoCodec(ap.Cdc.InterfaceRegistry)
csState, err := clienttypes.UnmarshalConsensusState(cdc, consensusState)
if err != nil {

Check warning on line 328 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L326-L328

Added lines #L326 - L328 were not covered by tests
return nil, err
}

anyConsensusState, err := clienttypes.PackConsensusState(csState)

Check warning on line 332 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L332

Added line #L332 was not covered by tests
if err != nil {
return nil, err
}
return clienttypes.NewQueryConsensusStateResponse(anyConsensusState, nil, clienttypes.NewHeight(0, uint64(chainHeight))), nil
}

func (ap *WasmProvider) QueryIBCHandlerContract(ctx context.Context, param wasmtypes.RawContractMessage) (op *wasmtypes.QuerySmartContractStateResponse, err error) {
return op, retry.Do(func() error {
done := ap.SetSDKContext()
defer done()
op, err = ap.QueryClient.SmartContractState(ctx, &wasmtypes.QuerySmartContractStateRequest{
Address: ap.PCfg.IbcHandlerAddress,
QueryData: param,
})
return err
}, retry.Context(ctx), retry.Attempts(latestHeightQueryRetries), retry.Delay(50*time.Millisecond), retry.LastErrorOnly(true), retry.OnRetry(func(n uint, err error) {
ap.log.Error(
"Failed to query",
zap.Uint("attempt", n+1),
zap.Uint("max_attempts", latestHeightQueryRetries),
zap.Any("Param", param),
zap.Error(err),
)
}))

Check warning on line 356 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L339-L356

Added lines #L339 - L356 were not covered by tests
}

func (ap *WasmProvider) QueryIBCHandlerContractProcessed(ctx context.Context, param wasmtypes.RawContractMessage) ([]byte, error) {
Expand Down Expand Up @@ -506,8 +506,8 @@
}

func (ap *WasmProvider) QueryWasmProof(ctx context.Context, storageKey []byte, height int64) ([]byte, error) {
done := ap.SetSDKContext()
defer done()

Check warning on line 510 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L509-L510

Added lines #L509 - L510 were not covered by tests
ibcAddr, err := sdk.AccAddressFromBech32(ap.PCfg.IbcHandlerAddress)
if err != nil {
return nil, err
Expand Down Expand Up @@ -732,14 +732,18 @@
if err != nil {
return nil, err
}
var seq uint64
if err := json.Unmarshal(nextSeqRecv.Data, &seq); err != nil {
return nil, err
}

Check warning on line 738 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L735-L738

Added lines #L735 - L738 were not covered by tests

proof, err := ap.QueryWasmProof(ctx, common.MustHexStrToBytes(STORAGEKEY__NextSequenceReceive), height)
if err != nil {
return nil, err
}

return &chantypes.QueryNextSequenceReceiveResponse{
NextSequenceReceive: sdk.BigEndianToUint64(nextSeqRecv.Data.Bytes()),
NextSequenceReceive: seq,

Check warning on line 746 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L746

Added line #L746 was not covered by tests
Proof: proof,
ProofHeight: clienttypes.NewHeight(0, uint64(height)),
}, nil
Expand Down Expand Up @@ -860,22 +864,22 @@
return transfers, nil
}

func (ap *WasmProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
param, err := types.NewPrevConsensusStateHeight(clientId, uint64(clientHeight)).Bytes()
res, err := ap.QueryIBCHandlerContract(ctx, param)
if err != nil {
return nil, err
}

Check warning on line 872 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L867-L872

Added lines #L867 - L872 were not covered by tests

var heights []int64
err = json.Unmarshal(res.Data.Bytes(), &heights)

if err != nil {
return nil, err
}

Check warning on line 879 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L874-L879

Added lines #L874 - L879 were not covered by tests

if len(heights) == 0 {
return nil, fmt.Errorf("consensus state of client %s before %d", clientId, clientHeight)
}
return clienttypes.Height{RevisionNumber: 0, RevisionHeight: uint64(heights[0])}, nil

Check warning on line 884 in relayer/chains/wasm/query.go

View check run for this annotation

Codecov / codecov/patch

relayer/chains/wasm/query.go#L881-L884

Added lines #L881 - L884 were not covered by tests
}
Loading