Skip to content

remove celo peculiarities from block structure #3623

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.

Sign up for GitHub

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

Merged
jxom merged 4 commits into from
May 6, 2025
Merged

remove celo peculiarities from block structure #3623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9da5b7a
remove celo peculiarities from block structure
aaronmgdr Apr 30, 2025
a6c8fdd
Update types.ts
jxom May 6, 2025
17583c1
Update thick-mayflies-itch.md
jxom May 6, 2025
c4e3cd7
Update thick-mayflies-itch.md
jxom May 6, 2025
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
5 changes: 5 additions & 0 deletions .changeset/thick-mayflies-itch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"viem": patch
---

**Celo:** Updated `CeloBlock` & `CeloRpcBlock` types.
16 changes: 4 additions & 12 deletions src/celo/formatters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ describe('block', () => {
nonce: '0x1',
sealFields: ['0x0'],
sha3Uncles: '0x0',
mixHash: '0x0',
uncles: [],
extraData:
'0xd983010700846765746889676f312e31372e3133856c696e7578000000000000f8ccc0c080b84169807e4d7934803decfde330167e444ec323431e1ff4cd70f40f2e79f24ce91f60340b99f97e3562ee57389e2c72343a74379e0b8b7ca5237ec141e84278bb3e00f8418e3e8af95497b7f6ffe7d3c4cbfbbdb06b26f6f3e913ca2cb7dff23532eaf3eb9f3b06ae75498c88353d279cf58fb0570736e2aa20cf53381722b6485f0f3c8180f8418e3fffffffffffffffffffffffffffb0005d23be939b9f8135e6b1ff283baff985c1b6ccacf2b6aa7fbd8939c4b6178b1d242b574a614b6347182a3b3195258080',
gasUsed: '0x1',
Expand All @@ -30,12 +32,6 @@ describe('block', () => {
number: '0x2',
parentHash:
'0xf6e57c99be5a81167bcb7bdf8d55572235384182c71635857ace2c04d25294ed',
randomness: {
committed:
'0x339714505ecf55eacc2d2568ea53a7424bd0aa40fd710fd6892464d0716da711',
revealed:
'0xe10b5f01b0376fdc9151f66992f8c1b990083acabc14ec1b04f6a53ad804db88',
},
receiptsRoot:
'0xca8aabc507534e45c982aa43e38118fc6f9cf222800e3d703a6e299a2e661f2a',
size: '0x3',
Expand Down Expand Up @@ -91,9 +87,11 @@ describe('block', () => {
difficulty: '0x0',
excessBlobGas: '0x0',
gasLimit: '0x0',
mixHash: '0x0',
nonce: '0x1',
sealFields: ['0x0'],
sha3Uncles: '0x0',
uncles: [],
extraData:
'0xd983010700846765746889676f312e31372e3133856c696e7578000000000000f8ccc0c080b84169807e4d7934803decfde330167e444ec323431e1ff4cd70f40f2e79f24ce91f60340b99f97e3562ee57389e2c72343a74379e0b8b7ca5237ec141e84278bb3e00f8418e3e8af95497b7f6ffe7d3c4cbfbbdb06b26f6f3e913ca2cb7dff23532eaf3eb9f3b06ae75498c88353d279cf58fb0570736e2aa20cf53381722b6485f0f3c8180f8418e3fffffffffffffffffffffffffffb0005d23be939b9f8135e6b1ff283baff985c1b6ccacf2b6aa7fbd8939c4b6178b1d242b574a614b6347182a3b3195258080',
gasUsed: '0x1',
Expand All @@ -104,12 +102,6 @@ describe('block', () => {
number: '0x2',
parentHash:
'0xf6e57c99be5a81167bcb7bdf8d55572235384182c71635857ace2c04d25294ed',
randomness: {
committed:
'0x339714505ecf55eacc2d2568ea53a7424bd0aa40fd710fd6892464d0716da711',
revealed:
'0xe10b5f01b0376fdc9151f66992f8c1b990083acabc14ec1b04f6a53ad804db88',
},
receiptsRoot:
'0xca8aabc507534e45c982aa43e38118fc6f9cf222800e3d703a6e299a2e661f2a',
size: '0x3',
Expand Down
1 change: 0 additions & 1 deletion src/celo/formatters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export const formatters = {
})
return {
transactions,
...(args.randomness ? { randomness: args.randomness } : {}),
} as CeloBlock
},
}),
Expand Down
48 changes: 9 additions & 39 deletions src/celo/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Transaction as core_Transaction,
TransactionRequest as core_TransactionRequest,
} from '../types/transaction.js'
import type { Assign, ExactPartial, OneOf } from '../types/utils.js'

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Verify / Test Environments (tsc) 

'Assign' is declared but never used.

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Verify / Test Environments (bun) 

'Assign' is declared but never used.

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Verify / Test Environments (node-latest) 

'Assign' is declared but never used.

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Size 

'Assign' is declared but never used.

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Verify / Test Environments (node-18) 

'Assign' is declared but never used.

Check failure on line 24 in src/celo/types.ts

View workflow job for this annotation

GitHub Actions / Verify / Build 

'Assign' is declared but never used.

import type {
OpStackDepositTransaction,
Expand All @@ -33,50 +33,20 @@
export type CeloBlock<
includeTransactions extends boolean = boolean,
blockTag extends BlockTag = BlockTag,
> = Assign<
Block<
bigint,
includeTransactions,
blockTag,
CeloTransaction<blockTag extends 'pending' ? true : false>
>,
{
difficulty?: bigint | undefined
gasLimit?: bigint | undefined
mixHash?: undefined
nonce?: bigint | null
randomness?:
| {
committed: Hex
revealed: Hex
}
| undefined
uncles?: undefined
}
> = Block<
bigint,
includeTransactions,
blockTag,
CeloTransaction<blockTag extends 'pending' ? true : false>
>

export type CeloRpcBlock<
blockTag extends BlockTag = BlockTag,
includeTransactions extends boolean = boolean,
> = Assign<
RpcBlock<
blockTag,
includeTransactions,
RpcTransaction<blockTag extends 'pending' ? true : false>
>,
{
difficulty?: Hex | undefined
mixHash?: undefined
nonce?: Hex | null
gasLimit?: Hex | undefined
randomness?:
| {
committed: Hex
revealed: Hex
}
| undefined
uncles?: undefined
}
> = RpcBlock<
blockTag,
includeTransactions,
RpcTransaction<blockTag extends 'pending' ? true : false>
>

export type CeloRpcTransaction<isPending extends boolean = boolean> = OneOf<
Expand Down
Loading