build: web3js update and compilation works

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

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,8 @@
  "@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",
+ "web3-eth-accounts": "4.0.2"
  },
  "engines": {
  "node": ">=10",

packages/cactus-plugin-ledger-connector-ethereum/src/main/json/openapi.json

@@ -217,61 +217,25 @@
  "nullable": false
  },
  "from": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "number"
- }
- ]
+ "type": "string"
  },
  "to": {
- "oneOf": [
- {
- "type": "string"
- }
- ]
+ "type": "string"
  },
  "value": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "number"
- }
- ]
+ "type": "string"
  },
  "gas": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "number"
- }
- ]
+ "type": "string"
  },
  "gasPrice": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "number"
- }
- ]
+ "type": "string"
  },
  "nonce": {
  "type": "number"
  },
  "data": {
- "oneOf": [
- {
- "type": "string"
- }
- ]
+ "type": "string"
  }
  }
  },
@@ -300,7 +264,7 @@
  "pattern": "^0x([A-Fa-f0-9]{64})$"
  },
  "transactionIndex": {
- "type": "number",
+ "type": "string",
  "nullable": false
  },
  "blockHash": {
@@ -310,11 +274,11 @@
  "pattern": "^0x([A-Fa-f0-9]{64})$"
  },
  "blockNumber": {
- "type": "number",
+ "type": "string",
  "nullable": false
  },
  "gasUsed": {
- "type": "number",
+ "type": "string",
  "nullable": false
  },
  "contractAddress": {
@@ -793,9 +757,7 @@
  "additionalProperties": false,
  "properties": {
  "abi": {
- "description": "The application binary interface of the solidity contract",
- "type": "array",
- "items": {}
+ "description": "The application binary interface of the solidity contract"
  },
  "address": {
  "description": "Deployed solidity contract address",
@@ -872,46 +834,28 @@
  "Web3BlockHeader": {
  "type": "object",
  "required": [
- "number",
- "hash",
- "parentHash",
- "nonce",
  "sha3Uncles",
- "logsBloom",
  "transactionRoot",
- "stateRoot",
  "receiptRoot",
- "miner",
- "extraData",
  "gasLimit",
- "gasUsed",
- "timestamp"
+ "gasUsed"
  ],
  "properties": {
  "number": {
- "type": "number"
- },
- "hash": {
  "type": "string"
  },
  "parentHash": {
  "type": "string"
  },
- "nonce": {
- "type": "string"
- },
  "sha3Uncles": {
- "type": "string"
- },
- "logsBloom": {
- "type": "string"
+ "type": "array",
+  "items": {
+  "type": "string"
+ }
  },
  "transactionsRoot": {
  "type": "string"
  },
- "stateRoot": {
- "type": "string"
- },
  "receiptsRoot": {
  "type": "string"
  },
@@ -924,24 +868,14 @@
  "miner": {
  "type": "string"
  },
- "extraData": {
- "type": "string"
- },
  "gasLimit": {
- "type": "integer"
+ "type": "string"
  },
  "gasUsed": {
- "type": "integer"
+ "type": "string"
  },
  "timestamp": {
- "oneOf": [
- {
- "type": "string"
- },
- {
- "type": "number"
- }
- ]
+ "type": "string"
  }
  }
  },
@@ -972,8 +906,7 @@
  "nullable": true
  },
  "blockNumber": {
- "type": "number",
- "nullable": true
+ "type": "string"
  },
  "transactionIndex": {
  "type": "number",

packages/cactus-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,