From 5780f92dcfce6a2fa3474745ae23cf2f5adb862c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 13 Oct 2020 15:28:06 +0200 Subject: [PATCH] Adjust contracts with API bump (#3860) * Adjust contracts with API bump * Change header for deploy modal * Override adjustments --- package.json | 6 +- packages/page-contracts/package.json | 2 +- packages/page-contracts/src/Codes/Upload.tsx | 5 +- .../page-contracts/src/Contracts/Call.tsx | 4 +- .../page-contracts/src/Contracts/index.tsx | 12 +- packages/page-contracts/src/Deploy.tsx | 9 +- packages/react-api/package.json | 2 +- .../react-params/src/Param/findComponent.ts | 4 +- yarn.lock | 112 +++++++++--------- 9 files changed, 79 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index 5244ebd77e..14a8397552 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,10 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@polkadot/api": "^2.2.1", - "@polkadot/api-contract": "^2.2.1", + "@polkadot/api": "^2.2.2-2", + "@polkadot/api-contract": "^2.2.2-2", "@polkadot/keyring": "^3.5.1", - "@polkadot/types": "^2.2.1", + "@polkadot/types": "^2.2.2-2", "@polkadot/util": "^3.5.1", "@polkadot/util-crypto": "^3.5.1", "@polkadot/wasm-crypto": "^1.4.1", diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index e24cbd8a0b..d542750fba 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api-contract": "^2.2.1" + "@polkadot/api-contract": "^2.2.2-2" } } diff --git a/packages/page-contracts/src/Codes/Upload.tsx b/packages/page-contracts/src/Codes/Upload.tsx index ad8936256e..7123961eeb 100644 --- a/packages/page-contracts/src/Codes/Upload.tsx +++ b/packages/page-contracts/src/Codes/Upload.tsx @@ -2,9 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { CodeSubmittableResult } from '@polkadot/api-contract/promise/types'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import { CodePromise, CodeSubmittableResult } from '@polkadot/api-contract'; +import { CodePromise } from '@polkadot/api-contract'; import { InputAddress, InputFile, Modal, TxButton } from '@polkadot/react-components'; import { useAccountId, useApi, useNonEmptyString } from '@polkadot/react-hooks'; import { isNull, isWasm } from '@polkadot/util'; @@ -47,7 +48,7 @@ function Upload ({ onClose }: Props): React.ReactElement { ); const _onSuccess = useCallback( - (result: CodeSubmittableResult<'promise'>): void => { + (result: CodeSubmittableResult): void => { result.blueprint && store .saveCode(result.blueprint.codeHash, { abi: JSON.stringify(result.blueprint.abi.json), diff --git a/packages/page-contracts/src/Contracts/Call.tsx b/packages/page-contracts/src/Contracts/Call.tsx index b24c50b734..b57d0c1b7e 100644 --- a/packages/page-contracts/src/Contracts/Call.tsx +++ b/packages/page-contracts/src/Contracts/Call.tsx @@ -8,7 +8,7 @@ import BN from 'bn.js'; import React, { useCallback, useState, useEffect } from 'react'; import styled from 'styled-components'; import { Button, Dropdown, Expander, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; -import { ContractPromise as ApiContract } from '@polkadot/api-contract'; +import { ContractPromise } from '@polkadot/api-contract'; import { useAccountId, useFormField } from '@polkadot/react-hooks'; import { BN_ZERO } from '@polkadot/util'; @@ -20,7 +20,7 @@ import useWeight from '../useWeight'; interface Props { className?: string; - contract: ApiContract; + contract: ContractPromise; messageIndex: number; onChangeCallContractAddress: (address: string | null) => void; onChangeCallMessageIndex: (messageIndex: number) => void; diff --git a/packages/page-contracts/src/Contracts/index.tsx b/packages/page-contracts/src/Contracts/index.tsx index 459cce1ad5..c243f3c753 100644 --- a/packages/page-contracts/src/Contracts/index.tsx +++ b/packages/page-contracts/src/Contracts/index.tsx @@ -5,7 +5,7 @@ import { StringOrNull } from '@polkadot/react-components/types'; import React, { useCallback, useMemo, useRef, useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { ContractPromise as ApiContract } from '@polkadot/api-contract'; +import { ContractPromise } from '@polkadot/api-contract'; import { Table } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; @@ -19,10 +19,10 @@ export interface Props { updated: number; } -function filterContracts (api: ApiPromise, keyringContracts: string[] = []): ApiContract[] { +function filterContracts (api: ApiPromise, keyringContracts: string[] = []): ContractPromise[] { return keyringContracts - .map((address): ApiContract | null => getContractForAddress(api, address.toString())) - .filter((contract: ApiContract | null): contract is ApiContract => !!contract); + .map((address): ContractPromise | null => getContractForAddress(api, address.toString())) + .filter((contract: ContractPromise | null): contract is ContractPromise => !!contract); } function Contracts ({ contracts: keyringContracts }: Props): React.ReactElement { @@ -50,7 +50,7 @@ function Contracts ({ contracts: keyringContracts }: Props): React.ReactElement< ); const _onChangeCallContractAddress = (newCallContractAddress: StringOrNull): void => { - const index = contracts.findIndex(({ address }: ApiContract) => newCallContractAddress === address.toString()); + const index = contracts.findIndex(({ address }) => newCallContractAddress === address.toString()); if (index > -1) { index !== contractIndex && setMessageIndex(0); @@ -81,7 +81,7 @@ function Contracts ({ contracts: keyringContracts }: Props): React.ReactElement< empty={t('No contracts available')} header={headerRef.current} > - {contracts.map((contract: ApiContract, index): React.ReactNode => ( + {contracts.map((contract, index): React.ReactNode => ( ): void => { + (result: BlueprintSubmittableResult): void => { if (result.contract) { keyring.saveContract(result.contract.address.toString(), { contract: { @@ -107,7 +106,7 @@ function Deploy ({ codeHash, constructorIndex = 0, onClose, setConstructorIndex const isValid = isNameValid && isEndowmentValid && weight.isValid && isAccountIdValid; return ( - +