Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 796660d

Browse files
fix: type errors
1 parent 7361a79 commit 796660d

File tree

5 files changed

+24
-10
lines changed

5 files changed

+24
-10
lines changed

packages/web3-core/src/web3_context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import { ExtensionObject, RequestManagerMiddleware } from './types.js';
3636
import { Web3BatchRequest } from './web3_batch_request.js';
3737
// eslint-disable-next-line import/no-cycle
3838
import { Web3Config, Web3ConfigEvent, Web3ConfigOptions } from './web3_config.js';
39+
// eslint-disable-next-line import/no-cycle
3940
import { Web3RequestManager } from './web3_request_manager.js';
4041
import { Web3SubscriptionConstructor } from './web3_subscriptions.js';
4142
import { Web3SubscriptionManager } from './web3_subscription_manager.js';

packages/web3-core/src/web3_request_manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import {
5353
} from './utils.js';
5454
import { Web3EventEmitter } from './web3_event_emitter.js';
5555
import { RequestManagerMiddleware } from './types.js';
56-
import { Web3ConfigOptions } from './web3_config.js';
56+
import { type Web3ConfigOptions } from './web3_config.js';
5757

5858
export enum Web3RequestManagerEvent {
5959
PROVIDER_CHANGED = 'PROVIDER_CHANGED',

packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
66
"config": {
77
"blockHeaderTimeout": 10,
88
"contractDataInputFill": "data",
9+
"customTransactionSchema": undefined,
910
"defaultAccount": undefined,
1011
"defaultBlock": "latest",
1112
"defaultChain": "mainnet",
@@ -73,6 +74,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
7374
"clientUrl": "http://test/abc",
7475
"httpProviderOptions": undefined,
7576
},
77+
"config": {},
7678
"useRpcCallSpecification": undefined,
7779
},
7880
"subscriptionManager": Web3SubscriptionManager {
@@ -108,6 +110,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
108110
"clientUrl": "http://test/abc",
109111
"httpProviderOptions": undefined,
110112
},
113+
"config": {},
111114
"useRpcCallSpecification": undefined,
112115
},
113116
"tolerateUnlinkedSubscription": false,

packages/web3-eth/test/fixtures/format_transaction.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ export const numbersAsBigIntTransaction: FormatType<
210210
s: '0x7e1941b264348e80c78c4027afc65a87b0a5e43e86742b8ca0823584c6788fd0',
211211
};
212212

213+
export type CustomFieldTransaction = Transaction & { feeCurrency: `0x${string}` };
213214
export const customFieldTransaction: FormatType<
214-
Transaction,
215+
CustomFieldTransaction,
215216
{ number: FMT_NUMBER.BIGINT; bytes: typeof DEFAULT_RETURN_FORMAT.bytes }
216217
> = {
217218
from: '0xEB014f8c8B418Db6b45774c326A0E64C78914dC0',

packages/web3-eth/test/unit/format_transaction.test.ts

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
numbersAsNumberTransaction,
2727
bytesAsUint8ArrayTransaction,
2828
customFieldTransaction,
29+
CustomFieldTransaction,
2930
} from '../fixtures/format_transaction';
3031
import { objectBigintToString } from '../fixtures/system_test_utils';
3132
import { transactionSchema } from '../../src';
@@ -120,17 +121,25 @@ describe('formatTransaction', () => {
120121
});
121122

122123
it('Accepts a custom schema', () => {
123-
expect(formatTransaction(customFieldTransaction).feeCurrency).toBeUndefined();
124124
expect(
125-
formatTransaction(customFieldTransaction, undefined, {
126-
transactionSchema: {
127-
...transactionSchema,
128-
properties: {
129-
...transactionSchema.properties,
130-
feeCurrency: 'address',
125+
formatTransaction<typeof DEFAULT_RETURN_FORMAT, CustomFieldTransaction>(
126+
customFieldTransaction,
127+
).feeCurrency,
128+
).toBeUndefined();
129+
expect(
130+
formatTransaction<typeof DEFAULT_RETURN_FORMAT, CustomFieldTransaction>(
131+
customFieldTransaction,
132+
undefined,
133+
{
134+
transactionSchema: {
135+
...transactionSchema,
136+
properties: {
137+
...transactionSchema.properties,
138+
feeCurrency: { format: 'address' },
139+
},
131140
},
132141
},
133-
}).feeCurrency,
142+
).feeCurrency,
134143
).toBeDefined();
135144
});
136145
});

0 commit comments

Comments
 (0)