Merging with base changes

Author: Salvia-Network

build_scripts/build_macos.sh

@@ -44,10 +44,19 @@ if [ "$LAST_EXIT_CODE" -ne 0 ]; then
 	exit $LAST_EXIT_CODE
 fi
 
+# sets the version for salvia-blockchain in package.json
+brew install jq
+cp package.json package.json.orig
+jq --arg VER "$SALVIA_INSTALLER_VERSION" '.version=$VER' package.json > temp.json && mv temp.json package.json
+
 electron-packager . Salvia --asar.unpack="**/daemon/**" --platform=darwin \
 --icon=src/assets/img/Salvia.icns --overwrite --app-bundle-id=net.salvia.blockchain \
 --appVersion=$SALVIA_INSTALLER_VERSION
 LAST_EXIT_CODE=$?
+
+# reset the package.json to the original
+mv package.json.orig package.json
+
 if [ "$LAST_EXIT_CODE" -ne 0 ]; then
 	echo >&2 "electron-packager failed!"
 	exit $LAST_EXIT_CODE

build_scripts/build_windows.ps1

@@ -107,6 +107,15 @@ $packageName = "Salvia-$packageVersion"
 
 Write-Output "packageName is $packageName"
 
+Write-Output "   ---"
+Write-Output "fix version in package.json"
+choco install jq
+cp package.json package.json.orig
+jq --arg VER "$env:SALVIA_INSTALLER_VERSION" '.version=$VER' package.json > temp.json
+rm package.json
+mv temp.json package.json
+Write-Output "   ---"
+
 Write-Output "   ---"
 Write-Output "electron-packager"
 electron-packager . Salvia --asar.unpack="**\daemon\**" --overwrite --icon=.\src\assets\img\salvia.ico --app-version=$packageVersion

salvia/consensus/blockchain.py

@@ -6,6 +6,8 @@
 from enum import Enum
 from typing import Dict, List, Optional, Set, Tuple, Union
 
+from clvm.casts import int_from_bytes
+
 from salvia.consensus.block_body_validation import validate_block_body
 from salvia.consensus.block_header_validation import validate_finished_header_block, validate_unfinished_header_block
 from salvia.consensus.block_record import BlockRecord
@@ -18,12 +20,14 @@
 from salvia.consensus.multiprocess_validation import PreValidationResult, pre_validate_blocks_multiprocessing
 from salvia.full_node.block_store import BlockStore
 from salvia.full_node.coin_store import CoinStore
+from salvia.full_node.hint_store import HintStore
 from salvia.full_node.mempool_check_conditions import get_name_puzzle_conditions
 from salvia.types.blockchain_format.coin import Coin
 from salvia.types.blockchain_format.sized_bytes import bytes32
 from salvia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from salvia.types.blockchain_format.vdf import VDFInfo
 from salvia.types.coin_record import CoinRecord
+from salvia.types.condition_opcodes import ConditionOpcode
 from salvia.types.end_of_slot_bundle import EndOfSubSlotBundle
 from salvia.types.full_block import FullBlock
 from salvia.types.generator_types import BlockGenerator, GeneratorArg
@@ -83,12 +87,11 @@ class Blockchain(BlockchainInterface):
     # Lock to prevent simultaneous reads and writes
     lock: asyncio.Lock
     compact_proof_lock: asyncio.Lock
+    hint_store: HintStore
 
     @staticmethod
     async def create(
-        coin_store: CoinStore,
-        block_store: BlockStore,
-        consensus_constants: ConsensusConstants,
+        coin_store: CoinStore, block_store: BlockStore, consensus_constants: ConsensusConstants, hint_store: HintStore
     ):
         """
         Initializes a blockchain with the BlockRecords from disk, assuming they have all been
@@ -112,6 +115,7 @@ async def create(
         self._shut_down = False
         await self._load_chain_from_store()
         self._seen_compact_proofs = set()
+        self.hint_store = hint_store
         return self
 
     def shut_down(self):
@@ -164,7 +168,12 @@ async def receive_block(
         block: FullBlock,
         pre_validation_result: Optional[PreValidationResult] = None,
         fork_point_with_peak: Optional[uint32] = None,
-    ) -> Tuple[ReceiveBlockResult, Optional[Err], Optional[uint32], List[CoinRecord]]:
+    ) -> Tuple[
+        ReceiveBlockResult,
+        Optional[Err],
+        Optional[uint32],
+        Tuple[List[CoinRecord], Dict[bytes, Dict[bytes32, CoinRecord]]],
+    ]:
         """
         This method must be called under the blockchain lock
         Adds a new block into the blockchain, if it's valid and connected to the current
