Skip to content

Commit 4fd9760

Browse files
talus-testtalus-test
committed
Merge tag 'v1.0.5-full-archive' into main
2 parents 63768e6 + 9c2c556 commit 4fd9760

File tree

7 files changed

+45
-42
lines changed

7 files changed

+45
-42
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Build
1313
bin
14-
build
14+
_build
1515
vendor
1616
.vendor-new
1717
build

‎app/app.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,11 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a
626626
}
627627
}
628628

629+
// trigger SetModuleVersionMap in upgrade keeper at the VersionMapEnableHeight
630+
if ctx.BlockHeight() == core.VersionMapEnableHeight {
631+
app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
632+
}
633+
629634
return app.mm.BeginBlock(ctx, req)
630635
}
631636

@@ -640,7 +645,6 @@ func (app *TerraApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc
640645
if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
641646
panic(err)
642647
}
643-
644648
return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
645649
}
646650

‎custom/auth/client/utils/feeutils.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
1616
"github.com/cosmos/cosmos-sdk/x/authz"
1717

18-
core "github.com/terra-money/core/types"
19-
2018
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2119

2220
marketexported "github.com/terra-money/core/x/market/exported"
@@ -265,10 +263,6 @@ func computeTax(clientCtx client.Context, taxRate sdk.Dec, principal sdk.Coins)
265263

