@dedot/codegen 0.18.8 → 1.0.0

package/cjs/utils.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariantDeprecationComment = exports.getDeprecationComment = exports.isNativeType = exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
+exports.resolveBlockHash = exports.getVariantDeprecationComment = exports.getDeprecationComment = exports.isNativeType = exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
+const utils_1 = require("@dedot/utils");
 const fs = __importStar(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path = __importStar(require("path"));
@@ -51,6 +52,7 @@ exports.commentBlock = commentBlock;
 const beautifySourceCode = async (source) => {
     const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_js_1.currentDirname)(), '../../../.prettierrc.cjs'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
+    // return source;
 };
 exports.beautifySourceCode = beautifySourceCode;
 const compileTemplate = (templateFile) => {
@@ -141,3 +143,27 @@ const getVariantDeprecationComment = (deprecationInfo, variantIndex) => {
     }
 };
 exports.getVariantDeprecationComment = getVariantDeprecationComment;
+/**
+ * Resolve block hash from either a block hash or block number
+ * @param client - The API client
+ * @param at - Block hash (0x...) or block number (number)
+ * @returns The resolved block hash
+ */
+async function resolveBlockHash(client, at) {
+    // Check if it's a hex string (block hash)
+    if ((0, utils_1.isHex)(at)) {
+        return at;
+    }
+    // Try to parse as a number (block height)
+    const blockNumber = parseInt(at, 10);
+    if (isNaN(blockNumber) || blockNumber < 0) {
+        throw new utils_1.DedotError(`Invalid block specifier: ${at}. Must be a block hash (0x...) or block number.`);
+    }
+    // Resolve block number to block hash
+    const blockHash = await client.rpc.chain_getBlockHash(blockNumber);
+    if (!blockHash) {
+        throw new utils_1.DedotError(`Block not found at height: ${blockNumber}`);
+    }
+    return blockHash;
+}
+exports.resolveBlockHash = resolveBlockHash;

package/index.d.ts

@@ -2,3 +2,4 @@ export * from './types.js';
 export * from './chaintypes/index.js';
 export * from './typink/index.js';
 export * from './sol/index.js';
+export { resolveBlockHash } from './utils.js';

package/index.js

@@ -2,3 +2,4 @@ export * from './types.js';
 export * from './chaintypes/index.js';
 export * from './typink/index.js';
 export * from './sol/index.js';
+export { resolveBlockHash } from './utils.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.18.8",
+  "version": "1.0.0",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -19,16 +19,16 @@
     "copy": "cp -R ./src/chaintypes/templates ./dist/chaintypes && cp -R ./src/chaintypes/templates ./dist/cjs/chaintypes && cp -R ./src/typink/templates ./dist/typink && cp -R ./src/typink/templates ./dist/cjs/typink && cp -R ./src/sol/templates ./dist/sol && cp -R ./src/sol/templates ./dist/cjs/sol"
   },
   "dependencies": {
-    "@dedot/api": "0.18.8",
-    "@dedot/codecs": "0.18.8",
-    "@dedot/contracts": "0.18.8",
-    "@dedot/providers": "0.18.8",
-    "@dedot/runtime-specs": "0.18.8",
-    "@dedot/shape": "0.18.8",
-    "@dedot/types": "0.18.8",
-    "@dedot/utils": "0.18.8",
+    "@dedot/api": "1.0.0",
+    "@dedot/codecs": "1.0.0",
+    "@dedot/contracts": "1.0.0",
+    "@dedot/providers": "1.0.0",
+    "@dedot/runtime-specs": "1.0.0",
+    "@dedot/shape": "1.0.0",
+    "@dedot/types": "1.0.0",
+    "@dedot/utils": "1.0.0",
     "handlebars": "^4.7.8",
-    "prettier": "^3.6.2"
+    "prettier": "^3.7.3"
   },
   "publishConfig": {
     "access": "public",
@@ -38,7 +38,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "5f87f515d4ce4183038681dd02b20bb682a5fdce",
+  "gitHead": "7767062a2188b4ac90561c5ad3cc3f06ac608a24",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/sol/generator/ConstructorQueryGen.js

@@ -29,7 +29,7 @@ export class ConstructorQueryGen {
     }
     generateMethodDef(abiItem, optionsParamName = 'options') {
         const paramsOut = this.generateParamsOut(abiItem);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>, Type>`;
+        return `GenericConstructorQueryCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>, Type>`;
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs

package/sol/generator/ConstructorTxGen.js

@@ -13,6 +13,6 @@ export class ConstructorTxGen extends ConstructorQueryGen {
     }
     generateMethodDef(abiItem, optionsParamName = 'options') {
         const paramsOut = this.generateParamsOut(abiItem);
-        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>, Type>`;
+        return `GenericConstructorTxCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>, Type>`;
     }
 }

