Merge pull request #76 from algorandfoundation/refactor/voter-params

refactor: accept Account or uint64 as parameter to VoterParams functions
algorandfoundation · Jan 13, 2025 · e816012 · e816012
2 parents aff7644 + 6f39186
commit e816012
Show file tree

Hide file tree

Showing 40 changed files with 42 additions and 42 deletions.
diff --git a/langspec.puya.json b/langspec.puya.json
@@ -6307,7 +6307,7 @@
       "stack_inputs": [
         {
           "name": "A",
-          "stack_type": "any",
+          "stack_type": "address_or_index",
           "doc": null
         }
       ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/algo-ts/package.json b/packages/algo-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorandfoundation/algorand-typescript",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "This package contains definitions for the types which comprise Algorand TypeScript which can be compiled to run on the Algorand Virtual Machine using the Puya compiler.",
   "private": false,
   "main": "index.js",

diff --git a/packages/algo-ts/src/op-types.ts b/packages/algo-ts/src/op-types.ts
@@ -3009,13 +3009,13 @@ export type VoterParamsType = {
    * Online stake in microalgos
    * Min AVM version: 6
    */
-  voterBalance(a: uint64 | bytes): readonly [uint64, boolean]
+  voterBalance(a: Account | uint64): readonly [uint64, boolean]
 
   /**
    * Had this account opted into block payouts
    * Min AVM version: 11
    */
-  voterIncentiveEligible(a: uint64 | bytes): readonly [boolean, boolean]
+  voterIncentiveEligible(a: Account | uint64): readonly [boolean, boolean]
 }
 
 /**

diff --git a/src/awst_build/op-metadata.ts b/src/awst_build/op-metadata.ts
@@ -4901,7 +4901,7 @@ export const OP_METADATA: Record<string, IntrinsicOpMapping | IntrinsicOpGroupin
           {
             argNames: ['a'],
             immediateArgs: ['VoterBalance'],
-            stackArgs: [{ name: 'a', ptypes: [ptypes.uint64PType, ptypes.bytesPType] }],
+            stackArgs: [{ name: 'a', ptypes: [ptypes.accountPType, ptypes.uint64PType] }],
             returnType: new ptypes.TuplePType({ items: [ptypes.uint64PType, ptypes.boolPType] }),
           },
         ],
@@ -4913,7 +4913,7 @@ export const OP_METADATA: Record<string, IntrinsicOpMapping | IntrinsicOpGroupin
           {
             argNames: ['a'],
             immediateArgs: ['VoterIncentiveEligible'],
-            stackArgs: [{ name: 'a', ptypes: [ptypes.uint64PType, ptypes.bytesPType] }],
+            stackArgs: [{ name: 'a', ptypes: [ptypes.accountPType, ptypes.uint64PType] }],
             returnType: new ptypes.TuplePType({ items: [ptypes.boolPType, ptypes.boolPType] }),
           },
         ],

diff --git a/src/cli.ts b/src/cli.ts
@@ -93,7 +93,7 @@ function cli() {
         .choices(['0', '1', '2'])
         .default(defaultPuyaOptions.optimizationLevel),
     )
-    .addOption(new Option('--target-avm-version [version]', '').choices(['10']).default(10))
+    .addOption(new Option('--target-avm-version [version]', '').choices(['10', '11']).default(10))
     .addOption(
       new Option(
         '--cli-template-definitions <...definitions>',

diff --git a/tests/approvals/out/abi-decorators/AbiDecorators.arc56.json b/tests/approvals/out/abi-decorators/AbiDecorators.arc56.json
@@ -193,7 +193,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/abi-decorators/BaseAbi.arc56.json b/tests/approvals/out/abi-decorators/BaseAbi.arc56.json
@@ -93,7 +93,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/abi-decorators/OverloadedMethods.arc56.json b/tests/approvals/out/abi-decorators/OverloadedMethods.arc56.json
@@ -125,7 +125,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/abi-decorators/SubAbi.arc56.json b/tests/approvals/out/abi-decorators/SubAbi.arc56.json
@@ -93,7 +93,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/abi-decorators/SubAbi2.arc56.json b/tests/approvals/out/abi-decorators/SubAbi2.arc56.json
@@ -93,7 +93,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/accounts/AccountsContract.arc56.json b/tests/approvals/out/accounts/AccountsContract.arc56.json
@@ -351,7 +351,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/arc-28-events/EventEmitter.arc56.json b/tests/approvals/out/arc-28-events/EventEmitter.arc56.json
@@ -237,7 +237,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/arc4-encode-decode/Arc4EncodeDecode.arc56.json b/tests/approvals/out/arc4-encode-decode/Arc4EncodeDecode.arc56.json
@@ -205,7 +205,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/arc4-struct/StructDemo.arc56.json b/tests/approvals/out/arc4-struct/StructDemo.arc56.json
@@ -198,7 +198,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/assert-match/AssertMatchContract.arc56.json b/tests/approvals/out/assert-match/AssertMatchContract.arc56.json
@@ -110,7 +110,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/avm11/AVM11Contract.arc56.json b/tests/approvals/out/avm11/AVM11Contract.arc56.json
@@ -171,7 +171,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/box-enum-contract/BoxContract.arc56.json b/tests/approvals/out/box-enum-contract/BoxContract.arc56.json
@@ -131,7 +131,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/byte-expressions/DemoContract.arc56.json b/tests/approvals/out/byte-expressions/DemoContract.arc56.json
@@ -117,7 +117,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/BaseWithAbiCreate.arc56.json b/tests/approvals/out/implicit-create/BaseWithAbiCreate.arc56.json
@@ -85,7 +85,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/BaseWithBareCreate.arc56.json b/tests/approvals/out/implicit-create/BaseWithBareCreate.arc56.json
@@ -64,7 +64,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/ExplicitAbiCreateFromBase.arc56.json b/tests/approvals/out/implicit-create/ExplicitAbiCreateFromBase.arc56.json
@@ -85,7 +85,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/ExplicitBareCreateFromBase.arc56.json b/tests/approvals/out/implicit-create/ExplicitBareCreateFromBase.arc56.json
@@ -64,7 +64,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/NoBare.arc56.json b/tests/approvals/out/implicit-create/NoBare.arc56.json
@@ -93,7 +93,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/implicit-create/NoNoOp.arc56.json b/tests/approvals/out/implicit-create/NoNoOp.arc56.json
@@ -72,7 +72,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/inheritance-b/ConcreteArc4Contract.arc56.json b/tests/approvals/out/inheritance-b/ConcreteArc4Contract.arc56.json
@@ -126,7 +126,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/jsdoc/JSDocDemo.arc56.json b/tests/approvals/out/jsdoc/JSDocDemo.arc56.json
@@ -160,7 +160,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/local-state/LocalStateDemo.arc56.json b/tests/approvals/out/local-state/LocalStateDemo.arc56.json
@@ -235,7 +235,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/named-types/MyContract.arc56.json b/tests/approvals/out/named-types/MyContract.arc56.json
@@ -225,7 +225,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/precompiled-apps/Hello.arc56.json b/tests/approvals/out/precompiled-apps/Hello.arc56.json
@@ -176,7 +176,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/precompiled-apps/HelloTemplate.arc56.json b/tests/approvals/out/precompiled-apps/HelloTemplate.arc56.json
@@ -171,7 +171,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/precompiled-apps/HelloTemplateCustomPrefix.arc56.json b/tests/approvals/out/precompiled-apps/HelloTemplateCustomPrefix.arc56.json
@@ -171,7 +171,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/precompiled-apps/LargeProgram.arc56.json b/tests/approvals/out/precompiled-apps/LargeProgram.arc56.json
@@ -116,7 +116,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/precompiled-factory/HelloFactory.arc56.json b/tests/approvals/out/precompiled-factory/HelloFactory.arc56.json
@@ -156,7 +156,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/prefix-postfix-operators/DemoContract.arc56.json b/tests/approvals/out/prefix-postfix-operators/DemoContract.arc56.json
@@ -113,7 +113,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/state-totals/BaseWithState.arc56.json b/tests/approvals/out/state-totals/BaseWithState.arc56.json
@@ -115,7 +115,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/state-totals/ExtendsSubWithTotals.arc56.json b/tests/approvals/out/state-totals/ExtendsSubWithTotals.arc56.json
@@ -120,7 +120,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/state-totals/SubClassWithExplicitTotals.arc56.json b/tests/approvals/out/state-totals/SubClassWithExplicitTotals.arc56.json
@@ -115,7 +115,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/state-totals/SubClassWithState.arc56.json b/tests/approvals/out/state-totals/SubClassWithState.arc56.json
@@ -125,7 +125,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },

diff --git a/tests/approvals/out/strings/StringContract.arc56.json b/tests/approvals/out/strings/StringContract.arc56.json
@@ -125,7 +125,7 @@
         "compiler": "puya",
         "compilerVersion": {
             "major": 4,
-            "minor": 0,
+            "minor": 1,
             "patch": 0
         }
     },