Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update typescript version to 5 #7272

Open
wants to merge 11 commits into
base: 4.x
Choose a base branch
from
Open
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"typedoc-plugin-markdown": "^3.17.0",
"typedoc-plugin-mdn-links": "^2.0.0",
"typedoc-plugin-merge-modules": "^5.1.0",
"typescript": "^4.7.4",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we are updating at devDependencies, there should be no issues with the braking changes except with our code that I needed to update at few places for the detected issues.

But for the users of our lib there should be, theoretically no issues at all. However, there could be some very edge case that I am not aware of. But according to my search and up to my knowledge, there should be no issues for the users.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

types created as output of build using TS in this PR are fully backward compatible?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to my reading, the generated JavaScript is only affected by the targeted ECMA Script. And for the same ECMA Script, the transpiled code is compatible. I checked few of the generated JavaScript source code and things seems almost identical and 100% compatible.

"typescript": "^5.6.2",
"utf-8-validate": "^5.0.9",
"web3-hardhat-plugin": "^1.0.0",
"webpack": "^5.73.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
"jest-when": "^3.5.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
}
}
1 change: 1 addition & 0 deletions packages/web3-core/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/formatters.ts","./src/index.ts","./src/types.ts","./src/utils.ts","./src/web3_batch_request.ts","./src/web3_config.ts","./src/web3_context.ts","./src/web3_event_emitter.ts","./src/web3_promi_event.ts","./src/web3_request_manager.ts","./src/web3_subscription_manager.ts","./src/web3_subscriptions.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
}
}
1 change: 1 addition & 0 deletions packages/web3-errors/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/error_codes.ts","./src/index.ts","./src/web3_error_base.ts","./src/errors/account_errors.ts","./src/errors/connection_errors.ts","./src/errors/contract_errors.ts","./src/errors/core_errors.ts","./src/errors/ens_errors.ts","./src/errors/generic_errors.ts","./src/errors/provider_errors.ts","./src/errors/response_errors.ts","./src/errors/rpc_error_messages.ts","./src/errors/rpc_errors.ts","./src/errors/schema_errors.ts","./src/errors/signature_errors.ts","./src/errors/transaction_errors.ts","./src/errors/utils_errors.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-abi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"jest-when": "^3.5.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
}
}
1 change: 1 addition & 0 deletions packages/web3-eth-abi/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/decode_contract_error_data.ts","./src/eip_712.ts","./src/index.ts","./src/utils.ts","./src/api/errors_api.ts","./src/api/events_api.ts","./src/api/functions_api.ts","./src/api/logs_api.ts","./src/api/parameters_api.ts","./src/coders/decode.ts","./src/coders/encode.ts","./src/coders/types.ts","./src/coders/utils.ts","./src/coders/base/address.ts","./src/coders/base/array.ts","./src/coders/base/bool.ts","./src/coders/base/bytes.ts","./src/coders/base/index.ts","./src/coders/base/number.ts","./src/coders/base/numbersLimits.ts","./src/coders/base/string.ts","./src/coders/base/tuple.ts","./src/coders/base/utils.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"jest-when": "^3.5.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-providers-ipc": "^4.0.7"
},
"dependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/web3-eth-accounts/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/account.ts","./src/index.ts","./src/schemas.ts","./src/types.ts","./src/wallet.ts","./src/common/common.ts","./src/common/enums.ts","./src/common/index.ts","./src/common/types.ts","./src/common/utils.ts","./src/common/chains/goerli.ts","./src/common/chains/mainnet.ts","./src/common/chains/sepolia.ts","./src/common/eips/1153.ts","./src/common/eips/1559.ts","./src/common/eips/2315.ts","./src/common/eips/2537.ts","./src/common/eips/2565.ts","./src/common/eips/2718.ts","./src/common/eips/2929.ts","./src/common/eips/2930.ts","./src/common/eips/3074.ts","./src/common/eips/3198.ts","./src/common/eips/3529.ts","./src/common/eips/3540.ts","./src/common/eips/3541.ts","./src/common/eips/3554.ts","./src/common/eips/3607.ts","./src/common/eips/3651.ts","./src/common/eips/3670.ts","./src/common/eips/3675.ts","./src/common/eips/3855.ts","./src/common/eips/3860.ts","./src/common/eips/4345.ts","./src/common/eips/4399.ts","./src/common/eips/4844.ts","./src/common/eips/4895.ts","./src/common/eips/5133.ts","./src/common/eips/index.ts","./src/common/hardforks/arrowGlacier.ts","./src/common/hardforks/berlin.ts","./src/common/hardforks/byzantium.ts","./src/common/hardforks/chainstart.ts","./src/common/hardforks/constantinople.ts","./src/common/hardforks/dao.ts","./src/common/hardforks/grayGlacier.ts","./src/common/hardforks/homestead.ts","./src/common/hardforks/index.ts","./src/common/hardforks/istanbul.ts","./src/common/hardforks/london.ts","./src/common/hardforks/merge.ts","./src/common/hardforks/mergeForkIdTransition.ts","./src/common/hardforks/muirGlacier.ts","./src/common/hardforks/petersburg.ts","./src/common/hardforks/shanghai.ts","./src/common/hardforks/sharding.ts","./src/common/hardforks/spuriousDragon.ts","./src/common/hardforks/tangerineWhistle.ts","./src/tx/address.ts","./src/tx/baseTransaction.ts","./src/tx/constants.ts","./src/tx/eip1559Transaction.ts","./src/tx/eip2930Transaction.ts","./src/tx/index.ts","./src/tx/legacyTransaction.ts","./src/tx/transactionFactory.ts","./src/tx/types.ts","./src/tx/utils.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-contract/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-eth-accounts": "^4.2.0",
"web3-providers-ws": "^4.0.8"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/web3-eth-contract/src/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@
const options =
// eslint-disable-next-line no-nested-ternary
typeof param1 !== 'string' && !isDataFormat(param1)
? param1
? (param1 as Omit<Filter, 'address'>)
: !isDataFormat(param2)
? param2
: {};
Expand All @@ -939,7 +939,7 @@
) as AbiEventFragment & { signature: string });

