diff --git a/web3.js/module.d.ts b/web3.js/module.d.ts index 8517c9c490..5b1cac9251 100644 --- a/web3.js/module.d.ts +++ b/web3.js/module.d.ts @@ -110,6 +110,7 @@ declare module '@solana/web3.js' { slot: number; err: TransactionError | null; memo: string | null; + blockTime?: number | null; }; export type BlockhashAndFeeCalculator = { @@ -189,6 +190,12 @@ declare module '@solana/web3.js' { transaction: Transaction; meta: ConfirmedTransactionMeta | null; }>; + rewards: Array<{ + pubkey: string; + lamports: number; + postBalance: number | null; + rewardType: string | null; + }>; }; export type PerfSample = { @@ -202,6 +209,7 @@ declare module '@solana/web3.js' { slot: number; transaction: Transaction; meta: ConfirmedTransactionMeta | null; + blockTime?: number | null; }; export type ParsedMessageAccount = { diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js index a0552bd983..117364751f 100644 --- a/web3.js/module.flow.js +++ b/web3.js/module.flow.js @@ -125,6 +125,7 @@ declare module '@solana/web3.js' { slot: number, err: TransactionError | null, memo: string | null, + blockTime?: number | null, }; declare export type BlockhashAndFeeCalculator = { @@ -204,6 +205,12 @@ declare module '@solana/web3.js' { transaction: Transaction, meta: ConfirmedTransactionMeta | null, }>, + rewards: Array<{ + pubkey: string, + lamports: number, + postBalance: number | null, + rewardType: string | null, + }>, }; declare export type PerfSample = { @@ -217,6 +224,7 @@ declare module '@solana/web3.js' { slot: number, transaction: Transaction, meta: ConfirmedTransactionMeta | null, + blockTime?: number | null, }; declare export type ParsedAccountData = { diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js index df80ed7e4f..0d36dd3787 100644 --- a/web3.js/src/connection.js +++ b/web3.js/src/connection.js @@ -438,11 +438,13 @@ type ConfirmedTransactionMeta = { * @property {number} slot The slot during which the transaction was processed * @property {Transaction} transaction The details of the transaction * @property {ConfirmedTransactionMeta|null} meta Metadata produced from the transaction + * @property {number|null|undefined} blockTime The unix timestamp of when the transaction was processed */ type ConfirmedTransaction = { slot: number, transaction: Transaction, meta: ConfirmedTransactionMeta | null, + blockTime?: number | null, }; /** @@ -520,11 +522,13 @@ type ParsedTransaction = { * @property {number} slot The slot during which the transaction was processed * @property {ParsedTransaction} transaction The details of the transaction * @property {ConfirmedTransactionMeta|null} meta Metadata produced from the transaction + * @property {number|null|undefined} blockTime The unix timestamp of when the transaction was processed */ type ParsedConfirmedTransaction = { slot: number, transaction: ParsedTransaction, meta: ParsedConfirmedTransactionMeta | null, + blockTime?: number | null, }; /** @@ -930,11 +934,12 @@ const GetConfirmedSignaturesForAddressRpcResult = jsonRpcResult( const GetConfirmedSignaturesForAddress2RpcResult = jsonRpcResult( struct.array([ - struct({ + struct.pick({ signature: 'string', slot: 'number', err: TransactionErrorResult, memo: struct.union(['null', 'string']), + blockTime: struct.union(['undefined', 'null', 'number']), }), ]), ); @@ -1332,6 +1337,7 @@ const GetConfirmedTransactionRpcResult = jsonRpcResult( slot: 'number', transaction: ConfirmedTransactionResult, meta: ConfirmedTransactionMetaResult, + blockTime: struct.union(['number', 'null', 'undefined']), }), ]), ); @@ -1346,6 +1352,7 @@ const GetParsedConfirmedTransactionRpcResult = jsonRpcResult( slot: 'number', transaction: ParsedConfirmedTransactionResult, meta: ParsedConfirmedTransactionMetaResult, + blockTime: struct.union(['number', 'null', 'undefined']), }), ]), ); @@ -1595,12 +1602,14 @@ export type SignatureStatus = { * @property {number} slot when the transaction was processed * @property {TransactionError | null} err error, if any * @property {string | null} memo memo associated with the transaction, if any + * @property {number | null | undefined} blockTime The unix timestamp of when the transaction was processed */ export type ConfirmedSignatureInfo = { signature: string, slot: number, err: TransactionError | null, memo: string | null, + blockTime?: number | null, }; /**