@pezkuwi/api-derive 16.5.6 → 16.5.8

package/build-tsc-esm/teyrchains/types.js

@@ -0,0 +1 @@
+export {};

package/build-tsc-esm/teyrchains/util.js

@@ -0,0 +1,5 @@
+export function didUpdateToBool(didUpdate, id) {
+    return didUpdate.isSome
+        ? didUpdate.unwrap().some((paraId) => paraId.eq(id))
+        : false;
+}

package/build-tsc-esm/treasury/index.js

@@ -0,0 +1 @@
+export * from './proposals.js';

package/build-tsc-esm/treasury/proposals.js

@@ -0,0 +1,68 @@
+import { combineLatest, map, of, switchMap } from 'rxjs';
+import { memo } from '../util/index.js';
+function parseResult(api, { allIds, allProposals, approvalIds, councilProposals, proposalCount }) {
+    const approvals = [];
+    const proposals = [];
+    const councilTreasury = councilProposals.filter(({ proposal }) => 
+    // FIXME `approveProposal` and `rejectProposal` have been removed in bizinikiwi and released in 1.14
+    // in favor of `spend`. See: https://github.com/pezkuwichain/pezkuwi-sdk/pull/3820
+    proposal && ((api.tx.treasury['approveProposal'] && api.tx.treasury['approveProposal'].is(proposal)) ||
+        (api.tx.treasury['rejectProposal'] && api.tx.treasury['rejectProposal'].is(proposal))));
+    allIds.forEach((id, index) => {
+        if (allProposals[index].isSome) {
+            const council = councilTreasury
+                .filter(({ proposal }) => proposal && id.eq(proposal.args[0]))
+                .sort((a, b) => a.proposal && b.proposal
+                ? a.proposal.method.localeCompare(b.proposal.method)
+                : a.proposal
+                    ? -1
+                    : 1);
+            const isApproval = approvalIds.some((approvalId) => approvalId.eq(id));
+            const derived = { council, id, proposal: allProposals[index].unwrap() };
+            if (isApproval) {
+                approvals.push(derived);
+            }
+            else {
+                proposals.push(derived);
+            }
+        }
+    });
+    return { approvals, proposalCount, proposals };
+}
+function retrieveProposals(api, proposalCount, approvalIds) {
+    const proposalIds = [];
+    const count = proposalCount.toNumber();
+    for (let index = 0; index < count; index++) {
+        if (!approvalIds.some((id) => id.eqn(index))) {
+            proposalIds.push(api.registry.createType('ProposalIndex', index));
+        }
+    }
+    const allIds = [...proposalIds, ...approvalIds];
+    return combineLatest([
+        api.query.treasury.proposals.multi(allIds),
+        api.derive.council
+            ? api.derive.council.proposals()
+            : of([])
+    ]).pipe(map(([allProposals, councilProposals]) => parseResult(api, { allIds, allProposals, approvalIds, councilProposals, proposalCount })));
+}
+/**
+ * @name proposals
+ * @description Retrieve all active and approved treasury proposals, along with their info.
+ * @example
+ * ```javascript
+ * const treasuryProposals = await api.derive.treasury.proposals();
+ * console.log(treasuryProposals);
+ * ```
+ */
+export function proposals(instanceId, api) {
+    return memo(instanceId, () => api.query.treasury
+        ? combineLatest([
+            api.query.treasury.proposalCount(),
+            api.query.treasury.approvals()
+        ]).pipe(switchMap(([proposalCount, approvalIds]) => retrieveProposals(api, proposalCount, approvalIds)))
+        : of({
+            approvals: [],
+            proposalCount: api.registry.createType('ProposalIndex'),
+            proposals: []
+        }));
+}

package/build-tsc-esm/tx/constants.js

@@ -0,0 +1,5 @@
+import { BN } from '@pezkuwi/util';
+export const FALLBACK_MAX_HASH_COUNT = 250;
+export const FALLBACK_PERIOD = new BN(6 * 1000);
+export const MAX_FINALITY_LAG = new BN(5);
+export const MORTAL_PERIOD = new BN(5 * 60 * 1000);

