Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1261545
:art: Update the code for small fixes
nazarhussain Jun 13, 2022
24b54df
Merge branch '4.x' into nh/5125-4.x-refactor
nazarhussain Jun 13, 2022
2e8eb6e
:white_check_mark: Update failing tests
nazarhussain Jun 13, 2022
b527ca8
:white_check_mark: Fix failing tests
nazarhussain Jun 13, 2022
57e6755
:art: Add version attribute to 'Web3' class
nazarhussain Jun 14, 2022
c0757de
:truck: Rename the misused promievent names
nazarhussain Jun 14, 2022
f785298
:pencil2: Fix the typos in tests
nazarhussain Jun 14, 2022
da0e926
Merge branch '4.x' into nh/5125-4.x-refactor
nazarhussain Jun 14, 2022
ed1708c
:pencil2: Fix some typo in tests files
nazarhussain Jun 14, 2022
6e74b6c
:art: Improve the code as per feedback
nazarhussain Jun 14, 2022
c9f593a
:art: Improve code with feedback
nazarhussain Jun 14, 2022
257f127
:art: Fix some typo in refactoring
nazarhussain Jun 14, 2022
15b8640
:building_construction: Update the default return format to bigint
nazarhussain Jun 14, 2022
ec3716c
:test_tube: Fix few eth tests
nazarhussain Jun 14, 2022
3321461
:white_check_mark: Fix all tests for web3-eth
nazarhussain Jun 15, 2022
3bfa8a5
:art: Add more test cases for the validator
nazarhussain Jun 15, 2022
d080142
:white_check_mark: Fix tests for eth-personal
nazarhussain Jun 15, 2022
baed875
:white_check_mark: Fix contracts tests
nazarhussain Jun 15, 2022
8634f35
:sparkles: Add optional provider support to web3
nazarhussain Jun 16, 2022
d7a9d08
:sparkles: Add optional provider support to web3
nazarhussain Jun 16, 2022
3df05e8
Merge branch 'nh/5125-optional-constructor' of https://github.com/Cha…
nazarhussain Jun 16, 2022
6e70f7b
Merge branch '4.x' into nh/5125-optional-constructor
nazarhussain Jun 21, 2022
d1e27e5
Merge branch 'nh/5125-optional-constructor' of https://github.com/Cha…
nazarhussain Jun 21, 2022
6ea54d0
:art: Fix some merge issues
nazarhussain Jun 21, 2022
4e35a8a
:white_check_mark: Update unit tests for web3-core
nazarhussain Jun 21, 2022
f72587c
:art: Add more integration tests for web3
nazarhussain Jun 21, 2022
c0b14a3
:coffin: Fix dead code caused by merge
nazarhussain Jun 21, 2022
8379c18
:bug: Update a provider init logic
nazarhussain Jun 21, 2022
ae0ef3d
:art: Update test snapshots
nazarhussain Jun 21, 2022
8832f3e
:art: Update the eth constructor logic to inject subscriptions
nazarhussain Jun 22, 2022
fa8e0a0
:white_check_mark: Add more tests for web3 instance
nazarhussain Jun 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web3-core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const isLegacySendAsyncProvider = <API extends Web3APISpec>(

export const isSupportedProvider = <API extends Web3APISpec>(
provider: SupportedProviders<API>,
): boolean =>
): provider is SupportedProviders<API> =>
Web3BaseProvider.isWeb3Provider(provider) ||
isLegacyRequestProvider(provider) ||
isLegacySendAsyncProvider(provider) ||
Expand Down
33 changes: 20 additions & 13 deletions packages/web3-core/src/web3_context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
Web3BaseWalletAccount,
Web3AccountProvider,
} from 'web3-common';
import { HexString } from 'web3-utils';
import { HexString, isNullish } from 'web3-utils';
import { SupportedProviders } from './types';
import { isSupportedProvider } from './utils';
// eslint-disable-next-line import/no-cycle
Expand All @@ -41,7 +41,7 @@ export type Web3ContextObject<
} = any,
> = {
config: Web3ConfigOptions;
provider: SupportedProviders<API>;
provider?: SupportedProviders<API> | string;
requestManager: Web3RequestManager<API>;
subscriptionManager?: Web3SubscriptionManager<API, RegisteredSubs> | undefined;
registeredSubscriptions?: RegisteredSubs;
Expand All @@ -59,7 +59,7 @@ export type Web3ContextInitOptions<
} = any,
> = {
config?: Partial<Web3ConfigOptions>;
provider: SupportedProviders<API> | string;
provider?: SupportedProviders<API> | string;
requestManager?: Web3RequestManager<API>;
subscriptionManager?: Web3SubscriptionManager<API, RegisteredSubs> | undefined;
registeredSubscriptions?: RegisteredSubs;
Expand Down Expand Up @@ -99,17 +99,24 @@ export class Web3Context<

public constructor(
providerOrContext?:
| string
| SupportedProviders<API>
| Web3ContextInitOptions<API, RegisteredSubs>
| string,
| Web3ContextInitOptions<API, RegisteredSubs>,
) {
super();

// If "providerOrContext" is provided as "string" or an objects matching "SupportedProviders" interface
if (
typeof providerOrContext === 'string' ||
isNullish(providerOrContext) ||
(typeof providerOrContext === 'string' && providerOrContext.trim() !== '') ||
isSupportedProvider(providerOrContext as SupportedProviders<API>)
) {
this._requestManager = new Web3RequestManager<API>(
providerOrContext as SupportedProviders<API>,
providerOrContext as undefined | string | SupportedProviders<API>,
);
this._subscriptionManager = new Web3SubscriptionManager(
this._requestManager,
{} as RegisteredSubs,
);

return;
Expand All @@ -123,7 +130,7 @@ export class Web3Context<
registeredSubscriptions,
accountProvider,
wallet,
} = providerOrContext as Partial<Web3ContextObject<API, RegisteredSubs>>;
} = providerOrContext as Web3ContextInitOptions<API, RegisteredSubs>;

this.setConfig(config ?? {});

Expand Down Expand Up @@ -229,19 +236,19 @@ export class Web3Context<
});
}

