[types] make WriteSet and friends mergeable and split each user (apto…

…s-labs#3331) transaction into two sessions
kristyfitzgerald · Aug 24, 2022 · 71bcbbd · 71bcbbd
1 parent 2f38f97
commit 71bcbbd
Show file tree

Hide file tree

Showing 81 changed files with 5,738 additions and 9,422 deletions.
diff --git a/...ions_test__test_get_transactions_output_user_transaction_with_entry_function_payload.json b/...ions_test__test_get_transactions_output_user_transaction_with_entry_function_payload.json
@@ -51,19 +51,19 @@
         "address": "0x1",
         "state_key_hash": "",
         "data": {
-          "type": "0x1::state_storage::StateStorageUsage",
-          "data": "state storage omitted"
+          "type": "0x1::timestamp::CurrentTimeMicroseconds",
+          "data": {
+            "microseconds": "500000"
+          }
         },
         "type": "write_resource"
       },
       {
         "address": "0x1",
         "state_key_hash": "",
         "data": {
-          "type": "0x1::timestamp::CurrentTimeMicroseconds",
-          "data": {
-            "microseconds": "500000"
-          }
+          "type": "0x1::state_storage::StateStorageUsage",
+          "data": "state storage omitted"
         },
         "type": "write_resource"
       }
@@ -138,37 +138,6 @@
         },
         "type": "write_resource"
       },
-      {
-        "address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
-        "state_key_hash": "",
-        "data": {
-          "type": "0x1::account::Account",
-          "data": {
-            "authentication_key": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
-            "coin_register_events": {
-              "counter": "1",
-              "guid": {
-                "id": {
-                  "addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
-                  "creation_num": "0"
-                }
-              }
-            },
-            "rotation_capability_offer": {
-              "for": {
-                "vec": []
-              }
-            },
-            "sequence_number": "0",
-            "signer_capability_offer": {
-              "for": {
-                "vec": []
-              }
-            }
-          }
-        },
-        "type": "write_resource"
-      },
       {
         "address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
         "state_key_hash": "",
@@ -211,6 +180,37 @@
           }
         },
         "type": "write_resource"
+      },
+      {
+        "address": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+        "state_key_hash": "",
+        "data": {
+          "type": "0x1::account::Account",
+          "data": {
+            "authentication_key": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+            "coin_register_events": {
+              "counter": "1",
+              "guid": {
+                "id": {
+                  "addr": "0x34bf7e2d17674feb234371a7ea58efd715f0e56ba20ebf13789480d9d643afaf",
+                  "creation_num": "0"
+                }
+              }
+            },
+            "rotation_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            },
+            "sequence_number": "0",
+            "signer_capability_offer": {
+              "for": {
+                "vec": []
+              }
+            }
+          }
+        },
+        "type": "write_resource"
       }
     ],
     "sender": "0xa550c18",