Merge pull request #3475 from mnaamani/olympia-final-tweaks

Olympia: Package version updates

cli/package.json

@@ -12,8 +12,8 @@
     "cross-fetch": "^3.0.6",
     "@apidevtools/json-schema-ref-parser": "^9.0.6",
     "@ffprobe-installer/ffprobe": "^1.1.0",
-    "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.2",
+    "@joystream/metadata-protobuf": "^2.1.0",
+    "@joystream/types": "^0.18.3",
     "@oclif/command": "^1.5.19",
     "@oclif/config": "^1.14.0",
     "@oclif/plugin-autocomplete": "^0.2.0",

cli/src/graphql/generated/schema.ts

@@ -1915,6 +1915,7 @@ export type BountyContribution = BaseGraphQlObject & {
   bounty: Bounty
   bountyId: Scalars['String']
   contributor?: Maybe<Membership>
+  /** The id of the contributor */
   contributorId?: Maybe<Scalars['String']>
   /** Amount of the contribution */
   amount: Scalars['BigInt']
@@ -1931,6 +1932,7 @@ export type BountyContributionConnection = {
 export type BountyContributionCreateInput = {
   bounty: Scalars['ID']
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount: Scalars['String']
 }
 
@@ -1950,6 +1952,8 @@ export enum BountyContributionOrderByInput {
   BountyDesc = 'bounty_DESC',
   ContributorAsc = 'contributor_ASC',
   ContributorDesc = 'contributor_DESC',
+  ContributorIdAsc = 'contributorId_ASC',
+  ContributorIdDesc = 'contributorId_DESC',
   AmountAsc = 'amount_ASC',
   AmountDesc = 'amount_DESC',
 }
@@ -1957,6 +1961,7 @@ export enum BountyContributionOrderByInput {
 export type BountyContributionUpdateInput = {
   bounty?: Maybe<Scalars['ID']>
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount?: Maybe<Scalars['String']>
 }
 
@@ -1985,6 +1990,11 @@ export type BountyContributionWhereInput = {
   deletedAt_gte?: Maybe<Scalars['DateTime']>
   deletedById_eq?: Maybe<Scalars['ID']>
   deletedById_in?: Maybe<Array<Scalars['ID']>>
+  contributorId_eq?: Maybe<Scalars['String']>
+  contributorId_contains?: Maybe<Scalars['String']>
+  contributorId_startsWith?: Maybe<Scalars['String']>
+  contributorId_endsWith?: Maybe<Scalars['String']>
+  contributorId_in?: Maybe<Array<Scalars['String']>>
   amount_eq?: Maybe<Scalars['BigInt']>
   amount_gt?: Maybe<Scalars['BigInt']>
   amount_gte?: Maybe<Scalars['BigInt']>

distributor-node/package.json

@@ -10,8 +10,8 @@
   "dependencies": {
     "@apollo/client": "^3.2.5",
     "@elastic/ecs-winston-format": "^1.1.0",
-    "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.2",
+    "@joystream/metadata-protobuf": "^2.1.0",
+    "@joystream/types": "^0.18.3",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",

distributor-node/src/services/networking/query-node/generated/schema.ts

@@ -1915,6 +1915,7 @@ export type BountyContribution = BaseGraphQlObject & {
   bounty: Bounty
   bountyId: Scalars['String']
   contributor?: Maybe<Membership>
+  /** The id of the contributor */
   contributorId?: Maybe<Scalars['String']>
   /** Amount of the contribution */
   amount: Scalars['BigInt']
@@ -1931,6 +1932,7 @@ export type BountyContributionConnection = {
 export type BountyContributionCreateInput = {
   bounty: Scalars['ID']
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount: Scalars['String']
 }
 
@@ -1950,6 +1952,8 @@ export enum BountyContributionOrderByInput {
   BountyDesc = 'bounty_DESC',
   ContributorAsc = 'contributor_ASC',
   ContributorDesc = 'contributor_DESC',
+  ContributorIdAsc = 'contributorId_ASC',
+  ContributorIdDesc = 'contributorId_DESC',
   AmountAsc = 'amount_ASC',
   AmountDesc = 'amount_DESC',
 }
@@ -1957,6 +1961,7 @@ export enum BountyContributionOrderByInput {
 export type BountyContributionUpdateInput = {
   bounty?: Maybe<Scalars['ID']>
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount?: Maybe<Scalars['String']>
 }
 
@@ -1985,6 +1990,11 @@ export type BountyContributionWhereInput = {
   deletedAt_gte?: Maybe<Scalars['DateTime']>
   deletedById_eq?: Maybe<Scalars['ID']>
   deletedById_in?: Maybe<Array<Scalars['ID']>>
+  contributorId_eq?: Maybe<Scalars['String']>
+  contributorId_contains?: Maybe<Scalars['String']>
+  contributorId_startsWith?: Maybe<Scalars['String']>
+  contributorId_endsWith?: Maybe<Scalars['String']>
+  contributorId_in?: Maybe<Array<Scalars['String']>>
   amount_eq?: Maybe<Scalars['BigInt']>
   amount_gt?: Maybe<Scalars['BigInt']>
   amount_gte?: Maybe<Scalars['BigInt']>

metadata-protobuf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/metadata-protobuf",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Joystream Metadata Protobuf Library (Olympia Release)",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

query-node/mappings/package.json

@@ -20,8 +20,8 @@
     "@polkadot/types": "5.9.1",
     "@joystream/hydra-common": "^3.1.0-alpha.20",
     "@joystream/hydra-db-utils": "^3.1.0-alpha.20",
-    "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.2",
+    "@joystream/metadata-protobuf": "^2.1.0",
+    "@joystream/types": "^0.18.3",
     "@joystream/warthog": "^2.41.4",
     "@apollo/client": "^3.2.5"
   },

storage-node/package.json

@@ -10,8 +10,8 @@
   "dependencies": {
     "@apollo/client": "^3.3.21",
     "@elastic/ecs-winston-format": "^1.3.1",
-    "@joystream/metadata-protobuf": "^2.0.0",
-    "@joystream/types": "^0.18.2",
+    "@joystream/metadata-protobuf": "^2.1.0",
+    "@joystream/types": "^0.18.3",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",

storage-node/src/services/queryNode/generated/schema.ts

@@ -1915,6 +1915,7 @@ export type BountyContribution = BaseGraphQlObject & {
   bounty: Bounty
   bountyId: Scalars['String']
   contributor?: Maybe<Membership>
+  /** The id of the contributor */
   contributorId?: Maybe<Scalars['String']>
   /** Amount of the contribution */
   amount: Scalars['BigInt']
@@ -1931,6 +1932,7 @@ export type BountyContributionConnection = {
 export type BountyContributionCreateInput = {
   bounty: Scalars['ID']
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount: Scalars['String']
 }
 
@@ -1950,6 +1952,8 @@ export enum BountyContributionOrderByInput {
   BountyDesc = 'bounty_DESC',
   ContributorAsc = 'contributor_ASC',
   ContributorDesc = 'contributor_DESC',
+  ContributorIdAsc = 'contributorId_ASC',
+  ContributorIdDesc = 'contributorId_DESC',
   AmountAsc = 'amount_ASC',
   AmountDesc = 'amount_DESC',
 }
@@ -1957,6 +1961,7 @@ export enum BountyContributionOrderByInput {
 export type BountyContributionUpdateInput = {
   bounty?: Maybe<Scalars['ID']>
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount?: Maybe<Scalars['String']>
 }
 
@@ -1985,6 +1990,11 @@ export type BountyContributionWhereInput = {
   deletedAt_gte?: Maybe<Scalars['DateTime']>
   deletedById_eq?: Maybe<Scalars['ID']>
   deletedById_in?: Maybe<Array<Scalars['ID']>>
+  contributorId_eq?: Maybe<Scalars['String']>
+  contributorId_contains?: Maybe<Scalars['String']>
+  contributorId_startsWith?: Maybe<Scalars['String']>
+  contributorId_endsWith?: Maybe<Scalars['String']>
+  contributorId_in?: Maybe<Array<Scalars['String']>>
   amount_eq?: Maybe<Scalars['BigInt']>
   amount_gt?: Maybe<Scalars['BigInt']>
   amount_gte?: Maybe<Scalars['BigInt']>

tests/network-tests/package.json

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

tests/network-tests/src/graphql/generated/schema.ts

@@ -1915,6 +1915,7 @@ export type BountyContribution = BaseGraphQlObject & {
   bounty: Bounty
   bountyId: Scalars['String']
   contributor?: Maybe<Membership>
+  /** The id of the contributor */
   contributorId?: Maybe<Scalars['String']>
   /** Amount of the contribution */
   amount: Scalars['BigInt']
@@ -1931,6 +1932,7 @@ export type BountyContributionConnection = {
 export type BountyContributionCreateInput = {
   bounty: Scalars['ID']
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount: Scalars['String']
 }
 
@@ -1950,6 +1952,8 @@ export enum BountyContributionOrderByInput {
   BountyDesc = 'bounty_DESC',
   ContributorAsc = 'contributor_ASC',
   ContributorDesc = 'contributor_DESC',
+  ContributorIdAsc = 'contributorId_ASC',
+  ContributorIdDesc = 'contributorId_DESC',
   AmountAsc = 'amount_ASC',
   AmountDesc = 'amount_DESC',
 }
@@ -1957,6 +1961,7 @@ export enum BountyContributionOrderByInput {
 export type BountyContributionUpdateInput = {
   bounty?: Maybe<Scalars['ID']>
   contributor?: Maybe<Scalars['ID']>
+  contributorId?: Maybe<Scalars['String']>
   amount?: Maybe<Scalars['String']>
 }
 
@@ -1985,6 +1990,11 @@ export type BountyContributionWhereInput = {
   deletedAt_gte?: Maybe<Scalars['DateTime']>
   deletedById_eq?: Maybe<Scalars['ID']>
   deletedById_in?: Maybe<Array<Scalars['ID']>>
+  contributorId_eq?: Maybe<Scalars['String']>
+  contributorId_contains?: Maybe<Scalars['String']>
+  contributorId_startsWith?: Maybe<Scalars['String']>
+  contributorId_endsWith?: Maybe<Scalars['String']>
+  contributorId_in?: Maybe<Array<Scalars['String']>>
   amount_eq?: Maybe<Scalars['BigInt']>
   amount_gt?: Maybe<Scalars['BigInt']>
   amount_gte?: Maybe<Scalars['BigInt']>

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/types",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "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.2",
+    "@joystream/types": "^0.18.3",
     "@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.2",
+    "@joystream/types": "^0.18.3",
     "@polkadot/api": "5.9.1",
     "@polkadot/types": "5.9.1",
     "@polkadot/keyring": "7.3.1",