Skip to content

fix(bmr): send only one receipt per transaction #545

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

Draft
MuhammedIrfan wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

fix(bmr): send only one receipt per transaction #545

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7bf75fb
fix(bmr): send only one receipt per transaction
MuhammedIrfan Sep 26, 2022
1915df5
fix tx size limit exceeding when single receipt has too many events
bbist Sep 27, 2022
a1af6ab
move shared segementation code to separate package
bbist Sep 27, 2022
f824d50
add unit tests for segmentation by tx data size
bbist Sep 27, 2022
c926648
add more tests
MuhammedIrfan Sep 28, 2022
6eeecbd
copy receipt to avoid input receipts mutation
bbist Sep 28, 2022
62dacce
Merge branch 'fix/543-bmc-transaction-failing-due-to-exceeded-the-pre…
bbist Sep 29, 2022
0dcaff4
skip test with external rpc call
bbist Sep 29, 2022
49446d2
resolve the cause of failing unit tests
bbist Sep 30, 2022
77afbd7
Merge branch 'main' into fix/543-bmc-transaction-failing-due-to-excee…
MuhammedIrfan Oct 7, 2022
c492fac
Merge branch 'main' into fix/543-bmc-transaction-failing-due-to-excee…
MuhammedIrfan Oct 12, 2022
63492df
Merge branch 'main' into fix/543-bmc-transaction-failing-due-to-excee…
MuhammedIrfan Oct 19, 2022
d847797
update testcase to assert size of relay message
MuhammedIrfan Oct 22, 2022
099aff7
fix missing param for e2e test
MuhammedIrfan Oct 22, 2022
bf923b0
fix testcase assertions
MuhammedIrfan Oct 22, 2022
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
43 changes: 18 additions & 25 deletions cmd/iconbridge/chain/near/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,24 @@ func (s *Sender) Segment(ctx context.Context, msg *chain.Message) (tx chain.Rela
Receipts: make([][]byte, 0),
}

var msgSize uint64
receipt := msg.Receipts[0]
Comment thread
bbist marked this conversation as resolved.
Outdated

newMsg = &chain.Message{
From: msg.From,
Receipts: msg.Receipts,
rlpEvents, err := codec.RLP.MarshalToBytes(receipt.Events)
if err != nil {
return nil, nil, err
}
for i, receipt := range msg.Receipts {
rlpEvents, err := codec.RLP.MarshalToBytes(receipt.Events)
Comment thread
bbist marked this conversation as resolved.
if err != nil {
return nil, nil, err
}
rlpReceipt, err := codec.RLP.MarshalToBytes(&chain.RelayReceipt{
Index: receipt.Index,
Height: receipt.Height,
Events: rlpEvents,
})
if err != nil {
return nil, nil, err
}
newMsgSize := msgSize + uint64(len(rlpReceipt))
if newMsgSize > txMaxDataSize {
newMsg.Receipts = msg.Receipts[i:]
break
}
msgSize = newMsgSize
rm.Receipts = append(rm.Receipts, rlpReceipt)

rlpReceipt, err := codec.RLP.MarshalToBytes(&chain.RelayReceipt{
Index: receipt.Index,
Height: receipt.Height,
Events: rlpEvents,
})
if err != nil {
return nil, nil, err
}

rm.Receipts = append(rm.Receipts, rlpReceipt)

message, err := codec.RLP.MarshalToBytes(rm)
if err != nil {
return nil, nil, err
Expand All @@ -126,7 +116,10 @@ func (s *Sender) Segment(ctx context.Context, msg *chain.Message) (tx chain.Rela
return nil, nil, err
}

return tx, newMsg, nil
return tx, &chain.Message{
From: msg.From,
Receipts: msg.Receipts[1:],
}, nil
}

func (s *Sender) newRelayTransaction(ctx context.Context, prev string, message []byte) (*RelayTransaction, error) {
Expand Down