Merge standalone wallet into main

.github/workflows/build-test-macos-wallet-cc_wallet.yml → .github/workflows/build-test-macos-wallet-cat_wallet.yml

@@ -1,7 +1,7 @@
 #
 # THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
 #
-name: MacOS wallet-cc_wallet Tests
+name: MacOS wallet-cat_wallet Tests
 
 on:
   push:
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    name: MacOS wallet-cc_wallet Tests
+    name: MacOS wallet-cat_wallet Tests
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     strategy:
@@ -92,10 +92,10 @@ jobs:
         sh install-timelord.sh
         ./vdf_bench square_asm 400000
 
-    - name: Test wallet-cc_wallet code with pytest
+    - name: Test wallet-cat_wallet code with pytest
       run: |
         . ./activate
-        ./venv/bin/py.test tests/wallet/cc_wallet/test_*.py -s -v --durations 0
+        ./venv/bin/py.test tests/wallet/cat_wallet/test_*.py -s -v --durations 0
 #
 # THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
 #

.github/workflows/build-test-ubuntu-wallet-cc_wallet.yml → .github/workflows/build-test-ubuntu-wallet-cat_wallet.yml

@@ -1,7 +1,7 @@
 #
 # THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
 #
-name: Ubuntu wallet-cc_wallet Test
+name: Ubuntu wallet-cat_wallet Test
 
 on:
   push:
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    name: Ubuntu wallet-cc_wallet Test
+    name: Ubuntu wallet-cat_wallet Test
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     strategy:
@@ -97,10 +97,10 @@ jobs:
         sh install-timelord.sh
         ./vdf_bench square_asm 400000
 
-    - name: Test wallet-cc_wallet code with pytest
+    - name: Test wallet-cat_wallet code with pytest
       run: |
         . ./activate
-        ./venv/bin/py.test tests/wallet/cc_wallet/test_*.py -s -v --durations 0
+        ./venv/bin/py.test tests/wallet/cat_wallet/test_*.py -s -v --durations 0
 
 
 #

chia/cmds/wallet_funcs.py

@@ -119,7 +119,7 @@ async def delete_unconfirmed_transactions(args: dict, wallet_client: WalletRpcCl
 
 
 def wallet_coin_unit(typ: WalletType, address_prefix: str) -> Tuple[str, int]:
-    if typ == WalletType.COLOURED_COIN:
+    if typ == WalletType.CAT:
         return "", units["colouredcoin"]
     if typ in [WalletType.STANDARD_WALLET, WalletType.POOLING_WALLET, WalletType.MULTI_SIG, WalletType.RATE_LIMITED]:
         return address_prefix, units["chia"]

chia/consensus/blockchain.py

@@ -848,22 +848,12 @@ def add_block_record(self, block_record: BlockRecord):
             self.__heights_in_cache[block_record.height] = set()
         self.__heights_in_cache[block_record.height].add(block_record.header_hash)
 
-    # TODO: address hint error and remove ignore
-    #       error: Argument 1 of "persist_sub_epoch_challenge_segments" is incompatible with supertype
-    #       "BlockchainInterface"; supertype defines the argument type as "uint32"  [override]
-    #       note: This violates the Liskov substitution principle
-    #       note: See https://mypy.readthedocs.io/en/stable/common_issues.html#incompatible-overrides
-    async def persist_sub_epoch_challenge_segments(  # type: ignore[override]
+    async def persist_sub_epoch_challenge_segments(
         self, ses_block_hash: bytes32, segments: List[SubEpochChallengeSegment]
     ):
         return await self.block_store.persist_sub_epoch_challenge_segments(ses_block_hash, segments)
 
-    # TODO: address hint error and remove ignore
-    #       error: Argument 1 of "get_sub_epoch_challenge_segments" is incompatible with supertype
-    #       "BlockchainInterface"; supertype defines the argument type as "uint32"  [override]
-    #       note: This violates the Liskov substitution principle
-    #       note: See https://mypy.readthedocs.io/en/stable/common_issues.html#incompatible-overrides
-    async def get_sub_epoch_challenge_segments(  # type: ignore[override]
+    async def get_sub_epoch_challenge_segments(
         self,
         ses_block_hash: bytes32,
     ) -> Optional[List[SubEpochChallengeSegment]]:

chia/consensus/blockchain_interface.py

@@ -71,13 +71,13 @@ def try_block_record(self, header_hash: bytes32) -> Optional[BlockRecord]:
         return None
 
     async def persist_sub_epoch_challenge_segments(
-        self, sub_epoch_summary_height: uint32, segments: List[SubEpochChallengeSegment]
+        self, sub_epoch_summary_height: bytes32, segments: List[SubEpochChallengeSegment]
     ):
         pass
 
     async def get_sub_epoch_challenge_segments(
         self,
-        sub_epoch_summary_height: uint32,
+        sub_epoch_summary_hash: bytes32,
     ) -> Optional[List[SubEpochChallengeSegment]]:
         pass
 

chia/consensus/full_block_to_block_record.py

@@ -22,6 +22,7 @@ def block_to_block_record(
     required_iters: uint64,
     full_block: Optional[Union[FullBlock, HeaderBlock]],
     header_block: Optional[HeaderBlock],
+    sub_slot_iters: Optional[uint64] = None,
 ) -> BlockRecord:
 
     if full_block is None:
@@ -32,9 +33,10 @@ def block_to_block_record(
     prev_b = blocks.try_block_record(block.prev_header_hash)
     if block.height > 0:
         assert prev_b is not None
-    sub_slot_iters, _ = get_next_sub_slot_iters_and_difficulty(
-        constants, len(block.finished_sub_slots) > 0, prev_b, blocks
-    )
+    if sub_slot_iters is None:
+        sub_slot_iters, _ = get_next_sub_slot_iters_and_difficulty(
+            constants, len(block.finished_sub_slots) > 0, prev_b, blocks
+        )
     overflow = is_overflow_block(constants, block.reward_chain_block.signage_point_index)
     deficit = calculate_deficit(
         constants,

chia/full_node/mempool_manager.py

@@ -58,11 +58,8 @@ def validate_clvm_and_signature(
             return Err(result.error), b"", {}
 
         pks: List[G1Element] = []
-        msgs: List[bytes32] = []
-        # TODO: address hint error and remove ignore
-        #       error: Incompatible types in assignment (expression has type "List[bytes]", variable has type
-        #       "List[bytes32]")  [assignment]
-        pks, msgs = pkm_pairs(result.npc_list, additional_data)  # type: ignore[assignment]
+        msgs: List[bytes] = []
+        pks, msgs = pkm_pairs(result.npc_list, additional_data)
 
         # Verify aggregated signature
         cache: LRUCache = LRUCache(10000)
@@ -249,6 +246,7 @@ async def pre_validate_spendbundle(
         start_time = time.time()
         if new_spend_bytes is None:
             new_spend_bytes = bytes(new_spend)
+
         err, cached_result_bytes, new_cache_entries = await asyncio.get_running_loop().run_in_executor(
             self.pool,
             validate_clvm_and_signature,
@@ -257,6 +255,7 @@ async def pre_validate_spendbundle(
             self.constants.COST_PER_BYTE,
             self.constants.AGG_SIG_ME_ADDITIONAL_DATA,
         )
+
         if err is not None:
             raise ValidationError(err)
         for cache_entry_key, cached_entry_value in new_cache_entries.items():