Skip to content

Commit

Permalink
v0.42.2 (#55)
Browse files Browse the repository at this point in the history
* fix: multisig invalid pubkey error ethermint

* fix: gasless panic out of gas

* feat: add begin block clock module

* feat: add multi-sig test cases & pump version to 0.42.2

* chore: add multi-sign docker test

* fix: pass e2e docker tests

* chore: fix test multi docker for amd64
  • Loading branch information
ducphamle2 authored Aug 6, 2024
1 parent 8c54a51 commit 429ed2e
Show file tree
Hide file tree
Showing 13 changed files with 355 additions and 92 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ Cosmos based blockchain integrated with Smart Contracts [Orai](https://orai.io).

```bash
# dev
docker build -t <image-tag> -f orai/Dockerfile --build-arg WASMVM_VERSION=v1.5.2 --build-arg VERSION=v0.42.1 .
docker build -t <image-tag> -f orai/Dockerfile --build-arg WASMVM_VERSION=v1.5.2 --build-arg VERSION=v0.42.2 .

# prod
docker build -t <image-tag> -f orai/Dockerfile.prod --build-arg WASMVM_VERSION=v1.5.2 --build-arg VERSION=v0.42.1 .
docker build -t <image-tag> -f orai/Dockerfile.prod --build-arg WASMVM_VERSION=v1.5.2 --build-arg VERSION=v0.42.2 .
```

## Upgrade command

```bash
oraid tx gov submit-proposal software-upgrade "v0.42.1" --title "upgrade Oraichain network to v0.42.1" --description "Please visit https://github.com/oraichain/orai/releases/tag/v0.42.1 to view the CHANGELOG for this upgrade" --from wallet --upgrade-height 21627705 --upgrade-info "https://github.com/oraichain/orai/releases/download/v0.42.1/manifest.json" --deposit 10000000orai --chain-id Oraichain -y -b block --gas-prices 0.001orai --gas 20000000 --node https://rpc.orai.io:443
```
oraid tx gov submit-proposal software-upgrade "v0.42.2" --title "upgrade Oraichain network to v0.42.2" --description "Please visit https://github.com/oraichain/orai/releases/tag/v0.42.2 to view the CHANGELOG for this upgrade" --from wallet --upgrade-height 21627705 --upgrade-info "https://github.com/oraichain/orai/releases/download/v0.42.2/manifest.json" --deposit 10000000orai --chain-id Oraichain -y -b block --gas-prices 0.001orai --gas 20000000 --node https://rpc.orai.io:443
```
197 changes: 193 additions & 4 deletions go.work.sum

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions orai/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const appName = "Oraichain"
var (
NodeDir = ".oraid"

BinaryVersion = "v0.42.1"
BinaryVersion = "v0.42.2"

// If EnabledSpecificProposals is "", and this is "true", then enable all x/wasm proposals.
// If EnabledSpecificProposals is "", and this is not "true", then disable all x/wasm proposals.
Expand Down Expand Up @@ -1145,12 +1145,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
func (app *OraichainApp) upgradeHandler() {
app.upgradeKeeper.SetUpgradeHandler(BinaryVersion, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
response, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
ctx.Logger().Info("Start updating tokenfactory params...")
tokenfactoryParams := tokenfactorytypes.DefaultParams()
tokenfactoryParams.DenomCreationFee = sdk.NewCoins(sdk.NewInt64Coin(appconfig.MinimalDenom, 10_000_000))
app.TokenFactoryKeeper.SetParams(ctx, tokenfactoryParams)
ctx.Logger().Info("Finished updating tokenfactory params...")

return response, err
})

Expand All @@ -1162,7 +1156,7 @@ func (app *OraichainApp) upgradeHandler() {
if upgradeInfo.Name == BinaryVersion && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
// configure store loader that checks if version == upgradeHeight and applies store upgrades
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storetypes.StoreUpgrades{
Added: []string{tokenfactorytypes.ModuleName},
Added: []string{},
}))
}
}
Expand Down
9 changes: 4 additions & 5 deletions orai/docker-compose-e2e-upgrade.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: '3.3'
services:
validator1:
container_name: validator1
image: oraichain/foundation-orai:0.42.0-alpine-prod # one version lower so we can test the network upgrade
image: oraichain/foundation-orai:0.42.1-alpine-prod # one version lower so we can test the network upgrade
working_dir: /workspace
tty: true
ulimits:
Expand All @@ -22,7 +21,7 @@ services:

validator2:
container_name: validator2
image: oraichain/foundation-orai:0.42.0-alpine-prod
image: oraichain/foundation-orai:0.42.1-alpine-prod
working_dir: /workspace
tty: true
ulimits:
Expand All @@ -41,7 +40,7 @@ services:

validator3:
container_name: validator3
image: oraichain/foundation-orai:0.42.0-alpine-prod
image: oraichain/foundation-orai:0.42.1-alpine-prod
working_dir: /workspace
tty: true
ulimits:
Expand All @@ -56,4 +55,4 @@ services:
cap_add:
- SYS_PTRACE
volumes:
- ./:/workspace
- ./:/workspace
3 changes: 1 addition & 2 deletions orai/docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: "3.3"
services:
orai:
container_name: orai_node
image: oraichain/foundation-orai:0.42.1-alpine-prod
image: oraichain/foundation-orai:0.42.2-alpine-prod
working_dir: /workspace
tty: true
ulimits:
Expand Down
3 changes: 1 addition & 2 deletions orai/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: "3.3"
services:
orai:
container_name: orai_node
image: oraichain/foundation-orai:0.42.1-alpine-dev
image: oraichain/foundation-orai:0.42.2-alpine-dev
working_dir: /workspace
tty: true
ulimits:
Expand Down
37 changes: 18 additions & 19 deletions orai/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require (
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-db v1.0.0 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/gogoproto v1.4.6 // indirect
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v1.0.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
Expand Down Expand Up @@ -99,10 +99,10 @@ require (
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/orderedcode v0.0.1 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
Expand Down Expand Up @@ -143,7 +143,7 @@ require (
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
Expand Down Expand Up @@ -172,20 +172,19 @@ require (
github.com/zondax/ledger-go v0.14.1 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 // indirect
Expand All @@ -201,12 +200,12 @@ replace (
github.com/CosmWasm/token-factory => github.com/CosmosContracts/token-factory v1.2.1-juno.0.20230523144425-253f9b9df6a6

// fork wasmd so that we have legacy wasm types
github.com/CosmWasm/wasmd => github.com/oraichain/wasmd v0.30.2-0.20240701025001-60163da93f49
github.com/CosmWasm/wasmd => github.com/oraichain/wasmd v0.30.2-0.20240729102409-91ec1f5fdc6c

// go list -m -json github.com/oraichain/wasmvm@main | jq '.|"\(.Path) \(.Version)"' -r
github.com/CosmWasm/wasmvm => github.com/oraichain/wasmvm v1.5.2

github.com/CosmosContracts/juno/v18/x/clock => github.com/oraichain/juno/x/clock v0.0.0-20231104204142-9bedf967a294
github.com/CosmosContracts/juno/v18/x/clock => github.com/oraichain/juno/x/clock v0.0.0-20240730041913-b862021c6b14
// same version as cosmos-sdk
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2

Expand All @@ -230,7 +229,7 @@ replace (
// Use ethermint fork that respects min-gas-price with NoBaseFee true and london enabled, and includes eip712 support
// also add params query, fix proto account & ibc v3 to v4 compatibility, and get first 4 bytes of sha256(chain_id) when not eip159 compatible
// also add evm & cosmos mapping
github.com/tharsis/ethermint => github.com/oraichain/ethermint v0.14.1-0.20240712211341-3a9a2f2dabad
github.com/tharsis/ethermint => github.com/oraichain/ethermint v0.14.1-0.20240730173417-7e4df27e54fd

google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
Loading

0 comments on commit 429ed2e

Please sign in to comment.