Skip to content
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

feat: additional block info #176

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: additional block info #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 47 additions & 0 deletions Sources/Core/Json/EthereumBlockObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,22 @@ public struct EthereumBlockObject: Codable {

/// Array of uncle hashes.
public let uncles: [EthereumData]?

public let author: EthereumAddress?

public let baseFeePerGas: EthereumQuantity?

public let blobGasUsed: EthereumQuantity?

public let excessBlobGas: EthereumQuantity?

public let mixHash: EthereumData?

public let parentBeaconBlockRoot: EthereumData?

public let withdrawals : [Withdrawal]?

public let withdrawalsRoot: EthereumData?

/**
* Represents a transaction as either a hash or an object.
Expand Down Expand Up @@ -132,6 +148,13 @@ public struct EthereumBlockObject: Codable {
case unsupportedType
}
}

public struct Withdrawal: Codable {
public let address: EthereumAddress
public let amount: EthereumQuantity
public let index: EthereumQuantity
public let validatorIndex: EthereumQuantity
}
}

// MARK: - Equatable
Expand All @@ -143,6 +166,15 @@ extension EthereumBlockObject.Transaction: Equatable {
}
}

extension EthereumBlockObject.Withdrawal: Equatable {
public static func ==(_ lhs: EthereumBlockObject.Withdrawal, _ rhs: EthereumBlockObject.Withdrawal) -> Bool {
return lhs.address == rhs.address
&& lhs.amount == rhs.amount
&& lhs.index == rhs.index
&& lhs.validatorIndex == rhs.validatorIndex
}
}

extension EthereumBlockObject: Equatable {

public static func ==(_ lhs: EthereumBlockObject, _ rhs: EthereumBlockObject) -> Bool {
Expand All @@ -166,6 +198,14 @@ extension EthereumBlockObject: Equatable {
&& lhs.timestamp == rhs.timestamp
&& lhs.transactions == rhs.transactions
&& lhs.uncles == rhs.uncles
&& lhs.author == rhs.author
&& lhs.baseFeePerGas == rhs.baseFeePerGas
&& lhs.blobGasUsed == rhs.blobGasUsed
&& lhs.excessBlobGas == rhs.excessBlobGas
&& lhs.mixHash == rhs.mixHash
&& lhs.parentBeaconBlockRoot == rhs.parentBeaconBlockRoot
&& lhs.withdrawals == rhs.withdrawals
&& lhs.withdrawalsRoot == rhs.withdrawalsRoot
}
}

Expand Down Expand Up @@ -204,5 +244,12 @@ extension EthereumBlockObject: Hashable {
hasher.combine(gasLimit)
hasher.combine(gasUsed)
hasher.combine(timestamp)
hasher.combine(baseFeePerGas)
hasher.combine(author)
hasher.combine(blobGasUsed)
hasher.combine(excessBlobGas)
hasher.combine(mixHash)
hasher.combine(parentBeaconBlockRoot)
hasher.combine(withdrawalsRoot)
}
}
64 changes: 29 additions & 35 deletions Tests/Web3Tests/JsonTests/EthereumBlockObjectTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,16 @@ class EthereumBlockObjectTests: QuickSpec {
)
)
],
uncles: []
uncles: [],
author:EthereumAddress(hex: "0xea674fdde714fd979de3edf0f56aa9716b898ec8", eip55: false),
baseFeePerGas: .string("0x79f39e"),
blobGasUsed: .string("0x0"),
excessBlobGas: .string("0xe0000"),
mixHash: .string("0x9cfe8408a1bfd35985d2ea8c330e4fec38c5f0e54fe259358517fb66f54238a5"),
parentBeaconBlockRoot: .string("0x8fa937418aba444b44ca55c455bb170e56991c3fdc3cbba10b1291246d3c7d0c"),
withdrawals: [],
withdrawalsRoot: .string("0xc8992060e732aa8625374cde2d70e3fd4e0b0a581777e468c98055213e152f7b")

)
it("should not be nil") {
expect(block).toNot(beNil())
Expand Down Expand Up @@ -117,47 +126,32 @@ class EthereumBlockObjectTests: QuickSpec {

context("decodable") {

let blockString = "{\"uncles\":[],\"hash\":\"0x5413f2348b6669b9ec9cb4798800fbadedf1f1da890b472234fb82fc3154eba9\",\"miner\":\"0xea674fdde714fd979de3edf0f56aa9716b898ec8\",\"parentHash\":\"0x8ecc84ad7e31d530b95491e33f8f38045553fa8f3150251793bf8be39f011932\",\"extraData\":\"0x65746865726d696e652d6e6f6465\",\"nonce\":\"0x56869aa000e98dae\",\"receiptsRoot\":\"0x1d24660fddfeb6903113adf09b5037d67fafca50237449d3dc90ba1b6ce425eb\",\"gasLimit\":\"0x79f39e\",\"transactionsRoot\":\"0xcac05ecb2d0ef298070e24185b2fd77438765f77a0aee08bbea43c224ca95767\",\"timestamp\":\"0x5a80e79f\",\"size\":\"0x8bb5\",\"stateRoot\":\"0x22ce9cd8ba6486e817acae0b5c7d66fd88e80ed26e06dea4f4c2a93c101a628f\",\"number\":\"0x4d6c68\",\"difficulty\":\"0xa2c29ca5908c1\",\"logsBloom\":\"0x020e10a820c102500600d8c0081034005790004c00268040204844025400000c00920320000007020004220602400c190302d1a040254a0c1680009884900001360400408000c100c9904e3c01a15a2106a2004208822000410308020220028284608a833248002224104070c6405a42005430248c3405004104027052a1824021d08c4980250504a8780a9048099251b98048546801c1b000022b82000020006902484080002b041008880030088246200121012004a03808e42290020021404c0100ce8004a200001510c2049031270022200411088461005f41902c01308000120142082090a14600080022102d1f180e2090003400062e019814800208a4\",\"sha3Uncles\":\"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347\",\"gasUsed\":\"0x79d6f0\",\"transactions\":[{\"from\":\"0x2607660f7922d2d651bc4ac45df7d3a310160cae\",\"hash\":\"0xe28aa8aeb6bdbd06f6a3e9ef498f5fd0b39c8bd5fb14b27a0d27d686c92d99bb\",\"gas\":\"0x3d090\",\"input\":\"0x0a19b14a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ce97c70706df20000000000000000000000000000419d0d8bdd9af5e606ae2232ed285aff190e711b000000000000000000000000000000000000000000000000000328708d2b380000000000000000000000000000000000000000000000000000000000004d931400000000000000000000000000000000000000000000000000000000cc56a16a0000000000000000000000006b01bb8b9f5d00a0f0fe8532d2beda1d5d1a42ce000000000000000000000000000000000000000000000000000000000000001c64402c21718134a6c59382663ea1f0eadd995581f1fb402c3b5f83586529e5bd70782295477707b527c40a050b7e7b2a81c4619bcad145a2e5ebfd83f78df5f9000000000000000000000000000000000000000000000002e425df9692720000\",\"blockHash\":\"0x5413f2348b6669b9ec9cb4798800fbadedf1f1da890b472234fb82fc3154eba9\",\"blockNumber\":\"0x4d6c68\",\"transactionIndex\":\"0x0\",\"value\":\"0x0\",\"to\":\"0x8d12a197cb00d4747a1fe03395095ce2a5cc6819\",\"gasPrice\":\"0x2e90edd000\",\"nonce\":\"0x7ec\"}],\"totalDifficulty\":\"0x87076c0957cde7ace3\"}"
let blockString = "{\"baseFeePerGas\":\"0x1de81cb77\",\"blobGasUsed\":\"0x0\",\"difficulty\":\"0x0\",\"excessBlobGas\":\"0xe0000\",\"extraData\":\"0x\",\"gasLimit\":\"0x1c9c380\",\"gasUsed\":\"0x0\",\"hash\":\"0x1e4e37dff58ffedbf03297a23cabb3fce115f7b4470a36114fa41543fdafcbfa\",\"logsBloom\":\"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",\"miner\":\"0x3826539cbd8d68dcf119e80b994557b4278cec9f\",\"mixHash\":\"0x9cfe8408a1bfd35985d2ea8c330e4fec38c5f0e54fe259358517fb66f54238a5\",\"nonce\":\"0x0000000000000000\",\"number\":\"0x5ea5c7\",\"parentBeaconBlockRoot\":\"0x8fa937418aba444b44ca55c455bb170e56991c3fdc3cbba10b1291246d3c7d0c\",\"parentHash\":\"0x8cc45b5eee1243dcee3f1148d51adb2d05004b967c332f30e8a86f3cbb9a4be4\",\"receiptsRoot\":\"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421\",\"sha3Uncles\":\"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347\",\"size\":\"0x470\",\"stateRoot\":\"0x1f49708700c00b079a0e8321e4e23099c62c0c166bd7cfafbc49230e3fd29f05\",\"timestamp\":\"0x667e43e0\",\"totalDifficulty\":\"0x3c656d23029ab0\",\"transactions\":[],\"transactionsRoot\":\"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421\",\"uncles\":[],\"withdrawals\":[{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100759\",\"validatorIndex\":\"0x3c6\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x39220\",\"index\":\"0x310075a\",\"validatorIndex\":\"0x3c7\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x310075b\",\"validatorIndex\":\"0x3c8\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x39220\",\"index\":\"0x310075c\",\"validatorIndex\":\"0x3c9\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x310075d\",\"validatorIndex\":\"0x3ca\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x310075e\",\"validatorIndex\":\"0x3cb\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x310075f\",\"validatorIndex\":\"0x3cc\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100760\",\"validatorIndex\":\"0x3cd\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100761\",\"validatorIndex\":\"0x3ce\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x39220\",\"index\":\"0x3100762\",\"validatorIndex\":\"0x3cf\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100763\",\"validatorIndex\":\"0x3d0\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100764\",\"validatorIndex\":\"0x3d1\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100765\",\"validatorIndex\":\"0x3d2\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x38032\",\"index\":\"0x3100766\",\"validatorIndex\":\"0x3d3\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x39220\",\"index\":\"0x3100767\",\"validatorIndex\":\"0x3d4\"},{\"address\":\"0xe276bc378a527a8792b353cdca5b5e53263dfb9e\",\"amount\":\"0x39220\",\"index\":\"0x3100768\",\"validatorIndex\":\"0x3d5\"}],\"withdrawalsRoot\":\"0xc8992060e732aa8625374cde2d70e3fd4e0b0a581777e468c98055213e152f7b\"}"
let block = try? self.decoder.decode(EthereumBlockObject.self, from: Data(blockString.makeBytes()))
it("should not be nil") {
expect(block).toNot(beNil())
}

it("should be equal") {
expect(block?.number?.quantity) == 5074024
expect(block?.hash?.hex()) == "0x5413f2348b6669b9ec9cb4798800fbadedf1f1da890b472234fb82fc3154eba9"
expect(block?.parentHash.hex()) == "0x8ecc84ad7e31d530b95491e33f8f38045553fa8f3150251793bf8be39f011932"
expect(block?.nonce?.hex()) == "0x56869aa000e98dae"
expect(block?.number?.quantity) == 6202823
expect(block?.hash?.hex()) == "0x1e4e37dff58ffedbf03297a23cabb3fce115f7b4470a36114fa41543fdafcbfa"
expect(block?.parentHash.hex()) == "0x8cc45b5eee1243dcee3f1148d51adb2d05004b967c332f30e8a86f3cbb9a4be4"
expect(block?.nonce?.hex()) == "0x0000000000000000"
expect(block?.sha3Uncles.hex()) == "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
expect(block?.logsBloom?.hex()) == "0x020e10a820c102500600d8c0081034005790004c00268040204844025400000c00920320000007020004220602400c190302d1a040254a0c1680009884900001360400408000c100c9904e3c01a15a2106a2004208822000410308020220028284608a833248002224104070c6405a42005430248c3405004104027052a1824021d08c4980250504a8780a9048099251b98048546801c1b000022b82000020006902484080002b041008880030088246200121012004a03808e42290020021404c0100ce8004a200001510c2049031270022200411088461005f41902c01308000120142082090a14600080022102d1f180e2090003400062e019814800208a4"
expect(block?.transactionsRoot.hex()) == "0xcac05ecb2d0ef298070e24185b2fd77438765f77a0aee08bbea43c224ca95767"
expect(block?.stateRoot.hex()) == "0x22ce9cd8ba6486e817acae0b5c7d66fd88e80ed26e06dea4f4c2a93c101a628f"
expect(block?.receiptsRoot.hex()) == "0x1d24660fddfeb6903113adf09b5037d67fafca50237449d3dc90ba1b6ce425eb"
expect(block?.miner.hex(eip55: false)) == "0xea674fdde714fd979de3edf0f56aa9716b898ec8"
expect(block?.difficulty.hex()) == "0xa2c29ca5908c1"
expect(block?.totalDifficulty?.hex()) == "0x87076c0957cde7ace3"
expect(block?.extraData.hex()) == "0x65746865726d696e652d6e6f6465"
expect(block?.size?.quantity) == 0x8bb5
expect(block?.gasLimit.hex()) == "0x79f39e"
expect(block?.gasUsed.hex()) == "0x79d6f0"
expect(block?.timestamp.hex()) == "0x5a80e79f"

expect(block?.transactions?.count) == 1

let tx = block?.transactions?.first
expect(tx?.object).toNot(beNil())
expect(tx?.hash).to(beNil())
expect(tx?.object?.hash.hex()) == "0xe28aa8aeb6bdbd06f6a3e9ef498f5fd0b39c8bd5fb14b27a0d27d686c92d99bb"
expect(tx?.object?.nonce.quantity) == 0x7ec
expect(tx?.object?.blockHash?.hex()) == "0x5413f2348b6669b9ec9cb4798800fbadedf1f1da890b472234fb82fc3154eba9"
expect(tx?.object?.blockNumber?.quantity) == 0x4d6c68
expect(tx?.object?.transactionIndex?.quantity) == 0x0
expect(tx?.object?.from.hex(eip55: false)) == "0x2607660f7922d2d651bc4ac45df7d3a310160cae"
expect(tx?.object?.to?.hex(eip55: false)) == "0x8d12a197cb00d4747a1fe03395095ce2a5cc6819"
expect(tx?.object?.value.quantity) == 0x0
expect(tx?.object?.gasPrice.hex()) == "0x2e90edd000"
expect(tx?.object?.gas.quantity) == 0x3d090
expect(tx?.object?.input.hex()) == "0x0a19b14a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ce97c70706df20000000000000000000000000000419d0d8bdd9af5e606ae2232ed285aff190e711b000000000000000000000000000000000000000000000000000328708d2b380000000000000000000000000000000000000000000000000000000000004d931400000000000000000000000000000000000000000000000000000000cc56a16a0000000000000000000000006b01bb8b9f5d00a0f0fe8532d2beda1d5d1a42ce000000000000000000000000000000000000000000000000000000000000001c64402c21718134a6c59382663ea1f0eadd995581f1fb402c3b5f83586529e5bd70782295477707b527c40a050b7e7b2a81c4619bcad145a2e5ebfd83f78df5f9000000000000000000000000000000000000000000000002e425df9692720000"
expect(block?.logsBloom?.hex()) == "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
expect(block?.transactionsRoot.hex()) == "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
expect(block?.stateRoot.hex()) == "0x1f49708700c00b079a0e8321e4e23099c62c0c166bd7cfafbc49230e3fd29f05"
expect(block?.receiptsRoot.hex()) == "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
expect(block?.miner.hex(eip55: false)) == "0x3826539cbd8d68dcf119e80b994557b4278cec9f"
expect(block?.difficulty.hex()) == "0x0"
expect(block?.totalDifficulty?.hex()) == "0x3c656d23029ab0"
expect(block?.extraData.hex()) == "0x"
expect(block?.size?.quantity) == 0x470
expect(block?.gasLimit.hex()) == "0x1c9c380"
expect(block?.gasUsed.hex()) == "0x0"
expect(block?.timestamp.hex()) == "0x667e43e0"

expect(block?.transactions?.count) == 0
}
}

Expand Down