fix: type errors

web3 · Sep 6, 2024 · 796660d · 796660d
1 parent 7361a79
commit 796660d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/packages/web3-core/src/web3_context.ts b/packages/web3-core/src/web3_context.ts
@@ -36,6 +36,7 @@ import { ExtensionObject, RequestManagerMiddleware } from './types.js';
 import { Web3BatchRequest } from './web3_batch_request.js';
 // eslint-disable-next-line import/no-cycle
 import { Web3Config, Web3ConfigEvent, Web3ConfigOptions } from './web3_config.js';
+// eslint-disable-next-line import/no-cycle
 import { Web3RequestManager } from './web3_request_manager.js';
 import { Web3SubscriptionConstructor } from './web3_subscriptions.js';
 import { Web3SubscriptionManager } from './web3_subscription_manager.js';

diff --git a/packages/web3-core/src/web3_request_manager.ts b/packages/web3-core/src/web3_request_manager.ts
@@ -53,7 +53,7 @@ import {
 } from './utils.js';
 import { Web3EventEmitter } from './web3_event_emitter.js';
 import { RequestManagerMiddleware } from './types.js';
-import { Web3ConfigOptions } from './web3_config.js';
+import { type Web3ConfigOptions } from './web3_config.js';
 
 export enum Web3RequestManagerEvent {
 	PROVIDER_CHANGED = 'PROVIDER_CHANGED',

diff --git a/packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap b/packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap
@@ -6,6 +6,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
   "config": {
     "blockHeaderTimeout": 10,
     "contractDataInputFill": "data",
+    "customTransactionSchema": undefined,
     "defaultAccount": undefined,
     "defaultBlock": "latest",
     "defaultChain": "mainnet",
@@ -73,6 +74,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
       "clientUrl": "http://test/abc",
       "httpProviderOptions": undefined,
     },
+    "config": {},
     "useRpcCallSpecification": undefined,
   },
   "subscriptionManager": Web3SubscriptionManager {
@@ -108,6 +110,7 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
         "clientUrl": "http://test/abc",
         "httpProviderOptions": undefined,
       },
+      "config": {},
       "useRpcCallSpecification": undefined,
     },
     "tolerateUnlinkedSubscription": false,

diff --git a/packages/web3-eth/test/fixtures/format_transaction.ts b/packages/web3-eth/test/fixtures/format_transaction.ts
@@ -210,8 +210,9 @@ export const numbersAsBigIntTransaction: FormatType<
 	s: '0x7e1941b264348e80c78c4027afc65a87b0a5e43e86742b8ca0823584c6788fd0',
 };
 
+export type CustomFieldTransaction = Transaction & { feeCurrency: `0x${string}` };
 export const customFieldTransaction: FormatType<
-	Transaction,
+	CustomFieldTransaction,
 	{ number: FMT_NUMBER.BIGINT; bytes: typeof DEFAULT_RETURN_FORMAT.bytes }
 > = {
 	from: '0xEB014f8c8B418Db6b45774c326A0E64C78914dC0',

diff --git a/packages/web3-eth/test/unit/format_transaction.test.ts b/packages/web3-eth/test/unit/format_transaction.test.ts
@@ -26,6 +26,7 @@ import {
 	numbersAsNumberTransaction,
 	bytesAsUint8ArrayTransaction,
 	customFieldTransaction,
+	CustomFieldTransaction,
 } from '../fixtures/format_transaction';
 import { objectBigintToString } from '../fixtures/system_test_utils';
 import { transactionSchema } from '../../src';
@@ -120,17 +121,25 @@ describe('formatTransaction', () => {
 	});
 
 	it('Accepts a custom schema', () => {
-		expect(formatTransaction(customFieldTransaction).feeCurrency).toBeUndefined();
 		expect(
-			formatTransaction(customFieldTransaction, undefined, {
-				transactionSchema: {
-					...transactionSchema,
-					properties: {
-						...transactionSchema.properties,
-						feeCurrency: 'address',
+			formatTransaction<typeof DEFAULT_RETURN_FORMAT, CustomFieldTransaction>(
+				customFieldTransaction,
+			).feeCurrency,
+		).toBeUndefined();
+		expect(
+			formatTransaction<typeof DEFAULT_RETURN_FORMAT, CustomFieldTransaction>(
+				customFieldTransaction,
+				undefined,
+				{
+					transactionSchema: {
+						...transactionSchema,
+						properties: {
+							...transactionSchema.properties,
+							feeCurrency: { format: 'address' },
+						},
 					},
 				},
-			}).feeCurrency,
+			).feeCurrency,
 		).toBeDefined();
 	});
 });