Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with the ARM architecture #8396

Merged
merged 19 commits into from
Jan 27, 2021
Merged

Compatibility with the ARM architecture #8396

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
72d9dc7
Compatibility with the ARM architecture
RiccardoM Jan 20, 2021
1067651
Trying to fix workflow
RiccardoM Jan 20, 2021
b514e55
Update x/ibc/testing/chain.go
RiccardoM Jan 20, 2021
cc81eb1
Deleted useless comments
RiccardoM Jan 20, 2021
54b2692
Update store/rootmulti/store.go
RiccardoM Jan 20, 2021
676582b
Update store/rootmulti/store.go
RiccardoM Jan 20, 2021
39119cb
Update x/ibc/applications/transfer/module.go
RiccardoM Jan 20, 2021
7fdd9cb
Merge branch 'master' into arm-compilation
Jan 20, 2021
b34e327
Update store/rootmulti/store.go
alessio Jan 20, 2021
c4b8a0a
Update x/ibc/applications/transfer/module.go
alessio Jan 20, 2021
33932ef
Merge branch 'master' into arm-compilation
RiccardoM Jan 25, 2021
9f1f3ba
Update .github/workflows/test.yml
RiccardoM Jan 25, 2021
d97ed62
Update .github/workflows/test.yml
RiccardoM Jan 25, 2021
952e7c8
Merge branch 'master' into arm-compilation
RiccardoM Jan 26, 2021
36f0ece
Added CHANGELOG
RiccardoM Jan 26, 2021
ddf2243
Update Makefile
alessio Jan 27, 2021
d687bc4
Merge branch 'master' into arm-compilation
jgimeno Jan 27, 2021
260ad25
Fixed CI
RiccardoM Jan 27, 2021
6decdaf
Merge remote-tracking branch 'riccardo/arm-compilation' into arm-comp…
RiccardoM Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,28 @@ jobs:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary

build:
runs-on: ubuntu-latest
strategy:
matrix:
go-arch: ["amd64", "arm", "arm64"]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v4
id: git_diff
with:
PREFIX_FILTER: |
cosmovisor
alessio marked this conversation as resolved.
Show resolved Hide resolved
PATTERNS: |
**/**.go
go.mod
go.sum
- name: Build
run: GOARCH=${{ matrix.go-arch }} LEDGER_ENABLED=false make build

test-cosmovisor:
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 3 additions & 3 deletions snapshots/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (s *Store) Get(height uint64, format uint32) (*types.Snapshot, error) {

// Get fetches the latest snapshot from the database, if any.
func (s *Store) GetLatest() (*types.Snapshot, error) {
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(math.MaxUint64, math.MaxUint32))
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(uint64(math.MaxUint64), math.MaxUint32))
if err != nil {
return nil, sdkerrors.Wrap(err, "failed to find latest snapshot")
}
Expand All @@ -111,7 +111,7 @@ func (s *Store) GetLatest() (*types.Snapshot, error) {

// List lists snapshots, in reverse order (newest first).
func (s *Store) List() ([]*types.Snapshot, error) {
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(math.MaxUint64, math.MaxUint32))
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(uint64(math.MaxUint64), math.MaxUint32))
if err != nil {
return nil, sdkerrors.Wrap(err, "failed to list snapshots")
}
Expand Down Expand Up @@ -181,7 +181,7 @@ func (s *Store) loadChunkFile(height uint64, format uint32, chunk uint32) (io.Re

// Prune removes old snapshots. The given number of most recent heights (regardless of format) are retained.
func (s *Store) Prune(retain uint32) (uint64, error) {
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(math.MaxUint64, math.MaxUint32))
iter, err := s.db.ReverseIterator(encodeKey(0, 0), encodeKey(uint64(math.MaxUint64), math.MaxUint32))
if err != nil {
return 0, sdkerrors.Wrap(err, "failed to prune snapshots")
}
Expand Down
4 changes: 2 additions & 2 deletions store/rootmulti/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,9 @@ func (rs *Store) Restore(
if height == 0 {
return sdkerrors.Wrap(sdkerrors.ErrLogic, "cannot restore snapshot at height 0")
}
if height > math.MaxInt64 {
if height > uint64(math.MaxUint64) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh oh, now height can be more than math.MaxInt64 aka >9223372036854775808, up until (1<<64 - 1) aka 18446744073709551615. That seems like a breaking change that's not related to ARM compatibility. The error message doesn't even match this check, plus I don't think there was a test to prevent such a regression. Please advise or revert this check.

Copy link
Contributor Author

@RiccardoM RiccardoM Jan 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was changed here by @alessio. I think he should be able to answer this better. The commit was b34e327

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should fix it #8466 - @odeke-em

return sdkerrors.Wrapf(snapshottypes.ErrInvalidMetadata,
"snapshot height %v cannot exceed %v", height, math.MaxInt64)
"snapshot height %v cannot exceed %v", height, int64(math.MaxInt64))
}

// Signal readiness. Must be done before the readers below are set up, since the zlib
Expand Down
4 changes: 2 additions & 2 deletions x/ibc/applications/transfer/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ func ValidateTransferChannelParams(
if err != nil {
return err
}
if channelSequence > math.MaxUint32 {
return sdkerrors.Wrapf(types.ErrMaxTransferChannels, "channel sequence %d is greater than max allowed transfer channels %d", channelSequence, math.MaxUint32)
if channelSequence > uint64(math.MaxUint32) {
RiccardoM marked this conversation as resolved.
Show resolved Hide resolved
return sdkerrors.Wrapf(types.ErrMaxTransferChannels, "channel sequence %d is greater than max allowed transfer channels %d", channelSequence, uint64(math.MaxUint32))
}
if order != channeltypes.UNORDERED {
return sdkerrors.Wrapf(channeltypes.ErrInvalidChannelOrdering, "expected %s channel, got %s ", channeltypes.UNORDERED, order)
Expand Down
2 changes: 1 addition & 1 deletion x/ibc/core/02-client/types/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func ValidateClientType(clientType string) error {
}

smallestPossibleClientID := FormatClientIdentifier(clientType, 0)
largestPossibleClientID := FormatClientIdentifier(clientType, math.MaxUint64)
largestPossibleClientID := FormatClientIdentifier(clientType, uint64(math.MaxUint64))

// IsValidClientID will check client type format and if the sequence is a uint64
if !IsValidClientID(smallestPossibleClientID) {
Expand Down