🔥 Add support for the decrease council budget proposal

.github/workflows/CI.yml

@@ -110,7 +110,7 @@ jobs:
             BRANCH=$(echo -n '${{ env.LABEL }}' | cut -d ':' -f2-)
           fi
 
-          URL_BRANCH=$(echo -n "$BRANCH" | tr -d '#' | tr -c '[:alnum:]' '-' | tr '[:upper:]' '[:lower:]')
+          URL_BRANCH=$(echo -n "$BRANCH" | sed 's/\//-/' | tr -d '/#' | tr -c '[:alnum:]' '-' | tr '[:upper:]' '[:lower:]')
           SUBDOMAIN="${{ env.PROJECT }}-${{ env.PREFIX }}-$URL_BRANCH-joystream"
 
           if [ ${#SUBDOMAIN} -gt 63 ]; then

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": "patch:@joystream/types@npm%3A4.3.0#./.yarn/patches/@joystream-types-npm-4.3.0-542438a0b6.patch",
     "@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,7 @@ union ProposalDetails =
   | UpdateChannelPayoutsProposalDetails
   | UpdatePalletFrozenStatusProposalDetails
   | UpdateGlobalNftLimitProposalDetails
+  | DecreaseCouncilBudgetProposalDetails
 
 union ProposalStatus =
     ProposalStatusDeciding
@@ -2976,6 +2978,13 @@ type DataObjectTypeVideoThumbnail {
   video: Video
 }
 
+type DecreaseCouncilBudgetProposalDetails {
+  """
+  Proposed amount of token to burn
+  """
+  amount: BigInt!
+}
+
 type DecreaseWorkingGroupLeadStakeProposalDetails {
   """
   The lead that should be affected
@@ -5261,6 +5270,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 +22816,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 +29624,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 +31329,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 +35093,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/src/app/pages/Proposals/CurrentProposals.stories.tsx

@@ -1543,3 +1543,37 @@ export const SpecificParametersRuntimeUpgrade: Story = {
     })
   }),
 }
+
+export const SpecificParametersDecreaseCouncilBudget: Story = {
+  parameters: {
+    councilBudget: joy(500),
+  },
+  play: specificParametersTest('Decrease Council Budget', async ({ args, createProposal, modal, step }) => {
+    await createProposal(async () => {
+      const nextButton = getButtonByText(modal, 'Create proposal')
+      expect(nextButton).toBeDisabled()
+
+      const amountField = await modal.findByLabelText('Amount')
+
+      // Invalid price set to 0
+      await userEvent.type(amountField, '0')
+      expect(await modal.findByText('Amount must be greater than zero'))
+      expect(nextButton).toBeDisabled()
+
+      // Invalid price set to 0
+      await userEvent.clear(amountField)
+      await userEvent.type(amountField, '600')
+      expect(await modal.findByText('The current council budget is 500JOY'))
+      expect(nextButton).toBeDisabled()
+
+      // Valid
+      await userEvent.clear(amountField)
+      await userEvent.type(amountField, '8')
+    })
+
+    await step('Transaction parameters', () => {
+      const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
+      expect(specificParameters.toJSON()).toEqual({ decreaseCouncilBudget: 8_0000000000 })
+    })
+  }),
+}

packages/ui/src/app/pages/Proposals/ProposalPreview.stories.tsx

@@ -218,12 +218,6 @@ export default {
 // ProposalPreview
 // ----------------------------------------------------------------------------
 
-export const AmendConstitution: Story = {
-  args: { type: 'AmendConstitutionProposalDetails', constitutionality: 2 },
-  parameters: {
-    statuses: ['ProposalStatusDeciding', 'ProposalStatusDormant', 'ProposalStatusDeciding'] satisfies ProposalStatus[],
-  },
-}
 export const CancelWorkingGroupLeadOpening: Story = {
   args: { type: 'CancelWorkingGroupLeadOpeningProposalDetails' },
 }
@@ -302,9 +296,20 @@ export const UpdatePalletFrozenStatus: Story = {
 export const UpdateWorkingGroupBudget: Story = {
   args: { type: 'UpdateWorkingGroupBudgetProposalDetails' },
 }
+export const DecreaseCouncilBudget: Story = {
+  args: { type: 'DecreaseCouncilBudgetProposalDetails' },
+}
+
+// Disabled proposals
 export const Veto: Story = {
   args: { type: 'VetoProposalDetails' },
 }
+export const AmendConstitution: Story = {
+  args: { type: 'AmendConstitutionProposalDetails', constitutionality: 2 },
+  parameters: {
+    statuses: ['ProposalStatusDeciding', 'ProposalStatusDormant', 'ProposalStatusDeciding'] satisfies ProposalStatus[],
+  },
+}
 
 // ----------------------------------------------------------------------------
 // VoteForProposalModal