Graviton 4 abi router

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
           echo $installed
           [[ $installed =~ "Python ${expected}" ]] && echo "Configured Python" || (echo "Failed to configure Python" && exit 1)
       - name: Start algod
-        run: make algod-start
+        run: make algod-start-report
       - name: Install python dependencies
         run: make setup-development
       - name: Integration Tests Only

Makefile

@@ -69,9 +69,13 @@ lint-and-test: check-generate-init lint test-unit
 algod-start:
 	docker compose up -d algod --wait
 
+algod-version:
+	docker compose exec algod goal --version
+
+algod-start-report: algod-start algod-version
+
 algod-stop:
 	docker compose stop algod
-
 integration-run:
 	pytest -n $(NUM_PROCS) --durations=10 -sv tests/integration -m "not serial"
 	pytest --durations=10 -sv tests/integration -m serial

pyteal/ast/router.py

@@ -259,6 +259,15 @@ def approval_construction(self) -> Optional[Expr]:
             )
         return Cond(*[[n.condition, n.branch] for n in conditions_n_branches])
 
+    def get_method_config(self) -> MethodConfig:
+        return MethodConfig(
+            no_op=self.no_op.call_config,
+            opt_in=self.opt_in.call_config,
+            close_out=self.close_out.call_config,
+            update_application=self.update_application.call_config,
+            delete_application=self.delete_application.call_config,
+        )
+
 
 BareCallActions.__module__ = "pyteal"
 
@@ -806,6 +815,10 @@ def __init__(
 
         self.bare_call_actions: BareCallActions = bare_calls or BareCallActions()
 
+        self.method_configs: dict[str | None, MethodConfig] = dict()
+        if not self.bare_call_actions.is_empty():
+            self.method_configs[None] = self.bare_call_actions.get_method_config()
+
     def _clean(self) -> None:
         self.approval_ast._clean_bare_calls()
 
@@ -831,9 +844,10 @@ def add_method_handler(
         """
         if not isinstance(method_call, ABIReturnSubroutine):
             raise TealInputError(
-                "for adding method handler, must be ABIReturnSubroutine"
+                "for adding method handler, must be ABIReturnSubroutine but method_call is {type(method_call)}"
             )
         method_signature = method_call.method_signature(overriding_name)
+        final_name = overriding_name or method_call.name()
         if method_config is None:
             method_config = MethodConfig(no_op=CallConfig.CALL)
         if method_config.is_never():
@@ -862,6 +876,7 @@ def add_method_handler(
         self.approval_ast.add_method_to_ast(
             method_signature, method_approval_cond, method_call
         )
+        self.method_configs[final_name] = method_config
         return method_call
 
     def method(

pyteal/ast/router_test.py

@@ -380,7 +380,7 @@ def test_bare_call_config_clear_state_failure():
     assert "Attempt to construct clear state program from bare app call" in str(tie)
 
 
-def test_bare_call_actions_asdict():
+def test_BareCallActions_asdict():
     no_action = pt.OnCompleteAction()
     del_action = pt.OnCompleteAction(action=pt.Int(1), call_config=pt.CallConfig.ALL)
     close_action = pt.OnCompleteAction(action=pt.Int(2), call_config=pt.CallConfig.CALL)
@@ -409,6 +409,35 @@ def test_bare_call_actions_asdict():
     }
 
 
+def test_BareCallActions_get_method_config():
+    from pyteal.ast.router import MethodConfig, CallConfig
+
+    cc_all, cc_call, cc_create = (
+        pt.CallConfig.ALL,
+        pt.CallConfig.CALL,
+        pt.CallConfig.CREATE,
+    )
+    optin_action = pt.OnCompleteAction(action=pt.Int(1), call_config=cc_all)
+    noop_action = pt.OnCompleteAction(action=pt.Int(2), call_config=cc_call)
+    update_action = pt.OnCompleteAction(action=pt.Int(3), call_config=cc_create)
+
+    bca = pt.BareCallActions(
+        update_application=update_action,
+        opt_in=optin_action,
+        no_op=noop_action,
+    )
+
+    mc = bca.get_method_config()
+    assert mc == MethodConfig(
+        close_out=CallConfig.NEVER,
+        delete_application=CallConfig.NEVER,
+        no_op=cc_call,
+        opt_in=cc_all,
+        update_application=cc_create,
+        clear_state=CallConfig.NEVER,
+    )
+
+
 def test_router_register_method_clear_state_failure():
     router = pt.Router("doomedToFail")