8000 feat: v1.0.0 upgrade by beer-1 · Pull Request #392 · initia-labs/initia · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: v1.0.0 upgrade #392

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

Merged
merged 3 commits into from
Apr 18, 2025
Merged

feat: v1.0.0 upgrade #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8134ac2
create v1 upgrade handler
beer-1 Apr 17, 2025
05b4543
fix upgrade name
beer-1 Apr 17, 2025
09315ac
bump versions
beer-1 Apr 18, 2025
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG VERSION
ARG COMMIT

# See https://github.com/initia-labs/movevm/releases
ENV LIBMOVEVM_VERSION=v1.0.0-rc.1
ENV LIBMOVEVM_VERSION=v1.0.0
ENV MIMALLOC_VERSION=v2.2.2

# Install necessary packages
Expand Down
40 changes: 1 addition & 39 deletions app/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,18 @@ package app
import (
"context"

"cosmossdk.io/errors"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/cosmos/cosmos-sdk/types/module"

dynamicfeetypes "github.com/initia-labs/initia/x/dynamic-fee/types"
)

const upgradeName = "v1.0.0-rc.0"
const upgradeName = "v1.0.0"

// RegisterUpgradeHandlers returns upgrade handlers
func (app *InitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) {
upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
if err != nil {
panic(err)
}

if upgradeInfo.Name == upgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{
dynamicfeetypes.StoreKey,
},
}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
}

