quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure call is exposed on rx (#5116)

Browse Source 
* Ensure call is exposed on rx

* Adjust to only top-level detection

* .123npm

* Adjust check for contractsApi
This commit is contained in:
Jaco
2022-07-29 11:10:05 +03:00
committed by GitHub
parent b2cfac4edd
commit 62bfcf84dd
6 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-contract/src/base/Base.ts
+1 -1
View File
@@ -29,7 +29,7 @@ export abstract class Base<ApiType extends ApiTypes> {
} else if (!api.tx.contracts || !isFunction(api.tx.contracts.instantiateWithCode) || api.tx.contracts.instantiateWithCode.meta.args.length !== 6) {
throw new Error('The runtime does not expose api.tx.contracts.instantiateWithCode with storageDepositLimit');
} else if (!api.call.contractsApi || !isFunction(api.call.contractsApi.call)) {
throw new Error('Your runtime does not expose the api.call.contractsApi.call method');
throw new Error('Your runtime does not expose the api.call.contractsApi.call runtime interfaces');
}
}
packages/api-contract/src/base/Contract.ts
+1 -14
View File
@@ -13,7 +13,7 @@ import { map } from 'rxjs';
import { SubmittableResult } from '@polkadot/api';
import { ApiBase } from '@polkadot/api/base';
import { BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
import { BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isUndefined, logger } from '@polkadot/util';
import { Abi } from '../Abi';
import { applyOnEvent } from '../util';
@@ -26,7 +26,6 @@ export interface ContractConstructor<ApiType extends ApiTypes> {
// As per Rust, 5 * GAS_PER_SEC
const MAX_CALL_GAS = new BN(5_000_000_000_000).isub(BN_ONE);
const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is most probably due to a runtime configuration.';
const l = logger('Contract');
@@ -78,15 +77,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
});
}
public get hasRpcContractsApi (): boolean {
return isFunction(this.api.rx.call.contractsApi?.call);
}
public get query (): MapMessageQuery<ApiType> {
if (!this.hasRpcContractsApi) {
throw new Error(ERROR_NO_CALL);
}
return this.#query;
}
@@ -132,10 +123,6 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
};
#read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, storageDepositLimit = null, value = BN_ZERO }: ContractOptions, params: unknown[]): ContractCallSend<ApiType> => {
if (!this.hasRpcContractsApi) {
throw new Error(ERROR_NO_CALL);
}
const message = this.abi.findMessage(messageOrId);
return {