Skip to content

app, helper, x/bor: full grpc implementation #576

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
marcello33 wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

app, helper, x/bor: full grpc implementation #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2261de7
implement full grpc comms with bor
marcello33 Apr 23, 2026
db92873
address comments
marcello33 Apr 23, 2026
d8aab00
safety check
marcello33 Apr 23, 2026
cd7e0fe
address comments
marcello33 Apr 23, 2026
a163232
address comments
marcello33 Apr 23, 2026
e0ba45e
address comments
marcello33 Apr 23, 2026
a399994
address comments
marcello33 Apr 23, 2026
b77aa0a
address comments
marcello33 Apr 23, 2026
670e7d7
address comments
marcello33 Apr 24, 2026
4139ab3
address comments
marcello33 Apr 24, 2026
51272a4
fix typo
marcello33 Apr 24, 2026
700f4ef
address comments
marcello33 Apr 24, 2026
0ff5140
address comments
marcello33 Apr 24, 2026
73975ae
address comments
marcello33 Apr 24, 2026
2b4d0e7
address comments
marcello33 Apr 24, 2026
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
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2"
run:
go: 1.26.1
go: 1.26.2
tests: true
linters:
enable:
Expand Down
167 changes: 73 additions & 94 deletions app/abci_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ func TestPreBlocker(t *testing.T) {
validators := app.StakeKeeper.GetAllValidators(ctx)

msg := &borTypes.MsgProposeSpan{
// SpanId: 2,
Proposer: validators[0].Signer,
StartBlock: 26657,
EndBlock: 30000,
Expand Down Expand Up @@ -652,8 +651,6 @@ func TestSideTxsHappyPath(t *testing.T) {
),
)

// coins, _ := simulation.RandomFees(rand.New(rand.NewSource(time.Now().UnixNano())), ctx, sdk.Coins{sdk.NewCoin(authTypes.FeeToken, math.NewInt(1000000000000000000))})

testCases := []struct {
name string
msg sdk.Msg
Expand All @@ -673,7 +670,7 @@ func TestSideTxsHappyPath(t *testing.T) {
{
name: "Clerk Module Happy Path",
msg: func() *clerkTypes.MsgEventRecord {
rec := clerkTypes.NewMsgEventRecord(
return new(clerkTypes.NewMsgEventRecord(
validators[0].Signer,
TxHash1,
1,
Expand All @@ -682,8 +679,7 @@ func TestSideTxsHappyPath(t *testing.T) {
propAddr,
make([]byte, 0),
"0",
)
return &rec
))
Comment thread
marcello33 marked this conversation as resolved.
}(),
},
}
Expand Down Expand Up @@ -858,7 +854,7 @@ func TestAllUnhappyPathBorSideTxs(t *testing.T) {
blockHeader1 := ethTypes.Header{Number: big.NewInt(int64(seedBlock1))}
blockHash1 := blockHeader1.Hash()

mockCaller.On("GetBorChainBlockAuthor", mock.Anything).Return(&val1Addr, nil)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, mock.Anything).Return(&val1Addr, nil)

mockCaller.On("GetBorChainBlock", mock.Anything, mock.Anything).Return(&blockHeader1, nil)
mockCaller.
Expand Down Expand Up @@ -1116,17 +1112,6 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {
Address2 := "0xb316fa9fa91700d7084d377bfdc81eb9f232f5ff"

addrBz2, err := ac.StringToBytes(Address2)
msg := clerkTypes.NewMsgEventRecord(
addressUtils.FormatAddress("0xa316fa9fa91700d7084d377bfdc81eb9f232f5ff"),
TxHash1,
logIndex,
blockNumber,
10,
addrBz2,
make([]byte, 0),
"101",
)

mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(nil, nil).Once()
mockCaller.
On("GetBorChainBlock", mock.Anything, mock.Anything).
Expand All @@ -1137,7 +1122,16 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(clerkTypes.NewMsgEventRecord(
addressUtils.FormatAddress("0xa316fa9fa91700d7084d377bfdc81eb9f232f5ff"),
TxHash1,
logIndex,
blockNumber,
10,
addrBz2,
make([]byte, 0),
"101",
)), validators[0].Signer, ctx, priv, app)
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1194,7 +1188,14 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {

addrBz2, err := ac.StringToBytes(Address2)

msg := clerkTypes.NewMsgEventRecord(
mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(txReceipt, nil).Once()
mockCaller.On("DecodeStateSyncedEvent", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Once()

mockCaller.
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(new(clerkTypes.NewMsgEventRecord(
addressUtils.FormatAddress("0xa316fa9fa91700d7084d377bfdc81eb9f232f5ff"),
TxHash1,
logIndex,
Expand All @@ -1203,16 +1204,7 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {
addrBz2,
make([]byte, 0),
"0",
)

mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(txReceipt, nil).Once()
mockCaller.On("DecodeStateSyncedEvent", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Once()

mockCaller.
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1363,17 +1355,6 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {

addrBz2, err := ac.StringToBytes(Address2)

msg := clerkTypes.NewMsgEventRecord(
addressUtils.FormatAddress("0xa316fa9fa91700d7084d377bfdc81eb9f232f5ff"),
TxHash1,
logIndex,
blockNumber,
id,
addrBz2,
make([]byte, 0),
"0",
)

mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(txReceipt, nil).Once()

mockCaller.On("DecodeStateSyncedEvent", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Once()
Expand All @@ -1383,7 +1364,16 @@ func TestAllUnhappyPathClerkSideTxs(t *testing.T) {
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(clerkTypes.NewMsgEventRecord(
addressUtils.FormatAddress("0xa316fa9fa91700d7084d377bfdc81eb9f232f5ff"),
TxHash1,
logIndex,
blockNumber,
id,
addrBz2,
make([]byte, 0),
"0",
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1528,15 +1518,6 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {

coins, err := simulation.RandomFees(rand.New(rand.NewSource(time.Now().UnixNano())), ctx, sdk.Coins{sdk.NewCoin(authTypes.FeeToken, math.NewInt(1000000000000000000))})

msg := *topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)

mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(nil, nil).Once()
mockCaller.On("DecodeStateSyncedEvent", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Once()
mockCaller.
Expand All @@ -1548,7 +1529,14 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(*topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1604,23 +1592,21 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {

coins, err := simulation.RandomFees(rand.New(rand.NewSource(time.Now().UnixNano())), ctx, sdk.Coins{sdk.NewCoin(authTypes.FeeToken, math.NewInt(1000000000000000000))})

msg := *topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)

mockCaller.On("GetConfirmedTxReceipt", mock.Anything, mock.Anything).Return(txReceipt, nil).Once()
mockCaller.On("DecodeValidatorTopupFeesEvent", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Once()

mockCaller.
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(*topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1675,14 +1661,6 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {

coins, err := simulation.RandomFees(rand.New(rand.NewSource(time.Now().UnixNano())), ctx, sdk.Coins{sdk.NewCoin(authTypes.FeeToken, math.NewInt(1000000000000000000))})

msg := *topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)
event := &stakinginfo.StakinginfoTopUpFee{
User: common.Address(addr1.Bytes()),
Fee: coins.AmountOf(authTypes.FeeToken).BigInt(),
Expand All @@ -1695,7 +1673,14 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(*topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -1750,14 +1735,6 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {

coins, err := simulation.RandomFees(rand.New(rand.NewSource(time.Now().UnixNano())), ctx, sdk.Coins{sdk.NewCoin(authTypes.FeeToken, math.NewInt(1000000000000000000))})

msg := *topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)
event := &stakinginfo.StakinginfoTopUpFee{
User: common.Address(addr2.Bytes()),
Fee: coins.AmountOf(authTypes.FeeToken).BigInt(),
Expand All @@ -1771,9 +1748,14 @@ func TestAllUnhappyPathTopupSideTxs(t *testing.T) {
On("GetBorChainBlockInfoInBatch", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).
Return([]*ethTypes.Header{}, []uint64{}, []common.Address{}, nil)

// mockChainKeeper.EXPECT().GetParams(gomock.Any()).Return(chainmanagertypes.DefaultParams(), nil).AnyTimes()

txBytes, err := buildSignedTx(&msg, validators[0].Signer, ctx, priv, app)
txBytes, err := buildSignedTx(new(*topUpTypes.NewMsgTopupTx(
addr1.String(),
addr1.String(),
coins.AmountOf(authTypes.FeeToken),
hash,
logIndex,
blockNumber,
)), validators[0].Signer, ctx, priv, app)
Comment thread
marcello33 marked this conversation as resolved.
var txBytesCmt cmtTypes.Tx = txBytes

extCommitBytes, extCommit, _, err := buildExtensionCommits(t, &app, txBytesCmt.Hash(), validators, validatorPrivKeys, 2)
Expand Down Expand Up @@ -2517,7 +2499,6 @@ func TestPrepareProposal(t *testing.T) {
BlockHash: goodExt.BlockHash,
Height: goodExt.Height, // keep height correct
SideTxResponses: badSide, // invalid payload
// MilestoneProposition: nil, // optional
}
fakeBz2, err := gogoproto.Marshal(fakeExt2)
require.NoError(t, err, "gogo‐Marshal should succeed")
Expand Down Expand Up @@ -2568,7 +2549,6 @@ func TestPrepareProposal(t *testing.T) {
require.NoError(t, err)

msgBor := &borTypes.MsgProposeSpan{
// SpanId: 2,
Proposer: validators[0].Signer,
StartBlock: 26657,
EndBlock: 30000,
Expand Down Expand Up @@ -2619,7 +2599,7 @@ func TestPrepareProposal(t *testing.T) {
_, err = app.PreBlocker(ctx, &finalizeReqBorSideTx)
require.NoError(t, err)

msgClerk := clerkTypes.NewMsgEventRecord(
require.NoError(t, txBuilder.SetMsgs(new(clerkTypes.NewMsgEventRecord(
validators[0].Signer,
TxHash1,
1,
Expand All @@ -2628,8 +2608,7 @@ func TestPrepareProposal(t *testing.T) {
propAddr,
make([]byte, 0),
"0",
)
require.NoError(t, txBuilder.SetMsgs(&msgClerk))
))))
Comment thread
marcello33 marked this conversation as resolved.
require.NoError(t, err)
require.NoError(t, txBuilder.SetSignatures(sigV2))

Expand Down Expand Up @@ -3074,8 +3053,8 @@ func TestCheckAndRotateCurrentSpan(t *testing.T) {
// Mock IContractCaller with proper producer mapping
mockCaller := new(helpermocks.IContractCaller)
producerSignerStr := validators[0].Signer
producerSignerAddr := common.HexToAddress(producerSignerStr)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, lastMilestone.EndBlock+1).Return(&producerSignerAddr, nil)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, lastMilestone.EndBlock+1).
Return(new(common.HexToAddress(producerSignerStr)), nil)
Comment thread
marcello33 marked this conversation as resolved.
app.BorKeeper.SetContractCaller(mockCaller)

// Call the function
Expand Down Expand Up @@ -3147,8 +3126,8 @@ func TestPreBlockerSpanRotationWithMinorityMilestone(t *testing.T) {

// Set up the mock contract caller
mockCaller := new(helpermocks.IContractCaller)
producerSigner := common.HexToAddress(validators[0].Signer)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, mock.Anything).Return(&producerSigner, nil)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, mock.Anything).
Return(new(common.HexToAddress(validators[0].Signer)), nil)
app.BorKeeper.SetContractCaller(mockCaller)

// Set context to trigger span rotation conditions
Expand Down Expand Up @@ -3229,8 +3208,8 @@ func TestPreBlockerSpanRotationWithoutMinorityMilestone(t *testing.T) {

// Set up the mock contract caller
mockCaller := new(helpermocks.IContractCaller)
producerSigner := common.HexToAddress(validators[0].Signer)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, mock.Anything).Return(&producerSigner, nil)
mockCaller.On("GetBorChainBlockAuthor", mock.Anything, mock.Anything).
Return(new(common.HexToAddress(validators[0].Signer)), nil)
app.BorKeeper.SetContractCaller(mockCaller)

// Set context to trigger span rotation conditions
Expand Down Expand Up @@ -3772,7 +3751,7 @@ func TestPrepareProposal_AccountSequenceMismatch(t *testing.T) {
require.NotNil(t, res)

// Only the first transaction should be accepted (sequence 0 is correct for the first tx)
// All subsequent transactions will fail because they also have sequence 0 but the account sequence is now 1
// All later transactions will fail because they also have sequence 0, but the account sequence is now 1
// Result should be: 1 ExtendedCommitInfo + 1 successful tx = 2 total
require.Equal(t, 2, len(res.Txs), "Should have exactly 2 transactions (1 ExtendedCommitInfo + 1 tx, others rejected due to sequence mismatch)")
})
Expand Down
Loading
Loading