package/build-tsc-esm/tx/events.js

@@ -0,0 +1,21 @@
+import { combineLatest, map, switchMap } from 'rxjs';
+import { memo } from '../util/index.js';
+/**
+ * @name events
+ * @param {Hash} at Block hash to query at.
+ * @description Retrieves the block information alongside its events at a given block hash
+ * @example
+ * ```javascript
+ * const blockHash = api.registry.createType(
+ *   "Hash",
+ *   "0xf1dc2efe8265be67deea5e91b05a98a7f9f81f66854e92825cf36f541beb7af6"
+ * );
+ * const { events, block } = await api.derive.tx.events(blockHash);
+ * ```
+ */
+export function events(instanceId, api) {
+    return memo(instanceId, (blockHash) => combineLatest([
+        api.rpc.chain.getBlock(blockHash),
+        api.queryAt(blockHash).pipe(switchMap((queryAt) => queryAt.system.events()))
+    ]).pipe(map(([block, events]) => ({ block, events }))));
+}

package/build-tsc-esm/tx/extrinsicInfo.js

@@ -0,0 +1,83 @@
+import { map } from 'rxjs';
+import { memo } from '../util/index.js';
+/**
+ * @name extrinsicInfo
+ * @param { Hash } at The block hash to query at.
+ * @param { Uint8Array | string } transactionHash A transaction hash as U8 array or string.
+ * @description Retrieves the extrinsic information and its events.
+ * @example
+ * ```javascript
+ * const blockHash = api.registry.createType(
+ *   'Hash',
+ *   '0xb772e4949d2f3eb5ba356aa43f885cc4f9097ee9812c5436543f3846a0491729'
+ * );
+ * const extrinsicInfo = await api.derive.tx.extrinsicInfo(
+ *   blockHash,
+ *   '0xcd96520b05e0c4648ea365f3f063f27c5cdd8be10d41a1c44566428c91f37dcb'
+ * );
+ *
+ * console.log(extrinsicInfo.extrinsic.toHuman());
+ * ```
+ */
+export function extrinsicInfo(instanceId, api) {
+    return memo(instanceId, (at, transactionHash) => {
+        return api.derive.tx.events(at).pipe(map(({ block, events }) => {
+            const index = block.block.extrinsics.findIndex((ext) => ext.hash.toString() === transactionHash);
+            if (index === -1) {
+                return null;
+            }
+            const extEvents = events.filter(({ phase }) => phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index));
+            return {
+                blockHash: block.hash.toHex(),
+                blockNumber: block.block.header.number.toNumber(),
+                events: extEvents,
+                extrinsic: block.block.extrinsics[index],
+                success: (extEvents.findIndex((ev) => ev.event.method === 'ExtrinsicSuccess') !== -1)
+            };
+        }));
+    });
+}
+/**
+ * @name accountExtrinsics
+ * @description Retrieves information about every extrinsic submitted by an account at a given block.
+ * @param { Hash } at The block hash to query at.
+ * @param { Uint8Array | strings } accountId The account identifier to query.
+ * @example
+ * ```javascript
+   const blockHash = api.registry.createType(
+    'Hash',
+    '0xb772e4949d2f3eb5ba356aa43f885cc4f9097ee9812c5436543f3846a0491729'
+  );
+  const extrinsicsInfo = await api.derive.tx.accountExtrinsics(
+    blockHash,
+    '0x21895DdfD4640b4e0aDCa2865b907f2CE6e6B777'
+  );
+
+  console.log(extrinsicsInfo.extrinsics[0]).extrinsic.toHuman();
+ * ```
+ */
+export function accountExtrinsics(instanceId, api) {
+    return memo(instanceId, (at, accountId) => {
+        return api.derive.tx.events(at).pipe(map(({ block, events }) => {
+            const indexes = [];
+            return {
+                blockHash: block.hash.toHex(),
+                blockNumber: block.block.header.number.toNumber(),
+                extrinsics: block.block.extrinsics.filter((ext, index) => {
+                    if (ext.signer.toString() === accountId) {
+                        indexes.push(index);
+                        return true;
+                    }
+                    return false;
+                }).map((ext, i) => {
+                    const extEvents = events.filter(({ phase }) => phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(indexes[i]));
+                    return {
+                        events: extEvents,
+                        extrinsic: ext,
+                        success: (extEvents.findIndex((ev) => ev.event.method === 'ExtrinsicSuccess') !== -1)
+                    };
+                })
+            };
+        }));
+    });
+}

