Skip to content

Commit e09983a

Browse files
troiantroian
committed
feat(upgrade): setup upgrade info for v2.0.0
Signed-off-by: Artur Troian <[email protected]>
1 parent e566877 commit e09983a

File tree

21 files changed

+279
-226
lines changed

21 files changed

+279
-226
lines changed

‎.goreleaser.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ builds:
1717
- CC=o64-clang
1818
- CXX=o64-clang++
1919
- CGO_CFLAGS=-mmacosx-version-min=10.12
20-
- CGO_LDFLAGS=-L./.cache/lib -mmacosx-version-min=10.12
20+
- CGO_LDFLAGS=-L./.cache/lib` -mmacosx-version-min=10.12
2121
flags:
2222
- "-mod={{ .Env.MOD }}"
2323
- "-tags={{ .Env.BUILD_TAGS }} static_wasm"

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ ifeq (,$(findstring nostrip,$(BUILD_OPTIONS)))
6262
endif
6363

6464
ldflags += $(LDFLAGS)
65+
ldflags += -extldflags "-L$(AKASH_DEVCACHE_LIB)"
6566
ldflags := $(strip $(ldflags))
6667

6768
GORELEASER_TAGS := $(BUILD_TAGS)

‎app/app.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func NewApp(
141141
if vl, valid := val.([]wasmkeeper.Option); valid {
142142
wasmOpts = append(wasmOpts, vl...)
143143
} else {
144-
panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasmh\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(vl).String()))
144+
panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasm\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(vl).String()))
145145
}
146146
}
147147

@@ -163,7 +163,6 @@ func NewApp(
163163
panic(fmt.Sprintf("error while reading wasm config: %s", err))
164164
}
165165

166-
wasmConfig.ContractDebugMode = false
167166
// Memory limits - prevent DoS
168167
wasmConfig.MemoryCacheSize = 100 // 100 MB max
169168
// Query gas limit - prevent expensive queries

‎app/types/app.go‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,8 @@ import (
4848
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
4949
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
5050
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
51-
icacontroller "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller"
52-
icacontrollerkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/keeper"
5351
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
54-
icahostkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/keeper"
5552
icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
56-
ibccallbacks "github.com/cosmos/ibc-go/v10/modules/apps/callbacks"
5753
"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
5854
ibctransferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper"
5955
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
@@ -115,9 +111,9 @@ type AppKeepers struct {
115111
IBC *ibckeeper.Keeper
116112
Evidence *evidencekeeper.Keeper
117113
Transfer ibctransferkeeper.Keeper
118-
ICAController icacontrollerkeeper.Keeper
119-
ICAHost icahostkeeper.Keeper
120-
Wasm *wasmkeeper.Keeper
114+
//ICAController icacontrollerkeeper.Keeper
115+
//ICAHost icahostkeeper.Keeper
116+
Wasm *wasmkeeper.Keeper
121117
}
122118

123119
Akash struct {
@@ -503,17 +499,17 @@ func (app *App) InitNormalKeepers(
503499
// Create Interchain Accounts Stack
504500
// SendPacket, since it is originating from the application to core IBC:
505501
// icaAuthModuleKeeper.SendTx -> icaController.SendPacket -> fee.SendPacket -> channel.SendPacket
506-
var icaControllerStack porttypes.IBCModule
507-
// integration point for custom authentication modules
508-
// sees https://medium.com/the-interchain-foundation/ibc-go-v6-changes-to-interchain-accounts-and-how-it-impacts-your-chain-806c185300d7
509-
var noAuthzModule porttypes.IBCModule
510-
icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(noAuthzModule, app.Keepers.Cosmos.ICAController)
511-
// app.ICAAuthModule = icaControllerStack.(ibcmock.IBCModule)
512-
icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(icaControllerStack, app.Keepers.Cosmos.ICAController)
513-
icaControllerStack = ibccallbacks.NewIBCMiddleware(icaControllerStack, app.Keepers.Cosmos.IBC.ChannelKeeper, wasmStackIBCHandler, wasm.DefaultMaxIBCCallbackGas)
514-
icaICS4Wrapper := icaControllerStack.(porttypes.ICS4Wrapper)
515-
// Since the callback middleware itself is an ics4wrapper, it needs to be passed to the ica controller keeper
516-
app.Keepers.Cosmos.ICAController.WithICS4Wrapper(icaICS4Wrapper)
502+
//var icaControllerStack porttypes.IBCModule
503+
//integration point for custom authentication modules
504+
//sees https://medium.com/the-interchain-foundation/ibc-go-v6-changes-to-interchain-accounts-and-how-it-impacts-your-chain-806c185300d7
505+
//var noAuthzModule porttypes.IBCModule
506+
//icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(noAuthzModule, app.Keepers.Cosmos.ICAController)
507+
//// app.ICAAuthModule = icaControllerStack.(ibcmock.IBCModule)
508+
//icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(icaControllerStack, app.Keepers.Cosmos.ICAController)
509+
//icaControllerStack = ibccallbacks.NewIBCMiddleware(icaControllerStack, app.Keepers.Cosmos.IBC.ChannelKeeper, wasmStackIBCHandler, wasm.DefaultMaxIBCCallbackGas)
510+
//icaICS4Wrapper := icaControllerStack.(porttypes.ICS4Wrapper)
511+
//// Since the callback middleware itself is an ics4wrapper, it needs to be passed to the ica controller keeper
512+
//app.Keepers.Cosmos.ICAController.WithICS4Wrapper(icaICS4Wrapper)
517513

518514
transferIBCModule := transfer.NewIBCModule(app.Keepers.Cosmos.Transfer)
519515

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ require (
4747
google.golang.org/grpc v1.75.0
4848
gopkg.in/yaml.v3 v3.0.1
4949
gotest.tools/v3 v3.5.2
50-
pkg.akt.dev/go v0.1.6-rc1
51-
pkg.akt.dev/go/cli v0.1.5-rc1
50+
pkg.akt.dev/go v0.1.6-rc3
51+
pkg.akt.dev/go/cli v0.1.5-rc3
5252
pkg.akt.dev/go/sdl v0.1.1
5353
)
5454

@@ -61,7 +61,7 @@ replace (
6161
// use akash fork of cometbft
6262
github.com/cometbft/cometbft => github.com/akash-network/cometbft v0.38.19-akash.1
6363
// use akash fork of cosmos sdk
64-
github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10
64+
github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.10
6565

6666
github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2
6767

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,8 +1285,8 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3
12851285
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
12861286
github.com/akash-network/cometbft v0.38.19-akash.1 h1:am45M/0vjs1FEwh1WiLv/cp92Yskj2Dls997phjnxso=
12871287
github.com/akash-network/cometbft v0.38.19-akash.1/go.mod h1:UCu8dlHqvkAsmAFmWDRWNZJPlu6ya2fTWZlDrWsivwo=
1288-
github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10 h1:zPQVFSuBQKE3orKGgePPLU6eWn7kTAMCfuqFFa1Gc3Y=
1289-
github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10/go.mod h1:gZcyUJu6h94FfxgJbuBpiW7RPCFEV/+GJdy4UAJ3Y1Q=
1288+
github.com/akash-network/cosmos-sdk v0.53.4-akash.10 h1:8XyxL+VfqkdVYaDudk4lrNX9vH/n3JxRizcLQlUiC/o=
1289+
github.com/akash-network/cosmos-sdk v0.53.4-akash.10/go.mod h1:gZcyUJu6h94FfxgJbuBpiW7RPCFEV/+GJdy4UAJ3Y1Q=
12901290
github.com/akash-network/gogoproto v1.7.0-akash.2 h1:zY5seM6kBOLMBWn15t8vrY1ao4J1HjrhNaEeO/Soro0=
12911291
github.com/akash-network/gogoproto v1.7.0-akash.2/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
12921292
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -3282,10 +3282,10 @@ nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
32823282
nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
32833283
pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
32843284
pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
3285-
pkg.akt.dev/go v0.1.6-rc1 h1:Bl1/tSPAyUnpPl/rv13pZqAZYp/a5ZNRbIOk6eSFRlw=
3286-
pkg.akt.dev/go v0.1.6-rc1/go.mod h1:lKU6b+hR+LAWslGemTYg8raiBHru4K1jolk+LDUU57Y=
3287-
pkg.akt.dev/go/cli v0.1.5-rc1 h1:g6AuRfwPZA0FpHo02tSeQvdLhvszRHoGb3VUdpgpoak=
3288-
pkg.akt.dev/go/cli v0.1.5-rc1/go.mod h1:G2PaN/gYDVDUuTF0TzQcQgx9Tn1iIx3Ca3kIF61sY2M=
3285+
pkg.akt.dev/go v0.1.6-rc3 h1:7w0TyrMLAJH7hOWTHOjCH69Ofh93DYWoSSeZWs1uG7E=
3286+
pkg.akt.dev/go v0.1.6-rc3/go.mod h1:XAwgUugjjoSqiUNM3Ph/jZMZxDbo6fhJpZlEk5XRmOk=
3287+
pkg.akt.dev/go/cli v0.1.5-rc3 h1:82X7H8LuSTftog1N70Zw4duwLMCGhUZHUsD19LhYcVE=
3288+
pkg.akt.dev/go/cli v0.1.5-rc3/go.mod h1:AJinKcxEzo/YTxvEcvQOnCoHeGXQh8FfZePy8Q3aJnc=
32893289
pkg.akt.dev/go/sdl v0.1.1 h1:3CcAqWeKouFlvUSjQMktWLDqftOjn4cBX37TRFT7BRM=
32903290
pkg.akt.dev/go/sdl v0.1.1/go.mod h1:ADsH8/kh61tWTax8nV0utelOaKWfU3qbG+OT3v9nmeY=
32913291
pkg.akt.dev/specs v0.0.1 h1:OP0zil3Fr4kcCuybFqQ8LWgSlSP2Yn7306meWpu6/S4=

‎make/releasing.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifeq ($(GORELEASER_MOUNT_CONFIG),true)
3434
endif
3535

3636
.PHONY: bins
37-
bins: $(BINS)
37+
bins: $(AKASH)
3838

3939
.PHONY: build
4040
build:

‎make/test-integration.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test-nocache:
1616

1717
.PHONY: test-full
1818
test-full:
19-
$(GO_TEST) -v -tags=$(BUILD_TAGS) $(TEST_MODULES)
19+
$(GO_TEST) -v -tags=$(build_tag_cs) $(TEST_MODULES)
2020

2121
.PHONY: test-integration
2222
test-integration:

‎make/test-upgrade.mk‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ UPGRADE_FROM := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name
2121
GENESIS_BINARY_VERSION := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name $(UPGRADE_TO) '.upgrades[$$name].from_binary' | tr -d '\n')
2222
UPGRADE_BINARY_VERSION ?= local
2323

24-
SNAPSHOT_SOURCE ?= sandbox1
24+
SNAPSHOT_SOURCE ?= sandbox
2525

2626
ifeq ($(SNAPSHOT_SOURCE),mainnet)
2727
SNAPSHOT_NETWORK := akashnet-2
2828
CHAIN_METADATA_URL := https://raw.githubusercontent.com/akash-network/net/master/mainnet/meta.json
2929
else ifeq ($(SNAPSHOT_SOURCE),sandbox)
3030
SNAPSHOT_NETWORK := sandbox-2
3131
CHAIN_METADATA_URL := https://raw.githubusercontent.com/akash-network/net/master/sandbox-2/meta.json
32-
else ifeq ($(SNAPSHOT_SOURCE),sandbox1)
33-
SNAPSHOT_NETWORK := sandbox-01
34-
CHAIN_METADATA_URL := https://raw.githubusercontent.com/akash-network/net/master/sandbox/meta.json
3532
else
3633
$(error "invalid snapshot source $(SNAPSHOT_SOURCE)")
3734
endif
@@ -67,6 +64,7 @@ test: init
6764
$(GO_TEST) -run "^\QTestUpgrade\E$$" -tags e2e.upgrade -timeout 180m -v -args \
6865
-cosmovisor=$(COSMOVISOR) \
6966
-workdir=$(AP_RUN_DIR)/validators \
67+
-sourcesdir=$(AKASH_ROOT) \
7068
-config=$(TEST_CONFIG) \
7169
-upgrade-name=$(UPGRADE_TO) \
7270
-upgrade-version="$(UPGRADE_BINARY_VERSION)" \
@@ -75,7 +73,7 @@ test: init
7573
.PHONY: test-reset
7674
test-reset:
7775
$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) --max-validators=$(MAX_VALIDATORS) clean
78-
#$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) --chain-meta=$(CHAIN_METADATA_URL) bins
76+
$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) --chain-meta=$(CHAIN_METADATA_URL) bins
7977
$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) keys
8078
$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) --max-validators=$(MAX_VALIDATORS) prepare-state
8179

‎meta.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
"skipped": false,
4545
"from_binary": "v0.38.6-rc2",
4646
"from_version": "v0.38.0"
47+
},
48+
"v2.0.0": {
49+
"skipped": false,
50+
"from_binary": "v1.0.3-rc4",
51+
"from_version": "v1.0.0"
4752
}
4853
}
4954
}

0 commit comments

Comments
 (0)