schemas: use sat and sat_or_all again where appropiate

Changelog-None

contrib/msggen/msggen/gen/grpc/convert.py

@@ -100,6 +100,8 @@ def generate_composite(self, prefix, field: CompositeField, override=None):
                     "u16?": f"c.{name}.map(|v| v.into())",
                     "msat": f"Some(c.{name}.into())",
                     "msat?": f"c.{name}.map(|f| f.into())",
+                    "sat": f"Some(c.{name}.into())",
+                    "sat?": f"c.{name}.map(|f| f.into())",
                     "pubkey": f"c.{name}.serialize().to_vec()",
                     "pubkey?": f"c.{name}.map(|v| v.serialize().to_vec())",
                     "hex": f"hex::decode(&c.{name}).unwrap()",
@@ -115,6 +117,8 @@ def generate_composite(self, prefix, field: CompositeField, override=None):
                     "msat_or_any": f"Some(c.{name}.into())",
                     "msat_or_all": f"Some(c.{name}.into())",
                     "msat_or_all?": f"c.{name}.map(|o|o.into())",
+                    "sat_or_all": f"Some(c.{name}.into())",
+                    "sat_or_all?": f"c.{name}.map(|o|o.into())",
                     "feerate?": f"c.{name}.map(|o|o.into())",
                     "feerate": f"Some(c.{name}.into())",
                     "outpoint?": f"c.{name}.map(|o|o.into())",

contrib/msggen/msggen/gen/grpc/unconvert.py

@@ -110,6 +110,10 @@ def generate_composite(self, prefix, field: CompositeField, override=None) -> No
                     "msat_or_all?": f"c.{name}.map(|a| a.into())",
                     "msat_or_any": f"c.{name}.unwrap().into()",
                     "msat_or_any?": f"c.{name}.map(|a| a.into())",
+                    "sat": f"c.{name}.unwrap().into()",
+                    "sat?": f"c.{name}.map(|a| a.into())",
+                    "sat_or_all": f"c.{name}.unwrap().into()",
+                    "sat_or_all?": f"c.{name}.map(|a| a.into())",
                     "feerate": f"c.{name}.unwrap().into()",
                     "feerate?": f"c.{name}.map(|a| a.into())",
                     "outpoint?": f"c.{name}.map(|a| a.into())",

contrib/msggen/msggen/gen/grpc/util.py

@@ -9,6 +9,8 @@
     "msat": "Amount",
     "msat_or_all": "AmountOrAll",
     "msat_or_any": "AmountOrAny",
+    "sat": "Amount",
+    "sat_or_all": "AmountOrAll",
     "currency": "string",
     "number": "double",
     "pubkey": "bytes",

contrib/msggen/msggen/gen/grpc2py.py

@@ -54,6 +54,7 @@ def __init__(self, dest: TextIO):
             "boolean": "m.{name}",
             "short_channel_id": "m.{name}",
             "msat": "amount2msat(m.{name})",
+            "sat": "amount2sat(m.{name})",
             "currency": "m.{name}",
             "number": "m.{name}",
         }
@@ -87,6 +88,10 @@ def amount2msat(a):
             return a.msat
 
 
+        def amount2sat(a):
+            return a.msat / 1000
+
+
         def remove_default(d):
             # grpc is really not good at empty values, they get replaced with the type's default value...
             return {k: v for k, v in d.items() if v is not None and v != ""}

contrib/msggen/msggen/gen/rpc/rust.py

@@ -27,6 +27,8 @@
     "msat": "Amount",
     "msat_or_all": "AmountOrAll",
     "msat_or_any": "AmountOrAny",
+    "sat": "Amount",
+    "sat_or_all": "AmountOrAll",
     "currency": "String",
     "number": "f64",
     "pubkey": "PublicKey",

contrib/msggen/msggen/model.py

@@ -415,6 +415,8 @@ class PrimitiveField(Field):
         "msat",
         "msat_or_any",
         "msat_or_all",
+        "sat",
+        "sat_or_all",
         "currency",
         "hex",
         "short_channel_id",