package/build-tsc-esm/tx/index.js

@@ -0,0 +1,3 @@
+export * from './events.js';
+export * from './extrinsicInfo.js';
+export * from './signingInfo.js';

package/build-tsc-esm/tx/signingInfo.js

@@ -0,0 +1,78 @@
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
+import { isNumber, isUndefined } from '@pezkuwi/util';
+import { unwrapBlockNumber } from '../util/index.js';
+import { FALLBACK_MAX_HASH_COUNT, FALLBACK_PERIOD, MAX_FINALITY_LAG, MORTAL_PERIOD } from './constants.js';
+function latestNonce(api, address) {
+    return api.derive.balances.account(address).pipe(map(({ accountNonce }) => accountNonce));
+}
+function nextNonce(api, address) {
+    if (api.call.accountNonceApi) {
+        return api.call.accountNonceApi.accountNonce(address);
+    }
+    else {
+        return api.rpc.system?.accountNextIndex
+            ? api.rpc.system.accountNextIndex(address)
+            : latestNonce(api, address);
+    }
+}
+function signingHeader(api) {
+    return combineLatest([
+        api.rpc.chain.getHeader().pipe(switchMap((header) => 
+        // check for chains at genesis (until block 1 is produced, e.g. 6s), since
+        // we do need to allow transactions at chain start (also dev/seal chains)
+        header.parentHash.isEmpty
+            ? of(header)
+            // in the case of the current block, we use the parent to minimize the
+            // impact of forks on the system, but not completely remove it
+            : api.rpc.chain.getHeader(header.parentHash).pipe(catchError(() => of(header))))),
+        api.rpc.chain.getFinalizedHead().pipe(switchMap((hash) => api.rpc.chain.getHeader(hash).pipe(catchError(() => of(null)))))
+    ]).pipe(map(([current, finalized]) => 
+    // determine the hash to use, current when lag > max, else finalized
+    !finalized || unwrapBlockNumber(current).sub(unwrapBlockNumber(finalized)).gt(MAX_FINALITY_LAG)
+        ? current
+        : finalized));
+}
+function babeOrAuraPeriod(api) {
+    const period = api.consts.babe?.expectedBlockTime ||
+        // this will be present ones https://github.com/pezkuwichain/pezkuwi-sdk/pull/3732 is merged
+        // eslint-disable-next-line
+        api.consts['aura']?.['slotDuration'] ||
+        api.consts.timestamp?.minimumPeriod.muln(2);
+    return period && period.isZero && !period.isZero() ? period : undefined;
+}
+/**
+ * @name signingInfo
+ * @description Retrieves signing-related information for an account, including the nonce, block header, and mortal length.
+ * @param {string} address The account address for which signing information is needed.
+ * @param { BN | bigint | Uint8Array | number | string } nonce? (Optional) The nonce to use. If `undefined`, the latest nonce is retrieved.
+ * @param { IExtrinsicEra | number } era? (Optional) The transaction era.
+ * @example
+ * ```javascript
+ * const info = await api.derive.tx.signingInfo(
+ *   "14mM9FRDDtwSYicjNxSvMfQkap8o4m9zHq7hNW4JpbSL4PPU"
+ * );
+ * console.log(info);
+ * ```
+ */
+export function signingInfo(_instanceId, api) {
+    // no memo, we want to do this fresh on each run
+    return (address, nonce, era) => combineLatest([
+        // retrieve nonce if none was specified
+        isUndefined(nonce)
+            ? latestNonce(api, address)
+            : nonce === -1
+                ? nextNonce(api, address)
+                : of(api.registry.createType('Index', nonce)),
+        // if no era (create) or era > 0 (mortal), do block retrieval
+        (isUndefined(era) || (isNumber(era) && era > 0))
+            ? signingHeader(api)
+            : of(null)
+    ]).pipe(map(([nonce, header]) => ({
+        header,
+        mortalLength: Math.min(api.consts.system?.blockHashCount?.toNumber() || FALLBACK_MAX_HASH_COUNT, MORTAL_PERIOD
+            .div(babeOrAuraPeriod(api) || FALLBACK_PERIOD)
+            .iadd(MAX_FINALITY_LAG)
+            .toNumber()),
+        nonce
+    })));
+}

