Skip to content

fix(interchain):rollback when invoke 500 #53

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.

Sign up for GitHub

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

Open
DiyiWi wants to merge 1 commit into
base: release-1.6
Choose a base branch
from
Open

fix(interchain):rollback when invoke 500 #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,20 @@ func (c *Client) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
} else {
res, resp, err := c.InvokeInterchain(ibtp.From, ibtp.Index, content.DstContractId, ibtp.Category(), bizData)
if err != nil {
return nil, fmt.Errorf("invoke interchain for ibtp %s to call %s: %w", ibtp.ID(), content.Func, err)
res, _, err = c.InvokeIndexUpdate(ibtp.From, ibtp.Index, ibtp.Category())
ret.Message = fmt.Sprintf("invoke interchain for ibtp to call %s: %w", content.Func, err)
ret.Status = false
if err != nil {
return nil, err
}
}

ret.Status = resp.OK
ret.Message = resp.Message

// if there is callback function, parse returned value
result = util.ToChaincodeArgs(strings.Split(string(resp.Data), ",")...)
if resp != nil {
ret.Status = resp.OK
ret.Message = resp.Message
// if there is callback function, parse returned value
result = util.ToChaincodeArgs(strings.Split(string(resp.Data), ",")...)
}
chResp = res
}

Expand Down Expand Up @@ -345,7 +351,7 @@ func (c *Client) InvokeInterchain(from string, index uint64, destAddr string, ca
}

if err != nil {
return nil, nil, err
return &res, nil, err
}

logger.Info("response", "cc status", strconv.Itoa(int(res.ChaincodeStatus)), "payload", string(res.Payload))
Expand Down