diff options
author | chris erway <51567+cce@users.noreply.github.com> | 2022-02-23 13:28:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-23 13:28:14 -0500 |
commit | c661566d80d3c0973b774928dc4b557a983eaea8 (patch) | |
tree | 1fecdae1fc9d2db2eaa4e18ff7dc7a8d48b333f2 | |
parent | 8b287389d3cb8b169a535d6c9340628587447d67 (diff) |
rename REST API fields to total-x-opted-in (#3676)
## Summary
Based on code review feedback in https://github.com/algorand/go-algorand/pull/3652#discussion_r810152418
## Test Plan
Existing tests should pass
-rw-r--r-- | daemon/algod/api/algod.oas2.json | 16 | ||||
-rw-r--r-- | daemon/algod/api/algod.oas3.yml | 16 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/account.go | 4 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/generated/private/routes.go | 156 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/generated/private/types.go | 22 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/generated/routes.go | 251 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/generated/types.go | 22 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/handlers.go | 16 | ||||
-rw-r--r-- | daemon/algod/api/server/v2/test/handlers_resources_test.go | 2 |
9 files changed, 253 insertions, 252 deletions
diff --git a/daemon/algod/api/algod.oas2.json b/daemon/algod/api/algod.oas2.json index 69da2f7cf..19d3c0ada 100644 --- a/daemon/algod/api/algod.oas2.json +++ b/daemon/algod/api/algod.oas2.json @@ -1595,8 +1595,8 @@ "rewards", "status", "min-balance", - "total-apps-local-state", - "total-assets", + "total-apps-opted-in", + "total-assets-opted-in", "total-created-apps", "total-created-assets" ], @@ -1624,8 +1624,8 @@ "$ref": "#/definitions/ApplicationLocalState" } }, - "total-apps-local-state": { - "description": "The count of all application local data (AppLocalState objects) stored in this account.", + "total-apps-opted-in": { + "description": "The count of all applications that have been opted in, equivalent to the count of application local data (AppLocalState objects) stored in this account.", "type": "integer" }, "apps-total-schema": { @@ -1643,8 +1643,8 @@ "$ref": "#/definitions/AssetHolding" } }, - "total-assets": { - "description": "The count of all assets (AssetHolding objects) held by this account.", + "total-assets-opted-in": { + "description": "The count of all assets that have been opted in, equivalent to the count of AssetHolding objects held by this account.", "type": "integer" }, "created-apps": { @@ -2257,10 +2257,10 @@ "max-results": { "type": "integer" }, - "total-apps-local-state": { + "total-apps-opted-in": { "type": "integer" }, - "total-assets": { + "total-assets-opted-in": { "type": "integer" }, "total-created-apps": { diff --git a/daemon/algod/api/algod.oas3.yml b/daemon/algod/api/algod.oas3.yml index 00de5a002..6279ef264 100644 --- a/daemon/algod/api/algod.oas3.yml +++ b/daemon/algod/api/algod.oas3.yml @@ -823,12 +823,12 @@ "description": "\\[onl\\] delegation status of the account's MicroAlgos\n* Offline - indicates that the associated account is delegated.\n* Online - indicates that the associated account used as part of the delegation pool.\n* NotParticipating - indicates that the associated account is neither a delegator nor a delegate.", "type": "string" }, - "total-apps-local-state": { - "description": "The count of all application local data (AppLocalState objects) stored in this account.", + "total-apps-opted-in": { + "description": "The count of all applications that have been opted in, equivalent to the count of application local data (AppLocalState objects) stored in this account.", "type": "integer" }, - "total-assets": { - "description": "The count of all assets (AssetHolding objects) held by this account.", + "total-assets-opted-in": { + "description": "The count of all assets that have been opted in, equivalent to the count of AssetHolding objects held by this account.", "type": "integer" }, "total-created-apps": { @@ -849,8 +849,8 @@ "rewards", "round", "status", - "total-apps-local-state", - "total-assets", + "total-apps-opted-in", + "total-assets-opted-in", "total-created-apps", "total-created-assets" ], @@ -868,10 +868,10 @@ "message": { "type": "string" }, - "total-apps-local-state": { + "total-apps-opted-in": { "type": "integer" }, - "total-assets": { + "total-assets-opted-in": { "type": "integer" }, "total-created-apps": { diff --git a/daemon/algod/api/server/v2/account.go b/daemon/algod/api/server/v2/account.go index 9c59b30a0..31725f13a 100644 --- a/daemon/algod/api/server/v2/account.go +++ b/daemon/algod/api/server/v2/account.go @@ -130,10 +130,10 @@ func AccountDataToAccount( CreatedApps: &createdApps, TotalCreatedApps: uint64(len(createdApps)), Assets: &assets, - TotalAssets: uint64(len(assets)), + TotalAssetsOptedIn: uint64(len(assets)), AuthAddr: addrOrNil(record.AuthAddr), AppsLocalState: &appsLocalState, - TotalAppsLocalState: uint64(len(appsLocalState)), + TotalAppsOptedIn: uint64(len(appsLocalState)), AppsTotalSchema: &totalAppSchema, AppsTotalExtraPages: numOrNil(totalExtraPages), MinBalance: minBalance.Raw, diff --git a/daemon/algod/api/server/v2/generated/private/routes.go b/daemon/algod/api/server/v2/generated/private/routes.go index f9f380881..7636c789b 100644 --- a/daemon/algod/api/server/v2/generated/private/routes.go +++ b/daemon/algod/api/server/v2/generated/private/routes.go @@ -379,84 +379,84 @@ var swaggerSpec = []string{ "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", - "AAAA//+CNiMHGbAAAA==", + "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", } // GetSwagger returns the Swagger specification corresponding to the generated code diff --git a/daemon/algod/api/server/v2/generated/private/types.go b/daemon/algod/api/server/v2/generated/private/types.go index b54b78332..ee69c30a3 100644 --- a/daemon/algod/api/server/v2/generated/private/types.go +++ b/daemon/algod/api/server/v2/generated/private/types.go @@ -81,11 +81,11 @@ type Account struct { // * NotParticipating - indicates that the associated account is neither a delegator nor a delegate. Status string `json:"status"` - // The count of all application local data (AppLocalState objects) stored in this account. - TotalAppsLocalState uint64 `json:"total-apps-local-state"` + // The count of all applications that have been opted in, equivalent to the count of application local data (AppLocalState objects) stored in this account. + TotalAppsOptedIn uint64 `json:"total-apps-opted-in"` - // The count of all assets (AssetHolding objects) held by this account. - TotalAssets uint64 `json:"total-assets"` + // The count of all assets that have been opted in, equivalent to the count of AssetHolding objects held by this account. + TotalAssetsOptedIn uint64 `json:"total-assets-opted-in"` // The count of all apps (AppParams objects) created by this account. TotalCreatedApps uint64 `json:"total-created-apps"` @@ -96,13 +96,13 @@ type Account struct { // AccountErrorResponse defines model for AccountErrorResponse. type AccountErrorResponse struct { - Data *string `json:"data,omitempty"` - MaxResults *uint64 `json:"max-results,omitempty"` - Message string `json:"message"` - TotalAppsLocalState *uint64 `json:"total-apps-local-state,omitempty"` - TotalAssets *uint64 `json:"total-assets,omitempty"` - TotalCreatedApps *uint64 `json:"total-created-apps,omitempty"` - TotalCreatedAssets *uint64 `json:"total-created-assets,omitempty"` + Data *string `json:"data,omitempty"` + MaxResults *uint64 `json:"max-results,omitempty"` + Message string `json:"message"` + TotalAppsOptedIn *uint64 `json:"total-apps-opted-in,omitempty"` + TotalAssetsOptedIn *uint64 `json:"total-assets-opted-in,omitempty"` + TotalCreatedApps *uint64 `json:"total-created-apps,omitempty"` + TotalCreatedAssets *uint64 `json:"total-created-assets,omitempty"` } // AccountParticipation defines model for AccountParticipation. diff --git a/daemon/algod/api/server/v2/generated/routes.go b/daemon/algod/api/server/v2/generated/routes.go index c3d1d602c..10b4f5b0d 100644 --- a/daemon/algod/api/server/v2/generated/routes.go +++ b/daemon/algod/api/server/v2/generated/routes.go @@ -805,131 +805,132 @@ var swaggerSpec = []string{ "Tr/oeSfm3WOtd+pEQbaNE7PmKL+A+WIYBq2FHe+/n8na03EFE4Jv/x3CZjkqS3XggRU9VLaMzvYx8xBo", "cTYGyRu1w4PRxkio3yyp8u8X8Zmn39E7aQKfMEh806Obo8BxHbzlrJ/UeMnb3a1x8619XFOo5pFNaLvd", "4cHMeORiqWLkEBzVoAxyWNiF28aeURxoD1RAIAPHj/N5zjiQJOYDp0qJlNkHqM1h4+YAoyXvEWItUGTn", - "EWJsHICNfiIcmLwV4d7ki6sAyYGhY4n6sdHDFPwN8YBAG+W0VfPEEDUvBKiLnfDyKVA/H7Y0R+9rfDSk", - "lm4w4Q2dKH1I7EnyMNRfmomj2tWGaTef6zE0KFy0u4fW8w4dbLtMfa2V3wCAjlmgSXPirmFbr0vtI7J/", - "oDSSddw8SvRxkgMs2OGDKH0GMNe3x9avUb6VUsjwZt9znWMUa3Px9mYWn4UmkLTAMwz6slc9Ivxjg35o", - "KD6adlsY/fuwSgGymHvf7KJozDC+JrYPIGOvKcejIPL8Ctt8+/bbdafsztZb+G84xr0m47uu2hM1ebQ9", - "we0HTYE2GjvSjKTqG5r75FKQA94vkpYmlpzF3A/mmgR4bB37boEdhDxkc3NreRSEF0hYMKWhMQSa091b", - "tu/aeUjxHbQQ8+HV6VLOzfreC1GfddjROUPDZd75Cs6FhmTOpNIJWlGjSzCNvlN4P//ONI0rXO0ABpsS", - "hGVx4Y7TnsE6yVhexfnVzfu3V2bat7VJS1WzM1ijWg00XZIZprCJhjVtmNpGvm1c8Gu74Nf01ta7224w", - "Tc3E0rBLe44vZF90RNcmcRBhwBhz9Kk2iNINAhLVr1eQ69jDpkB1s5szMw0nmwy5vc2U+bE3XTgDKIaV", - "DDtSdC2B7WHjKhjGcphrszlmg9R23RUN7AFalixbdcyqdtTBaze9ku3EPwDuYAGp6wbbgoHAhBoL9JXg", - "zcCWpMEtweby4eHaJjth5qTzbDsQCOFUTPlMdH1EGdbGdEnbcHUCNP8brP9u2uJyRpfj0c2ssDFcuxG3", - "4PpdTd4ontG9aK1yLV3viiinZSnFOc0TZ6seYk0pzh1rYnNv2r5jURe3iJ58e/j6nQP/cjxKc6AyqVWF", - "wVVhu/KLWZXRYIUc2CA+05VR7v2ly6qSAfHr18ahfftiCS6rUKCNGinmmMtur8Z3EWxFZ++ex6Mctlqv", - "nZvFLnGDuwXK2tvS2ACts6XtYKHnlOXe+OahHYhIwMXtlkojKhXCAW7sqAmuQ8mtipve7o7vjoa7tsik", - "cK4NeY8Km9pLEcG7AW5GhUSbHrJqQdeGg6xhpi+ceFUkZvslKmdp3FDLZ8owB7duONOYYOMBZdSMWLEB", - "ry6vWDCWaaZ2sFR0gAzmiCLTp+sYwt1MuJysFWf/qoCwDLg2nyTuys5GxTwYzmTfP06N7tCfyw1szfzN", - "8DfRMcL0It0TD4HYrGCETr8euK/qK7NfaG1PMz8Efo0rxA6EM/aOxA1+f8cfjpttANay7bwLU6j25Z9h", - "DJtua3v+Vn95dRliBuaI5mNlKplL8RvE73l4PY68AnAToTKFvSeRx1RdEVOb55q0ss3sg+Qe0m5CM2I7", - "3mGA65HygYcPc2d4MzflltQ2PWIryibOMGFk3NSO3zCMg7kXTZjTixmNJRYxSoaB6bDxJbcM8loQ39nj", - "3vkOzNmFs5PALV23ZfZ9XAmyeaDTf4t9TYXBTruzqtBoBsi1oU4wtk7EXInIMBW/oNxm2TT97FZyvRVY", - "45fpdSEkvm5Vcd9BBikraB7XHDLEfvs1cMYWzOaYrBQESQzdQDY5r+UilwjSeusb1BzNyf44SEjkqJGx", - "c6bYLAds8di2mFGFkrw2RNVdzPKA66XC5k92aL6seCYh00tlEasEqZU6vN7UHrAZ6AsATvax3eMX5CH6", - "/hQ7h0cGi+58Hh08foFWc/vHfuwAcMlkN0mTDMXJfztxEudjdH7aMYzgdqNOom81bQbwYcG1YTfZrrvs", - "JWzpZN32vVRQThcQDzoptsBk+yI10ZDWwQvPbPpapaVYE6bj84OmRj4NRNAa8WfBIKkoCqbRra8FUaIw", - "/NRkKLST+uFsLlyXZMjD5T+io7X0DxA6l8i7NZra8y22anSHv6UFtNE6JtQ+ac5ZEwLhBOKEHPnECJh1", - "qU62ZHFj5jJLRzUHIyLmpJSMa7xYVHqe/JWkSyppasTfZAjcZPbVs0imqXZyGX41wO8c7xIUyPM46uUA", - "23sdwvUlD7ngSWEkSvaoiVgPduWgRzgee+clejf0cvPQuyplZpRkkN2qFrvRQFLfiPH4hgFvyIr1eq7E", - "j1de2Z1zZiXj7EErQ6Gf3r92WkYhZCxNTrPdncYhQUsG5xgGGCeSGfOGtJD5TlS4CfSf1/PgVc5ALfN7", - "OXYR+KZiefb35gVOJ1mfpDxdRu3+M9PxlyZdcL1ku4+jWVmWlHPIo8PZM/MXf7ZGTv9/il3nKRjfsW03", - "CZ9dbmdxDeBtMD1QfkKDXqZzM0GI1faThDqGNV+IjOA8TQqQhsv6eQWDhGT/qkDp2BNI/GDjb9C+Y+4F", - "Nh9WHaMwId/bch9LIK0MBajNsqLK7Wt3yBYgneGxKnNBszEx45x8e/ia2FltH5uW3ebjWqAy115F514f", - "5AvaLRbTJ/mMR4vvPs7m8FWzaqUxYYjStChjD4FMixPfAF8bhbZOVPNC7EzIK6thK6+/2UkMP8yZLIxm", - "Wo9mZTzyhPmP1jRdourakibDLL97IjnPlSrIkF7ncK1T/uC+M3C7XHI2ldyYCHO/uGDKVnmAc2i/Paof", - "4rmrk3+L1F6erDi3nBKV0Zseil4H7R4469D25tAoZB3EX1FxUaKSKVw1r94x9orm0Ogm6eulRrdvtOtM", - "pr56T0q54CzFDBZBXYkaZFcxYhdfwQ7JPrrGKL/F3Q6NbK5oasA6HsxhcTBZoBeEDnF9Y2Xw1RDVcof9", - "U2NpgiXVZAFaOckG2dinf3T2EsYVuBROWDwkkJNCtvwvKCGjLr2kNv1ekY3wJcKAAvyd+fbWXY8wOPeM", - "cVSEHNpcHLC1aGBCe220J6bJQoBy62knOlA/mz4TfOyfwerDxCfAxzGs+8Is2/rq+kMdes+d85SZti9N", - "W2JjP+ufW68e7KSHZekmjYYa1RSOJbAcRHDEA5N4E3iA3Hr8cLQN7LbR5Y7nqWE0OEeHHZR4DvcYo84F", - "2knqe07zykUTYtyhDXWJvlZlPALGa8ahKc8QOSDS6JGAhMH9OtBPpZJqqwLuJNNOgObopYsJNKWdifam", - "Q3UIjCjBNfo5hsnYpDEdEBx1g0Zxo3xdV4Uw3B0oEy+xHI1DZD8pKWpVTonKMHy7k6Y0JjiM4PYJftsH", - "QH8b9HUi211LanfOVU6ioXd5qYjpm9+uIK2sE1rY3Ei0LEmKD92D8yJq0WTKXJ6KWR6JB3tVfwxy/2Ko", - "/WyN/8YyVg2jxHmJrxyn5F3C2PHKCmt7pJ66aZgpUWyR7I4JFOY3R0cz9fU4rOl/qyyWi0UbkDvOLLNJ", - "vIQ0igmWK8eSt8PEbTEF//xw1yjwwSDvKwRRm1NnIDYwyKdD7cFm3RtDEYLpYEAr1e59jqakSQbSlwk2", - "u3dsBBteYLOK25J7UdPOUEiBjSgwn3u9d1PJegoujr0RoT5WpQ/Q33wgHCkpc767Rlj0MetCZvtBzLsE", - "0zUE7i7CBaLiILGV9NItbuaQXiByEExvs+JNdk8PcFg7RtFdgznNF8BdUvN2iOHOgU7zOaSanW8J/P5v", - "oyw3QcVjr07bShBBHDirA2d8ZcYravkNQJvisjfCE+QguTE4Q2GfZ7B+oEiLG6Jp+saeUa/z7hQxgPlZ", - "EsMiQsUcD/b+72zBTNWcgVjwjj7bHZrUWIP5kYNnDNecy7MkoeHThg1TnovYBWKnuUzXK73YwhiQodjw", - "fobS4dPrFSaEVXVu+7r0YhDHYe6J3ex5F+7dK4bp1yYv/wIWlP/Nv8mxs9iSnk0GZzQwXlCZ+RZRjdkr", - "48lAtFU3ftmGibM40PN6ZtaEZfRDeCNZIzD4Js2FYnyRDEUwtSMhajfCA2X9Pc3TMIRrDtJlbte+Ymqi", - "hQ/j2ATHJlS4+j7XQYIazIFogRt8Of2+eRqOqbKorZfrfFnhAomEghroZPCAe3jOTch+ab/7mFX/hq+T", - "mCwyrufXZOsLbB+Qw1QPiSHXz4k7LbfHwl7nqsI4t4UxVOw1NzeoDI1YpRRZldoDOtwY4K90O+dK2CBK", - "olp+2l9lT2HLMX/I6+BlwRmsp1ZpSpeUN4lc2tvapna0awhe8nWofau3uLjCmi/sAha3AufnvAmNR6UQ", - "eTJgtTrqP0rv7oEzlp5BRszZ4V3ZAzmSyUM0ltRuiYvl2leEKEvgkD2aEGLuUkWp195D0U7K1pmcP9Cb", - "5l/hrFll80S4S9rklMejMGwF6hvKNz/MZqmmwAi/G05lB9ny3HzFB0QbvYhkDN+12FnEZ9DN4twwlYUi", - "pqVc8+naTvu7f1GLsH746GDL/eesdauzaYc6fgIh4ZZvd4GB9Iq3u/5zil2Xh+tAqVYp6K9zZwK0cDuA", - "+10Q35gm+sgdtijo2S4WhXhyFNMdTRoWIZhZiCCo5NfHvxIJc1cOf28PJ9jbG7umvz5pfza3r7296M68", - "M2NGq6aamzfGMX8f8itb3+lACEOHHhXLs22M0QpIaXJ/YsjFLy5057NkH/3FXpH7W9UlYryKGbVLBERM", - "ZK2tyYOpglCTHaJMXLdITAkeNmklmV7jiyJ/o2K/RF9qf18bYVyhzjoG3YVA26LvLiKqMdk0dbq/F7bU", - "XmHOejRiayyP8O2KFmUObqN8/WD2F3j612fZ/tPHf5n9df/5fgrPnr/Y36cvntHHL54+hid/ff5sHx7P", - "v3oxe5I9efZk9uzJs6+ev0ifPns8e/bVi7888EWyLaBNAep/YIre5PDdUXJigG1wQktWV0UxbOzTfdIU", - "d6K5k+SjA//T/+932CQVRTO8/3XkwuNGS61LdTCdXlxcTMIu0wXe0RItqnQ59fP0q1G8O6pDd+yTC6So", - "jcowrIBEdaxwiN/ef3t8Qg7fHU0ahhkdjPYn+5PHmFW7BE5LNjoYPcWfcPcske5Tx2yjg4+X49F0CTTH", - "VOvmjwK0ZKn/pC7oYgFy4vKemp/On0y953/60d1PL82oi9hbKxuEFKke3Dz3d7Yu9CfZIKNWYi3l8jyN", - "63RrTn3kGcaG2CufEW01so6yJiVIkL/FP4yyL8UPfo6koZ6zRSU7dZxqa77LyMgU+a/jH98SIckba3N/", - "R9OzMP4iVhDdibJYPXQXpVGoRdl2aTaW/ljFl1he1Ui5/sZUNFypv5GrRlbuJy8+fHz+18vRDoCg3dLV", - "y/2V5vmvttAWrND445+QuScC40gSKVTqxo3pATs0ZBqjT7b+Gub7rNu0I4F+5YLDr0NkcIBF6UDz3DQU", - "HGI0+NApPP9kf/8TVLget0bxLPFZS2U/u/2Fth1pt7Xq7qg9FHxDM8zFCErbhT2+tYXd8oq2LuWIoyPB", - "yH9iz7fL8ej5LVLq7hdkJBDNCbYMXkP1z5Sf+BkXF9y3NLpNVRRUrlFzCdLGhjrq5eDZNQ1TtE4/tszM", - "2ac82R6oIXnYSwhqH/RiYhysGQYrpvSj2lZvE3uHHY5eDR2IwY36/mz8pGfjYZskrdffMWBajLcRpp53", - "6KaHUz82qZM17lppv4OEcdfInPNJs6J2LmaDFRt3EHv3uBuqdjmgggTw1tpIO1dfuG1s1AwmNu2J2q6Y", - "PHp16xrLXZ+Db2huCGGUXf/eT3Yl+73u8mfSXfqn/GZtBrNuTj/6FBGfWoMJb3h2QzZXuK0ai0u+Mair", - "YJKNey3lU2sp/ew0MTCanCOfTzNBGJZN+pqr1Ldo5aW9UpqdL1QV+RMja1D3MJAOaR24DbbqG05m/UE1", - "DS+R73WMP7OOYaO/NmgZrdxNLlRwWNGAoPB1UEWkFao0W3s+HBOF9fXNT6VkQjK9HhPGSQZGKqGPSUh8", - "ptqU0HZhKcDxv28O/4HBim8O/0G+JvvjWnnBVzyR6W04SFsJ+R50pMT7N+vD+jzeqIz8bk74kxpJAyXY", - "tfDplxBpBV19PYSylfVExfSjgq5GG1WB8Zejrt1Ua+m8v+tzkStiuaFsvyKwoqnO14Qqq0JjtCgW9/a5", - "kzrlyLu18WMvVDbM6EtJxN4ZXTUOKPLIuV+mP16ud4hLXY4yLJ+yXTPoISMKwfXUrHvqfrHU7euFpBRm", - "TzN8RN+cJ/6sagHZ5KN34A6EOE7I/4gKwyNs2SqIJYDEGTAc1M/pYrSDDK45Fg2rsbO311343p6jOVNk", - "DhcoQSnHhl107O39AVTWVZ13jxIueMKxqtI5kCCm6l5v/V3rrc/3n36xqzkGec5SICdQlEJSyfI1+YnX", - "iUpuppbXMqfiQeqYjfKnF1vdaNGB+n4j/2bb9jwmTDeaYeupTXCHr4vfuSRV4ybru7lCY4IJ/8RZjX32", - "cwwVs05QS49xLzf6JKakB/6Eb9ZoTNyql38hbrmdEx1FzrU4bT71CRCNuXh/NzEXuwnTZ/vP7g6CkApv", - "hSbfob3qE4v0T2o7iLNVIGyu7H7wJqe2aHFP1zYKFbNDxy45JWZLXJP6aYmRJ1YQ2vT0falhZthVXvyO", - "DeQ7FLiN8GUXvfdy4V4u3EgudBmqkQj4QFtNP6KtPhQHvS35jWn5B/LxBQ4PKQrv8RBkDjpd2ofr3YcU", - "EbHi86UNy5RNWcVv2QGHQEeyquJa3GMBzHa94xMy7PiDjd2/HI9SkBHm+9FnUDGf2RwfAta58HzyfMwg", - "y3w+2TqVrEu4zZSPUnZ5Uoih4pWgfNlM3n/YgWi5DafdPYKvhuCeUPvWZfa128st4ks3fASnJUnIW1SH", - "cIP7VHB/RLPHpzyRP/WC3goONubFaKyWF+9dkLW6gPU3ECn+3bx1PLqSnnHVoe10/KhXLLuc1oldhpSK", - "d9hgi1LRnNSsqXrYNq/QsgQq1bUP6e3usJPOjEevwkCJVh6aOgNNBBSDlyt6Ev9jFzfiH9db1z6Bl1Qt", - "4y+CkUDrEtP2m1ZkXnFLqrrCEEbNWE+GIdG4NlcbeSDmB6d8j6iqwN74/yV9/vjJL0+efzUa1yt2DQw2", - "ms8fIi9WWbaKJmuAlc85E/KTsxnipnqgSEnXgzleBtIlvQF5lvvSzm3nCCnAHERqycrPUaqazeLVWn4w", - "iBZzUudQPuLf1HLnHCSbY8mhej/dcQ4OCZBBqZcbH7/bikmlXjZEBVfTjymXZKSU4hz4mLAJTLpOpGzR", - "pCPNgc7rJBVC7BJjVe8Hy2+eOQKshwvZRUV7F+MffHjmknndtTGiCYWyh4BHnuzI489qqdCfxVLxVvAE", - "9Rjg2uvULbR8PqsF5hUZB4bBOis9FxoNgkKi+hWKLTXZSXGBQSdNSwbaOMFBNnZqTEp1uqzK6Uf8D77x", - "vmxeU9sSDFNrwNykyRzbFrcammLHJLItbXxaAWdUFXPyhqVSHGL+GXeMqLXSUPQL9Nmuv2xK7h89cgTP", - "GYekEDyWkeBH/PoGP0Yz3KC7e6AzBh4M9e2WVWnB3wGrPc8uou6m+J38PoyjN1L0O6uVUNbhfRgHgfzf", - "7JZWitFmm7R+nn5sF8e3fgbXUi0rnYmLoK/NILBxb9kWt7q33ooM7LjtpB2xuEsuMnCJDvpbqpYacZXU", - "47dp11EOUlotltoWmItWr6w7JjS1W8Fm6VTb0hraVj591zkQmkug2ZrMADgRM7PodnpYQlVdMRSZw8rG", - "eHa+Bq5SihSUgiwJK8tsAq1OH4Gaj96AJwQcAa5nIUqQOZXXBNYKic2Adkuq1eDWFjYnB/pQ7zb9JgJ2", - "Jw/JSCUQLxDxSiOKMgd3qYmgcEecoK7NPjH9/CTXJV9VYvGSSH5J+/WEFZghgVMuFKSCZ2o4C+y2bYt5", - "X4O1KLD1Ov1OidaEMAMPHK2vqdKudk4rWV6QPdhMsSFt7VDqJzPy3+vET72xUyMvuapUU1bI6l6QRSs2", - "wmrDXG9hVc8l5sHYtXJnq8luG3kIS8H4daGhIA+tDqw/ZrjI4jDBCXWqWKTqeQhEg4hNgBz7VgF2QxPL", - "ACBMNYiuk0u2OSeo9Kq0KEuz/3RS8brfEJqObetD/VPTts9cLuge5XomQIWKt4P8wmLW1hBbUkUcHKSg", - "Z05nX7jY9z7MZjMmivHUJc8eeljECjg2rcItsGWTdtW+cPu39llnc3T4N8p0g0ywhQpDC44pmr8LtfCq", - "976u4e4TmpjbinagXjWKpv17ekGZTuZCusTkWKU64q3u5D2iTLva6O5WrIUzEbs611aguHGCCnoqDBy2", - "IPjHK4b6/VgVM9V3Qu7kHG/s2FoQszBScc38212z32od8/fnab7Xnu+153vt+V57vtee77Xne+35Xnv+", - "1Nrz54l2JUni5bT3DcceMpHRF6nhf0Fvhe7ycU+j9NcqP14SjIpu9vHGKBgNNJ+6urUYrhCt0mjD6cMa", - "uKmZjnFS5tRoQ7DS/lE3mbWr4PtqgzZRupE1psHTJ+T4h0MXf2ADHrAQf9j2oa/hpfQ6h0cuWrDOZOzD", - "BoFTrG2IUYPU335SH1Fitfk5y4Eog6xvsfkrOIfcqPLW+0nMZaR/PToBmr90yLFSCZT+RmTrDuOY9U8R", - "FW2WaTz+jFMZqcTaZ5QekrXAasyutHDvBnV56/EpffL3CbaNVvHyF/GKqZv4JRY71AsgGNVj7+I1MzT1", - "6CSuiutnFdkEIXJs1oin382rhW4pL7dxsK3RKtz++1JfGHjERzcebtuxL3VEmFbEcdwqMY0WwBMnFpKZ", - "yNau4rYvCt2SsrZa77CQtaVwwdUad9vgoXpkxCxidKVbph4sFLywBWy6ZgtMV1LXYfo8gtMWa90oN6/P", - "HXbw+pHPTeNTu8P1pUYQhvFQSLKQoiof2aRNfI1X4qKkfO3NYEZXLKq8STM5Gd2upK6rKfXkbK8sfqxm", - "t72wBfcVF1bY/t2iBWswWfpCRiqegYyXOllxdcVSvk0h7W3lLXyhn0jR/4ES/30ieiq7oNLa9FfasmeR", - "0tudQtv3D9n+FEfCOynOmbk4RyVsPy6rEQiTrSeDDEQWHg2dtCb+bGjL0/f04qRVDn03mbpKnOJ5Y610", - "CaiQ1VpaJAeMOS+loFlKFb7V4aAvhDz7xBqrXh1F7A4IJuby6ocqmwN8slWxxHF30ifbUfVuQky2o2zF", - "nM+rXTbxp4fuaVQLG/emgD+KKeAbv/kUoVh8r7M5rdUP9+QOYope6BWPSqmpTb87GPEWbAiXtvNWfXe9", - "4dsuvMaF6VwQkJeEkjRn6KAQXGlZpfqUUzSBdioTdtx73rA7rEq99E3iVviIkdwNdcqNUjUntWE0qlLN", - "IeLy+A7Aa2yqWixA6Y4kngOccteKcawJjHNhocfERoKa49pI9IltWdA1mdMcbfi/gRRkZm4RYX4YNCgq", - "zfLc+RPNNETMTznVJAcj9N8wo9CZ4bzNqfaRW76rsTBQwNaWjkriVojv7Vd8deGW7+1GaN6yn5ua3Z+l", - "wFsSq4HuID965XK3Hb3CdDyNJ7EH+525lwrGkyiTmRPfeeS7vEUeGh3PM9CjxifpqH7KjTKtBUFBT/X1", - "2KHrBujtRbs7OlzTIkTHW+DX+iH2bnghEnNlpAvz+4LpZTXDEmv+PfF0Ieq3xdOMQiE4fsumtGRTVUI6", - "PX+8RT+4gbwiEXF1f3L/cYz4IR+Y3VITHjPfd2k/cC7fQqrc33d+3K0hSvfZaO+z0d7nK73PRntP3fts", - "tPe5Wu9ztf5Zc7VONmqILr/J1uyJumfapERCameuBXjYrJVnse+WZHpCyMnSyH9qzgA4B0lzklJlFSNu", - "I+UKtlhqoqo0BcgOTnnSgiQVhZv4YfNfe809rfb3nwLZf9TtY+0WgeTt90VVFT+hq4l8TU5Hp6PeSBIK", - "cQ4u6xo2zyr0FdteW4f9/+pxf5Q90hV0bY0rS1qWYI41Vc3nLGUW5bkwl4GF6MT3cYFfQBrgbKYMwrRN", - "cIv4xLhIF51D3fvzmNLdP9+vUB/rsJvP4D6BzCev7dwn2O3JwI1j9wTivci4C5Hx2YXGHyjX3X1au9/Z", - "gkJHaitv7Q00qbrKWsTu5HUka042shlHgLSSTK/xhKMl++UMzP8/GDmuQJ77w6+S+ehgtNS6PJhOMbP8", - "Uig9HZmjqfmmOh/N+UAXdgR3uJSSnWNWyg+X/y8AAP//hsOm11cPAQA=", + "EWJsHICNfiIcmLwV4d7ki6sAyYGhY4n6sdHDFPwN8YBAG+VkFB9RGkHO+EB8mpcA1AVO1KdYJ3wHhyGM", + "j4kRc+c0N2LOmVKbQQLpFiivD1t6p/dUPhpSajcYAO3xcqU12QPpOqsJNScPdFyt2wDxZoUiRgKF+HIX", + "4BpXQyfqLlMPHOJDuHoYHLrXAqBjj2jyq7j739Z7Wvts7p9kjUgfN68hfYBmjPeH+CdKpQH89c3B9WOY", + "b6UUMjQs9Dz3GETb3Pu9lccnwQkEPfAMY87sTdNwqn3r0I9MxTfbjrUxvABWKUAWiy4w2zAasoyPme37", + "y9hjzvEoCHzfVcpcYfPuumt2Z/EtvDgcaF8T811X94raXdru6ParqkAljp2rRuD1rd19oinIAS85SUsd", + "TM5iPhBzVwM8O499t8AYQx6yubk6PQpiHCQsmNLQWCONiuHN63ftwaT4GFuI+fDqdCnnZn3vhagPXOzo", + "PLLhMu98BedCQzJnUukETbnRJZhG3yk0Enxnmsa1vnYUhc1LwrK4oMdpz2CdZCyv4vzq5v3bKzPt29qu", + "pqrZGaxRtweaLskM8+hEY6s2TG3D7zYu+LVd8Gt6a+vdbTeYpmZiadilPccXsi86omuTOIgwYIw5+lQb", + "ROkGAYla3CvIdex1VaAB2s2ZmYaTTdbk3mbK/Nibbr0BFMMKhx0pupbAALJxFQwDSszd3Ry2QX697ooG", + "9gAtS5atOrZdO+rg3Z9eyYDjXyF3sIDUdYNtwUBgx41FG0vwtmhL0uCqYhMK8XBtk50wc9J5Ox4IhHAq", + "pnw6vD6iDGtjzqZtuDoBmv8N1n83bXE5o8vx6Gam4Biu3YhbcP2uJm8Uz+jjtKbBlsZ3RZTTspTinOaJ", + "M5gPsaYU5441sbm3r9+xqIubZU++PXz9zoF/OR6lOVCZ1KrC4KqwXfnFrMposEIObBCfbsuo+P4CZlXJ", + "gPj1k+fQyH6xBJfaKNBGjRRzzGW3V+NACbaiM7rP46EWW03oztdjl7jB5wNl7fJpDJHW49P28tBzynJv", + "AfTQDoRF4OJ2y+cRlQrhADf2FgVOv+RWxU1vd8d3R8NdW2RSONeG5EuFzS+miODdKDujQqJhEVm1oGvD", + "Qda+0xdOvCoSs/0SlbM0bi3mM2WYg1tfoGlMsPGAMmpGrNiAa5lXLBjLNFM7WC06QAZzRJHpc4YM4W4m", + "XGLYirN/VUBYBlybTxJ3ZWejYjIO5zfoH6dGd+jP5Qa2voZm+JvoGGGOk+6Jh0BsVjBCz2MP3Ff1ldkv", + "tLatmR8C58oVAhjCGXtH4obgA8cfjpttFNiy7UEM87j25Z9hDJvza3sSWX95dWlqBuaIJoVlKplL8RvE", + "73l4PY48RXAToTKFvSeRF11dEVOb6prcts3sg+Qe0m5Ck2I76GKA65HygZsRE3h4WzvlltQ2R2Mr1CfO", + "MGF43tSO3zCMg7kX0pjTixmNZTcxSoaB6bBxaLe8AloQ39nj3jkwzNmFs5PAN163ZfaRXgmyeSXUfxB+", + "TYXBTruzqtBoBsi1oU4wtp7MXInIMBW/oNym+jT97FZyvRVY45fpdSEkPrFVcQdGBikraB7XHDLEfvtJ", + "csYWzCa6rBQEmRTdQDZDsOUil43Shgw0qDmak/1xkBXJUSNj50yxWQ7Y4rFtMaMKJXltiKq7mOUB10uF", + "zZ/s0HxZ8UxCppfKIlYJUit1eL2p3XAz0BcAnOxju8cvyEN0QCp2Do8MFt35PDp4/AIt6PaP/dgB4DLa", + "bpImGYqT/3biJM7H6IG1YxjB7UadRB+M2jTkw4Jrw26yXXfZS9jSybrte6mgnC4gHvlSbIHJ9kVqoiGt", + "gxee2Ry6SkuxJkzH5wdNjXwaCOM14s+CQVJRFEwXzk2lRGH4qUmTaCf1w9mEvC7TkYfLf0Rvb+mdXZ1L", + "5N0aTe35Fls1+uTf0gLaaB0Tat9V56yJw3ACcUKOfHYGTP1UZ3yyuDFzmaWjmoNhGXNSSsY1XiwqPU/+", + "StIllTQ14m8yBG4y++pZJN1VO8MNvxrgd453CQrkeRz1coDtvQ7h+pKHXPCkMBIle9SEzQe7ctAtHQ8A", + "9BK9G/+5eehdlTIzSjLIblWL3WggqW/EeHzDgDdkxXo9V+LHK6/szjmzknH2oJWh0E/vXzstoxAylqun", + "2e5O45CgJYNzjEWME8mMeUNayHwnKtwE+s/refAqZ6CW+b0cuwh8U7E8+3vzDKiTMVBSni6jdv+Z6fhL", + "k7O4XrLdx9HUMEvKOeTR4eyZ+Ys/WyOn/z/FrvMUjO/YtpsJ0C63s7gG8DaYHig/oUEv07mZIMRq+11E", + "HUibL0RGcJ4mD0nDZf3khkFWtH9VoHTsHSZ+sGE8aN8x9wKblKuOVJiQ723NkSWQVpoE1GZZUeX2yT1k", + "C5DO8FiVuaDZmJhxTr49fE3srLaPzQ1vk4ItUJlrr6Jzrw+SFu0WEOozjcZD1ncfZ3MMrVm10pi1RGla", + "lLHXSKbFiW+AT55CWyeqeSF2JuSV1bCV19/sJIYf5kwWRjOtR7MyHnnC/Edrmi5RdW1Jk2GW3z2bnedK", + "FaRprxPJ1nmHcN8ZuF1CO5vPbkyEuV9cMGVLTcA5tB9A1a8B3dXJP4hqL09WnFtOicroTa9Vr4N2D5x1", + "aHtzaBSyDuKvqLgoUckUrprc7xh7RRN5dDMF9vKz24fidTpVX0IopVxwlmIajaC4RQ2yK1uxi69gh4wj", + "XWOU3+Juh0Y2VzQ/YR0b5rA4mLHQC0KHuL6xMvhqiGq5w/6psT7CkmqyAK2cZINs7HNQOnsJ4wpcHims", + "YBLISSFb/heUkFGXXlKbfq/IRvgcYkAB/s58e+uuRxghfMY4KkIObS4Y2Vo0MKu+NtoT02QhQLn1tLMt", + "qJ9NnwlmHMhg9WHis/DjGNZ9YZZtfXX9oQ695855ykzbl6YtsSGk9c+tmFM76WFZukmjoUY1hWNZNAcR", + "HPHAJN4EHiC3Hj8cbQO7bXS543lqGA3O0WEHJZ7DPcaoE5J2Mguf07xyMYUYfWhDXaJPZhmPgPGacWhq", + "REQOiDR6JCBhcL8O9FOppNqqgDvJtBOgOXrpYgJNaWeivelQHQIjSnCNfo5hMja5VAcER92gUdwoX9el", + "KQx3B8rES6yJ4xDZz4yKWpVTojKMIe/kSo0JDiO4fZbh9gHQ3wZ9nch215LanXOVk2jocWAqYvrmtytI", + "K+uEFsqHlJMUX9sH50XUosmUuTwVszwSD/aq/hgkIMZ4/9ka/42lzRpGifMSXzlOybuEseOVFdb2SD11", + "0zBTotgi2R0TKMxvjo5m6utxWNP/VlksF4s2IHec3maTeAlpFBMsV44obweL24oO/g3krrHgg6HeVwii", + "NqfOQGxgkNSH2oPNujeGIgTTwYBWqt0jIU1Jk5GkLxNsivHYCDa8wKY2t3X/oqadoZACG1FgPvd676aS", + "9RRcHHsjQn2sSh+gv/lAOFJS5nx3jbDoY9aFzPaDmHcJpmsI3F2EC0TFQWIr6eV83MwhvUDkIJjepuab", + "7J6j4LB2jKK7BhOrL4C7zOrtEMOdA53mc0g1O98S+P3fRllugorHXp225SiCOHBWB8748pBX1PIbgDbF", + "ZW+EJ0iEcmNwhsI+z2D9QJEWN0RzBY49o17n8StiAJPEJIZFhIo5Huz939mCmao5A7HgHX22OzT5uQaT", + "NAfPGK45l2dJQsOnDRumPBexC8ROc5muV3q9hTEgQ7Hh/TSpw6fXK8xKq+oE+3X9xyCOw9wTuyn8Ltzj", + "WwzTr01e/hkuKP+bf5NjZ7F1RZs00mhgvKAy8y2iGrNXxpOBaKtu/LINE2dxoOf1zKwJy+iH8EZSV2Dw", + "TZoLxfgiGYpgakdC1G6EB8r6e5oHYgjXHKRLH6992dZECx/GsQmOTahwRYaugwQ1mIjRAjf4fPt98z4d", + "83VRW7TX+bLCBRIJBTXQyeAV+fCcm5D90n73Mav+JV8nO1pkXM+vydZn4D4gh6keEkOunxN3Wm6Phb3O", + "VYVxbqtzqNiTcm5QGRqxSimyKrUHdLgxwF/pdk7YsEGURLX8tL/KnsKWYxKT18HLgjNYT63SlC4pb7LJ", + "tLe1zS9p1xC85OtQ+1ZvcXGFNV/YBSxuBc7PeRMaj0oh8mTAanXUfxnf3QNnLD2DjJizw7uyBxI1k4do", + "LKndEhfLtX8JXpbAIXs0IcTcpYpSr72Hop0ZrjM5f6A3zb/CWbPKJqtwl7TJKY9HYdgy2DeUb36YzVJN", + "gRF+N5zKDrLl6flq4FW+pBeRtOW7VlyL+Ay6qaQbprJQxLSUaz5d22l/9y9qEdYPHx1suf+ctW51NvdR", + "x08gJNzy7S4wkF7xdtd/TrHr8nAdKNUqBf117kyAFm4HcL8L4hvTRB+5wxYFPdvFohDP0GK6o0nDIgTT", + "GxEElfz6+FciYe5q8u/t4QR7e2PX9Ncn7c/m9rW3F92Zd2bMaBV2c/PGOObvQ35l6zsdCGHo0KNiebaN", + "MVoBKU0CUgy5+MWF7nyWFKi/2Ctyf6u6bJBXMaN2iYCIiay1NXkwVRBqskOUiesWiSnBwyatJNNrfFHk", + "b1Tsl+hL7e9rI4yrFlrHoLsQaFt53kVENSabplj498LW+yvMWY9GbI01Gr5d0aLMwW2Urx/M/gJP//os", + "23/6+C+zv+4/30/h2fMX+/v0xTP6+MXTx/Dkr8+f7cPj+VcvZk+yJ8+ezJ49efbV8xfp02ePZ8++evGX", + "B75StwW0qYL9D8wTnBy+O0pODLANTmjJ6tIsho19zlGa4k40d5J8dOB/+v/9DpukomiG97+OXHjcaKl1", + "qQ6m04uLi0nYZbrAO1qiRZUup36efkmMd0d16I59coEUtVEZhhWQqI4VDvHb+2+PT8jhu6NJwzCjg9H+", + "ZH/yGFN7l8BpyUYHo6f4E+6eJdJ96phtdPDxcjyaLoHmmO/d/FGAliz1n9QFXSxATlzyVfPT+ZOp9/xP", + "P7r76aUZdRF7a2WDkCIljJvn/s7Whf4kG2TUyu6lXLKpcZ3zzamPPMPYEHvlM6KtRtZR1qQECbK4+IdR", + "9qX4wc+RXNhztqhkp5hUbc13aSGZIv91/ONbIiR5Y23u72h6FsZfxKqyO1EWK8ruojQKtSjbLs3G0h8r", + "OxNL7oozGzoHnFqbihpJpGUFISSNXDWycj958eHj879ejnYABO2WrmjvrzTPf7XVvmCFxh//hMw9ERhH", + "clGhUjduTA/YoSHTGH2y9dcw6Wjdph0J9CsXHH4dIoMDLEoHmuemoeAQo8GHTvX7J/v7n6DM9rg1imeJ", + "z1qv+9ntL7TtSLutVXdH7aHgG5phQkhQ2i7s8a0t7JZXtHUpRxwdCUb+E3u+XY5Hz2+RUne/ICOBaE6w", + "ZfAaqn+m/MTPuLjgvqXRbaqioHKNmkuQuzbUUS8Hz65pmGFv+rFlZs4+5cn2QA3Jw15WUvugFxPjYOEy", + "WDGlH9W2eptdPOxw9GroQAxu1Pdn4yc9Gw/bJGm9/o4B02K8jTD1vEM3PZz6sUmd3OjXyj0eJIy7Ruac", + "T5qatXMxGywbuYPYu8fdUMnNARUkgLfWRtq5+sJtY6NmMLtqT9R2xeTRq1vXWO76HHxDc0MIo+z6936y", + "K9nvdZc/k+7SP+U3azOYdXP60aeI+NQaTHjDsxuyucJt1Vhc8o1BXQWTbNxrKZ9aS+lnp4mB0eQc+Xya", + "CcKwbNLXXKXIRisv7ZXS7HyhqsifGFmDuoeBdEjrwG2wVd9wMusPqml4iXyvY/yZdQwb/bVBy2jlbnKh", + "gsOKBgTVt4NSJq1Qpdna8+GYKCzyb34qJROS6fWYME4yMFIJfUxC4jPVpo63C0sBjv99c/gPDFZ8c/gP", + "8jXZH9fKC77iiUxvw0HaSsj3oCN15r9ZH9bn8UZl5Hdzwp/USBqoA6+FT7+ESCvo6ushlK2sJyqmHxV0", + "NdqoCoy/HHXtplpL5/1dn4tcJU1bR97VfWkH4SgCK5rqfE2osio0RotihXGfO6lTE71boD/2QmXDjL6s", + "ROyd0VXjgCKPnHvF8QdqBg9xqctRhjVctmsGPWREIbiemnVP3S+Wun29kJTC7GmGj+ib88SfVS0gm3z0", + "DtyBEMcJ+R9RYXiErZ0FsQSQOAOGg/o5XYx2kME1x8plNXb29roL39tzNGeKzOECJSjl2LCLjr29P4DK", + "uqrz7lHCBU84lnY6BxLEVN3rrb9rvfX5/tMvdjXHIM9ZCuQEilJIKlm+Jj/xOlHJzdTyWuZUPEgds1H+", + "9GKrGy06UN9v5N9s257HhOlGM2w9tQnu8HUFPpekatxkfTdXaEww4Z84q7HPfo6hYtYJaukx7uVGn8SU", + "9MCf8M0ajYlb9fIvxC23c6KjyLkWp82nPgGiMRfv7ybmYjdh+mz/2d1BEFLhrdDkO7RXfWKR/kltB3G2", + "CoTNld0P3uTUFi3u6dpGoWJ26Nglp8RsiWtSPy0x8sQKQpuevi81zAy7yovfsYF8hyq7Eb7sovdeLtzL", + "hRvJhS5DNRIBH2ir6Ue01YfioLclvzEt/0A+vsDhIUXhPR6CzEGnS/twvfuQIiJWfL60YZmyKav4LTvg", + "EOhIVlVci3ssgNmud3xChh1/sLH7l+NRCjLCfD/6DCrmM5vjQ8A6F55Pno8ZZJnPJ1unknUJt5nyUcou", + "TwoxVLwSlC+byfsPOxAtt+G0u0fw1RDcE2rfusy+dnu5RXzpho/gtCQJeYvqEG5wnwruj2j2+JQn8qde", + "0FvBwca8GI3V8uK9C7JWF7D+BiLFv5u3jkdX0jOuOrSdjh/1imWX0zqxy5BS8Q4bbFEqmpOaNVUP2+YV", + "WpZApbr2Ib3dHXbSmfHoVRgo0cpDU2egiYBi8HJFT+J/7OJG/ON669on8JKqZfxFMBJoXWLaftOKzCtu", + "SVVXGMKoGevJMCQa1+ZqIw/E/OCU7xFVFdgb/7+kzx8/+eXJ869G43rFroHBRvP5Q+TFKstW0WQNsPI5", + "Z0J+cjZD3FQPFCnpejDHy0C6pDcgz3Jf2rntHCEFmINILVn5OUpVs1m8WssPBtFiTuocykf8m1runINk", + "cyw5VO+nO87BIQEyKPVy4+N3WzGp1MuGqOBq+jHlkoyUUpwDHxM2gUnXiZQtmnSkOdB5naRCiF1irOr9", + "YPnNM0eA9XAhu6ho72L8gw/PXDKvuzZGNKFQ9hDwyJMdefxZLRX6s1gq3gqeoB4DXHuduoWWz2e1wLwi", + "48AwWGel50KjQVBIVL9CsaUmOykuMOikaclAGyc4yMZOjUmpTpdVOf2I/8E33pfNa2pbgmFqDZibNJlj", + "2+JWQ1PsmES2pY1PK+CMqmJO3rBUikPMP+OOEbVWGop+gT7b9ZdNyf2jR47gOeOQFILHMhL8iF/f4Mdo", + "hht0dw90xsCDob7dsiot+DtgtefZRdTdFL+T34dx9EaKfme1Eso6vA/jIJD/m93SSjHabJPWz9OP7eL4", + "1s/gWqplpTNxEfS1GQQ27i3b4lb31luRgR23nbQjFnfJRQYu0UF/S9VSI66Sevw27TrKQUqrxVLbAnPR", + "6pV1x4SmdivYLJ1qW1pD28qn7zoHQnMJNFuTGQAnYmYW3U4PS6iqK4Yic1jZGM/O18BVSpGCUpAlYWWZ", + "TaDV6SNQ89Eb8ISAI8D1LEQJMqfymsBaIbEZ0G5JtRrc2sLm5EAf6t2m30TA7uQhGakE4gUiXmlEUebg", + "LjURFO6IE9S12Semn5/kuuSrSixeEskvab+esAIzJHDKhYJU8EwNZ4Hdtm0x72uwFgW2XqffKdGaEGbg", + "gaP1NVXa1c5pJcsLsgebKTakrR1K/WRG/nud+Kk3dmrkJVeVasoKWd0LsmjFRlhtmOstrOq5xDwYu1bu", + "bDXZbSMPYSkYvy40FOSh1YH1xwwXWRwmOKFOFYtUPQ+BaBCxCZBj3yrAbmhiGQCEqQbRdXLJNucElV6V", + "FmVp9p9OKl73G0LTsW19qH9q2vaZywXdo1zPBKhQ8XaQX1jM2hpiS6qIg4MU9Mzp7AsX+96H2WzGRDGe", + "uuTZQw+LWAHHplW4BbZs0q7aF27/1j7rbI4O/0aZbpAJtlBhaMExRfN3oRZe9d7XNdx9QhNzW9EO1KtG", + "0bR/Ty8o08lcSJeYHKtUR7zVnbxHlGlXG93dirVwJmJX59oKFDdOUEFPhYHDFgT/eMVQvx+rYqb6Tsid", + "nOONHVsLYhZGKq6Zf7tr9lutY/7+PM332vO99nyvPd9rz/fa8732fK8932vPn1p7/jzRriRJvJz2vuHY", + "QyYy+iI1/C/ordBdPu5plP5a5cdLglHRzT7eGAWjgeZTV7cWwxWiVRptOH1YAzc10zFOypwabQhW2j/q", + "JrN2FXxfbdAmSjeyxjR4+oQc/3Do4g9swAMW4g/bPvQ1vJRe5/DIRQvWmYx92CBwirUNMWqQ+ttP6iNK", + "rDY/ZzkQZZD1LTZ/BeeQG1Xeej+JuYz0r0cnQPOXDjlWKoHS34hs3WEcs/4poqLNMo3Hn3EqI5VY+4zS", + "Q7IWWI3ZlRbu3aAubz0+pU/+PsG20Spe/iJeMXUTv8Rih3oBBKN67F28ZoamHp3EVXH9rCKbIESOzRrx", + "9Lt5tdAt5eU2DrY1WoXbf1/qCwOP+OjGw2079qWOCNOKOI5bJabRAnjixEIyE9naVdz2RaFbUtZW6x0W", + "srYULrha424bPFSPjJhFjK50y9SDhYIXtoBN12yB6UrqOkyfR3DaYq0b5eb1ucMOXj/yuWl8ane4vtQI", + "wjAeCkkWUlTlI5u0ia/xSlyUlK+9GczoikWVN2kmJ6PbldR1NaWenO2VxY/V7LYXtuC+4sIK279btGAN", + "JktfyEjFM5DxUicrrq5YyrcppL2tvIUv9BMp+j9Q4r9PRE9lF1Ram/5KW/YsUnq7U2j7/iHbn+JIeCfF", + "OTMX56iE7cdlNQJhsvVkkIHIwqOhk9bEnw1tefqeXpy0yqHvJlNXiVM8b6yVLgEVslpLi+SAMeelFDRL", + "qcK3Ohz0hZBnn1hj1aujiN0BwcRcXv1QZXOAT7YqljjuTvpkO6reTYjJdpStmPN5tcsm/vTQPY1qYePe", + "FPBHMQV84zefIhSL73U2p7X64Z7cQUzRC73iUSk1tel3ByPegg3h0nbequ+uN3zbhde4MJ0LAvKSUJLm", + "DB0Ugistq1Sfcoom0E5lwo57zxt2h1Wpl75J3AofMZK7oU65UarmpDaMRlWqOURcHt8BeI1NVYsFKN2R", + "xHOAU+5aMY41gXEuLPSY2EhQc1wbiT6xLQu6JnOaow3/N5CCzMwtIswPgwZFpVmeO3+imYaI+SmnmuRg", + "hP4bZhQ6M5y3OdU+cst3NRYGCtja0lFJ3Arxvf2Kry7c8r3dCM1b9nNTs/uzFHhLYjXQHeRHr1zutqNX", + "mI6n8ST2YL8z91LBeBJlMnPiO498l7fIQ6PjeQZ61PgkHdVPuVGmtSAo6Km+Hjt03QC9vWh3R4drWoTo", + "eAv8Wj/E3g0vRGKujHRhfl8wvaxmWGLNvyeeLkT9tniaUSgEx2/ZlJZsqkpIp+ePt+gHN5BXJCKu7k/u", + "P44RP+QDs1tqwmPm+y7tB87lW0iV+/vOj7s1ROk+G+19Ntr7fKX32WjvqXufjfY+V+t9rtY/a67WyUYN", + "0eU32Zo9UfdMm5RISO3MtQAPm7XyLPbdkkxPCDlZGvlPzRkA5yBpTlKqrGLEbaRcwRZLTVSVpgDZwSlP", + "WpCkonATP2z+a6+5p9X+/lMg+4+6fazdIpC8/b6oquIndDWRr8np6HTUG0lCIc7BZV3D5lmFvmLba+uw", + "/1897o+yR7qCrq1xZUnLEsyxpqr5nKXMojwX5jKwEJ34Pi7wC0gDnM2UQZi2CW4RnxgX6aJzqHt/HlO6", + "++f7FepjHXbzGdwnkPnktZ37BLs9Gbhx7J5AvBcZdyEyPrvQ+APlurtPa/c7W1DoSG3lrb2BJlVXWYvY", + "nbyOZM3JRjbjCJBWkuk1nnC0ZL+cgfn/ByPHFchzf/hVMh8djJZalwfTKWaWXwqlpyNzNDXfVOejOR/o", + "wo7gDpdSsnPMSvnh8v8FAAD//wv9yovcDwEA", } // GetSwagger returns the Swagger specification corresponding to the generated code diff --git a/daemon/algod/api/server/v2/generated/types.go b/daemon/algod/api/server/v2/generated/types.go index 07bd113be..f367f85ea 100644 --- a/daemon/algod/api/server/v2/generated/types.go +++ b/daemon/algod/api/server/v2/generated/types.go @@ -81,11 +81,11 @@ type Account struct { // * NotParticipating - indicates that the associated account is neither a delegator nor a delegate. Status string `json:"status"` - // The count of all application local data (AppLocalState objects) stored in this account. - TotalAppsLocalState uint64 `json:"total-apps-local-state"` + // The count of all applications that have been opted in, equivalent to the count of application local data (AppLocalState objects) stored in this account. + TotalAppsOptedIn uint64 `json:"total-apps-opted-in"` - // The count of all assets (AssetHolding objects) held by this account. - TotalAssets uint64 `json:"total-assets"` + // The count of all assets that have been opted in, equivalent to the count of AssetHolding objects held by this account. + TotalAssetsOptedIn uint64 `json:"total-assets-opted-in"` // The count of all apps (AppParams objects) created by this account. TotalCreatedApps uint64 `json:"total-created-apps"` @@ -96,13 +96,13 @@ type Account struct { // AccountErrorResponse defines model for AccountErrorResponse. type AccountErrorResponse struct { - Data *string `json:"data,omitempty"` - MaxResults *uint64 `json:"max-results,omitempty"` - Message string `json:"message"` - TotalAppsLocalState *uint64 `json:"total-apps-local-state,omitempty"` - TotalAssets *uint64 `json:"total-assets,omitempty"` - TotalCreatedApps *uint64 `json:"total-created-apps,omitempty"` - TotalCreatedAssets *uint64 `json:"total-created-assets,omitempty"` + Data *string `json:"data,omitempty"` + MaxResults *uint64 `json:"max-results,omitempty"` + Message string `json:"message"` + TotalAppsOptedIn *uint64 `json:"total-apps-opted-in,omitempty"` + TotalAssetsOptedIn *uint64 `json:"total-assets-opted-in,omitempty"` + TotalCreatedApps *uint64 `json:"total-created-apps,omitempty"` + TotalCreatedAssets *uint64 `json:"total-created-assets,omitempty"` } // AccountParticipation defines model for AccountParticipation. diff --git a/daemon/algod/api/server/v2/handlers.go b/daemon/algod/api/server/v2/handlers.go index ccf7b1f85..c81e8ba8e 100644 --- a/daemon/algod/api/server/v2/handlers.go +++ b/daemon/algod/api/server/v2/handlers.go @@ -305,12 +305,12 @@ func (v2 *Handlers) AccountInformation(ctx echo.Context, address string, params if totalResults > maxResults { v2.Log.Info("MaxAccountAPIResults limit %d exceeded, total results %d", maxResults, totalResults) return ctx.JSON(http.StatusBadRequest, generated.AccountErrorResponse{ - Message: "Result limit exceeded", - MaxResults: &maxResults, - TotalAssets: &record.TotalAssets, - TotalCreatedAssets: &record.TotalAppLocalStates, - TotalAppsLocalState: &record.TotalAppLocalStates, - TotalCreatedApps: &record.TotalAppParams, + Message: "Result limit exceeded", + MaxResults: &maxResults, + TotalAssetsOptedIn: &record.TotalAssets, + TotalCreatedAssets: &record.TotalAppLocalStates, + TotalAppsOptedIn: &record.TotalAppLocalStates, + TotalCreatedApps: &record.TotalAppParams, }) } } @@ -397,9 +397,9 @@ func (v2 *Handlers) basicAccountInformation(ctx echo.Context, addr basics.Addres Participation: apiParticipation, TotalCreatedAssets: record.TotalAssetParams, TotalCreatedApps: record.TotalAppParams, - TotalAssets: record.TotalAssets, + TotalAssetsOptedIn: record.TotalAssets, AuthAddr: addrOrNil(record.AuthAddr), - TotalAppsLocalState: record.TotalAppLocalStates, + TotalAppsOptedIn: record.TotalAppLocalStates, AppsTotalSchema: &generated.ApplicationStateSchema{ NumByteSlice: record.TotalAppSchema.NumByteSlice, NumUint: record.TotalAppSchema.NumUint, diff --git a/daemon/algod/api/server/v2/test/handlers_resources_test.go b/daemon/algod/api/server/v2/test/handlers_resources_test.go index c8bdf0362..44d7f2403 100644 --- a/daemon/algod/api/server/v2/test/handlers_resources_test.go +++ b/daemon/algod/api/server/v2/test/handlers_resources_test.go @@ -149,7 +149,7 @@ func accountInformationResourceLimitsTest(t *testing.T, acctSize, maxResults int require.NoError(t, err) // totals should be present in both 200 and 400 - require.Equal(t, float64(acctSize), ret["total-apps-local-state"].(float64)+ret["total-assets"].(float64)+ret["total-created-apps"].(float64)+ret["total-created-assets"].(float64)) + require.Equal(t, float64(acctSize), ret["total-apps-opted-in"].(float64)+ret["total-assets-opted-in"].(float64)+ret["total-created-apps"].(float64)+ret["total-created-assets"].(float64)) // check totals switch rec.Code { |