From cd94a2012730ed2b4ca11f875e62f6c3ccb279de Mon Sep 17 00:00:00 2001 From: ze97286 Date: Mon, 12 Feb 2024 11:56:26 +0000 Subject: [PATCH 1/7] fix: governance update for perps internal composite price fixed --- CHANGELOG.md | 1 + core/governance/engine.go | 1 + core/types/governance_update_market.go | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0881fb8afae..29de04b3757 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -210,6 +210,7 @@ - [10604](https://github.com/vegaprotocol/vega/issues/10604) - Register margin modes API subscriber. - [10595](https://github.com/vegaprotocol/vega/issues/10595) - Fix failed amends for isolated margin orders causing negative spread in console. - [10606](https://github.com/vegaprotocol/vega/issues/10606) - Party profiles `API` was not returning results. +- [10611](https://github.com/vegaprotocol/vega/issues/10611) - Added internal config price to update `perps`. ## 0.73.0 diff --git a/core/governance/engine.go b/core/governance/engine.go index 8ac25fd85c3..f75c297680d 100644 --- a/core/governance/engine.go +++ b/core/governance/engine.go @@ -1266,6 +1266,7 @@ func (e *Engine) updatedMarketFromProposal(p *proposal) (*types.Market, types.Pr DataSourceSpecForSettlementData: product.Perps.DataSourceSpecForSettlementData, DataSourceSpecForSettlementSchedule: product.Perps.DataSourceSpecForSettlementSchedule, DataSourceSpecBinding: product.Perps.DataSourceSpecBinding, + InternalCompositePriceConfig: product.Perps.InternalCompositePrice, }, } default: diff --git a/core/types/governance_update_market.go b/core/types/governance_update_market.go index 5c0ec3d5389..6f429fc6754 100644 --- a/core/types/governance_update_market.go +++ b/core/types/governance_update_market.go @@ -520,6 +520,11 @@ func UpdateInstrumentConfigurationFromProto(p *vegapb.UpdateInstrumentConfigurat upperBound = &d } + var ipc *CompositePriceConfiguration + if pr.Perpetual.InternalCompositePriceConfiguration != nil { + ipc = CompositePriceConfigurationFromProto(pr.Perpetual.InternalCompositePriceConfiguration) + } + r.Product = &UpdateInstrumentConfigurationPerps{ Perps: &UpdatePerpsProduct{ QuoteName: pr.Perpetual.QuoteName, @@ -533,6 +538,7 @@ func UpdateInstrumentConfigurationFromProto(p *vegapb.UpdateInstrumentConfigurat DataSourceSpecForSettlementData: *datasource.NewDefinitionWith(settlement), DataSourceSpecForSettlementSchedule: *datasource.NewDefinitionWith(settlementSchedule), DataSourceSpecBinding: datasource.SpecBindingForPerpsFromProto(pr.Perpetual.DataSourceSpecBinding), + InternalCompositePrice: ipc, }, } } @@ -589,6 +595,7 @@ type UpdatePerpsProduct struct { DataSourceSpecForSettlementData dsdefinition.Definition DataSourceSpecForSettlementSchedule dsdefinition.Definition DataSourceSpecBinding *datasource.SpecBindingForPerps + InternalCompositePrice *CompositePriceConfiguration } func (p UpdatePerpsProduct) IntoProto() *vegapb.UpdatePerpetualProduct { @@ -603,6 +610,11 @@ func (p UpdatePerpsProduct) IntoProto() *vegapb.UpdatePerpetualProduct { upperBound = ptr.From(p.FundingRateUpperBound.String()) } + var ipc *vegapb.CompositePriceConfiguration + if p.InternalCompositePrice != nil { + ipc = p.InternalCompositePrice.IntoProto() + } + return &vegapb.UpdatePerpetualProduct{ QuoteName: p.QuoteName, MarginFundingFactor: p.MarginFundingFactor.String(), @@ -615,6 +627,7 @@ func (p UpdatePerpsProduct) IntoProto() *vegapb.UpdatePerpetualProduct { DataSourceSpecForSettlementData: p.DataSourceSpecForSettlementData.IntoProto(), DataSourceSpecForSettlementSchedule: p.DataSourceSpecForSettlementSchedule.IntoProto(), DataSourceSpecBinding: p.DataSourceSpecBinding.IntoProto(), + InternalCompositePriceConfiguration: ipc, } } @@ -628,6 +641,7 @@ func (p UpdatePerpsProduct) DeepClone() *UpdatePerpsProduct { DataSourceSpecForSettlementData: *p.DataSourceSpecForSettlementData.DeepClone().(*dsdefinition.Definition), DataSourceSpecForSettlementSchedule: *p.DataSourceSpecForSettlementSchedule.DeepClone().(*dsdefinition.Definition), DataSourceSpecBinding: p.DataSourceSpecBinding.DeepClone(), + InternalCompositePrice: p.InternalCompositePrice.DeepClone(), } } From 43bdb07bdb37101f6603a5909561fd632c405e6d Mon Sep 17 00:00:00 2001 From: ze97286 Date: Mon, 12 Feb 2024 14:09:00 +0000 Subject: [PATCH 2/7] fix: wire oracle scaling function in update of internal composite price --- core/execution/future/market.go | 1 + 1 file changed, 1 insertion(+) diff --git a/core/execution/future/market.go b/core/execution/future/market.go index 8a1e390bba2..3542933e15d 100644 --- a/core/execution/future/market.go +++ b/core/execution/future/market.go @@ -621,6 +621,7 @@ func (m *Market) Update(ctx context.Context, config *types.Market, oracleEngine } else if internalCompositePriceConfig != nil { // it's a new index calculator m.internalCompositePriceCalculator = NewCompositePriceCalculator(ctx, internalCompositePriceConfig, oracleEngine, m.timeService) + m.internalCompositePriceCalculator.setOraclePriceScalingFunc(m.scaleOracleData) } } From 2021a8421c263d92237fe37382b7c1ff523d2cd4 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 12 Feb 2024 15:56:44 +0000 Subject: [PATCH 3/7] fix: store maker fees paid --- core/execution/common/market_activity_tracker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/execution/common/market_activity_tracker.go b/core/execution/common/market_activity_tracker.go index 1940bfbf6b0..a51c9723348 100644 --- a/core/execution/common/market_activity_tracker.go +++ b/core/execution/common/market_activity_tracker.go @@ -418,7 +418,7 @@ func (mt *marketTracker) clearFeeActivity() { mt.epochTotalLpFees = mt.epochTotalLpFees[1:] } mt.epochMakerFeesReceived = append(mt.epochMakerFeesReceived, mt.makerFeesReceived) - mt.epochMakerFeesPaid = append(mt.epochMakerFeesReceived, mt.makerFeesPaid) + mt.epochMakerFeesPaid = append(mt.epochMakerFeesPaid, mt.makerFeesPaid) mt.epochLpFees = append(mt.epochLpFees, mt.lpFees) mt.makerFeesReceived = map[string]*num.Uint{} mt.makerFeesPaid = map[string]*num.Uint{} From 0c6a52b9fd4785ec9bd3a23ea4bc33d769a76635 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 12 Feb 2024 15:57:45 +0000 Subject: [PATCH 4/7] feat: add test for bug and fix --- .../verified/rewards-over-window.feature | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 core/integration/features/verified/rewards-over-window.feature diff --git a/core/integration/features/verified/rewards-over-window.feature b/core/integration/features/verified/rewards-over-window.feature new file mode 100644 index 00000000000..8f184b9ea59 --- /dev/null +++ b/core/integration/features/verified/rewards-over-window.feature @@ -0,0 +1,116 @@ +Feature: Maker fees paid reward metric calculated correctly for time window + + # Test checks bug where previous maker fees received were being stored in place of + # maker fees paid in the market activity tracker. + + Background: + + # Initialise the network + Given time is updated to "2023-01-01T00:00:00Z" + And the average block duration is "1" + And the following network parameters are set: + | name | value | + | market.fee.factors.makerFee | 0.001 | + | network.markPriceUpdateMaximumFrequency | 0s | + | market.auction.minimumDuration | 1 | + | validators.epoch.length | 60s | + | limits.markets.maxPeggedOrders | 4 | + | referralProgram.minStakedVegaTokens | 0 | + + # Initialise the markets + And the following assets are registered: + | id | decimal places | quantum | + | USD-1-10 | 1 | 10 | + And the markets: + | id | quote name | asset | risk model | margin calculator | auction duration | fees | price monitoring | data source config | linear slippage factor | quadratic slippage factor | sla params | decimal places | position decimal places | + | ETH/USD-1-10 | ETH | USD-1-10 | default-log-normal-risk-model | default-margin-calculator | 1 | default-none | default-none | default-eth-for-future | 1e-3 | 0 | default-futures | 0 | 0 | + + # Initialise the parties + Given the parties deposit on asset's general account the following amount: + | party | asset | amount | + | lpprov | USD-1-10 | 10000000000 | + | aux1 | USD-1-10 | 10000000 | + | aux2 | USD-1-10 | 10000000 | + | referrer1 | USD-1-10 | 10000000 | + | referee1 | USD-1-10 | 10000000 | + | referee2 | USD-1-10 | 10000000 | + | referee3 | USD-1-10 | 10000000 | + | a3c024b4e23230c89884a54a813b1ecb4cb0f827a38641c66eeca466da6b2ddf | USD-1-10 | 10000000 | + + # Exit opening auctions + Given the parties submit the following liquidity provision: + | id | party | market id | commitment amount | fee | lp type | + | lp1 | lpprov | ETH/USD-1-10 | 1000000 | 0.01 | submission | + And the parties place the following pegged iceberg orders: + | party | market id | peak size | minimum visible size | side | pegged reference | volume | offset | + | lpprov | ETH/USD-1-10 | 5000 | 1000 | buy | BID | 10000 | 1 | + | lpprov | ETH/USD-1-10 | 5000 | 1000 | sell | ASK | 10000 | 1 | + When the parties place the following orders: + | party | market id | side | volume | price | resulting trades | type | tif | + | aux1 | ETH/USD-1-10 | buy | 1 | 990 | 0 | TYPE_LIMIT | TIF_GTC | + | aux1 | ETH/USD-1-10 | buy | 1 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | aux1 | ETH/USD-1-10 | sell | 1 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | aux2 | ETH/USD-1-10 | sell | 1 | 1100 | 0 | TYPE_LIMIT | TIF_GTC | + And the opening auction period ends for market "ETH/USD-1-10" + When the network moves ahead "1" blocks + And the trading mode should be "TRADING_MODE_CONTINUOUS" for the market "ETH/USD-1-10" + + # Create the teams + Given the parties create the following referral codes: + | party | code | is_team | team | + | referrer1 | referral-code-1 | true | team1 | + | referrer2 | referral-code-2 | true | team2 | + And the parties apply the following referral codes: + | party | code | is_team | team | + | referee1 | referral-code-1 | true | team1 | + | referee2 | referral-code-2 | true | team2 | + | referee3 | referral-code-2 | true | team2 | + And the team "team1" has the following members: + | party | + | referrer1 | + | referee1 | + And the team "team2" has the following members: + | party | + | referrer2 | + | referee2 | + | referee3 | + + + Scenario: Party funds pool with recurring transfer scoping individuals + + Given the parties submit the following recurring transfers: + | id | from | from_account_type | to | to_account_type | entity_scope | teams | ntop | asset | amount | start_epoch | end_epoch | factor | metric | metric_asset | markets | window_length | + | 1 | a3c024b4e23230c89884a54a813b1ecb4cb0f827a38641c66eeca466da6b2ddf | ACCOUNT_TYPE_GENERAL | 0000000000000000000000000000000000000000000000000000000000000000 | ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES | INDIVIDUALS | | 1 | USD-1-10 | 10000 | 1 | | 1 | DISPATCH_METRIC_MAKER_FEES_PAID | USD-1-10 | ETH/USD-1-10 | 2 | + And the parties place the following orders: + | party | market id | side | volume | price | resulting trades | type | tif | + | referrer1 | ETH/USD-1-10 | sell | 10 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee1 | ETH/USD-1-10 | buy | 10 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + | referrer1 | ETH/USD-1-10 | sell | 10 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee2 | ETH/USD-1-10 | buy | 10 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + | referrer1 | ETH/USD-1-10 | sell | 5 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee3 | ETH/USD-1-10 | buy | 5 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + When the network moves ahead "1" epochs + + Then "referee1" should have vesting account balance of "4000" for asset "USD-1-10" + And "referee2" should have vesting account balance of "4000" for asset "USD-1-10" + And "referee3" should have vesting account balance of "2000" for asset "USD-1-10" + + + Scenario: Party funds pool with recurring transfer scoping teams + + Given the parties submit the following recurring transfers: + | id | from | from_account_type | to | to_account_type | entity_scope | teams | ntop | asset | amount | start_epoch | end_epoch | factor | metric | metric_asset | markets | window_length | + | 1 | a3c024b4e23230c89884a54a813b1ecb4cb0f827a38641c66eeca466da6b2ddf | ACCOUNT_TYPE_GENERAL | 0000000000000000000000000000000000000000000000000000000000000000 | ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES | TEAMS | | 1 | USD-1-10 | 10000 | 1 | | 1 | DISPATCH_METRIC_MAKER_FEES_PAID | USD-1-10 | ETH/USD-1-10 | 2 | + And the parties place the following orders: + | party | market id | side | volume | price | resulting trades | type | tif | + | referrer1 | ETH/USD-1-10 | sell | 10 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee1 | ETH/USD-1-10 | buy | 10 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + | referrer1 | ETH/USD-1-10 | sell | 10 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee2 | ETH/USD-1-10 | buy | 10 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + | referrer1 | ETH/USD-1-10 | sell | 5 | 1000 | 0 | TYPE_LIMIT | TIF_GTC | + | referee3 | ETH/USD-1-10 | buy | 5 | 1000 | 1 | TYPE_LIMIT | TIF_GTC | + When the network moves ahead "1" epochs + + Then "referee1" should have vesting account balance of "5000" for asset "USD-1-10" + And "referee2" should have vesting account balance of "2500" for asset "USD-1-10" + And "referee3" should have vesting account balance of "2500" for asset "USD-1-10" From 19462206a145407d696e493433c95e80605bc6c0 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 12 Feb 2024 16:20:20 +0000 Subject: [PATCH 5/7] chore: update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29de04b3757..725265622f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -211,6 +211,7 @@ - [10595](https://github.com/vegaprotocol/vega/issues/10595) - Fix failed amends for isolated margin orders causing negative spread in console. - [10606](https://github.com/vegaprotocol/vega/issues/10606) - Party profiles `API` was not returning results. - [10611](https://github.com/vegaprotocol/vega/issues/10611) - Added internal config price to update `perps`. +- [10621](https://github.com/vegaprotocol/vega/issues/10516) - Fix market activity tracker storing incorrect data for previous epochMakerFeesPaid ## 0.73.0 @@ -839,6 +840,7 @@ - [9793](https://github.com/vegaprotocol/vega/issues/9793) - Map network owner correctly in creating account from transfer. - [10516](https://github.com/vegaprotocol/vega/issues/10516) - Fix mapping of estimate position. + ## 0.70.0 ### 🚨 Breaking changes From 709e71b54660545c120709d37210cfdafbeae2a4 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 12 Feb 2024 16:24:29 +0000 Subject: [PATCH 6/7] chore: fix typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 725265622f1..e1d802c3bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -211,7 +211,7 @@ - [10595](https://github.com/vegaprotocol/vega/issues/10595) - Fix failed amends for isolated margin orders causing negative spread in console. - [10606](https://github.com/vegaprotocol/vega/issues/10606) - Party profiles `API` was not returning results. - [10611](https://github.com/vegaprotocol/vega/issues/10611) - Added internal config price to update `perps`. -- [10621](https://github.com/vegaprotocol/vega/issues/10516) - Fix market activity tracker storing incorrect data for previous epochMakerFeesPaid +- [10621](https://github.com/vegaprotocol/vega/issues/10516) - Fix market activity tracker storing incorrect data for previous `epochMakerFeesPaid`. ## 0.73.0 From ec33b5efd52798e684c5ddb17fd65d4aa920db76 Mon Sep 17 00:00:00 2001 From: Jeremy Letang Date: Mon, 12 Feb 2024 15:31:06 +0000 Subject: [PATCH 7/7] chore: release v0.74.1 Signed-off-by: Jeremy Letang --- CHANGELOG.md | 11 +++++++++-- protos/blockexplorer/api/v1/blockexplorer.pb.go | 2 +- protos/data-node/api/v2/trading_data.pb.go | 2 +- .../sources/blockexplorer/api/v1/blockexplorer.proto | 2 +- protos/sources/data-node/api/v2/trading_data.proto | 2 +- protos/sources/vega/api/v1/core.proto | 2 +- protos/sources/vega/api/v1/corestate.proto | 2 +- protos/vega/api/v1/core.pb.go | 2 +- protos/vega/api/v1/corestate.pb.go | 2 +- version/version.go | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d802c3bb5..22052c8f5d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,15 @@ - [](https://github.com/vegaprotocol/vega/issues/xxx) - +## 0.74.1 + +### 🐛 Fixes + +- [10611](https://github.com/vegaprotocol/vega/issues/10611) - Added internal config price to update `perps`. +- [10615](https://github.com/vegaprotocol/vega/issues/10615) - Fix oracle scaling function in internal composite price. +- [10621](https://github.com/vegaprotocol/vega/issues/10516) - Fix market activity tracker storing incorrect data for previous `epochMakerFeesPaid`. + + ## 0.74.0 ### 🚨 Breaking changes @@ -210,8 +219,6 @@ - [10604](https://github.com/vegaprotocol/vega/issues/10604) - Register margin modes API subscriber. - [10595](https://github.com/vegaprotocol/vega/issues/10595) - Fix failed amends for isolated margin orders causing negative spread in console. - [10606](https://github.com/vegaprotocol/vega/issues/10606) - Party profiles `API` was not returning results. -- [10611](https://github.com/vegaprotocol/vega/issues/10611) - Added internal config price to update `perps`. -- [10621](https://github.com/vegaprotocol/vega/issues/10516) - Fix market activity tracker storing incorrect data for previous `epochMakerFeesPaid`. ## 0.73.0 diff --git a/protos/blockexplorer/api/v1/blockexplorer.pb.go b/protos/blockexplorer/api/v1/blockexplorer.pb.go index 9abc927da42..d6afe333020 100644 --- a/protos/blockexplorer/api/v1/blockexplorer.pb.go +++ b/protos/blockexplorer/api/v1/blockexplorer.pb.go @@ -656,7 +656,7 @@ var file_blockexplorer_api_v1_blockexplorer_proto_rawDesc = []byte{ 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x92, 0x41, 0x3e, 0x12, 0x23, 0x0a, 0x18, 0x56, 0x65, 0x67, 0x61, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x72, 0x20, - 0x41, 0x50, 0x49, 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x30, 0x1a, 0x13, 0x6c, + 0x41, 0x50, 0x49, 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x31, 0x1a, 0x13, 0x6c, 0x62, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x6e, 0x65, 0x74, 0x2e, 0x76, 0x65, 0x67, 0x61, 0x2e, 0x78, 0x79, 0x7a, 0x2a, 0x02, 0x01, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/protos/data-node/api/v2/trading_data.pb.go b/protos/data-node/api/v2/trading_data.pb.go index 733c3217a63..4c44614a5a6 100644 --- a/protos/data-node/api/v2/trading_data.pb.go +++ b/protos/data-node/api/v2/trading_data.pb.go @@ -30128,7 +30128,7 @@ var file_data_node_api_v2_trading_data_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x92, 0x41, 0x8f, 0x01, 0x12, 0x1e, 0x0a, 0x13, 0x56, 0x65, 0x67, 0x61, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x41, 0x50, 0x49, - 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x30, 0x1a, 0x1c, 0x68, 0x74, 0x74, 0x70, + 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x31, 0x1a, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x61, 0x70, 0x69, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x6e, 0x65, 0x74, 0x2e, 0x76, 0x65, 0x67, 0x61, 0x2e, 0x78, 0x79, 0x7a, 0x2a, 0x02, 0x01, 0x02, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x39, diff --git a/protos/sources/blockexplorer/api/v1/blockexplorer.proto b/protos/sources/blockexplorer/api/v1/blockexplorer.proto index 2ba778535ce..83d1f8a9b8e 100644 --- a/protos/sources/blockexplorer/api/v1/blockexplorer.proto +++ b/protos/sources/blockexplorer/api/v1/blockexplorer.proto @@ -11,7 +11,7 @@ option go_package = "code.vegaprotocol.io/vega/protos/blockexplorer/api/v1"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Vega block explorer APIs"; - version: "v0.74.0"; + version: "v0.74.1"; } schemes: [ HTTP, diff --git a/protos/sources/data-node/api/v2/trading_data.proto b/protos/sources/data-node/api/v2/trading_data.proto index 5529296ffa7..94d72e22d3f 100644 --- a/protos/sources/data-node/api/v2/trading_data.proto +++ b/protos/sources/data-node/api/v2/trading_data.proto @@ -17,7 +17,7 @@ option go_package = "code.vegaprotocol.io/vega/protos/data-node/api/v2"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Vega data node APIs"; - version: "v0.74.0"; + version: "v0.74.1"; } schemes: [ HTTP, diff --git a/protos/sources/vega/api/v1/core.proto b/protos/sources/vega/api/v1/core.proto index 9611fc372fd..7ec585c6c6a 100644 --- a/protos/sources/vega/api/v1/core.proto +++ b/protos/sources/vega/api/v1/core.proto @@ -12,7 +12,7 @@ option go_package = "code.vegaprotocol.io/vega/protos/vega/api/v1"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Vega core APIs"; - version: "v0.74.0"; + version: "v0.74.1"; } schemes: [ HTTP, diff --git a/protos/sources/vega/api/v1/corestate.proto b/protos/sources/vega/api/v1/corestate.proto index 942a7876ab4..5b8c59c9af8 100644 --- a/protos/sources/vega/api/v1/corestate.proto +++ b/protos/sources/vega/api/v1/corestate.proto @@ -13,7 +13,7 @@ option go_package = "code.vegaprotocol.io/vega/protos/vega/api/v1"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Vega core state APIs"; - version: "v0.74.0"; + version: "v0.74.1"; } schemes: [ HTTP, diff --git a/protos/vega/api/v1/core.pb.go b/protos/vega/api/v1/core.pb.go index 35a14aee698..170ffb449b1 100644 --- a/protos/vega/api/v1/core.pb.go +++ b/protos/vega/api/v1/core.pb.go @@ -2796,7 +2796,7 @@ var file_vega_api_v1_core_proto_rawDesc = []byte{ 0x6f, 0x6c, 0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x65, 0x67, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x76, 0x65, 0x67, 0x61, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x92, 0x41, 0x34, 0x12, 0x19, 0x0a, 0x0e, 0x56, 0x65, 0x67, 0x61, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x41, 0x50, - 0x49, 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x30, 0x1a, 0x13, 0x6c, 0x62, 0x2e, + 0x49, 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, 0x2e, 0x31, 0x1a, 0x13, 0x6c, 0x62, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x6e, 0x65, 0x74, 0x2e, 0x76, 0x65, 0x67, 0x61, 0x2e, 0x78, 0x79, 0x7a, 0x2a, 0x02, 0x01, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/protos/vega/api/v1/corestate.pb.go b/protos/vega/api/v1/corestate.pb.go index 9873b198ebf..4bba393a175 100644 --- a/protos/vega/api/v1/corestate.pb.go +++ b/protos/vega/api/v1/corestate.pb.go @@ -1512,7 +1512,7 @@ var file_vega_api_v1_corestate_proto_rawDesc = []byte{ 0x6f, 0x73, 0x2f, 0x76, 0x65, 0x67, 0x61, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x92, 0x41, 0x3a, 0x12, 0x1f, 0x0a, 0x14, 0x56, 0x65, 0x67, 0x61, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x41, 0x50, 0x49, 0x73, 0x32, 0x07, 0x76, 0x30, 0x2e, 0x37, 0x34, - 0x2e, 0x30, 0x1a, 0x13, 0x6c, 0x62, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x6e, 0x65, 0x74, 0x2e, 0x76, + 0x2e, 0x31, 0x1a, 0x13, 0x6c, 0x62, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x6e, 0x65, 0x74, 0x2e, 0x76, 0x65, 0x67, 0x61, 0x2e, 0x78, 0x79, 0x7a, 0x2a, 0x02, 0x01, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/version/version.go b/version/version.go index 413a48275cf..eb0e2acd290 100644 --- a/version/version.go +++ b/version/version.go @@ -22,7 +22,7 @@ import ( var ( cliVersionHash = "" - cliVersion = "v0.74.0" + cliVersion = "v0.74.1" ) func init() {