diff --git a/apps/explorer/project.json b/apps/explorer/project.json index 9cfabdf0f..61cdaa40d 100644 --- a/apps/explorer/project.json +++ b/apps/explorer/project.json @@ -70,7 +70,7 @@ "executor": "@nrwl/workspace:run-commands", "options": { "commands": [ - "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.65.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types" + "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.66.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types" ] } }, diff --git a/apps/explorer/src/app/routes/markets/__generated__/Markets.ts b/apps/explorer/src/app/routes/markets/__generated__/Markets.ts index a651b1d48..3ef1a43f3 100644 --- a/apps/explorer/src/app/routes/markets/__generated__/Markets.ts +++ b/apps/explorer/src/app/routes/markets/__generated__/Markets.ts @@ -6,7 +6,7 @@ const defaultOptions = {} as const; export type ExplorerMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>; -export type ExplorerMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, tradingMode: Types.MarketTradingMode, state: Types.MarketState, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array | null }, product: { __typename?: 'Future', settlementAsset: { __typename?: 'Asset', id: string, name: string, decimals: number, globalRewardPoolAccount?: { __typename?: 'AccountBalance', balance: string } | null } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, proposal?: { __typename?: 'Proposal', id?: string | null } | null, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', balance: string, type: Types.AccountType, asset: { __typename?: 'Asset', id: string, name: string } } } | null> | null } | null, data?: { __typename?: 'MarketData', markPrice: string, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, midPrice: string, staticMidPrice: string, timestamp: any, openInterest: string, auctionEnd?: string | null, auctionStart?: string | null, indicativePrice: string, indicativeVolume: string, trigger: Types.AuctionTrigger, extensionTrigger: Types.AuctionTrigger, targetStake?: string | null, suppliedStake?: string | null, marketValueProxy: string, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', auctionExtensionSecs: number, probability: number } }> | null, liquidityProviderFeeShare?: Array<{ __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, party: { __typename?: 'Party', id: string } }> | null } | null } }> } | null }; +export type ExplorerMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, tradingMode: Types.MarketTradingMode, state: Types.MarketState, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array | null }, product: { __typename?: 'Future', settlementAsset: { __typename?: 'Asset', id: string, name: string, decimals: number, globalRewardPoolAccount?: { __typename?: 'AccountBalance', balance: string } | null } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, proposal?: { __typename?: 'Proposal', id?: string | null } | null, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', balance: string, type: Types.AccountType, asset: { __typename?: 'Asset', id: string, name: string } } } | null> | null } | null, data?: { __typename?: 'MarketData', markPrice: string, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, midPrice: string, staticMidPrice: string, timestamp: any, openInterest: string, auctionEnd?: string | null, auctionStart?: string | null, indicativePrice: string, indicativeVolume: string, trigger: Types.AuctionTrigger, extensionTrigger: Types.AuctionTrigger, targetStake?: string | null, suppliedStake?: string | null, marketValueProxy: string, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', auctionExtensionSecs: number, probability: number } }> | null, liquidityProviderFeeShare?: Array<{ __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, party: { __typename?: 'Party', id: string } }> | null } | null } }> } | null }; export const ExplorerMarketsDocument = gql` diff --git a/apps/explorer/src/types/explorer.d.ts b/apps/explorer/src/types/explorer.d.ts index 5ef6211ad..50536c2c5 100644 --- a/apps/explorer/src/types/explorer.d.ts +++ b/apps/explorer/src/types/explorer.d.ts @@ -15,7 +15,6 @@ type OneOf = T extends [infer Only] ? OneOf<[XOR, ...Rest]> : never; /* eslint-enable @typescript-eslint/no-explicit-any */ - export interface paths { '/info': { /** @@ -41,6 +40,8 @@ export interface paths { }; } +export type webhooks = Record; + export interface components { schemas: { /** @@ -458,7 +459,40 @@ export interface components { readonly v1NodeVote: { /** Reference, required field */ readonly reference?: string; + /** type of NodeVote, also required */ + readonly type?: components['schemas']['v1NodeVoteType']; }; + /** + * - TYPE_UNSPECIFIED: Represents an unspecified or missing value from the input + * - TYPE_STAKE_DEPOSITED: A node vote a new stake deposit + * - TYPE_STAKE_REMOVED: A node vote for a new stake removed event + * - TYPE_FUNDS_DEPOSITED: A node vote for new collateral deposited + * - TYPE_SIGNER_ADDED: A node vote for a new signer added to the erc20 bridge + * - TYPE_SIGNER_REMOVED: A node vote for a signer removed from the erc20 bridge + * - TYPE_BRIDGE_STOPPED: A node vote for a bridge stopped event + * - TYPE_BRIDGE_RESUMED: A node vote for a bridge resumed event + * - TYPE_ASSET_LISTED: A node vote for a newly listed asset + * - TYPE_LIMITS_UPDATED: A node vote for an asset limits update + * - TYPE_STAKE_TOTAL_SUPPLY: A node vote to share the total supply of the staking token + * - TYPE_SIGNER_THRESHOLD_SET: A node vote to update the threshold of the signer set for the multisig contract + * - TYPE_GOVERNANCE_VALIDATE_ASSET: A node vote to validate a new assert governance proposal + * @default TYPE_UNSPECIFIED + * @enum {string} + */ + readonly v1NodeVoteType: + | 'TYPE_UNSPECIFIED' + | 'TYPE_STAKE_DEPOSITED' + | 'TYPE_STAKE_REMOVED' + | 'TYPE_FUNDS_DEPOSITED' + | 'TYPE_SIGNER_ADDED' + | 'TYPE_SIGNER_REMOVED' + | 'TYPE_BRIDGE_STOPPED' + | 'TYPE_BRIDGE_RESUMED' + | 'TYPE_ASSET_LISTED' + | 'TYPE_LIMITS_UPDATED' + | 'TYPE_STAKE_TOTAL_SUPPLY' + | 'TYPE_SIGNER_THRESHOLD_SET' + | 'TYPE_GOVERNANCE_VALIDATE_ASSET'; /** Specific details for a one off transfer */ readonly v1OneOffTransfer: { /** @@ -1111,11 +1145,8 @@ export interface components { readonly auctionExtension?: string; /** Specifies parameters related to target stake calculation */ readonly targetStakeParameters?: components['schemas']['vegaTargetStakeParameters']; - /** - * Specifies the triggering ratio for entering liquidity auction - * Format: double - */ - readonly triggeringRatio?: number; + /** Specifies the triggering ratio for entering liquidity auction */ + readonly triggeringRatio?: string; }; /** Represents a liquidity order */ readonly vegaLiquidityOrder: { diff --git a/apps/token-e2e/src/fixtures/proposals/new-market.json b/apps/token-e2e/src/fixtures/proposals/new-market.json index e95574354..6e49addbe 100644 --- a/apps/token-e2e/src/fixtures/proposals/new-market.json +++ b/apps/token-e2e/src/fixtures/proposals/new-market.json @@ -78,7 +78,7 @@ "timeWindow": "3600", "scalingFactor": 10 }, - "triggeringRatio": 0.7, + "triggeringRatio": "0.7", "auctionExtension": "1" }, "logNormal": { diff --git a/apps/token/src/routes/proposals/proposal/__generated__/Proposal.ts b/apps/token/src/routes/proposals/proposal/__generated__/Proposal.ts index 657cbc661..4b555ee0e 100644 --- a/apps/token/src/routes/proposals/proposal/__generated__/Proposal.ts +++ b/apps/token/src/routes/proposals/proposal/__generated__/Proposal.ts @@ -8,7 +8,7 @@ export type ProposalQueryVariables = Types.Exact<{ }>; -export type ProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', metadata?: Array | null, instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string, dataSourceSpecForSettlementData: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename?: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | null } | { __typename?: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } | null }; +export type ProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', decimalPlaces: number, metadata?: Array | null, instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } | null } } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', metadata?: Array | null, instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string, dataSourceSpecForSettlementData: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', operator: Types.ConditionOperator, value?: string | null } | null> } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename?: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | null } | { __typename?: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } | null }; export const ProposalDocument = gql` diff --git a/apps/trading/client-pages/liquidity/liquidity.tsx b/apps/trading/client-pages/liquidity/liquidity.tsx index 5a9c10ae1..541ffb973 100644 --- a/apps/trading/client-pages/liquidity/liquidity.tsx +++ b/apps/trading/client-pages/liquidity/liquidity.tsx @@ -252,7 +252,7 @@ export const LiquidityViewContainer = ({ ]); const stakeToCcyVolume = params.market_liquidity_stakeToCcyVolume; const triggeringRatio = - params.market_liquidity_targetstake_triggering_ratio || 1; + params.market_liquidity_targetstake_triggering_ratio || '1'; const myLpEdges = useMemo( () => liquidityProviders?.filter((e) => e.party.id === pubKey), [liquidityProviders, pubKey] diff --git a/libs/governance/src/lib/proposals-data-provider/__generated__/Proposals.ts b/libs/governance/src/lib/proposals-data-provider/__generated__/Proposals.ts index 675a1f3f4..41ed9bc0c 100644 --- a/libs/governance/src/lib/proposals-data-provider/__generated__/Proposals.ts +++ b/libs/governance/src/lib/proposals-data-provider/__generated__/Proposals.ts @@ -5,11 +5,11 @@ import * as Apollo from '@apollo/client'; const defaultOptions = {} as const; export type NewMarketFieldsFragment = { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } }; -export type UpdateMarketFieldsFragment = { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } }; +export type UpdateMarketFieldsFragment = { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } }; export type UpdateAssetFieldsFragment = { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } }; -export type ProposalListFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } }; +export type ProposalListFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } }; export type ProposalsListQueryVariables = Types.Exact<{ proposalType?: Types.InputMaybe; @@ -17,7 +17,7 @@ export type ProposalsListQueryVariables = Types.Exact<{ }>; -export type ProposalsListQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } } } | null> | null } | null }; +export type ProposalsListQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } } } | null> | null } | null }; export const NewMarketFieldsFragmentDoc = gql` fragment NewMarketFields on NewMarket { diff --git a/libs/governance/src/lib/proposals-data-provider/__generated___/Proposals.ts b/libs/governance/src/lib/proposals-data-provider/__generated___/Proposals.ts deleted file mode 100644 index 675a1f3f4..000000000 --- a/libs/governance/src/lib/proposals-data-provider/__generated___/Proposals.ts +++ /dev/null @@ -1,172 +0,0 @@ -import * as Types from '@vegaprotocol/types'; - -import { gql } from '@apollo/client'; -import * as Apollo from '@apollo/client'; -const defaultOptions = {} as const; -export type NewMarketFieldsFragment = { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } }; - -export type UpdateMarketFieldsFragment = { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } }; - -export type UpdateAssetFieldsFragment = { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } }; - -export type ProposalListFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } }; - -export type ProposalsListQueryVariables = Types.Exact<{ - proposalType?: Types.InputMaybe; - inState?: Types.InputMaybe; -}>; - - -export type ProposalsListQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalWeight: string } }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', code: string, name: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', id: string, name: string, symbol: string } } | null } } | { __typename?: 'UpdateAsset', assetId: string, quantum: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string, updateMarketConfiguration: { __typename?: 'UpdateMarketConfiguration', instrument: { __typename?: 'UpdateInstrumentConfiguration', code: string, product: { __typename?: 'UpdateFutureProduct', quoteName: string } }, priceMonitoringParameters: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null }, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, riskParameters: { __typename: 'UpdateMarketLogNormalRiskModel', logNormal?: { __typename?: 'LogNormalRiskModel', riskAversionParameter: number, tau: number, params: { __typename?: 'LogNormalModelParams', mu: number, r: number, sigma: number } } | null } | { __typename: 'UpdateMarketSimpleRiskModel', simple?: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } | null } } } | { __typename?: 'UpdateNetworkParameter' } } } } | null> | null } | null }; - -export const NewMarketFieldsFragmentDoc = gql` - fragment NewMarketFields on NewMarket { - instrument { - code - name - futureProduct { - settlementAsset { - id - name - symbol - } - } - } -} - `; -export const UpdateMarketFieldsFragmentDoc = gql` - fragment UpdateMarketFields on UpdateMarket { - marketId - updateMarketConfiguration { - instrument { - code - product { - quoteName - } - } - priceMonitoringParameters { - triggers { - horizonSecs - probability - auctionExtensionSecs - } - } - liquidityMonitoringParameters { - targetStakeParameters { - timeWindow - scalingFactor - } - triggeringRatio - } - riskParameters { - __typename - ... on UpdateMarketSimpleRiskModel { - simple { - factorLong - factorShort - } - } - ... on UpdateMarketLogNormalRiskModel { - logNormal { - riskAversionParameter - tau - params { - mu - r - sigma - } - } - } - } - } -} - `; -export const UpdateAssetFieldsFragmentDoc = gql` - fragment UpdateAssetFields on UpdateAsset { - assetId - quantum - source { - ... on UpdateERC20 { - lifetimeLimit - withdrawThreshold - } - } -} - `; -export const ProposalListFieldsFragmentDoc = gql` - fragment ProposalListFields on Proposal { - id - reference - state - datetime - votes { - yes { - totalTokens - totalNumber - totalWeight - } - no { - totalTokens - totalNumber - totalWeight - } - } - terms { - closingDatetime - enactmentDatetime - change { - ... on NewMarket { - ...NewMarketFields - } - ... on UpdateMarket { - ...UpdateMarketFields - } - ... on UpdateAsset { - ...UpdateAssetFields - } - } - } -} - ${NewMarketFieldsFragmentDoc} -${UpdateMarketFieldsFragmentDoc} -${UpdateAssetFieldsFragmentDoc}`; -export const ProposalsListDocument = gql` - query ProposalsList($proposalType: ProposalType, $inState: ProposalState) { - proposalsConnection(proposalType: $proposalType, inState: $inState) { - edges { - node { - ...ProposalListFields - } - } - } -} - ${ProposalListFieldsFragmentDoc}`; - -/** - * __useProposalsListQuery__ - * - * To run a query within a React component, call `useProposalsListQuery` and pass it any options that fit your needs. - * When your component renders, `useProposalsListQuery` returns an object from Apollo Client that contains loading, error, and data properties - * you can use to render your UI. - * - * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options; - * - * @example - * const { data, loading, error } = useProposalsListQuery({ - * variables: { - * proposalType: // value for 'proposalType' - * inState: // value for 'inState' - * }, - * }); - */ -export function useProposalsListQuery(baseOptions?: Apollo.QueryHookOptions) { - const options = {...defaultOptions, ...baseOptions} - return Apollo.useQuery(ProposalsListDocument, options); - } -export function useProposalsListLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions) { - const options = {...defaultOptions, ...baseOptions} - return Apollo.useLazyQuery(ProposalsListDocument, options); - } -export type ProposalsListQueryHookResult = ReturnType; -export type ProposalsListLazyQueryHookResult = ReturnType; -export type ProposalsListQueryResult = Apollo.QueryResult; \ No newline at end of file diff --git a/libs/governance/src/lib/proposals-data-provider/index.ts b/libs/governance/src/lib/proposals-data-provider/index.ts index 951221ec4..0c6a2a3b8 100644 --- a/libs/governance/src/lib/proposals-data-provider/index.ts +++ b/libs/governance/src/lib/proposals-data-provider/index.ts @@ -1,2 +1,2 @@ export * from './proposals-data-provider'; -export * from './__generated___/Proposals'; +export * from './__generated__/Proposals'; diff --git a/libs/governance/src/lib/proposals-data-provider/proposals-data-provider.tsx b/libs/governance/src/lib/proposals-data-provider/proposals-data-provider.tsx index f507124b8..66f6763cf 100644 --- a/libs/governance/src/lib/proposals-data-provider/proposals-data-provider.tsx +++ b/libs/governance/src/lib/proposals-data-provider/proposals-data-provider.tsx @@ -2,8 +2,8 @@ import { makeDataProvider } from '@vegaprotocol/react-helpers'; import type { ProposalsListQuery, ProposalListFieldsFragment, -} from './__generated___/Proposals'; -import { ProposalsListDocument } from './__generated___/Proposals'; +} from './__generated__/Proposals'; +import { ProposalsListDocument } from './__generated__/Proposals'; const getData = (responseData: ProposalsListQuery) => responseData.proposalsConnection?.edges diff --git a/libs/governance/src/lib/proposals-data-provider/proposals.mock.ts b/libs/governance/src/lib/proposals-data-provider/proposals.mock.ts index ed7fd358d..f08965645 100644 --- a/libs/governance/src/lib/proposals-data-provider/proposals.mock.ts +++ b/libs/governance/src/lib/proposals-data-provider/proposals.mock.ts @@ -57,7 +57,7 @@ export const marketUpdateProposal: ProposalListFieldsFragment = { triggers: [], }, liquidityMonitoringParameters: { - triggeringRatio: 0, + triggeringRatio: '0', targetStakeParameters: { scalingFactor: 0, timeWindow: 0, diff --git a/libs/governance/src/lib/proposals-hooks/__generated__/Proposal.ts b/libs/governance/src/lib/proposals-hooks/__generated__/Proposal.ts index eeb1f6966..1663074a0 100644 --- a/libs/governance/src/lib/proposals-hooks/__generated__/Proposal.ts +++ b/libs/governance/src/lib/proposals-hooks/__generated__/Proposal.ts @@ -83,7 +83,7 @@ export type ProposalEventSubscriptionHookResult = ReturnType; export const OnUpdateNetworkParametersDocument = gql` subscription OnUpdateNetworkParameters { - busEvents(types: [TimeUpdate], batchSize: 0) { + busEvents(types: [Proposal], batchSize: 0) { event { ... on Proposal { ...UpdateNetworkParameterFields diff --git a/libs/governance/src/lib/proposals-hooks/use-update-proposal.spec.ts b/libs/governance/src/lib/proposals-hooks/use-update-proposal.spec.ts index 3dbde7263..c18db6797 100644 --- a/libs/governance/src/lib/proposals-hooks/use-update-proposal.spec.ts +++ b/libs/governance/src/lib/proposals-hooks/use-update-proposal.spec.ts @@ -177,7 +177,7 @@ const generateUpdateMarketProposal = ( __typename: liquidityMonitoring ? 'LiquidityMonitoringParameters' : undefined, - triggeringRatio: 0, + triggeringRatio: '0', targetStakeParameters: { __typename: undefined, scalingFactor: 0, diff --git a/libs/governance/src/lib/proposals-list/proposals-list.tsx b/libs/governance/src/lib/proposals-list/proposals-list.tsx index dcb8d3632..e2449b0cf 100644 --- a/libs/governance/src/lib/proposals-list/proposals-list.tsx +++ b/libs/governance/src/lib/proposals-list/proposals-list.tsx @@ -8,7 +8,7 @@ import { proposalsListDataProvider } from '../proposals-data-provider'; import { useCallback, useMemo, useRef } from 'react'; import type { AgGridReact } from 'ag-grid-react'; import { useColumnDefs } from './use-column-defs'; -import type { ProposalListFieldsFragment } from '../proposals-data-provider/__generated___/Proposals'; +import type { ProposalListFieldsFragment } from '../proposals-data-provider/__generated__/Proposals'; export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) => data.filter((proposal) => diff --git a/libs/governance/src/lib/proposals-list/use-column-defs.tsx b/libs/governance/src/lib/proposals-list/use-column-defs.tsx index 9bcdfe9f6..7a9179b67 100644 --- a/libs/governance/src/lib/proposals-list/use-column-defs.tsx +++ b/libs/governance/src/lib/proposals-list/use-column-defs.tsx @@ -17,7 +17,7 @@ import { ProposalStateMapping } from '@vegaprotocol/types'; import type { ProposalListFieldsFragment, NewMarketFieldsFragment, -} from '../proposals-data-provider/__generated___/Proposals'; +} from '../proposals-data-provider/__generated__/Proposals'; import { VoteProgress } from '../voting-progress'; const instrumentGuard = ( diff --git a/libs/market-info/src/components/market-info/__generated__/MarketInfo.ts b/libs/market-info/src/components/market-info/__generated__/MarketInfo.ts index e9613803d..52ee29570 100644 --- a/libs/market-info/src/components/market-info/__generated__/MarketInfo.ts +++ b/libs/market-info/src/components/market-info/__generated__/MarketInfo.ts @@ -10,7 +10,7 @@ export type MarketInfoQueryVariables = Types.Exact<{ }>; -export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, data?: { __typename?: 'MarketData', markPrice: string, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, bestBidPrice: string, bestOfferPrice: string, trigger: Types.AuctionTrigger, openInterest: string, suppliedStake?: string | null, targetStake?: string | null, marketValueProxy: string, market: { __typename?: 'Market', id: string }, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', volume: string } } | null> | null } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } } }, depth: { __typename?: 'MarketDepth', lastTrade?: { __typename?: 'Trade', price: string } | null } } | null }; +export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, data?: { __typename?: 'MarketData', markPrice: string, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, bestBidPrice: string, bestOfferPrice: string, trigger: Types.AuctionTrigger, openInterest: string, suppliedStake?: string | null, targetStake?: string | null, marketValueProxy: string, market: { __typename?: 'Market', id: string }, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', volume: string } } | null> | null } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } } }, depth: { __typename?: 'MarketDepth', lastTrade?: { __typename?: 'Trade', price: string } | null } } | null }; export const MarketInfoDocument = gql` diff --git a/libs/market-info/src/components/market-info/market-info.mock.ts b/libs/market-info/src/components/market-info/market-info.mock.ts index 7601352dd..0d750173d 100644 --- a/libs/market-info/src/components/market-info/market-info.mock.ts +++ b/libs/market-info/src/components/market-info/market-info.mock.ts @@ -126,7 +126,7 @@ export const marketInfoQuery = ( ], }, liquidityMonitoringParameters: { - triggeringRatio: 0, + triggeringRatio: '0', targetStakeParameters: { timeWindow: 3600, scalingFactor: 10, diff --git a/libs/types/src/__generated__/types.ts b/libs/types/src/__generated__/types.ts index 70da9c901..7d2972995 100644 --- a/libs/types/src/__generated__/types.ts +++ b/libs/types/src/__generated__/types.ts @@ -473,6 +473,35 @@ export type ContinuousTrading = { tickSize: Scalars['String']; }; +/** Connection type for retrieving cursor-based paginated core snapshot data */ +export type CoreSnapshotConnection = { + __typename?: 'CoreSnapshotConnection'; + /** The positions in this connection */ + edges?: Maybe>; + /** The pagination information */ + pageInfo?: Maybe; +}; + +/** A snapshot taken by the core */ +export type CoreSnapshotData = { + __typename?: 'CoreSnapshotData'; + /** The block hash at the snapshot block height */ + blockHash: Scalars['String']; + /** At which block the snapshot was taken */ + blockHeight: Scalars['String']; + /** The current version of vega core */ + vegaCoreVersion: Scalars['String']; +}; + +/** Edge type containing the core snapshot cursor information */ +export type CoreSnapshotEdge = { + __typename?: 'CoreSnapshotEdge'; + /** Cursor identifying the core snapashot data */ + cursor: Scalars['String']; + /** The core snapshot data */ + node: CoreSnapshotData; +}; + /** A data source contains the data sent by a data source */ export type Data = { __typename?: 'Data'; @@ -861,6 +890,33 @@ export type EpochParticipation = { totalRewards?: Maybe; }; +/** an aggregated reward summary for a combination of epoch/asset/market/reward type */ +export type EpochRewardSummary = { + __typename?: 'EpochRewardSummary'; + /** Total quantity of rewards awarded in this asset/market/reward type in this epoch */ + amount: Scalars['String']; + /** ID of the Asset */ + assetId: Scalars['ID']; + /** The epoch for which summary is generated */ + epoch: Scalars['Int']; + /** ID of the market */ + marketId?: Maybe; + /** Type of the reward */ + rewardType: AccountType; +}; + +export type EpochRewardSummaryConnection = { + __typename?: 'EpochRewardSummaryConnection'; + edges?: Maybe>>; + pageInfo?: Maybe; +}; + +export type EpochRewardSummaryEdge = { + __typename?: 'EpochRewardSummaryEdge'; + cursor: Scalars['String']; + node: EpochRewardSummary; +}; + /** Describes in both human readable and block time when an epoch spans. */ export type EpochTimestamps = { __typename?: 'EpochTimestamps'; @@ -868,6 +924,10 @@ export type EpochTimestamps = { end?: Maybe; /** RFC3339 timestamp - Vega time of epoch expiry */ expiry?: Maybe; + /** Height of first block in the epoch, null if not started */ + firstBlock: Scalars['String']; + /** Height of last block in the epoch, null if not ended */ + lastBlock?: Maybe; /** RFC3339 timestamp - Vega time of epoch start, null if not started */ start?: Maybe; }; @@ -897,8 +957,6 @@ export type Erc20WithdrawalApproval = { assetSource: Scalars['String']; /** Timestamp at which the withdrawal was created */ creation: Scalars['String']; - /** Timestamp in seconds for expiry of the approval */ - expiry: Scalars['Timestamp']; /** The nonce to be used in the request */ nonce: Scalars['String']; /** @@ -1020,8 +1078,6 @@ export type Future = { quoteName: Scalars['String']; /** The name of the asset (string) */ settlementAsset: Asset; - /** The number of decimal places implied by the settlement data (such as price) emitted by the settlement data source */ - settlementDataDecimals: Scalars['Int']; }; export type FutureProduct = { @@ -1039,8 +1095,6 @@ export type FutureProduct = { quoteName: Scalars['String']; /** Product asset */ settlementAsset: Asset; - /** The number of decimal places implied by the settlement data (such as price) emitted by the settlement oracle */ - settlementDataDecimals: Scalars['Int']; }; /** A segment of datanode history */ @@ -1169,7 +1223,7 @@ export type LiquidityMonitoringParameters = { /** Specifies parameters related to target stake calculation */ targetStakeParameters: TargetStakeParameters; /** Specifies the triggering ratio for entering liquidity auction */ - triggeringRatio: Scalars['Float']; + triggeringRatio: Scalars['String']; }; /** A special order type for liquidity providers */ @@ -1196,6 +1250,8 @@ export type LiquidityProviderFeeShare = { __typename?: 'LiquidityProviderFeeShare'; /** The average entry valuation of the liquidity provider for the market */ averageEntryValuation: Scalars['String']; + /** The average liquidity score */ + averageScore: Scalars['String']; /** The share owned by this liquidity provider (float) */ equityLikeShare: Scalars['String']; /** The liquidity provider party ID */ @@ -1432,6 +1488,8 @@ export type Market = { liquidityMonitoringParameters: LiquidityMonitoringParameters; /** The list of the liquidity provision commitments for this market */ liquidityProvisionsConnection?: Maybe; + /** Liquidity Provision order price range */ + lpPriceRange: Scalars['String']; /** Timestamps for state changes in the market */ marketTimestamps: MarketTimestamps; /** @@ -1811,6 +1869,8 @@ export type NewMarket = { decimalPlaces: Scalars['Int']; /** New market instrument configuration */ instrument: InstrumentConfiguration; + /** Liquidity Provision order price range */ + lpPriceRange: Scalars['String']; /** Metadata for this instrument, tags */ metadata?: Maybe>; /** New market risk configuration */ @@ -1969,6 +2029,8 @@ export type ObservableLiquidityProviderFeeShare = { __typename?: 'ObservableLiquidityProviderFeeShare'; /** The average entry valuation of the liquidity provider for the market */ averageEntryValuation: Scalars['String']; + /** The average liquidity score */ + averageScore: Scalars['String']; /** The share owned by this liquidity provider (float) */ equityLikeShare: Scalars['String']; /** The liquidity provider party ID */ @@ -2517,6 +2579,7 @@ export type PartymarginsConnectionArgs = { export type PartyordersConnectionArgs = { dateRange?: InputMaybe; filter?: InputMaybe; + marketId?: InputMaybe; pagination?: InputMaybe; }; @@ -2792,6 +2855,11 @@ export type PropertyKey = { __typename?: 'PropertyKey'; /** The name of the property. */ name?: Maybe; + /** + * An optional decimal place to be applied on the provided value. + * Valid only for PropertyType of type DECIMAL, INTEGER. + */ + numberDecimalPlaces?: Maybe; /** The type of the property. */ type: PropertyKeyType; }; @@ -3136,12 +3204,16 @@ export type Query = { assetsConnection?: Maybe; /** Get historical balances for an account within the given date range */ balanceChanges: AggregatedBalanceConnection; + /** List core snapshots */ + coreSnapshots?: Maybe; /** Find a deposit using its ID */ deposit?: Maybe; /** Fetch all deposits */ deposits?: Maybe; /** Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch */ epoch: Epoch; + /** List reward summary per epoch by asset, market, reward type */ + epochRewardSummaries?: Maybe; /** Get the signatures bundle to allowlist an ERC20 token in the collateral bridge */ erc20ListAssetBundle?: Maybe; /** Get the signature bundle to add a particular validator to the signer list of the multisig contract */ @@ -3247,6 +3319,12 @@ export type QuerybalanceChangesArgs = { }; +/** Queries allow a caller to read data and filter data via GraphQL. */ +export type QuerycoreSnapshotsArgs = { + pagination?: InputMaybe; +}; + + /** Queries allow a caller to read data and filter data via GraphQL. */ export type QuerydepositArgs = { id: Scalars['ID']; @@ -3266,6 +3344,14 @@ export type QueryepochArgs = { }; +/** Queries allow a caller to read data and filter data via GraphQL. */ +export type QueryepochRewardSummariesArgs = { + fromEpoch?: InputMaybe; + pagination?: InputMaybe; + toEpoch?: InputMaybe; +}; + + /** Queries allow a caller to read data and filter data via GraphQL. */ export type Queryerc20ListAssetBundleArgs = { assetId: Scalars['ID']; @@ -4265,8 +4351,8 @@ export enum TransferType { TRANSFER_TYPE_MTM_LOSS = 'TRANSFER_TYPE_MTM_LOSS', /** Funds added to margin account after mark to market gain */ TRANSFER_TYPE_MTM_WIN = 'TRANSFER_TYPE_MTM_WIN', - /** Staking reward received */ - TRANSFER_TYPE_STAKE_REWARD = 'TRANSFER_TYPE_STAKE_REWARD', + /** Reward payout received */ + TRANSFER_TYPE_REWARD_PAYOUT = 'TRANSFER_TYPE_REWARD_PAYOUT', /** A network internal instruction for the collateral engine to move funds from the pending transfers pool account into the destination account */ TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE = 'TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE', /** A network internal instruction for the collateral engine to move funds from a user's general account into the pending transfers pool */ @@ -4423,8 +4509,6 @@ export type Withdrawal = { createdTimestamp: Scalars['Timestamp']; /** Foreign chain specific details about the withdrawal */ details?: Maybe; - /** RFC3339Nano time until the withdrawal will be invalid */ - expiry: Scalars['Timestamp']; /** The Vega internal ID of the withdrawal */ id: Scalars['ID']; /** The Party initiating the withdrawal */ diff --git a/libs/types/src/global-types-mappings.ts b/libs/types/src/global-types-mappings.ts index 22e732451..fd4b97fd6 100644 --- a/libs/types/src/global-types-mappings.ts +++ b/libs/types/src/global-types-mappings.ts @@ -401,7 +401,7 @@ export const TransferTypeMapping: TransferTypeMap = { TRANSFER_TYPE_WITHDRAW: 'Withdrawal', TRANSFER_TYPE_DEPOSIT: 'Deposit', TRANSFER_TYPE_BOND_SLASHING: 'Bond slashed', - TRANSFER_TYPE_STAKE_REWARD: 'Rewards funded', + TRANSFER_TYPE_REWARD_PAYOUT: 'Rewards funded', TRANSFER_TYPE_TRANSFER_FUNDS_SEND: 'Transfer sent', TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE: 'Transfer received', TRANSFER_TYPE_CLEAR_ACCOUNT: 'Market accounts cleared', @@ -427,7 +427,7 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = { TRANSFER_TYPE_WITHDRAW: `Funds withdrawn from your general account`, TRANSFER_TYPE_DEPOSIT: `Funds deposited to your general account`, TRANSFER_TYPE_BOND_SLASHING: `Bond account penalized when liquidity commitment not met`, - TRANSFER_TYPE_STAKE_REWARD: `Collateral deducted from your general account to fund rewards you've set up`, + TRANSFER_TYPE_REWARD_PAYOUT: `Collateral deducted from your general account to fund rewards you've set up`, TRANSFER_TYPE_TRANSFER_FUNDS_SEND: `Funds deducted from your general account to fulfil a transfer`, TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE: `Funds added to your general account to fulfil a transfer`, TRANSFER_TYPE_CLEAR_ACCOUNT: `Market-related accounts emptied, and balances moved, because the market has closed`, diff --git a/libs/wallet/src/WithdrawalApproval.graphql b/libs/wallet/src/WithdrawalApproval.graphql index d5e9540f3..2e57557ef 100644 --- a/libs/wallet/src/WithdrawalApproval.graphql +++ b/libs/wallet/src/WithdrawalApproval.graphql @@ -5,7 +5,6 @@ query WithdrawalApproval($withdrawalId: ID!) { nonce signatures targetAddress - expiry creation } } diff --git a/libs/wallet/src/__generated__/WithdrawalApproval.ts b/libs/wallet/src/__generated__/WithdrawalApproval.ts index 88cbf8243..e5c63fcea 100644 --- a/libs/wallet/src/__generated__/WithdrawalApproval.ts +++ b/libs/wallet/src/__generated__/WithdrawalApproval.ts @@ -8,7 +8,7 @@ export type WithdrawalApprovalQueryVariables = Types.Exact<{ }>; -export type WithdrawalApprovalQuery = { __typename?: 'Query', erc20WithdrawalApproval?: { __typename?: 'Erc20WithdrawalApproval', assetSource: string, amount: string, nonce: string, signatures: string, targetAddress: string, expiry: any, creation: string } | null }; +export type WithdrawalApprovalQuery = { __typename?: 'Query', erc20WithdrawalApproval?: { __typename?: 'Erc20WithdrawalApproval', assetSource: string, amount: string, nonce: string, signatures: string, targetAddress: string, creation: string } | null }; export const WithdrawalApprovalDocument = gql` @@ -19,7 +19,6 @@ export const WithdrawalApprovalDocument = gql` nonce signatures targetAddress - expiry creation } } diff --git a/libs/wallet/src/connectors/vega-connector.ts b/libs/wallet/src/connectors/vega-connector.ts index f2682e236..9f201ca70 100644 --- a/libs/wallet/src/connectors/vega-connector.ts +++ b/libs/wallet/src/connectors/vega-connector.ts @@ -95,7 +95,7 @@ interface ProposalNewMarketTerms { timeWindow: string; scalingFactor: number; }; - triggeringRatio: number; + triggeringRatio: string; auctionExtension: string; }; logNormal: LogNormal; diff --git a/libs/wallet/src/wait-for-withdrawal-approval.spec.ts b/libs/wallet/src/wait-for-withdrawal-approval.spec.ts index f939b0b1e..7153b5cbf 100644 --- a/libs/wallet/src/wait-for-withdrawal-approval.spec.ts +++ b/libs/wallet/src/wait-for-withdrawal-approval.spec.ts @@ -13,7 +13,6 @@ const erc20WithdrawalApproval: WithdrawalApprovalQuery['erc20WithdrawalApproval' nonce: '1', signatures: 'signatures', targetAddress: 'targetAddress', - expiry: 'expiry', creation: '1', }; diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx index d4e9e2052..1be78ab45 100644 --- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx +++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx @@ -130,7 +130,6 @@ const erc20WithdrawalApproval = { creation: '1', signatures: 'signatures', targetAddress: 'target-address', - expiry: 'expiry', }; const mockedNetworkParams: MockedResponse = { diff --git a/libs/withdraws/src/lib/Erc20Approval.graphql b/libs/withdraws/src/lib/Erc20Approval.graphql index c9f805034..21d759c09 100644 --- a/libs/withdraws/src/lib/Erc20Approval.graphql +++ b/libs/withdraws/src/lib/Erc20Approval.graphql @@ -5,7 +5,6 @@ query Erc20Approval($withdrawalId: ID!) { nonce signatures targetAddress - expiry creation } } diff --git a/libs/withdraws/src/lib/__generated__/Erc20Approval.ts b/libs/withdraws/src/lib/__generated__/Erc20Approval.ts index 8c052cbb0..c948e5e75 100644 --- a/libs/withdraws/src/lib/__generated__/Erc20Approval.ts +++ b/libs/withdraws/src/lib/__generated__/Erc20Approval.ts @@ -8,7 +8,7 @@ export type Erc20ApprovalQueryVariables = Types.Exact<{ }>; -export type Erc20ApprovalQuery = { __typename?: 'Query', erc20WithdrawalApproval?: { __typename?: 'Erc20WithdrawalApproval', assetSource: string, amount: string, nonce: string, signatures: string, targetAddress: string, expiry: any, creation: string } | null }; +export type Erc20ApprovalQuery = { __typename?: 'Query', erc20WithdrawalApproval?: { __typename?: 'Erc20WithdrawalApproval', assetSource: string, amount: string, nonce: string, signatures: string, targetAddress: string, creation: string } | null }; export const Erc20ApprovalDocument = gql` @@ -19,7 +19,6 @@ export const Erc20ApprovalDocument = gql` nonce signatures targetAddress - expiry creation } } diff --git a/libs/withdraws/src/lib/use-create-withdraw.spec.tsx b/libs/withdraws/src/lib/use-create-withdraw.spec.tsx index 2791b37e4..6ab287f4c 100644 --- a/libs/withdraws/src/lib/use-create-withdraw.spec.tsx +++ b/libs/withdraws/src/lib/use-create-withdraw.spec.tsx @@ -107,7 +107,6 @@ beforeEach(() => { nonce: '1', signatures: 'signatures', targetAddress: 'targetAddress', - expiry: 'expiry', creation: '1', }, },