public get provider(): SupportedProviders<API> {
public get provider(): SupportedProviders<API> | string | undefined {
return this.requestManager.provider;
}

public set provider(provider: SupportedProviders<API> | string) {
public set provider(provider: SupportedProviders<API> | string | undefined) {
this.requestManager.setProvider(provider);
}

public get currentProvider(): SupportedProviders<API> {
public get currentProvider(): SupportedProviders<API> | string | undefined {
return this.requestManager.provider;
}

public set currentProvider(provider: SupportedProviders<API> | string) {
public set currentProvider(provider: SupportedProviders<API> | string | undefined) {
this.requestManager.setProvider(provider);
}

Expand All @@ -250,7 +257,7 @@ export class Web3Context<
return Web3Context.givenProvider;
}

public setProvider(provider: SupportedProviders<API>) {
public setProvider(provider?: SupportedProviders<API> | string) {
this.provider = provider;
}

Expand Down
30 changes: 18 additions & 12 deletions packages/web3-core/src/web3_request_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
Web3APIRequest,
Web3APIReturnType,
Web3APISpec,
Web3BaseProvider,
Web3EventEmitter,
} from 'web3-common';
import HttpProvider from 'web3-providers-http';
Expand Down Expand Up @@ -60,14 +59,14 @@ const availableProviders = {
export class Web3RequestManager<
API extends Web3APISpec = EthExecutionAPI,
> extends Web3EventEmitter<{
[key in Web3RequestManagerEvent]: SupportedProviders<API>;
[key in Web3RequestManagerEvent]: SupportedProviders<API> | undefined;
}> {
private _provider!: SupportedProviders<API>;
private _provider?: SupportedProviders<API>;

public constructor(provider?: SupportedProviders<API> | string, net?: Socket) {
super();

if (provider) {
if (!isNullish(provider)) {
this.setProvider(provider, net);
}
}
Expand All @@ -77,10 +76,6 @@ export class Web3RequestManager<
}

public get provider() {
if (!this._provider) {
throw new ProviderError('Provider not available');
}

return this._provider;
}

Expand All @@ -89,8 +84,8 @@ export class Web3RequestManager<
return availableProviders;
}

public setProvider(provider: SupportedProviders<API> | string, net?: Socket) {
let newProvider!: Web3BaseProvider<API>;
public setProvider(provider?: SupportedProviders<API> | string, net?: Socket) {
let newProvider: SupportedProviders<API> | undefined;

// autodetect provider
if (provider && typeof provider === 'string' && this.providers) {
Expand All @@ -106,12 +101,17 @@ export class Web3RequestManager<
} else if (typeof net === 'object' && typeof net.connect === 'function') {
newProvider = new this.providers.IpcProvider<API>(provider, net);
} else {
throw new ProviderError(`Can't autodetect provider for "${provider}'"`);
throw new ProviderError(`Can't autodetect provider for "${provider}"`);
}
} else if (isNullish(provider)) {
// In case want to unset the provider
newProvider = undefined;
} else {
newProvider = provider as SupportedProviders<API>;
}

this.emit(Web3RequestManagerEvent.BEFORE_PROVIDER_CHANGE, this._provider);
this._provider = newProvider ?? provider;
this._provider = newProvider;
this.emit(Web3RequestManagerEvent.PROVIDER_CHANGED, this._provider);
}

Expand Down Expand Up @@ -142,6 +142,12 @@ export class Web3RequestManager<
): Promise<JsonRpcResponse<ResponseType>> {
const { provider } = this;

if (isNullish(provider)) {
throw new ProviderError(
'Provider not available. Use `.setProvider` or `.provider=` to initialize the provider.',
);
}

const payload = jsonRpc.isBatchRequest(request)
? jsonRpc.toBatchPayload(request)
: jsonRpc.toPayload(request);
Expand Down
4 changes: 3 additions & 1 deletion packages/web3-core/src/web3_subscription_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ export class Web3SubscriptionManager<
}

public supportsSubscriptions(): boolean {
return isSupportSubscriptions(this.requestManager.provider);
return isNullish(this.requestManager.provider)
? false
: isSupportSubscriptions(this.requestManager.provider);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ Object {
"IpcProvider": [Function],
"WebsocketProvider": [Function],
},
"registeredSubscriptions": undefined,
"registeredSubscriptions": Object {},
"requestManager": Web3RequestManager {
"_emitter": EventEmitter {
"_events": Object {},
"_eventsCount": 0,
"_events": Object {
"BEFORE_PROVIDER_CHANGE": [Function],
"PROVIDER_CHANGED": [Function],
},
"_eventsCount": 2,
"_maxListeners": undefined,
Symbol(kCapture): false,
},
Expand All @@ -46,7 +49,25 @@ Object {
"httpProviderOptions": undefined,
},
},
"subscriptionManager": undefined,
"subscriptionManager": Web3SubscriptionManager {
"_subscriptions": Map {},
"registeredSubscriptions": Object {},
"requestManager": Web3RequestManager {
"_emitter": EventEmitter {
"_events": Object {
"BEFORE_PROVIDER_CHANGE": [Function],
"PROVIDER_CHANGED": [Function],
},
"_eventsCount": 2,
"_maxListeners": undefined,
Symbol(kCapture): false,
},
"_provider": HttpProvider {
"clientUrl": "http://test/abc",
"httpProviderOptions": undefined,
},
},
},
"wallet": undefined,
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('Web3RequestManager', () => {
const manager = new Web3RequestManager();

expect(() => manager.setProvider(providerString)).toThrow(
`Can't autodetect provider for "pc://mydomain.com'"`,
`Can't autodetect provider for "pc://mydomain.com"`,
);
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-eth-contract/src/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export class Contract<Abi extends ContractAbi>
super({
...context,
// Pass an empty string to avoid type issue. Error will be thrown from underlying validation
provider: options?.provider ?? context?.provider ?? Contract.givenProvider ?? '',
provider: options?.provider ?? context?.provider ?? Contract.givenProvider,
registeredSubscriptions: {
logs: LogsSubscription,
newHeads: NewHeadsSubscription,
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-eth-contract/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export interface ContractInitOptions {
readonly from?: Address;
readonly data?: Bytes;
readonly gasLimit?: Uint;
readonly provider: SupportedProviders<EthExecutionAPI> | string;
readonly provider?: SupportedProviders<EthExecutionAPI> | string;
}

export type TransactionReceipt = ReceiptInfo;
Expand Down
57 changes: 37 additions & 20 deletions packages/web3-eth/src/web3_eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ along with web3.js. If not, see <http://www.gnu.org/licenses/>.
// Disabling because returnTypes must be last param to match 1.x params
/* eslint-disable default-param-last */
import { DataFormat, DEFAULT_RETURN_FORMAT } from 'web3-common';
import { SupportedProviders, Web3Context, Web3ContextInitOptions } from 'web3-core';
import {
isSupportedProvider,
SupportedProviders,
Web3Context,
Web3ContextInitOptions,
} from 'web3-core';
import {
Address,
Bytes,
Expand Down Expand Up @@ -53,28 +58,40 @@ type RegisteredSubscription = {
syncing: typeof SyncingSubscription;
};

const registeredSubscriptions = {
logs: LogsSubscription,
newPendingTransactions: NewPendingTransactionsSubscription,
newHeads: NewHeadsSubscription,
syncing: SyncingSubscription,
pendingTransactions: NewPendingTransactionsSubscription, // the same as newPendingTransactions. just for support API like in version 1.x
newBlockHeaders: NewHeadsSubscription, // the same as newHeads. just for support API like in version 1.x
};

export class Web3Eth extends Web3Context<Web3EthExecutionAPI, RegisteredSubscription> {
public constructor(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
providerOrContext: SupportedProviders<any> | Web3ContextInitOptions | string,
providerOrContext?: SupportedProviders<any> | Web3ContextInitOptions | string,
) {
super(
typeof providerOrContext === 'object' &&
(providerOrContext as Web3ContextInitOptions).provider
? providerOrContext
: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
provider: providerOrContext as SupportedProviders<any>,
registeredSubscriptions: {
logs: LogsSubscription,
newPendingTransactions: NewPendingTransactionsSubscription,
newHeads: NewHeadsSubscription,
syncing: SyncingSubscription,
pendingTransactions: NewPendingTransactionsSubscription, // the same as newPendingTransactions. just for support API like in version 1.x
newBlockHeaders: NewHeadsSubscription, // the same as newHeads. just for support API like in version 1.x
},
},
);
if (
typeof providerOrContext === 'string' ||
isSupportedProvider(providerOrContext as SupportedProviders<any>)
) {
super({
provider: providerOrContext as SupportedProviders<any>,
registeredSubscriptions,
});

return;
}

if ((providerOrContext as Web3ContextInitOptions).registeredSubscriptions) {
super(providerOrContext as Web3ContextInitOptions);
return;
}

super({
...(providerOrContext as Web3ContextInitOptions),
registeredSubscriptions,
});
}
public async getProtocolVersion() {
return rpcMethods.getProtocolVersion(this.requestManager);
Expand Down
1 change: 1 addition & 0 deletions packages/web3-validator/src/validation/numbers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const isUInt = (
) {
return false;
}

let size!: number;

if (options?.abiType) {
Expand Down
9 changes: 5 additions & 4 deletions packages/web3/src/web3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ export class Web3 extends Web3Context<EthExecutionAPI> {
Personal,
};

public utils: typeof utils;

public eth: Web3Eth & {
Iban: typeof Iban;
ens: ENS;
utils: typeof utils;
net: Net;
personal: Personal;
Contract: typeof Contract & {
Expand Down Expand Up @@ -93,7 +94,7 @@ export class Web3 extends Web3Context<EthExecutionAPI> {
};
};

public constructor(provider: SupportedProviders<EthExecutionAPI> | string) {
public constructor(provider?: SupportedProviders<EthExecutionAPI> | string) {
const accountProvider = {
create,
privateKeyToAccount,
Expand All @@ -108,6 +109,8 @@ export class Web3 extends Web3Context<EthExecutionAPI> {

super({ provider, wallet, accountProvider });

this.utils = utils;

// Have to use local alias to initiate contract context
// eslint-disable-next-line @typescript-eslint/no-this-alias
const self = this;
Expand Down Expand Up @@ -146,8 +149,6 @@ export class Web3 extends Web3Context<EthExecutionAPI> {
net: self.use(Net),
personal: self.use(Personal),

utils,

// Contract helper and module
Contract: ContractBuilder,

Expand Down
Loading