diff --git a/loadtest/contracts/jupiter/Cargo.lock b/loadtest/contracts/jupiter/Cargo.lock index 3f9c9d5dfd..183d960221 100644 --- a/loadtest/contracts/jupiter/Cargo.lock +++ b/loadtest/contracts/jupiter/Cargo.lock @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "sei-cosmwasm" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cace5feff10f2f826f42ed459b8162d023b785aaf677bc640f42091c0e16e0" +checksum = "869bc11575e307e8f885de6ade9a5a3458cc52a1a3fd2c58af730301c43ec0cc" dependencies = [ "cosmwasm-std", "schemars", diff --git a/loadtest/contracts/jupiter/Cargo.toml b/loadtest/contracts/jupiter/Cargo.toml index 8ef36e801a..e09876be5e 100644 --- a/loadtest/contracts/jupiter/Cargo.toml +++ b/loadtest/contracts/jupiter/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } thiserror = { version = "1.0.26" } base64 = { version = "0.13.0" } -sei-cosmwasm = "0.2.0" +sei-cosmwasm = "0.3.0" [dependencies.forward_ref] version = "1" diff --git a/loadtest/contracts/jupiter/src/contract.rs b/loadtest/contracts/jupiter/src/contract.rs index b56dff8ee9..4a83baaf9c 100644 --- a/loadtest/contracts/jupiter/src/contract.rs +++ b/loadtest/contracts/jupiter/src/contract.rs @@ -83,11 +83,11 @@ pub fn process_bulk_order_placements( position_direction: PositionDirection::Long, order_type: OrderType::Limit, data: "".to_string(), + status_description: "".to_string(), }; let order = sei_cosmwasm::SeiMsg::PlaceOrders { funds: vec![], orders: vec![order_placement], - creator: env.contract.address, contract_address: MARS_ADDR.load(deps.storage)?, }; response = Response::new().add_message(order); diff --git a/loadtest/contracts/mars/Cargo.lock b/loadtest/contracts/mars/Cargo.lock index 3415d08c99..bafff58d33 100644 --- a/loadtest/contracts/mars/Cargo.lock +++ b/loadtest/contracts/mars/Cargo.lock @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "sei-cosmwasm" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cace5feff10f2f826f42ed459b8162d023b785aaf677bc640f42091c0e16e0" +checksum = "869bc11575e307e8f885de6ade9a5a3458cc52a1a3fd2c58af730301c43ec0cc" dependencies = [ "cosmwasm-std", "schemars", diff --git a/loadtest/contracts/mars/Cargo.toml b/loadtest/contracts/mars/Cargo.toml index aa09a99450..fd18d75f8a 100644 --- a/loadtest/contracts/mars/Cargo.toml +++ b/loadtest/contracts/mars/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } thiserror = { version = "1.0.26" } base64 = { version = "0.13.0" } -sei-cosmwasm = "0.2.0" +sei-cosmwasm = "0.3.0" [dependencies.forward_ref] version = "1" diff --git a/loadtest/contracts/saturn/Cargo.toml b/loadtest/contracts/saturn/Cargo.toml index c442a5cb58..e973b8bed9 100644 --- a/loadtest/contracts/saturn/Cargo.toml +++ b/loadtest/contracts/saturn/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } thiserror = { version = "1.0.26" } base64 = { version = "0.13.0" } -sei-cosmwasm = "0.2.0" +sei-cosmwasm = "0.3.0" [dependencies.forward_ref] version = "1" diff --git a/loadtest/contracts/venus/Cargo.toml b/loadtest/contracts/venus/Cargo.toml index ed70cdfa92..f571fd4959 100644 --- a/loadtest/contracts/venus/Cargo.toml +++ b/loadtest/contracts/venus/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } thiserror = { version = "1.0.26" } base64 = { version = "0.13.0" } -sei-cosmwasm = "0.2.0" +sei-cosmwasm = "0.3.0" [dependencies.forward_ref] version = "1" diff --git a/x/dex/module_test.go b/x/dex/module_test.go index 0f65dd0fff..0186ab06c8 100644 --- a/x/dex/module_test.go +++ b/x/dex/module_test.go @@ -46,7 +46,7 @@ func TestEndBlockMarketOrder(t *testing.T) { bankkeeper := testApp.BankKeeper bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts) bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts) - wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm") + wasm, err := ioutil.ReadFile("./testdata/mars.wasm") if err != nil { panic(err) } @@ -62,7 +62,7 @@ func TestEndBlockMarketOrder(t *testing.T) { if err != nil { panic(err) } - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true}) dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair) // place one order to a nonexistent contract dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add( @@ -128,7 +128,7 @@ func TestEndBlockMarketOrder(t *testing.T) { // Long book should be removed since it's executed // No state change should've been persisted for bad contract - _, found = dexkeeper.GetLongBookByPrice(ctx, contractAddr.String(), sdk.MustNewDecFromStr("1"), pair.PriceDenom, pair.AssetDenom) + _, found = dexkeeper.GetLongBookByPrice(ctx, contractAddr.String(), sdk.MustNewDecFromStr("2"), pair.PriceDenom, pair.AssetDenom) // Long book should be populated require.False(t, found) @@ -167,7 +167,7 @@ func TestEndBlockRollback(t *testing.T) { dexkeeper := testApp.DexKeeper pair := TEST_PAIR() // register contract and pair - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: false, NeedOrderMatching: true}) dexkeeper.AddRegisteredPair(ctx, keepertest.TestContract, pair) // place one order to a nonexistent contract dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(keepertest.TestContract), utils.GetPairString(&pair)).Add( @@ -198,7 +198,7 @@ func TestEndBlockPartialRollback(t *testing.T) { dexkeeper := testApp.DexKeeper pair := TEST_PAIR() // register contract and pair - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: false, NeedOrderMatching: true}) dexkeeper.AddRegisteredPair(ctx, keepertest.TestContract, pair) // place one order to a nonexistent contract dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(keepertest.TestContract), utils.GetPairString(&pair)).Add( @@ -220,7 +220,7 @@ func TestEndBlockPartialRollback(t *testing.T) { bankkeeper := testApp.BankKeeper bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts) bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts) - wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm") + wasm, err := ioutil.ReadFile("./testdata/mars.wasm") if err != nil { panic(err) } @@ -236,7 +236,7 @@ func TestEndBlockPartialRollback(t *testing.T) { if err != nil { panic(err) } - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true}) dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair) // place one order to a nonexistent contract dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add( @@ -284,7 +284,7 @@ func TestBeginBlock(t *testing.T) { bankkeeper := testApp.BankKeeper bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts) bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts) - wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm") + wasm, err := ioutil.ReadFile("./testdata/mars.wasm") if err != nil { panic(err) } @@ -300,7 +300,7 @@ func TestBeginBlock(t *testing.T) { if err != nil { panic(err) } - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true}) // right now just make sure it doesn't crash since it doesn't register any state to be checked against testApp.BeginBlocker(ctx, abci.RequestBeginBlock{}) @@ -324,7 +324,7 @@ func TestEndBlockPanicHandling(t *testing.T) { bankkeeper := testApp.BankKeeper bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts) bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts) - wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm") + wasm, err := ioutil.ReadFile("./testdata/mars.wasm") if err != nil { panic(err) } @@ -340,7 +340,7 @@ func TestEndBlockPanicHandling(t *testing.T) { if err != nil { panic(err) } - dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true}) + dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true}) dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair) dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add( &types.Order{ diff --git a/x/dex/testdata/mars.wasm b/x/dex/testdata/mars.wasm new file mode 100644 index 0000000000..8addcee304 Binary files /dev/null and b/x/dex/testdata/mars.wasm differ