diff --git a/app/sim_test.go b/app/sim_test.go index 144b73f0a..162bf5dab 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -69,7 +69,7 @@ func setupSimulationApp(b *testing.B, msg string) (simtypes.Config, dbm.DB, simt dir, terraapp.MakeEncodingConfig(), appOptions, emptyWasmOpts, interBlockCacheOpt(), fauxMerkleModeOpt(), baseapp.SetChainID(SimAppChainID), ) - require.Equal(b, "WasmApp", app.Name()) + require.Equal(b, "TerraApp", app.Name()) return config, db, appOptions, app } diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go index 50dcc8c4c..a84e28357 100644 --- a/custom/auth/ante/fee_test.go +++ b/custom/auth/ante/fee_test.go @@ -648,11 +648,11 @@ func (s *AnteTestSuite) TestTaxExemption() { // change block time for contract instantiate s.ctx = s.ctx.WithBlockTime(time.Date(2020, time.April, 22, 12, 0, 0, 0, time.UTC)) // instantiate contract then set the contract address to tax exemption - addr, _, err := per.Instantiate(s.ctx, CodeID, addrs[0], nil, bz, "my label", nil) + addr, _, err := per.Instantiate(s.ctx, CodeID, addrs[0], nil, bz, nil) s.Require().NoError(err) s.app.TreasuryKeeper.AddBurnTaxExemptionAddress(s.ctx, addr.String()) // instantiate contract then not set to tax exemption - addr1, _, err := per.Instantiate(s.ctx, CodeID, addrs[0], nil, bz, "my label", nil) + addr1, _, err := per.Instantiate(s.ctx, CodeID, addrs[0], nil, bz, nil) s.Require().NoError(err) var msgs []sdk.Msg diff --git a/custom/wasm/client/cli/tx.go b/custom/wasm/client/cli/tx.go index 66cb2dfea..c672b5c2e 100644 --- a/custom/wasm/client/cli/tx.go +++ b/custom/wasm/client/cli/tx.go @@ -205,7 +205,7 @@ $ %s tx wasm instantiate2 1 '{"foo":"bar"}' $(echo -n "testing" | xxd -ps) --adm CodeID: data.CodeID, Msg: data.Msg, Funds: data.Funds, - Label: data.Label, + // Label: data.Label, Salt: salt, FixMsg: fixMsg, } @@ -314,7 +314,7 @@ func parseInstantiateArgs(rawCodeID, initMsg string, sender sdk.AccAddress, flag Funds: amount, Msg: []byte(initMsg), Admin: adminStr, - Label: label, + // Label: label, } return &msg, nil } diff --git a/go.mod b/go.mod index 0f0ce0a1b..4cd542fc3 100644 --- a/go.mod +++ b/go.mod @@ -225,7 +225,7 @@ replace ( ) replace ( - github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra1 + github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra2 // use cometbft github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-terra1 github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.8.0 diff --git a/go.sum b/go.sum index 381cc44d3..ae6fc711d 100644 --- a/go.sum +++ b/go.sum @@ -356,8 +356,8 @@ github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 h1:fjpWDB0 github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/classic-terra/ibc-go/v7 v7.4.0-terra h1:hawaq62XKlxyc8xLyIcc6IujDDEbqDBU+2U15SF+hj8= github.com/classic-terra/ibc-go/v7 v7.4.0-terra/go.mod h1:s0lxNkjVIqsb8AVltL0qhzxeLgOKvWZrknPuvgjlEQ8= -github.com/classic-terra/wasmd v0.45.0-terra1 h1:0QT9ViBy2kFDqGhcbTXvIuwgycVAWmAWemMV1PmOlWQ= -github.com/classic-terra/wasmd v0.45.0-terra1/go.mod h1:n1BJiGOIkPR3dZyQCfNAO2k2bPC/lnxZLIBMA1PM6/A= +github.com/classic-terra/wasmd v0.45.0-terra2 h1:yrhjKTzfZHqQVjymHX2Lo+bNMO1yDCufryc+7KeYAG0= +github.com/classic-terra/wasmd v0.45.0-terra2/go.mod h1:pTPOut260rZ3J0WROheOgNWDV/vk/AeRdXmM1JOtMjk= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= diff --git a/wasmbinding/test/helpers_test.go b/wasmbinding/test/helpers_test.go index 030cdf433..317566e9e 100644 --- a/wasmbinding/test/helpers_test.go +++ b/wasmbinding/test/helpers_test.go @@ -54,7 +54,7 @@ func (s *WasmTestSuite) storeReflectCode(addr sdk.AccAddress, contractPath strin func (s *WasmTestSuite) instantiateContract(funder sdk.AccAddress, codeID uint64) sdk.AccAddress { initMsgBz := []byte("{}") contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(s.App.WasmKeeper) - addr, _, err := contractKeeper.Instantiate(s.Ctx, codeID, funder, funder, initMsgBz, "label", nil) + addr, _, err := contractKeeper.Instantiate(s.Ctx, codeID, funder, funder, initMsgBz, nil) s.Require().NoError(err) return addr