-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
P2P sync update for 0.13.2 hashing scheme (#2033)
feat: add hash map for verifying pre-0.13.2 blocks - Introduced a map of post-0.13.2 hashes for pre-0.13.2 blocks to enable their verification. - Compute post-0.13.2 commitments for pre-0.13.2 blocks when syncing with clients using commitments. - Temporary measure to support pre-0.13.2 blocks; will be removed once no longer needed.
- Loading branch information
Showing
15 changed files
with
278 additions
and
102 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,36 @@ | ||
| package core2p2p | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/NethermindEth/juno/core" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestReceiptCommon(t *testing.T) { | ||
| t.Run("successful", func(t *testing.T) { | ||
| receipt := &core.TransactionReceipt{ | ||
| Reverted: false, | ||
| } | ||
| r := receiptCommon(receipt) | ||
| // if RevertReason is nil then receipt considered as non reverted | ||
| assert.Nil(t, r.RevertReason) | ||
| }) | ||
| t.Run("reverted", func(t *testing.T) { | ||
| receipts := []*core.TransactionReceipt{ | ||
| { | ||
| Reverted: true, | ||
| RevertReason: "Reason", | ||
| }, | ||
| { | ||
| Reverted: true, | ||
| RevertReason: "", | ||
| }, | ||
| } | ||
|
|
||
| for _, receipt := range receipts { | ||
| r := receiptCommon(receipt) | ||
| assert.Equal(t, &receipt.RevertReason, r.RevertReason) | ||
| } | ||
| }) | ||
| } |
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,47 @@ | ||
| package p2p2core_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/NethermindEth/juno/adapters/p2p2core" | ||
| "github.com/NethermindEth/juno/p2p/gen" | ||
| "github.com/NethermindEth/juno/utils" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestAdaptReceipt(t *testing.T) { | ||
| t.Run("successful", func(t *testing.T) { | ||
| hash := utils.HexToFelt(t, "0xCAFEBABE") | ||
| receipt := &gen.Receipt{ | ||
| Type: &gen.Receipt_L1Handler_{ | ||
| L1Handler: &gen.Receipt_L1Handler{ | ||
| Common: &gen.Receipt_Common{ | ||
| RevertReason: nil, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| r := p2p2core.AdaptReceipt(receipt, hash) | ||
| assert.False(t, r.Reverted) | ||
| assert.Equal(t, "", r.RevertReason) | ||
| }) | ||
| t.Run("reverted", func(t *testing.T) { | ||
| reasons := []string{"reason", ""} | ||
|
|
||
| for _, reason := range reasons { | ||
| hash := utils.HexToFelt(t, "0xCAFEDEAD") | ||
| receipt := &gen.Receipt{ | ||
| Type: &gen.Receipt_L1Handler_{ | ||
| L1Handler: &gen.Receipt_L1Handler{ | ||
| Common: &gen.Receipt_Common{ | ||
| RevertReason: utils.Ptr(reason), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| r := p2p2core.AdaptReceipt(receipt, hash) | ||
| assert.True(t, r.Reverted) | ||
| assert.Equal(t, receipt.GetL1Handler().GetCommon().GetRevertReason(), r.RevertReason) | ||
| } | ||
| }) | ||
| } |
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
File renamed without changes.
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,27 @@ | ||
| package core | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/Masterminds/semver/v3" | ||
| ) | ||
|
|
||
| var ( | ||
| Ver0_13_2 = semver.MustParse("0.13.2") | ||
| Ver0_13_4 = semver.MustParse("0.13.4") | ||
| ) | ||
|
|
||
| // ParseBlockVersion computes the block version, defaulting to "0.0.0" for empty strings | ||
| func ParseBlockVersion(protocolVersion string) (*semver.Version, error) { | ||
| if protocolVersion == "" { | ||
| return semver.NewVersion("0.0.0") | ||
| } | ||
|
|
||
| sep := "." | ||
| digits := strings.Split(protocolVersion, sep) | ||
| // pad with 3 zeros in case version has less than 3 digits | ||
| digits = append(digits, []string{"0", "0", "0"}...) | ||
|
|
||
| // get first 3 digits only | ||
| return semver.NewVersion(strings.Join(digits[:3], sep)) | ||
| } |
Oops, something went wrong.