package/sol/generator/IndexGen.js

@@ -10,7 +10,7 @@ export class IndexGen {
     generate(useSubPaths = false) {
         const interfaceName = this.interfaceName;
         const typeImports = new TypeImports();
-        typeImports.addKnownType('VersionedGenericSubstrateApi', 'RpcVersion', 'RpcV2');
+        typeImports.addKnownType('GenericSubstrateApi', 'RpcVersion', 'RpcV2');
         typeImports.addContractType('SolGenericContractApi', 'SolRegistry');
         typeImports.addChainType('SubstrateApi');
         const importTypes = typeImports.toImports({ useSubPaths });

package/sol/generator/QueryGen.js

@@ -36,7 +36,7 @@ export class QueryGen {
         const typeOutInner = `${outputs.map((o) => this.typesGen.generateType(o, abiItem, 1, true)).join(',')}`;
         // If there is only one output, we don't need to wrap it in a tuple, for user-friendly
         const typeOut = outputs.length === 1 ? typeOutInner : `[${typeOutInner}]`;
-        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>, Type>`;
+        return `GenericContractQueryCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult>>, Type>`;
     }
     generateParamsOut(abiItem) {
         return abiItem.inputs

package/sol/generator/TxGen.js

@@ -13,6 +13,6 @@ export class TxGen extends QueryGen {
     }
     generateMethodDef(abiItem, optionsParamName = 'options') {
         const paramsOut = this.generateParamsOut(abiItem);
-        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>, Type>`;
+        return `GenericContractTxCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractTxOptions) => ContractSubmittableExtrinsic, Type>`;
     }
 }

package/sol/templates/constructor-query.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ConstructorQuery <ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericConstructorQuery <ChainApi, Type> {
+export interface ConstructorQuery<Type extends MetadataType> extends GenericConstructorQuery<Type> {
     {{{ constructorsOut }}}
 }

package/sol/templates/constructor-tx.hbs

@@ -3,9 +3,8 @@
 {{{ importTypes }}}
 
 export interface ConstructorTx<
-  ChainApi extends GenericSubstrateApi, 
   ContractApi extends SolGenericContractApi,
   Type extends MetadataType
-> extends GenericConstructorTx <ChainApi, Type> {
+> extends GenericConstructorTx<Type> {
   {{{ constructorsOut }}}
 }

package/sol/templates/events.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractEvents <ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractEvents <ChainApi, Type> {
+export interface ContractEvents<Type extends MetadataType> extends GenericContractEvents<Type> {
     {{{ eventsOut }}}
 }

package/sol/templates/index.hbs

@@ -9,15 +9,15 @@ import { ContractEvents } from './events.js';
 
 export * from './types.js';
 
-{{{interfaceDocs}}}export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends SolGenericContractApi<Rv, ChainApi> {
+{{{interfaceDocs}}}export interface {{{interfaceName}}}<ChainApi extends GenericSubstrateApi = SubstrateApi> extends SolGenericContractApi<ChainApi> {
     metadataType: 'sol';
-    query: ContractQuery<ChainApi[Rv], 'sol'>;
-    tx: ContractTx<ChainApi[Rv], 'sol'>;
-    constructorQuery: ConstructorQuery<ChainApi[Rv], 'sol'>;
-    events: ContractEvents<ChainApi[Rv], 'sol'>;
-    constructorTx: ConstructorTx<ChainApi[Rv], {{{interfaceName}}}, 'sol'>;
+    query: ContractQuery<'sol'>;
+    tx: ContractTx<'sol'>;
+    constructorQuery: ConstructorQuery<'sol'>;
+    events: ContractEvents<'sol'>;
+    constructorTx: ConstructorTx<{{{interfaceName}}}, 'sol'>;
 
     types: {
-      ChainApi: ChainApi[Rv];
+      ChainApi: ChainApi;
     };
 }

package/sol/templates/query.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractQuery<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractQuery<ChainApi, Type> {
+export interface ContractQuery<Type extends MetadataType> extends GenericContractQuery<Type> {
     {{{ queryCallsOut }}}
 }

package/sol/templates/tx.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractTx<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractTx<ChainApi, Type> {
+export interface ContractTx<Type extends MetadataType> extends GenericContractTx<Type> {
     {{{ txCallsOut }}}
 }

package/typink/generator/ConstructorQueryGen.js

@@ -17,6 +17,6 @@ export class ConstructorQueryGen extends QueryGen {
         const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
         // Unwrap langError result
         const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
-        return `GenericConstructorQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<${typeOut}, ContractInstantiateResult<ChainApi>>>, Type>`;
+        return `GenericConstructorQueryCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<${typeOut}, ContractInstantiateResult>>, Type>`;
     }
 }

package/typink/generator/ConstructorTxGen.js

@@ -13,6 +13,6 @@ export class ConstructorTxGen extends QueryGen {
     }
     generateMethodDef(def, optionsParamName = 'options') {
         const paramsOut = this.generateParamsOut(def.args);
-        return `GenericConstructorTxCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>, Type>`;
+        return `GenericConstructorTxCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ContractApi>, Type>`;
     }
 }

package/typink/generator/IndexGen.js

@@ -15,7 +15,7 @@ export class IndexGen {
         const langErrorId = this.contractMetadata.spec.lang_error.type;
         const langErrorName = this.typesGen.cleanPath(this.contractMetadata.types[langErrorId].type.path);
         const typeImports = new TypeImports();
-        typeImports.addKnownType('VersionedGenericSubstrateApi', 'RpcVersion', 'RpcV2');
+        typeImports.addKnownType('GenericSubstrateApi', 'RpcVersion', 'RpcV2');
         typeImports.addContractType('InkGenericContractApi', 'WithLazyStorage');
         typeImports.addChainType('SubstrateApi');
         typeImports.addPortableType(langErrorName);

package/typink/generator/QueryGen.js

@@ -37,7 +37,7 @@ export class QueryGen {
         const typeOutRaw = this.typesGen.generateType(returnType.type, 0, true);
         // Unwrap langError result
         const typeOut = typeOutRaw.match(/^(\w+)<(.*), (.*)>$/).at(2);
-        return `GenericContractQueryCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult<ChainApi>>>, Type>`;
+        return `GenericContractQueryCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractCallOptions) => Promise<GenericContractCallResult<${typeOut}, ContractCallResult>>, Type>`;
     }
     generateParamsOut(args) {
         return args

package/typink/generator/TxGen.js

@@ -14,6 +14,6 @@ export class TxGen extends QueryGen {
     }
     generateMethodDef(def, optionsParamName = 'options') {
         const paramsOut = this.generateParamsOut(def.args);
-        return `GenericContractTxCall<ChainApi, (${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>, Type>`;
+        return `GenericContractTxCall<(${paramsOut && `${paramsOut},`} ${optionsParamName}?: ContractTxOptions) => ContractSubmittableExtrinsic, Type>`;
     }
 }

package/typink/templates/constructor-query.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ConstructorQuery<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericConstructorQuery<ChainApi, Type> {  
+export interface ConstructorQuery<Type extends MetadataType> extends GenericConstructorQuery<Type> {
     {{{ constructorsOut }}}
 }

package/typink/templates/constructor-tx.hbs

@@ -3,9 +3,8 @@
 {{{ importTypes }}}
 
 export interface ConstructorTx<
-  ChainApi extends GenericSubstrateApi,
   ContractApi extends InkGenericContractApi,
   Type extends MetadataType
-> extends GenericConstructorTx<ChainApi, Type> {
+> extends GenericConstructorTx<Type> {
     {{{ constructorsOut }}}
 }

package/typink/templates/events.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractEvents <ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractEvents <ChainApi, Type> {
+export interface ContractEvents<Type extends MetadataType> extends GenericContractEvents <Type> {
     {{{ eventsOut }}}
 }

package/typink/templates/index.hbs

@@ -9,20 +9,20 @@ import { ContractEvents } from './events.js';
 
 export * from './types.js';
 
-{{{interfaceDocs}}}export interface {{{interfaceName}}}<Rv extends RpcVersion = RpcVersion, ChainApi extends VersionedGenericSubstrateApi = SubstrateApi> extends InkGenericContractApi<Rv, ChainApi> {
+{{{interfaceDocs}}}export interface {{{interfaceName}}}<ChainApi extends GenericSubstrateApi = SubstrateApi> extends InkGenericContractApi<ChainApi> {
     metadataType: 'ink';
-    query: ContractQuery<ChainApi[Rv], 'ink'>;
-    tx: ContractTx<ChainApi[Rv], 'ink'>;
-    constructorQuery: ConstructorQuery<ChainApi[Rv], 'ink'>;
-    constructorTx: ConstructorTx<ChainApi[Rv], {{{interfaceName}}}, 'ink'>;
-    events: ContractEvents<ChainApi[Rv], 'ink'>;
+    query: ContractQuery<'ink'>;
+    tx: ContractTx<'ink'>;
+    constructorQuery: ConstructorQuery<'ink'>;
+    constructorTx: ConstructorTx<{{{interfaceName}}}, 'ink'>;
+    events: ContractEvents<'ink'>;
     storage: {
       root(): Promise<{{{rootStorageName}}}>;
       lazy(): {{{lazyStorageName}}};
     };
 
     types: {
-      ChainApi: ChainApi[Rv];
+      ChainApi: ChainApi;
       RootStorage: {{{rootStorageName}}};
       LazyStorage: {{{lazyStorageName}}};
       LangError: {{{langErrorName}}};

package/typink/templates/query.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractQuery<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractQuery<ChainApi, Type> {
+export interface ContractQuery<Type extends MetadataType> extends GenericContractQuery<Type> {
     {{{ queryCallsOut }}}
 }

package/typink/templates/tx.hbs

@@ -2,6 +2,6 @@
 
 {{{ importTypes }}}
 
-export interface ContractTx<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractTx<ChainApi, Type> {
+export interface ContractTx<Type extends MetadataType> extends GenericContractTx<Type> {
     {{{ txCallsOut }}}
 }

package/utils.d.ts

@@ -1,4 +1,6 @@
+import { DedotClient } from '@dedot/api';
 import { ItemDeprecationInfoDefV16, EnumDeprecationInfoDefV16 } from '@dedot/codecs';
+import { HexString } from '@dedot/utils';
 export declare const WRAPPER_TYPE_REGEX: RegExp;
 export declare const TUPLE_TYPE_REGEX: RegExp;
 export declare const commentBlock: (...docs: (string | string[])[]) => string;
@@ -27,3 +29,10 @@ export declare const getDeprecationComment: (deprecationInfo: ItemDeprecationInf
  * @param variantIndex
  */
 export declare const getVariantDeprecationComment: (deprecationInfo: EnumDeprecationInfoDefV16 | undefined, variantIndex: number) => string[];
+/**
+ * Resolve block hash from either a block hash or block number
+ * @param client - The API client
+ * @param at - Block hash (0x...) or block number (number)
+ * @returns The resolved block hash
+ */
+export declare function resolveBlockHash(client: DedotClient, at: string): Promise<HexString>;

package/utils.js

@@ -1,3 +1,4 @@
+import { DedotError, isHex } from '@dedot/utils';
 import * as fs from 'fs';
 import handlebars from 'handlebars';
 import * as path from 'path';
@@ -21,6 +22,7 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
 export const beautifySourceCode = async (source) => {
     const prettierOptions = await prettier.resolveConfig(path.resolve(currentDirname(), '../../../.prettierrc.cjs'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
+    // return source;
 };
 export const compileTemplate = (templateFile) => {
     const templateFilePath = path.resolve(currentDirname(), templateFile);
@@ -105,3 +107,26 @@ export const getVariantDeprecationComment = (deprecationInfo, variantIndex) => {
             return [];
     }
 };
+/**
+ * Resolve block hash from either a block hash or block number
+ * @param client - The API client
+ * @param at - Block hash (0x...) or block number (number)
+ * @returns The resolved block hash
+ */
+export async function resolveBlockHash(client, at) {
+    // Check if it's a hex string (block hash)
+    if (isHex(at)) {
+        return at;
+    }
+    // Try to parse as a number (block height)
+    const blockNumber = parseInt(at, 10);
+    if (isNaN(blockNumber) || blockNumber < 0) {
+        throw new DedotError(`Invalid block specifier: ${at}. Must be a block hash (0x...) or block number.`);
+    }
+    // Resolve block number to block hash
+    const blockHash = await client.rpc.chain_getBlockHash(blockNumber);
+    if (!blockHash) {
+        throw new DedotError(`Block not found at height: ${blockNumber}`);
+    }
+    return blockHash;
+}