Merge branch 'olympia-playground' into fix-proposal-tests

cli/package.json

@@ -13,7 +13,7 @@
     "@apidevtools/json-schema-ref-parser": "^9.0.6",
     "@ffprobe-installer/ffprobe": "^1.1.0",
     "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@oclif/command": "^1.5.19",
     "@oclif/config": "^1.14.0",
     "@oclif/plugin-autocomplete": "^0.2.0",

distributor-node/package.json

@@ -11,7 +11,7 @@
     "@apollo/client": "^3.2.5",
     "@elastic/ecs-winston-format": "^1.1.0",
     "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",

query-node/mappings/package.json

@@ -21,7 +21,7 @@
     "@joystream/hydra-common": "3.1.0-alpha.16",
     "@joystream/hydra-db-utils": "3.1.0-alpha.16",
     "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@joystream/warthog": "2.41.2",
     "@apollo/client": "^3.2.5"
   },

storage-node/package.json

@@ -11,7 +11,7 @@
     "@apollo/client": "^3.3.21",
     "@elastic/ecs-winston-format": "^1.3.1",
     "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",

tests/integration-tests/package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.2.5",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@polkadot/api": "5.3.2",
     "@polkadot/keyring": "^7.1.1",
     "@types/async-lock": "^1.1.3",

tests/integration-tests/src/fixtures/proposals/DecideOnProposalStatusFixture.ts

@@ -78,7 +78,7 @@ export class DecideOnProposalStatusFixture extends BaseQueryNodeFixture {
         approvalThresholdPercentage.toNumber(),
         slashingThresholdPercentage.toNumber()
       )
-      const minRejectOrAbstainVotesN = Math.ceil((councilSize * (100 - otherResultMinThreshold)) / 100)
+      const minRejectOrAbstainVotesN = Math.floor((councilSize * (100 - otherResultMinThreshold)) / 100) + 1
       return Array.from({ length: minRejectOrAbstainVotesN }, (v, i) => vote('Reject', i))
     }
   }

tests/integration-tests/src/graphql/generated/queries.ts

@@ -4150,7 +4150,7 @@ export const GetProposalExecutedEventsByEventIds = gql`
 `
 export const GetProposalVotedEventsByEventIds = gql`
   query getProposalVotedEventsByEventIds($eventIds: [ID!]) {
-    proposalVotedEvents(where: { id_in: $eventIds }) {
+    proposalVotedEvents(where: { id_in: $eventIds }, limit: 200) {
       ...ProposalVotedEventFields
     }
   }

tests/integration-tests/src/graphql/queries/proposalsEvents.graphql

@@ -100,7 +100,7 @@ fragment ProposalVotedEventFields on ProposalVotedEvent {
 }
 
 query getProposalVotedEventsByEventIds($eventIds: [ID!]) {
-  proposalVotedEvents(where: { id_in: $eventIds }) {
+  proposalVotedEvents(where: { id_in: $eventIds }, limit: 200) {
     ...ProposalVotedEventFields
   }
 }

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/types",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Types for Joystream Substrate Runtime - Olympia release",
   "main": "index.js",
   "types": "index.d.ts",

utils/api-scripts/package.json

@@ -12,7 +12,7 @@
     "storage-dev-init": "./dev-init-storage.sh"
   },
   "dependencies": {
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@polkadot/api": "5.9.1",
     "@polkadot/types": "5.9.1",
     "@polkadot/keyring": "7.3.1",

utils/migration-scripts/package.json

@@ -12,7 +12,7 @@
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3.2.3",
     "tslib": "^1",
-    "@joystream/types": "^0.18.0",
+    "@joystream/types": "^0.18.1",
     "@polkadot/api": "5.9.1",
     "@polkadot/types": "5.9.1",
     "@polkadot/keyring": "7.3.1",