if (!abi) {
throw new Web3ContractError(`Event ${eventName} not found.`);
throw new Web3ContractError(`Event ${String(eventName)} not found.`);

Check warning on line 942 in packages/web3-eth-contract/src/contract.ts

View check run for this annotation

Codecov / codecov/patch

packages/web3-eth-contract/src/contract.ts#L942

Added line #L942 was not covered by tests
}

const { fromBlock, toBlock, topics, address } = encodeEventABI(
Expand Down Expand Up @@ -1043,11 +1043,11 @@

// make constant and payable backwards compatible
abi.constant =
abi.stateMutability === 'view' ??
abi.stateMutability === 'pure' ??
abi.stateMutability === 'view' ||
abi.stateMutability === 'pure' ||
abi.constant;

abi.payable = abi.stateMutability === 'payable' ?? abi.payable;
abi.payable = abi.stateMutability === 'payable' || abi.payable;
this._overloadedMethodAbis.set(abi.name, [
...(this._overloadedMethodAbis.get(abi.name) ?? []),
abi,
Expand Down
1 change: 1 addition & 0 deletions packages/web3-eth-contract/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/constant.ts","./src/contract-deployer-method-class.ts","./src/contract.ts","./src/encoding.ts","./src/index.ts","./src/log_subscription.ts","./src/types.ts","./src/utils.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-ens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"@adraffy/ens-normalize": "^1.8.8",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-eth-ens/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/config.ts","./src/ens.ts","./src/index.ts","./src/registry.ts","./src/resolver.ts","./src/utils.ts","./src/abi/ens/ENSRegistry.ts","./src/abi/ens/PublicResolver.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-iban/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"web3-errors": "^1.1.3",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-eth-iban/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/iban.ts","./src/index.ts","./src/types.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth-personal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-providers-ws": "^4.0.8"
}
}
1 change: 1 addition & 0 deletions packages/web3-eth-personal/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/index.ts","./src/personal.ts","./src/rpc_method_wrappers.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-eth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-providers-http": "^4.2.0"
},
"dependencies": {
Expand Down
12 changes: 7 additions & 5 deletions packages/web3-eth/src/rpc_method_wrappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -598,11 +598,13 @@ export function sendTransaction<
transaction = await transactionMiddleware.processTransaction(transaction);
}

