From a1bc42c912dc8335e24238ad9cf511b22cdf146e Mon Sep 17 00:00:00 2001 From: emidev98 Date: Mon, 4 Dec 2023 08:38:57 +0200 Subject: [PATCH] chore(v2.8): prepare release version --- go.mod | 6 +++--- go.sum | 8 ++++---- sync.go | 9 +++++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a909d50..7a09aa5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/terra-money/mantlemint go 1.20 require ( - github.com/CosmWasm/wasmd v0.43.0 + github.com/CosmWasm/wasmd v0.45.0 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-sdk v0.47.5 @@ -19,7 +19,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - github.com/terra-money/core/v2 v2.7.1 + github.com/terra-money/core/v2 v2.8.0 ) require ( @@ -39,7 +39,7 @@ require ( github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/CosmWasm/wasmvm v1.4.1 // indirect + github.com/CosmWasm/wasmvm v1.5.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index 8ce531e..142ae3f 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v1.4.1 h1:YgodVlBrXa2HJZzOXjWDH0EIRwQzK3zuA73dDPRRLS4= -github.com/CosmWasm/wasmvm v1.4.1/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= +github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw= +github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -1129,8 +1129,8 @@ github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2l github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/terra-money/alliance v0.3.2 h1:MuL3RBw+jXFv4io5PhaBn7jRUBvlJLUzgpD6gx4GCug= github.com/terra-money/alliance v0.3.2/go.mod h1:HDiUexeXRUkLkLRw5jLQcHuVt1Sx43HfyVl0kfwW3JM= -github.com/terra-money/core/v2 v2.7.1 h1:XpoB5DbkPvPDJxvCAXTXCiAEdfq41rHKenrFNgoxMQE= -github.com/terra-money/core/v2 v2.7.1/go.mod h1:wovUCGK15+vJ1k8zKu9NdSxN/UXFEGieQA2rmIXF81c= +github.com/terra-money/core/v2 v2.8.0 h1:Jp10bhQNAKDeJjvfT2zJwmghA+l9bL7vLHVS+c9NGjI= +github.com/terra-money/core/v2 v2.8.0/go.mod h1:Oee7bSuSMhUk4EeI/PITPSqW/ydWAOa4xMQrHr1kg8c= github.com/terra-money/cosmos-sdk v0.47.6-terra.0 h1:BrK2cq8W5HsMT5siVdJCFDx1vcEMm+BGN5713FEm84g= github.com/terra-money/cosmos-sdk v0.47.6-terra.0/go.mod h1:xTc1chW8HyUWCfrgGbjS5jNu9RzlPVrBNfbL9RmZUio= github.com/terra-money/ledger-terra-go v0.11.2 h1:BVXZl+OhJOri6vFNjjVaTabRLApw9MuG7mxWL4V718c= diff --git a/sync.go b/sync.go index 68134e5..857423b 100644 --- a/sync.go +++ b/sync.go @@ -9,6 +9,7 @@ import ( "os" "runtime/debug" + wasm "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" tmlog "github.com/cometbft/cometbft/libs/log" "github.com/cometbft/cometbft/proxy" @@ -19,7 +20,6 @@ import ( "github.com/spf13/viper" terra "github.com/terra-money/core/v2/app" coreconfig "github.com/terra-money/core/v2/app/config" - wasmconfig "github.com/terra-money/core/v2/app/wasmconfig" blockFeeder "github.com/terra-money/mantlemint/block_feed" "github.com/terra-money/mantlemint/config" @@ -87,6 +87,11 @@ func main() { cms := rootmulti.NewStore(batched, hldb, logger) vpr := viper.GetViper() + wasmConfig, err := wasm.ReadWasmConfig(vpr) + if err != nil { + panic(err) + } + var app = terra.NewTerraApp( logger, batched, @@ -97,7 +102,7 @@ func main() { 0, codec, vpr, - wasmconfig.GetConfig(vpr), + wasmConfig, fauxMerkleModeOpt, func(ba *baseapp.BaseApp) { ba.SetCMS(cms)