Merge pull request #3 from algorandfoundation/fixes

Fixes

Author: tristanmenzel

.github/workflows/release.yml

@@ -52,14 +52,17 @@ jobs:
         with:
           path: artifacts
 
+      - name: Install @algorandfoundation/algorand-typescript-testing dependencies and patch for bundling
+        run: npm i --include=prod && npx patch-package --patch-dir ../../patches
+        working-directory: artifacts/algo-ts-testing
+
       - name: Generate semantic version for @algorandfoundation/algorand-typescript-testing
         run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish @algorandfoundation/algorand-typescript-testing
         uses: JS-DevTools/npm-publish@v3
-        id: publish-puya-ts
         with:
           token: ${{ secrets.NPM_TOKEN }}
           package: artifacts/algo-ts-testing/package.json

.gitignore

@@ -62,3 +62,6 @@ out/
 .env.test.local
 .env.production.local
 .env.local
+
+
+examples/debug-out/

.idea/algorand-typescript-testing.iml

@@ -10,7 +10,7 @@ const config: TsToolkitConfig = {
     exports: {
       '.': 'index.ts',
       './runtime-helpers': 'runtime-helpers.ts',
-      './test-transformer/index': 'test-transformer.ts',
+      './test-transformer': 'test-transformer/index.ts',
     },
   },
 }

.tstoolkitrc.ts

@@ -1,5 +1,4 @@
-import type { uint64 } from '@algorandfoundation/algorand-typescript'
-import { assert, Bytes, Contract, err, log, op, Txn, Uint64 } from '@algorandfoundation/algorand-typescript'
+import { assert, BaseContract, Bytes, err, log, op, Txn, uint64, Uint64 } from '@algorandfoundation/algorand-typescript'
 
 const ADD = Uint64(1)
 const SUB = Uint64(2)
@@ -13,7 +12,7 @@ function itoa(i: uint64): string {
   }
   return itoa(i / radix).concat(digits.at(i % radix).toString())
 }
-export default class MyContract extends Contract {
+export default class MyContract extends BaseContract {
   public approvalProgram(): boolean {
     const numArgs = Txn.numAppArgs
     let a: uint64, b: uint64, action: uint64

examples/calculator/contract.algo.ts

@@ -38,8 +38,8 @@ describe('Calculator', () => {
 
       const [left, right, outcome] = ctx.exportLogs(application.id, 'i', 'i', 's')
 
-      expect(left).toBe(2n)
-      expect(right).toBe(3n)
+      expect(left).toEqual(Uint64(2))
+      expect(right).toEqual(3n)
       expect(outcome).toBe('2 + 3 = 5')
       expect(result).toBe(true)
     })

examples/calculator/contract.spec.ts

@@ -1,6 +1,7 @@
-import { assert, TransactionType } from '@algorandfoundation/algorand-typescript'
+import { assert, Bytes, TransactionType } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { afterEach, describe, expect, it } from 'vitest'
+import { ABI_RETURN_VALUE_LOG_PREFIX } from '../../src/constants'
 import HelloWorldContract from './contract.algo'
 
 describe('HelloWorldContract', () => {
@@ -14,14 +15,20 @@ describe('HelloWorldContract', () => {
     assert(ctx.txn.lastActive.type === TransactionType.ApplicationCall, 'Last txn must be app')
 
     expect(result).toBe('Bananas')
-    expect(ctx.exportLogs(ctx.txn.lastActive.appId.id, 's')).toStrictEqual([result])
+    const bananasBytes = Bytes('Bananas')
+    const abiLog = ABI_RETURN_VALUE_LOG_PREFIX.concat(bananasBytes)
+    const logs = ctx.exportLogs(ctx.txn.lastActive.appId.id, 's', 'b')
+    expect(logs).toStrictEqual([result, abiLog])
   })
   it('logs the returned value when sayHello is called', async () => {
     const contract = ctx.contract.create(HelloWorldContract)
     const result = contract.sayHello('John', 'Doe')
     assert(ctx.txn.lastActive.type === TransactionType.ApplicationCall, 'Last txn must be app')
 
     expect(result).toBe('Hello John Doe')
-    expect(ctx.exportLogs(ctx.txn.lastActive.appId.id, 's')).toStrictEqual([result])
+    const helloBytes = Bytes('Hello John Doe')
+    const abiLog = ABI_RETURN_VALUE_LOG_PREFIX.concat(helloBytes)
+    const logs = ctx.exportLogs(ctx.txn.lastActive.appId.id, 's', 'b')
+    expect(logs).toStrictEqual([result, abiLog])
   })
 })

examples/hello-world-abi/contract.spec.ts

@@ -6,6 +6,7 @@ import { puyaTsTransformer } from '../src/test-transformer'
 
 const config: RollupOptions = {
   input: [
+    'examples/calculator/contract.algo.ts',
     'examples/hello-world-abi/contract.algo.ts',
     'examples/hello-world/contract.algo.ts',
     'examples/auction/contract.algo.ts',