Update libra to af6b3fd

Author: Yucong Sun

libra

@@ -78,7 +78,7 @@ def run(self):
 setup(
     name="pylibra-beta",
     # change to 0.1.YYYYMMDDNN on release
-    version="0.5.master",
+    version="0.5.2020081001",
     description="",
     python_requires=">=3.7",
     packages=find_packages("src"),

python/lib/data.h

@@ -211,7 +211,6 @@ def serialize(obj: typing.Any, obj_type) -> bytes:
             if not dataclasses.is_dataclass(obj_type):
                 raise ValueError("Unexpected type", obj_type)
 
-        # pyre-ignore
         if not isinstance(obj, obj_type):
             raise ValueError("Wrong Value for the type", obj, obj_type)
 

python/lib/liblibra_dev-darwin-x86_64.a

@@ -212,9 +212,9 @@ class Transaction__UserTransaction(Transaction):
 
 
 @dataclass
-class Transaction__WaypointWriteSet(Transaction):
+class Transaction__GenesisTransaction(Transaction):
     INDEX = 1
-    value: "ChangeSet"
+    value: "WriteSetPayload"
 
 
 @dataclass
@@ -225,7 +225,7 @@ class Transaction__BlockMetadata(Transaction):
 
 Transaction.VARIANTS = [
     Transaction__UserTransaction,
-    Transaction__WaypointWriteSet,
+    Transaction__GenesisTransaction,
     Transaction__BlockMetadata,
 ]
 

python/lib/liblibra_dev-linux-x86_64.a

@@ -182,6 +182,7 @@ def encode_create_designated_dealer_script(
 
 def encode_create_parent_vasp_account_script(
     coin_type: TypeTag,
+    sliding_nonce: st.uint64,
     new_account_address: AccountAddress,
     auth_key_prefix: bytes,
     human_name: bytes,
@@ -193,11 +194,13 @@ def encode_create_parent_vasp_account_script(
 
     If `add_all_currencies` is true, 0 balances for all available currencies in the system
     will also be added. This can only be invoked by an Association account.
+    `sliding_nonce` is a unique nonce for operation, see sliding_nonce.move for details.
     """
     return Script(
-        code=b"\xa1\x1c\xeb\x0b\x01\x00\x00\x00\x06\x01\x00\x02\x03\x02\x06\x04\x08\x02\x05\x0a\x11\x07\x1b\x28\x08\x43\x10\x00\x00\x00\x01\x00\x01\x01\x01\x00\x02\x07\x06\x0c\x05\x0a\x02\x0a\x02\x0a\x02\x0a\x02\x01\x00\x01\x09\x00\x0c\x4c\x69\x62\x72\x61\x41\x63\x63\x6f\x75\x6e\x74\x1a\x63\x72\x65\x61\x74\x65\x5f\x70\x61\x72\x65\x6e\x74\x5f\x76\x61\x73\x70\x5f\x61\x63\x63\x6f\x75\x6e\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01\x01\x00\x01\x09\x0b\x00\x0a\x01\x0b\x02\x0b\x03\x0b\x04\x0b\x05\x0a\x06\x38\x00\x02",
+        code=b"\xa1\x1c\xeb\x0b\x01\x00\x00\x00\x06\x01\x00\x04\x03\x04\x0b\x04\x0f\x02\x05\x11\x23\x07\x34\x4b\x08\x7f\x10\x00\x00\x00\x01\x01\x02\x00\x01\x00\x00\x03\x02\x01\x01\x01\x01\x04\x02\x06\x0c\x03\x00\x07\x06\x0c\x05\x0a\x02\x0a\x02\x0a\x02\x0a\x02\x01\x08\x06\x0c\x03\x05\x0a\x02\x0a\x02\x0a\x02\x0a\x02\x01\x01\x09\x00\x0c\x4c\x69\x62\x72\x61\x41\x63\x63\x6f\x75\x6e\x74\x0c\x53\x6c\x69\x64\x69\x6e\x67\x4e\x6f\x6e\x63\x65\x15\x72\x65\x63\x6f\x72\x64\x5f\x6e\x6f\x6e\x63\x65\x5f\x6f\x72\x5f\x61\x62\x6f\x72\x74\x1a\x63\x72\x65\x61\x74\x65\x5f\x70\x61\x72\x65\x6e\x74\x5f\x76\x61\x73\x70\x5f\x61\x63\x63\x6f\x75\x6e\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01\x01\x03\x01\x0c\x0a\x00\x0a\x01\x11\x00\x0b\x00\x0a\x02\x0b\x03\x0b\x04\x0b\x05\x0b\x06\x0a\x07\x38\x00\x02",
         ty_args=[coin_type],
         args=[
+            TransactionArgument__U64(sliding_nonce),
             TransactionArgument__Address(new_account_address),
             TransactionArgument__U8Vector(auth_key_prefix),
             TransactionArgument__U8Vector(human_name),
@@ -730,12 +733,15 @@ def encode_update_exchange_rate_script(
     )
 
 
-def encode_update_libra_version_script(major: st.uint64) -> Script:
-    """Update Libra version."""
+def encode_update_libra_version_script(sliding_nonce: st.uint64, major: st.uint64) -> Script:
+    """Update Libra version.
+
+    `sliding_nonce` is a unique nonce for operation, see sliding_nonce.move for details.
+    """
     return Script(
-        code=b"\xa1\x1c\xeb\x0b\x01\x00\x00\x00\x05\x01\x00\x02\x03\x02\x05\x05\x07\x05\x07\x0c\x11\x08\x1d\x10\x00\x00\x00\x01\x00\x01\x00\x02\x06\x0c\x03\x00\x0c\x4c\x69\x62\x72\x61\x56\x65\x72\x73\x69\x6f\x6e\x03\x73\x65\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x01\x04\x0b\x00\x0a\x01\x11\x00\x02",
+        code=b"\xa1\x1c\xeb\x0b\x01\x00\x00\x00\x05\x01\x00\x04\x03\x04\x0a\x05\x0e\x0a\x07\x18\x34\x08\x4c\x10\x00\x00\x00\x01\x00\x02\x00\x01\x00\x01\x03\x00\x01\x00\x02\x06\x0c\x03\x00\x03\x06\x0c\x03\x03\x0c\x4c\x69\x62\x72\x61\x56\x65\x72\x73\x69\x6f\x6e\x0c\x53\x6c\x69\x64\x69\x6e\x67\x4e\x6f\x6e\x63\x65\x03\x73\x65\x74\x15\x72\x65\x63\x6f\x72\x64\x5f\x6e\x6f\x6e\x63\x65\x5f\x6f\x72\x5f\x61\x62\x6f\x72\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x01\x07\x0a\x00\x0a\x01\x11\x01\x0b\x00\x0a\x02\x11\x00\x02",
         ty_args=[],
-        args=[TransactionArgument__U64(major)],
+        args=[TransactionArgument__U64(sliding_nonce), TransactionArgument__U64(major)],
     )
 
 

python/lib/liblibra_dev-windows-x86_64.a

@@ -3,20 +3,18 @@
 
 # pyre-strict
 
-from pylibra import (
-    TransactionUtils,
-    lcs,
-    libra_types as libra,
-    serde_types as st,
-    stdlib,
-)
+from pylibra import TransactionUtils
+from pylibra import libra_types as libra
+from pylibra import serde_types as st
+from pylibra import lcs
+from pylibra import stdlib
 
 
 def test_lcs_e2e() -> None:
     print("Testing serialization: ")
 
-    obj = libra.Transaction__WaypointWriteSet(
-        libra.ChangeSet(libra.WriteSet(libra.WriteSetMut(write_set=[])), [])
+    obj = libra.Transaction__GenesisTransaction(
+        libra.WriteSetPayload__Direct(libra.ChangeSet(libra.WriteSet(libra.WriteSetMut(write_set=[])), []))
     )
     content = lcs.serialize(obj, libra.Transaction)
 
@@ -34,12 +32,7 @@ def test_lcs_e2e() -> None:
 
 def test_lcs_e2e_native() -> None:
     content = TransactionUtils.createSignedP2PTransaction(
-        bytes.fromhex("11" * 32),
-        bytes.fromhex("22" * 16),
-        255,
-        1_234_567,
-        expiration_time=123456789,
-        chain_id=255,
+        bytes.fromhex("11" * 32), bytes.fromhex("22" * 16), 255, 1_234_567, expiration_time=123456789, chain_id=255
     )
 
     print("Testing Deserialization native bytes: ", content)
@@ -68,16 +61,9 @@ def make_address(content: bytes) -> libra.AccountAddress:
 
 def test_stdlib() -> None:
     content = TransactionUtils.createSignedP2PTransaction(
-        bytes.fromhex("11" * 32),
-        bytes.fromhex("22" * 16),
-        255,
-        1_234_567,
-        expiration_time=123456789,
-        chain_id=255,
+        bytes.fromhex("11" * 32), bytes.fromhex("22" * 16), 255, 1_234_567, expiration_time=123456789, chain_id=255
     )
-    raw_txn = lcs.deserialize(content, libra.Transaction__UserTransaction)[
-        0
-    ].value.raw_txn
+    raw_txn = lcs.deserialize(content, libra.Transaction__UserTransaction)[0].value.raw_txn
 
     assert isinstance(raw_txn.payload, libra.TransactionPayload__Script)
 
@@ -91,9 +77,7 @@ def test_stdlib() -> None:
     )
     payee = make_address(b"\x22" * 16)
     amount = st.uint64(1_234_567)
-    script = stdlib.encode_peer_to_peer_with_metadata_script(
-        token, payee, amount, b"", b""
-    )
+    script = stdlib.encode_peer_to_peer_with_metadata_script(token, payee, amount, b"", b"")
 
     # We have successfully generated an (unsigned) P2P transaction in python.
     assert script == raw_txn.payload.value