From 771487bcff5051fa5e2bc16ec4c81cd56b6a7dfc Mon Sep 17 00:00:00 2001 From: joon9823 Date: Mon, 7 Oct 2024 17:33:29 +0900 Subject: [PATCH 1/4] Apply updates from core --- package-lock.json | 20 +-- package.json | 6 +- src/client/lcd/api/GovAPI.ts | 10 +- src/client/lcd/api/IbcPermAPI.ts | 7 +- src/client/lcd/api/MarketmapAPI.ts | 8 +- src/client/lcd/api/OracleAPI.ts | 7 +- src/core/Msg.ts | 92 +++++------ src/core/gov/TallyResult.ts | 144 ++++++++++++++++++ src/core/gov/index.ts | 1 + src/core/gov/proposals/Proposal.ts | 83 ++-------- .../applications/perm/msgs/MsgHaltChannel.ts | 101 ------------ .../perm/msgs/MsgResumeChannel.ts | 101 ------------ .../perm/msgs/MsgUpdateIbcPermAdmin.ts | 121 +++++++++++++++ ...rs.ts => MsgUpdatePermissionedRelayers.ts} | 58 +++---- src/core/ibc/applications/perm/msgs/index.ts | 30 ++-- .../ibc/applications/transfer/DenomTrace.ts | 2 +- src/core/intertx/msgs/MsgRegisterAccount.ts | 28 ++-- src/core/marketmap/Market.ts | 2 +- src/core/marketmap/MarketmapParams.ts | 2 +- src/core/marketmap/ProviderConfig.ts | 2 +- src/core/marketmap/Ticker.ts | 2 +- src/core/marketmap/msgs/MsgCreateMarkets.ts | 12 +- .../msgs/MsgRemoveMarketAuthorities.ts | 12 +- .../msgs/MsgUpdateMarketmapParams.ts | 12 +- src/core/marketmap/msgs/MsgUpdateMarkets.ts | 12 +- src/core/marketmap/msgs/MsgUpsertMarkets.ts | 98 ++++++++++++ src/core/marketmap/msgs/index.ts | 6 + src/core/ophost/BridgeConfig.ts | 30 ++-- src/core/ophost/msgs/MsgUpdateChallenger.ts | 121 +++++++++++++++ src/core/ophost/msgs/MsgUpdateChallengers.ts | 123 --------------- src/core/ophost/msgs/index.ts | 12 +- src/core/oracle/CurrencyPair.ts | 2 +- src/core/oracle/QuotePrice.ts | 2 +- src/core/oracle/msgs/MsgAddCurrencyPairs.ts | 12 +- .../oracle/msgs/MsgRemoveCurrencyPairs.ts | 12 +- 35 files changed, 695 insertions(+), 598 deletions(-) create mode 100644 src/core/gov/TallyResult.ts delete mode 100644 src/core/ibc/applications/perm/msgs/MsgHaltChannel.ts delete mode 100644 src/core/ibc/applications/perm/msgs/MsgResumeChannel.ts create mode 100644 src/core/ibc/applications/perm/msgs/MsgUpdateIbcPermAdmin.ts rename src/core/ibc/applications/perm/msgs/{MsgSetPermissionedRelayers.ts => MsgUpdatePermissionedRelayers.ts} (52%) create mode 100644 src/core/marketmap/msgs/MsgUpsertMarkets.ts create mode 100644 src/core/ophost/msgs/MsgUpdateChallenger.ts delete mode 100644 src/core/ophost/msgs/MsgUpdateChallengers.ts diff --git a/package-lock.json b/package-lock.json index a916b93..3e3fc22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "@initia/initia.js", - "version": "0.2.16", + "version": "0.2.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@initia/initia.js", - "version": "0.2.16", + "version": "0.2.17", "license": "Apache-2.0", "dependencies": { - "@initia/initia.proto": "^0.2.2", - "@initia/opinit.proto": "^0.0.9", + "@initia/initia.proto": "^0.2.3", + "@initia/opinit.proto": "^0.0.10", "@ledgerhq/hw-transport": "^6.27.12", "@ledgerhq/hw-transport-webhid": "^6.27.12", "@ledgerhq/hw-transport-webusb": "^6.27.12", @@ -1283,9 +1283,9 @@ } }, "node_modules/@initia/initia.proto": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@initia/initia.proto/-/initia.proto-0.2.2.tgz", - "integrity": "sha512-y3BVZZGgZ4xUJyzqisc9AUSlHReLsM6lkvcCCEsHJ8D1fEQEurXwSLJert0Ydjy4yVSCKYneJ629N2+HYfxQBQ==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@initia/initia.proto/-/initia.proto-0.2.3.tgz", + "integrity": "sha512-lmhRNFTzYBGIYZgtiy2DLXIf6VsOXf9/WDgtSPjl9wlFchhbEJrR+PHBxQFYhHen5JmXpXWzESmTSGPUILOXHw==", "dependencies": { "@improbable-eng/grpc-web": "^0.15.0", "google-protobuf": "^3.21.4", @@ -1294,9 +1294,9 @@ } }, "node_modules/@initia/opinit.proto": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/@initia/opinit.proto/-/opinit.proto-0.0.9.tgz", - "integrity": "sha512-pquQaOfXaTKX/tQfMPeoaawmtdH/jI9SYDvJInCxED38f2ATms75JERgxOf7deTtJrzz/sWwTe1G0BydQnrghg==", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/@initia/opinit.proto/-/opinit.proto-0.0.10.tgz", + "integrity": "sha512-AlLIAZMqeZSld1g0Fp/zXkVjQME19r8N3JEy9rISKqQpjKAIbgnZJ3ukR78nYGdr9TPpt8RBMdDWsjPnzD0xSQ==", "dependencies": { "@improbable-eng/grpc-web": "^0.15.0", "google-protobuf": "^3.21.4", diff --git a/package.json b/package.json index 8ce65f7..7525cc9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@initia/initia.js", - "version": "0.2.16", + "version": "0.2.17", "description": "The JavaScript SDK for Initia", "license": "Apache-2.0", "author": "Initia Foundation", @@ -64,8 +64,8 @@ "webpack-cli": "^4.10.0" }, "dependencies": { - "@initia/initia.proto": "^0.2.2", - "@initia/opinit.proto": "^0.0.9", + "@initia/initia.proto": "^0.2.3", + "@initia/opinit.proto": "^0.0.10", "@ledgerhq/hw-transport": "^6.27.12", "@ledgerhq/hw-transport-webhid": "^6.27.12", "@ledgerhq/hw-transport-webusb": "^6.27.12", diff --git a/src/client/lcd/api/GovAPI.ts b/src/client/lcd/api/GovAPI.ts index e09d46f..42ef801 100644 --- a/src/client/lcd/api/GovAPI.ts +++ b/src/client/lcd/api/GovAPI.ts @@ -1,5 +1,5 @@ import { BaseAPI } from './BaseAPI' -import { Proposal, Deposit, Vote, GovParams } from '../../../core' +import { Proposal, Deposit, Vote, GovParams, TallyResult } from '../../../core' import { APIParams, Pagination, PaginationOptions } from '../APIRequester' export class GovAPI extends BaseAPI { @@ -74,12 +74,12 @@ export class GovAPI extends BaseAPI { public async tally( proposalId: number, params: APIParams = {} - ): Promise { + ): Promise { return this.c .get<{ - tally: Proposal.FinalTallyResult - }>(`/cosmos/gov/v1/proposals/${proposalId}/tally`, params) - .then((d) => d.tally) + tally_result: TallyResult.Data + }>(`/initia/gov/v1/proposals/${proposalId}/tally`, params) + .then((d) => TallyResult.fromData(d.tally_result)) } /** Gets the Gov module's current parameters */ diff --git a/src/client/lcd/api/IbcPermAPI.ts b/src/client/lcd/api/IbcPermAPI.ts index e215c8b..9edc324 100644 --- a/src/client/lcd/api/IbcPermAPI.ts +++ b/src/client/lcd/api/IbcPermAPI.ts @@ -4,15 +4,10 @@ import { APIParams, Pagination, PaginationOptions } from '../APIRequester' export interface ChannelState { port_id: string channel_id: string - halt_state: HaltState + admin: string relayers: string[] } -export interface HaltState { - halted: boolean - halted_by: string -} - export class IbcPermAPI extends BaseAPI { public async channelStates( params: Partial = {} diff --git a/src/client/lcd/api/MarketmapAPI.ts b/src/client/lcd/api/MarketmapAPI.ts index 80fa782..afa45d6 100644 --- a/src/client/lcd/api/MarketmapAPI.ts +++ b/src/client/lcd/api/MarketmapAPI.ts @@ -17,7 +17,7 @@ export class MarketmapAPI extends BaseAPI { return this.c .get<{ market_map: MarketMap.Data - }>(`/slinky/marketmap/v1/marketmap`, params) + }>(`/connect/marketmap/v2/marketmap`, params) .then((d) => { const markets: Record = {} for (const [ticker, market] of Object.entries(d.market_map.markets)) { @@ -32,7 +32,7 @@ export class MarketmapAPI extends BaseAPI { params: APIParams = {} ): Promise { return this.c - .get<{ market: Market.Data }>(`/slinky/marketmap/v1/market`, { + .get<{ market: Market.Data }>(`/connect/marketmap/v2/market`, { ...params, 'currency_pair.Base': pair.Base, 'currency_pair.Quote': pair.Quote, @@ -44,7 +44,7 @@ export class MarketmapAPI extends BaseAPI { return this.c .get<{ last_updated: string - }>(`/slinky/marketmap/v1/last_updated`, params) + }>(`/connect/marketmap/v2/last_updated`, params) .then((d) => Number.parseInt(d.last_updated)) } @@ -52,7 +52,7 @@ export class MarketmapAPI extends BaseAPI { return this.c .get<{ params: MarketmapParams.Data - }>(`/slinky/marketmap/v1/params`, params) + }>(`/connect/marketmap/v2/params`, params) .then((d) => MarketmapParams.fromData(d.params)) } } diff --git a/src/client/lcd/api/OracleAPI.ts b/src/client/lcd/api/OracleAPI.ts index 14f70d5..894e03b 100644 --- a/src/client/lcd/api/OracleAPI.ts +++ b/src/client/lcd/api/OracleAPI.ts @@ -7,7 +7,7 @@ export class OracleAPI extends BaseAPI { return this.c .get<{ currency_pairs: CurrencyPair.Data[] - }>(`/slinky/oracle/v1/get_all_tickers`, params) + }>(`/connect/oracle/v2/get_all_tickers`, params) .then((d) => d.currency_pairs.map(CurrencyPair.fromData)) } @@ -16,10 +16,9 @@ export class OracleAPI extends BaseAPI { params: APIParams = {} ): Promise { return this.c - .get<{ price: QuotePrice.Data }>(`/slinky/oracle/v1/get_price`, { + .get<{ price: QuotePrice.Data }>(`/connect/oracle/v2/get_price`, { ...params, - 'currency_pair.Base': pair.Base, - 'currency_pair.Quote': pair.Quote, + currency_pair: pair.toString(), }) .then((d) => QuotePrice.fromData(d.price)) } diff --git a/src/core/Msg.ts b/src/core/Msg.ts index 0427b7c..faac486 100644 --- a/src/core/Msg.ts +++ b/src/core/Msg.ts @@ -85,9 +85,8 @@ import { } from './ibc/applications/nft-transfer' import { IbcPermMsg, - MsgSetPermissionedRelayers, - MsgHaltChannel, - MsgResumeChannel, + MsgUpdateIbcPermAdmin, + MsgUpdatePermissionedRelayers, } from './ibc/applications/perm' import { IbcTransferMsg, @@ -131,6 +130,7 @@ import { MarketmapMsg, MsgCreateMarkets, MsgUpdateMarkets, + MsgUpsertMarkets, MsgRemoveMarketAuthorities, MsgUpdateMarketmapParams, } from './marketmap/msgs' @@ -181,7 +181,7 @@ import { MsgInitiateTokenDeposit, MsgFinalizeTokenWithdrawal, MsgUpdateProposer, - MsgUpdateChallengers, + MsgUpdateChallenger, MsgUpdateBatchInfo, MsgUpdateOracleConfig, MsgUpdateMetadata, @@ -515,12 +515,10 @@ export namespace Msg { return MsgUpdateIbcNftParams.fromAmino(data) // ibc-perm - case 'perm/MsgSetPermissionedRelayers': - return MsgSetPermissionedRelayers.fromAmino(data) - case 'perm/MsgHaltChannel': - return MsgHaltChannel.fromAmino(data) - case 'perm/MsgResumeChannel': - return MsgResumeChannel.fromAmino(data) + case 'ibc-perm/MsgUpdateAdmin': + return MsgUpdateIbcPermAdmin.fromAmino(data) + case 'ibc-perm/MsgUpdatePermissionedRelayers': + return MsgUpdatePermissionedRelayers.fromAmino(data) // ibc-transfer case 'cosmos-sdk/MsgTransfer': @@ -533,13 +531,15 @@ export namespace Msg { return MsgSubmitTx.fromAmino(data) // marketmap - case 'slinky/x/marketmap/MsgCreateMarkets': + case 'connect/x/marketmap/MsgCreateMarkets': return MsgCreateMarkets.fromAmino(data) - case 'slinky/x/marketmap/MsgUpdateMarkets': + case 'connect/x/marketmap/MsgUpdateMarkets': return MsgUpdateMarkets.fromAmino(data) - case 'slinky/x/marketmap/MsgRemoveMarketAuthorities': + case 'connect/x/marketmap/MsgUpsertMarkets': + return MsgUpsertMarkets.fromAmino(data) + case 'connect/x/marketmap/MsgRemoveMarketAuthorities': return MsgRemoveMarketAuthorities.fromAmino(data) - case 'slinky/x/marketmap/MsgParams': + case 'connect/x/marketmap/MsgParams': return MsgUpdateMarketmapParams.fromAmino(data) // move @@ -621,8 +621,8 @@ export namespace Msg { return MsgFinalizeTokenWithdrawal.fromAmino(data) case 'ophost/MsgUpdateProposer': return MsgUpdateProposer.fromAmino(data) - case 'ophost/MsgUpdateChallengers': - return MsgUpdateChallengers.fromAmino(data) + case 'ophost/MsgUpdateChallenger': + return MsgUpdateChallenger.fromAmino(data) case 'ophost/MsgUpdateBatchInfo': return MsgUpdateBatchInfo.fromAmino(data) case 'ophost/MsgUpdateOracleConfig': @@ -633,9 +633,9 @@ export namespace Msg { return MsgUpdateOphostParams.fromAmino(data) // oracle - case 'slinky/x/oracle/MsgAddCurrencyPairs': + case 'connect/x/oracle/MsgAddCurrencyPairs': return MsgAddCurrencyPairs.fromAmino(data) - case 'slinky/x/oracle/MsgSetCurrencyPairs': + case 'connect/x/oracle/MsgSetCurrencyPairs': return MsgRemoveCurrencyPairs.fromAmino(data) // reward @@ -871,12 +871,10 @@ export namespace Msg { return MsgUpdateIbcNftParams.fromData(data) // ibc-perm - case '/ibc.applications.perm.v1.MsgSetPermissionedRelayers': - return MsgSetPermissionedRelayers.fromData(data) - case '/ibc.applications.perm.v1.MsgHaltChannel': - return MsgHaltChannel.fromData(data) - case '/ibc.applications.perm.v1.MsgResumeChannel': - return MsgResumeChannel.fromData(data) + case '/ibc.applications.perm.v1.MsgUpdateAdmin': + return MsgUpdateIbcPermAdmin.fromData(data) + case '/ibc.applications.perm.v1.MsgUpdatePermissionedRelayers': + return MsgUpdatePermissionedRelayers.fromData(data) // ibc-transfer case '/ibc.applications.transfer.v1.MsgTransfer': @@ -943,13 +941,15 @@ export namespace Msg { return MsgSubmitTx.fromData(data) // marketmap - case '/slinky.marketmap.v1.MsgCreateMarkets': + case '/connect.marketmap.v2.MsgCreateMarkets': return MsgCreateMarkets.fromData(data) - case '/slinky.marketmap.v1.MsgUpdateMarkets': + case '/connect.marketmap.v2.MsgUpdateMarkets': return MsgUpdateMarkets.fromData(data) - case '/slinky.marketmap.v1.MsgRemoveMarketAuthorities': + case '/connect.marketmap.v2.MsgUpsertMarkets': + return MsgUpsertMarkets.fromData(data) + case '/connect.marketmap.v2.MsgRemoveMarketAuthorities': return MsgRemoveMarketAuthorities.fromData(data) - case '/slinky.marketmap.v1.MsgParams': + case '/connect.marketmap.v2.MsgParams': return MsgUpdateMarketmapParams.fromData(data) // move @@ -1031,8 +1031,8 @@ export namespace Msg { return MsgFinalizeTokenWithdrawal.fromData(data) case '/opinit.ophost.v1.MsgUpdateProposer': return MsgUpdateProposer.fromData(data) - case '/opinit.ophost.v1.MsgUpdateChallengers': - return MsgUpdateChallengers.fromData(data) + case '/opinit.ophost.v1.MsgUpdateChallenger': + return MsgUpdateChallenger.fromData(data) case '/opinit.ophost.v1.MsgUpdateBatchInfo': return MsgUpdateBatchInfo.fromData(data) case '/opinit.ophost.v1.MsgUpdateOracleConfig': @@ -1043,9 +1043,9 @@ export namespace Msg { return MsgUpdateOphostParams.fromData(data) // oracle - case '/slinky.oracle.v1.MsgAddCurrencyPairs': + case '/connect.oracle.v2.MsgAddCurrencyPairs': return MsgAddCurrencyPairs.fromData(data) - case '/slinky.oracle.v1.MsgRemoveCurrencyPairs': + case '/connect.oracle.v2.MsgRemoveCurrencyPairs': return MsgRemoveCurrencyPairs.fromData(data) // reward @@ -1281,12 +1281,10 @@ export namespace Msg { return MsgUpdateIbcNftParams.unpackAny(proto) // ibc-perm - case '/ibc.applications.perm.v1.MsgSetPermissionedRelayers': - return MsgSetPermissionedRelayers.unpackAny(proto) - case '/ibc.applications.perm.v1.MsgHaltChannel': - return MsgHaltChannel.unpackAny(proto) - case '/ibc.applications.perm.v1.MsgResumeChannel': - return MsgResumeChannel.unpackAny(proto) + case '/ibc.applications.perm.v1.MsgUpdateAdmin': + return MsgUpdateIbcPermAdmin.unpackAny(proto) + case '/ibc.applications.perm.v1.MsgUpdatePermissionedRelayers': + return MsgUpdatePermissionedRelayers.unpackAny(proto) // ibc-transfer case '/ibc.applications.transfer.v1.MsgTransfer': @@ -1353,13 +1351,15 @@ export namespace Msg { return MsgSubmitTx.unpackAny(proto) // marketmap - case '/slinky.marketmap.v1.MsgCreateMarkets': + case '/connect.marketmap.v2.MsgCreateMarkets': return MsgCreateMarkets.unpackAny(proto) - case '/slinky.marketmap.v1.MsgUpdateMarkets': + case '/connect.marketmap.v2.MsgUpdateMarkets': return MsgUpdateMarkets.unpackAny(proto) - case '/slinky.marketmap.v1.MsgRemoveMarketAuthorities': + case '/connect.marketmap.v2.MsgUpsertMarkets': + return MsgUpsertMarkets.unpackAny(proto) + case '/connect.marketmap.v2.MsgRemoveMarketAuthorities': return MsgRemoveMarketAuthorities.unpackAny(proto) - case '/slinky.marketmap.v1.MsgParams': + case '/connect.marketmap.v2.MsgParams': return MsgUpdateMarketmapParams.unpackAny(proto) // move @@ -1441,8 +1441,8 @@ export namespace Msg { return MsgFinalizeTokenWithdrawal.unpackAny(proto) case '/opinit.ophost.v1.MsgUpdateProposer': return MsgUpdateProposer.unpackAny(proto) - case '/opinit.ophost.v1.MsgUpdateChallengers': - return MsgUpdateChallengers.unpackAny(proto) + case '/opinit.ophost.v1.MsgUpdateChallenger': + return MsgUpdateChallenger.unpackAny(proto) case '/opinit.ophost.v1.MsgUpdateBatchInfo': return MsgUpdateBatchInfo.unpackAny(proto) case '/opinit.ophost.v1.MsgUpdateOracleConfig': @@ -1453,9 +1453,9 @@ export namespace Msg { return MsgUpdateOphostParams.unpackAny(proto) // oracle - case '/slinky.oracle.v1.MsgAddCurrencyPairs': + case '/connect.oracle.v2.MsgAddCurrencyPairs': return MsgAddCurrencyPairs.unpackAny(proto) - case '/slinky.oracle.v1.MsgRemoveCurrencyPairs': + case '/connect.oracle.v2.MsgRemoveCurrencyPairs': return MsgRemoveCurrencyPairs.unpackAny(proto) // reward diff --git a/src/core/gov/TallyResult.ts b/src/core/gov/TallyResult.ts new file mode 100644 index 0000000..cd97ebe --- /dev/null +++ b/src/core/gov/TallyResult.ts @@ -0,0 +1,144 @@ +import { JSONSerializable } from '../../util/json' +import { TallyResult as V1TallyResult_pb } from '@initia/initia.proto/cosmos/gov/v1/gov' +import { TallyResult as TallyResult_pb } from '@initia/initia.proto/initia/gov/v1/gov' +import Long from 'long' + +export class TallyResult extends JSONSerializable< + TallyResult.Amino, + TallyResult.Data, + TallyResult.Proto +> { + /** + * @param tally_height + * @param total_staking_power + * @param total_vesting_power + * @param v1_tally_result // the original TallyResult from cosmos-sdk which contains both staking and vesting power + */ + constructor( + public tally_height: number, + public total_staking_power: string, + public total_vesting_power: string, + public v1_tally_result: TallyResult.V1TallyResult + ) { + super() + } + + public static fromAmino(data: TallyResult.Amino): TallyResult { + const { + tally_height, + total_staking_power, + total_vesting_power, + v1_tally_result, + } = data + return new TallyResult( + Number.parseInt(tally_height), + total_staking_power, + total_vesting_power, + v1_tally_result + ) + } + + public toAmino(): TallyResult.Amino { + const { + tally_height, + total_staking_power, + total_vesting_power, + v1_tally_result, + } = this + return { + tally_height: tally_height.toString(), + total_staking_power, + total_vesting_power, + v1_tally_result, + } + } + + public static fromData(data: TallyResult.Data): TallyResult { + const { + tally_height, + total_staking_power, + total_vesting_power, + v1_tally_result, + } = data + return new TallyResult( + Number.parseInt(tally_height), + total_staking_power, + total_vesting_power, + v1_tally_result + ) + } + + public toData(): TallyResult.Data { + const { + tally_height, + total_staking_power, + total_vesting_power, + v1_tally_result, + } = this + return { + tally_height: tally_height.toString(), + total_staking_power, + total_vesting_power, + v1_tally_result, + } + } + + public static fromProto(data: TallyResult.Proto): TallyResult { + return new TallyResult( + data.tallyHeight.toNumber(), + data.totalStakingPower, + data.totalVestingPower, + { + yes_count: data.v1TallyResult?.yesCount ?? '0', + abstain_count: data.v1TallyResult?.abstainCount ?? '0', + no_count: data.v1TallyResult?.noCount ?? '0', + no_with_veto_count: data.v1TallyResult?.noWithVetoCount ?? '0', + } + ) + } + + public toProto(): TallyResult.Proto { + const { + tally_height, + total_staking_power, + total_vesting_power, + v1_tally_result, + } = this + return TallyResult_pb.fromPartial({ + tallyHeight: Long.fromNumber(tally_height), + totalStakingPower: total_staking_power, + totalVestingPower: total_vesting_power, + v1TallyResult: V1TallyResult_pb.fromPartial({ + yesCount: v1_tally_result.yes_count, + abstainCount: v1_tally_result.abstain_count, + noCount: v1_tally_result.no_count, + noWithVetoCount: v1_tally_result.no_with_veto_count, + }), + }) + } +} + +export namespace TallyResult { + export interface V1TallyResult { + yes_count: string + abstain_count: string + no_count: string + no_with_veto_count: string + } + + export interface Amino { + tally_height: string + total_staking_power: string + total_vesting_power: string + v1_tally_result: V1TallyResult + } + + export interface Data { + tally_height: string + total_staking_power: string + total_vesting_power: string + v1_tally_result: V1TallyResult + } + + export type Proto = TallyResult_pb +} diff --git a/src/core/gov/index.ts b/src/core/gov/index.ts index 13eb967..8acd95d 100644 --- a/src/core/gov/index.ts +++ b/src/core/gov/index.ts @@ -2,4 +2,5 @@ export * from './msgs' export * from './proposals' export * from './Deposit' export * from './Vote' +export * from './TallyResult' export * from './GovParams' diff --git a/src/core/gov/proposals/Proposal.ts b/src/core/gov/proposals/Proposal.ts index a8dd2bc..14755f0 100644 --- a/src/core/gov/proposals/Proposal.ts +++ b/src/core/gov/proposals/Proposal.ts @@ -1,11 +1,10 @@ import { JSONSerializable } from '../../../util/json' import { Coins } from '../../Coins' -import { num } from '../../num' import { AccAddress } from '../../bech32' import { Msg } from '../../Msg' +import { TallyResult } from '../TallyResult' import { ProposalStatus, - TallyResult, proposalStatusFromJSON, proposalStatusToJSON, } from '@initia/initia.proto/cosmos/gov/v1/gov' @@ -47,7 +46,7 @@ export class Proposal extends JSONSerializable< public id: number, public messages: Msg[], public status: ProposalStatus, - public final_tally_result: Proposal.FinalTallyResult, + public final_tally_result: TallyResult, public submit_time: Date, public deposit_end_time: Date, total_deposit: Coins.Input, @@ -93,14 +92,7 @@ export class Proposal extends JSONSerializable< Number.parseInt(id), messages.map(Msg.fromAmino), proposalStatusFromJSON(status), - { - yes_count: num(final_tally_result.yes_count ?? 0).toFixed(0), - no_count: num(final_tally_result.no_count ?? 0).toFixed(0), - abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(0), - no_with_veto_count: num( - final_tally_result.no_with_veto_count ?? 0 - ).toFixed(0), - }, + TallyResult.fromAmino(final_tally_result), new Date(submit_time), new Date(deposit_end_time), Coins.fromAmino(total_deposit), @@ -144,14 +136,7 @@ export class Proposal extends JSONSerializable< id: id.toString(), messages: messages.map((msg): Msg.Amino => msg.toAmino()), status: proposalStatusToJSON(status), - final_tally_result: { - yes_count: num(final_tally_result.yes_count).toFixed(), - no_count: num(final_tally_result.no_count).toFixed(), - abstain_count: num(final_tally_result.abstain_count).toFixed(), - no_with_veto_count: num( - final_tally_result.no_with_veto_count - ).toFixed(), - }, + final_tally_result: final_tally_result.toAmino(), submit_time: submit_time.toISOString(), deposit_end_time: deposit_end_time.toISOString(), total_deposit: total_deposit.toAmino(), @@ -195,14 +180,7 @@ export class Proposal extends JSONSerializable< Number.parseInt(id), messages.map(Msg.fromData), proposalStatusFromJSON(status), - { - yes_count: num(final_tally_result.yes_count ?? 0).toFixed(0), - no_count: num(final_tally_result.no_count ?? 0).toFixed(0), - abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(0), - no_with_veto_count: num( - final_tally_result.no_with_veto_count ?? 0 - ).toFixed(0), - }, + TallyResult.fromData(final_tally_result), new Date(submit_time), new Date(deposit_end_time), Coins.fromData(total_deposit), @@ -246,14 +224,7 @@ export class Proposal extends JSONSerializable< id: id.toString(), messages: messages.map((msg) => msg.toData()), status: proposalStatusToJSON(status), - final_tally_result: { - yes_count: num(final_tally_result.yes_count).toFixed(), - no_count: num(final_tally_result.no_count).toFixed(), - abstain_count: num(final_tally_result.abstain_count).toFixed(), - no_with_veto_count: num( - final_tally_result.no_with_veto_count - ).toFixed(), - }, + final_tally_result: final_tally_result.toData(), submit_time: submit_time.toISOString(), deposit_end_time: deposit_end_time.toISOString(), total_deposit: total_deposit.toData(), @@ -276,14 +247,7 @@ export class Proposal extends JSONSerializable< data.id.toNumber(), data.messages.map(Msg.fromProto), data.status, - { - yes_count: num(data.finalTallyResult?.yesCount ?? 0).toFixed(0), - no_count: num(data.finalTallyResult?.noCount ?? 0).toFixed(0), - abstain_count: num(data.finalTallyResult?.abstainCount ?? 0).toFixed(0), - no_with_veto_count: num( - data.finalTallyResult?.noWithVetoCount ?? 0 - ).toFixed(0), - }, + TallyResult.fromProto(data.finalTallyResult as TallyResult.Proto), data.submitTime as Date, data.depositEndTime as Date, Coins.fromProto(data.totalDeposit), @@ -323,21 +287,11 @@ export class Proposal extends JSONSerializable< failed_reason, } = this - let ftr: TallyResult | undefined - if (final_tally_result) { - ftr = TallyResult.fromPartial({ - yesCount: final_tally_result.yes_count.toString(), - noCount: final_tally_result.no_count.toString(), - abstainCount: final_tally_result.abstain_count.toString(), - noWithVetoCount: final_tally_result.no_with_veto_count.toString(), - }) - } - return Proposal_pb.fromPartial({ id: Long.fromNumber(id), messages: messages.map((msg) => msg.packAny()), status, - finalTallyResult: ftr, + finalTallyResult: final_tally_result.toProto(), submitTime: submit_time, depositEndTime: deposit_end_time, totalDeposit: total_deposit.toProto(), @@ -360,23 +314,11 @@ export namespace Proposal { export const Status = ProposalStatus export type Status = ProposalStatus - export interface FinalTallyResult { - yes_count: string - abstain_count: string - no_count: string - no_with_veto_count: string - } - export interface Amino { id: string messages: Msg.Amino[] status: string - final_tally_result: { - yes_count: string - abstain_count: string - no_count: string - no_with_veto_count: string - } + final_tally_result: TallyResult.Amino submit_time: string deposit_end_time: string total_deposit: Coins.Amino @@ -397,12 +339,7 @@ export namespace Proposal { id: string messages: Msg.Data[] status: string - final_tally_result: { - yes_count: string - abstain_count: string - no_count: string - no_with_veto_count: string - } + final_tally_result: TallyResult.Data submit_time: string deposit_end_time: string total_deposit: Coins.Data diff --git a/src/core/ibc/applications/perm/msgs/MsgHaltChannel.ts b/src/core/ibc/applications/perm/msgs/MsgHaltChannel.ts deleted file mode 100644 index 75d3d1e..0000000 --- a/src/core/ibc/applications/perm/msgs/MsgHaltChannel.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { JSONSerializable } from '../../../../../util/json' -import { AccAddress } from '../../../../bech32' -import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgHaltChannel as MsgHaltChannel_pb } from '@initia/initia.proto/ibc/applications/perm/v1/tx' - -export class MsgHaltChannel extends JSONSerializable< - MsgHaltChannel.Amino, - MsgHaltChannel.Data, - MsgHaltChannel.Proto -> { - /** - * @param authority the address that controls the module - * @param channel_id - * @param port_id - */ - constructor( - public authority: AccAddress, - public channel_id: string, - public port_id: string - ) { - super() - } - - public static fromAmino(data: MsgHaltChannel.Amino): MsgHaltChannel { - const { - value: { authority, channel_id, port_id }, - } = data - return new MsgHaltChannel(authority, channel_id, port_id) - } - - public toAmino(): MsgHaltChannel.Amino { - const { authority, channel_id, port_id } = this - return { - type: 'perm/MsgHaltChannel', - value: { - authority, - channel_id, - port_id, - }, - } - } - - public static fromData(data: MsgHaltChannel.Data): MsgHaltChannel { - const { authority, channel_id, port_id } = data - return new MsgHaltChannel(authority, channel_id, port_id) - } - - public toData(): MsgHaltChannel.Data { - const { authority, channel_id, port_id } = this - return { - '@type': '/ibc.applications.perm.v1.MsgHaltChannel', - authority, - channel_id, - port_id, - } - } - - public static fromProto(data: MsgHaltChannel.Proto): MsgHaltChannel { - return new MsgHaltChannel(data.authority, data.channelId, data.portId) - } - - public toProto(): MsgHaltChannel.Proto { - const { authority, channel_id, port_id } = this - return MsgHaltChannel_pb.fromPartial({ - authority, - channelId: channel_id, - portId: port_id, - }) - } - - public packAny(): Any { - return Any.fromPartial({ - typeUrl: '/ibc.applications.perm.v1.MsgHaltChannel', - value: MsgHaltChannel_pb.encode(this.toProto()).finish(), - }) - } - - public static unpackAny(msgAny: Any): MsgHaltChannel { - return MsgHaltChannel.fromProto(MsgHaltChannel_pb.decode(msgAny.value)) - } -} - -export namespace MsgHaltChannel { - export interface Amino { - type: 'perm/MsgHaltChannel' - value: { - authority: AccAddress - channel_id: string - port_id: string - } - } - - export interface Data { - '@type': '/ibc.applications.perm.v1.MsgHaltChannel' - authority: AccAddress - channel_id: string - port_id: string - } - - export type Proto = MsgHaltChannel_pb -} diff --git a/src/core/ibc/applications/perm/msgs/MsgResumeChannel.ts b/src/core/ibc/applications/perm/msgs/MsgResumeChannel.ts deleted file mode 100644 index 50417ab..0000000 --- a/src/core/ibc/applications/perm/msgs/MsgResumeChannel.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { JSONSerializable } from '../../../../../util/json' -import { AccAddress } from '../../../../bech32' -import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgResumeChannel as MsgResumeChannel_pb } from '@initia/initia.proto/ibc/applications/perm/v1/tx' - -export class MsgResumeChannel extends JSONSerializable< - MsgResumeChannel.Amino, - MsgResumeChannel.Data, - MsgResumeChannel.Proto -> { - /** - * @param authority the address that controls the module - * @param channel_id - * @param port_id - */ - constructor( - public authority: AccAddress, - public channel_id: string, - public port_id: string - ) { - super() - } - - public static fromAmino(data: MsgResumeChannel.Amino): MsgResumeChannel { - const { - value: { authority, channel_id, port_id }, - } = data - return new MsgResumeChannel(authority, channel_id, port_id) - } - - public toAmino(): MsgResumeChannel.Amino { - const { authority, channel_id, port_id } = this - return { - type: 'perm/MsgResumeChannel', - value: { - authority, - channel_id, - port_id, - }, - } - } - - public static fromData(data: MsgResumeChannel.Data): MsgResumeChannel { - const { authority, channel_id, port_id } = data - return new MsgResumeChannel(authority, channel_id, port_id) - } - - public toData(): MsgResumeChannel.Data { - const { authority, channel_id, port_id } = this - return { - '@type': '/ibc.applications.perm.v1.MsgResumeChannel', - authority, - channel_id, - port_id, - } - } - - public static fromProto(data: MsgResumeChannel.Proto): MsgResumeChannel { - return new MsgResumeChannel(data.authority, data.channelId, data.portId) - } - - public toProto(): MsgResumeChannel.Proto { - const { authority, channel_id, port_id } = this - return MsgResumeChannel_pb.fromPartial({ - authority, - channelId: channel_id, - portId: port_id, - }) - } - - public packAny(): Any { - return Any.fromPartial({ - typeUrl: '/ibc.applications.perm.v1.MsgResumeChannel', - value: MsgResumeChannel_pb.encode(this.toProto()).finish(), - }) - } - - public static unpackAny(msgAny: Any): MsgResumeChannel { - return MsgResumeChannel.fromProto(MsgResumeChannel_pb.decode(msgAny.value)) - } -} - -export namespace MsgResumeChannel { - export interface Amino { - type: 'perm/MsgResumeChannel' - value: { - authority: AccAddress - channel_id: string - port_id: string - } - } - - export interface Data { - '@type': '/ibc.applications.perm.v1.MsgResumeChannel' - authority: AccAddress - channel_id: string - port_id: string - } - - export type Proto = MsgResumeChannel_pb -} diff --git a/src/core/ibc/applications/perm/msgs/MsgUpdateIbcPermAdmin.ts b/src/core/ibc/applications/perm/msgs/MsgUpdateIbcPermAdmin.ts new file mode 100644 index 0000000..8b5d522 --- /dev/null +++ b/src/core/ibc/applications/perm/msgs/MsgUpdateIbcPermAdmin.ts @@ -0,0 +1,121 @@ +import { JSONSerializable } from '../../../../../util/json' +import { AccAddress } from '../../../../bech32' +import { Any } from '@initia/initia.proto/google/protobuf/any' +import { MsgUpdateAdmin as MsgUpdateAdmin_pb } from '@initia/initia.proto/ibc/applications/perm/v1/tx' + +export class MsgUpdateIbcPermAdmin extends JSONSerializable< + MsgUpdateIbcPermAdmin.Amino, + MsgUpdateIbcPermAdmin.Data, + MsgUpdateIbcPermAdmin.Proto +> { + /** + * @param authority the address that controls the module + * @param channel_id + * @param port_id + * @param admin + */ + constructor( + public authority: AccAddress, + public channel_id: string, + public port_id: string, + public admin: string + ) { + super() + } + + public static fromAmino( + data: MsgUpdateIbcPermAdmin.Amino + ): MsgUpdateIbcPermAdmin { + const { + value: { authority, channel_id, port_id, admin }, + } = data + return new MsgUpdateIbcPermAdmin(authority, channel_id, port_id, admin) + } + + public toAmino(): MsgUpdateIbcPermAdmin.Amino { + const { authority, channel_id, port_id, admin } = this + return { + type: 'ibc-perm/MsgUpdateAdmin', + value: { + authority, + channel_id, + port_id, + admin, + }, + } + } + + public static fromData( + data: MsgUpdateIbcPermAdmin.Data + ): MsgUpdateIbcPermAdmin { + const { authority, channel_id, port_id, admin } = data + return new MsgUpdateIbcPermAdmin(authority, channel_id, port_id, admin) + } + + public toData(): MsgUpdateIbcPermAdmin.Data { + const { authority, channel_id, port_id, admin } = this + return { + '@type': '/ibc.applications.perm.v1.MsgUpdateAdmin', + authority, + channel_id, + port_id, + admin, + } + } + + public static fromProto( + data: MsgUpdateIbcPermAdmin.Proto + ): MsgUpdateIbcPermAdmin { + return new MsgUpdateIbcPermAdmin( + data.authority, + data.channelId, + data.portId, + data.admin + ) + } + + public toProto(): MsgUpdateIbcPermAdmin.Proto { + const { authority, channel_id, port_id, admin } = this + return MsgUpdateAdmin_pb.fromPartial({ + authority, + channelId: channel_id, + portId: port_id, + admin, + }) + } + + public packAny(): Any { + return Any.fromPartial({ + typeUrl: '/ibc.applications.perm.v1.MsgUpdateAdmin', + value: MsgUpdateAdmin_pb.encode(this.toProto()).finish(), + }) + } + + public static unpackAny(msgAny: Any): MsgUpdateIbcPermAdmin { + return MsgUpdateIbcPermAdmin.fromProto( + MsgUpdateAdmin_pb.decode(msgAny.value) + ) + } +} + +export namespace MsgUpdateIbcPermAdmin { + export interface Amino { + type: 'ibc-perm/MsgUpdateAdmin' + value: { + authority: AccAddress + channel_id: string + port_id: string + admin: string + } + } + + export interface Data { + '@type': '/ibc.applications.perm.v1.MsgUpdateAdmin' + authority: AccAddress + channel_id: string + port_id: string + admin: string + } + + export type Proto = MsgUpdateAdmin_pb +} diff --git a/src/core/ibc/applications/perm/msgs/MsgSetPermissionedRelayers.ts b/src/core/ibc/applications/perm/msgs/MsgUpdatePermissionedRelayers.ts similarity index 52% rename from src/core/ibc/applications/perm/msgs/MsgSetPermissionedRelayers.ts rename to src/core/ibc/applications/perm/msgs/MsgUpdatePermissionedRelayers.ts index f135f83..15db437 100644 --- a/src/core/ibc/applications/perm/msgs/MsgSetPermissionedRelayers.ts +++ b/src/core/ibc/applications/perm/msgs/MsgUpdatePermissionedRelayers.ts @@ -1,12 +1,12 @@ import { JSONSerializable } from '../../../../../util/json' import { AccAddress } from '../../../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgSetPermissionedRelayers as MsgSetPermissionedRelayers_pb } from '@initia/initia.proto/ibc/applications/perm/v1/tx' +import { MsgUpdatePermissionedRelayers as MsgUpdatePermissionedRelayers_pb } from '@initia/initia.proto/ibc/applications/perm/v1/tx' -export class MsgSetPermissionedRelayers extends JSONSerializable< - MsgSetPermissionedRelayers.Amino, - MsgSetPermissionedRelayers.Data, - MsgSetPermissionedRelayers.Proto +export class MsgUpdatePermissionedRelayers extends JSONSerializable< + MsgUpdatePermissionedRelayers.Amino, + MsgUpdatePermissionedRelayers.Data, + MsgUpdatePermissionedRelayers.Proto > { /** * @param authority the address that controls the module @@ -24,12 +24,12 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< } public static fromAmino( - data: MsgSetPermissionedRelayers.Amino - ): MsgSetPermissionedRelayers { + data: MsgUpdatePermissionedRelayers.Amino + ): MsgUpdatePermissionedRelayers { const { value: { authority, channel_id, port_id, relayers }, } = data - return new MsgSetPermissionedRelayers( + return new MsgUpdatePermissionedRelayers( authority, channel_id, port_id, @@ -37,10 +37,10 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< ) } - public toAmino(): MsgSetPermissionedRelayers.Amino { + public toAmino(): MsgUpdatePermissionedRelayers.Amino { const { authority, channel_id, port_id, relayers } = this return { - type: 'perm/MsgSetPermissionedRelayers', + type: 'ibc-perm/MsgUpdatePermissionedRelayers', value: { authority, channel_id, @@ -51,10 +51,10 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< } public static fromData( - data: MsgSetPermissionedRelayers.Data - ): MsgSetPermissionedRelayers { + data: MsgUpdatePermissionedRelayers.Data + ): MsgUpdatePermissionedRelayers { const { authority, channel_id, port_id, relayers } = data - return new MsgSetPermissionedRelayers( + return new MsgUpdatePermissionedRelayers( authority, channel_id, port_id, @@ -62,10 +62,10 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< ) } - public toData(): MsgSetPermissionedRelayers.Data { + public toData(): MsgUpdatePermissionedRelayers.Data { const { authority, channel_id, port_id, relayers } = this return { - '@type': '/ibc.applications.perm.v1.MsgSetPermissionedRelayers', + '@type': '/ibc.applications.perm.v1.MsgUpdatePermissionedRelayers', authority, channel_id, port_id, @@ -74,9 +74,9 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< } public static fromProto( - data: MsgSetPermissionedRelayers.Proto - ): MsgSetPermissionedRelayers { - return new MsgSetPermissionedRelayers( + data: MsgUpdatePermissionedRelayers.Proto + ): MsgUpdatePermissionedRelayers { + return new MsgUpdatePermissionedRelayers( data.authority, data.channelId, data.portId, @@ -84,9 +84,9 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< ) } - public toProto(): MsgSetPermissionedRelayers.Proto { + public toProto(): MsgUpdatePermissionedRelayers.Proto { const { authority, channel_id, port_id, relayers } = this - return MsgSetPermissionedRelayers_pb.fromPartial({ + return MsgUpdatePermissionedRelayers_pb.fromPartial({ authority, channelId: channel_id, portId: port_id, @@ -96,21 +96,21 @@ export class MsgSetPermissionedRelayers extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/ibc.applications.perm.v1.MsgSetPermissionedRelayers', - value: MsgSetPermissionedRelayers_pb.encode(this.toProto()).finish(), + typeUrl: '/ibc.applications.perm.v1.MsgUpdatePermissionedRelayers', + value: MsgUpdatePermissionedRelayers_pb.encode(this.toProto()).finish(), }) } - public static unpackAny(msgAny: Any): MsgSetPermissionedRelayers { - return MsgSetPermissionedRelayers.fromProto( - MsgSetPermissionedRelayers_pb.decode(msgAny.value) + public static unpackAny(msgAny: Any): MsgUpdatePermissionedRelayers { + return MsgUpdatePermissionedRelayers.fromProto( + MsgUpdatePermissionedRelayers_pb.decode(msgAny.value) ) } } -export namespace MsgSetPermissionedRelayers { +export namespace MsgUpdatePermissionedRelayers { export interface Amino { - type: 'perm/MsgSetPermissionedRelayers' + type: 'ibc-perm/MsgUpdatePermissionedRelayers' value: { authority: AccAddress channel_id: string @@ -120,12 +120,12 @@ export namespace MsgSetPermissionedRelayers { } export interface Data { - '@type': '/ibc.applications.perm.v1.MsgSetPermissionedRelayers' + '@type': '/ibc.applications.perm.v1.MsgUpdatePermissionedRelayers' authority: AccAddress channel_id: string port_id: string relayers: string[] } - export type Proto = MsgSetPermissionedRelayers_pb + export type Proto = MsgUpdatePermissionedRelayers_pb } diff --git a/src/core/ibc/applications/perm/msgs/index.ts b/src/core/ibc/applications/perm/msgs/index.ts index 78e4763..9bf8fe3 100644 --- a/src/core/ibc/applications/perm/msgs/index.ts +++ b/src/core/ibc/applications/perm/msgs/index.ts @@ -1,26 +1,18 @@ -import { MsgSetPermissionedRelayers } from './MsgSetPermissionedRelayers' -import { MsgHaltChannel } from './MsgHaltChannel' -import { MsgResumeChannel } from './MsgResumeChannel' +import { MsgUpdateIbcPermAdmin } from './MsgUpdateIbcPermAdmin' +import { MsgUpdatePermissionedRelayers } from './MsgUpdatePermissionedRelayers' -export * from './MsgSetPermissionedRelayers' -export * from './MsgHaltChannel' -export * from './MsgResumeChannel' +export * from './MsgUpdateIbcPermAdmin' +export * from './MsgUpdatePermissionedRelayers' -export type IbcPermMsg = - | MsgSetPermissionedRelayers - | MsgHaltChannel - | MsgResumeChannel +export type IbcPermMsg = MsgUpdateIbcPermAdmin | MsgUpdatePermissionedRelayers export namespace IbcPermMsg { export type Amino = - | MsgSetPermissionedRelayers.Amino - | MsgHaltChannel.Amino - | MsgResumeChannel.Amino + | MsgUpdateIbcPermAdmin.Amino + | MsgUpdatePermissionedRelayers.Amino export type Data = - | MsgSetPermissionedRelayers.Data - | MsgHaltChannel.Data - | MsgResumeChannel.Data + | MsgUpdateIbcPermAdmin.Data + | MsgUpdatePermissionedRelayers.Data export type Proto = - | MsgSetPermissionedRelayers.Proto - | MsgHaltChannel.Proto - | MsgResumeChannel.Proto + | MsgUpdateIbcPermAdmin.Proto + | MsgUpdatePermissionedRelayers.Proto } diff --git a/src/core/ibc/applications/transfer/DenomTrace.ts b/src/core/ibc/applications/transfer/DenomTrace.ts index edd7edc..26635fc 100644 --- a/src/core/ibc/applications/transfer/DenomTrace.ts +++ b/src/core/ibc/applications/transfer/DenomTrace.ts @@ -1,4 +1,4 @@ -import { DenomTrace as DenomTrace_pb } from '@initia/initia.proto/ibc/applications/transfer/v1/denomtrace' +import { DenomTrace as DenomTrace_pb } from '@initia/initia.proto/ibc/applications/transfer/v1/transfer' import { JSONSerializable } from '../../../../util/json' /** diff --git a/src/core/intertx/msgs/MsgRegisterAccount.ts b/src/core/intertx/msgs/MsgRegisterAccount.ts index 973ce20..fac721f 100644 --- a/src/core/intertx/msgs/MsgRegisterAccount.ts +++ b/src/core/intertx/msgs/MsgRegisterAccount.ts @@ -1,6 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' +import { Order } from '@initia/initia.proto/ibc/core/channel/v1/channel' import { MsgRegisterAccount as MsgRegisterAccount_pb } from '@initia/initia.proto/initia/intertx/v1/tx' export class MsgRegisterAccount extends JSONSerializable< @@ -12,43 +13,46 @@ export class MsgRegisterAccount extends JSONSerializable< * @param owner * @param connection_id * @param version + * @param ordering */ constructor( public owner: AccAddress, public connection_id: string, - public version: string + public version: string, + public ordering: Order ) { super() } public static fromAmino(data: MsgRegisterAccount.Amino): MsgRegisterAccount { const { - value: { owner, connection_id, version }, + value: { owner, connection_id, version, ordering }, } = data - return new MsgRegisterAccount(owner, connection_id, version) + return new MsgRegisterAccount(owner, connection_id, version, ordering) } public toAmino(): MsgRegisterAccount.Amino { - const { owner, connection_id, version } = this + const { owner, connection_id, version, ordering } = this return { type: 'intertx/MsgRegisterAccount', - value: { owner, connection_id, version }, + value: { owner, connection_id, version, ordering }, } } public static fromData(data: MsgRegisterAccount.Data): MsgRegisterAccount { - const { owner, connection_id, version } = data - return new MsgRegisterAccount(owner, connection_id, version) + const { owner, connection_id, version, ordering } = data + return new MsgRegisterAccount(owner, connection_id, version, ordering) } public toData(): MsgRegisterAccount.Data { - const { owner, connection_id, version } = this + const { owner, connection_id, version, ordering } = this return { '@type': '/initia.intertx.v1.MsgRegisterAccount', owner, connection_id, version, + ordering, } } @@ -56,16 +60,18 @@ export class MsgRegisterAccount extends JSONSerializable< return new MsgRegisterAccount( proto.owner, proto.connectionId, - proto.version + proto.version, + proto.ordering ) } public toProto(): MsgRegisterAccount.Proto { - const { owner, connection_id, version } = this + const { owner, connection_id, version, ordering } = this return MsgRegisterAccount_pb.fromPartial({ owner, connectionId: connection_id, version, + ordering, }) } @@ -90,6 +96,7 @@ export namespace MsgRegisterAccount { owner: AccAddress connection_id: string version: string + ordering: Order } } @@ -98,6 +105,7 @@ export namespace MsgRegisterAccount { owner: AccAddress connection_id: string version: string + ordering: Order } export type Proto = MsgRegisterAccount_pb diff --git a/src/core/marketmap/Market.ts b/src/core/marketmap/Market.ts index b58d33e..cff7330 100644 --- a/src/core/marketmap/Market.ts +++ b/src/core/marketmap/Market.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../util/json' import { ProviderConfig } from './ProviderConfig' import { Ticker } from './Ticker' -import { Market as Market_pb } from '@initia/initia.proto/slinky/marketmap/v1/market' +import { Market as Market_pb } from '@initia/initia.proto/connect/marketmap/v2/market' export class Market extends JSONSerializable< Market.Amino, diff --git a/src/core/marketmap/MarketmapParams.ts b/src/core/marketmap/MarketmapParams.ts index 64ac7d5..cc89ffd 100644 --- a/src/core/marketmap/MarketmapParams.ts +++ b/src/core/marketmap/MarketmapParams.ts @@ -1,6 +1,6 @@ import { AccAddress } from '../bech32' import { JSONSerializable } from '../../util/json' -import { Params as Params_pb } from '@initia/initia.proto/slinky/marketmap/v1/params' +import { Params as Params_pb } from '@initia/initia.proto/connect/marketmap/v2/params' export class MarketmapParams extends JSONSerializable< MarketmapParams.Amino, diff --git a/src/core/marketmap/ProviderConfig.ts b/src/core/marketmap/ProviderConfig.ts index 2c35797..63f8d99 100644 --- a/src/core/marketmap/ProviderConfig.ts +++ b/src/core/marketmap/ProviderConfig.ts @@ -1,6 +1,6 @@ import { JSONSerializable } from '../../util/json' import { CurrencyPair } from '../oracle' -import { ProviderConfig as ProviderConfig_pb } from '@initia/initia.proto/slinky/marketmap/v1/market' +import { ProviderConfig as ProviderConfig_pb } from '@initia/initia.proto/connect/marketmap/v2/market' export class ProviderConfig extends JSONSerializable< ProviderConfig.Amino, diff --git a/src/core/marketmap/Ticker.ts b/src/core/marketmap/Ticker.ts index 89dbfe0..8bd1228 100644 --- a/src/core/marketmap/Ticker.ts +++ b/src/core/marketmap/Ticker.ts @@ -1,6 +1,6 @@ import { JSONSerializable } from '../../util/json' import { CurrencyPair } from '../oracle' -import { Ticker as Ticker_pb } from '@initia/initia.proto/slinky/marketmap/v1/market' +import { Ticker as Ticker_pb } from '@initia/initia.proto/connect/marketmap/v2/market' import Long from 'long' export class Ticker extends JSONSerializable< diff --git a/src/core/marketmap/msgs/MsgCreateMarkets.ts b/src/core/marketmap/msgs/MsgCreateMarkets.ts index c8860ea..f6b689a 100644 --- a/src/core/marketmap/msgs/MsgCreateMarkets.ts +++ b/src/core/marketmap/msgs/MsgCreateMarkets.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgCreateMarkets as MsgCreateMarkets_pb } from '@initia/initia.proto/slinky/marketmap/v1/tx' +import { MsgCreateMarkets as MsgCreateMarkets_pb } from '@initia/initia.proto/connect/marketmap/v2/tx' import { Market } from '../Market' export class MsgCreateMarkets extends JSONSerializable< @@ -30,7 +30,7 @@ export class MsgCreateMarkets extends JSONSerializable< public toAmino(): MsgCreateMarkets.Amino { const { authority, create_markets } = this return { - type: 'slinky/x/marketmap/MsgCreateMarkets', + type: 'connect/x/marketmap/MsgCreateMarkets', value: { authority, create_markets: create_markets.map((msg) => msg.toAmino()), @@ -46,7 +46,7 @@ export class MsgCreateMarkets extends JSONSerializable< public toData(): MsgCreateMarkets.Data { const { authority, create_markets } = this return { - '@type': '/slinky.marketmap.v1.MsgCreateMarkets', + '@type': '/connect.marketmap.v2.MsgCreateMarkets', authority, create_markets: create_markets.map((msg) => msg.toData()), } @@ -69,7 +69,7 @@ export class MsgCreateMarkets extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.marketmap.v1.MsgCreateMarkets', + typeUrl: '/connect.marketmap.v2.MsgCreateMarkets', value: MsgCreateMarkets_pb.encode(this.toProto()).finish(), }) } @@ -81,7 +81,7 @@ export class MsgCreateMarkets extends JSONSerializable< export namespace MsgCreateMarkets { export interface Amino { - type: 'slinky/x/marketmap/MsgCreateMarkets' + type: 'connect/x/marketmap/MsgCreateMarkets' value: { authority: AccAddress create_markets: Market.Amino[] @@ -89,7 +89,7 @@ export namespace MsgCreateMarkets { } export interface Data { - '@type': '/slinky.marketmap.v1.MsgCreateMarkets' + '@type': '/connect.marketmap.v2.MsgCreateMarkets' authority: AccAddress create_markets: Market.Data[] } diff --git a/src/core/marketmap/msgs/MsgRemoveMarketAuthorities.ts b/src/core/marketmap/msgs/MsgRemoveMarketAuthorities.ts index d4c6357..3511791 100644 --- a/src/core/marketmap/msgs/MsgRemoveMarketAuthorities.ts +++ b/src/core/marketmap/msgs/MsgRemoveMarketAuthorities.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgRemoveMarketAuthorities as MsgRemoveMarketAuthorities_pb } from '@initia/initia.proto/slinky/marketmap/v1/tx' +import { MsgRemoveMarketAuthorities as MsgRemoveMarketAuthorities_pb } from '@initia/initia.proto/connect/marketmap/v2/tx' export class MsgRemoveMarketAuthorities extends JSONSerializable< MsgRemoveMarketAuthorities.Amino, @@ -31,7 +31,7 @@ export class MsgRemoveMarketAuthorities extends JSONSerializable< public toAmino(): MsgRemoveMarketAuthorities.Amino { const { remove_addresses, admin } = this return { - type: 'slinky/x/marketmap/MsgRemoveMarketAuthorities', + type: 'connect/x/marketmap/MsgRemoveMarketAuthorities', value: { remove_addresses, admin, @@ -49,7 +49,7 @@ export class MsgRemoveMarketAuthorities extends JSONSerializable< public toData(): MsgRemoveMarketAuthorities.Data { const { remove_addresses, admin } = this return { - '@type': '/slinky.marketmap.v1.MsgRemoveMarketAuthorities', + '@type': '/connect.marketmap.v2.MsgRemoveMarketAuthorities', remove_addresses, admin, } @@ -71,7 +71,7 @@ export class MsgRemoveMarketAuthorities extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.marketmap.v1.MsgRemoveMarketAuthorities', + typeUrl: '/connect.marketmap.v2.MsgRemoveMarketAuthorities', value: MsgRemoveMarketAuthorities_pb.encode(this.toProto()).finish(), }) } @@ -85,7 +85,7 @@ export class MsgRemoveMarketAuthorities extends JSONSerializable< export namespace MsgRemoveMarketAuthorities { export interface Amino { - type: 'slinky/x/marketmap/MsgRemoveMarketAuthorities' + type: 'connect/x/marketmap/MsgRemoveMarketAuthorities' value: { remove_addresses: AccAddress[] admin: AccAddress @@ -93,7 +93,7 @@ export namespace MsgRemoveMarketAuthorities { } export interface Data { - '@type': '/slinky.marketmap.v1.MsgRemoveMarketAuthorities' + '@type': '/connect.marketmap.v2.MsgRemoveMarketAuthorities' remove_addresses: AccAddress[] admin: AccAddress } diff --git a/src/core/marketmap/msgs/MsgUpdateMarketmapParams.ts b/src/core/marketmap/msgs/MsgUpdateMarketmapParams.ts index 46a153e..89cbc36 100644 --- a/src/core/marketmap/msgs/MsgUpdateMarketmapParams.ts +++ b/src/core/marketmap/msgs/MsgUpdateMarketmapParams.ts @@ -2,7 +2,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MarketmapParams } from '../MarketmapParams' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgParams as MsgParams_pb } from '@initia/initia.proto/slinky/marketmap/v1/tx' +import { MsgParams as MsgParams_pb } from '@initia/initia.proto/connect/marketmap/v2/tx' export class MsgUpdateMarketmapParams extends JSONSerializable< MsgUpdateMarketmapParams.Amino, @@ -35,7 +35,7 @@ export class MsgUpdateMarketmapParams extends JSONSerializable< public toAmino(): MsgUpdateMarketmapParams.Amino { const { authority, params } = this return { - type: 'slinky/x/marketmap/MsgParams', + type: 'connect/x/marketmap/MsgParams', value: { authority, params: params.toAmino(), @@ -56,7 +56,7 @@ export class MsgUpdateMarketmapParams extends JSONSerializable< public toData(): MsgUpdateMarketmapParams.Data { const { authority, params } = this return { - '@type': '/slinky.marketmap.v1.MsgParams', + '@type': '/connect.marketmap.v2.MsgParams', authority, params: params.toData(), } @@ -81,7 +81,7 @@ export class MsgUpdateMarketmapParams extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.marketmap.v1.MsgParams', + typeUrl: '/connect.marketmap.v2.MsgParams', value: MsgParams_pb.encode(this.toProto()).finish(), }) } @@ -93,7 +93,7 @@ export class MsgUpdateMarketmapParams extends JSONSerializable< export namespace MsgUpdateMarketmapParams { export interface Amino { - type: 'slinky/x/marketmap/MsgParams' + type: 'connect/x/marketmap/MsgParams' value: { authority: AccAddress params: MarketmapParams.Amino @@ -101,7 +101,7 @@ export namespace MsgUpdateMarketmapParams { } export interface Data { - '@type': '/slinky.marketmap.v1.MsgParams' + '@type': '/connect.marketmap.v2.MsgParams' authority: AccAddress params: MarketmapParams.Data } diff --git a/src/core/marketmap/msgs/MsgUpdateMarkets.ts b/src/core/marketmap/msgs/MsgUpdateMarkets.ts index 08d28d4..6da36d8 100644 --- a/src/core/marketmap/msgs/MsgUpdateMarkets.ts +++ b/src/core/marketmap/msgs/MsgUpdateMarkets.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgUpdateMarkets as MsgUpdateMarkets_pb } from '@initia/initia.proto/slinky/marketmap/v1/tx' +import { MsgUpdateMarkets as MsgUpdateMarkets_pb } from '@initia/initia.proto/connect/marketmap/v2/tx' import { Market } from '../Market' export class MsgUpdateMarkets extends JSONSerializable< @@ -30,7 +30,7 @@ export class MsgUpdateMarkets extends JSONSerializable< public toAmino(): MsgUpdateMarkets.Amino { const { authority, update_markets } = this return { - type: 'slinky/x/marketmap/MsgUpdateMarkets', + type: 'connect/x/marketmap/MsgUpdateMarkets', value: { authority, update_markets: update_markets.map((msg) => msg.toAmino()), @@ -46,7 +46,7 @@ export class MsgUpdateMarkets extends JSONSerializable< public toData(): MsgUpdateMarkets.Data { const { authority, update_markets } = this return { - '@type': '/slinky.marketmap.v1.MsgUpdateMarkets', + '@type': '/connect.marketmap.v2.MsgUpdateMarkets', authority, update_markets: update_markets.map((msg) => msg.toData()), } @@ -69,7 +69,7 @@ export class MsgUpdateMarkets extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.marketmap.v1.MsgUpdateMarkets', + typeUrl: '/connect.marketmap.v2.MsgUpdateMarkets', value: MsgUpdateMarkets_pb.encode(this.toProto()).finish(), }) } @@ -81,7 +81,7 @@ export class MsgUpdateMarkets extends JSONSerializable< export namespace MsgUpdateMarkets { export interface Amino { - type: 'slinky/x/marketmap/MsgUpdateMarkets' + type: 'connect/x/marketmap/MsgUpdateMarkets' value: { authority: AccAddress update_markets: Market.Amino[] @@ -89,7 +89,7 @@ export namespace MsgUpdateMarkets { } export interface Data { - '@type': '/slinky.marketmap.v1.MsgUpdateMarkets' + '@type': '/connect.marketmap.v2.MsgUpdateMarkets' authority: AccAddress update_markets: Market.Data[] } diff --git a/src/core/marketmap/msgs/MsgUpsertMarkets.ts b/src/core/marketmap/msgs/MsgUpsertMarkets.ts new file mode 100644 index 0000000..187f7de --- /dev/null +++ b/src/core/marketmap/msgs/MsgUpsertMarkets.ts @@ -0,0 +1,98 @@ +import { JSONSerializable } from '../../../util/json' +import { AccAddress } from '../../bech32' +import { Any } from '@initia/initia.proto/google/protobuf/any' +import { MsgUpsertMarkets as MsgUpsertMarkets_pb } from '@initia/initia.proto/connect/marketmap/v2/tx' +import { Market } from '../Market' + +export class MsgUpsertMarkets extends JSONSerializable< + MsgUpsertMarkets.Amino, + MsgUpsertMarkets.Data, + MsgUpsertMarkets.Proto +> { + /** + * @param authority the signer of this transaction + * @param markets the list of all markets to be updated for the given transaction + */ + constructor( + public authority: AccAddress, + public markets: Market[] + ) { + super() + } + + public static fromAmino(data: MsgUpsertMarkets.Amino): MsgUpsertMarkets { + const { + value: { authority, markets }, + } = data + return new MsgUpsertMarkets(authority, markets.map(Market.fromAmino)) + } + + public toAmino(): MsgUpsertMarkets.Amino { + const { authority, markets } = this + return { + type: 'connect/x/marketmap/MsgUpsertMarkets', + value: { + authority, + markets: markets.map((msg) => msg.toAmino()), + }, + } + } + + public static fromData(data: MsgUpsertMarkets.Data): MsgUpsertMarkets { + const { authority, markets } = data + return new MsgUpsertMarkets(authority, markets.map(Market.fromData)) + } + + public toData(): MsgUpsertMarkets.Data { + const { authority, markets } = this + return { + '@type': '/connect.marketmap.v2.MsgUpsertMarkets', + authority, + markets: markets.map((msg) => msg.toData()), + } + } + + public static fromProto(data: MsgUpsertMarkets.Proto): MsgUpsertMarkets { + return new MsgUpsertMarkets( + data.authority, + data.markets.map(Market.fromProto) + ) + } + + public toProto(): MsgUpsertMarkets.Proto { + const { authority, markets } = this + return MsgUpsertMarkets_pb.fromPartial({ + authority, + markets: markets.map((c) => c.toProto()), + }) + } + + public packAny(): Any { + return Any.fromPartial({ + typeUrl: '/connect.marketmap.v2.MsgUpsertMarkets', + value: MsgUpsertMarkets_pb.encode(this.toProto()).finish(), + }) + } + + public static unpackAny(msgAny: Any): MsgUpsertMarkets { + return MsgUpsertMarkets.fromProto(MsgUpsertMarkets_pb.decode(msgAny.value)) + } +} + +export namespace MsgUpsertMarkets { + export interface Amino { + type: 'connect/x/marketmap/MsgUpsertMarkets' + value: { + authority: AccAddress + markets: Market.Amino[] + } + } + + export interface Data { + '@type': '/connect.marketmap.v2.MsgUpsertMarkets' + authority: AccAddress + markets: Market.Data[] + } + + export type Proto = MsgUpsertMarkets_pb +} diff --git a/src/core/marketmap/msgs/index.ts b/src/core/marketmap/msgs/index.ts index 4c68157..b5ce8d5 100644 --- a/src/core/marketmap/msgs/index.ts +++ b/src/core/marketmap/msgs/index.ts @@ -1,16 +1,19 @@ import { MsgCreateMarkets } from './MsgCreateMarkets' import { MsgUpdateMarkets } from './MsgUpdateMarkets' +import { MsgUpsertMarkets } from './MsgUpsertMarkets' import { MsgRemoveMarketAuthorities } from './MsgRemoveMarketAuthorities' import { MsgUpdateMarketmapParams } from './MsgUpdateMarketmapParams' export * from './MsgCreateMarkets' export * from './MsgUpdateMarkets' +export * from './MsgUpsertMarkets' export * from './MsgRemoveMarketAuthorities' export * from './MsgUpdateMarketmapParams' export type MarketmapMsg = | MsgCreateMarkets | MsgUpdateMarkets + | MsgUpsertMarkets | MsgRemoveMarketAuthorities | MsgUpdateMarketmapParams @@ -18,18 +21,21 @@ export namespace MarketmapMsg { export type Amino = | MsgCreateMarkets.Amino | MsgUpdateMarkets.Amino + | MsgUpsertMarkets.Amino | MsgRemoveMarketAuthorities.Amino | MsgUpdateMarketmapParams.Amino export type Data = | MsgCreateMarkets.Data | MsgUpdateMarkets.Data + | MsgUpsertMarkets.Data | MsgRemoveMarketAuthorities.Data | MsgUpdateMarketmapParams.Data export type Proto = | MsgCreateMarkets.Proto | MsgUpdateMarkets.Proto + | MsgUpsertMarkets.Proto | MsgRemoveMarketAuthorities.Proto | MsgUpdateMarketmapParams.Proto } diff --git a/src/core/ophost/BridgeConfig.ts b/src/core/ophost/BridgeConfig.ts index 4d4e3d7..7a1c238 100644 --- a/src/core/ophost/BridgeConfig.ts +++ b/src/core/ophost/BridgeConfig.ts @@ -11,7 +11,7 @@ export class BridgeConfig extends JSONSerializable< BridgeConfig.Proto > { /** - * @param challengers the addresses of the challengers + * @param challenger the address of the challenger * @param proposer the address of the proposer * @param batch_info the information about batch submission * @param submission_interval the time interval at which checkpoints must be submitted @@ -21,7 +21,7 @@ export class BridgeConfig extends JSONSerializable< * @param metadata normally IBC channelID for permissioned IBC relayer */ constructor( - public challengers: AccAddress[], + public challenger: AccAddress, public proposer: AccAddress, public batch_info: BatchInfo, public submission_interval: Duration, @@ -35,7 +35,7 @@ export class BridgeConfig extends JSONSerializable< public static fromAmino(data: BridgeConfig.Amino): BridgeConfig { const { - challengers, + challenger, proposer, batch_info, submission_interval, @@ -46,7 +46,7 @@ export class BridgeConfig extends JSONSerializable< } = data return new BridgeConfig( - challengers, + challenger, proposer, BatchInfo.fromAmino(batch_info), Duration.fromAmino(submission_interval), @@ -59,7 +59,7 @@ export class BridgeConfig extends JSONSerializable< public toAmino(): BridgeConfig.Amino { const { - challengers, + challenger, proposer, batch_info, submission_interval, @@ -70,7 +70,7 @@ export class BridgeConfig extends JSONSerializable< } = this return { - challengers, + challenger, proposer, batch_info: batch_info.toAmino(), submission_interval: submission_interval.toAmino(), @@ -83,7 +83,7 @@ export class BridgeConfig extends JSONSerializable< public static fromData(data: BridgeConfig.Data): BridgeConfig { const { - challengers, + challenger, proposer, batch_info, submission_interval, @@ -94,7 +94,7 @@ export class BridgeConfig extends JSONSerializable< } = data return new BridgeConfig( - challengers, + challenger, proposer, BatchInfo.fromData(batch_info), Duration.fromData(submission_interval), @@ -107,7 +107,7 @@ export class BridgeConfig extends JSONSerializable< public toData(): BridgeConfig.Data { const { - challengers, + challenger, proposer, batch_info, submission_interval, @@ -118,7 +118,7 @@ export class BridgeConfig extends JSONSerializable< } = this return { - challengers, + challenger, proposer, batch_info: batch_info.toData(), submission_interval: submission_interval.toData(), @@ -131,7 +131,7 @@ export class BridgeConfig extends JSONSerializable< public static fromProto(data: BridgeConfig.Proto): BridgeConfig { return new BridgeConfig( - data.challengers, + data.challenger, data.proposer, BatchInfo.fromProto(data.batchInfo as BatchInfo.Proto), Duration.fromProto(data.submissionInterval as Duration.Proto), @@ -144,7 +144,7 @@ export class BridgeConfig extends JSONSerializable< public toProto(): BridgeConfig.Proto { const { - challengers, + challenger, proposer, batch_info, submission_interval, @@ -155,7 +155,7 @@ export class BridgeConfig extends JSONSerializable< } = this return BridgeConfig_pb.fromPartial({ - challengers, + challenger, proposer, batchInfo: batch_info.toProto(), submissionInterval: submission_interval.toProto(), @@ -169,7 +169,7 @@ export class BridgeConfig extends JSONSerializable< export namespace BridgeConfig { export interface Amino { - challengers: AccAddress[] + challenger: AccAddress proposer: AccAddress batch_info: BatchInfo.Amino submission_interval: Duration.Amino @@ -180,7 +180,7 @@ export namespace BridgeConfig { } export interface Data { - challengers: AccAddress[] + challenger: AccAddress proposer: AccAddress batch_info: BatchInfo.Data submission_interval: Duration.Data diff --git a/src/core/ophost/msgs/MsgUpdateChallenger.ts b/src/core/ophost/msgs/MsgUpdateChallenger.ts new file mode 100644 index 0000000..83e75e7 --- /dev/null +++ b/src/core/ophost/msgs/MsgUpdateChallenger.ts @@ -0,0 +1,121 @@ +import { JSONSerializable } from '../../../util/json' +import { AccAddress } from '../../bech32' +import { MsgUpdateChallenger as MsgUpdateChallenger_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' +import { Any } from '@initia/initia.proto/google/protobuf/any' +import Long from 'long' + +export class MsgUpdateChallenger extends JSONSerializable< + MsgUpdateChallenger.Amino, + MsgUpdateChallenger.Data, + MsgUpdateChallenger.Proto +> { + /** + * @param authority the address that controls the module + * @param bridge_id + * @param challenger + */ + constructor( + public authority: AccAddress, + public bridge_id: number, + public challenger: AccAddress + ) { + super() + } + + public static fromAmino( + data: MsgUpdateChallenger.Amino + ): MsgUpdateChallenger { + const { + value: { authority, bridge_id, challenger }, + } = data + + return new MsgUpdateChallenger( + authority, + Number.parseInt(bridge_id), + challenger + ) + } + + public toAmino(): MsgUpdateChallenger.Amino { + const { authority, bridge_id, challenger } = this + return { + type: 'ophost/MsgUpdateChallenger', + value: { + authority, + bridge_id: bridge_id.toString(), + challenger, + }, + } + } + + public static fromData(data: MsgUpdateChallenger.Data): MsgUpdateChallenger { + const { authority, bridge_id, challenger } = data + return new MsgUpdateChallenger( + authority, + Number.parseInt(bridge_id), + challenger + ) + } + + public toData(): MsgUpdateChallenger.Data { + const { authority, bridge_id, challenger } = this + return { + '@type': '/opinit.ophost.v1.MsgUpdateChallenger', + authority, + bridge_id: bridge_id.toString(), + challenger, + } + } + + public static fromProto( + data: MsgUpdateChallenger.Proto + ): MsgUpdateChallenger { + return new MsgUpdateChallenger( + data.authority, + data.bridgeId.toNumber(), + data.challenger + ) + } + + public toProto(): MsgUpdateChallenger.Proto { + const { authority, bridge_id, challenger } = this + return MsgUpdateChallenger_pb.fromPartial({ + authority, + bridgeId: Long.fromNumber(bridge_id), + challenger, + }) + } + + public packAny(): Any { + return Any.fromPartial({ + typeUrl: '/opinit.ophost.v1.MsgUpdateChallenger', + value: MsgUpdateChallenger_pb.encode(this.toProto()).finish(), + }) + } + + public static unpackAny(msgAny: Any): MsgUpdateChallenger { + return MsgUpdateChallenger.fromProto( + MsgUpdateChallenger_pb.decode(msgAny.value) + ) + } +} + +export namespace MsgUpdateChallenger { + export interface Amino { + type: 'ophost/MsgUpdateChallenger' + value: { + authority: AccAddress + bridge_id: string + challenger: AccAddress + } + } + + export interface Data { + '@type': '/opinit.ophost.v1.MsgUpdateChallenger' + authority: AccAddress + bridge_id: string + challenger: AccAddress + } + + export type Proto = MsgUpdateChallenger_pb +} diff --git a/src/core/ophost/msgs/MsgUpdateChallengers.ts b/src/core/ophost/msgs/MsgUpdateChallengers.ts deleted file mode 100644 index df90e76..0000000 --- a/src/core/ophost/msgs/MsgUpdateChallengers.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { JSONSerializable } from '../../../util/json' -import { AccAddress } from '../../bech32' -import { MsgUpdateChallengers as MsgUpdateChallengers_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' -import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' - -export class MsgUpdateChallengers extends JSONSerializable< - MsgUpdateChallengers.Amino, - MsgUpdateChallengers.Data, - MsgUpdateChallengers.Proto -> { - /** - * @param authority the address that controls the module - * @param bridge_id - * @param new_challengers - */ - constructor( - public authority: AccAddress, - public bridge_id: number, - public new_challengers: AccAddress[] - ) { - super() - } - - public static fromAmino( - data: MsgUpdateChallengers.Amino - ): MsgUpdateChallengers { - const { - value: { authority, bridge_id, new_challengers }, - } = data - - return new MsgUpdateChallengers( - authority, - Number.parseInt(bridge_id), - new_challengers - ) - } - - public toAmino(): MsgUpdateChallengers.Amino { - const { authority, bridge_id, new_challengers } = this - return { - type: 'ophost/MsgUpdateChallengers', - value: { - authority, - bridge_id: bridge_id.toString(), - new_challengers, - }, - } - } - - public static fromData( - data: MsgUpdateChallengers.Data - ): MsgUpdateChallengers { - const { authority, bridge_id, new_challengers } = data - return new MsgUpdateChallengers( - authority, - Number.parseInt(bridge_id), - new_challengers - ) - } - - public toData(): MsgUpdateChallengers.Data { - const { authority, bridge_id, new_challengers } = this - return { - '@type': '/opinit.ophost.v1.MsgUpdateChallengers', - authority, - bridge_id: bridge_id.toString(), - new_challengers, - } - } - - public static fromProto( - data: MsgUpdateChallengers.Proto - ): MsgUpdateChallengers { - return new MsgUpdateChallengers( - data.authority, - data.bridgeId.toNumber(), - data.newChallengers - ) - } - - public toProto(): MsgUpdateChallengers.Proto { - const { authority, bridge_id, new_challengers } = this - return MsgUpdateChallengers_pb.fromPartial({ - authority, - bridgeId: Long.fromNumber(bridge_id), - newChallengers: new_challengers, - }) - } - - public packAny(): Any { - return Any.fromPartial({ - typeUrl: '/opinit.ophost.v1.MsgUpdateChallengers', - value: MsgUpdateChallengers_pb.encode(this.toProto()).finish(), - }) - } - - public static unpackAny(msgAny: Any): MsgUpdateChallengers { - return MsgUpdateChallengers.fromProto( - MsgUpdateChallengers_pb.decode(msgAny.value) - ) - } -} - -export namespace MsgUpdateChallengers { - export interface Amino { - type: 'ophost/MsgUpdateChallengers' - value: { - authority: AccAddress - bridge_id: string - new_challengers: AccAddress[] - } - } - - export interface Data { - '@type': '/opinit.ophost.v1.MsgUpdateChallengers' - authority: AccAddress - bridge_id: string - new_challengers: AccAddress[] - } - - export type Proto = MsgUpdateChallengers_pb -} diff --git a/src/core/ophost/msgs/index.ts b/src/core/ophost/msgs/index.ts index a8eb226..3f9015f 100644 --- a/src/core/ophost/msgs/index.ts +++ b/src/core/ophost/msgs/index.ts @@ -5,7 +5,7 @@ import { MsgDeleteOutput } from './MsgDeleteOutput' import { MsgInitiateTokenDeposit } from './MsgInitiateTokenDeposit' import { MsgFinalizeTokenWithdrawal } from './MsgFinalizeTokenWithdrawal' import { MsgUpdateProposer } from './MsgUpdateProposer' -import { MsgUpdateChallengers } from './MsgUpdateChallengers' +import { MsgUpdateChallenger } from './MsgUpdateChallenger' import { MsgUpdateBatchInfo } from './MsgUpdateBatchInfo' import { MsgUpdateOracleConfig } from './MsgUpdateOracleConfig' import { MsgUpdateMetadata } from './MsgUpdateMetadata' @@ -18,7 +18,7 @@ export * from './MsgDeleteOutput' export * from './MsgInitiateTokenDeposit' export * from './MsgFinalizeTokenWithdrawal' export * from './MsgUpdateProposer' -export * from './MsgUpdateChallengers' +export * from './MsgUpdateChallenger' export * from './MsgUpdateBatchInfo' export * from './MsgUpdateOracleConfig' export * from './MsgUpdateMetadata' @@ -32,7 +32,7 @@ export type OphostMsg = | MsgInitiateTokenDeposit | MsgFinalizeTokenWithdrawal | MsgUpdateProposer - | MsgUpdateChallengers + | MsgUpdateChallenger | MsgUpdateBatchInfo | MsgUpdateOracleConfig | MsgUpdateMetadata @@ -47,7 +47,7 @@ export namespace OphostMsg { | MsgInitiateTokenDeposit.Amino | MsgFinalizeTokenWithdrawal.Amino | MsgUpdateProposer.Amino - | MsgUpdateChallengers.Amino + | MsgUpdateChallenger.Amino | MsgUpdateBatchInfo.Amino | MsgUpdateOracleConfig.Amino | MsgUpdateMetadata.Amino @@ -61,7 +61,7 @@ export namespace OphostMsg { | MsgInitiateTokenDeposit.Data | MsgFinalizeTokenWithdrawal.Data | MsgUpdateProposer.Data - | MsgUpdateChallengers.Data + | MsgUpdateChallenger.Data | MsgUpdateBatchInfo.Data | MsgUpdateOracleConfig.Data | MsgUpdateMetadata.Data @@ -75,7 +75,7 @@ export namespace OphostMsg { | MsgInitiateTokenDeposit.Proto | MsgFinalizeTokenWithdrawal.Proto | MsgUpdateProposer.Proto - | MsgUpdateChallengers.Proto + | MsgUpdateChallenger.Proto | MsgUpdateBatchInfo.Proto | MsgUpdateOracleConfig.Proto | MsgUpdateMetadata.Proto diff --git a/src/core/oracle/CurrencyPair.ts b/src/core/oracle/CurrencyPair.ts index f08813f..0f307fe 100644 --- a/src/core/oracle/CurrencyPair.ts +++ b/src/core/oracle/CurrencyPair.ts @@ -1,5 +1,5 @@ import { JSONSerializable } from '../../util/json' -import { CurrencyPair as CurrencyPair_pb } from '@initia/initia.proto/slinky/types/v1/currency_pair' +import { CurrencyPair as CurrencyPair_pb } from '@initia/initia.proto/connect/types/v2/currency_pair' export class CurrencyPair extends JSONSerializable< CurrencyPair.Amino, diff --git a/src/core/oracle/QuotePrice.ts b/src/core/oracle/QuotePrice.ts index a6b1179..5b80c66 100644 --- a/src/core/oracle/QuotePrice.ts +++ b/src/core/oracle/QuotePrice.ts @@ -1,5 +1,5 @@ import { JSONSerializable } from '../../util/json' -import { QuotePrice as QuotePrice_pb } from '@initia/initia.proto/slinky/oracle/v1/genesis' +import { QuotePrice as QuotePrice_pb } from '@initia/initia.proto/connect/oracle/v2/genesis' import Long from 'long' export class QuotePrice extends JSONSerializable< diff --git a/src/core/oracle/msgs/MsgAddCurrencyPairs.ts b/src/core/oracle/msgs/MsgAddCurrencyPairs.ts index b000127..22ac1f4 100644 --- a/src/core/oracle/msgs/MsgAddCurrencyPairs.ts +++ b/src/core/oracle/msgs/MsgAddCurrencyPairs.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgAddCurrencyPairs as MsgAddCurrencyPairs_pb } from '@initia/initia.proto/slinky/oracle/v1/tx' +import { MsgAddCurrencyPairs as MsgAddCurrencyPairs_pb } from '@initia/initia.proto/connect/oracle/v2/tx' import { CurrencyPair } from '../CurrencyPair' export class MsgAddCurrencyPairs extends JSONSerializable< @@ -35,7 +35,7 @@ export class MsgAddCurrencyPairs extends JSONSerializable< public toAmino(): MsgAddCurrencyPairs.Amino { const { authority, currency_pairs } = this return { - type: 'slinky/x/oracle/MsgAddCurrencyPairs', + type: 'connect/x/oracle/MsgAddCurrencyPairs', value: { authority, currency_pairs: currency_pairs.map((msg) => msg.toAmino()), @@ -54,7 +54,7 @@ export class MsgAddCurrencyPairs extends JSONSerializable< public toData(): MsgAddCurrencyPairs.Data { const { authority, currency_pairs } = this return { - '@type': '/slinky.oracle.v1.MsgAddCurrencyPairs', + '@type': '/connect.oracle.v2.MsgAddCurrencyPairs', authority, currency_pairs: currency_pairs.map((msg) => msg.toData()), } @@ -79,7 +79,7 @@ export class MsgAddCurrencyPairs extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.oracle.v1.MsgAddCurrencyPairs', + typeUrl: '/connect.oracle.v2.MsgAddCurrencyPairs', value: MsgAddCurrencyPairs_pb.encode(this.toProto()).finish(), }) } @@ -93,7 +93,7 @@ export class MsgAddCurrencyPairs extends JSONSerializable< export namespace MsgAddCurrencyPairs { export interface Amino { - type: 'slinky/x/oracle/MsgAddCurrencyPairs' + type: 'connect/x/oracle/MsgAddCurrencyPairs' value: { authority: AccAddress currency_pairs: CurrencyPair.Amino[] @@ -101,7 +101,7 @@ export namespace MsgAddCurrencyPairs { } export interface Data { - '@type': '/slinky.oracle.v1.MsgAddCurrencyPairs' + '@type': '/connect.oracle.v2.MsgAddCurrencyPairs' authority: AccAddress currency_pairs: CurrencyPair.Data[] } diff --git a/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts b/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts index 5d3bcb2..b2c8a06 100644 --- a/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts +++ b/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts @@ -1,7 +1,7 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' -import { MsgRemoveCurrencyPairs as MsgRemoveCurrencyPairs_pb } from '@initia/initia.proto/slinky/oracle/v1/tx' +import { MsgRemoveCurrencyPairs as MsgRemoveCurrencyPairs_pb } from '@initia/initia.proto/connect/oracle/v2/tx' export class MsgRemoveCurrencyPairs extends JSONSerializable< MsgRemoveCurrencyPairs.Amino, @@ -31,7 +31,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< public toAmino(): MsgRemoveCurrencyPairs.Amino { const { authority, currency_pair_ids } = this return { - type: 'slinky/x/oracle/MsgSetCurrencyPairs', + type: 'connect/x/oracle/MsgSetCurrencyPairs', value: { authority, currency_pair_ids, @@ -49,7 +49,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< public toData(): MsgRemoveCurrencyPairs.Data { const { authority, currency_pair_ids } = this return { - '@type': '/slinky.oracle.v1.MsgRemoveCurrencyPairs', + '@type': '/connect.oracle.v2.MsgRemoveCurrencyPairs', authority, currency_pair_ids, } @@ -71,7 +71,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< public packAny(): Any { return Any.fromPartial({ - typeUrl: '/slinky.oracle.v1.MsgRemoveCurrencyPairs', + typeUrl: '/connect.oracle.v2.MsgRemoveCurrencyPairs', value: MsgRemoveCurrencyPairs_pb.encode(this.toProto()).finish(), }) } @@ -85,7 +85,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< export namespace MsgRemoveCurrencyPairs { export interface Amino { - type: 'slinky/x/oracle/MsgSetCurrencyPairs' + type: 'connect/x/oracle/MsgSetCurrencyPairs' value: { authority: AccAddress currency_pair_ids: string[] @@ -93,7 +93,7 @@ export namespace MsgRemoveCurrencyPairs { } export interface Data { - '@type': '/slinky.oracle.v1.MsgRemoveCurrencyPairs' + '@type': '/connect.oracle.v2.MsgRemoveCurrencyPairs' authority: AccAddress currency_pair_ids: string[] } From 6805c4e64b8397d96935612cee622aacba589daf Mon Sep 17 00:00:00 2001 From: joon9823 Date: Mon, 7 Oct 2024 18:01:32 +0900 Subject: [PATCH 2/4] Fix typo --- src/core/Msg.ts | 2 +- src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/Msg.ts b/src/core/Msg.ts index faac486..1a93c82 100644 --- a/src/core/Msg.ts +++ b/src/core/Msg.ts @@ -635,7 +635,7 @@ export namespace Msg { // oracle case 'connect/x/oracle/MsgAddCurrencyPairs': return MsgAddCurrencyPairs.fromAmino(data) - case 'connect/x/oracle/MsgSetCurrencyPairs': + case 'connect/x/oracle/MsgRemoveCurrencyPairs': return MsgRemoveCurrencyPairs.fromAmino(data) // reward diff --git a/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts b/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts index b2c8a06..34d41dc 100644 --- a/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts +++ b/src/core/oracle/msgs/MsgRemoveCurrencyPairs.ts @@ -31,7 +31,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< public toAmino(): MsgRemoveCurrencyPairs.Amino { const { authority, currency_pair_ids } = this return { - type: 'connect/x/oracle/MsgSetCurrencyPairs', + type: 'connect/x/oracle/MsgRemoveCurrencyPairs', value: { authority, currency_pair_ids, @@ -85,7 +85,7 @@ export class MsgRemoveCurrencyPairs extends JSONSerializable< export namespace MsgRemoveCurrencyPairs { export interface Amino { - type: 'connect/x/oracle/MsgSetCurrencyPairs' + type: 'connect/x/oracle/MsgRemoveCurrencyPairs' value: { authority: AccAddress currency_pair_ids: string[] From 9e0aa3f747873a92731521af96981ceb6073622e Mon Sep 17 00:00:00 2001 From: Vritra4 Date: Tue, 8 Oct 2024 10:35:30 +0900 Subject: [PATCH 3/4] resolve security alert --- package-lock.json | 470 +++++++++++++++++++++++++--------------------- package.json | 6 +- 2 files changed, 257 insertions(+), 219 deletions(-) diff --git a/package-lock.json b/package-lock.json index a916b93..740aae0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,8 +57,8 @@ "tsconfig-paths-webpack-plugin": "^4.0.0", "typescript": "^5.4.5", "typescript-eslint": "^7.13.1", - "vite": "^5.4.3", - "vite-plugin-dts": "^4.2.1", + "vite": "^5.4.8", + "vite-plugin-dts": "^4.2.3", "webpack": "^5.74.0", "webpack-bundle-analyzer": "^4.6.1", "webpack-cli": "^4.10.0" @@ -1752,13 +1752,14 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@ledgerhq/devices": { @@ -2106,9 +2107,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz", - "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz", + "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==", "cpu": [ "arm" ], @@ -2120,9 +2121,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz", - "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz", + "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==", "cpu": [ "arm64" ], @@ -2134,9 +2135,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz", - "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz", + "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==", "cpu": [ "arm64" ], @@ -2148,9 +2149,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz", - "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz", + "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==", "cpu": [ "x64" ], @@ -2162,9 +2163,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz", - "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz", + "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==", "cpu": [ "arm" ], @@ -2176,9 +2177,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz", - "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz", + "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==", "cpu": [ "arm" ], @@ -2190,9 +2191,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz", - "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz", + "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==", "cpu": [ "arm64" ], @@ -2204,9 +2205,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz", - "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz", + "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==", "cpu": [ "arm64" ], @@ -2218,9 +2219,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz", - "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz", + "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==", "cpu": [ "ppc64" ], @@ -2232,9 +2233,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz", - "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz", + "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==", "cpu": [ "riscv64" ], @@ -2246,9 +2247,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz", - "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz", + "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==", "cpu": [ "s390x" ], @@ -2260,9 +2261,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz", - "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz", + "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==", "cpu": [ "x64" ], @@ -2274,9 +2275,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz", - "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz", + "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==", "cpu": [ "x64" ], @@ -2288,9 +2289,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz", - "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz", + "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==", "cpu": [ "arm64" ], @@ -2302,9 +2303,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz", - "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz", + "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==", "cpu": [ "ia32" ], @@ -2316,9 +2317,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz", - "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz", + "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==", "cpu": [ "x64" ], @@ -2593,20 +2594,10 @@ "@types/eslint": "*" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true, "license": "MIT" }, @@ -3069,10 +3060,11 @@ "license": "MIT" }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -3082,25 +3074,29 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -3111,18 +3107,20 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/wasm-gen": "1.12.1" } }, "node_modules/@webassemblyjs/ieee754": { @@ -3130,6 +3128,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, + "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -3139,6 +3138,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } @@ -3147,31 +3147,34 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", @@ -3179,24 +3182,26 @@ } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -3205,12 +3210,13 @@ } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -3254,13 +3260,15 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/acorn": { "version": "8.12.1", @@ -3274,11 +3282,12 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^8" } @@ -3364,6 +3373,7 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, + "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" } @@ -3931,9 +3941,9 @@ ] }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "dev": true, "funding": [ { @@ -3943,13 +3953,18 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -4084,9 +4099,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001667", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", + "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", "dev": true, "funding": [ { @@ -4096,8 +4111,13 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", @@ -4662,10 +4682,11 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", - "dev": true + "version": "1.5.33", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.33.tgz", + "integrity": "sha512-+cYTcFB1QqD4j4LegwLfpCNxifb6dDFUAwk6RsLusCwIaZI6or2f+q8rs5tTB2YC53HhOlIbEaqHMAAC8IOIwA==", + "dev": true, + "license": "ISC" }, "node_modules/elliptic": { "version": "6.5.4", @@ -4705,10 +4726,11 @@ "dev": true }, "node_modules/enhanced-resolve": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz", - "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -4930,10 +4952,11 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -5822,7 +5845,8 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/globals": { "version": "13.24.0", @@ -5893,10 +5917,11 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", @@ -8050,10 +8075,11 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -8882,13 +8908,13 @@ } }, "node_modules/rollup": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz", - "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz", + "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -8898,22 +8924,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.2", - "@rollup/rollup-android-arm64": "4.21.2", - "@rollup/rollup-darwin-arm64": "4.21.2", - "@rollup/rollup-darwin-x64": "4.21.2", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.2", - "@rollup/rollup-linux-arm-musleabihf": "4.21.2", - "@rollup/rollup-linux-arm64-gnu": "4.21.2", - "@rollup/rollup-linux-arm64-musl": "4.21.2", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2", - "@rollup/rollup-linux-riscv64-gnu": "4.21.2", - "@rollup/rollup-linux-s390x-gnu": "4.21.2", - "@rollup/rollup-linux-x64-gnu": "4.21.2", - "@rollup/rollup-linux-x64-musl": "4.21.2", - "@rollup/rollup-win32-arm64-msvc": "4.21.2", - "@rollup/rollup-win32-ia32-msvc": "4.21.2", - "@rollup/rollup-win32-x64-msvc": "4.21.2", + "@rollup/rollup-android-arm-eabi": "4.24.0", + "@rollup/rollup-android-arm64": "4.24.0", + "@rollup/rollup-darwin-arm64": "4.24.0", + "@rollup/rollup-darwin-x64": "4.24.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.0", + "@rollup/rollup-linux-arm-musleabihf": "4.24.0", + "@rollup/rollup-linux-arm64-gnu": "4.24.0", + "@rollup/rollup-linux-arm64-musl": "4.24.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0", + "@rollup/rollup-linux-riscv64-gnu": "4.24.0", + "@rollup/rollup-linux-s390x-gnu": "4.24.0", + "@rollup/rollup-linux-x64-gnu": "4.24.0", + "@rollup/rollup-linux-x64-musl": "4.24.0", + "@rollup/rollup-win32-arm64-msvc": "4.24.0", + "@rollup/rollup-win32-ia32-msvc": "4.24.0", + "@rollup/rollup-win32-x64-msvc": "4.24.0", "fsevents": "~2.3.2" } }, @@ -8987,10 +9013,11 @@ "dev": true }, "node_modules/schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -9036,10 +9063,11 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -9502,13 +9530,14 @@ } }, "node_modules/terser": { - "version": "5.17.4", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.4.tgz", - "integrity": "sha512-jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw==", + "version": "5.34.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz", + "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -9520,16 +9549,17 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" + "terser": "^5.26.0" }, "engines": { "node": ">= 10.13.0" @@ -9558,6 +9588,7 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -9572,6 +9603,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -10024,9 +10056,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "dev": true, "funding": [ { @@ -10036,14 +10068,19 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -10104,9 +10141,9 @@ "dev": true }, "node_modules/vite": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", - "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", + "version": "5.4.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", + "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10164,9 +10201,9 @@ } }, "node_modules/vite-plugin-dts": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.2.1.tgz", - "integrity": "sha512-/QlYvgUMiv8+ZTEerhNCYnYaZMM07cdlX6hQCR/w/g/nTh0tUXPoYwbT6SitizLJ9BybT1lnrcZgqheI6wromQ==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.2.3.tgz", + "integrity": "sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==", "dev": true, "license": "MIT", "dependencies": { @@ -10235,10 +10272,11 @@ } }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -10248,34 +10286,34 @@ } }, "node_modules/webpack": { - "version": "5.83.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.83.1.tgz", - "integrity": "sha512-TNsG9jDScbNuB+Lb/3+vYolPplCS3bbEaJf+Bj0Gw4DhP3ioAflBb1flcRt9zsWITyvOhM96wMQNRWlSX52DgA==", + "version": "5.95.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", + "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", "dev": true, + "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.14.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { diff --git a/package.json b/package.json index 8ce65f7..7cca087 100644 --- a/package.json +++ b/package.json @@ -57,9 +57,9 @@ "tsconfig-paths-webpack-plugin": "^4.0.0", "typescript": "^5.4.5", "typescript-eslint": "^7.13.1", - "vite": "^5.4.3", - "vite-plugin-dts": "^4.2.1", - "webpack": "^5.74.0", + "vite": "^5.4.8", + "vite-plugin-dts": "^4.2.3", + "webpack": "^5.94.0", "webpack-bundle-analyzer": "^4.6.1", "webpack-cli": "^4.10.0" }, From 09d7ff0cf51be816ddbacd485f4bae6076a75c37 Mon Sep 17 00:00:00 2001 From: joon9823 Date: Tue, 8 Oct 2024 11:23:50 +0900 Subject: [PATCH 4/4] Update package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 5b33ff5..bdd3222 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "typescript-eslint": "^7.13.1", "vite": "^5.4.8", "vite-plugin-dts": "^4.2.3", - "webpack": "^5.74.0", + "webpack": "^5.94.0", "webpack-bundle-analyzer": "^4.6.1", "webpack-cli": "^4.10.0" },