Merge branch 'master' into expiration_timestamp_secs

Author: sanlee42

examples/p2p_transfer.py

@@ -26,26 +26,26 @@ def transfer(cli: client.Client, sender: local_account.LocalAccount, payee: str,
         sender=sender.account_address,
         sequence_number=seq_num,
         payload=script,
-        max_gas_amount=1000000,
+        max_gas_amount=10000000,
         gas_unit_price=1,
         gas_token_code="0x1::STC::STC",
         expiration_timestamp_secs=expiration_timestamp_secs,
-        chain_id=types.ChainId(st.uint8(253)),
+        chain_id=types.ChainId(st.uint8(251)),
     )
 
     txn = sender.sign(raw_txn)
     print(cli.submit(txn))
 
 
 if __name__ == "__main__":
-    cli = client.Client("http://halley1.seed.starcoin.org:9850")
+    cli = client.Client("http://barnard1.seed.starcoin.org:9850")
     # sender
     private_key = Ed25519PrivateKey.from_private_bytes(bytes.fromhex(
-        "75e9bee7e0474926cb6cfd5d4eefea4d56a4c9fdc518c8425e53aac23059f4f6"))
+        "e424e16db235e3f3b9ef2475516c51d4c15aa5287ceb364213698bd551eab4f2"))
     sender = local_account.LocalAccount(private_key)
 
     # reciver
-    payee_public_key_hex = "cdf17852b92695569943b0681e3c23934c73d041eaee1190236840e70dc4a6e6"
+    payee_public_key_hex = "a1d2f3e34563ef6e63e0d01e91bd53e9d27da758b25b01771572c240cb4f3113"
     pk = Ed25519PublicKey.from_public_bytes(
         bytes.fromhex(payee_public_key_hex))
     payee_auth_key = auth_key.AuthKey.from_public_key(pk)

starcoin/bcs/__init__.py

@@ -8,8 +8,8 @@
 from copy import copy
 from typing import get_type_hints
 
-import starcoin.serde_types as st
-import starcoin.serde_binary as sb
+from starcoin import serde_types as st
+from starcoin import serde_binary as sb
 
 MAX_LENGTH = (1 << 31) - 1
 MAX_U32 = (1 << 32) - 1

starcoin/sdk/client.py

@@ -84,7 +84,7 @@ def get_transaction(self, txn_hash: str) -> dict:
         }
         ret = self.execute(operation)
         return ret
-    
+
     def get_transaction_info(self, txn_hash: str) -> dict:
         operation = {
             "rpc_method": "chain.get_transaction_info",

starcoin/serde_binary/__init__.py

@@ -30,7 +30,7 @@ class BinarySerializer:
 
     def __post_init__(self):
         self.primitive_type_serializer = {
-            st.bool: self.serialize_bool,
+            bool: self.serialize_bool,
             st.uint8: self.serialize_u8,
             st.uint16: self.serialize_u16,
             st.uint32: self.serialize_u32,
@@ -59,7 +59,7 @@ def serialize_str(self, value: str):
     def serialize_unit(self, value: st.unit):
         pass
 
-    def serialize_bool(self, value: st.bool):
+    def serialize_bool(self, value: bool):
         self.output.write(int(value).to_bytes(1, "little", signed=False))
 
     def serialize_u8(self, value: st.uint8):
@@ -140,6 +140,7 @@ def serialize_any(self, obj: typing.Any, obj_type):
                 self.serialize_len(len(obj))
                 for item in obj:
                     self.serialize_any(item, item_type)
+
             elif getattr(obj_type, "__origin__") == tuple:  # Tuple
                 for i in range(len(obj)):
                     self.serialize_any(obj[i], types[i])
@@ -209,7 +210,7 @@ class BinaryDeserializer:
 
     def __post_init__(self):
         self.primitive_type_deserializer = {
-            st.bool: self.deserialize_bool,
+            bool: self.deserialize_bool,
             st.uint8: self.deserialize_u8,
             st.uint16: self.deserialize_u16,
             st.uint32: self.deserialize_u32,
@@ -248,7 +249,7 @@ def deserialize_str(self) -> str:
     def deserialize_unit(self) -> st.unit:
         pass
 
-    def deserialize_bool(self) -> st.bool:
+    def deserialize_bool(self) -> bool:
         b = int.from_bytes(self.read(1), byteorder="little", signed=False)
         if b == 0:
             return False