Skip to content

Commit

Permalink
Merge remote-tracking branch 'bat/fix/order-txs' (#2547)
Browse files Browse the repository at this point in the history
* origin/bat/fix/order-txs:
  added changelog
  [fix]: Removed the command to forward abci commands from async block
  • Loading branch information
Gianmarco Fraccaroli committed Feb 7, 2024
2 parents a7e581a + 433c2d4 commit d65dd84
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/2547-order-txs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- ABCI calls must be executed synchronously.
([\#2547](https://github.com/anoma/namada/pull/2547))
3 changes: 1 addition & 2 deletions crates/apps/src/lib/node/ledger/shims/abcipp_shim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ impl AbciService {
/// forward it normally.
fn forward_request(&mut self, req: Req) -> <Self as Service<Req>>::Future {
let (resp_send, recv) = tokio::sync::oneshot::channel();
let shell_send = self.shell_send.clone();
let result = self.shell_send.send((req.clone(), resp_send));
async move {
let genesis_time = if let Req::InitChain(ref init) = req {
Some(
Expand All @@ -305,7 +305,6 @@ impl AbciService {
} else {
None
};
let result = shell_send.send((req, resp_send));
if let Err(err) = result {
// The shell has shut-down
return Err(err.into());
Expand Down

0 comments on commit d65dd84

Please sign in to comment.