feat(update dependencies): polkadot-js/api version update to 10.1.4, …

…and hydra-typegen fix to work-a affects: @joystream/hydra-cli, @joystream/hydra-e2e-tests, @joystream/hydra-indexer, @joystream/hydra-processor, @joystream/hydra-typegen, sample, sample-mappings
Joystream · Mar 1, 2024 · cbce70f · cbce70f
1 parent c92a495
commit cbce70f
Show file tree

Hide file tree

Showing 14 changed files with 593 additions and 1,368 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "prettier": "^2.7.1"
   },
   "resolutions": {
-    "@polkadot/types": "8.9.1",
+    "@polkadot/types": "10.1.4",
     "node-gyp": "^9.4.0"
   },
   "lint-staged": {

diff --git a/packages/hydra-cli/src/templates/scaffold/mappings/package.json.mst b/packages/hydra-cli/src/templates/scaffold/mappings/package.json.mst
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@joystream/hydra-common": "{{{hydraCommonVersion}}}",
-    "@polkadot/types": "8.9.1",
+    "@polkadot/types": "10.1.4",
     "@joystream/warthog": "{{{hydraWarthogVersion}}}"
   },
   "devDependencies": {

diff --git a/packages/hydra-e2e-tests/package.json b/packages/hydra-e2e-tests/package.json
@@ -22,12 +22,13 @@
     "e2e-test": "bash run-tests.sh"
   },
   "dependencies": {
-    "@polkadot/api": "8.9.1",
-    "@polkadot/keyring": "9.5.1",
+    "@polkadot/api": "10.1.4",
+    "@polkadot/keyring": "11.1.1",
+    "@types/node-fetch": "^2.6.11",
     "fetch": "^1.1.0",
     "graphql-request": "^3.3.0",
     "graphql-subscriptions-client": "^0.16.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.3.2",
     "p-wait-for": "^3.2.0",
     "typedi": "^0.8.0"
   },

diff --git a/packages/hydra-indexer/package.json b/packages/hydra-indexer/package.json
@@ -39,7 +39,7 @@
     "@joystream/bn-typeorm": "^5.0.0-alpha.7",
     "@joystream/hydra-common": "^5.0.0-alpha.7",
     "@joystream/hydra-db-utils": "^5.0.0-alpha.7",
-    "@polkadot/api": "8.9.1",
+    "@polkadot/api": "10.1.4",
     "@types/express": "^4.17.8",
     "@types/ioredis": "^4.17.4",
     "@types/lodash": "^4.14.161",

diff --git a/packages/hydra-processor/package.json b/packages/hydra-processor/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@joystream/hydra-cli": "^5.0.0-alpha.7",
-    "@polkadot/api": "8.9.1",
+    "@polkadot/api": "10.1.4",
     "@types/async-lock": "^1.1.3",
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.2.19",

diff --git a/packages/hydra-typegen/package.json b/packages/hydra-typegen/package.json
@@ -41,8 +41,8 @@
     "@oclif/command": "^1.8.0",
     "@oclif/config": "^1",
     "@oclif/errors": "^1.3.3",
-    "@polkadot/api": "8.9.1",
-    "@polkadot/typegen": "8.9.1",
+    "@polkadot/api": "10.1.4",
+    "@polkadot/typegen": "10.1.4",
     "debug": "^4.3.1",
     "figlet": "^1.5.2",
     "handlebars": "^4.7.6",

diff --git a/packages/hydra-typegen/src/generators/gen-index.ts b/packages/hydra-typegen/src/generators/gen-index.ts
@@ -11,7 +11,7 @@ export function generateIndex({ modules, dest }: GeneratorConfig): void {
   writeFile(path.join(dest, `index.ts`), () =>
     formatWithPrettier(
       generateIndexTemplate({
-        modules: modules.map((m) => m.module),
+        moduleNames: modules.map((m) => m.module.name.toString()),
       })
     )
   )

diff --git a/packages/hydra-typegen/src/generators/gen-modules.ts b/packages/hydra-typegen/src/generators/gen-modules.ts
@@ -15,6 +15,7 @@ type ModuleTemplateProps = {
   validateArgs: boolean
   imports: ImportsDef
   specVersion: number
+  moduleName: string
 } & ExtractedModuleMeta
 
 export function generateModuleTypes(config: GeneratorConfig): void {
@@ -42,6 +43,7 @@ export function buildModuleProps(
     validateArgs,
     specVersion,
     imports,
+    moduleName: meta.module.name.toString(),
     ...meta,
   }
 }
diff --git a/packages/hydra-typegen/src/generators/gen-typesLookup.ts b/packages/hydra-typegen/src/generators/gen-typesLookup.ts
@@ -47,10 +47,12 @@ export async function generateTypesLookup(
     'utf8'
   )
 
-  // remove module augmentation from the file
+  // remove module augmentation from the file, and export all types and interfaces
   const outFile = file
     .replace(`declare module '@polkadot/types/lookup' {`, '')
     .replace('} // declare module', '')
+    .replaceAll('  interface ', 'export interface ')
+    .replaceAll('  type ', 'export type ')
 
   // save the file
   writeFile(path.join(dest, TYPES_LOOKUP_FILE_NAME), () =>

diff --git a/packages/hydra-typegen/src/templates/index.hbs b/packages/hydra-typegen/src/templates/index.hbs
@@ -1,5 +1,5 @@
 /* eslint-disable */
 
-{{#each modules}}
-export * from './{{kebabCase name}}'
+{{#each moduleNames}}
+export * from './{{kebabCase this}}'
 {{/each}}
diff --git a/packages/hydra-typegen/src/templates/module.hbs b/packages/hydra-typegen/src/templates/module.hbs
@@ -16,7 +16,7 @@ import { typeRegistry } from "./typeRegistry";
      *  Event parameters: [{{#each args}}{{{this}}}, {{/each}}]
      */
     {{/if}}
-    export class {{@root.module.name}}_{{name}}Event_V{{@root.specVersion}} {
+    export class {{@root.moduleName}}_{{name}}Event_V{{@root.specVersion}} {
         public readonly expectedParamTypes = [{{#each args}}'{{{this}}}', {{/each}}]
 
         constructor(public readonly ctx: SubstrateEvent) {}

diff --git a/packages/hydra-typegen/tsconfig.json b/packages/hydra-typegen/tsconfig.json
@@ -6,7 +6,7 @@
     "outDir": "lib",
     "rootDirs": ["./src"],
     "strict": true,
-    "target": "es2017",
+    "target": "es2021",
     "noImplicitAny": false,
     "esModuleInterop": true,
     "experimentalDecorators": true,

diff --git a/packages/sample/mappings/package.json b/packages/sample/mappings/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@joystream/hydra-common": "^5.0.0-alpha.7",
-    "@polkadot/types": "8.9.1"
+    "@polkadot/types": "10.1.4"
   },
   "devDependencies": {
     "copyfiles": "^2.4.1",