diff --git a/.github/workflows/pre-release-types.yml b/.github/workflows/pre-release-types.yml index aac0b7d..ae2afe5 100644 --- a/.github/workflows/pre-release-types.yml +++ b/.github/workflows/pre-release-types.yml @@ -94,27 +94,7 @@ jobs: - name: Sleep for 1 minutes run: sleep 60s - - run: npm i - - - name: Extract the latest version of type definitions - if: ${{ github.event.inputs.branch == '' }} - run: | - version=$(npm show @mangata-finance/type-definitions version) - echo "NPM package version of mangata type definitions is $version" - echo "MANGATA_TYPE_DEFINITIONS=$version" >> $GITHUB_ENV - - - name: Extract the tag version of type definitions based on branch - if: ${{ github.event.inputs.branch != '' }} - env: - INPUTS_BRANCH: ${{ github.event.inputs.branch }} - run: | - version=$(npm show @mangata-finance/type-definitions@${INPUTS_BRANCH//\//-} version || npm show @mangata-finance/type-definitions version) - echo "NPM package version of mangata type definitions is $version" - echo "MANGATA_TYPE_DEFINITIONS=$version" >> $GITHUB_ENV - - - name: Install always latest type definitions - working-directory: packages/types - run: npm i @mangata-finance/type-definitions@${{ env.MANGATA_TYPE_DEFINITIONS }} + - run: npm ci - run: npx nx run @mangata-finance/types:generate-metadata diff --git a/package-lock.json b/package-lock.json index ec2d9b1..f79f9fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,6 @@ "workspaces": [ "packages/*" ], - "dependencies": { - "@mangata-finance/type-definitions": "^2.0.1-feature-3rdparty-rewards-merge.0" - }, "devDependencies": { "@goestav/nx-semantic-release": "1.0.0", "@nx/eslint-plugin": "16.9.1", @@ -16684,27 +16681,12 @@ "name": "@mangata-finance/types", "version": "2.0.1-feature-3rdparty-rewards-merge.8", "license": "GPL-3.0", - "devDependencies": { - "@mangata-finance/type-definitions": "2.0.0" - }, "engines": { "node": ">=18.0.0" }, "peerDependencies": { "@polkadot/api": "^10.9.1" } - }, - "packages/types/node_modules/@mangata-finance/type-definitions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@mangata-finance/type-definitions/-/type-definitions-2.0.0.tgz", - "integrity": "sha512-N8o0PgeSjTsb5MLfdsZD/DsD1BldBqrvRZ/KaanPY1ESFAAEu+B9BebSUZm/XFDm9GzQpOZqNg9KaZsghx4E5A==", - "dev": true, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "@polkadot/types": "10.9.1" - } } } } diff --git a/packages/types/package.json b/packages/types/package.json index 1b183d3..b2aab70 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -16,10 +16,7 @@ ], "license": "GPL-3.0", "peerDependencies": { - "@polkadot/api": "^10.9.1" - }, - "devDependencies": { - "@mangata-finance/type-definitions": "2.0.0" + "@polkadot/api": "10.9.1" }, "type": "module", "module": "./src/index.js", diff --git a/packages/types/project.json b/packages/types/project.json index f1a1049..c3d815e 100644 --- a/packages/types/project.json +++ b/packages/types/project.json @@ -11,7 +11,12 @@ "outputPath": "dist/packages/types", "main": "packages/types/src/index.ts", "tsConfig": "packages/types/tsconfig.lib.json", - "assets": ["packages/types/*.md"] + "assets": ["packages/types/*.md"], + "transformers": [ + { + "name": "typescript-transform-paths/nx-transformer" + } + ] } }, "build-types": { diff --git a/packages/types/src/interfaces/definitions.ts b/packages/types/src/interfaces/definitions.ts index 0eb5df7..0cfab76 100644 --- a/packages/types/src/interfaces/definitions.ts +++ b/packages/types/src/interfaces/definitions.ts @@ -1,5 +1,24 @@ -import { mTypes } from "@mangata-finance/type-definitions"; - export default { - types: mTypes -}; + types: { + ShufflingSeed: { + seed: "H256", + proof: "H512" + }, + Header: { + parentHash: "Hash", + number: "Compact", + stateRoot: "Hash", + extrinsicsRoot: "Hash", + digest: "Digest", + seed: "ShufflingSeed", + count: "BlockNumber" + }, + RpcAssetMetadata: { + tokenId: "TokenId", + decimals: "u32", + name: "Vec", + symbol: "Vec" + }, + TokenId: "u32", + } +}