build: wip

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH · Jul 5, 2023 · f5a9414 · f5a9414
1 parent 752add1
commit f5a9414
Show file tree

Hide file tree

Showing 6 changed files with 736 additions and 347 deletions.
diff --git a/packages/cactus-plugin-ledger-connector-ethereum/package.json b/packages/cactus-plugin-ledger-connector-ethereum/package.json
@@ -73,9 +73,9 @@
  "rxjs": "7.8.1",
  "sanitize-html": "2.7.0",
  "typescript-optional": "2.0.1",
- "web3": "1.10.0",
- "web3-eth-contract": "1.10.0",
- "web3-utils": "1.10.0"
+ "web3": "4.0.2",
+ "web3-eth-contract": "4.0.2",
+ "web3-utils": "4.0.2"
  },
  "devDependencies": {
  "@hyperledger/cactus-plugin-keychain-memory": "2.0.0-alpha.1",
@@ -84,7 +84,7 @@
  "@types/minimist": "1.2.2",
  "@types/sanitize-html": "2.6.2",
  "chalk": "4.1.2",
- "web3-eth": "1.10.0"
+ "web3-eth": "4.0.2"
  },
  "engines": {
  "node": ">=10",

diff --git a/...us-plugin-ledger-connector-ethereum/src/main/typescript/api-client/ethereum-api-client.ts b/...us-plugin-ledger-connector-ethereum/src/main/typescript/api-client/ethereum-api-client.ts
@@ -13,7 +13,7 @@ import {
  WatchBlocksV1Progress,
 } from "../generated/openapi/typescript-axios";
 import { Configuration } from "../generated/openapi/typescript-axios/configuration";
-import { AbiItem } from "web3-utils";
+import { ContractAbi } from "web3";
 
 export class EthereumApiClientOptions extends Configuration {
  readonly logLevel?: LogLevelDesc;
@@ -37,7 +37,7 @@ export type EthereumRequestInputWeb3EthContractMethod = {
 
 // Common input types for sending requests
 export type EthereumRequestInputContract = {
- abi?: AbiItem[];
+ abi?: ContractAbi;
  address?: string;
 };
 export type EthereumRequestInputMethod =
@@ -198,7 +198,7 @@ export class EthereumApiClient
 
  // Prepare input
  const invokeArgs: InvokeRawWeb3EthContractV1Request = {
- abi: contract.abi as AbiItem[],
+ abi: contract.abi as ContractAbi,
  address: contract.address as string,
  invocationType: method.command,
  invocationParams: args,