diff --git a/src/main/scala/units/client/contract/ContractBlock.scala b/src/main/scala/units/client/contract/ContractBlock.scala index a49111fe..8d1b5140 100644 --- a/src/main/scala/units/client/contract/ContractBlock.scala +++ b/src/main/scala/units/client/contract/ContractBlock.scala @@ -7,14 +7,14 @@ import units.eth.EthAddress import units.util.HexBytesConverter.toHex case class ContractBlock( - hash: BlockHash, - parentHash: BlockHash, - epoch: Int, - height: Long, - minerRewardAddress: EthAddress, - chainId: Long, - e2cTransfersRootHash: Digest, - lastC2ETransferIndex: Long + hash: BlockHash, + parentHash: BlockHash, + epoch: Int, + height: Long, + minerRewardAddress: EthAddress, + chainId: Long, + e2cTransfersRootHash: Digest, + lastC2ETransferIndex: Long ) extends CommonBlockData { override def toString: String = s"ContractBlock($hash, p=$parentHash, e=$epoch, h=$height, m=$minerRewardAddress, c=$chainId, " + diff --git a/src/main/scala/units/client/engine/model/ExecutionPayload.scala b/src/main/scala/units/client/engine/model/ExecutionPayload.scala index 61a46d0a..27e517fe 100644 --- a/src/main/scala/units/client/engine/model/ExecutionPayload.scala +++ b/src/main/scala/units/client/engine/model/ExecutionPayload.scala @@ -14,17 +14,17 @@ import units.util.HexBytesConverter.* * https://besu.hyperledger.org/stable/public-networks/reference/engine-api/objects#execution-payload-object tells about milliseconds */ case class ExecutionPayload( - hash: BlockHash, - parentHash: BlockHash, - stateRoot: String, - height: Long, - timestamp: Long, - minerRewardAddress: EthAddress, - baseFeePerGas: Uint256, - gasLimit: Long, - gasUsed: Long, - prevRandao: String, - withdrawals: Vector[Withdrawal] + hash: BlockHash, + parentHash: BlockHash, + stateRoot: String, + height: Long, + timestamp: Long, + minerRewardAddress: EthAddress, + baseFeePerGas: Uint256, + gasLimit: Long, + gasUsed: Long, + prevRandao: String, + withdrawals: Vector[Withdrawal] ) extends CommonBlockData { override def toString: String = s"ExecutionPayload($hash, p=$parentHash, h=$height, t=$timestamp, m=$minerRewardAddress, w={${withdrawals.mkString(", ")}})" diff --git a/src/test/scala/units/ExtensionDomain.scala b/src/test/scala/units/ExtensionDomain.scala index 2321fba7..8729227d 100644 --- a/src/test/scala/units/ExtensionDomain.scala +++ b/src/test/scala/units/ExtensionDomain.scala @@ -90,7 +90,7 @@ class ExtensionDomain( val eluScheduler: TestScheduler = TestScheduler(ExecutionModel.AlwaysAsyncExecution) val elBlockStream: PublishSubject[(Channel, NetworkBlock)] = PublishSubject[(Channel, NetworkBlock)]() - val blockObserver: TestBlocksObserver = new TestBlocksObserver(elBlockStream) + val blockObserver: TestBlocksObserver = new TestBlocksObserver(elBlockStream) val neighbourChannel = new EmbeddedChannel() val allChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE) @@ -232,11 +232,11 @@ class ExtensionDomain( // Useful for debugging purposes def evaluateExtendAltChain( - minerAccount: KeyPair, - chainId: Long, - blockData: CommonBlockData, - epoch: Long, - e2CTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex + minerAccount: KeyPair, + chainId: Long, + blockData: CommonBlockData, + epoch: Long, + e2CTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex ): Either[String, JsObject] = { val r = evaluate( chainContractAddress, diff --git a/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala b/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala index 7cb92d2b..5a225953 100644 --- a/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala +++ b/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala @@ -50,11 +50,11 @@ trait HasConsensusLayerDappTxHelpers { ) def extendMainChain( - minerAccount: KeyPair, - blockData: CommonBlockData, - e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, - lastC2ETransferIndex: Long = -1, - vrf: ByteStr = currentHitSource + minerAccount: KeyPair, + blockData: CommonBlockData, + e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, + lastC2ETransferIndex: Long = -1, + vrf: ByteStr = currentHitSource ): InvokeScriptTransaction = TxHelpers.invoke( invoker = minerAccount, @@ -71,10 +71,10 @@ trait HasConsensusLayerDappTxHelpers { ) def appendBlock( - minerAccount: KeyPair, - blockData: CommonBlockData, - e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, - lastC2ETransferIndex: Long = -1 + minerAccount: KeyPair, + blockData: CommonBlockData, + e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, + lastC2ETransferIndex: Long = -1 ): InvokeScriptTransaction = TxHelpers.invoke( invoker = minerAccount, @@ -90,11 +90,11 @@ trait HasConsensusLayerDappTxHelpers { ) def startAltChain( - minerAccount: KeyPair, - blockData: CommonBlockData, - e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, - lastC2ETransferIndex: Long = -1, - vrf: ByteStr = currentHitSource + minerAccount: KeyPair, + blockData: CommonBlockData, + e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, + lastC2ETransferIndex: Long = -1, + vrf: ByteStr = currentHitSource ): InvokeScriptTransaction = TxHelpers.invoke( invoker = minerAccount, @@ -111,12 +111,12 @@ trait HasConsensusLayerDappTxHelpers { ) def extendAltChain( - minerAccount: KeyPair, - blockData: CommonBlockData, - chainId: Long, - e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, - lastC2ETransferIndex: Long = -1, - vrf: ByteStr = currentHitSource + minerAccount: KeyPair, + blockData: CommonBlockData, + chainId: Long, + e2cTransfersRootHashHex: String = EmptyE2CTransfersRootHashHex, + lastC2ETransferIndex: Long = -1, + vrf: ByteStr = currentHitSource ): InvokeScriptTransaction = TxHelpers.invoke( invoker = minerAccount, @@ -165,11 +165,11 @@ trait HasConsensusLayerDappTxHelpers { ) def withdraw( - sender: KeyPair, - blockData: CommonBlockData, - merkleProof: Seq[Digest], - transferIndexInBlock: Int, - amount: Long + sender: KeyPair, + blockData: CommonBlockData, + merkleProof: Seq[Digest], + transferIndexInBlock: Int, + amount: Long ): InvokeScriptTransaction = TxHelpers.invoke( invoker = sender,