diff --git a/package.json b/package.json index c73e057be6..f2d89f0f9f 100644 --- a/package.json +++ b/package.json @@ -34,9 +34,9 @@ "@babel/core": "^7.18.2", "@babel/register": "^7.17.7", "@babel/runtime": "^7.18.3", - "@polkadot/dev": "^0.66.34", + "@polkadot/dev": "^0.66.35", "@polkadot/typegen": "workspace:packages/typegen", - "@types/jest": "^28.1.0", + "@types/jest": "^28.1.1", "copyfiles": "^2.4.1" }, "resolutions": { diff --git a/packages/types/src/interfaces/contracts/definitions.ts b/packages/types/src/interfaces/contracts/definitions.ts index af60ca519d..064bf53b2b 100644 --- a/packages/types/src/interfaces/contracts/definitions.ts +++ b/packages/types/src/interfaces/contracts/definitions.ts @@ -34,12 +34,7 @@ export default { code: 'Bytes', storageDepositLimit: 'Option' }, - CodeUploadResult: { - _enum: { - Ok: 'CodeUploadResultValue', - Err: 'Null' - } - }, + CodeUploadResult: 'Result', CodeUploadResultValue: { codeHash: 'CodeHash', deposit: 'Balance' @@ -77,12 +72,7 @@ export default { flags: 'ContractReturnFlags', data: 'Bytes' }, - ContractExecResultResult: { - _enum: { - Ok: 'ContractExecResultOk', - Err: 'DispatchError' - } - }, + ContractExecResultResult: 'Result', ContractExecResultTo267: { gasConsumed: 'u64', debugMessage: 'Text', @@ -255,19 +245,8 @@ export default { data: 'Bytes', salt: 'Bytes' }, - ContractInstantiateResultTo267: { - _enum: { - Ok: 'InstantiateReturnValueTo267', - Err: 'Null' - } - }, - ContractInstantiateResultTo299: { - _enum: { - Ok: 'InstantiateReturnValue', - Err: 'Null' - }, - _fallback: 'ContractInstantiateResultTo267' - }, + ContractInstantiateResultTo267: 'Result', + ContractInstantiateResultTo299: 'Result', ContractInstantiateResult: { _fallback: 'ContractInstantiateResultTo299', gasConsumed: 'u64', @@ -285,12 +264,7 @@ export default { result: 'ExecReturnValue', accountId: 'AccountId' }, - InstantiateReturnValue: { - _enum: { - Ok: 'InstantiateReturnValueOk', - Err: 'DispatchError' - } - }, + InstantiateReturnValue: 'Result', InstructionWeights: { i64const: 'u32', i64load: 'u32', diff --git a/packages/types/src/interfaces/contracts/types.ts b/packages/types/src/interfaces/contracts/types.ts index b5fdea3d88..14a5912fea 100644 --- a/packages/types/src/interfaces/contracts/types.ts +++ b/packages/types/src/interfaces/contracts/types.ts @@ -1,7 +1,7 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -import type { Bytes, Compact, Enum, Null, Option, Raw, Set, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types-codec'; +import type { Bytes, Compact, Enum, Null, Option, Raw, Result, Set, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types-codec'; import type { AccountId, Balance, BlockNumber, Hash, Weight } from '@polkadot/types/interfaces/runtime'; import type { DispatchError } from '@polkadot/types/interfaces/system'; @@ -38,11 +38,15 @@ export interface CodeUploadRequest extends Struct { } /** @name CodeUploadResult */ -export interface CodeUploadResult extends Enum { +export interface CodeUploadResult extends Result { + readonly isErr: boolean; + readonly asErr: DispatchError; + /** @deprecated Use isErr */ + readonly isError: boolean; + /** @deprecated Use asErr */ + readonly asError: DispatchError; readonly isOk: boolean; readonly asOk: CodeUploadResultValue; - readonly isErr: boolean; - readonly type: 'Ok' | 'Err'; } /** @name CodeUploadResultValue */ @@ -85,12 +89,15 @@ export interface ContractExecResultOk extends Struct { } /** @name ContractExecResultResult */ -export interface ContractExecResultResult extends Enum { - readonly isOk: boolean; - readonly asOk: ContractExecResultOk; +export interface ContractExecResultResult extends Result { readonly isErr: boolean; readonly asErr: DispatchError; - readonly type: 'Ok' | 'Err'; + /** @deprecated Use isErr */ + readonly isError: boolean; + /** @deprecated Use asErr */ + readonly asError: DispatchError; + readonly isOk: boolean; + readonly asOk: ContractExecResultOk; } /** @name ContractExecResultSuccessTo255 */ @@ -148,19 +155,21 @@ export interface ContractInstantiateResult extends Struct { } /** @name ContractInstantiateResultTo267 */ -export interface ContractInstantiateResultTo267 extends Enum { +export interface ContractInstantiateResultTo267 extends Result { + readonly isErr: boolean; + /** @deprecated Use isErr */ + readonly isError: boolean; readonly isOk: boolean; readonly asOk: InstantiateReturnValueTo267; - readonly isErr: boolean; - readonly type: 'Ok' | 'Err'; } /** @name ContractInstantiateResultTo299 */ -export interface ContractInstantiateResultTo299 extends Enum { - readonly isOk: boolean; - readonly asOk: InstantiateReturnValue; +export interface ContractInstantiateResultTo299 extends Result { readonly isErr: boolean; - readonly type: 'Ok' | 'Err'; + /** @deprecated Use isErr */ + readonly isError: boolean; + readonly isOk: boolean; + readonly asOk: InstantiateReturnValueOk; } /** @name ContractReturnFlags */ @@ -324,12 +333,15 @@ export interface InstantiateRequestV2 extends Struct { } /** @name InstantiateReturnValue */ -export interface InstantiateReturnValue extends Enum { - readonly isOk: boolean; - readonly asOk: InstantiateReturnValueOk; +export interface InstantiateReturnValue extends Result { readonly isErr: boolean; readonly asErr: DispatchError; - readonly type: 'Ok' | 'Err'; + /** @deprecated Use isErr */ + readonly isError: boolean; + /** @deprecated Use asErr */ + readonly asError: DispatchError; + readonly isOk: boolean; + readonly asOk: InstantiateReturnValueOk; } /** @name InstantiateReturnValueOk */ diff --git a/yarn.lock b/yarn.lock index c617c2d1ce..f562d9f42b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2039,9 +2039,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.66.34": - version: 0.66.34 - resolution: "@polkadot/dev@npm:0.66.34" +"@polkadot/dev@npm:^0.66.35": + version: 0.66.35 + resolution: "@polkadot/dev@npm:0.66.35" dependencies: "@babel/cli": ^7.17.10 "@babel/core": ^7.18.2 @@ -2128,7 +2128,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 55e37ec25ccdc03d3b7c70474c2bc8f465536a4a1ac3d8b73ce47a62279f561574b44b5e3718be01e1e7c077ee2c44281e62be87b133a6a8c5f2a598fba773bd + checksum: 6e6f09d9333dac9ebad7bde7b763dc9857f12a4d53d5e39604d28c62310c8d04f3ae7181455382fc4fcfecd66ffe937e8dce833317bbfb4e84d9008fa44c917e languageName: node linkType: hard @@ -2771,13 +2771,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^28.1.0": - version: 28.1.0 - resolution: "@types/jest@npm:28.1.0" +"@types/jest@npm:^28.1.1": + version: 28.1.1 + resolution: "@types/jest@npm:28.1.1" dependencies: jest-matcher-utils: ^27.0.0 pretty-format: ^27.0.0 - checksum: be4d887b2452e8c1367cd19b23906ba4b64af95e22ca871f81c7af5e945bd39b370e124086356aa9380c4543123b1387448bc2c00a604c6f0a92bc3e4a24e9ce + checksum: 0a8b045a7b660372decc807c390d3f99a2b12bb1659a1cd593afe04557f4b7c235b0576a5e35b1577710d20e42759d3d8755eb8bed6edc8733f47007e75a5509 languageName: node linkType: hard @@ -9251,9 +9251,9 @@ resolve@^2.0.0-next.3: "@babel/core": ^7.18.2 "@babel/register": ^7.17.7 "@babel/runtime": ^7.18.3 - "@polkadot/dev": ^0.66.34 + "@polkadot/dev": ^0.66.35 "@polkadot/typegen": "workspace:packages/typegen" - "@types/jest": ^28.1.0 + "@types/jest": ^28.1.1 copyfiles: ^2.4.1 languageName: unknown linkType: soft