@talismn/sapi 0.0.2 → 0.0.4

package/dist/declarations/src/helpers/types.d.ts

@@ -1,7 +1,6 @@
 import { ExtDef } from "@polkadot/types/extrinsic/signedExtensions/types";
-import { getDynamicBuilder, getLookupFn, V14, V15 } from "@talismn/scale";
+import { getDynamicBuilder, getLookupFn, UnifiedMetadata } from "@talismn/scale";
 import { SapiConnector } from "./getSapiConnector";
-export type ScaleMetadata = V14 | V15;
 export type ScaleBuilder = ReturnType<typeof getDynamicBuilder>;
 export type ScaleLookup = ReturnType<typeof getLookupFn>;
 export type Chain = {
@@ -14,7 +13,7 @@ export type Chain = {
     hasCheckMetadataHash?: boolean;
     signedExtensions?: ExtDef;
     registryTypes?: unknown;
-    metadata: ScaleMetadata;
+    metadata: UnifiedMetadata;
     lookup: ScaleLookup;
     builder: ScaleBuilder;
 };

package/dist/declarations/src/sapi.d.ts

@@ -33,7 +33,7 @@ export declare const getScaleApi: (connector: SapiConnectorProps, hexMetadata: `
     getFeeEstimate: (payload: SignerPayloadJSON) => Promise<bigint>;
     getRuntimeCallValue: <T>(apiName: string, method: string, args: unknown[]) => Promise<T>;
     getTypeRegistry: (payload: SignerPayloadJSON) => import("@polkadot/types").TypeRegistry;
-    submit: (payload: SignerPayloadJSON, signature?: `0x${string}`) => Promise<{
+    submit: (payload: SignerPayloadJSON, signature?: `0x${string}`, txInfo?: any) => Promise<{
         hash: `0x${string}`;
     }>;
     getCallDocs: (pallet: string, method: string) => string | null;

package/dist/declarations/src/types.d.ts

@@ -12,7 +12,7 @@ export type JsonRpcRequestSend = (method: string, params: unknown[], isCacheable
 export type SapiConnectorProps = {
     chainId: string;
     send: JsonRpcRequestSend;
-    submit?: (payload: SignerPayloadJSON, signature?: `0x${string}`) => Promise<{
+    submit?: (payload: SignerPayloadJSON, signature?: `0x${string}`, txInfo?: any) => Promise<{
         hash: `0x${string}`;
     }>;
 };

package/dist/talismn-sapi.cjs.dev.js

@@ -23,7 +23,7 @@ const getCallDocs = (chain, pallet, method) => {
   try {
     const typeIdCalls = chain.metadata.pallets.find(({
       name
-    }) => name === pallet)?.calls;
+    }) => name === pallet)?.calls?.type;
     if (!typeIdCalls) return null;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -375,7 +375,7 @@ const getPayloadWithMetadataHash = (chain, chainInfo, payload) => {
 
     // TODO do this without PJS / registry => waiting for @polkadot-api/tx-utils
     // const { extra, additionalSigned } = getSignedExtensionValues(payload, metadata)
-    // const badExtPayload = mergeUint8(fromHex(payload.method), ...extra, ...additionalSigned)
+    // const badExtPayload = mergeUint8([fromHex(payload.method), ...extra, ...additionalSigned])
 
     const registry = getTypeRegistry(chain, payload);
     const extPayload = registry.createType("ExtrinsicPayload", payloadWithMetadataHash);
@@ -435,7 +435,7 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
     codec,
     location
   } = chain.builder.buildCall(palletName, methodName);
-  const method = polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args)));
+  const method = polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)]));
   const blockNumber = await getStorageValue(chain, "System", "Number", []);
   if (blockNumber === null) throw new Error("Block number not found");
   const [account, genesisHash, blockHash] = await Promise.all([
@@ -485,11 +485,8 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
 };
 
 const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signedExtensions, registryTypes) => {
-  const decoded = scale.decodeMetadata(hexMetadata);
-  util.assert(decoded.metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
-  const {
-    metadata
-  } = decoded;
+  const metadata = scale.unifyMetadata(scale.decAnyMetadata(hexMetadata));
+  util.assert(metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
   const lookup = scale.getLookupFn(metadata);
   const builder = scale.getDynamicBuilder(lookup);
   const chain = {
@@ -525,7 +522,8 @@ const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signed
     getFeeEstimate: payload => getFeeEstimate(chain, payload, chainInfo),
     getRuntimeCallValue: (apiName, method, args) => getRuntimeCallResult(chain, apiName, method, args),
     getTypeRegistry: payload => getTypeRegistry(chain, payload),
-    submit: (payload, signature) => chain.connector.submit(payload, signature),
+    submit: (payload, signature, txInfo // eslint-disable-line @typescript-eslint/no-explicit-any
+    ) => chain.connector.submit(payload, signature, txInfo),
     getCallDocs: (pallet, method) => getCallDocs(chain, pallet, method),
     getDryRunCall: (from, decodedCall) => getDryRunCall(chain, from, decodedCall),
     isApiAvailable: (name, method) => isApiAvailable(chain, name, method)

package/dist/talismn-sapi.cjs.prod.js

@@ -23,7 +23,7 @@ const getCallDocs = (chain, pallet, method) => {
   try {
     const typeIdCalls = chain.metadata.pallets.find(({
       name
-    }) => name === pallet)?.calls;
+    }) => name === pallet)?.calls?.type;
     if (!typeIdCalls) return null;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -375,7 +375,7 @@ const getPayloadWithMetadataHash = (chain, chainInfo, payload) => {
 
     // TODO do this without PJS / registry => waiting for @polkadot-api/tx-utils
     // const { extra, additionalSigned } = getSignedExtensionValues(payload, metadata)
-    // const badExtPayload = mergeUint8(fromHex(payload.method), ...extra, ...additionalSigned)
+    // const badExtPayload = mergeUint8([fromHex(payload.method), ...extra, ...additionalSigned])
 
     const registry = getTypeRegistry(chain, payload);
     const extPayload = registry.createType("ExtrinsicPayload", payloadWithMetadataHash);
@@ -435,7 +435,7 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
     codec,
     location
   } = chain.builder.buildCall(palletName, methodName);
-  const method = polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args)));
+  const method = polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)]));
   const blockNumber = await getStorageValue(chain, "System", "Number", []);
   if (blockNumber === null) throw new Error("Block number not found");
   const [account, genesisHash, blockHash] = await Promise.all([
@@ -485,11 +485,8 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
 };
 
 const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signedExtensions, registryTypes) => {
-  const decoded = scale.decodeMetadata(hexMetadata);
-  util.assert(decoded.metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
-  const {
-    metadata
-  } = decoded;
+  const metadata = scale.unifyMetadata(scale.decAnyMetadata(hexMetadata));
+  util.assert(metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
   const lookup = scale.getLookupFn(metadata);
   const builder = scale.getDynamicBuilder(lookup);
   const chain = {
@@ -525,7 +522,8 @@ const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signed
     getFeeEstimate: payload => getFeeEstimate(chain, payload, chainInfo),
     getRuntimeCallValue: (apiName, method, args) => getRuntimeCallResult(chain, apiName, method, args),
     getTypeRegistry: payload => getTypeRegistry(chain, payload),
-    submit: (payload, signature) => chain.connector.submit(payload, signature),
+    submit: (payload, signature, txInfo // eslint-disable-line @typescript-eslint/no-explicit-any
+    ) => chain.connector.submit(payload, signature, txInfo),
     getCallDocs: (pallet, method) => getCallDocs(chain, pallet, method),
     getDryRunCall: (from, decodedCall) => getDryRunCall(chain, from, decodedCall),
     isApiAvailable: (name, method) => isApiAvailable(chain, name, method)

package/dist/talismn-sapi.esm.js

@@ -1,5 +1,5 @@
 import { assert, u8aConcatStrict } from '@polkadot/util';
-import { decodeMetadata, getLookupFn as getLookupFn$1, getDynamicBuilder } from '@talismn/scale';
+import { unifyMetadata, decAnyMetadata, getLookupFn as getLookupFn$1, getDynamicBuilder } from '@talismn/scale';
 import anylogger from 'anylogger';
 import { Enum, Binary } from 'polkadot-api';
 import { getLookupFn } from '@polkadot-api/metadata-builders';
@@ -17,7 +17,7 @@ const getCallDocs = (chain, pallet, method) => {
   try {
     const typeIdCalls = chain.metadata.pallets.find(({
       name
-    }) => name === pallet)?.calls;
+    }) => name === pallet)?.calls?.type;
     if (!typeIdCalls) return null;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -369,7 +369,7 @@ const getPayloadWithMetadataHash = (chain, chainInfo, payload) => {
 
     // TODO do this without PJS / registry => waiting for @polkadot-api/tx-utils
     // const { extra, additionalSigned } = getSignedExtensionValues(payload, metadata)
-    // const badExtPayload = mergeUint8(fromHex(payload.method), ...extra, ...additionalSigned)
+    // const badExtPayload = mergeUint8([fromHex(payload.method), ...extra, ...additionalSigned])
 
     const registry = getTypeRegistry(chain, payload);
     const extPayload = registry.createType("ExtrinsicPayload", payloadWithMetadataHash);
@@ -429,7 +429,7 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
     codec,
     location
   } = chain.builder.buildCall(palletName, methodName);
-  const method = Binary.fromBytes(mergeUint8(new Uint8Array(location), codec.enc(args)));
+  const method = Binary.fromBytes(mergeUint8([new Uint8Array(location), codec.enc(args)]));
   const blockNumber = await getStorageValue(chain, "System", "Number", []);
   if (blockNumber === null) throw new Error("Block number not found");
   const [account, genesisHash, blockHash] = await Promise.all([
@@ -479,11 +479,8 @@ const getSignerPayloadJSON = async (chain, palletName, methodName, args, signerC
 };
 
 const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signedExtensions, registryTypes) => {
-  const decoded = decodeMetadata(hexMetadata);
-  assert(decoded.metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
-  const {
-    metadata
-  } = decoded;
+  const metadata = unifyMetadata(decAnyMetadata(hexMetadata));
+  assert(metadata, `Missing Metadata V14+ for chain ${connector.chainId}`);
   const lookup = getLookupFn$1(metadata);
   const builder = getDynamicBuilder(lookup);
   const chain = {
@@ -519,7 +516,8 @@ const getScaleApi = (connector, hexMetadata, token, hasCheckMetadataHash, signed
     getFeeEstimate: payload => getFeeEstimate(chain, payload, chainInfo),
     getRuntimeCallValue: (apiName, method, args) => getRuntimeCallResult(chain, apiName, method, args),
     getTypeRegistry: payload => getTypeRegistry(chain, payload),
-    submit: (payload, signature) => chain.connector.submit(payload, signature),
+    submit: (payload, signature, txInfo // eslint-disable-line @typescript-eslint/no-explicit-any
+    ) => chain.connector.submit(payload, signature, txInfo),
     getCallDocs: (pallet, method) => getCallDocs(chain, pallet, method),
     getDryRunCall: (from, decodedCall) => getDryRunCall(chain, from, decodedCall),
     isApiAvailable: (name, method) => isApiAvailable(chain, name, method)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/sapi",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -21,16 +21,16 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@polkadot-api/merkleize-metadata": "1.1.14",
-    "@polkadot-api/metadata-builders": "0.10.2",
-    "@polkadot-api/substrate-bindings": "0.11.1",
-    "@polkadot-api/utils": "0.1.2",
-    "@polkadot/types": "15.8.1",
-    "@polkadot/types-codec": "15.8.1",
-    "@polkadot/util": "13.4.3",
+    "@polkadot-api/merkleize-metadata": "1.1.18",
+    "@polkadot-api/metadata-builders": "0.12.2",
+    "@polkadot-api/substrate-bindings": "0.14.0",
+    "@polkadot-api/utils": "0.2.0",
+    "@polkadot/types": "16.1.2",
+    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/util": "13.5.1",
     "anylogger": "^1.0.11",
-    "polkadot-api": "1.7.6",
-    "@talismn/scale": "0.1.1"
+    "polkadot-api": "1.13.1",
+    "@talismn/scale": "0.1.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",