fix: as coins map value serialization type now generates correct co…

…de (#987) * fix: use `BigVarUint` TS function for coins map value serialization type * fix: `coins` value type func codegen
tact-lang · Nov 5, 2024 · 14b7c89 · 14b7c89
1 parent de44616
commit 14b7c89
Show file tree

Hide file tree

Showing 8 changed files with 1,404 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Prevent inline code snippets from changing their background color: PR [#935](https://github.com/tact-lang/tact/pull/935)
 - Docs: correctly handle next and previous page links at the bottom of the pages when there's a separator item in the sidebar: PR [#949](https://github.com/tact-lang/tact/pull/949)
 - Docs: compilation of examples in `data-structures.mdx` and across Cookbook: PR [#917](https://github.com/tact-lang/tact/pull/917)
+- `as coins` map value serialization type is now handled correctly: PR [#987](https://github.com/tact-lang/tact/pull/987)
 
 ### Release contributors
 

diff --git a/cspell.json b/cspell.json
@@ -114,6 +114,7 @@
     "uintptr",
     "uninit",
     "unixfs",
+    "varuint",
     "workchain",
     "xffff",
     "привет"

diff --git a/src/abi/map.ts b/src/abi/map.ts
@@ -160,6 +160,10 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                     } else if (self.valueAs?.startsWith("uint")) {
                         vBits = parseInt(self.valueAs.slice(4), 10);
                         vKind = "uint";
+                    } else if (self.valueAs?.startsWith("coins")) {
+                        vKind = "coins";
+                        ctx.used(`__tact_dict_set_${kind}_${vKind}`);
+                        return `${resolved[0]}~__tact_dict_set_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]})`;
                     }
                     ctx.used(`__tact_dict_set_${kind}_${vKind}`);
                     return `${resolved[0]}~__tact_dict_set_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]}, ${vBits})`;
@@ -226,6 +230,10 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                     } else if (self.valueAs?.startsWith("uint")) {
                         vBits = parseInt(self.valueAs.slice(4), 10);
                         vKind = "uint";
+                    } else if (self.valueAs?.startsWith("coins")) {
+                        vKind = "coins";
+                        ctx.used(`__tact_dict_get_${kind}_${vKind}`);
+                        return `__tact_dict_get_${kind}_${vKind}(${resolved[0]}, ${bits}, ${resolved[1]})`;
                     }
                     ctx.used(`__tact_dict_get_${kind}_${vKind}`);
                     return `__tact_dict_get_${kind}_${vKind}(${resolved[0]}, ${bits}, ${resolved[1]}, ${vBits})`;
@@ -571,6 +579,10 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                     } else if (self.valueAs?.startsWith("uint")) {
                         vBits = parseInt(self.valueAs.slice(4), 10);
                         vKind = "uint";
+                    } else if (self.valueAs?.startsWith("coins")) {
+                        vKind = "coins";
+                        ctx.used(`__tact_dict_replace_${kind}_${vKind}`);
+                        return `${resolved[0]}~__tact_dict_replace_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]})`;
                     }
                     ctx.used(`__tact_dict_replace_${kind}_${vKind}`);
                     return `${resolved[0]}~__tact_dict_replace_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]}, ${vBits})`;
@@ -649,6 +661,10 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                     } else if (self.valueAs?.startsWith("uint")) {
                         vBits = parseInt(self.valueAs.slice(4), 10);
                         vKind = "uint";
+                    } else if (self.valueAs?.startsWith("coins")) {
+                        vKind = "coins";
+                        ctx.used(`__tact_dict_replaceget_${kind}_${vKind}`);
+                        return `${resolved[0]}~__tact_dict_replaceget_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]})`;
                     }
                     ctx.used(`__tact_dict_replaceget_${kind}_${vKind}`);
                     return `${resolved[0]}~__tact_dict_replaceget_${kind}_${vKind}(${bits}, ${resolved[1]}, ${resolved[2]}, ${vBits})`;

diff --git a/src/bindings/typescript/serializers.ts b/src/bindings/typescript/serializers.ts
@@ -620,6 +620,7 @@ type MapSerializerDescrKey =
     | { kind: "address" };
 type MapSerializerDescrValue =
     | { kind: "int" | "uint"; bits: number }
+    | { kind: "varuint"; length: number }
     | { kind: "boolean" }
     | { kind: "address" }
     | { kind: "cell" }
@@ -665,6 +666,9 @@ function getValueParser(src: MapSerializerDescrValue) {
                 return `Dictionary.Values.BigUint(${src.bits})`;
             }
         }
+        case "varuint": {
+            return `Dictionary.Values.BigVarUint(${src.length})`;
+        }
         case "address": {
             return "Dictionary.Values.Address()";
         }
@@ -739,7 +743,7 @@ const map: Serializer<MapSerializerDescr> = {
                 ) {
                     value = { kind: "uint", bits: 256 };
                 } else if (src.valueFormat === "coins") {
-                    value = { kind: "uint", bits: 124 };
+                    value = { kind: "varuint", length: 4 };
                 }
             }
             if (src.value === "address") {
@@ -809,6 +813,10 @@ const map: Serializer<MapSerializerDescr> = {
                     }
                 }
                 break;
+            case "varuint": {
+                valueT = `bigint`;
+                break;
+            }
             case "boolean":
                 {
                     valueT = `boolean`;