Skip to content

Commit bbc9849

Browse files
authored
Merge pull request regen-network#69 from regen-network/aaronc/amazonas-upgrade
Amazonas upgrade
2 parents f676063 + a06dbf7 commit bbc9849

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

app/app.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ type XrnApp struct {
104104
keyFeeCollection *sdk.KVStoreKey
105105
keyParams *sdk.KVStoreKey
106106
tkeyParams *sdk.TransientStoreKey
107-
upgradeStoreKey *sdk.KVStoreKey
107+
upgradeStoreKey *sdk.KVStoreKey
108108
//dataStoreKey *sdk.KVStoreKey
109109
//schemaStoreKey *sdk.KVStoreKey
110110
//espStoreKey *sdk.KVStoreKey
@@ -168,7 +168,7 @@ func NewXrnApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bo
168168
keyFeeCollection: sdk.NewKVStoreKey(auth.FeeStoreKey),
169169
keyParams: sdk.NewKVStoreKey(params.StoreKey),
170170
tkeyParams: sdk.NewTransientStoreKey(params.TStoreKey),
171-
upgradeStoreKey: sdk.NewKVStoreKey(upgrade.StoreKey),
171+
upgradeStoreKey: sdk.NewKVStoreKey(upgrade.StoreKey),
172172
//dataStoreKey: sdk.NewKVStoreKey("data"),
173173
//schemaStoreKey: sdk.NewKVStoreKey("schema"),
174174
//espStoreKey: sdk.NewKVStoreKey("esp"),
@@ -204,7 +204,13 @@ func NewXrnApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bo
204204
app.bankKeeper, app.feeCollectionKeeper)
205205
app.upgradeKeeper = upgrade.NewKeeper(app.upgradeStoreKey, app.cdc)
206206
// this configures a no-op upgrade handler for the "el-choco" upgrade
207-
app.upgradeKeeper.SetUpgradeHandler("el-choco", func(ctx sdk.Context, plan upgrade.Plan) { })
207+
app.upgradeKeeper.SetUpgradeHandler("amazonas", func(ctx sdk.Context, plan upgrade.Plan) {
208+
// Add some more coins to the faucet account
209+
addr, err := sdk.AccAddressFromBech32("xrn:1xrsmkqh305m09tc5x73v4t3wtcuqmf6cgy2taw")
210+
if err == nil {
211+
_, _ = app.bankKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.Coin{Denom: "tree", Amount: sdk.NewInt(10000000)}})
212+
}
213+
})
208214

209215
// register the proposal types
210216
govRouter := gov.NewRouter()

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ require (
4545

4646
replace golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
4747

48-
replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-1b7a69be1993054a17a71d905d2b4df15ffec3f8
48+
replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-281da889de6ca3c7784d5570fd95de78d7d23a59

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-13fdf0c499fa0ef8ff9f
194194
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-13fdf0c499fa0ef8ff9f303999f43fa8eb582211/go.mod h1:aLgIheIE6TNKv6nyUhMjLwS4QHntAcEzgZzJBINvTds=
195195
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-1b7a69be1993054a17a71d905d2b4df15ffec3f8 h1:PHRwj/13QcrR5F+5Z6YwBEh5hPhoaYvCW+u8UwB6etA=
196196
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-1b7a69be1993054a17a71d905d2b4df15ffec3f8/go.mod h1:BvyNPEYewihHQa092/+OEX5dgLZsV7H2boKkkj1H2wI=
197+
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-281da889de6ca3c7784d5570fd95de78d7d23a59 h1:tv1w/7CktlBOMrFVW53qrRPO2jC3gmz69QkUxfFI7hc=
198+
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-281da889de6ca3c7784d5570fd95de78d7d23a59/go.mod h1:BvyNPEYewihHQa092/+OEX5dgLZsV7H2boKkkj1H2wI=
197199
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-2aca2a23f319f7415479009b57b6d27c9113c422 h1:geHDeOMbcg8jZetkR7k0yW6FvTKmY0qFo38W/ImmRMk=
198200
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-2aca2a23f319f7415479009b57b6d27c9113c422/go.mod h1:BvyNPEYewihHQa092/+OEX5dgLZsV7H2boKkkj1H2wI=
199201
github.com/regen-network/cosmos-sdk v0.0.0-0.20190329021654-40bbfbc157c4086e61ee284716d9da0b8b361458 h1:M4dUjBPotvaPFbnas69qMYBfIkffejaRcqmJKhy2dX4=

0 commit comments

Comments
 (0)