revert to just jasons patch

algorand · Apr 12, 2023 · a71ed3e · a71ed3e
1 parent d010f80
commit a71ed3e
Show file tree

Hide file tree

Showing 8 changed files with 197 additions and 221 deletions.
diff --git a/daemon/algod/api/algod.oas2.json b/daemon/algod/api/algod.oas2.json
@@ -1423,12 +1423,6 @@
           },
           {
             "$ref": "#/parameters/format"
-          },
-          {
-            "type": "integer",
-            "description": "Max number of rounds to look back in case the transaction is not in pending pool.",
-            "name": "lookback",
-            "in": "query"
           }
         ],
         "responses": {

diff --git a/daemon/algod/api/algod.oas3.yml b/daemon/algod/api/algod.oas3.yml
@@ -5643,14 +5643,6 @@
               ],
               "type": "string"
             }
-          },
-          {
-            "description": "Max number of rounds to look back in case the transaction is not in pending pool.",
-            "in": "query",
-            "name": "lookback",
-            "schema": {
-              "type": "integer"
-            }
           }
         ],
         "responses": {

diff --git a/daemon/algod/api/server/v2/generated/model/types.go b/daemon/algod/api/server/v2/generated/model/types.go
diff --git a/daemon/algod/api/server/v2/generated/participating/public/routes.go b/daemon/algod/api/server/v2/generated/participating/public/routes.go
diff --git a/daemon/algod/api/server/v2/handlers.go b/daemon/algod/api/server/v2/handlers.go
@@ -101,7 +101,7 @@ type NodeInterface interface {
 	GenesisHash() crypto.Digest
 	BroadcastSignedTxGroup(txgroup []transactions.SignedTxn) error
 	Simulate(txgroup []transactions.SignedTxn) (result simulation.Result, err error)
-	GetPendingTransaction(txID transactions.Txid, lookbackRounds uint64) (res node.TxnWithStatus, found bool)
+	GetPendingTransaction(txID transactions.Txid) (res node.TxnWithStatus, found bool)
 	GetPendingTxnsFromPool() ([]transactions.SignedTxn, error)
 	SuggestedFee() basics.MicroAlgos
 	StartCatchup(catchpoint string) error
@@ -1177,12 +1177,7 @@ func (v2 *Handlers) PendingTransactionInformation(ctx echo.Context, txid string,
 		return badRequest(ctx, err, errNoValidTxnSpecified, v2.Log)
 	}
 
-	lookbackRounds := uint64(0)
-	if params.Lookback != nil {
-		lookbackRounds = *params.Lookback
-	}
-
-	txn, ok := v2.Node.GetPendingTransaction(txID, lookbackRounds)
+	txn, ok := v2.Node.GetPendingTransaction(txID)
 
 	// We didn't find it, return a failure
 	if !ok {

diff --git a/daemon/algod/api/server/v2/test/helpers.go b/daemon/algod/api/server/v2/test/helpers.go
@@ -169,7 +169,7 @@ func (m *mockNode) Simulate(txgroup []transactions.SignedTxn) (simulation.Result
 	return simulator.Simulate(txgroup)
 }
 
-func (m *mockNode) GetPendingTransaction(txID transactions.Txid, lookbackRounds uint64) (res node.TxnWithStatus, found bool) {
+func (m *mockNode) GetPendingTransaction(txID transactions.Txid) (res node.TxnWithStatus, found bool) {
 	res = node.TxnWithStatus{}
 	found = true
 	return

diff --git a/node/follower_node.go b/node/follower_node.go
@@ -246,7 +246,7 @@ func (node *AlgorandFollowerNode) Simulate(_ []transactions.SignedTxn) (result s
 }
 
 // GetPendingTransaction no-ops in follower mode
-func (node *AlgorandFollowerNode) GetPendingTransaction(_ transactions.Txid, _ uint64) (res TxnWithStatus, found bool) {
+func (node *AlgorandFollowerNode) GetPendingTransaction(_ transactions.Txid) (res TxnWithStatus, found bool) {
 	return
 }
 

diff --git a/node/node.go b/node/node.go
@@ -606,7 +606,7 @@ func (node *AlgorandFullNode) GetTransaction(addr basics.Address, txID transacti
 // blocks, in the txpool, and in the txpool's status cache.  It returns
 // the SignedTxn (with status information), and a bool to indicate if the
 // transaction was found.
-func (node *AlgorandFullNode) GetPendingTransaction(txID transactions.Txid, lookbackRounds uint64) (res TxnWithStatus, found bool) {
+func (node *AlgorandFullNode) GetPendingTransaction(txID transactions.Txid) (res TxnWithStatus, found bool) {
 	// We need to check both the pool and the ledger's blocks.
 	// If the transaction is found in a committed block, that
 	// takes precedence.  But we check the pool first, because
@@ -631,19 +631,24 @@ func (node *AlgorandFullNode) GetPendingTransaction(txID transactions.Txid, look
 		// Keep looking in the ledger.
 	}
 
+	var maxLife basics.Round
 	latest := node.ledger.Latest()
-	// Backwards compat with in case old clients don't specify
-	if lookbackRounds == 0 {
-		proto, err := node.ledger.ConsensusParams(latest)
-		if err == nil {
-			lookbackRounds = proto.MaxTxnLife
-		} else {
-			node.log.Errorf("node.GetPendingTransaction: cannot get consensus params for latest round %v", latest)
-		}
+	proto, err := node.ledger.ConsensusParams(latest)
+	if err == nil {
+		maxLife = basics.Round(proto.MaxTxnLife)
+	} else {
+		node.log.Errorf("node.GetPendingTransaction: cannot get consensus params for latest round %v", latest)
 	}
+
 	// Search from newest to oldest round up to the max life of a transaction.
 	maxRound := latest
-	minRound := maxRound.SubSaturate(basics.Round(lookbackRounds))
+	minRound := maxRound.SubSaturate(maxLife)
+
+	// If we did find the transaction, we know there is no point
+	// checking rounds earlier than its first valid round
+	if found && tx.Txn.FirstValid > minRound {
+		minRound = tx.Txn.FirstValid
+	}
 
 	// Since we're using uint64, if the minRound is 0, we need to check for an underflow.
 	if minRound == 0 {