feat: simplify contract templates

algorandfoundation · Jan 31, 2024 · b5cadcb · b5cadcb
1 parent 7822bef
commit b5cadcb
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 70 deletions.
diff --git a/...s/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/contract.py.j2 b/...s/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/contract.py.j2
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/template_content/smart_contracts/{{ contract_name }}/contract.py.jinja b/template_content/smart_contracts/{{ contract_name }}/contract.py.jinja
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...ract_generator_default_production_preset_python/smart_contracts/cool_contract/contract.py b/...ract_generator_default_production_preset_python/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class CoolContract(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...ntract_generator_default_production_preset_python/smart_contracts/hello_world/contract.py b/...ntract_generator_default_production_preset_python/smart_contracts/hello_world/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class HelloWorld(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/..._generator_default_production_preset_typescript/smart_contracts/cool_contract/contract.py b/..._generator_default_production_preset_typescript/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class CoolContract(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...ct_generator_default_production_preset_typescript/smart_contracts/hello_world/contract.py b/...ct_generator_default_production_preset_typescript/smart_contracts/hello_world/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class HelloWorld(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...ontract_generator_default_starter_preset_python/smart_contracts/cool_contract/contract.py b/...ontract_generator_default_starter_preset_python/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class CoolContract(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/..._contract_generator_default_starter_preset_python/smart_contracts/hello_world/contract.py b/..._contract_generator_default_starter_preset_python/smart_contracts/hello_world/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class HelloWorld(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...act_generator_default_starter_preset_typescript/smart_contracts/cool_contract/contract.py b/...act_generator_default_starter_preset_typescript/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class CoolContract(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name
diff --git a/...tract_generator_default_starter_preset_typescript/smart_contracts/hello_world/contract.py b/...tract_generator_default_starter_preset_typescript/smart_contracts/hello_world/contract.py
@@ -1,8 +1,7 @@
-from puyapy import ARC4Contract, Bytes
-from puyapy.arc4 import String, abimethod
+from puyapy import ARC4Contract, arc4
 
 
 class HelloWorld(ARC4Contract):
-    @abimethod()
-    def hello(self, name: String) -> String:
-        return String.encode(Bytes(b"Hello, ") + name.decode())
+    @arc4.abimethod()
+    def hello(self, name: arc4.String) -> arc4.String:
+        return "Hello, " + name