Merge main into release

algorandfoundation · Jan 17, 2025 · c2ba16e · c2ba16e
2 parents 6ab453e + 6069bde
commit c2ba16e
Show file tree

Hide file tree

Showing 6 changed files with 1,482 additions and 431 deletions.
diff --git a/examples/xgov-voting/types/voting-app-client.ts b/examples/xgov-voting/types/voting-app-client.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@algorandfoundation/algokit-client-generator": "^4.0.2",
+    "@algorandfoundation/algokit-client-generator": "^4.0.6",
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
     "@eslint/js": "^9.16.0",
@@ -101,8 +101,8 @@
     "js-sha512": "^0.9.0"
   },
   "peerDependencies": {
-    "@algorandfoundation/algokit-utils": "^7.0.0",
-    "algosdk": ">=2.9.0 <3.0"
+    "@algorandfoundation/algokit-utils": "^7.1.0",
+    "algosdk": ">=2.10.0 <3.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/transform.ts b/src/transform.ts
@@ -484,6 +484,41 @@ export function getIndexerTransactionFromAlgodTransaction(
             },
           }
         : undefined),
+      ...(transaction.type === TransactionType.hb && transaction.heartbeatFields
+        ? {
+            'heartbeat-transaction': {
+              'hb-address':
+                typeof transaction.heartbeatFields.a === 'string'
+                  ? transaction.heartbeatFields.a
+                  : algosdk.encodeAddress(transaction.heartbeatFields.a.publicKey),
+              'hb-key-dilution': transaction.heartbeatFields.kd,
+              'hb-proof': {
+                'hb-pk':
+                  transaction.heartbeatFields.prf.p && transaction.heartbeatFields.prf.p.length
+                    ? Buffer.from(transaction.heartbeatFields.prf.p).toString('base64')
+                    : undefined,
+                'hb-pk1sig':
+                  transaction.heartbeatFields.prf.p1s && transaction.heartbeatFields.prf.p1s.length
+                    ? Buffer.from(transaction.heartbeatFields.prf.p1s).toString('base64')
+                    : undefined,
+                'hb-pk2':
+                  transaction.heartbeatFields.prf.p2 && transaction.heartbeatFields.prf.p2.length
+                    ? Buffer.from(transaction.heartbeatFields.prf.p2).toString('base64')
+                    : undefined,
+                'hb-pk2sig':
+                  transaction.heartbeatFields.prf.p2s && transaction.heartbeatFields.prf.p2s.length
+                    ? Buffer.from(transaction.heartbeatFields.prf.p2s).toString('base64')
+                    : undefined,
+                'hb-sig':
+                  transaction.heartbeatFields.prf.s && transaction.heartbeatFields.prf.s.length
+                    ? Buffer.from(transaction.heartbeatFields.prf.s).toString('base64')
+                    : undefined,
+              },
+              'hb-seed': Buffer.from(transaction.heartbeatFields.sd).toString('base64'),
+              'hb-vote-id': Buffer.from(transaction.heartbeatFields.vid).toString('base64'),
+            },
+          }
+        : undefined),
       'first-valid': transaction.firstRound,
       'last-valid': transaction.lastRound,
       'tx-type': transaction.type,