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

Contracts with Data return (#1540)

Browse Source 
* Contracts with Data return

* Data toU8a()
This commit is contained in:
Jaco Greeff
2019-11-03 17:15:21 +01:00
committed by GitHub
parent 7c04be6abc
commit 287ceb2ded
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-contract/src/base/Contract.ts
+3
View File
@@ -69,8 +69,11 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
private createOutcome (result: ContractExecResult, origin: AccountId, message: ContractABIMessage, params: any[]): ContractCallOutcome {
let output: string;
if (result.isSuccess) {
const { data } = result.asSuccess;
// TODO We actually want to return the full Codec type here, not a string value
output = message.returnType
? formatData(data, message.returnType).toString()
: data.toHex();
packages/api-contract/src/util.ts
+6 -8
View File
@@ -4,20 +4,18 @@
import { Codec, TypeDefInfo, TypeDef } from '@polkadot/types/types';
import { Bytes, Option, createClass } from '@polkadot/types';
import { createType, createTypeUnsafe } from '@polkadot/types/codec';
import { compactStripLength } from '@polkadot/util';
import { Data, Option, createClass } from '@polkadot/types';
import { createTypeUnsafe } from '@polkadot/types/codec';
export function formatData (value: Bytes, { info, type }: TypeDef): Codec {
const input = compactStripLength(value.toU8a(true))[1];
const data = createType('Data', input);
export function formatData (data: Data, { info, type }: TypeDef): Codec {
const u8a = data.toU8a();
if (info === TypeDefInfo.Option) {
return new Option(
createClass(type),
createTypeUnsafe(type, [data], true)
createTypeUnsafe(type, [u8a], true)
);
}
return createTypeUnsafe(type, [data], true);
return createTypeUnsafe(type, [u8a], true);
}