zoneconcierge: query inclusion proofs and add them to ProofEpochSealed
#243
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
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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -11,6 +11,7 @@ import ( | |||||
| zckeeper "github.com/babylonchain/babylon/x/zoneconcierge/keeper" | ||||||
| zctypes "github.com/babylonchain/babylon/x/zoneconcierge/types" | ||||||
| "github.com/boljen/go-bitmap" | ||||||
| sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" | ||||||
| "github.com/golang/mock/gomock" | ||||||
| "github.com/stretchr/testify/require" | ||||||
| ) | ||||||
|
|
@@ -33,14 +34,11 @@ func signBLSWithBitmap(blsSKs []bls12381.PrivateKey, bm bitmap.Bitmap, msg []byt | |||||
| // 3. Generate a BLS multisig with >1/3 random validators of the validator set | ||||||
| // 4. Generate a checkpoint based on the above validator subset and the above sealer header | ||||||
| // 5. Execute ProveEpochSealed where the mocked checkpointing keeper produces the above validator set | ||||||
| // 6. Execute VerifyEpochSealed with above epoch, checkpoint and proof, and assert the outcome to be true | ||||||
| // | ||||||
| // Tested property: proof is valid only when | ||||||
| // - BLS sig in proof is valid | ||||||
| func FuzzProofEpochSealed_BLSSig(f *testing.F) { | ||||||
| datagen.AddRandomSeedsToFuzzer(f, 10) | ||||||
|
|
||||||
| f.Fuzz(func(t *testing.T, seed int64) { | ||||||
|
|
@@ -80,8 +78,12 @@ func FuzzProofEpochSealed(f *testing.F) { | |||||
| // mock checkpointing keeper that produces the expected validator set | ||||||
| checkpointingKeeper := zctypes.NewMockCheckpointingKeeper(ctrl) | ||||||
| checkpointingKeeper.EXPECT().GetBLSPubKeySet(gomock.Any(), gomock.Eq(epoch.EpochNumber)).Return(valSet.ValSet, nil).AnyTimes() | ||||||
| // mock epoching keeper | ||||||
| epochingKeeper := zctypes.NewMockEpochingKeeper(ctrl) | ||||||
| epochingKeeper.EXPECT().GetEpoch(gomock.Any()).Return(epoch).AnyTimes() | ||||||
| epochingKeeper.EXPECT().GetHistoricalEpoch(gomock.Any(), gomock.Eq(epoch.EpochNumber)).Return(epoch, nil).AnyTimes() | ||||||
| // create zcKeeper and ctx | ||||||
| zcKeeper, ctx := testkeeper.ZoneConciergeKeeper(t, checkpointingKeeper, nil, epochingKeeper, nil) | ||||||
|
|
||||||
| // prove | ||||||
| proof, err := zcKeeper.ProveEpochSealed(ctx, epoch.EpochNumber) | ||||||
|
|
@@ -92,9 +94,30 @@ func FuzzProofEpochSealed(f *testing.F) { | |||||
| if numSubSet <= numVals*1/3 { // BLS sig does not reach a quorum | ||||||
| require.LessOrEqual(t, subsetPower, uint64(numVals*1/3)) | ||||||
| require.Error(t, err) | ||||||
| require.False(t, sdkerrors.IsOf(zctypes.ErrInvalidMerkleProof, err)) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } else { // BLS sig has a valid quorum | ||||||
| require.Greater(t, subsetPower, valSet.GetTotalPower()*1/3) | ||||||
| require.True(t, sdkerrors.IsOf(zctypes.ErrInvalidMerkleProof, err)) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| }) | ||||||
| } | ||||||
|
|
||||||
| // - TODO: epoch metadata has a valid inclusion proof | ||||||
| func FuzzProofEpochSealed_Epoch(f *testing.F) { | ||||||
| datagen.AddRandomSeedsToFuzzer(f, 10) | ||||||
|
|
||||||
| f.Fuzz(func(t *testing.T, seed int64) { | ||||||
| rand.Seed(seed) | ||||||
|
|
||||||
| }) | ||||||
| } | ||||||
|
|
||||||
| // - TODO: BLS val set has a valid inclusion proof | ||||||
| func FuzzProofEpochSealed_ValSet(f *testing.F) { | ||||||
| datagen.AddRandomSeedsToFuzzer(f, 10) | ||||||
|
|
||||||
| f.Fuzz(func(t *testing.T, seed int64) { | ||||||
| rand.Seed(seed) | ||||||
|
|
||||||
| }) | ||||||
| } | ||||||
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,52 @@ | ||
| package keeper | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/store/rootmulti" | ||
| abci "github.com/tendermint/tendermint/abci/types" | ||
| "github.com/tendermint/tendermint/crypto/merkle" | ||
| tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" | ||
| ) | ||
|
|
||
| // QueryStore queries a KV pair in the KVStore, where | ||
| // - moduleStoreKey is the store key of a module, e.g., zctypes.StoreKey | ||
| // - key is the key of the queried KV pair, including the prefix, e.g., zctypes.EpochChainInfoKey || chainID in the chain info store | ||
| // and returns | ||
| // - key of this KV pair | ||
| // - value of this KV pair | ||
| // - Merkle proof of this KV pair | ||
| // - error | ||
| // (adapted from https://github.com/cosmos/cosmos-sdk/blob/v0.46.6/baseapp/abci.go#L774-L795) | ||
| func (k Keeper) QueryStore(moduleStoreKey string, key []byte, queryHeight int64) ([]byte, []byte, *tmcrypto.ProofOps, error) { | ||
| // construct the query path for ABCI query | ||
| // since we are querying the DB directly, the path will not need prefix "/store" as done in ABCIQuery | ||
| // Instead, it will be formed as "/<moduleStoreKey>/key", e.g., "/epoching/key" | ||
| path := fmt.Sprintf("/%s/key", moduleStoreKey) | ||
|
|
||
| // query the KV with Merkle proof | ||
| resp := k.storeQuerier.Query(abci.RequestQuery{ | ||
| Path: path, | ||
| Data: key, | ||
| Height: queryHeight, | ||
| Prove: true, | ||
| }) | ||
| if resp.Code != 0 { | ||
| return nil, nil, nil, fmt.Errorf("query (with path %s) failed with response: %v", path, resp) | ||
| } | ||
|
|
||
| return resp.Key, resp.Value, resp.ProofOps, nil | ||
| } | ||
|
|
||
| // VerifyStore verifies whether a KV pair is committed to the Merkle root, with the assistance of a Merkle proof | ||
| // (adapted from https://github.com/cosmos/cosmos-sdk/blob/v0.46.6/store/rootmulti/proof_test.go) | ||
| func VerifyStore(root []byte, moduleStoreKey string, key []byte, value []byte, proof *tmcrypto.ProofOps) error { | ||
| prt := rootmulti.DefaultProofRuntime() | ||
|
|
||
| keypath := merkle.KeyPath{} | ||
| keypath = keypath.AppendKey([]byte(moduleStoreKey), merkle.KeyEncodingURL) | ||
| keypath = keypath.AppendKey(key, merkle.KeyEncodingURL) | ||
| keypathStr := keypath.String() | ||
|
|
||
| return prt.VerifyAbsence(proof, root, keypathStr) // TODO: verify value rather than just existence | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be cleaner if we move this function to
x/zoneconcierge/types/keys.go?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is possible. However, my concern is that if we do this, then the function has to be public to any module that imports
zoneconciergetypes. This might be too open. I thus chose to make this function and the belowgetValSetKeyas private functions. If other modules underzoneconciergeneed to use them in the future, I will move them tox/zoneconcierge/types/keys.go. 👍