@@ -174,18 +183,13 @@ async def receive_block(
         """
         genesis: bool = block.height == 0
         if self.contains_block(block.header_hash):
-            return ReceiveBlockResult.ALREADY_HAVE_BLOCK, None, None, []
+            return ReceiveBlockResult.ALREADY_HAVE_BLOCK, None, None, ([], {})
 
         if not self.contains_block(block.prev_header_hash) and not genesis:
-            return (
-                ReceiveBlockResult.DISCONNECTED_BLOCK,
-                Err.INVALID_PREV_BLOCK_HASH,
-                None,
-                [],
-            )
+            return (ReceiveBlockResult.DISCONNECTED_BLOCK, Err.INVALID_PREV_BLOCK_HASH, None, ([], {}))
 
         if not genesis and (self.block_record(block.prev_header_hash).height + 1) != block.height:
-            return ReceiveBlockResult.INVALID_BLOCK, Err.INVALID_HEIGHT, None, []
+            return ReceiveBlockResult.INVALID_BLOCK, Err.INVALID_HEIGHT, None, ([], {})
 
         npc_result: Optional[NPCResult] = None
         if pre_validation_result is None:
@@ -202,7 +206,7 @@ async def receive_block(
                     try:
                         block_generator: Optional[BlockGenerator] = await self.get_block_generator(block)
                     except ValueError:
-                        return ReceiveBlockResult.INVALID_BLOCK, Err.GENERATOR_REF_HAS_NO_GENERATOR, None, []
+                        return ReceiveBlockResult.INVALID_BLOCK, Err.GENERATOR_REF_HAS_NO_GENERATOR, None, ([], {})
                     assert block_generator is not None and block.transactions_info is not None
                     npc_result = get_name_puzzle_conditions(
                         block_generator,
@@ -228,7 +232,7 @@ async def receive_block(
             )
 
             if error is not None:
-                return ReceiveBlockResult.INVALID_BLOCK, error.code, None, []
+                return ReceiveBlockResult.INVALID_BLOCK, error.code, None, ([], {})
         else:
             npc_result = pre_validation_result.npc_result
             required_iters = pre_validation_result.required_iters
@@ -247,7 +251,7 @@ async def receive_block(
             self.get_block_generator,
         )
         if error_code is not None:
-            return ReceiveBlockResult.INVALID_BLOCK, error_code, None, []
+            return ReceiveBlockResult.INVALID_BLOCK, error_code, None, ([], {})
 
         block_record = block_to_block_record(
             self.constants,
@@ -263,7 +267,7 @@ async def receive_block(
                 # Perform the DB operations to update the state, and rollback if something goes wrong
                 await self.block_store.db_wrapper.begin_transaction()
                 await self.block_store.add_full_block(header_hash, block, block_record)
-                fork_height, peak_height, records, coin_record_change = await self._reconsider_peak(
+                fork_height, peak_height, records, (coin_record_change, hint_changes) = await self._reconsider_peak(
                     block_record, genesis, fork_point_with_peak, npc_result
                 )
                 await self.block_store.db_wrapper.commit_transaction()
@@ -286,17 +290,35 @@ async def receive_block(
         if fork_height is not None:
             # new coin records added
             assert coin_record_change is not None
-            return ReceiveBlockResult.NEW_PEAK, None, fork_height, coin_record_change
+            return ReceiveBlockResult.NEW_PEAK, None, fork_height, (coin_record_change, hint_changes)
         else:
-            return ReceiveBlockResult.ADDED_AS_ORPHAN, None, None, []
+            return ReceiveBlockResult.ADDED_AS_ORPHAN, None, None, ([], {})
+
+    def get_hint_list(self, npc_result: NPCResult) -> List[Tuple[bytes32, bytes]]:
+        h_list = []
+        for npc in npc_result.npc_list:
+            for opcode, conditions in npc.conditions:
+                if opcode == ConditionOpcode.CREATE_COIN:
+                    for condition in conditions:
+                        if len(condition.vars) > 2 and condition.vars[2] != b"":
+                            puzzle_hash, amount_bin = condition.vars[0], condition.vars[1]
+                            amount = int_from_bytes(amount_bin)
+                            coin_id = Coin(npc.coin_name, puzzle_hash, amount).name()
+                            h_list.append((coin_id, condition.vars[2]))
+        return h_list
 
     async def _reconsider_peak(
         self,
         block_record: BlockRecord,
         genesis: bool,
         fork_point_with_peak: Optional[uint32],
         npc_result: Optional[NPCResult],
-    ) -> Tuple[Optional[uint32], Optional[uint32], List[BlockRecord], List[CoinRecord]]:
+    ) -> Tuple[
+        Optional[uint32],
+        Optional[uint32],
+        List[BlockRecord],
+        Tuple[List[CoinRecord], Dict[bytes, Dict[bytes32, CoinRecord]]],
+    ]:
         """
         When a new block is added, this is called, to check if the new block is the new peak of the chain.
         This also handles reorgs by reverting blocks which are not in the heaviest chain.
@@ -305,6 +327,8 @@ async def _reconsider_peak(
         """
         peak = self.get_peak()
         lastest_coin_state: Dict[bytes32, CoinRecord] = {}
+        hint_coin_state: Dict[bytes32, Dict[bytes32, CoinRecord]] = {}
+
         if genesis:
             if peak is None:
                 block: Optional[FullBlock] = await self.block_store.get_full_block(block_record.header_hash)
@@ -326,8 +350,8 @@ async def _reconsider_peak(
                 else:
                     added, _ = [], []
                 await self.block_store.set_peak(block_record.header_hash)
-                return uint32(0), uint32(0), [block_record], added
-            return None, None, [], []
+                return uint32(0), uint32(0), [block_record], (added, {})
+            return None, None, [], ([], {})
 
         assert peak is not None
         if block_record.weight > peak.weight:
@@ -372,46 +396,63 @@ async def _reconsider_peak(
             records_to_add = []
             for fetched_full_block, fetched_block_record in reversed(blocks_to_add):
                 records_to_add.append(fetched_block_record)
-                if fetched_block_record.is_transaction_block:
+                if fetched_full_block.is_transaction_block():
                     if fetched_block_record.header_hash == block_record.header_hash:
-                        tx_removals, tx_additions = await self.get_tx_removals_and_additions(
+                        tx_removals, tx_additions, npc_res = await self.get_tx_removals_and_additions(
                             fetched_full_block, npc_result
                         )
                     else:
-                        tx_removals, tx_additions = await self.get_tx_removals_and_additions(fetched_full_block, None)
-                    if fetched_full_block.is_transaction_block():
-                        assert fetched_full_block.foliage_transaction_block is not None
-                        added_rec = await self.coin_store.new_block(
-                            fetched_full_block.height,
-                            fetched_full_block.foliage_transaction_block.timestamp,
-                            fetched_full_block.get_included_reward_coins(),
-                            tx_additions,
-                            tx_removals,
+                        tx_removals, tx_additions, npc_res = await self.get_tx_removals_and_additions(
+                            fetched_full_block, None
                         )
-                        removed_rec: List[Optional[CoinRecord]] = [
-                            await self.coin_store.get_coin_record(name) for name in tx_removals
-                        ]
-
-                        # Set additions first, than removals in order to handle ephemeral coin state
-                        # Add in height order is also required
-                        record: Optional[CoinRecord]
-                        for record in added_rec:
-                            assert record
-                            lastest_coin_state[record.name] = record
-                        for record in removed_rec:
-                            assert record
-                            lastest_coin_state[record.name] = record
+
+                    assert fetched_full_block.foliage_transaction_block is not None
+                    added_rec = await self.coin_store.new_block(
+                        fetched_full_block.height,
+                        fetched_full_block.foliage_transaction_block.timestamp,
+                        fetched_full_block.get_included_reward_coins(),
+                        tx_additions,
+                        tx_removals,
+                    )
+                    removed_rec: List[Optional[CoinRecord]] = [
+                        await self.coin_store.get_coin_record(name) for name in tx_removals
+                    ]
+
+                    # Set additions first, then removals in order to handle ephemeral coin state
+                    # Add in height order is also required
+                    record: Optional[CoinRecord]
+                    for record in added_rec:
+                        assert record
+                        lastest_coin_state[record.name] = record
+                    for record in removed_rec:
+                        assert record
+                        lastest_coin_state[record.name] = record
+
+                    if npc_res is not None:
+                        hint_list: List[Tuple[bytes32, bytes]] = self.get_hint_list(npc_res)
+                        await self.hint_store.add_hints(hint_list)
+                        # There can be multiple coins for the same hint
+                        for coin_id, hint in hint_list:
+                            key = hint
+                            if key not in hint_coin_state:
+                                hint_coin_state[key] = {}
+                            hint_coin_state[key][coin_id] = lastest_coin_state[coin_id]
 
             # Changes the peak to be the new peak
             await self.block_store.set_peak(block_record.header_hash)
-            return uint32(max(fork_height, 0)), block_record.height, records_to_add, list(lastest_coin_state.values())
+            return (
+                uint32(max(fork_height, 0)),
+                block_record.height,
+                records_to_add,
+                (list(lastest_coin_state.values()), hint_coin_state),
+            )
 
         # This is not a heavier block than the heaviest we have seen, so we don't change the coin set
-        return None, None, [], list(lastest_coin_state.values())
+        return None, None, [], ([], {})
 
     async def get_tx_removals_and_additions(
         self, block: FullBlock, npc_result: Optional[NPCResult] = None
-    ) -> Tuple[List[bytes32], List[Coin]]:
+    ) -> Tuple[List[bytes32], List[Coin], Optional[NPCResult]]:
         if block.is_transaction_block():
             if block.transactions_generator is not None:
                 if npc_result is None:
@@ -424,11 +465,11 @@ async def get_tx_removals_and_additions(
                         safe_mode=False,
                     )
                 tx_removals, tx_additions = tx_removals_and_additions(npc_result.npc_list)
-                return tx_removals, tx_additions
+                return tx_removals, tx_additions, npc_result
             else:
-                return [], []
+                return [], [], None
         else:
-            return [], []
+            return [], [], None
 
     def get_next_difficulty(self, header_hash: bytes32, new_slot: bool) -> uint64:
         assert self.contains_block(header_hash)

salvia/full_node/coin_store.py

@@ -242,6 +242,13 @@ async def get_coin_records_by_names(
 
         return list(coins)
 
+    def row_to_coin_state(self, row):
+        coin = Coin(bytes32(bytes.fromhex(row[6])), bytes32(bytes.fromhex(row[5])), uint64.from_bytes(row[7]))
+        spent_h = None
+        if row[3]:
+            spent_h = row[2]
+        return CoinState(coin, spent_h, row[1])
+
     async def get_coin_states_by_puzzle_hashes(
         self,
         include_spent_coins: bool,
@@ -265,11 +272,7 @@ async def get_coin_states_by_puzzle_hashes(
 
         await cursor.close()
         for row in rows:
-            coin = Coin(bytes32(bytes.fromhex(row[6])), bytes32(bytes.fromhex(row[5])), uint64.from_bytes(row[7]))
-            spent_h = None
-            if row[3]:
-                spent_h = row[2]
-            coins.add(CoinState(coin, spent_h, row[1]))
+            coins.add(self.row_to_coin_state(row))
 
         return list(coins)
 
@@ -323,11 +326,7 @@ async def get_coin_state_by_ids(
 
         await cursor.close()
         for row in rows:
-            coin = Coin(bytes32(bytes.fromhex(row[6])), bytes32(bytes.fromhex(row[5])), uint64.from_bytes(row[7]))
-            spent_h = None
-            if row[3]:
-                spent_h = row[2]
-            coins.add(CoinState(coin, spent_h, row[1]))
+            coins.add(self.row_to_coin_state(row))
         return list(coins)
 
     async def rollback_to_block(self, block_index: int) -> List[CoinRecord]: