Merge pull request #510 from algorandfoundation/feat/addr_tmpl

feat: use addr for address template vars
algorandfoundation · Jul 8, 2024 · 3a6d5c9 · 3a6d5c9
2 parents d8f63c1 + b4bf852
commit 3a6d5c9
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 71 deletions.
diff --git a/examples/reti/artifacts/StakingPool.approval.teal b/examples/reti/artifacts/StakingPool.approval.teal
@@ -3965,7 +3965,7 @@ getFeeSink:
 
 	// examples/reti/stakingPool.algo.ts:956
 	// return this.feeSinkAddr;
-	pushbytes TMPL_feeSinkAddr
+	addr TMPL_feeSinkAddr
 	retsub
 
 // algoSaturationLevel(): uint64

diff --git a/examples/reti/artifacts/StakingPool.arc32.json b/examples/reti/artifacts/StakingPool.arc32.json
diff --git a/examples/reti/artifacts/StakingPool.arc56_draft.json b/examples/reti/artifacts/StakingPool.arc56_draft.json
diff --git a/src/lib/compiler.ts b/src/lib/compiler.ts
@@ -5871,6 +5871,8 @@ export default class Compiler {
       const { type, name } = this.templateVars[chain[0].getNameNode().getText()];
       if (isNumeric(type)) {
         this.push(chain[0], `pushint TMPL_${name}`, type);
+      } else if (type.kind === 'base' && type.type === 'address') {
+        this.push(chain[0], `addr TMPL_${name}`, type);
       } else {
         this.push(chain[0], `pushbytes TMPL_${name}`, type);
       }
@@ -7320,17 +7322,17 @@ declare type AssetFreezeTxn = Required<AssetFreezeParams>;
       .map((t) => t.teal)
       .map((t) => {
         // Replace template variables
-        if (t.match(/push(int|bytes) TMPL_/)) {
+        if (t.trim().match(/^push(int|bytes) TMPL_/) || t.trim().startsWith('addr TMPL_')) {
           const [opcode, arg] = t.trim().split(' ');
           if (opcode === 'pushint') return 'pushint 0';
 
           const tVar = Object.values(this.templateVars).find((v) => v.name === arg.replace(/^TMPL_/, ''));
 
           if (tVar === undefined) throw Error(`Could not find template variable ${arg}`);
 
-          if (this.isDynamicType(tVar.type)) return 'byte 0x';
+          if (this.isDynamicType(tVar.type)) return 'pushbytes 0x';
 
-          return `byte 0x${'00'.repeat(this.getTypeLength(tVar.type))}`;
+          return `pushbytes 0x${'00'.repeat(this.getTypeLength(tVar.type))}`;
         }
 
         // Remove comments to avoid taking up space in the request body