fix: improving minting flow (#674)

* feat: allow filtering transfers by type

* feat: rework minting flow

* chore: align repo with changes to minting flow

* fix: only drop rejected transfers from cache

* fix: ignore rejected transfers

* fix: floating point imprecision

* fix: reduce wait between forwarding blocks

vega_sim/api/data.py

@@ -1718,6 +1718,7 @@ def list_accounts(
     pub_key: Optional[str] = None,
     asset_id: Optional[str] = None,
     market_id: Optional[str] = None,
+    account_types: Optional[vega_protos.vega.AccountType] = None,
     asset_decimals_map: Optional[Dict[str, int]] = None,
 ) -> List[AccountData]:
     """Output money in general accounts/margin accounts/bond accounts (if exists)
@@ -1726,6 +1727,7 @@ def list_accounts(
         data_client=data_client,
         party_id=pub_key,
         asset_id=asset_id,
+        account_types=account_types,
         market_id=market_id,
     )
 
@@ -2369,9 +2371,6 @@ def list_transfers(
     for transfer_node in transfer_nodes:
         transfer = transfer_node.transfer
 
-        if transfer.status == events_protos.Transfer.Status.STATUS_REJECTED:
-            continue
-
         if transfer.asset not in asset_dp:
             asset_dp[transfer.asset] = get_asset_decimals(
                 asset_id=transfer.asset, data_client=data_client

vega_sim/api/data_raw.py

@@ -149,6 +149,7 @@ def list_accounts(
     data_client: vac.VegaTradingDataClientV2,
     asset_id: Optional[str] = None,
     market_id: Optional[str] = None,
+    account_types: Optional[vega_protos.vega.AccountType] = None,
     party_id: Optional[str] = None,
 ) -> List[data_node_protos_v2.trading_data.AccountBalance]:
     """
@@ -162,6 +163,8 @@ def list_accounts(
         account_filter.asset_id = asset_id
     if market_id is not None:
         account_filter.market_ids.extend([market_id])
+    if account_types is not None:
+        account_filter.account_types.extend(account_types)
     return unroll_v2_pagination(
         base_request=data_node_protos_v2.trading_data.ListAccountsRequest(
             filter=account_filter

vega_sim/api/faucet.py

@@ -9,9 +9,12 @@
 
 def mint(pub_key: str, asset: str, amount: int, faucet_url: str) -> None:
     url = BASE_MINT_URL.format(faucet_url=faucet_url)
+    # Request a proportion of the maximum faucet amount - this allows for
+    # cases where requesting the maximum amount would have floating point
+    # imprecision and the request rejected.
     payload = {
         "party": pub_key,
-        "amount": str(int(amount)),
+        "amount": str(int(0.99 * amount)),
         "asset": asset,
     }
     for i in range(20):

vega_sim/environment/environment.py

@@ -40,8 +40,6 @@
 from vega_sim.null_service import VegaServiceNull
 from vega_sim.service import VegaService
 
-from vega_sim.service import VegaFaucetError
-
 logger = logging.getLogger(__name__)
 
 MarketState = namedtuple(
@@ -304,16 +302,8 @@ def step(self, vega: VegaService) -> None:
             if self.random_agent_ordering
             else self.agents
         ):
-            # TODO: Remove this once fauceting error has been investigated
-            try:
-                agent.step(vega)
-            except VegaFaucetError:
-                logger.exception(
-                    f"Agent {agent.name()} failed to step. Funds from faucet never"
-                    " received."
-                )
-                # Mint forwards blocks, wait for catchup
-                vega.wait_for_total_catchup()
+            agent.step(vega)
+            vega.wait_for_total_catchup()
 
 
 class MarketEnvironmentWithState(MarketEnvironment):
@@ -431,16 +421,7 @@ def step(self, vega: VegaService) -> None:
             if self.random_agent_ordering
             else self.agents
         ):
-            # TODO: Remove this once fauceting error has been investigated
-            try:
-                agent.step(state)
-            except VegaFaucetError:
-                logger.exception(
-                    f"Agent {agent.name()} failed to step. Funds from faucet never"
-                    " received."
-                )
-                # Mint forwards blocks, wait for catchup
-                vega.wait_for_total_catchup()
+            agent.step(state)
 
 
 class NetworkEnvironment(MarketEnvironmentWithState):

vega_sim/local_data_cache.py

@@ -453,14 +453,12 @@ def initialise_market_data(
     def initialise_transfer_monitoring(
         self,
     ):
-        base_transfers = []
-
-        base_transfers.extend(
-            data.list_transfers(data_client=self._trading_data_client)
-        )
+        base_transfers = data.list_transfers(data_client=self._trading_data_client)
 
         with self.transfers_lock:
             for t in base_transfers:
+                if t.status == events_protos.Transfer.Status.STATUS_REJECTED:
+                    continue
                 self._transfer_state_from_feed.setdefault(t.party_to, {})[t.id] = t
 
     def initialise_network_parameters(self):

vega_sim/null_service.py

@@ -1028,19 +1028,7 @@ def start(self, block_on_startup: bool = True) -> None:
 
         # Initialise the data-cache
         self.data_cache
-
-        # Create the VegaService key and mint assets to the treasury
-        governance_asset = self.get_asset(
-            self.find_asset_id(symbol="VOTE", enabled=True, raise_on_missing=True)
-        )
         self.wallet.create_key(wallet_name=self.WALLET_NAME, name=self.KEY_NAME)
-        self.mint(
-            wallet_name=self.WALLET_NAME,
-            key_name=self.KEY_NAME,
-            asset=governance_asset.id,
-            amount=governance_asset.details.builtin_asset.max_faucet_amount_mint,
-            from_faucet=True,
-        )
 
     # Class internal as at some point the host may vary as well as the port
     @staticmethod

vega_sim/scenario/common/agents.py

@@ -1310,7 +1310,6 @@ def step(self, vega_state: VegaState):
                         asset=self.asset_id,
                         amount=self.initial_asset_mint,
                         key_name=self.key_name,
-                        raise_error=False,
                     )
                     self.vega.wait_for_total_catchup()
 
@@ -3271,7 +3270,6 @@ def step(self, vega_state: VegaState):
                         asset=self.asset_id,
                         amount=self.initial_asset_mint,
                         key_name=self.key_name,
-                        raise_error=False,
                     )
 
             # Ensure volume maximising range is at least 100bps wide to

vega_sim/scenario/fuzzed_markets/agents.py

@@ -298,7 +298,6 @@ def check_balance(self, asset_id: str, amount: float):
             wallet_name=self.wallet_name,
             asset=asset_id,
             amount=amount,
-            raise_error=False,
         )
 
 
@@ -364,7 +363,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             self.close_outs += 1
             self.commitment_amount = 0
@@ -466,7 +464,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             self.close_outs += 1
             self.commitment_amount = 0
@@ -639,7 +636,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             return