app.UpgradeKeeper.SetUpgradeHandler(
upgradeName,
func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
moveParams, err := app.MoveKeeper.GetParams(ctx)
if err != nil {
return nil, errors.Wrap(err, "failed to get move params")
}
moveParams.BaseMinGasPrice = math.LegacyZeroDec()
err = app.MoveKeeper.SetParams(ctx, moveParams)
if err != nil {
return nil, errors.Wrap(err, "failed to set move params")
}

params := dynamicfeetypes.DefaultParams()
params.MaxChangeRate = math.LegacyZeroDec()

err = app.DynamicFeeKeeper.SetParams(ctx, params)
if err != nil {
return nil, errors.Wrap(err, "failed to set dynamic fee params")
}
return vm, nil
},
)
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ require (
github.com/hashicorp/go-metrics v0.5.3
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/huandu/skiplist v1.2.0
github.com/initia-labs/OPinit v1.0.0-rc.0
github.com/initia-labs/OPinit v1.0.0
// we also need to update `LIBMOVEVM_VERSION` of Dockerfile#11
github.com/initia-labs/movevm v1.0.0-rc.1
github.com/initia-labs/movevm v1.0.0
github.com/noble-assets/forwarding/v2 v2.0.1
github.com/pelletier/go-toml v1.9.5
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -157,7 +157,7 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/initia-labs/OPinit/api v1.0.0-beta.1 // indirect
github.com/initia-labs/OPinit/api v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.17.11 // indirect
Expand Down Expand Up @@ -245,7 +245,7 @@ replace (

// indirect custom dependencies
// - https://github.com/cosmos/cosmos-sdk/issues/23740
require github.com/cosmos/iavl v1.2.5-0.20250306174232-6cfb3dac2c71 // indirect
require github.com/cosmos/iavl v1.2.5 // indirect

// initia custom
// use custom version for
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ
github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
github.com/cosmos/iavl v1.2.5-0.20250306174232-6cfb3dac2c71 h1:Afp8nOyRYPXh2F6YknQKYOph9fucMuctB7TqJ7vyiQE=
github.com/cosmos/iavl v1.2.5-0.20250306174232-6cfb3dac2c71/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/iavl v1.2.5 h1:GY6PphOF8tJbBlrb4TBqBx1SqUsW0OocFAZvV+s003A=
github.com/cosmos/iavl v1.2.5/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0 h1:rM+S14DFiqmu6Rc3PuhvWqwywPsnt/CbIslSnBftPFs=
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0/go.mod h1:O5H9Ic3Pe6cmJn1eqlj5N48sLb8WQ1VWmDP4/11g/4E=
github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0 h1:AQO9NIAP3RFqvBCj7IqM/V1LCxmuvcvGUdu0RIEz/c0=
Expand Down Expand Up @@ -745,18 +745,18 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/initia-labs/OPinit v1.0.0-rc.0 h1:F31cgQwdoLUmnz+2mS5Bb7mp5fzJ7eLmsz8eCp1GIFI=
github.com/initia-labs/OPinit v1.0.0-rc.0/go.mod h1:E3C1kaDWjWd+Pd/c+m0XflL/aPDaZEPcbtH1xzM97ig=
github.com/initia-labs/OPinit/api v1.0.0-beta.1 h1:aWv4PAW0eVDQy5m2n4BJmdhy6RdpCcRSLJAWGzbwMO8=
github.com/initia-labs/OPinit/api v1.0.0-beta.1/go.mod h1:Qz11o6zlTtJe495JO7FhEyLhJLPit0rEuLN4pweKL24=
github.com/initia-labs/OPinit v1.0.0 h1:8nc7UIFsf2JiMqVeoxq0sM0Hf4Rug+UG1LsbrAPXC8w=
github.com/initia-labs/OPinit v1.0.0/go.mod h1:nO24xmTxOPcIs5Zem5S/libjiKQkqItQ7dw4amcHC1I=
github.com/initia-labs/OPinit/api v1.0.0 h1:l1WjRl8dK1HoEn+1mPXCmEnRqLwXrfoBA9CI1lAUnnU=
github.com/initia-labs/OPinit/api v1.0.0/go.mod h1:Qz11o6zlTtJe495JO7FhEyLhJLPit0rEuLN4pweKL24=
github.com/initia-labs/cometbft v0.0.0-20250324104207-ff0764c4444f h1:XA4MKOcB/V+tnCFsngKVYgpAfpY7j/DcMjR5sEbjAGM=
github.com/initia-labs/cometbft v0.0.0-20250324104207-ff0764c4444f/go.mod h1:5l0SkgeLRXi6bBfQuevXjKqML1jjfJJlvI1Ulp02/o4=
github.com/initia-labs/connect/v2 v2.3.1 h1:Y32LCwUHDBgUzzQHqPBJeWeItYoNu2oYD57JKbZCtjw=
github.com/initia-labs/connect/v2 v2.3.1/go.mod h1:35hM7xSgI0h3GMUTgspzKY8Ff2yCXNGNwmAdjqo3z8s=
github.com/initia-labs/cosmos-sdk v0.0.0-20250415174140-9fd233bcf847 h1:MUusHIRbaraL//dic8nCj7wXvVLT3LvKbS0k+Bj12oM=
github.com/initia-labs/cosmos-sdk v0.0.0-20250415174140-9fd233bcf847/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw=
github.com/initia-labs/movevm v1.0.0-rc.1 h1:toK3fEssrjNHLRpSntmBZr+8U8DYYl1mc116SeK7Mik=
github.com/initia-labs/movevm v1.0.0-rc.1/go.mod h1:sj/kXD7mUQASqogPTjqltIr4Uid3xxnlcbfiFvvqeXA=
github.com/initia-labs/movevm v1.0.0 h1:6/799kyQGCujfvRhAmlu11RkRSRG4Cc1Xk0L91DjzFw=
github.com/initia-labs/movevm v1.0.0/go.mod h1:sj/kXD7mUQASqogPTjqltIr4Uid3xxnlcbfiFvvqeXA=
github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls=
github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
Expand Down
2 changes: 1 addition & 1 deletion x/move/keeper/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ var submsgModule []byte

func init() {
basicCoinModule = ReadMoveFile("BasicCoin")
basicCoinModuleAbi = "{\"address\":\"0x1\",\"name\":\"BasicCoin\",\"friends\":[],\"exposed_functions\":[{\"name\":\"get\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"address\"],\"return\":[\"u64\"]},{\"name\":\"get_coin\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"address\"],\"return\":[\"0x1::BasicCoin::Coin<T0>\"]},{\"name\":\"mint\",\"visibility\":\"public\",\"is_entry\":true,\"is_view\":false,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"signer\",\"u64\"],\"return\":[]},{\"name\":\"number\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[],\"params\":[],\"return\":[\"u64\"]}],\"structs\":[{\"name\":\"Coin\",\"is_native\":false,\"abilities\":[\"copy\",\"key\"],\"generic_type_params\":[{\"constraints\":[],\"is_phantom\":true}],\"fields\":[{\"name\":\"value\",\"type\":\"u64\"},{\"name\":\"test\",\"type\":\"bool\"}]},{\"name\":\"Initia\",\"is_native\":false,\"abilities\":[],\"generic_type_params\":[],\"fields\":[{\"name\":\"dummy_field\",\"type\":\"bool\"}]},{\"name\":\"MintEvent\",\"is_native\":false,\"abilities\":[\"drop\",\"store\"],\"generic_type_params\":[],\"fields\":[{\"name\":\"account\",\"type\":\"address\"},{\"name\":\"amount\",\"type\":\"u64\"},{\"name\":\"coin_type\",\"type\":\"0x1::string::String\"}]},{\"name\":\"ViewEvent\",\"is_native\":false,\"abilities\":[\"drop\",\"store\"],\"generic_type_params\":[],\"fields\":[{\"name\":\"data\",\"type\":\"0x1::string::String\"}]}]}"
basicCoinModuleAbi = "{\"address\":\"0x1\",\"name\":\"BasicCoin\",\"friends\":[],\"exposed_functions\":[{\"name\":\"get\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"address\"],\"return\":[\"u64\"]},{\"name\":\"get_coin\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"address\"],\"return\":[\"0x1::BasicCoin::Coin<T0>\"]},{\"name\":\"mint\",\"visibility\":\"public\",\"is_entry\":true,\"is_view\":false,\"generic_type_params\":[{\"constraints\":[]}],\"params\":[\"signer\",\"u64\"],\"return\":[]},{\"name\":\"number\",\"visibility\":\"public\",\"is_entry\":false,\"is_view\":true,\"generic_type_params\":[],\"params\":[],\"return\":[\"u64\"]}],\"structs\":[{\"name\":\"Coin\",\"is_native\":false,\"is_event\":false,\"abilities\":[\"copy\",\"key\"],\"generic_type_params\":[{\"constraints\":[],\"is_phantom\":true}],\"fields\":[{\"name\":\"value\",\"type\":\"u64\"},{\"name\":\"test\",\"type\":\"bool\"}]},{\"name\":\"Initia\",\"is_native\":false,\"is_event\":false,\"abilities\":[],\"generic_type_params\":[],\"fields\":[{\"name\":\"dummy_field\",\"type\":\"bool\"}]},{\"name\":\"MintEvent\",\"is_native\":false,\"is_event\":true,\"abilities\":[\"drop\",\"store\"],\"generic_type_params\":[],\"fields\":[{\"name\":\"account\",\"type\":\"address\"},{\"name\":\"amount\",\"type\":\"u64\"},{\"name\":\"coin_type\",\"type\":\"0x1::string::String\"}]},{\"name\":\"ViewEvent\",\"is_native\":false,\"is_event\":true,\"abilities\":[\"drop\",\"store\"],\"generic_type_params\":[],\"fields\":[{\"name\":\"data\",\"type\":\"0x1::string::String\"}]}]}"
stdCoinTestModule = ReadMoveFile("StdCoinTest")
tableGeneratorModule = ReadMoveFile("TableGenerator")
testAddressModule = ReadMoveFile("TestAddress")
Expand Down
Loading
0