Merge pull request #129 from kevinheavey/fix-127

Fix missing sanitization in to_json methods
kevinheavey · Jul 20, 2023 · ae8ea8e · ae8ea8e
2 parents 23e7b0b + 3082389
commit ae8ea8e
Show file tree

Hide file tree

Showing 3 changed files with 1,475 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.18.0] - 2023-07-20
+
+### Changed
+
+Client-gen: add support for optional accounts [#(128)](https://github.com/kevinheavey/anchorpy/pull/128)
+
+### Fixed
+
+Client-gen: fix missing sanitization in to_json method generation [#(129)](https://github.com/kevinheavey/anchorpy/pull/129)
+
 ## [0.17.2] - 2023-06-02
 
 ### Changed

diff --git a/src/anchorpy/clientgen/common.py b/src/anchorpy/clientgen/common.py
@@ -435,7 +435,7 @@ def _field_to_json(
     convert_case: bool = True,
 ) -> str:
     ty_type = ty.ty
-    maybe_converted = snake(ty.name) if convert_case else ty.name
+    maybe_converted = _sanitize(snake(ty.name)) if convert_case else _sanitize(ty.name)
     var_name = f"{val_prefix}{maybe_converted}{val_suffix}"
     if ty_type == IdlTypeSimple.PublicKey:
         return f"str({var_name})"