package/build-tsc-esm/type/HeaderExtended.js

@@ -0,0 +1,20 @@
+import { extractAuthor } from './util.js';
+export function createHeaderExtended(registry, header, validators, author) {
+    // an instance of the base extrinsic for us to extend
+    const HeaderBase = registry.createClass('Header');
+    class Implementation extends HeaderBase {
+        #author;
+        constructor(registry, header, validators, author) {
+            super(registry, header);
+            this.#author = author || extractAuthor(this.digest, validators || []);
+            this.createdAtHash = header?.createdAtHash;
+        }
+        /**
+         * @description Convenience method, returns the author for the block
+         */
+        get author() {
+            return this.#author;
+        }
+    }
+    return new Implementation(registry, header, validators, author);
+}

package/build-tsc-esm/type/SignedBlockExtended.js

@@ -0,0 +1,57 @@
+import { extractAuthor } from './util.js';
+function mapExtrinsics(extrinsics, records) {
+    return extrinsics.map((extrinsic, index) => {
+        let dispatchError;
+        let dispatchInfo;
+        const events = records
+            .filter(({ phase }) => phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index))
+            .map(({ event }) => {
+            if (event.section === 'system') {
+                if (event.method === 'ExtrinsicSuccess') {
+                    dispatchInfo = event.data[0];
+                }
+                else if (event.method === 'ExtrinsicFailed') {
+                    dispatchError = event.data[0];
+                    dispatchInfo = event.data[1];
+                }
+            }
+            return event;
+        });
+        return { dispatchError, dispatchInfo, events, extrinsic };
+    });
+}
+export function createSignedBlockExtended(registry, block, events, validators, author) {
+    // an instance of the base extrinsic for us to extend
+    const SignedBlockBase = registry.createClass('SignedBlock');
+    class Implementation extends SignedBlockBase {
+        #author;
+        #events;
+        #extrinsics;
+        constructor(registry, block, events, validators, author) {
+            super(registry, block);
+            this.#author = author || extractAuthor(this.block.header.digest, validators || []);
+            this.#events = events || [];
+            this.#extrinsics = mapExtrinsics(this.block.extrinsics, this.#events);
+            this.createdAtHash = block?.createdAtHash;
+        }
+        /**
+         * @description Convenience method, returns the author for the block
+         */
+        get author() {
+            return this.#author;
+        }
+        /**
+         * @description Convenience method, returns the events associated with the block
+         */
+        get events() {
+            return this.#events;
+        }
+        /**
+         * @description Returns the extrinsics and their events, mapped
+         */
+        get extrinsics() {
+            return this.#extrinsics;
+        }
+    }
+    return new Implementation(registry, block, events, validators, author);
+}

package/build-tsc-esm/type/index.js

@@ -0,0 +1,2 @@
+export { createHeaderExtended } from './HeaderExtended.js';
+export { createSignedBlockExtended } from './SignedBlockExtended.js';

package/build-tsc-esm/type/types.js

@@ -0,0 +1 @@
+export {};

package/build-tsc-esm/type/util.js

