Skip to content

Commit

Permalink
Merge branch 'main' into feat/hyperspace (#492)
Browse files Browse the repository at this point in the history
* Param proposals, balance inquiries, and IBC transfer error handling (#393)

* Extract file writing/copying logic to helpers

* Add ParamChangeProposal

* Update file naming for param change proposal

* Use Code to detect errors in IBC transfers

* Add AllBalances and ParamChangeProposal

* Add support for the Hermes relayer (#396)

* adding some scaffolding for hermes relayer

* chore: updating interface to accept create connection options type

* chore: wip

* wip: adding path map to hermes relayer type

* writing mnemonic file

* correctly reading toml config

* ibc test passing with hermes relayer

* learn ibc test passing with hermes relayer

* adding parse client and connection output

* adding hermes test cases

* remove unused types

* undid import change

* reverted import change

* reverted some unintentional changes

* fix linting error

* adding hermes to conformance matrix

* adding default value for matrix file for CI

* pass absolute value for matrix file

* removed extra part of path

* adding hermes to Labels function

* add capabilities for hermes

* temporarily strip down number of tests to verify hermes relayer

* fixing conformance tests

* fixing channel tests in TestRelayerSetup

* revert to go rly to test

* bump hermes version

* extract json response correctly

* extract json result from stdout

* correct channel parsing json stdout

* set field ClearOnStart to true

* switch back to go relayer as default

* add hermes to the default relayers list

* update penumbra chain spin-up (#409)

* Create .github/dependabot.yml

Start dependabot.

* Bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (#432)

Bumps [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/BurntSushi/toml/releases)
- [Commits](BurntSushi/toml@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: github.com/BurntSushi/toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump modernc.org/sqlite from 1.17.3 to 1.21.0 (#433)

---
updated-dependencies:
- dependency-name: modernc.org/sqlite
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump leonsteinhaeuser/project-beta-automations from 2.0.1 to 2.1.0 (#428)

Bumps [leonsteinhaeuser/project-beta-automations](https://github.com/leonsteinhaeuser/project-beta-automations) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/leonsteinhaeuser/project-beta-automations/releases)
- [Commits](leonsteinhaeuser/project-beta-automations@v2.0.1...v2.1.0)

---
updated-dependencies:
- dependency-name: leonsteinhaeuser/project-beta-automations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <[email protected]>

* Bump golangci/golangci-lint-action from 2 to 3 (#429)

Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 2 to 3.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v2...v3)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <[email protected]>

* Bump actions/checkout from 1 to 3 (#430)

Bumps [actions/checkout](https://github.com/actions/checkout) from 1 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v1...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <[email protected]>

* Bump github.com/gdamore/tcell/v2 (#434)

Bumps [github.com/gdamore/tcell/v2](https://github.com/gdamore/tcell) from 2.4.1-0.20210905002822-f057f0a857a1 to 2.6.0.
- [Release notes](https://github.com/gdamore/tcell/releases)
- [Commits](https://github.com/gdamore/tcell/commits/v2.6.0)

---
updated-dependencies:
- dependency-name: github.com/gdamore/tcell/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <[email protected]>

* Bump github.com/avast/retry-go/v4 from 4.0.4 to 4.3.3 (#437)

Bumps [github.com/avast/retry-go/v4](https://github.com/avast/retry-go) from 4.0.4 to 4.3.3.
- [Release notes](https://github.com/avast/retry-go/releases)
- [Commits](avast/retry-go@4.0.4...4.3.3)

---
updated-dependencies:
- dependency-name: github.com/avast/retry-go/v4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github.com/stretchr/testify from 1.8.1 to 1.8.2 (#436)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump go.uber.org/zap from 1.21.0 to 1.24.0 (#439)

Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.21.0 to 1.24.0.
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](uber-go/zap@v1.21.0...v1.24.0)

---
updated-dependencies:
- dependency-name: go.uber.org/zap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <[email protected]>

* Cosmos SDK v0.47 (#359)

* chore: update to 0.47

* bump go

* updates

* updates

* feedback

* Fix BroadcastSync for cosmos broadcaster (#360)

* Fix BroadcastSync for cosmos broadcaster

* Fixing docstring

* public grpc, register tmlightclient codecs as no longer by default, attempt base64 decode on key if string value doesn't match for backwards compatibility

Add test for IBC with chains pre/post SDK 47 upgrade

* Bump ibc-go to latest commit

* deps: upgrade to ibc-go/v7 and bump ibctest go mod (#372)

* bumping ibc-go to v7 branch

* bumping ibctest go mod to v7

* chore: align User interface with CosmosWallet and fix issue with broadcast mode sync (#388)

* chore: v0.47 branch merge and bumps (#406)

* Param proposals, balance inquiries, and IBC transfer error handling (#393)

* Extract file writing/copying logic to helpers

* Add ParamChangeProposal

* Update file naming for param change proposal

* Use Code to detect errors in IBC transfers

* Add AllBalances and ParamChangeProposal

* Add support for the Hermes relayer (#396)

* adding some scaffolding for hermes relayer

* chore: updating interface to accept create connection options type

* chore: wip

* wip: adding path map to hermes relayer type

* writing mnemonic file

* correctly reading toml config

* ibc test passing with hermes relayer

* learn ibc test passing with hermes relayer

* adding parse client and connection output

* adding hermes test cases

* remove unused types

* undid import change

* reverted import change

* reverted some unintentional changes

* fix linting error

* adding hermes to conformance matrix

* adding default value for matrix file for CI

* pass absolute value for matrix file

* removed extra part of path

* adding hermes to Labels function

* add capabilities for hermes

* temporarily strip down number of tests to verify hermes relayer

* fixing conformance tests

* fixing channel tests in TestRelayerSetup

* revert to go rly to test

* bump hermes version

* extract json response correctly

* extract json result from stdout

* correct channel parsing json stdout

* set field ClearOnStart to true

* switch back to go relayer as default

* add hermes to the default relayers list

* Update version of ibc-go from v6 to v7 from merge

* Bump sdk and ibc-go

---------

Co-authored-by: bigs <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>

* deps: bump SDK to v0.47-rc3 (#414)

Co-authored-by: Carlos Rodriguez <[email protected]>

* Consolidate flush command into single command (#417)

* Consolidate flush command into single command

* Updates for hermes

* Bump to rly default with consolidated flush

* Flush with channelID since hermes requires it

* feat: add ReadFile method for reading files from docker fs (#423)

Expose a ReadFile method on ChainNode so that you can read files from the docker filesystem within test cases that exist in downstream repos.

---------

Co-authored-by: Justin Tieri <[email protected]>

* Add support for genesis sub commands (#384)

* Add support for genesis sub commands

* Remove logging and add some basic documentation for UsingNewGenesisCommand

* Remove UsingNewGenesisCommand from chainspec + add test

---------

Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>
Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: Gjermund Garaba <[email protected]>
Co-authored-by: bigs <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Justin Tieri <[email protected]>

* Add image repo to upgradeVersion (#445)

* add image reop to upgradeVersion

* container repo

* juno container repo

* fix order

* capitalization

* generate explicit port bindings (#444)

* generate explicit port bindings

* Prevent race to open ports between closing tmp listeners and starting containers

* Bump github.com/cosmos/ibc-go/v7 from 7.0.0-rc1 to 7.0.0 (#451)

Bumps [github.com/cosmos/ibc-go/v7](https://github.com/cosmos/ibc-go) from 7.0.0-rc1 to 7.0.0.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/main/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v7.0.0-rc1...v7.0.0)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump golang.org/x/tools from 0.6.0 to 0.7.0 (#449)

Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.6.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* fix: remove race condition on start container retries (#415)

* fix: increase retry to 15 seconds to avoid retrying a command exec

* chore: increase log tail, simplify start container logic

* chore: cleanup, revert change, add in-code comment

* chore: remove reference to retry

* Bump github.com/libp2p/go-libp2p-core from 0.15.1 to 0.20.1 (#440)

Bumps [github.com/libp2p/go-libp2p-core](https://github.com/libp2p/go-libp2p-core) from 0.15.1 to 0.20.1.
- [Release notes](https://github.com/libp2p/go-libp2p-core/releases)
- [Commits](libp2p/go-libp2p-core@v0.15.1...v0.20.1)

---
updated-dependencies:
- dependency-name: github.com/libp2p/go-libp2p-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* consolidate create node container (#447)

* generate explicit port bindings

* Prevent race to open ports between closing tmp listeners and starting containers

* Consolidate create node container

* Use RWMutex

* initialize containerLifecycle for penumbra node

* Bump rly to v2.3.0-rc2

* Temporarily modify version

* Bump github.com/centrifuge/go-substrate-rpc-client/v4 (#438)

Bumps [github.com/centrifuge/go-substrate-rpc-client/v4](https://github.com/centrifuge/go-substrate-rpc-client) from 4.0.10 to 4.0.12.
- [Release notes](https://github.com/centrifuge/go-substrate-rpc-client/releases)
- [Commits](centrifuge/go-substrate-rpc-client@v4.0.10...v4.0.12)

---
updated-dependencies:
- dependency-name: github.com/centrifuge/go-substrate-rpc-client/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump actions/setup-go from 3 to 4 (#472)

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Migrate docker relayer to ContainerLifecycle (#466)

* Bump default rly version to v2.3.0-rc4

* update docker relayer to use ContainerLifecycle

* Add nil check

* Make ICA waits more explicit (#471)

* Make ICA waits more explicit

* Poll for channel close

* Bump modernc.org/sqlite from 1.21.0 to 1.21.1 (#473)

Bumps [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) from 1.21.0 to 1.21.1.
- [Release notes](https://gitlab.com/cznic/sqlite/tags)
- [Commits](https://gitlab.com/cznic/sqlite/compare/v1.21.0...v1.21.1)

---
updated-dependencies:
- dependency-name: modernc.org/sqlite
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump google.golang.org/grpc from 1.53.0 to 1.54.0 (#463)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.53.0 to 1.54.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.53.0...v1.54.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump github.com/cosmos/cosmos-sdk from 0.47.0 to 0.47.1 (#462)

Bumps [github.com/cosmos/cosmos-sdk](https://github.com/cosmos/cosmos-sdk) from 0.47.0 to 0.47.1.
- [Release notes](https://github.com/cosmos/cosmos-sdk/releases)
- [Changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.47.1/CHANGELOG.md)
- [Commits](cosmos/cosmos-sdk@v0.47.0...v0.47.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/cosmos-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>

* Bump github.com/99designs/keyring from 1.2.1 to 1.2.2 (#450)

Bumps [github.com/99designs/keyring](https://github.com/99designs/keyring) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/99designs/keyring/releases)
- [Commits](99designs/keyring@v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: github.com/99designs/keyring
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>
Co-authored-by: Dan Kanefsky <[email protected]>

* Update `ExportState`  (#475)

* update exportstate

* add space

* concatenate stdout and stderr

* use ChainConfig in RestoreKey relayer

* fix mini bug

* fix lint

* use cmd create node same main

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: bigs <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>
Co-authored-by: Dan Kanefsky <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Gouin <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: Gjermund Garaba <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Justin Tieri <[email protected]>
Co-authored-by: colin axnér <[email protected]>
Co-authored-by: Nguyen Thanh Nhan <[email protected]>
  • Loading branch information
14 people authored Apr 12, 2023
1 parent d76b929 commit a6c0457
Show file tree
Hide file tree
Showing 58 changed files with 2,525 additions and 1,158 deletions.
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
labels:
- dependencies

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
open-pull-requests-limit: 10
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: latest
only-new-issues: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prior-version-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: release_pull_request
steps:
- name: checkout
uses: actions/checkout@v1
uses: actions/checkout@v3
- name: Create PR to branch
uses: gorillio/github-action-cherry-pick@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/strangelove-project-management.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened')
steps:
- name: Add Issue to "Motherboard" Project Board
uses: leonsteinhaeuser/project-beta-automations@v2.0.1
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
with:
gh_app_secret_key: ${{ secrets.MB_SECRET_KEY }}
gh_app_ID: ${{ secrets.MB_APP_ID }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
# Install and setup go
- name: Set up Go 1.19
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19

Expand All @@ -39,7 +39,7 @@ jobs:
steps:
# Install and setup go
- name: Set up Go 1.19
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19

Expand All @@ -60,7 +60,7 @@ jobs:
steps:
# Install and setup go
- name: Set up Go 1.19
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19

Expand All @@ -81,7 +81,7 @@ jobs:
steps:
# Install and setup go
- name: Set up Go 1.19
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19

Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Don't commit the interchaintest.test file,
# regardless of where it was built.
interchaintest.test

/bin
.idea
/bin
vendor
2 changes: 1 addition & 1 deletion chain/cosmos/broadcaster.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (b *Broadcaster) GetClientContext(ctx context.Context, user User) (client.C
if !ok {
localDir := b.t.TempDir()
containerKeyringDir := path.Join(cn.HomeDir(), "keyring-test")
kr, err := dockerutil.NewLocalKeyringFromDockerContainer(ctx, cn.DockerClient, localDir, containerKeyringDir, cn.containerID)
kr, err := dockerutil.NewLocalKeyringFromDockerContainer(ctx, cn.DockerClient, localDir, containerKeyringDir, cn.containerLifecycle.ContainerID())
if err != nil {
return client.Context{}, err
}
Expand Down
Loading

0 comments on commit a6c0457

Please sign in to comment.