Refine

Author: jaypan

tests/bridge_xcmutils_test.py

@@ -44,7 +44,7 @@ def setUp(self):
         self.setup_sibling_parachain_account()
 
     # Just calculate the sibling parachain account by moonbeam's xcm-utils tool
-    # Here is the comment but remember to change the parachain id
+    # Here is the command but remember to change the parachain id
     # yarn calculate-multilocation-derivative-account --a 0x55eebfdbb6af8aecbc9664bb229c48e2fceb381ce9d93a3ed698d4177da3e8e6 --p 2000 --parents
     def setup_sibling_parachain_account(self):
         # substrate addr is 5E1NrJDAqp5R3JDBBn2JGaHpUMo5kbCNXtV2asLzaw2MZfwr
@@ -170,7 +170,7 @@ def _compose_xcm_send_message_dict(self, kp):
                 'parents': '1',
                 'interior': {
                     'X1': [{
-                        'Parachain': '3000'
+                        'Parachain': str(ACA_PD_CHAIN_ID)
                     }]
                 },
             }},

tests/xcm_send_test.py

@@ -31,7 +31,7 @@ def setUp(self):
         self.setup_sibling_parachain_account()
 
     # Just calculate the sibling parachain account by moonbeam's xcm-utils tool
-    # Here is the comment but remember to change the parachain id
+    # Here is the command but remember to change the parachain id
     # yarn calculate-multilocation-derivative-account --a 0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d --p 2000 --parents
     def setup_sibling_parachain_account(self):
         chain_spec = get_chain(self.si_peaq)

tools/utils.py

@@ -5,16 +5,13 @@
 from peaq import utils as PeaqUtils
 PeaqUtils.DEBUG = True
 
-# from scalecodec.types import U32
-# from scalecodec.utils.ss58 import ss58_encode
 from tools.constants import PARACHAIN_WS_URL, TOKEN_NUM_BASE, KP_GLOBAL_SUDO
 from substrateinterface import SubstrateInterface
 from substrateinterface import Keypair
 from peaq.utils import get_account_balance, show_extrinsic
 from peaq.sudo_extrinsic import fund
 from peaq.eth import calculate_evm_addr
 from peaq.utils import calculate_multi_sig
-# from substrateinterface.utils import hasher
 
 # Monkey patch
 from scalecodec.types import FixedLengthArray
@@ -466,25 +463,6 @@ def get_balance_reserve_value(substrate, account, key):
     return 0
 
 
-# def get_parachain_sovereign_account(para_id, chain_type='para'):
-#     scale_encoded = chain_type.encode().hex()
-#     scale_encoded += U32(ScaleBytes(bytearray())).encode(para_id).to_hex()[2:]
-#     public_key = f"0x{scale_encoded + ''.join(['0' * (64 - len(scale_encoded))])}"
-#     print(
-#         f'\t  Account ID:\t{public_key}\n' +
-#         f'\tSS58 Address:\t{ss58_encode(public_key)}'
-#     )
-#
-#
-# def get_sibling_chain_account(substrate, parachain_id, ss58_addr):
-#     loc = b"SilbingChain" + bytes(str(parachain_id), 'utf-8')
-#     # loc = b"SilbingChain" + bytes.fromhex(str(substrate.encode_scale('Compact<u32>', parachain_id))[2:])
-#     pk = bytes.fromhex('0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'[2:])
-#     loc += b"AccountId32" + pk
-#     # loc += b"AccountId32" + Keypair(ss58_address=ss58_addr).public_key
-#     return f'0x{hasher.blake2_256(loc).hex()}'
-
-
 if __name__ == '__main__':
     data = '5F1e2nuSgxwWZiL9jTxv3jrMQHeHHhuwP7oDmU87SMp1Ncxv'
     print(calculate_evm_addr(data))