let transactionFormatted:
let transactionFormatted: FormatType<
| Transaction
| TransactionWithFromLocalWalletIndex
| TransactionWithToLocalWalletIndex
| TransactionWithFromAndToLocalWalletIndex = formatTransaction(
| TransactionWithFromAndToLocalWalletIndex,
ReturnFormat
> = formatTransaction(
{
...transaction,
from: getTransactionFromOrToAttr('from', web3Context, transaction),
Expand All @@ -612,13 +614,13 @@ export function sendTransaction<
{
transactionSchema: web3Context.config.customTransactionSchema,
},
);
) as FormatType<Transaction, ReturnFormat>;

try {
transactionFormatted = await sendTxHelper.populateGasPrice({
transactionFormatted = (await sendTxHelper.populateGasPrice({
transaction,
transactionFormatted,
});
})) as FormatType<Transaction, ReturnFormat>;

await sendTxHelper.checkRevertBeforeSending(
transactionFormatted as TransactionCall,
Expand Down
19 changes: 15 additions & 4 deletions packages/web3-eth/src/utils/send_tx_helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
import { ethRpcMethods } from 'web3-rpc-methods';

import {
InternalTransaction,
SendSignedTransactionEvents,
SendTransactionEvents,
SendTransactionOptions,
Expand Down Expand Up @@ -150,7 +151,12 @@ export class SendTxHelper<

public emitSending(tx: TxType | HexString) {
if (this.promiEvent.listenerCount('sending') > 0) {
this.promiEvent.emit('sending', tx);
this.promiEvent.emit(
'sending',
tx as
| SendSignedTransactionEvents<ReturnFormat>['sending']
| SendTransactionEvents<ReturnFormat>['sending'],
);
}
}

Expand All @@ -173,7 +179,7 @@ export class SendTxHelper<
// @TODO gasPrice, maxPriorityFeePerGas, maxFeePerGas
// should not be included if undefined, but currently are
...(await getTransactionGasPricing(
transactionFormatted,
transactionFormatted as InternalTransaction,
this.web3Context,
ETH_DATA_FORMAT,
)),
Expand All @@ -191,7 +197,7 @@ export class SendTxHelper<
tx: TxType;
}) {
if (wallet) {
const signedTransaction = await wallet.signTransaction(tx);
const signedTransaction = await wallet.signTransaction(tx as Transaction);

return trySendTransaction(
this.web3Context,
Expand All @@ -215,7 +221,12 @@ export class SendTxHelper<

public emitSent(tx: TxType | HexString) {
if (this.promiEvent.listenerCount('sent') > 0) {
this.promiEvent.emit('sent', tx);
this.promiEvent.emit(
'sent',
tx as
| SendSignedTransactionEvents<ReturnFormat>['sent']
| SendTransactionEvents<ReturnFormat>['sent'],
);
}
}
public emitTransactionHash(hash: string & Uint8Array) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function watchTransactionForConfirmations<
returnFormat,
),
latestBlockHash: format({ format: 'bytes32' }, transactionReceipt.blockHash, returnFormat),
});
} as Web3PromiEventEventType['confirmation']);

