chore: Updating protos and associated code changes (#229)

* chore: Updating protos and associated code changes
vegaprotocol · Nov 10, 2022 · 414337a · 414337a
1 parent 672b784
commit 414337a
Show file tree

Hide file tree

Showing 44 changed files with 2,338 additions and 1,656 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,2 @@
-VEGA_SIM_VEGA_TAG=dfad7923af512fac5f0b53f4552cf8e5b2f3bf65
-VEGA_SIM_CONSOLE_TAG=269d3820dc3bd50c8844674690acf4f4f37dbb93
-VEGA_DEFAULT_KEY_NAME="Key 1"
-VEGA_SIM_NETWORKS_INTERNAL_TAG=main
-VEGA_SIM_NETWORKS_TAG=master
-VEGA_USER_WALLET_NAME="NETWORK_TRADERS"
-VEGA_USER_WALLET_PASS="PASSPHRASE"
+VEGA_SIM_VEGA_TAG=f27333689a39940a40be165da6a673a7dfb0fc0f
+VEGA_SIM_CONSOLE_TAG=master
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         timeout(time: 50, unit: 'MINUTES')
     }
     parameters {
-        string( name: 'VEGA_VERSION', defaultValue: 'e2f23ddfd420326d8689789a8a9e900da5813742',
+        string( name: 'VEGA_VERSION', defaultValue: 'f27333689a39940a40be165da6a673a7dfb0fc0f',
                 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/generate_vega_init.py b/generate_vega_init.py
@@ -14,7 +14,7 @@
     checkpoint,
     commands,
     events,
-    oracles,
+    data,
     snapshot,
     wallet,
 {%- for i in imports %}
@@ -27,7 +27,7 @@
     "checkpoint",
     "commands",
     "events",
-    "oracles",
+    "data",
     "snapshot",
     "tm",
     "wallet",

diff --git a/scripts/post-generate.sh b/scripts/post-generate.sh
@@ -9,7 +9,7 @@ for x in \
 	vega/checkpoint/v1 \
 	vega/commands/v1 \
 	vega/events/v1 \
-	vega/oracles/v1 \
+	vega/data/v1 \
 	vega/snapshot/v1 \
 	vega/wallet/v1
 do
@@ -53,7 +53,7 @@ for x in \
 	vega/checkpoint \
 	vega/commands \
 	vega/events \
-	vega/oracles \
+	vega/data \
 	vega/snapshot \
 	vega/wallet
 do
@@ -95,7 +95,7 @@ for x in \
 	vega/checkpoint \
 	vega/commands \
 	vega/events \
-	vega/oracles \
+	vega/data \
 	vega/snapshot \
 	vega/wallet
 do
@@ -106,7 +106,7 @@ find "$generated_dir/vega" -maxdepth 1 -name '*.py' -print0 | xargs -0r sed --in
 	-e 's#^from vega import ([a-z_]*)_pb2 as #from . import \1_pb2 as #' \
 	-e 's#^from vega.commands.v1 import#from .commands.v1 import#' \
 	-e 's#^from vega.events.v1 import#from .events.v1 import#' \
-	-e 's#^from vega.oracles.v1 import#from .oracles.v1 import#' \
+	-e 's#^from vega.data.v1 import#from .data.v1 import#' \
 	-e 's#^from vega.snapshot.v1 import#from .snapshot.v1 import#' \
 	-e 's#^from vega.wallet.v1 import#from .wallet.v1 import#' \
 	-e 's#^from vega.checkpoint.v1 import#from .checkpoint.v1 import#' \
@@ -117,7 +117,7 @@ find "$generated_dir/vega/api" -maxdepth 1 -name '*.py' -print0 | xargs -0r sed
 	-e 's#^from vega.api import #from . import #' \
 	-e 's#^from vega.commands.v1 import#from ..commands.v1 import#' \
 	-e 's#^from vega.events.v1 import#from ..events.v1 import#' \
-	-e 's#^from vega.oracles.v1 import#from ..oracles.v1 import#' \
+	-e 's#^from vega.data.v1 import#from ..data.v1 import#' \
 	-e 's#^from vega.snapshot.v1 import#from ..snapshot.v1 import#' \
 	-e 's#^from vega.wallet.v1 import#from ..wallet.v1 import#' \
 	-e 's#^from vega.checkpoint.v1 import#from ..checkpoint.v1 import#' \
@@ -128,26 +128,26 @@ find \
 	"$generated_dir/vega/checkpoint/v1" \
 	"$generated_dir/vega/commands/v1" \
 	"$generated_dir/vega/events/v1" \
-	"$generated_dir/vega/oracles/v1" \
+	"$generated_dir/vega/data/v1" \
 	"$generated_dir/vega/snapshot/v1" \
 	"$generated_dir/vega/wallet/v1" \
 	-maxdepth 1 -name '*.py' -print0 | xargs -0r sed --in-place -r \
 	-e 's#^from vega import ([a-z_]*)_pb2 as#from ... import \1_pb2 as#' \
-	-e 's#^from vega.(api.v1|commands.v1|events.v1|oracles.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ...\1 import #' \
+	-e 's#^from vega.(api.v1|commands.v1|events.v1|data.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ...\1 import #' \
 	-e 's#^import ([a-z_]*_pb2) as #from ... import \1 as #'
 
 find \
 	"$generated_dir/data_node/api/v1" \
 	-maxdepth 1 -name '*.py' -print0 | xargs -0r sed --in-place -r \
 	-e 's#^from vega import ([a-z_]*)_pb2 as#from ....vega import \1_pb2 as#' \
-	-e 's#^from vega.(api.v1|commands.v1|events.v1|oracles.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ....vega.\1 import #' \
+	-e 's#^from vega.(api.v1|commands.v1|events.v1|data.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ....vega.\1 import #' \
 	-e 's#^from data_node.(api.v1) import #from ...\1 import #'
 
 find \
 	"$generated_dir/data_node/api/v2" \
 	-maxdepth 1 -name '*.py' -print0 | xargs -0r sed --in-place -r \
 	-e 's#^from vega import ([a-z_]*)_pb2 as#from ....vega import \1_pb2 as#' \
-	-e 's#^from vega.(api.v1|commands.v1|events.v1|oracles.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ....vega.\1 import #' \
+	-e 's#^from vega.(api.v1|commands.v1|events.v1|data.v1|snapshot.v1|wallet.v1|checkpoint.v1|github.com.mwitkow.go_proto_validators) import #from ....vega.\1 import #' \
 	-e 's#^from data_node.(api.v2) import #from ...\1 import #'
 
 find "$generated_dir" -name '*.py' -print0 | xargs -0r sed --in-place -re 's#[ \t]+$##'
diff --git a/scripts/run-docker-integration-test.sh b/scripts/run-docker-integration-test.sh
@@ -7,6 +7,7 @@ RESULT_DIR="${WORK_DIR}/test_logs/$(date '+%F_%H%M%S')-integration"
 mkdir -p "${RESULT_DIR}"
 
 docker run \
+    --platform linux/amd64 \
     -v "${RESULT_DIR}:/tmp" \
     vega_sim_test:latest \
         pytest -s -v \

diff --git a/tests/integration/test_update_market.py b/tests/integration/test_update_market.py
@@ -9,6 +9,8 @@
 )
 from vega_sim.null_service import VegaServiceNull
 import vega_sim.proto.vega as vega_protos
+import vega_sim.proto.vega.data.v1 as oracles_protos
+import vega_sim.proto.vega.data_source_pb2 as data_source_protos
 
 
 LIQ = WalletConfig("liq", "liq")
@@ -86,19 +88,31 @@ def test_update_market_instrument(vega_service_with_market: VegaServiceNull):
 
     create_and_faucet_wallet(vega=vega, wallet=LIQ)
 
+    oracle_spec_for_settlement_data = data_source_protos.DataSourceDefinition(
+        external=data_source_protos.DataSourceDefinitionExternal(
+            oracle=data_source_protos.DataSourceSpecConfiguration(
+                signers=curr_fut.data_source_spec_for_settlement_data.data.external.oracle.signers,
+                filters=curr_fut.data_source_spec_for_settlement_data.data.external.oracle.filters,
+            )
+        )
+    )
+
+    oracle_spec_for_trading_termination = data_source_protos.DataSourceDefinition(
+        external=data_source_protos.DataSourceDefinitionExternal(
+            oracle=data_source_protos.DataSourceSpecConfiguration(
+                signers=curr_fut.data_source_spec_for_trading_termination.data.external.oracle.signers,
+                filters=curr_fut.data_source_spec_for_trading_termination.data.external.oracle.filters,
+            )
+        )
+    )
+
     pre_market = vega.market_info(market_id)
     curr_inst = pre_market.tradable_instrument.instrument
     curr_fut = curr_inst.future
     curr_fut_prod = vega_protos.governance.UpdateFutureProduct(
         quote_name=curr_fut.quote_name,
-        oracle_spec_for_settlement_data=vega_protos.oracles.v1.spec.OracleSpecConfiguration(
-            pub_keys=curr_fut.oracle_spec_for_settlement_data.pub_keys,
-            filters=curr_fut.oracle_spec_for_settlement_data.filters,
-        ),
-        oracle_spec_for_trading_termination=vega_protos.oracles.v1.spec.OracleSpecConfiguration(
-            pub_keys=curr_fut.oracle_spec_for_trading_termination.pub_keys,
-            filters=curr_fut.oracle_spec_for_trading_termination.filters,
-        ),
+        oracle_spec_for_settlement_data=oracle_spec_for_settlement_data,
+        oracle_spec_for_trading_termination=oracle_spec_for_trading_termination,
         oracle_spec_binding=curr_fut.oracle_spec_binding,
         settlement_data_decimals=curr_fut.settlement_data_decimals,
     )

diff --git a/tests/vega_sim/api/test_data.py b/tests/vega_sim/api/test_data.py
@@ -57,28 +57,28 @@ def ListAccounts(self, request, context):
                 edges=[
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
+                        account=data_node_protos_v2.trading_data.AccountBalance(
                             balance="1051",
                             type=vega_protos.vega.ACCOUNT_TYPE_BOND,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
+                        account=data_node_protos_v2.trading_data.AccountBalance(
                             balance="2041",
                             type=vega_protos.vega.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
+                        account=data_node_protos_v2.trading_data.AccountBalance(
                             balance="5235",
                             type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
+                        account=data_node_protos_v2.trading_data.AccountBalance(
                             balance="6423",
                             type=vega_protos.vega.ACCOUNT_TYPE_MARGIN,
                         ),

diff --git a/tests/vega_sim/api/test_data_raw.py b/tests/vega_sim/api/test_data_raw.py
@@ -83,7 +83,6 @@ class MockCoreServicer(CoreServiceServicer):
 
 def test_positions_by_market(trading_data_v2_servicer_and_port):
     def ListPositions(self, request, context):
-
         return data_node_protos_v2.trading_data.ListPositionsResponse(
             positions=data_node_protos_v2.trading_data.PositionConnection(
                 page_info=data_node_protos_v2.trading_data.PageInfo(
@@ -139,7 +138,6 @@ def ListPositions(self, request, context):
 
 def test_all_markets(trading_data_v2_servicer_and_port):
     def ListMarkets(self, request, context):
-
         return data_node_protos_v2.trading_data.ListMarketsResponse(
             markets=data_node_protos_v2.trading_data.MarketConnection(
                 page_info=data_node_protos_v2.trading_data.PageInfo(
@@ -230,14 +228,14 @@ def GetAsset(self, request, context):
 
 def test_all_market_accounts(trading_data_v2_servicer_and_port):
     expected = {
-        vega_protos.vega.ACCOUNT_TYPE_BOND: vega_protos.vega.Account(
-            id="a1",
+        vega_protos.vega.ACCOUNT_TYPE_BOND: data_node_protos_v2.trading_data.AccountBalance(
+            owner="a1",
             asset="asset1",
             market_id="market1",
             type=vega_protos.vega.ACCOUNT_TYPE_BOND,
         ),
-        vega_protos.vega.ACCOUNT_TYPE_GENERAL: vega_protos.vega.Account(
-            id="a2",
+        vega_protos.vega.ACCOUNT_TYPE_GENERAL: data_node_protos_v2.trading_data.AccountBalance(
+            owner="a2",
             asset="asset1",
             market_id="market1",
             type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
@@ -256,17 +254,17 @@ def ListAccounts(self, request, context):
                 edges=[
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="a1",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="a1",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_BOND,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="a2",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="a2",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
@@ -291,14 +289,14 @@ def ListAccounts(self, request, context):
 
 def test_market_accounts(trading_data_v2_servicer_and_port):
     expected = MarketAccount(
-        vega_protos.vega.Account(
-            id="ins",
+        data_node_protos_v2.trading_data.AccountBalance(
+            owner="ins",
             asset="asset1",
             market_id="market1",
             type=vega_protos.vega.ACCOUNT_TYPE_INSURANCE,
         ),
-        vega_protos.vega.Account(
-            id="liq",
+        data_node_protos_v2.trading_data.AccountBalance(
+            owner="liq",
             asset="asset1",
             market_id="market1",
             type=vega_protos.vega.ACCOUNT_TYPE_FEES_LIQUIDITY,
@@ -317,35 +315,35 @@ def ListAccounts(self, request, context):
                 edges=[
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="a1",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="a1",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_BOND,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="a2",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="a2",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="liq",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="liq",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         ),
                     ),
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="ins",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="ins",
                             asset=request.filter.asset_id,
                             market_id=request.filter.market_ids[0],
                             type=vega_protos.vega.ACCOUNT_TYPE_INSURANCE,
@@ -390,8 +388,8 @@ def GetLatestMarketData(self, request, context):
 
 
 def test_infrastructure_fee_accounts(trading_data_v2_servicer_and_port):
-    expected = vega_protos.vega.Account(
-        id="inf",
+    expected = data_node_protos_v2.trading_data.AccountBalance(
+        owner="inf",
         asset="asset1",
         type=vega_protos.vega.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
     )
@@ -408,8 +406,8 @@ def ListAccounts(self, request, context):
                 edges=[
                     data_node_protos_v2.trading_data.AccountEdge(
                         cursor="cursor",
-                        account=vega_protos.vega.Account(
-                            id="inf",
+                        account=data_node_protos_v2.trading_data.AccountBalance(
+                            owner="inf",
                             asset=request.filter.asset_id,
                             type=vega_protos.vega.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
                         ),