@@ -0,0 +1,33 @@
+export function extractAuthor(digest, sessionValidators) {
+    const [citem] = digest.logs.filter((e) => e.isConsensus);
+    const preRuntimeItems = digest.logs.filter((e) => e.isPreRuntime);
+    const [sitem] = digest.logs.filter((e) => e.isSeal);
+    let accountId;
+    try {
+        // This is critical to be first for BABE (before Consensus)
+        // If not first, we end up dropping the author at session-end
+        // Iterate through ALL preRuntime logs to find a recognized engine
+        // (teyrchains may have multiple preRuntime logs, e.g., CMLS + aura)
+        for (const pitem of preRuntimeItems) {
+            const [engine, data] = pitem.asPreRuntime;
+            accountId = engine.extractAuthor(data, sessionValidators);
+            // Stop at first recognized engine that returns an author
+            if (accountId) {
+                return accountId;
+            }
+        }
+        if (!accountId && citem) {
+            const [engine, data] = citem.asConsensus;
+            accountId = engine.extractAuthor(data, sessionValidators);
+        }
+        // SEAL, still used in e.g. Kulupu for pow
+        if (!accountId && sitem) {
+            const [engine, data] = sitem.asSeal;
+            accountId = engine.extractAuthor(data, sessionValidators);
+        }
+    }
+    catch {
+        // ignore
+    }
+    return accountId;
+}

package/build-tsc-esm/types.js

@@ -0,0 +1,12 @@
+export * from './accounts/types.js';
+export * from './bagsList/types.js';
+export * from './balances/types.js';
+export * from './council/types.js';
+export * from './crowdloan/types.js';
+export * from './democracy/types.js';
+export * from './elections/types.js';
+export * from './session/types.js';
+export * from './society/types.js';
+export * from './staking/types.js';
+export * from './teyrchains/types.js';
+export * from './type/types.js';

package/build-tsc-esm/util/approvalFlagsToBools.js

@@ -0,0 +1,16 @@
+/** @internal */
+export function approvalFlagsToBools(flags) {
+    const bools = [];
+    for (let i = 0, count = flags.length; i < count; i++) {
+        const str = flags[i].toString(2);
+        // read from lowest bit to highest
+        for (const bit of str.split('').reverse()) {
+            bools.push(!!parseInt(bit, 10));
+        }
+    }
+    // slice off trailing "false" values, as in bizinikiwi
+    const lastApproval = bools.lastIndexOf(true);
+    return lastApproval >= 0
+        ? bools.slice(0, lastApproval + 1)
+        : [];
+}

package/build-tsc-esm/util/blockNumber.js

@@ -0,0 +1,6 @@
+import { isCompact } from '@pezkuwi/util';
+export function unwrapBlockNumber(hdr) {
+    return isCompact(hdr.number)
+        ? hdr.number.unwrap()
+        : hdr.number;
+}

package/build-tsc-esm/util/cache.js

@@ -0,0 +1,42 @@
+import { deriveNoopCache } from './cacheImpl.js';
+const CACHE_EXPIRY = 7 * (24 * 60) * (60 * 1000);
+let deriveCache;
+function wrapCache(keyStart, cache) {
+    return {
+        del: (partial) => cache.del(`${keyStart}${partial}`),
+        forEach: cache.forEach,
+        get: (partial) => {
+            const key = `${keyStart}${partial}`;
+            const cached = cache.get(key);
+            if (cached) {
+                cached.x = Date.now();
+                cache.set(key, cached);
+                return cached.v;
+            }
+            return undefined;
+        },
+        set: (partial, v) => {
+            cache.set(`${keyStart}${partial}`, { v, x: Date.now() });
+        }
+    };
+}
+function clearCache(cache) {
+    // clear all expired values
+    const now = Date.now();
+    const all = [];
+    cache.forEach((key, { x }) => {
+        ((now - x) > CACHE_EXPIRY) && all.push(key);
+    });
+    // don't do delete inside loop, just in-case
+    all.forEach((key) => cache.del(key));
+}
+export function setDeriveCache(prefix = '', cache) {
+    deriveCache = cache
+        ? wrapCache(`derive:${prefix}:`, cache)
+        : deriveNoopCache;
+    if (cache) {
+        clearCache(cache);
+    }
+}
+setDeriveCache();
+export { deriveCache };

