8000 chore: backport https://github.com/skip-mev/connect/pull/735 by aljo242 · Pull Request #859 · skip-mev/connect · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This r 8000 epository was archived by the owner on Mar 24, 2025. It is now read-only.

chore: backport https://github.com/skip-mev/connect/pull/735 #859

Merged
merged 6 commits into from
Dec 11, 2024
Merged

chore: backport https://github.com/skip-mev/connect/pull/735 #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed07d3e
fix: retain injected tx if its removed (#735)
technicallyty Sep 10, 2024
7afcb98
sum
Dec 10, 2024
2c8ffe0
go mod tidy
Dec 10, 2024
2a04bcc
Merge branch 'release/v1.x.x' into chore/backport-735
Dec 10, 2024
1d3e352
Merge branch 'release/v1.x.x' into chore/backport-735
Dec 11, 2024
64855f3
Merge branch 'release/v1.x.x' into chore/backport-735
Dec 11, 2024
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
9 changes: 9 additions & 0 deletions abci/proposals/proposals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ func (h *ProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler {
"vote_extensions_enabled", voteExtensionsEnabled,
)

// we save the injected tx so we can re-add it to the txs in case it is removed in a wrapped proposal handler.
var injectedTx []byte

if voteExtensionsEnabled {
// Ensure that the commit info was correctly injected into the proposal.
if len(req.Txs) < slinkyabci.NumInjectedTxs {
Expand Down Expand Up @@ -331,6 +334,7 @@ func (h *ProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler {

// Remove the extended commit info from the proposal if required
if !h.retainOracleDataInWrappedHandler {
injectedTx = req.Txs[slinkyabci.OracleInfoIndex]
req.Txs = req.Txs[slinkyabci.NumInjectedTxs:]
}
}
Expand All @@ -345,6 +349,11 @@ func (h *ProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler {
}
}

if !h.retainOracleDataInWrappedHandler && injectedTx != nil {
// Re-inject the extended commit info back into the response if it was removed
req.Txs = append([][]byte{injectedTx}, req.Txs...)
}

wrappedProcessProposalLatency = time.Since(wrappedProcessProposalStartTime)
return resp, err
}
Expand Down
18 changes: 18 additions & 0 deletions abci/proposals/proposals_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ func (s *ProposalsTestSuite) TestProcessProposal() {
currencyPairStrategy func() currencypair.CurrencyPairStrategy
expectedError bool
expectedResp *cometabci.ResponseProcessProposal
checkTxs func(before, after [][]byte)
}{
{
name: "returns an error on nil request",
Expand Down Expand Up @@ -697,6 +698,9 @@ func (s *ProposalsTestSuite) TestProcessProposal() {
expectedResp: &cometabci.ResponseProcessProposal{
Status: cometabci.ResponseProcessProposal_ACCEPT,
},
checkTxs: func(before, after [][]byte) {
s.Require().Equal(before, after)
},
},
{
name: "can process a block with multiple vote extensions",
Expand Down Expand Up @@ -936,6 +940,16 @@ func (s *ProposalsTestSuite) TestProcessProposal() {
))
}

// make a copy of the txs before we run the proposal
var before [][]byte
if req != nil { // some tests use a nil request.
before = make([][]byte, len(req.Txs))
for i, tx := range req.Txs {
before[i] = make([]byte, len(tx))
copy(before[i], tx)
}
}

response, err := s.proposalHandler.ProcessProposalHandler()(s.ctx, req)

s.Require().Equal(tc.expectedResp, response)
Expand All @@ -944,6 +958,10 @@ func (s *ProposalsTestSuite) TestProcessProposal() {
} else {
s.Require().NoError(err)
}

if tc.checkTxs != nil {
tc.checkTxs(before, req.Txs)
}
})
}
}
Expand Down
Loading
0