266264
for _, coin := range principal {
267265

268-
if coin.Denom == core.MicroLunaDenom {
269-
continue
270-
}
271-
272266
taxCap, err := queryTaxCap(clientCtx, coin.Denom)
273267
if err != nil {
274268
return nil, err

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ require (
123123
replace (
124124
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
125125
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
126-
github.com/cosmos/cosmos-sdk => github.com/terra-rebels/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59
126+
github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59
127127
github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2
128128
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
129129
github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.2.0
130-
github.com/tendermint/tendermint => github.com/terra-money/tendermint v0.34.14-terra.2
130+
github.com/tendermint/tendermint => github.com/terra-money/tendermint v0.34.14-terra.3
131131
google.golang.org/grpc => google.golang.org/grpc v1.33.2
132132
)

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
165165
github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
166166
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
167167
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
168+
github.com/classic-terra/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59 h1:aEO8kp0lD+AIqZlyJxA5w6WHg/qMTZnzG7c2BGN1Od0=
169+
github.com/classic-terra/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59/go.mod h1:pTH1UR4ZKkchlqIeNIc4U2v9aB36Jdl28iui7pZsluU=
168170
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
169171
github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U=
170172
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -865,10 +867,8 @@ github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kG
865867
github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI=
866868
github.com/terra-money/ledger-terra-go v0.11.2 h1:BVXZl+OhJOri6vFNjjVaTabRLApw9MuG7mxWL4V718c=
867869
github.com/terra-money/ledger-terra-go v0.11.2/go.mod h1:ClJ2XMj1ptcnONzKH+GhVPi7Y8pXIT+UzJ0TNt0tfZE=
868-
github.com/terra-money/tendermint v0.34.14-terra.2 h1:UYDDCI001ZNhs+aX09HjKVldUcz084q3RwLHUOSSZQU=
869-
github.com/terra-money/tendermint v0.34.14-terra.2/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0=
870-
github.com/terra-rebels/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59 h1:62KT/h2dpx3wM3Tev3srYaUnVfMqsXuFg/cYtfS3mA4=
871-
github.com/terra-rebels/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59/go.mod h1:pTH1UR4ZKkchlqIeNIc4U2v9aB36Jdl28iui7pZsluU=
870+
github.com/terra-money/tendermint v0.34.14-terra.3 h1:6ZKViOBESN3/2csQ8jWHmALdeGMUp7citxh7drtBicI=
871+
github.com/terra-money/tendermint v0.34.14-terra.3/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0=
872872
github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
873873
github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
874874
github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

‎types/alias.go‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,35 @@ import (
1212
)
1313

1414
const (
15-
MicroLunaDenom = assets.MicroLunaDenom
16-
MicroUSDDenom = assets.MicroUSDDenom
17-
MicroKRWDenom = assets.MicroKRWDenom
18-
MicroSDRDenom = assets.MicroSDRDenom
19-
MicroCNYDenom = assets.MicroCNYDenom
20-
MicroJPYDenom = assets.MicroJPYDenom
21-
MicroEURDenom = assets.MicroEURDenom
22-
MicroGBPDenom = assets.MicroGBPDenom
23-
MicroMNTDenom = assets.MicroMNTDenom
24-
MicroUnit = assets.MicroUnit
25-
BlocksPerMinute = util.BlocksPerMinute
26-
BlocksPerHour = util.BlocksPerHour
27-
BlocksPerDay = util.BlocksPerDay
28-
BlocksPerWeek = util.BlocksPerWeek
29-
BlocksPerMonth = util.BlocksPerMonth
30-
BlocksPerYear = util.BlocksPerYear
31-
CoinType = util.CoinType
32-
FullFundraiserPath = util.FullFundraiserPath
33-
Bech32PrefixAccAddr = util.Bech32PrefixAccAddr
34-
Bech32PrefixAccPub = util.Bech32PrefixAccPub
35-
Bech32PrefixValAddr = util.Bech32PrefixValAddr
36-
Bech32PrefixValPub = util.Bech32PrefixValPub
37-
Bech32PrefixConsAddr = util.Bech32PrefixConsAddr
38-
Bech32PrefixConsPub = util.Bech32PrefixConsPub
39-
ColumbusChainID = "columbus-5"
40-
BombayChainID = "bombay-12"
41-
SwapDisableForkHeight = fork.SwapDisableForkHeight
42-
SwapEnableForkHeight = fork.SwapEnableForkHeight
15+
MicroLunaDenom = assets.MicroLunaDenom
16+
MicroUSDDenom = assets.MicroUSDDenom
17+
MicroKRWDenom = assets.MicroKRWDenom
18+
MicroSDRDenom = assets.MicroSDRDenom
19+
MicroCNYDenom = assets.MicroCNYDenom
20+
MicroJPYDenom = assets.MicroJPYDenom
21+
MicroEURDenom = assets.MicroEURDenom
22+
MicroGBPDenom = assets.MicroGBPDenom
23+
MicroMNTDenom = assets.MicroMNTDenom
24+
MicroUnit = assets.MicroUnit
25+
BlocksPerMinute = util.BlocksPerMinute
26+
BlocksPerHour = util.BlocksPerHour
27+
BlocksPerDay = util.BlocksPerDay
28+
BlocksPerWeek = util.BlocksPerWeek
29+
BlocksPerMonth = util.BlocksPerMonth
30+
BlocksPerYear = util.BlocksPerYear
31+
CoinType = util.CoinType
32+
FullFundraiserPath = util.FullFundraiserPath
33+
Bech32PrefixAccAddr = util.Bech32PrefixAccAddr
34+
Bech32PrefixAccPub = util.Bech32PrefixAccPub
35+
Bech32PrefixValAddr = util.Bech32PrefixValAddr
36+
Bech32PrefixValPub = util.Bech32PrefixValPub
37+
Bech32PrefixConsAddr = util.Bech32PrefixConsAddr
38+
Bech32PrefixConsPub = util.Bech32PrefixConsPub
39+
ColumbusChainID = "columbus-5"
40+
BombayChainID = "bombay-12"
41+
SwapDisableForkHeight = fork.SwapDisableForkHeight
42+
SwapEnableForkHeight = fork.SwapEnableForkHeight
43+
VersionMapEnableHeight = fork.VersionMapEnableHeight
4344
)
4445

4546
// functions aliases

‎types/fork/height.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ package fork
22

33
// SwapDisableForkHeight - make min spread to 100% to disable swap
44
const SwapDisableForkHeight = 7607790
5+
56
// SwapEnableForkHeight - renable IBC only, block height is approximately December 5th, 2022
67
const SwapEnableForkHeight = 10542500
8+
9+
// VersionMapEnableHeight - set the version map to enable software upgrades, approximately February 14, 2023
10+
const VersionMapEnableHeight = 11543150

0 commit comments

Comments
 (0)