🪢 Merge Luxor into dev (#4834)

package.json

@@ -34,7 +34,7 @@
     "@babel/parser": "~7.21.0",
     "@babel/traverse": "~7.21.0",
     "@babel/types": "~7.21.0",
-    "@joystream/types": "4.3.0",
+    "@joystream/types": "4.5.0",
     "@polkadot/api": "10.1.4",
     "@polkadot/api-contract": "10.1.4",
     "@polkadot/api-derive": "10.1.4",

packages/server/src/common/queries/schema.graphql

@@ -87,6 +87,7 @@ enum EventTypeOptions {
   CommentPinnedEvent
   CommentReactedEvent
   CommentTextUpdatedEvent
+  CouncilBudgetDecreasedEvent
   CouncilBudgetFundedEvent
   CouncilorRewardUpdatedEvent
   EnglishAuctionSettledEvent
@@ -2590,6 +2591,8 @@ union ProposalDetails =
   | UpdateChannelPayoutsProposalDetails
   | UpdatePalletFrozenStatusProposalDetails
   | UpdateGlobalNftLimitProposalDetails
+  | DecreaseCouncilBudgetProposalDetails
+  | UpdateTokenPalletTokenConstraintsProposalDetails
 
 union ProposalStatus =
     ProposalStatusDeciding
@@ -2976,6 +2979,13 @@ type DataObjectTypeVideoThumbnail {
   video: Video
 }
 
+type DecreaseCouncilBudgetProposalDetails {
+  """
+  Proposed amount of token to burn
+  """
+  amount: BigInt!
+}
+
 type DecreaseWorkingGroupLeadStakeProposalDetails {
   """
   The lead that should be affected
@@ -3553,6 +3563,53 @@ type UpdatePalletFrozenStatusProposalDetails {
   pallet: String!
 }
 
+type UpdateTokenPalletTokenConstraintsProposalDetails {
+  """
+  Proposed maximum patronage yearly interest rate (in part per million)
+  """
+  maxYearlyRate: Int
+
+  """
+  Proposed minimum value of the slope amm parameter
+  """
+  minAmmSlope: BigInt
+
+  """
+  Proposed minimum block duration of sales
+  """
+  minSaleDuration: Int
+
+  """
+  Proposed minimum block duration for a revenue split
+  """
+  minRevenueSplitDuration: Int
+
+  """
+  Proposed minimum blocks between revenue share issuance block and actual revenue share starting block
+  """
+  minRevenueSplitTimeToStart: Int
+
+  """
+  Proposed platform fee ratio charged on top of each sale and burned (in part per million)
+  """
+  salePlatformFee: Int
+
+  """
+  Proposed ratio of fees charged on top of each token purchase from the AMM (in part per million)
+  """
+  ammBuyTxFees: Int
+
+  """
+  Proposed ratio of fees charged on top of each token sold to the AMM (in part per million)
+  """
+  ammSellTxFees: Int
+
+  """
+  Proposed	bloat bond value used during account creation
+  """
+  bloatBond: BigInt
+}
+
 type UpdateWorkingGroupBudgetProposalDetails {
   """
   Amount to increase / decrease the working group budget by (will be decudted from / appended to council budget accordingly)
@@ -5261,6 +5318,17 @@ type CommentConnection {
   pageInfo: PageInfo!
 }
 
+type CouncilBudgetDecreasedEventEdge {
+  node: CouncilBudgetDecreasedEvent!
+  cursor: String!
+}
+
+type CouncilBudgetDecreasedEventConnection {
+  totalCount: Int!
+  edges: [CouncilBudgetDecreasedEventEdge!]!
+  pageInfo: PageInfo!
+}
+
 type CouncilBudgetFundedEventEdge {
   node: CouncilBudgetFundedEvent!
   cursor: String!
@@ -22796,6 +22864,81 @@ input ChannelVisibilitySetByModeratorEventUpdateInput {
   rationale: String
 }
 
+input CouncilBudgetDecreasedEventWhereInput {
+  id_eq: ID
+  id_in: [ID!]
+  createdAt_eq: DateTime
+  createdAt_lt: DateTime
+  createdAt_lte: DateTime
+  createdAt_gt: DateTime
+  createdAt_gte: DateTime
+  createdById_eq: ID
+  createdById_in: [ID!]
+  updatedAt_eq: DateTime
+  updatedAt_lt: DateTime
+  updatedAt_lte: DateTime
+  updatedAt_gt: DateTime
+  updatedAt_gte: DateTime
+  updatedById_eq: ID
+  updatedById_in: [ID!]
+  deletedAt_all: Boolean
+  deletedAt_eq: DateTime
+  deletedAt_lt: DateTime
+  deletedAt_lte: DateTime
+  deletedAt_gt: DateTime
+  deletedAt_gte: DateTime
+  deletedById_eq: ID
+  deletedById_in: [ID!]
+  inExtrinsic_eq: String
+  inExtrinsic_contains: String
+  inExtrinsic_startsWith: String
+  inExtrinsic_endsWith: String
+  inExtrinsic_in: [String!]
+  inBlock_eq: Int
+  inBlock_gt: Int
+  inBlock_gte: Int
+  inBlock_lt: Int
+  inBlock_lte: Int
+  inBlock_in: [Int!]
+  network_eq: Network
+  network_in: [Network!]
+  indexInBlock_eq: Int
+  indexInBlock_gt: Int
+  indexInBlock_gte: Int
+  indexInBlock_lt: Int
+  indexInBlock_lte: Int
+  indexInBlock_in: [Int!]
+  amount_eq: BigInt
+  amount_gt: BigInt
+  amount_gte: BigInt
+  amount_lt: BigInt
+  amount_lte: BigInt
+  amount_in: [BigInt!]
+  AND: [CouncilBudgetDecreasedEventWhereInput!]
+  OR: [CouncilBudgetDecreasedEventWhereInput!]
+  NOT: [CouncilBudgetDecreasedEventWhereInput!]
+}
+
+input CouncilBudgetDecreasedEventWhereUniqueInput {
+  id: ID!
+}
+
+input CouncilBudgetDecreasedEventCreateInput {
+  inExtrinsic: String
+  inBlock: Float!
+  network: Network!
+  indexInBlock: Float!
+  amount: String!
+}
+
+input CouncilBudgetDecreasedEventUpdateInput {
+  inExtrinsic: String
+  inBlock: Float
+  network: Network
+  indexInBlock: Float
+  amount: String
+}
+
 input CouncilBudgetFundedEventWhereInput {
   id_eq: ID
   id_in: [ID!]
@@ -29529,6 +29672,47 @@ type BudgetRefillPlannedEvent implements Event & BaseGraphQLObject {
   nextRefillInBlock: Int!
 }
 
+type CouncilBudgetDecreasedEvent implements Event & BaseGraphQLObject {
+  id: ID!
+  createdAt: DateTime!
+  createdById: ID!
+  updatedAt: DateTime
+  updatedById: ID
+  deletedAt: DateTime
+  deletedById: ID
+  version: Int!
+
+  """
+  Hash of the extrinsic which caused the event to be emitted
+  """
+  inExtrinsic: String
+
+  """
+  Blocknumber of the block in which the event was emitted.
+  """
+  inBlock: Int!
+
+  """
+  Network the block was produced in
+  """
+  network: Network!
+
+  """
+  Index of event in block from which it was emitted.
+  """
+  indexInBlock: Int!
+
+  """
+  Filtering options for interface implementers
+  """
+  type: EventTypeOptions
+
+  """
+  Funding amount.
+  """
+  amount: BigInt!
+}
+
 type CouncilBudgetFundedEvent implements Event & BaseGraphQLObject {
   id: ID!
   createdAt: DateTime!
@@ -31193,6 +31377,23 @@ type Query {
     where: CommentWhereInput
     orderBy: [CommentOrderByInput!]
   ): CommentConnection!
+  councilBudgetDecreasedEvents(
+    offset: Int
+    limit: Int = 50
+    where: CouncilBudgetDecreasedEventWhereInput
+    orderBy: [CouncilBudgetDecreasedEventOrderByInput!]
+  ): [CouncilBudgetDecreasedEvent!]!
+  councilBudgetDecreasedEventByUniqueInput(
+    where: CouncilBudgetDecreasedEventWhereUniqueInput!
+  ): CouncilBudgetDecreasedEvent
+  councilBudgetDecreasedEventsConnection(
+    first: Int
+    after: String
+    last: Int
+    before: String
+    where: CouncilBudgetDecreasedEventWhereInput
+    orderBy: [CouncilBudgetDecreasedEventOrderByInput!]
+  ): CouncilBudgetDecreasedEventConnection!
   councilBudgetFundedEvents(
     offset: Int
     limit: Int = 50
@@ -34940,6 +35141,25 @@ enum CommentOrderByInput {
   isEdited_DESC
 }
 
+enum CouncilBudgetDecreasedEventOrderByInput {
+  createdAt_ASC
+  createdAt_DESC
+  updatedAt_ASC
+  updatedAt_DESC
+  deletedAt_ASC
+  deletedAt_DESC
+  inExtrinsic_ASC
+  inExtrinsic_DESC
+  inBlock_ASC
+  inBlock_DESC
+  network_ASC
+  network_DESC
+  indexInBlock_ASC
+  indexInBlock_DESC
+  amount_ASC
+  amount_DESC
+}
+
 enum CouncilBudgetFundedEventOrderByInput {
   createdAt_ASC
   createdAt_DESC

packages/ui/package.json

@@ -29,7 +29,7 @@
     "@joystream/js": "1.10.0",
     "@joystream/markdown-editor": "^0.1.0",
     "@joystream/metadata-protobuf": "2.15.0",
-    "@joystream/types": "4.3.0",
+    "@joystream/types": "4.5.0",
     "@nivo/bar": "^0.79.1",
     "@nivo/core": "^0.79.0",
     "@noble/hashes": "^1.1.5",