forked from hyperledger/firefly-evmconnect
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request hyperledger#142 from hyperledger/ws-blocks
Faster block detection using WebSocket notifications
- Loading branch information
Showing
10 changed files
with
320 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // Copyright © 2024 Kaleido, Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package ethereum | ||
|
|
||
| import ( | ||
| "context" | ||
| "strconv" | ||
|
|
||
| "github.com/hyperledger/firefly-common/pkg/fftypes" | ||
| "github.com/hyperledger/firefly-common/pkg/i18n" | ||
| "github.com/hyperledger/firefly-common/pkg/log" | ||
| "github.com/hyperledger/firefly-evmconnect/internal/msgs" | ||
| "github.com/hyperledger/firefly-signer/pkg/ethtypes" | ||
| "github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi" | ||
| ) | ||
|
|
||
| // blockInfoJSONRPC are the info fields we parse from the JSON/RPC response, and cache | ||
| type blockInfoJSONRPC struct { | ||
| Number *ethtypes.HexInteger `json:"number"` | ||
| Hash ethtypes.HexBytes0xPrefix `json:"hash"` | ||
| ParentHash ethtypes.HexBytes0xPrefix `json:"parentHash"` | ||
| Timestamp *ethtypes.HexInteger `json:"timestamp"` | ||
| Transactions []ethtypes.HexBytes0xPrefix `json:"transactions"` | ||
| } | ||
|
|
||
| func transformBlockInfo(bi *blockInfoJSONRPC, t *ffcapi.BlockInfo) { | ||
| t.BlockNumber = (*fftypes.FFBigInt)(bi.Number) | ||
| t.BlockHash = bi.Hash.String() | ||
| t.ParentHash = bi.ParentHash.String() | ||
| stringHashes := make([]string, len(bi.Transactions)) | ||
| for i, th := range bi.Transactions { | ||
| stringHashes[i] = th.String() | ||
| } | ||
| t.TransactionHashes = stringHashes | ||
| } | ||
|
|
||
| func (bl *blockListener) addToBlockCache(blockInfo *blockInfoJSONRPC) { | ||
| bl.blockCache.Add(blockInfo.Hash.String(), blockInfo) | ||
| bl.blockCache.Add(blockInfo.Number.BigInt().String(), blockInfo) | ||
| } | ||
|
|
||
| func (bl *blockListener) getBlockInfoByNumber(ctx context.Context, blockNumber int64, allowCache bool, expectedHashStr string) (*blockInfoJSONRPC, ffcapi.ErrorReason, error) { | ||
| var blockInfo *blockInfoJSONRPC | ||
| if allowCache { | ||
| cached, ok := bl.blockCache.Get(strconv.FormatInt(blockNumber, 10)) | ||
| if ok { | ||
| blockInfo = cached.(*blockInfoJSONRPC) | ||
| if expectedHashStr != "" && blockInfo.ParentHash.String() != expectedHashStr { | ||
| log.L(ctx).Debugf("Block cache miss for block %d due to mismatched parent hash expected=%s found=%s", blockNumber, expectedHashStr, blockInfo.ParentHash) | ||
| blockInfo = nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if blockInfo == nil { | ||
| rpcErr := bl.backend.CallRPC(ctx, &blockInfo, "eth_getBlockByNumber", ethtypes.NewHexInteger64(blockNumber), false /* only the txn hashes */) | ||
| if rpcErr != nil { | ||
| if mapError(blockRPCMethods, rpcErr.Error()) == ffcapi.ErrorReasonNotFound { | ||
| log.L(ctx).Debugf("Received error signifying 'block not found': '%s'", rpcErr.Message) | ||
| return nil, ffcapi.ErrorReasonNotFound, i18n.NewError(ctx, msgs.MsgBlockNotAvailable) | ||
| } | ||
| return nil, ffcapi.ErrorReason(""), rpcErr.Error() | ||
| } | ||
| if blockInfo == nil { | ||
| return nil, ffcapi.ErrorReason(""), nil | ||
| } | ||
| bl.addToBlockCache(blockInfo) | ||
| } | ||
|
|
||
| return blockInfo, "", nil | ||
| } | ||
|
|
||
| func (bl *blockListener) getBlockInfoByHash(ctx context.Context, hash0xString string) (*blockInfoJSONRPC, error) { | ||
| var blockInfo *blockInfoJSONRPC | ||
| cached, ok := bl.blockCache.Get(hash0xString) | ||
| if ok { | ||
| blockInfo = cached.(*blockInfoJSONRPC) | ||
| } | ||
|
|
||
| if blockInfo == nil { | ||
| rpcErr := bl.backend.CallRPC(ctx, &blockInfo, "eth_getBlockByHash", hash0xString, false /* only the txn hashes */) | ||
| if rpcErr != nil || blockInfo == nil { | ||
| var err error | ||
| if rpcErr != nil { | ||
| err = rpcErr.Error() | ||
| } | ||
| return nil, err | ||
| } | ||
| bl.addToBlockCache(blockInfo) | ||
| } | ||
|
|
||
| return blockInfo, nil | ||
| } |
Oops, something went wrong.