Merge branch 'petra' into fix/petra-ci-checks

ignazio-bovo · Jun 5, 2024 · 34766e6 · 34766e6
2 parents 94ebc04 + 3452fbc
commit 34766e6
Show file tree

Hide file tree

Showing 37 changed files with 1,208 additions and 622 deletions.
diff --git a/bin/node/src/chain_spec/argo_bridge_config.rs b/bin/node/src/chain_spec/argo_bridge_config.rs
@@ -6,7 +6,6 @@ pub fn production_config() -> ArgoBridgeConfig {
         mint_allowance: 0,
         bridging_fee: DefaultBridgingFee::get(),
         thawn_duration: 1,
-        ..Default::default()
     }
 }
 
@@ -16,6 +15,5 @@ pub fn testing_config() -> ArgoBridgeConfig {
         mint_allowance: 0,
         bridging_fee: DefaultBridgingFee::get(),
         thawn_duration: 1,
-        ..Default::default()
     }
 }
diff --git a/chain-metadata.json b/chain-metadata.json
diff --git a/cli/package.json b/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joystream/cli",
   "description": "Command Line Interface for Joystream community and governance activities",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "author": "Leszek Wiesner",
   "bin": {
     "joystream-cli": "./bin/run"
@@ -57,7 +57,7 @@
     "proper-lockfile": "^4.1.1",
     "slug": "^2.1.1",
     "tslib": "^1.11.1",
-    "@joystream/js": "^1.11.0"
+    "@joystream/js": "^1.12.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^1.21.4",

diff --git a/distributor-node/CHANGELOG.md b/distributor-node/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.1.2
+
+- Bump @joystream/types to Petra version
+
 ### 2.1.1
 
 - Bump deps @polkadot/api v10.7.1

diff --git a/distributor-node/package.json b/distributor-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joystream/distributor-cli",
   "description": "Joystream distributor node CLI",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "Joystream contributors",
   "bin": {
     "joystream-distributor": "./bin/run"
@@ -13,7 +13,7 @@
     "@joystream/metadata-protobuf": "^2.15.0",
     "@joystream/opentelemetry": "1.0.0",
     "@joystream/storage-node-client": "^4.0.0",
-    "@joystream/types": "^4.4.0",
+    "@joystream/types": "^4.6.0",
     "@nerdwallet/apollo-cache-policies": "2.10.0",
     "@oclif/command": "^1",
     "@oclif/config": "^1",

diff --git a/joystreamjs/CHANGELOG.md b/joystreamjs/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.12.0
+
+- Bump @joystream/types to Petra version
+
 ### 1.7.0
 
 - Update dependency on metadata protobuf to v2.13.0

diff --git a/joystreamjs/package.json b/joystreamjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joystream/js",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "license": "GPL-3.0-only",
   "description": "Joystream JS package provides  utilities required to work with Joystream network.",
   "main": "lib/index.js",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@joystream/metadata-protobuf": "^2.15.0",
-    "@joystream/types": "^4.4.0",
+    "@joystream/types": "^4.6.0",
     "@polkadot/util-crypto": "^12.6.2",
     "axios": "^1.2.1",
     "buffer": "^6.0.3",

diff --git a/query-node/CHANGELOG.md b/query-node/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.4.0
+
+- Bump @joystream/types to Petra version
+
 ### 2.2.1
 
 - Bump deps @polkadot/api v10.7.1

diff --git a/query-node/chain-metadata/2004.json b/query-node/chain-metadata/2004.json
diff --git a/query-node/mappings/package.json b/query-node/mappings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-mappings",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Mappings for hydra-processor",
   "main": "lib/src/index.js",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@apollo/client": "^3.2.5",
     "@joystream/hydra-common": "5.0.0-alpha.8",
     "@joystream/hydra-db-utils": "5.0.0-alpha.8",
-    "@joystream/js": "^1.11.0",
+    "@joystream/js": "^1.12.0",
     "@joystream/warthog": "^2.41.9",
     "@polkadot/types": "10.7.1"
   },

diff --git a/query-node/mappings/src/proposals.ts b/query-node/mappings/src/proposals.ts
@@ -55,6 +55,7 @@ import {
   SignalProposalDetails,
   SlashWorkingGroupLeadProposalDetails,
   TerminateWorkingGroupLeadProposalDetails,
+  UpdateArgoBridgeConstraintsProposalDetails,
   UpdateChannelPayoutsProposalDetails,
   UpdatePalletFrozenStatusProposalDetails,
   UpdateGlobalNftLimitProposalDetails,
@@ -78,14 +79,14 @@ import {
 } from './common'
 import {
   ProposalsCodex_ProposalCreatedEvent_V1001 as ProposalCreatedEvent_V1001,
-  ProposalsCodex_ProposalCreatedEvent_V2003 as ProposalCreatedEvent_V2003,
+  ProposalsCodex_ProposalCreatedEvent_V2004 as ProposalCreatedEvent_V2004,
   ProposalsEngine_ProposalCancelledEvent_V1001 as ProposalCancelledEvent_V1001,
   ProposalsEngine_ProposalDecisionMadeEvent_V1001 as ProposalDecisionMadeEvent_V1001,
   ProposalsEngine_ProposalExecutedEvent_V1001 as ProposalExecutedEvent_V1001,
   ProposalsEngine_ProposalStatusUpdatedEvent_V1001 as ProposalStatusUpdatedEvent_V1001,
   ProposalsEngine_VotedEvent_V1001 as ProposalVotedEvent_V1001,
 } from '../generated/types'
-import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails_V2003 } from '../generated/types/2003/types-lookup'
+import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails_V2004 } from '../generated/types/2004/types-lookup'
 
 import { createWorkingGroupOpeningMetadata } from './workingGroups'
 
