refactor: use impl pattern for Account, Application, Asset, and log functions

package.json

@@ -63,8 +63,8 @@
     "tslib": "^2.6.2"
   },
   "dependencies": {
-    "@algorandfoundation/algorand-typescript": "^0.0.1-alpha.24",
-    "@algorandfoundation/puya-ts": "^1.0.0-alpha.36",
+    "@algorandfoundation/algorand-typescript": "^1.0.0-beta.4",
+    "@algorandfoundation/puya-ts": "^1.0.0-beta.6",
     "elliptic": "^6.5.7",
     "js-sha256": "^0.11.0",
     "js-sha3": "^0.9.3",

src/abi-metadata.ts

@@ -1,6 +1,6 @@
 import { BaseContract, Contract } from '@algorandfoundation/algorand-typescript'
 import { AbiMethodConfig, BareMethodConfig, CreateOptions, OnCompleteActionStr } from '@algorandfoundation/algorand-typescript/arc4'
-import { sha512_256 as js_sha512_256 } from 'js-sha512'
+import js_sha512 from 'js-sha512'
 import { TypeInfo } from './encoders'
 import { getArc4TypeName as getArc4TypeNameForARC4Encoded } from './impl/encoded-types'
 import { DeliberateAny } from './typescript-helpers'
@@ -79,7 +79,7 @@ export const getArc4Signature = (metadata: AbiMetadata): string => {
 }
 
 export const getArc4Selector = (metadata: AbiMetadata): Uint8Array => {
-  const hash = js_sha512_256.array(getArc4Signature(metadata))
+  const hash = js_sha512.sha512_256.array(getArc4Signature(metadata))
   return new Uint8Array(hash.slice(0, 4))
 }
 

src/context-helpers/internal-context.ts

@@ -1,7 +1,6 @@
 import { Account, BaseContract, internal } from '@algorandfoundation/algorand-typescript'
-import { AccountData } from '../impl/account'
-import { ApplicationData } from '../impl/application'
-import { AssetData } from '../impl/asset'
+import { AccountData, ApplicationData, AssetData } from '../impl/reference'
+import { VoterData } from '../impl/voter-params'
 import { TransactionGroup } from '../subcontexts/transaction-context'
 import { TestExecutionContext } from '../test-execution-context'
 
@@ -12,7 +11,7 @@
  */
 class InternalContext {
   get value() {
     return internal.ctxMgr.instance as TestExecutionContext
   }
 
   get defaultSender() {
@@ -69,6 +68,14 @@
     }
     return data
   }
+
+  getVoterData(account: Account): VoterData {
+    const data = this.ledger.voterDataMap.get(account)
+    if (!data) {
+      throw internal.errors.internalError('Unknown voter, check correct testing context is active')
+    }
+    return data
+  }
 }
 
 export const lazyContext = new InternalContext()

src/encoders.ts

@@ -1,10 +1,8 @@
 import { biguint, BigUint, bytes, internal, TransactionType, uint64, Uint64 } from '@algorandfoundation/algorand-typescript'
 import { ARC4Encoded, OnCompleteAction } from '@algorandfoundation/algorand-typescript/arc4'
-import { AccountCls } from './impl/account'
-import { ApplicationCls } from './impl/application'
-import { AssetCls } from './impl/asset'
 import { BytesBackedCls, Uint64BackedCls } from './impl/base'
 import { arc4Encoders, encodeArc4Impl, getArc4Encoder } from './impl/encoded-types'
+import { AccountCls, ApplicationCls, AssetCls } from './impl/reference'
 import { DeliberateAny } from './typescript-helpers'
 import { asBytes, asMaybeBigUintCls, asMaybeBytesCls, asMaybeUint64Cls, asUint64Cls, asUint8Array, nameOfType } from './util'
 

src/impl/acct-params.ts

@@ -2,6 +2,7 @@ import { Account, Application, gtxn, internal, uint64 } from '@algorandfoundatio
 import { lazyContext } from '../context-helpers/internal-context'
 import { asMaybeUint64Cls } from '../util'
 import { getApp } from './app-params'
+import { Global } from './global'
 
 export const getAccount = (acct: Account | internal.primitives.StubUint64Compat): Account => {
   const acctId = asMaybeUint64Cls(acct)
@@ -84,14 +85,19 @@ export const AcctParams: internal.opTypes.AcctParamsType = {
     const acct = getAccount(a)
     return [acct.totalBoxBytes, acct.balance !== 0]
   },
-  // TODO: implement v11 methods
-  acctIncentiveEligible: function (_a: Account | uint64): readonly [boolean, boolean] {
-    throw new Error('Function not implemented.')
+  acctIncentiveEligible: function (a: Account | internal.primitives.StubUint64Compat): readonly [boolean, boolean] {
+    const acct = getAccount(a)
+    const accountData = lazyContext.ledger.accountDataMap.get(acct)
+    return [accountData?.incentiveEligible ?? false, acct.balance !== 0]
   },
-  acctLastProposed: function (_a: Account | uint64): readonly [uint64, boolean] {
-    throw new Error('Function not implemented.')
+  acctLastProposed: function (a: Account | internal.primitives.StubUint64Compat): readonly [uint64, boolean] {
+    const acct = getAccount(a)
+    const accountData = lazyContext.ledger.accountDataMap.get(acct)
+    return [accountData?.lastProposed ?? Global.round, acct.balance !== 0]
   },
-  acctLastHeartbeat: function (_a: Account | uint64): readonly [uint64, boolean] {
-    throw new Error('Function not implemented.')
+  acctLastHeartbeat: function (a: Account | internal.primitives.StubUint64Compat): readonly [uint64, boolean] {
+    const acct = getAccount(a)
+    const accountData = lazyContext.ledger.accountDataMap.get(acct)
+    return [accountData?.lastHeartbeat ?? Global.round, acct.balance !== 0]
   },
 }

src/impl/app-params.ts

@@ -1,6 +1,7 @@
 import { Account, Application, Bytes, bytes, gtxn, internal, Uint64, uint64 } from '@algorandfoundation/algorand-typescript'
 import { lazyContext } from '../context-helpers/internal-context'
 import { asMaybeUint64Cls, asUint64 } from '../util'
+import { AccountImpl } from './reference'
 
 const resolveAppIndex = (appIdOrIndex: internal.primitives.StubUint64Compat): uint64 => {
   const input = asUint64(appIdOrIndex)
@@ -54,10 +55,10 @@ export const AppParams: internal.opTypes.AppParamsType = {
   },
   appCreator(a: Application | internal.primitives.StubUint64Compat): readonly [Account, boolean] {
     const app = getApp(a)
-    return app === undefined ? [Account(), false] : [app.creator, true]
+    return app === undefined ? [AccountImpl(), false] : [app.creator, true]
   },
   appAddress(a: Application | internal.primitives.StubUint64Compat): readonly [Account, boolean] {
     const app = getApp(a)
-    return app === undefined ? [Account(), false] : [app.address, true]
+    return app === undefined ? [AccountImpl(), false] : [app.address, true]
   },
 }

src/impl/asset-holding.ts

@@ -1,8 +1,8 @@
 import { Account, Asset, internal, Uint64, uint64 } from '@algorandfoundation/algorand-typescript'
 import { lazyContext } from '../context-helpers/internal-context'
-import { AssetHolding as AssetHoldingData } from './account'
 import { getAccount } from './acct-params'
 import { getAsset } from './asset-params'
+import { AssetHolding as AssetHoldingData } from './reference'
 
 const getAssetHolding = (
   acctOrIndex: Account | internal.primitives.StubUint64Compat,