Skip to content

modified Block struct #873

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

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+8 −1
Open

modified Block struct #873

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58ed367
modified Block struct
Oct 31, 2024
329bcb4
Update Sources/Web3Core/Structure/Block/Block.swift
h33min Oct 31, 2024
8c68165
Update Sources/Web3Core/Structure/Block/Block.swift
h33min Oct 31, 2024
546a307
chore: Block's optional totalDifficulty parsing refactoring;
JeneaVranceanu Nov 6, 2024
82d9b1a
chore: swift doc update for the totalDifficulty field;
JeneaVranceanu Nov 6, 2024
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
9 changes: 8 additions & 1 deletion Sources/Web3Core/Structure/Block/Block.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public struct Block {
public var receiptsRoot: Data
public var miner: EthereumAddress? // MARK: This is NOT optional in web3js
public var difficulty: BigUInt
/// by JoshKim: Removed from Ethereum official Blockschema making it optional (https://github.com/ethereum/execution-apis/commit/9e16d5e76a554c733613a2db631130166e2d8725)
/// Set to 0 if not provided. Will be made optional in v4 of web3swift.
public var totalDifficulty: BigUInt
public var extraData: Data
public var size: BigUInt
Expand Down Expand Up @@ -83,7 +85,12 @@ extension Block: Decodable {
}

self.difficulty = try container.decodeHex(BigUInt.self, forKey: .difficulty)
self.totalDifficulty = try container.decodeHex(BigUInt.self, forKey: .totalDifficulty)
if (container.contains(.totalDifficulty)) {
// Must throw if value is set but it is invalid
self.totalDifficulty = try container.decodeHex(BigUInt.self, forKey: .totalDifficulty)
} else {
self.totalDifficulty = .zero
}
self.extraData = try container.decodeHex(Data.self, forKey: .extraData)
self.size = try container.decodeHex(BigUInt.self, forKey: .size)
self.gasLimit = try container.decodeHex(BigUInt.self, forKey: .gasLimit)
Expand Down
Loading