@@ -109,7 +110,7 @@ async function getOrCreateRuntimeWasmBytecode(store: DatabaseManager, bytecode:
 async function parseProposalDetails(
   event: SubstrateEvent,
   store: DatabaseManager,
-  proposalDetails: RuntimeProposalDetails_V2003
+  proposalDetails: RuntimeProposalDetails_V2004
 ): Promise<typeof ProposalDetails> {
   const eventTime = new Date(event.blockTimestamp)
 
@@ -353,6 +354,17 @@ async function parseProposalDetails(
     const details = new SetEraPayoutDampingFactorProposalDetails()
     details.dampingFactor = proposalDetails.asSetEraPayoutDampingFactor.toNumber()
     return details
+  }
+  // UpdateArgoBridgeConstraintsProposalDetails
+  else if (proposalDetails.isUpdateArgoBridgeConstraints) {
+    const details = new UpdateArgoBridgeConstraintsProposalDetails()
+    const bridgeConstraints = proposalDetails.asUpdateArgoBridgeConstraints
+    details.operatorAccount = unwrap(bridgeConstraints.operatorAccount)?.toString()
+    details.pauserAccounts = unwrap(bridgeConstraints.pauserAccounts)?.map((a) => a.toString())
+    details.bridgingFee = whenDef(unwrap(bridgeConstraints.bridgingFee), asBN)
+    details.thawnDuration = unwrap(bridgeConstraints.thawnDuration)?.toNumber()
+    details.remoteChains = unwrap(bridgeConstraints.remoteChains)?.map((a) => a.toNumber())
+    return details
   } else {
     unimplementedError(`Unsupported proposal details type: ${proposalDetails.type}`)
   }
@@ -393,13 +405,13 @@ export async function proposalsCodex_ProposalCreated({
   const [proposalId, generalProposalParameters, runtimeProposalDetails, proposalThreadId] =
     Number(specVersion) < 2001
       ? new ProposalCreatedEvent_V1001(event).params
-      : new ProposalCreatedEvent_V2003(event).params
+      : new ProposalCreatedEvent_V2004(event).params
 
   const eventTime = new Date(event.blockTimestamp)
   const proposalDetails = await parseProposalDetails(
     event,
     store,
-    runtimeProposalDetails as RuntimeProposalDetails_V2003
+    runtimeProposalDetails as RuntimeProposalDetails_V2004
   )
 
   const proposal = new Proposal({

diff --git a/query-node/package.json b/query-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-root",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "GraphQL server and mappings. Generated with ♥ by Hydra-CLI",
   "scripts": {
     "build": "./build.sh",

diff --git a/query-node/schemas/proposals.graphql b/query-node/schemas/proposals.graphql
@@ -386,6 +386,14 @@ type SetEraPayoutDampingFactorProposalDetails @variant {
   dampingFactor: Int!
 }
 
+type UpdateArgoBridgeConstraintsProposalDetails @variant {
+  operatorAccount: String
+  pauserAccounts: [String]
+  bridgingFee: BigInt
+  thawnDuration: Int
+  remoteChains: [Int]
+}
+
 union ProposalDetails =
     SignalProposalDetails
   | RuntimeUpgradeProposalDetails
@@ -414,3 +422,4 @@ union ProposalDetails =
   | DecreaseCouncilBudgetProposalDetails
   | UpdateTokenPalletTokenConstraintsProposalDetails
   | SetEraPayoutDampingFactorProposalDetails
+  | UpdateArgoBridgeConstraintsProposalDetails