feat: Wallet v2 upgrade (#332)

* feat: Moving to wallet v2 Co-authored-by: Charlie <[email protected]>
vegaprotocol · Feb 16, 2023 · 4f453ef · 4f453ef
1 parent 50642ad
commit 4f453ef
Show file tree

Hide file tree

Showing 64 changed files with 3,020 additions and 2,578 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
-VEGA_SIM_VEGA_TAG=c47229607908487b0d4fb31ec733435b994ff97a
+VEGA_SIM_VEGA_TAG=0e9ea16c03e9ee5a83031ebab7aa37ce6b72e65a
 VEGA_SIM_CONSOLE_TAG=develop
 VEGA_DEFAULT_KEY_NAME='Key 1'
 VEGA_SIM_NETWORKS_INTERNAL_TAG=main
-VEGA_SIM_NETWORKS_TAG=develop
+VEGA_SIM_NETWORKS_TAG=master
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         timeout(time: 50, unit: 'MINUTES')
     }
     parameters {
-        string( name: 'VEGA_VERSION', defaultValue: 'c47229607908487b0d4fb31ec733435b994ff97a',
+        string( name: 'VEGA_VERSION', defaultValue: '0e9ea16c03e9ee5a83031ebab7aa37ce6b72e65a',
                 description: 'Git branch, tag or hash of the vegaprotocol/vega repository')
         string( name: 'JENKINS_SHARED_LIB_BRANCH', defaultValue: 'main',
                 description: 'Git branch, tag or hash of the vegaprotocol/jenkins-shared-library repository')

diff --git a/devops/example_tokens.json b/devops/example_tokens.json
@@ -0,0 +1,3 @@
+{
+  "EXAMPLE_WALLET_NAME_1": "TOKEN_1"
+}
diff --git a/devops/scenario.py b/devops/scenario.py
@@ -105,10 +105,12 @@ def _get_historic_price_process(
         price_process = get_historic_price_series(
             product_id=self.simulation_args.coinbase_code,
             granularity=self.simulation_args.granularity,
-            interpolation=f"{self.simulation_args.step_length_seconds}S"
-            if self.simulation_args.step_length_seconds
-            < self.simulation_args.granularity.value
-            else self.simulation_args.granularity.value,
+            interpolation=(
+                f"{self.simulation_args.step_length_seconds}S"
+                if self.simulation_args.step_length_seconds
+                < self.simulation_args.granularity.value
+                else self.simulation_args.granularity.value
+            ),
             start=str(start),
             end=str(end),
         )
@@ -136,10 +138,8 @@ def configure_agents(
         # Setup agent for proposing and settling the market
         market_manager = ConfigurableMarketManager(
             proposal_wallet_name=MARKET_CREATOR_AGENT.wallet_name,
-            proposal_wallet_pass=MARKET_CREATOR_AGENT.wallet_pass,
             proposal_key_name=MARKET_CREATOR_AGENT.key_name,
             termination_wallet_name=MARKET_SETTLER_AGENT.wallet_name,
-            termination_wallet_pass=MARKET_SETTLER_AGENT.wallet_pass,
             termination_key_name=MARKET_SETTLER_AGENT.key_name,
             market_config=MarketConfig(),
             market_name=self.market_manager_args.market_name,
@@ -154,7 +154,6 @@ def configure_agents(
         # Setup agent for proving a market for traders
         market_maker = ExponentialShapedMarketMaker(
             wallet_name=MARKET_MAKER_AGENT.wallet_name,
-            wallet_pass=MARKET_MAKER_AGENT.wallet_pass,
             key_name=MARKET_MAKER_AGENT.key_name,
             market_name=self.market_manager_args.market_name,
             asset_name=self.market_manager_args.asset_name,
@@ -178,7 +177,6 @@ def configure_agents(
         auction_pass_agents = [
             OpenAuctionPass(
                 wallet_name=party.wallet_name,
-                wallet_pass=party.wallet_pass,
                 key_name=party.key_name,
                 market_name=self.market_manager_args.market_name,
                 asset_name=self.market_manager_args.asset_name,
@@ -194,7 +192,6 @@ def configure_agents(
         random_market_order_traders = [
             MarketOrderTrader(
                 wallet_name=party.wallet_name,
-                wallet_pass=party.wallet_pass,
                 key_name=party.key_name,
                 market_name=self.market_manager_args.market_name,
                 asset_name=self.market_manager_args.asset_name,
@@ -211,7 +208,6 @@ def configure_agents(
         momentum_market_order_traders = [
             MomentumTrader(
                 wallet_name=party.wallet_name,
-                wallet_pass=party.wallet_pass,
                 key_name=party.key_name,
                 market_name=self.market_manager_args.market_name,
                 asset_name=self.market_manager_args.asset_name,
@@ -228,7 +224,6 @@ def configure_agents(
         sensitive_market_order_traders = [
             PriceSensitiveMarketOrderTrader(
                 wallet_name=party.wallet_name,
-                wallet_pass=party.wallet_pass,
                 key_name=party.key_name,
                 market_name=self.market_manager_args.market_name,
                 asset_name=self.market_manager_args.asset_name,

diff --git a/examples/nullchain.py b/examples/nullchain.py
@@ -35,7 +35,7 @@
         store_transactions=True,
     ) as vega:
         for wallet in wallets:
-            vega.create_wallet(wallet.name, wallet.passphrase)
+            vega.create_key(wallet.name)
 
         vega.mint(
             MM_WALLET.name,
@@ -77,16 +77,16 @@
 
         vega.create_simple_market(
             market_name="BTC:DAI_Mar22",
-            proposal_wallet=MM_WALLET.name,
+            proposal_key=MM_WALLET.name,
             settlement_asset_id=tdai_id,
-            termination_wallet=TERMINATE_WALLET.name,
+            termination_key=TERMINATE_WALLET.name,
             market_decimals=5,
         )
         vega.wait_for_total_catchup()
 
         market_id = vega.all_markets()[0].id
         vega.submit_liquidity(
-            wallet_name=MM_WALLET.name,
+            key_name=MM_WALLET.name,
             market_id=market_id,
             commitment_amount=10000,
             fee=0.001,
@@ -95,7 +95,7 @@
             is_amendment=False,
         )
         vega.submit_order(
-            trading_wallet=MM_WALLET.name,
+            trading_key=MM_WALLET.name,
             market_id=market_id,
             time_in_force="TIME_IN_FORCE_GTC",
             order_type="TYPE_LIMIT",
@@ -104,7 +104,7 @@
             price=100,
         )
         vega.submit_order(
-            trading_wallet=MM_WALLET2.name,
+            trading_key=MM_WALLET2.name,
             market_id=market_id,
             time_in_force="TIME_IN_FORCE_GTC",
             order_type="TYPE_LIMIT",
@@ -193,7 +193,7 @@
         #     )
 
         to_cancel = vega.submit_order(
-            trading_wallet=MM_WALLET.name,
+            trading_key=MM_WALLET.name,
             market_id=market_id,
             time_in_force="TIME_IN_FORCE_GTC",
             order_type="TYPE_LIMIT",
@@ -206,7 +206,7 @@
         vega.cancel_order(MM_WALLET.name, market_id, to_cancel)
 
         vega.submit_order(
-            trading_wallet=MM_WALLET.name,
+            trading_key=MM_WALLET.name,
             market_id=market_id,
             time_in_force="TIME_IN_FORCE_GTC",
             order_type="TYPE_LIMIT",
@@ -216,7 +216,7 @@
             wait=True,
         )
         vega.submit_simple_liquidity(
-            wallet_name=MM_WALLET.name,
+            key_name=MM_WALLET.name,
             market_id=market_id,
             commitment_amount=5000,
             fee=0.002,
@@ -233,7 +233,7 @@
 
         input("Pausing to observe the market, press Enter to continue.")
         vega.settle_market(
-            settlement_wallet=TERMINATE_WALLET.name,
+            settlement_key=TERMINATE_WALLET.name,
             settlement_price=100,
             market_id=market_id,
         )

diff --git a/parameter_results/TauScalingFactor/TauScalingFactor.ipynb b/parameter_results/TauScalingFactor/TauScalingFactor.ipynb