@@ -112,7 +112,7 @@ class ELUpdater(
112112 }
113113 }
114114
115- private def callContract (fc : FUNCTION_CALL , invoker : KeyPair ): JobResult [Unit ] = {
115+ private def callContract (fc : FUNCTION_CALL , invoker : KeyPair ): Result [Unit ] = {
116116 val extraFee = if (blockchain.hasPaidVerifier(invoker.toAddress)) ScriptExtraFee else 0
117117
118118 val tx = InvokeScriptTransaction (
@@ -150,7 +150,7 @@ class ELUpdater(
150150 }
151151 }
152152
153- private def rollbackDryRun (prevState : Working [ChainStatus ], target : L2BlockLike , finalizedBlock : ContractBlock ): JobResult [Working [ChainStatus ]] = {
153+ private def rollbackDryRun (prevState : Working [ChainStatus ], target : L2BlockLike , finalizedBlock : ContractBlock ): Result [Working [ChainStatus ]] = {
154154 val targetHash = target.hash
155155 for {
156156 lastEcBlock <- engineApiClient.getBlockByHash(targetHash).flatMap(_.toRight(s " Block $targetHash was not found " ))
@@ -183,7 +183,7 @@ class ELUpdater(
183183 chainContractOptions : ChainContractOptions ,
184184 prevEpochMinerRewardAddress : Option [EthAddress ],
185185 willSimulateBlock : Boolean
186- ): JobResult [MiningData ] = {
186+ ): Result [MiningData ] = {
187187 val startElWithdrawalIndex = lastElWithdrawalIndex + 1
188188 val startC2ETransferIndex = lastC2ETransferIndex + 1
189189
@@ -993,7 +993,7 @@ class ELUpdater(
993993 logger.debug(s " Unexpected state on sync: $other" )
994994 })
995995
996- private def validateRandao (block : EcBlock , epochNumber : Int ): JobResult [Unit ] =
996+ private def validateRandao (block : EcBlock , epochNumber : Int ): Result [Unit ] =
997997 blockchain.vrf(epochNumber) match {
998998 case None => s " VRF of $epochNumber epoch is empty " .asLeft
999999 case Some (vrf) =>
@@ -1004,7 +1004,7 @@ class ELUpdater(
10041004 }
10051005
10061006 // Of a current epoch miner
1007- private def validateBlockSignature (block : NetworkL2Block , epochInfo : Option [EpochInfo ]): JobResult [Unit ] = {
1007+ private def validateBlockSignature (block : NetworkL2Block , epochInfo : Option [EpochInfo ]): Result [Unit ] = {
10081008 epochInfo match {
10091009 case Some (epochMeta) =>
10101010 for {
@@ -1024,19 +1024,19 @@ class ELUpdater(
10241024 }
10251025 }
10261026
1027- private def validateTimestamp (newNetworkBlock : NetworkL2Block , parentEcBlock : EcBlock ): JobResult [Unit ] = {
1027+ private def validateTimestamp (newNetworkBlock : NetworkL2Block , parentEcBlock : EcBlock ): Result [Unit ] = {
10281028 val minAppendTs = parentEcBlock.timestamp + config.blockDelay.toSeconds
10291029 Either .raiseUnless(newNetworkBlock.timestamp >= minAppendTs) {
10301030 s " timestamp ( ${newNetworkBlock.timestamp}) of appended block must be greater or equal $minAppendTs, Δ ${minAppendTs - newNetworkBlock.timestamp}s "
10311031 }
10321032 }
10331033
1034- private def preValidateBlock (networkBlock : NetworkL2Block , parentBlock : EcBlock , epochInfo : Option [EpochInfo ]): JobResult [Unit ] = for {
1034+ private def preValidateBlock (networkBlock : NetworkL2Block , parentBlock : EcBlock , epochInfo : Option [EpochInfo ]): Result [Unit ] = for {
10351035 _ <- validateTimestamp(networkBlock, parentBlock)
10361036 _ <- validateBlockSignature(networkBlock, epochInfo)
10371037 } yield ()
10381038
1039- private def getAltChainReferenceBlock (nodeChainInfo : ChainInfo , lastContractBlock : ContractBlock ): JobResult [ContractBlock ] = {
1039+ private def getAltChainReferenceBlock (nodeChainInfo : ChainInfo , lastContractBlock : ContractBlock ): Result [ContractBlock ] = {
10401040 if (nodeChainInfo.isMain) {
10411041 for {
10421042 lastEpoch <- chainContractClient
@@ -1212,7 +1212,7 @@ class ELUpdater(
12121212 contractBlock : ContractBlock ,
12131213 parentContractBlock : ContractBlock ,
12141214 chainContractOptions : ChainContractOptions
1215- ): JobResult [Unit ] = {
1215+ ): Result [Unit ] = {
12161216 val expectedAddedAssets =
12171217 if (
12181218 contractBlock.epoch < chainContractOptions.assetTransfersActivationEpoch ||
@@ -1287,7 +1287,7 @@ class ELUpdater(
12871287 getContractBlocksForValidation(startState).fold[Unit ](
12881288 err => logger.error(s " Validation of applied blocks error: $err" ),
12891289 blocksToValidate =>
1290- blocksToValidate.foldLeft[JobResult [Working [ChainStatus ]]](Right (startState)) {
1290+ blocksToValidate.foldLeft[Result [Working [ChainStatus ]]](Right (startState)) {
12911291 case (Right (curState), block) =>
12921292 logger.trace(s " Trying to validate applied block ${block.hash}" )
12931293 validateAppliedBlock(block.contractBlock, block.ecBlock, curState) match {
@@ -1315,7 +1315,7 @@ class ELUpdater(
13151315 fullValidationStatus : FullValidationStatus ,
13161316 miningReward : Option [MiningReward ],
13171317 options : ChainContractOptions
1318- ): JobResult [Option [WithdrawalIndex ]] = for {
1318+ ): Result [Option [WithdrawalIndex ]] = for {
13191319 blockJsonE <- engineApiClient.getBlockByHashJson(ecBlock.hash, fullTransactionObjects = true )
13201320 blockJson <- blockJsonE.toRight(s " Can't find EC block ${ecBlock.hash} transactions " )
13211321
@@ -1569,15 +1569,15 @@ class ELUpdater(
15691569 contractBlock : ContractBlock ,
15701570 parentBlock : EcBlock ,
15711571 prevState : Working [ChainStatus ]
1572- ): JobResult [Working [ChainStatus ]] = {
1572+ ): Result [Working [ChainStatus ]] = {
15731573 logger.trace(s " Trying to apply and do a full validation of block ${networkBlock.hash}" )
15741574 for {
15751575 _ <- applyBlock(networkBlock, parentBlock, epochInfo = None ) // epochInfo is empty, because we don't need to validate a block signature
15761576 updatedState <- validateAppliedBlock(contractBlock, networkBlock.toEcBlock, prevState)
15771577 } yield updatedState
15781578 }
15791579
1580- private def applyBlock (networkBlock : NetworkL2Block , parentBlock : EcBlock , epochInfo : Option [EpochInfo ]): JobResult [Unit ] = for {
1580+ private def applyBlock (networkBlock : NetworkL2Block , parentBlock : EcBlock , epochInfo : Option [EpochInfo ]): Result [Unit ] = for {
15811581 _ <- preValidateBlock(networkBlock, parentBlock, epochInfo)
15821582 _ <- engineApiClient.newPayload(networkBlock.payload)
15831583 } yield ()
@@ -1588,7 +1588,7 @@ class ELUpdater(
15881588 prevState : Working [ChainStatus ],
15891589 ecBlockLogs : Option [List [GetLogsResponseEntry ]] = None ,
15901590 updateState : Boolean = true
1591- ): JobResult [Working [ChainStatus ]] = {
1591+ ): Result [Working [ChainStatus ]] = {
15921592 val validationResult =
15931593 for {
15941594 _ <- Either .raiseUnless(contractBlock.minerRewardL2Address == ecBlock.minerRewardL2Address) {
@@ -1673,9 +1673,9 @@ class ELUpdater(
16731673 }
16741674 }
16751675
1676- private def getContractBlocksForValidation (curState : Working [ChainStatus ]): JobResult [List [BlockForValidation ]] = {
1676+ private def getContractBlocksForValidation (curState : Working [ChainStatus ]): Result [List [BlockForValidation ]] = {
16771677 @ tailrec
1678- def loop (curBlock : ContractBlock , acc : List [BlockForValidation ]): JobResult [List [BlockForValidation ]] = {
1678+ def loop (curBlock : ContractBlock , acc : List [BlockForValidation ]): Result [List [BlockForValidation ]] = {
16791679 if (curBlock.height <= curState.fullValidationStatus.lastValidatedBlock.height || curBlock.height <= curState.finalizedBlock.height) {
16801680 Right (acc)
16811681 } else {
@@ -1702,7 +1702,7 @@ class ELUpdater(
17021702 loop(curState.lastContractBlock, List .empty)
17031703 }
17041704
1705- private def confirmBlock (block : L2BlockLike , finalizedBlock : L2BlockLike ): JobResult [PayloadStatus ] = {
1705+ private def confirmBlock (block : L2BlockLike , finalizedBlock : L2BlockLike ): Result [PayloadStatus ] = {
17061706 val finalizedBlockHash = if (finalizedBlock.height > block.height) block.hash else finalizedBlock.hash
17071707 engineApiClient.forkchoiceUpdated(block.hash, finalizedBlockHash)
17081708 }
@@ -1841,7 +1841,7 @@ object ELUpdater {
18411841
18421842 def registryKey (chainContract : Address ): String = s " unit_ ${chainContract}_approved "
18431843
1844- private def validateE2CTransfers (contractBlock : ContractBlock , ecBlockLogs : List [GetLogsResponseEntry ]): JobResult [Unit ] =
1844+ private def validateE2CTransfers (contractBlock : ContractBlock , ecBlockLogs : List [GetLogsResponseEntry ]): Result [Unit ] =
18451845 for {
18461846 elRootHash <- BridgeMerkleTree .getE2CTransfersRootHash(ecBlockLogs)
18471847 _ <- Either .raiseUnless(java.util.Arrays .equals(contractBlock.e2cTransfersRootHash, elRootHash)) { // elRootHash is the source of true
0 commit comments