package/build-tsc-esm/util/cacheImpl.js

@@ -0,0 +1,23 @@
+const mapCache = new Map();
+export const deriveMapCache = {
+    del: (key) => {
+        mapCache.delete(key);
+    },
+    forEach: (cb) => {
+        for (const [k, v] of mapCache.entries()) {
+            cb(k, v);
+        }
+    },
+    get: (key) => {
+        return mapCache.get(key);
+    },
+    set: (key, value) => {
+        mapCache.set(key, value);
+    }
+};
+export const deriveNoopCache = {
+    del: () => undefined,
+    forEach: () => undefined,
+    get: () => undefined,
+    set: (_, value) => value
+};

package/build-tsc-esm/util/first.js

@@ -0,0 +1,8 @@
+import { map } from 'rxjs';
+import { memo } from '@pezkuwi/rpc-core';
+export function firstObservable(obs) {
+    return obs.pipe(map(([a]) => a));
+}
+export function firstMemo(fn) {
+    return (instanceId, api) => memo(instanceId, (...args) => firstObservable(fn(api, ...args)));
+}

package/build-tsc-esm/util/index.js

@@ -0,0 +1,7 @@
+export { drr, memo } from '@pezkuwi/rpc-core';
+export * from './approvalFlagsToBools.js';
+export * from './blockNumber.js';
+export * from './cache.js';
+export * from './cacheImpl.js';
+export * from './first.js';
+export * from './lazy.js';

package/build-tsc-esm/util/lazy.js

@@ -0,0 +1,4 @@
+import { lazyMethod, lazyMethods } from '@pezkuwi/util';
+export function lazyDeriveSection(result, section, getKeys, creator) {
+    lazyMethod(result, section, () => lazyMethods({}, getKeys(section), (method) => creator(section, method)));
+}

package/build-tsc-esm/util/types.js

@@ -0,0 +1 @@
+export {};

package/cjs/crowdloan/childKey.js

