Default storage values

Pi-Squared-Inc · Sep 11, 2024 · b212cb1 · b212cb1
1 parent 708d1ea
commit b212cb1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/mx-rust-semantics/main/glue.md b/mx-rust-semantics/main/glue.md
@@ -10,14 +10,26 @@ module MX-RUST-GLUE
   rule
       <k>
           storeHostValue
-              (... destination: rustDestination(ValueId)
+              (... destination: rustDestination(ValueId, _:MxRustType)
               , value: wrappedRust(V:Value)
               )
           => .K
           ...
       </k>
       <values> Values:Map => Values[ValueId <- V] </values>
 
+  rule
+      (.K => mxRustEmptyValue(T))
+      ~>  storeHostValue
+              (... destination: rustDestination(_, T:MxRustType)
+              , value: mxWrappedEmpty
+              )
+  rule
+      (ptrValue(_, V:Value) => .K)
+      ~>   storeHostValue
+              (... value: mxWrappedEmpty => wrappedRust(V)
+              )
+
   rule
       <k>
           mxRustLoadPtr(P:Int) => ptrValue(ptr(P), V)

diff --git a/mx-rust-semantics/main/modules/biguint.md b/mx-rust-semantics/main/modules/biguint.md
@@ -41,6 +41,8 @@ module MX-RUST-MODULES-BIGUINT
                 )
             )
 
+    rule mxRustEmptyValue(BigUint) => mxRustBigIntNew(0)
+
 endmodule
 
 ```
diff --git a/mx-rust-semantics/main/modules/storage.md b/mx-rust-semantics/main/modules/storage.md
@@ -58,17 +58,19 @@ module MX-RUST-MODULES-STORAGE
                     , .NormalizedCallParams
                     )
                 )
-            => MX#storageLoad(mxStringValue(StorageKey), rustDestination(NextId))
+            => MX#storageLoad(mxStringValue(StorageKey), rustDestination(NextId, ResultType))
                 ~> mxRustLoadPtr(NextId)
             ...
         </k>
         <values>
             SelfId |-> struct
                         ( Type
                         , #token("storage_key", "Identifier"):Identifier |-> StorageKeyId:Int
+                            #token("result_type", "Identifier"):Identifier |-> ResultTypeId:Int
                             _:Map
                         )
             StorageKeyId |-> StorageKey:String
+            ResultTypeId |-> ResultType:MxRustType
             ...
         </values>
         <next-value-id> NextId:Int => NextId +Int 1 </next-value-id>

diff --git a/mx-rust-semantics/main/representation.md b/mx-rust-semantics/main/representation.md
@@ -7,6 +7,7 @@ module MX-RUST-REPRESENTATION
     syntax MxRustInstruction  ::= "mxRustPreprocessTraits"
                                 | mxRustPreprocessMethods(TypePath)
                                 | mxRustNewValue(ValueOrError)
+                                | mxRustEmptyValue(MxRustType)
                                 | mxValueToRust(Type)
                                 | mxRustLoadPtr(Int)
 
@@ -21,7 +22,7 @@ module MX-RUST-REPRESENTATION
     syntax Expression ::= concatString(Expression, Expression)  [seqstrict]
                         | toString(Expression)  [strict]
 
-    syntax MxValue ::= rustDestination(Int)
+    syntax MxValue ::= rustDestination(Int, MxRustType)
 endmodule
 
 ```
diff --git a/mx-semantics/test/execution.md b/mx-semantics/test/execution.md
@@ -18,7 +18,7 @@ module MX-TEST-EXECUTION-PARSING-SYNTAX
                               | setCallee(String)
                               | addAccount(String)
                               | setBalance(account:String, token:String, nonce:Int, value:Int)
-                              | setStorage(account:String, key:String, value:MxValue)
+                              | setStorage(account:String, key:String, value:MxWrappedValue)
                               | setBlockTimestamp(Int)
                               | setMockCode(String, MxValue)
 
@@ -238,7 +238,7 @@ module MX-ACCOUNTS-TEST
         <k> setStorage
                 (... account: Account:String
                 , key: Key:String
-                , value: Value:MxValue
+                , value: Value:MxWrappedValue
                 ) => .K
             ...
         </k>
@@ -251,7 +251,7 @@ module MX-ACCOUNTS-TEST
         <k> setStorage
                 (... account: Account:String
                 , key: Key:String
-                , value: Value:MxValue
+                , value: Value:MxWrappedValue
                 ) => .K
             ...
         </k>
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,8 @@ module MX-RUST-MODULES-BIGUINT @@
                     )
                 )
+        rule mxRustEmptyValue(BigUint) => mxRustBigIntNew(0)
     endmodule
     ```