Merge pull request #17 from AlgoNode/sync-with-upstream

Sync with upstream

Author: agodnic

README.md

@@ -110,6 +110,7 @@ Below is a snippet of the output from `algorand-indexer api-config`:
     optional:
         - currency-greater-than: disabled
         - currency-less-than: disabled
+        - online-only: disabled
 /v2/assets/{asset-id}/transactions:
     optional:
         - note-prefix: disabled

accounting/rewind.go

@@ -165,15 +165,21 @@ func AccountAtRound(ctx context.Context, account models.Account, round uint64, d
 			return
 		}
 	}
+
 	acct.Round = round
+
 	// Due to accounts being closed and re-opened, we cannot always rewind Rewards. So clear it out.
 	acct.Rewards = 0
+
 	// Computing pending rewards is not supported.
 	acct.PendingRewards = 0
 	acct.Amount = acct.AmountWithoutPendingRewards
+
 	// MinBalance is not supported.
 	acct.MinBalance = 0
+
 	// TODO: Clear out the closed-at field as well. Like Rewards we cannot know this value for all accounts.
 	//acct.ClosedAt = 0
+
 	return
 }

accounting/rewind_test.go

@@ -0,0 +1,80 @@
+package accounting
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
+	models "github.com/algorand/indexer/v3/api/generated/v2"
+	"github.com/algorand/indexer/v3/idb"
+	"github.com/algorand/indexer/v3/idb/mocks"
+	"github.com/algorand/indexer/v3/types"
+
+	sdk "github.com/algorand/go-algorand-sdk/v2/types"
+)
+
+func TestBasic(t *testing.T) {
+	var a sdk.Address
+	a[0] = 'a'
+
+	account := models.Account{
+		Address:                     a.String(),
+		Amount:                      100,
+		AmountWithoutPendingRewards: 100,
+		Round:                       8,
+	}
+
+	txnRow := idb.TxnRow{
+		Round: 7,
+		Txn: &sdk.SignedTxnWithAD{
+			SignedTxn: sdk.SignedTxn{
+				Txn: sdk.Transaction{
+					Type: sdk.PaymentTx,
+					PaymentTxnFields: sdk.PaymentTxnFields{
+						Receiver: a,
+						Amount:   sdk.MicroAlgos(2),
+					},
+				},
+			},
+		},
+	}
+
+	ch := make(chan idb.TxnRow, 1)
+	ch <- txnRow
+	close(ch)
+	var outCh <-chan idb.TxnRow = ch
+
+	db := &mocks.IndexerDb{}
+	db.On("GetSpecialAccounts", mock.Anything).Return(types.SpecialAddresses{}, nil)
+	db.On("Transactions", mock.Anything, mock.Anything).Return(outCh, uint64(8))
+
+	account, err := AccountAtRound(context.Background(), account, 6, db)
+	assert.NoError(t, err)
+
+	assert.Equal(t, uint64(98), account.Amount)
+}
+
+// Test that when idb.Transactions() returns stale data the first time, we return an error.
+func TestStaleTransactions1(t *testing.T) {
+	var a sdk.Address
+	a[0] = 'a'
+
+	account := models.Account{
+		Address: a.String(),
+		Round:   8,
+	}
+
+	ch := make(chan idb.TxnRow)
+	var outCh <-chan idb.TxnRow = ch
+	close(ch)
+
+	db := &mocks.IndexerDb{}
+	db.On("GetSpecialAccounts", mock.Anything).Return(types.SpecialAddresses{}, nil)
+	db.On("Transactions", mock.Anything, mock.Anything).Return(outCh, uint64(7)).Once()
+
+	account, err := AccountAtRound(context.Background(), account, 6, db)
+	assert.True(t, errors.As(err, &ConsistencyError{}), "err: %v", err)
+}

api/disabled_parameters.go

@@ -317,7 +317,7 @@ func GetDefaultDisabledMapConfigForPostgres() *DisabledMapConfig {
 		rval.addEntry(restPath, http.MethodGet, parameterNames)
 	}
 
-	get("/v2/accounts", []string{"currency-greater-than", "currency-less-than"})
+	get("/v2/accounts", []string{"currency-greater-than", "currency-less-than", "online-only"})
 	get("/v2/accounts/{account-id}/transactions", []string{"note-prefix", "tx-type", "sig-type", "asset-id", "before-time", "after-time", "rekey-to"})
 	get("/v2/assets", []string{"name", "unit"})
 	get("/v2/assets/{asset-id}/balances", []string{"currency-greater-than", "currency-less-than"})

api/error_messages.go

@@ -39,6 +39,8 @@ const (
 	ErrMultipleBoxes                   = "multiple application boxes found for this app id and box name, please contact us, this shouldn't happen"
 	ErrFailedLookingUpBoxes            = "failed while looking up application boxes"
 	errMultiAcctRewind                 = "multiple accounts rewind is not supported by this server"
+	errOnlineOnlyRewind                = "simultaneously rewinding and searching for online accounts is not supported"
+	errOnlineOnlyDeleted               = "simultaneously searching for online and deleted accounts is not supported"
 	errRewindingAccount                = "error while rewinding account"
 	errLookingUpBlockForRound          = "error while looking up block for round"
 	errBlockHeaderSearch               = "error while searching for block headers"