Skip to content

Feature: Add support for unlimited assets. #900

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

Merged
winder merged 19 commits into from
Mar 10, 2022
Merged

Feature: Add support for unlimited assets. #900

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bd40522
Merge branch 'release/2.8.3'
onetechnical Feb 1, 2022
4997285
Merge branch 'release/2.8.4'
bricerisingalgorand Feb 7, 2022
ae96643
Ledger refactoring changes (#870)
tolikzinovyev Feb 22, 2022
76faddd
unlimited assets: backwards-compatible JSON encodings for account dat…
cce Feb 24, 2022
c941e78
REST API changes for unlimited assets (#872)
cce Feb 25, 2022
dadae50
Merge remote-tracking branch 'origin/develop' into feature/unlimited-…
cce Feb 25, 2022
8444586
REST API: count include-all results when checking max resources limit…
cce Feb 25, 2022
20c5ade
add "none" to exclude enum
cce Feb 25, 2022
ebc44d5
rename MaxAccountNestedObjects => MaxAPIResourcesPerAccount
cce Feb 25, 2022
b3ebf76
update docs for MaxAccountNestedObjects => MaxAPIResourcesPerAccount
cce Feb 25, 2022
0a20fa2
remove "creator" from required since it has been removed from response
cce Feb 25, 2022
12aaa71
achieve parity
cce Feb 25, 2022
6bc3394
Merge branch 'release/2.9.0'
algobarb Mar 2, 2022
6fdb088
Merge remote-tracking branch 'origin/master' into feature/unlimited-a…
cce Mar 3, 2022
ff54cba
Merge remote-tracking branch 'origin/develop' into feature/unlimited-…
cce Mar 8, 2022
333fedf
add DisabledMapConfig to handles_e2e_test defaultOpts
cce Mar 8, 2022
6402d35
Merge remote-tracking branch 'origin/develop' into feature/unlimited-…
cce Mar 9, 2022
482097a
REST API: use ErrorResponse instead of AccountsErrorResponse (#916)
cce Mar 10, 2022
2b82173
Merge branch 'develop' into feature/unlimited-assets
winder Mar 10, 2022
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
Prev Previous commit
Next Next commit
REST API: count include-all results when checking max resources limit (… 
…#901)

* REST API: count include-all results when checking max resources limit

* update TestValidate for removed round param

* move countOnly to function argument rather than polluting idb interface
  • Loading branch information
@cce
cce authored Feb 25, 2022
commit 84445868e33a53f421c9c1a2e610e3403a22d9c2
2 changes: 1 addition & 1 deletion api/disabled_parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func GetDefaultDisabledMapConfigForPostgres() *DisabledMapConfig {
get("/v2/accounts", []string{"currency-greater-than", "currency-less-than"})
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{"round", "currency-greater-than", "currency-less-than"})
get("/v2/assets/{asset-id}/balances", []string{"currency-greater-than", "currency-less-than"})
get("/v2/transactions", []string{"note-prefix", "tx-type", "sig-type", "asset-id", "before-time", "after-time", "currency-greater-than", "currency-less-than", "address-role", "exclude-close-to", "rekey-to", "application-id"})
get("/v2/assets/{asset-id}/transactions", []string{"note-prefix", "tx-type", "sig-type", "asset-id", "before-time", "after-time", "currency-greater-than", "currency-less-than", "address-role", "exclude-close-to", "rekey-to"})

Expand Down
87 changes: 61 additions & 26 deletions api/handlers_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,22 +351,40 @@ func TestAccountMaxResultsLimit(t *testing.T) {
defer shutdownFunc()

///////////
// Given // A block containing an address that has created 5 apps and 5 assets, and another address that has opted into them all
// Given // A block containing an address that has created 10 apps, deleted 5 apps, and created 10 assets,
// // deleted 5 assets, and another address that has opted into the 5 apps and 5 assets remaining
///////////

expectedAppIDs := []uint64{1, 2, 3, 4, 5}
expectedAssetIDs := []uint64{6, 7, 8, 9, 10}
deletedAppIDs := []uint64{1, 2, 3, 4, 5}
deletedAssetIDs := []uint64{6, 7, 8, 9, 10}
expectedAppIDs := []uint64{11, 12, 13, 14, 15}
expectedAssetIDs := []uint64{16, 17, 18, 19, 20}

var txns []transactions.SignedTxnWithAD
// make apps and assets
for range deletedAppIDs {
txns = append(txns, test.MakeCreateAppTxn(test.AccountA))
}
for _, id := range deletedAssetIDs {
txns = append(txns, test.MakeAssetConfigTxn(0, 100, 0, false, "UNIT",
fmt.Sprintf("Asset %d", id), "http://asset.com", test.AccountA))
}
for range expectedAppIDs {
txns = append(txns, test.MakeCreateAppTxn(test.AccountA))
}

for i := range expectedAssetIDs {
for _, id := range expectedAssetIDs {
txns = append(txns, test.MakeAssetConfigTxn(0, 100, 0, false, "UNIT",
fmt.Sprintf("Asset %d", expectedAssetIDs[i]), "http://asset.com", test.AccountA))
fmt.Sprintf("Asset %d", id), "http://asset.com", test.AccountA))
}
// delete some apps and assets
for _, id := range deletedAppIDs {
txns = append(txns, test.MakeAppDestroyTxn(id, test.AccountA))
}
for _, id := range deletedAssetIDs {
txns = append(txns, test.MakeAssetDestroyTxn(id, test.AccountA))
}

// opt in to the remaining ones
for _, id := range expectedAppIDs {
txns = append(txns, test.MakeAppOptInTxn(id, test.AccountA))
txns = append(txns, test.MakeAppOptInTxn(id, test.AccountB))
Expand Down Expand Up @@ -418,11 +436,14 @@ func TestAccountMaxResultsLimit(t *testing.T) {
require.True(t, serverUp, "api.Serve did not start server in time")

// make a real HTTP request (to additionally test generated param parsing logic)
makeReq := func(t *testing.T, path string, exclude []string, next *string, limit *uint64) (*http.Response, []byte) {
makeReq := func(t *testing.T, path string, exclude []string, includeDeleted bool, next *string, limit *uint64) (*http.Response, []byte) {
var query []string
if len(exclude) > 0 {
query = append(query, "exclude="+strings.Join(exclude, ","))
}
if includeDeleted {
query = append(query, "include-all=true")
}
if next != nil {
query = append(query, "next="+*next)
}
Expand Down Expand Up @@ -466,12 +487,17 @@ func TestAccountMaxResultsLimit(t *testing.T) {
}

testCases := []struct {
address basics.Address
exclude []string
errStatus int
address basics.Address
exclude []string
includeDeleted bool
errStatus int
}{
{address: test.AccountA, exclude: []string{"all"}},
{address: test.AccountA, exclude: []string{"created-assets", "created-apps", "apps-local-state", "assets"}},
{address: test.AccountA, exclude: []string{"assets", "created-apps"}},
{address: test.AccountA, exclude: []string{"assets", "apps-local-state"}},
{address: test.AccountA, exclude: []string{"assets", "apps-local-state"}, includeDeleted: true, errStatus: http.StatusBadRequest},
{address: test.AccountB, exclude: []string{"created-assets", "apps-local-state"}},
{address: test.AccountB, exclude: []string{"assets", "apps-local-state"}},
{address: test.AccountA, exclude: []string{"created-assets"}, errStatus: http.StatusBadRequest},
{address: test.AccountA, exclude: []string{"created-apps"}, errStatus: http.StatusBadRequest},
Expand All @@ -483,18 +509,23 @@ func TestAccountMaxResultsLimit(t *testing.T) {
maxResults := 14
t.Run(fmt.Sprintf("LookupAccountByID exclude %v", tc.exclude), func(t *testing.T) {
path := "/v2/accounts/" + tc.address.String()
resp, data := makeReq(t, path, tc.exclude, nil, nil)
resp, data := makeReq(t, path, tc.exclude, tc.includeDeleted, nil, nil)
if tc.errStatus != 0 { // was a 400 error expected? check error response
require.Equal(t, tc.errStatus, resp.StatusCode)
var response generated.AccountsErrorResponse
err = json.Decode(data, &response)
require.NoError(t, err)
assert.Equal(t, *response.Address, tc.address.String())
assert.Equal(t, *response.MaxResults, uint64(maxResults))
assert.Equal(t, *response.TotalAppsOptedIn, uint64(5))
assert.Equal(t, *response.TotalCreatedApps, uint64(5))
assert.Equal(t, *response.TotalAssetsOptedIn, uint64(5))
assert.Equal(t, *response.TotalCreatedAssets, uint64(5))
assert.Equal(t, tc.address.String(), *response.Address)
assert.Equal(t, uint64(maxResults), *response.MaxResults)
if tc.includeDeleted {
assert.Equal(t, uint64(10), *response.TotalCreatedApps)
assert.Equal(t, uint64(10), *response.TotalCreatedAssets)
} else {
assert.Equal(t, uint64(5), *response.TotalAppsOptedIn)
assert.Equal(t, uint64(5), *response.TotalAssetsOptedIn)
assert.Equal(t, uint64(5), *response.TotalCreatedApps)
assert.Equal(t, uint64(5), *response.TotalCreatedAssets)
}
return
}
require.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("unexpected return code, body: %s", string(data)))
Expand Down Expand Up @@ -526,7 +557,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
} {
t.Run(fmt.Sprintf("SearchForAccounts exclude %v", tc.exclude), func(t *testing.T) {
maxResults := 14
resp, data := makeReq(t, "/v2/accounts", tc.exclude, nil, nil)
resp, data := makeReq(t, "/v2/accounts", tc.exclude, false, nil, nil)
if tc.errStatus != 0 { // was a 400 error expected? check error response
require.Equal(t, tc.errStatus, resp.StatusCode)
var response generated.AccountsErrorResponse
Expand Down Expand Up @@ -577,7 +608,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
limit := uint64(2) // 2 at a time
var assets []generated.AssetHolding
for {
resp, data := makeReq(t, "/v2/accounts/"+test.AccountB.String()+"/assets", nil, next, &limit)
resp, data := makeReq(t, "/v2/accounts/"+test.AccountB.String()+"/assets", nil, false, next, &limit)
require.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("unexpected return code, body: %s", string(data)))
var response generated.AssetHoldingsResponse
err = json.Decode(data, &response)
Expand Down Expand Up @@ -608,7 +639,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
limit := uint64(2) // 2 at a time
var assets []generated.Asset
for {
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/created-assets", nil, next, &limit)
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/created-assets", nil, false, next, &limit)
require.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("unexpected return code, body: %s", string(data)))
var response generated.AssetsResponse
err = json.Decode(data, &response)
Expand Down Expand Up @@ -639,7 +670,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
limit := uint64(2) // 2 at a time
var apps []generated.ApplicationLocalState
for {
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/apps-local-state", nil, next, &limit)
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/apps-local-state", nil, false, next, &limit)
require.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("unexpected return code, body: %s", string(data)))
var response generated.ApplicationLocalStatesResponse
err = json.Decode(data, &response)
Expand Down Expand Up @@ -670,7 +701,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
limit := uint64(2) // 2 at a time
var apps []generated.Application
for {
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/created-applications", nil, next, &limit)
resp, data := makeReq(t, "/v2/accounts/"+test.AccountA.String()+"/created-applications", nil, false, next, &limit)
require.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("unexpected return code, body: %s", string(data)))
var response generated.ApplicationsResponse
err = json.Decode(data, &response)
Expand Down Expand Up @@ -794,7 +825,8 @@ func TestInnerTxn(t *testing.T) {
//////////
require.Equal(t, http.StatusOK, rec.Code)
var response generated.TransactionsResponse
json.Decode(rec.Body.Bytes(), &response)
err = json.Decode(rec.Body.Bytes(), &response)
require.NoError(t, err)

require.Len(t, response.Transactions, 1)
require.Equal(t, expectedID, *(response.Transactions[0].Id))
Expand Down Expand Up @@ -862,7 +894,8 @@ func TestPagingRootTxnDeduplication(t *testing.T) {

require.Equal(t, http.StatusOK, rec1.Code)
var response generated.TransactionsResponse
json.Decode(rec1.Body.Bytes(), &response)
err = json.Decode(rec1.Body.Bytes(), &response)
require.NoError(t, err)
require.Len(t, response.Transactions, 1)
require.Equal(t, expectedID, *(response.Transactions[0].Id))
pageOneNextToken := *response.NextToken
Expand All @@ -884,7 +917,8 @@ func TestPagingRootTxnDeduplication(t *testing.T) {
//////////
var response2 generated.TransactionsResponse
require.Equal(t, http.StatusOK, rec2.Code)
json.Decode(rec2.Body.Bytes(), &response2)
err = json.Decode(rec2.Body.Bytes(), &response2)
require.NoError(t, err)

require.Len(t, response2.Transactions, 0)
// The fact that NextToken changes indicates that the search results were different.
Expand Down Expand Up @@ -916,7 +950,8 @@ func TestPagingRootTxnDeduplication(t *testing.T) {
//////////
var response generated.BlockResponse
require.Equal(t, http.StatusOK, rec.Code)
json.Decode(rec.Body.Bytes(), &response)
err = json.Decode(rec.Body.Bytes(), &response)
require.NoError(t, err)

require.NotNil(t, response.Transactions)
require.Len(t, *response.Transactions, 1)
Expand Down
Loading