// so a subscription for newBlockHeaders can be made instead of polling
const provider: Web3BaseProvider = web3Context.requestManager.provider as Web3BaseProvider;
Expand Down
4 changes: 2 additions & 2 deletions packages/web3-eth/src/web3_eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1846,8 +1846,8 @@ export class Web3Eth extends Web3Context<Web3EthExecutionAPI, RegisteredSubscrip
subscription instanceof LogsSubscription &&
name === 'logs' &&
typeof args === 'object' &&
!isNullish(args.fromBlock) &&
Number.isFinite(Number(args.fromBlock))
!isNullish((args as { fromBlock?: BlockNumberOrTag }).fromBlock) &&
Number.isFinite(Number((args as { fromBlock?: BlockNumberOrTag }).fromBlock))
) {
setImmediate(() => {
this.getPastLogs(args)
Expand Down
1 change: 1 addition & 0 deletions packages/web3-eth/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/constants.ts","./src/index.ts","./src/rpc_method_wrappers.ts","./src/schemas.ts","./src/types.ts","./src/validation.ts","./src/web3_eth.ts","./src/web3_subscriptions.ts","./src/utils/decode_signed_transaction.ts","./src/utils/decoding.ts","./src/utils/detect_transaction_type.ts","./src/utils/format_transaction.ts","./src/utils/get_revert_reason.ts","./src/utils/get_transaction_error.ts","./src/utils/get_transaction_gas_pricing.ts","./src/utils/index.ts","./src/utils/prepare_transaction_for_signing.ts","./src/utils/reject_if_block_timeout.ts","./src/utils/send_tx_helper.ts","./src/utils/transaction_builder.ts","./src/utils/try_send_transaction.ts","./src/utils/wait_for_transaction_receipt.ts","./src/utils/watch_transaction_by_polling.ts","./src/utils/watch_transaction_by_subscription.ts","./src/utils/watch_transaction_for_confirmations.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-net/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"web3-core": "^4.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-net/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/index.ts","./src/net.ts","./src/rpc_method_wrappers.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-providers-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"jest-fetch-mock": "^3.0.3",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"cross-fetch": "^4.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-providers-http/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/index.ts","./src/types.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-providers-ipc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"web3-errors": "^1.1.3",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-providers-ipc/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/index.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-providers-ws/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-providers-http": "^4.1.0"
},
"dependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/web3-providers-ws/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/index.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-rpc-methods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"web3-core": "^4.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-rpc-methods/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/errors.ts","./src/eth_rpc_methods.ts","./src/index.ts","./src/net_rpc_methods.ts","./src/personal_rpc_methods.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-rpc-providers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"web3-errors": "^1.3.0",
Expand Down
1 change: 1 addition & 0 deletions packages/web3-rpc-providers/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/errors.ts","./src/index.ts","./src/types.ts","./src/web3_provider.ts","./src/web3_provider_quicknode.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
}
}
1 change: 1 addition & 0 deletions packages/web3-types/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/data_format_types.ts","./src/error_types.ts","./src/eth_abi_types.ts","./src/eth_contract_types.ts","./src/eth_types.ts","./src/index.ts","./src/json_rpc_types.ts","./src/primitives_types.ts","./src/utility_types.ts","./src/web3_api_types.ts","./src/web3_base_provider.ts","./src/web3_base_wallet.ts","./src/web3_deferred_promise_type.ts","./src/apis/eth_execution_api.ts","./src/apis/eth_personal_api.ts","./src/apis/web3_eth_execution_api.ts","./src/apis/web3_net_api.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"js-sha3": "^0.8.0",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
},
"dependencies": {
"ethereum-cryptography": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/web3-utils/src/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ export const compareBlockNumbers = (blockA: BlockNumberOrTag, blockB: BlockNumbe
) {
return 0;
}
if (blockA === 'earliest' && blockB > 0) {
Muhammad-Altabba marked this conversation as resolved.
Show resolved Hide resolved
if (blockA === 'earliest') {
return -1;
}
if (blockB === 'earliest' && blockA > 0) {
if (blockB === 'earliest') {
return 1;
}

Expand Down
1 change: 1 addition & 0 deletions packages/web3-utils/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/chunk_response_parser.ts","./src/converters.ts","./src/event_emitter.ts","./src/formatter.ts","./src/hash.ts","./src/index.ts","./src/json_rpc.ts","./src/objects.ts","./src/promise_helpers.ts","./src/random.ts","./src/socket_provider.ts","./src/string_manipulation.ts","./src/uint8array.ts","./src/uuid.ts","./src/validation.ts","./src/web3_deferred_promise.ts","./src/web3_eip1193_provider.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3-validator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4"
"typescript": "^5.6.2"
}
}
1 change: 1 addition & 0 deletions packages/web3-validator/tsconfig.types.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":["./src/constants.ts","./src/default_validator.ts","./src/errors.ts","./src/formats.ts","./src/index.ts","./src/types.ts","./src/utils.ts","./src/validator.ts","./src/web3_validator.ts","./src/validation/abi.ts","./src/validation/address.ts","./src/validation/block.ts","./src/validation/bloom.ts","./src/validation/boolean.ts","./src/validation/bytes.ts","./src/validation/eth.ts","./src/validation/filter.ts","./src/validation/index.ts","./src/validation/numbers.ts","./src/validation/object.ts","./src/validation/string.ts","./src/validation/topic.ts"],"version":"5.6.2"}
2 changes: 1 addition & 1 deletion packages/web3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"jest-extended": "^3.0.1",
"prettier": "^2.7.1",
"ts-jest": "^29.1.1",
"typescript": "^4.7.4",
"typescript": "^5.6.2",
"web3-providers-ipc": "^4.0.7"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/web3/test/benchmark/processingContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
import { AbiFunctionFragment, ContractOptions } from 'web3-types';
import { AbiConstructorFragment, AbiFunctionFragment, ContractOptions } from 'web3-types';
// eslint-disable-next-line
import { getSendTxParams, getEthTxCallParams } from 'web3-eth-contract';
import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
import accounts from '../shared_fixtures/accounts.json';

const abiConstructor = BasicAbi.find(j => j.type === 'constructor') as AbiFunctionFragment;
const abiConstructor = BasicAbi.find(j => j.type === 'constructor') as AbiConstructorFragment;
const abiSendMethod = BasicAbi.find(
j => j.type === 'function' && j.name === 'firesMultiValueEvent',
) as AbiFunctionFragment;
Expand Down
Loading
Loading