Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
spoo-bar authored Jul 2, 2024
2 parents 0fe0153 + 4526629 commit 6146342
Show file tree
Hide file tree
Showing 194 changed files with 10,801 additions and 9,479 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ This checklist is to be used for tracking the final things to do to wrap up a ne
package upgradelatest

import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
storetypes "cosmossdk.io/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/archway-network/archway/app/keepers"
"github.com/archway-network/archway/app/upgrades"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/interchaintest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
with:
repository: strangelove-ventures/heighliner
path: heighliner
ref: 'v1.5.5'


- name: Setup up Golang
uses: actions/setup-go@v4
Expand Down
28 changes: 15 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,33 @@ Contains bug fixes.
Contains all the PRs that improved the code without changing the behaviors.
-->

## [Unreleased]
## [v8.0.0](https://github.com/archway-network/archway/releases/tag/v8.0.0)

### Added
- [#577](https://github.com/archway-network/archway/pull/577) - Adding a cute ascii art of Archway for the cli

### Changed
- [#573](https://github.com/archway-network/archway/pull/573) - Bump cosmos-sdk to v0.50.6 and ibc to v8.2.1

### Fixed
- [#569](https://github.com/archway-network/archway/pull/569) - Audit remidiations for x/cwerrors and x/cwica
- [#566](https://github.com/archway-network/archway/pull/566) - Fixing the localnet script to correctly set gov params post sdk v47

### Improvements

- [#571](https://github.com/archway-network/archway/pull/571) - Automatically
publish proto files to buf.build
- [#567](https://github.com/archway-network/archway/pull/567) - Remove redundant params fetching in SaveCallback
- [#572](https://github.com/archway-network/archway/pull/572) - Using buf 1.31 to push files

## [v7.0.1](https://github.com/archway-network/archway/releases/tag/v7.0.1)
## [v7.0.1](https://github.com/archway-network/archway/releases/tag/v7.0.0)

### Added

- [#571](https://github.com/archway-network/archway/pull/571) - Automatically
publish proto files to buf.build
- [#571](https://github.com/archway-network/archway/pull/571) - Automatically publish proto files to buf.build

### Fixed

- [#568](https://github.com/archway-network/archway/pull/568) - Update Swagger doc and config to include CWICA and CWErrors modules
- [#570](https://github.com/archway-network/archway/pull/570) - Fix the Docker.deprecated file to build
- [#569](https://github.com/archway-network/archway/pull/569) - Audit remidiations for x/cwerrors and x/cwica

- [#566](https://github.com/archway-network/archway/pull/566) - Fixing the localnet script to correctly set gov params post sdk v47

### Improvements

- [#567](https://github.com/archway-network/archway/pull/567) - Remove redundant params fetching in SaveCallback

## [v7.0.0](https://github.com/archway-network/archway/releases/tag/v7.0.0)

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.deprecated
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ RUN archwayd ensure-binary

# rest server
EXPOSE 1317
# tendermint p2p
# comet p2p
EXPOSE 26656
# tendermint rpc
# comet rpc
EXPOSE 26657

ENTRYPOINT [ "/usr/bin/archwayd" ]
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN apk add --no-cache bash jq

# rest server
EXPOSE 1317
# tendermint p2p
# comet p2p
EXPOSE 26656
# tendermint rpc
# comet rpc
EXPOSE 26657

ENTRYPOINT [ "/usr/bin/archwayd" ]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The core implementation of the Archway protocol leverages the [Cosmos SDK](https
The following specifications have been found to work well:

- An x86-64 (amd64) multi-core CPU (AMD / Intel);
- Higher clock speeds are preferred as Tendermint is mostly single-threaded;
- Higher clock speeds are preferred as CometBFT is mostly single-threaded;
- 64GB RAM;
- 1TB NVMe SSD Storage (disk i/o is crucial);
- 100Mbps bi-directional Internet connection;
Expand Down
12 changes: 6 additions & 6 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
package app

import (
corestoretypes "cosmossdk.io/core/store"
errorsmod "cosmossdk.io/errors"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"

"github.com/archway-network/archway/x/cwfees"

Expand All @@ -30,7 +30,7 @@ type HandlerOptions struct {
WasmConfig *wasmTypes.WasmConfig
RewardsAnteBankKeeper rewardsAnte.BankKeeper

TXCounterStoreKey storetypes.StoreKey
TXCounterStoreService corestoretypes.KVStoreService

TrackingKeeper trackingKeeper.Keeper
RewardsKeeper rewardsKeeper.Keeper
Expand All @@ -52,7 +52,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
if options.WasmConfig == nil {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
}
if options.TXCounterStoreKey == nil {
if options.TXCounterStoreService == nil {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
}

Expand All @@ -70,7 +70,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
ante.NewSetUpContextDecorator(),
// After setup context to enforce limits early
wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
ante.NewValidateBasicDecorator(),
ante.NewTxTimeoutHeightDecorator(),
Expand Down
Loading

0 comments on commit 6146342

Please sign in to comment.