Merge remote-tracking branch 'origin/main' into bytes

Author: janmasrovira

Applib/Helpers.juvix

@@ -106,3 +106,14 @@ fromResult
   case result of
     | ok data := data
     | error err := failwith (Show.show err);
+
+modulesAppData (modules : List Nat) : AppData :=
+  Map.fromList [RawTag.fromNat 0, map (AnomaAtom.fromNat) modules]
+    |> AppData.fromMap;
+
+moduleSubmissionTransaction
+  {M : Type -> Type}
+  {{Tx M}}
+  {{Monad M}}
+  (modules : List Nat)
+  : M Transaction := prepareStandardTransaction [] [] (modulesAppData modules);

BaseLayer/ResourceMachine.juvix

@@ -47,14 +47,6 @@ end;
 builtin anoma-nullifier-key
 type NullifierKey := privateMk ByteArray
 with
-  type Raw := mk AnomaAtom;
-
-  fromRaw : NullifierKey.Raw -> NullifierKey
-    | (Raw.mk n) := privateMk (fromAnomaContents size n);
-
-  toRaw : NullifierKey -> NullifierKey.Raw
-    | (NullifierKey.privateMk bs) := Raw.mk (toAnomaContents bs);
-
   size : Nat := 64;
 
   fromByteArray : ByteArray -> NullifierKey := privateMk;
@@ -166,7 +158,7 @@ with
       isConsumed : Bool;
       consumed : List Resource;
       created : List Resource;
-      appData : AppData;
+      appData : List AppData.Value;
     }
   with
     nullifiers (a : Args) : List Nullifier :=
@@ -210,15 +202,6 @@ end;
 --- NOTE: This should be a number having an at most negligible chance of repeating is sufficient, e.g., a pseudo-random number.
 type Nonce := privateMk ByteArray
 with
-  -- should be mk AnomaAtom
-  type Raw := mk AnomaAtom;
-
-  fromRaw : Nonce.Raw -> Nonce
-    | (Raw.mk n) := privateMk (fromAnomaContents size n);
-
-  toRaw : Nonce -> Nonce.Raw
-    | (Nonce.privateMk bs) := Raw.mk (toAnomaContents bs);
-
   instance
   Nonce-FixedSize : FixedSize Nonce := FixedSize.mk size;
 
@@ -289,7 +272,7 @@ type Resource :=
     value : AnomaAtom;
     quantity : Nat;
     ephemeral : Bool;
-    nonce : Nonce.Raw;
+    nonce : Nonce;
     nullifierKeyCommitment : AnomaAtom;
     --- Currently unused. It is safe to set it to 0
     unusedRandSeed : Nat;
@@ -460,7 +443,7 @@ end;
 
 type RootedNullifiableResource :=
   mk@{
-    key : NullifierKey.Raw;
+    key : NullifierKey;
     resource : Resource;
     root : CommitmentRoot;
   }
@@ -483,14 +466,14 @@ with
       RootedNullifiableResource.mk@{
         resource;
         root;
-        key := NullifierKey.toRaw NullifierKey.Transparent.mk;
+        key := NullifierKey.Transparent.mk;
       };
   end;
 end;
 
 type NullifiableResource :=
   mk@{
-    key : NullifierKey.Raw;
+    key : NullifierKey;
     resource : Resource;
   }
 with
@@ -504,7 +487,7 @@ with
     mk (resource : Resource) : NullifiableResource :=
       NullifiableResource.mk@{
         resource;
-        key := NullifierKey.toRaw NullifierKey.Transparent.mk;
+        key := NullifierKey.Transparent.mk;
       };
   end;
 end;

Package.juvix

@@ -8,7 +8,7 @@ package : Package :=
     version :=
       mkVersion@{
         major := 0;
-        minor := 10;
+        minor := 11;
         patch := 1;
       };
     dependencies :=

juvix.lock.yaml

@@ -2,7 +2,7 @@
 # Do not edit this file manually.
 
 version: 2
-checksum: a28fa0a4023ddc664913499e443d287826bd4b5e116c8b5f693f126ac4e2abf4
+checksum: 5c11471c6f7b80ce9559cafebe1537073dc5cb6bba44bbf364862c2a821bef49
 dependencies:
 - git:
     name: anoma_juvix-stdlib