@@ -20,7 +20,10 @@ function createChildKey(info) {
  * ```
  */
 function childKey(instanceId, api) {
-    return (0, index_js_1.memo)(instanceId, (paraId) => api.query['crowdloan']['funds'](paraId).pipe((0, rxjs_1.map)((optInfo) => optInfo.isSome
-        ? createChildKey(optInfo.unwrap())
-        : null)));
+    return (0, index_js_1.memo)(instanceId, (paraId) => api.query['crowdloan']['funds'](paraId).pipe((0, rxjs_1.map)((optInfo) => {
+        if (optInfo.isSome) {
+            return createChildKey(optInfo.unwrap());
+        }
+        return null;
+    })));
 }

package/cjs/derive.d.ts

@@ -12,11 +12,11 @@ import * as democracy from './democracy/index.js';
 import * as elections from './elections/index.js';
 import * as imOnline from './imOnline/index.js';
 import * as membership from './membership/index.js';
-import * as teyrchains from './teyrchains/index.js';
 import * as session from './session/index.js';
 import * as society from './society/index.js';
 import * as staking from './staking/index.js';
 import * as technicalCommittee from './technicalCommittee/index.js';
+import * as teyrchains from './teyrchains/index.js';
 import * as treasury from './treasury/index.js';
 import * as tx from './tx/index.js';
 export declare const derive: {

package/cjs/derive.js

@@ -15,11 +15,11 @@ const democracy = tslib_1.__importStar(require("./democracy/index.js"));
 const elections = tslib_1.__importStar(require("./elections/index.js"));
 const imOnline = tslib_1.__importStar(require("./imOnline/index.js"));
 const membership = tslib_1.__importStar(require("./membership/index.js"));
-const teyrchains = tslib_1.__importStar(require("./teyrchains/index.js"));
 const session = tslib_1.__importStar(require("./session/index.js"));
 const society = tslib_1.__importStar(require("./society/index.js"));
 const staking = tslib_1.__importStar(require("./staking/index.js"));
 const technicalCommittee = tslib_1.__importStar(require("./technicalCommittee/index.js"));
+const teyrchains = tslib_1.__importStar(require("./teyrchains/index.js"));
 const treasury = tslib_1.__importStar(require("./treasury/index.js"));
 const tx = tslib_1.__importStar(require("./tx/index.js"));
 exports.derive = { accounts, alliance, bagsList, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, teyrchains, session, society, staking, technicalCommittee, treasury, tx };

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@pezkuwi/api-derive', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.5.4' };
+exports.packageInfo = { name: '@pezkuwi/api-derive', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.5.8' };

package/cjs/types.d.ts

@@ -11,10 +11,10 @@ export * from './council/types.js';
 export * from './crowdloan/types.js';
 export * from './democracy/types.js';
 export * from './elections/types.js';
-export * from './teyrchains/types.js';
 export * from './session/types.js';
 export * from './society/types.js';
 export * from './staking/types.js';
+export * from './teyrchains/types.js';
 export * from './type/types.js';
 export interface DeriveApi extends ApiInterfaceRx {
     derive: ExactDerive;

package/cjs/types.js

@@ -8,8 +8,8 @@ tslib_1.__exportStar(require("./council/types.js"), exports);
 tslib_1.__exportStar(require("./crowdloan/types.js"), exports);
 tslib_1.__exportStar(require("./democracy/types.js"), exports);
 tslib_1.__exportStar(require("./elections/types.js"), exports);
-tslib_1.__exportStar(require("./teyrchains/types.js"), exports);
 tslib_1.__exportStar(require("./session/types.js"), exports);
 tslib_1.__exportStar(require("./society/types.js"), exports);
 tslib_1.__exportStar(require("./staking/types.js"), exports);
+tslib_1.__exportStar(require("./teyrchains/types.js"), exports);
 tslib_1.__exportStar(require("./type/types.js"), exports);

package/crowdloan/childKey.js

@@ -17,7 +17,10 @@ function createChildKey(info) {
  * ```
  */
 export function childKey(instanceId, api) {
-    return memo(instanceId, (paraId) => api.query['crowdloan']['funds'](paraId).pipe(map((optInfo) => optInfo.isSome
-        ? createChildKey(optInfo.unwrap())
-        : null)));
+    return memo(instanceId, (paraId) => api.query['crowdloan']['funds'](paraId).pipe(map((optInfo) => {
+        if (optInfo.isSome) {
+            return createChildKey(optInfo.unwrap());
+        }
+        return null;
+    })));
 }

package/derive.d.ts

@@ -12,11 +12,11 @@ import * as democracy from './democracy/index.js';
 import * as elections from './elections/index.js';
 import * as imOnline from './imOnline/index.js';
 import * as membership from './membership/index.js';
-import * as teyrchains from './teyrchains/index.js';
 import * as session from './session/index.js';
 import * as society from './society/index.js';
 import * as staking from './staking/index.js';
 import * as technicalCommittee from './technicalCommittee/index.js';
+import * as teyrchains from './teyrchains/index.js';
 import * as treasury from './treasury/index.js';
 import * as tx from './tx/index.js';
 export declare const derive: {

package/derive.js

@@ -11,11 +11,11 @@ import * as democracy from './democracy/index.js';
 import * as elections from './elections/index.js';
 import * as imOnline from './imOnline/index.js';
 import * as membership from './membership/index.js';
-import * as teyrchains from './teyrchains/index.js';
 import * as session from './session/index.js';
 import * as society from './society/index.js';
 import * as staking from './staking/index.js';
 import * as technicalCommittee from './technicalCommittee/index.js';
+import * as teyrchains from './teyrchains/index.js';
 import * as treasury from './treasury/index.js';
 import * as tx from './tx/index.js';
 export const derive = { accounts, alliance, bagsList, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, teyrchains, session, society, staking, technicalCommittee, treasury, tx };