Update DEX WASM tests to work with the update version of the WASM SDK. (

#1030)
CoreumFoundation · Nov 25, 2024 · 1f99518 · 1f99518
1 parent 31502e2
commit 1f99518
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 54 deletions.
diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock b/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock
diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml b/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml
@@ -29,6 +29,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw2 = "2.0.0"
 cw-storage-plus = "2.0.0"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cw-utils = "2.0.0"
 prost = "0.12.6"
diff --git a/integration-tests/contracts/modules/authz-nft-trade/src/contract.rs b/integration-tests/contracts/modules/authz-nft-trade/src/contract.rs
@@ -1,4 +1,4 @@
-use coreum_wasm_sdk::core::CoreumResult;
+use coreum_wasm_sdk::deprecated::core::CoreumResult;
 use coreum_wasm_sdk::shim;
 use coreum_wasm_sdk::types::cosmos::authz::v1beta1::MsgExec;
 use coreum_wasm_sdk::types::cosmos::bank::v1beta1::MsgSend as BankMsg;

diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.lock b/integration-tests/contracts/modules/authz-stargate/Cargo.lock
diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.toml b/integration-tests/contracts/modules/authz-stargate/Cargo.toml
@@ -28,4 +28,4 @@ thiserror = "1.0.56"
 cosmwasm-std = { version = "2.1.4", features = ["stargate", "cosmwasm_2_0"] }
 cw2 = "2.0.0"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
diff --git a/integration-tests/contracts/modules/authz-stargate/src/contract.rs b/integration-tests/contracts/modules/authz-stargate/src/contract.rs
@@ -1,4 +1,4 @@
-use coreum_wasm_sdk::core::CoreumResult;
+use coreum_wasm_sdk::deprecated::core::CoreumResult;
 
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;

diff --git a/integration-tests/contracts/modules/authz-transfer/Cargo.lock b/integration-tests/contracts/modules/authz-transfer/Cargo.lock
diff --git a/integration-tests/contracts/modules/authz-transfer/Cargo.toml b/integration-tests/contracts/modules/authz-transfer/Cargo.toml
@@ -29,4 +29,4 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw2 = "2.0.0"
 cw-storage-plus = "2.0.0"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
diff --git a/integration-tests/contracts/modules/authz-transfer/src/contract.rs b/integration-tests/contracts/modules/authz-transfer/src/contract.rs
@@ -1,4 +1,4 @@
-use coreum_wasm_sdk::core::CoreumResult;
+use coreum_wasm_sdk::deprecated::core::CoreumResult;
 use coreum_wasm_sdk::shim;
 use coreum_wasm_sdk::types::cosmos::authz::v1beta1::MsgExec;
 use coreum_wasm_sdk::types::cosmos::bank::v1beta1::MsgSend;

diff --git a/integration-tests/contracts/modules/bank-send/Cargo.lock b/integration-tests/contracts/modules/bank-send/Cargo.lock
diff --git a/integration-tests/contracts/modules/bank-send/Cargo.toml b/integration-tests/contracts/modules/bank-send/Cargo.toml
@@ -28,7 +28,7 @@ library = []
 
 [dependencies]
 cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"
 thiserror = "1.0.59"

diff --git a/integration-tests/contracts/modules/dex/Cargo.lock b/integration-tests/contracts/modules/dex/Cargo.lock
diff --git a/integration-tests/contracts/modules/dex/Cargo.toml b/integration-tests/contracts/modules/dex/Cargo.toml
@@ -31,6 +31,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"
 thiserror = "1.0.59"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cosmwasm-schema = "2.1.4"
 cw-ownable = "2.1.0"
diff --git a/integration-tests/contracts/modules/dex/src/contract.rs b/integration-tests/contracts/modules/dex/src/contract.rs
@@ -75,7 +75,7 @@ pub fn execute(
 
 // ********** Transactions **********
 
-fn place_order(env: Env, order: Order) -> Result<Response, ContractError> {
+fn place_order(env: Env, order: MsgPlaceOrder) -> Result<Response, ContractError> {
     let place_order = MsgPlaceOrder {
         sender: env.contract.address.to_string(),
         r#type: order.r#type,

diff --git a/integration-tests/contracts/modules/dex/src/msg.rs b/integration-tests/contracts/modules/dex/src/msg.rs
@@ -1,5 +1,5 @@
 use coreum_wasm_sdk::types::coreum::asset::ft::v1::{DexSettings, ExtensionIssueSettings};
-use coreum_wasm_sdk::types::coreum::dex::v1::Order;
+use coreum_wasm_sdk::types::coreum::dex::v1::{MsgPlaceOrder, Order};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Uint128;
 
@@ -21,7 +21,7 @@ pub struct InstantiateMsg {
 
 #[cw_serde]
 pub enum ExecuteMsg {
-    PlaceOrder { order: Order },
+    PlaceOrder { order: MsgPlaceOrder },
     CancelOrder { order_id: String },
     CancelOrdersByDenom { account: String, denom: String },
 }

diff --git a/integration-tests/contracts/modules/ft-legacy/Cargo.toml b/integration-tests/contracts/modules/ft-legacy/Cargo.toml
@@ -34,6 +34,6 @@ cosmwasm-storage = "1.5.0"
 cw-storage-plus = "1.1.0"
 cw2 = "1.1.1"
 thiserror = "1.0.50"
-coreum-wasm-sdk = "1.0.0"
+coreum-wasm-sdk = "1.0.0" # we use old version intentionally
 cosmwasm-schema = "1.4.1"
 cw-ownable = "0.5.1"
diff --git a/integration-tests/contracts/modules/ft/Cargo.lock b/integration-tests/contracts/modules/ft/Cargo.lock
diff --git a/integration-tests/contracts/modules/ft/Cargo.toml b/integration-tests/contracts/modules/ft/Cargo.toml
@@ -31,6 +31,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"
 thiserror = "1.0.59"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cosmwasm-schema = "2.1.4"
 cw-ownable = "2.1.0"
diff --git a/integration-tests/contracts/modules/nft-legacy/Cargo.toml b/integration-tests/contracts/modules/nft-legacy/Cargo.toml
@@ -35,6 +35,6 @@ cw-storage-plus = "1.2.0"
 cw2 = "1.1.2"
 thiserror = "1.0.59"
 schemars = "0.8.16"
-coreum-wasm-sdk = "1.0.0"
+coreum-wasm-sdk = "1.0.0" # we use old version intentionally
 cosmwasm-schema = "1.5.4"
 cw-ownable = "0.5.1"
diff --git a/integration-tests/contracts/modules/nft/Cargo.lock b/integration-tests/contracts/modules/nft/Cargo.lock
diff --git a/integration-tests/contracts/modules/nft/Cargo.toml b/integration-tests/contracts/modules/nft/Cargo.toml
@@ -32,6 +32,6 @@ cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"
 thiserror = "1.0.59"
 schemars = "0.8.16"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cosmwasm-schema = "2.1.4"
 cw-ownable = "2.1.0"
diff --git a/integration-tests/modules/dex_test.go b/integration-tests/modules/dex_test.go
@@ -2333,8 +2333,8 @@ func TestAssetFTBlockSmartContractsFeatureWithDEX(t *testing.T) {
 
 	placeOrderPayload, err := json.Marshal(map[dexMethod]placeOrderBodyDEXRequest{
 		dexMethodPlaceOrder: {
-			Order: dextypes.Order{
-				Creator:     contractAddr,
+			Order: dextypes.MsgPlaceOrder{
+				Sender:      contractAddr,
 				Type:        dextypes.ORDER_TYPE_LIMIT,
 				ID:          "id1",
 				BaseDenom:   denom1WithBlockSmartContract,
@@ -2343,11 +2343,6 @@ func TestAssetFTBlockSmartContractsFeatureWithDEX(t *testing.T) {
 				Quantity:    sdkmath.NewInt(100),
 				Side:        dextypes.SIDE_BUY,
 				TimeInForce: dextypes.TIME_IN_FORCE_GTC,
-				// next attributes are required by smart contract, but not used
-				RemainingQuantity: sdkmath.ZeroInt(),
-				RemainingBalance:  sdkmath.ZeroInt(),
-				GoodTil:           nil,
-				Reserve:           sdk.NewCoin("denom1", sdkmath.ZeroInt()),
 			},
 		},
 	})

diff --git a/integration-tests/modules/wasm_test.go b/integration-tests/modules/wasm_test.go
@@ -121,7 +121,7 @@ type accountBodyFTRequest struct {
 }
 
 type placeOrderBodyDEXRequest struct {
-	Order dextypes.Order `json:"order"`
+	Order dextypes.MsgPlaceOrder `json:"order"`
 }
 
 //nolint:tagliatelle
@@ -3613,8 +3613,6 @@ func TestVestingToWASMContract(t *testing.T) {
 
 // TestWASMDEXInContract verifies that smart contract is able to execute all Coreum DEX messages and queries.
 func TestWASMDEXInContract(t *testing.T) {
-	t.Skip() // FIXME(dzmitryhil) restore once we merge and regenerate protos and contract
-
 	t.Parallel()
 
 	ctx, chain := integrationtests.NewCoreumTestingContext(t)
@@ -3768,8 +3766,8 @@ func TestWASMDEXInContract(t *testing.T) {
 	orderQuantity := sdkmath.NewInt(100)
 	placeOrderPayload, err := json.Marshal(map[dexMethod]placeOrderBodyDEXRequest{
 		dexMethodPlaceOrder: {
-			Order: dextypes.Order{
-				Creator:    contractAddr,
+			Order: dextypes.MsgPlaceOrder{
+				Sender:     contractAddr,
 				Type:       dextypes.ORDER_TYPE_LIMIT,
 				ID:         "id1",
 				BaseDenom:  denom1,
@@ -3780,10 +3778,7 @@ func TestWASMDEXInContract(t *testing.T) {
 				GoodTil: &dextypes.GoodTil{
 					GoodTilBlockHeight: uint64(blockRes.SdkBlock.Header.Height + 500),
 				},
-				TimeInForce:       dextypes.TIME_IN_FORCE_GTC,
-				RemainingQuantity: orderQuantity,
-				RemainingBalance:  orderQuantity,
-				Reserve:           wasmParamsRes.Params.OrderReserve,
+				TimeInForce: dextypes.TIME_IN_FORCE_GTC,
 			},
 		},
 	})
@@ -3801,12 +3796,25 @@ func TestWASMDEXInContract(t *testing.T) {
 
 	// ********** Query Order **********
 
+	orderPayload, err := json.Marshal(map[dexMethod]OrderBodyDEXRequest{
+		dexMethodOrder: {
+			Account: contractAddr,
+			OrderID: "id1",
+		},
+	})
+	requireT.NoError(err)
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, orderPayload)
+	requireT.NoError(err)
+	var wasmOrderRes dextypes.QueryOrderResponse
+	requireT.NoError(json.Unmarshal(queryOut, &wasmOrderRes))
+
 	expectedOrder := dextypes.Order{
 		Creator:    contractAddr,
 		Type:       dextypes.ORDER_TYPE_LIMIT,
 		ID:         "id1",
 		BaseDenom:  denom1,
 		QuoteDenom: denom2,
+		Sequence:   wasmOrderRes.Order.Sequence,
 		Price:      lo.ToPtr(dextypes.MustNewPriceFromString("999")),
 		Quantity:   orderQuantity,
 		Side:       dextypes.SIDE_SELL,
@@ -3818,18 +3826,6 @@ func TestWASMDEXInContract(t *testing.T) {
 		RemainingBalance:  orderQuantity,
 		Reserve:           dexParms.OrderReserve,
 	}
-
-	orderPayload, err := json.Marshal(map[dexMethod]OrderBodyDEXRequest{
-		dexMethodOrder: {
-			Account: contractAddr,
-			OrderID: "id1",
-		},
-	})
-	requireT.NoError(err)
-	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, orderPayload)
-	requireT.NoError(err)
-	var wasmOrderRes dextypes.QueryOrderResponse
-	requireT.NoError(json.Unmarshal(queryOut, &wasmOrderRes))
 	requireT.Equal(expectedOrder, wasmOrderRes.Order)
 
 	// ********** Query Orders **********

diff --git a/x/asset/ft/keeper/test-contracts/asset-extension/Cargo.lock b/x/asset/ft/keeper/test-contracts/asset-extension/Cargo.lock
diff --git a/x/asset/ft/keeper/test-contracts/asset-extension/Cargo.toml b/x/asset/ft/keeper/test-contracts/asset-extension/Cargo.toml
@@ -31,7 +31,7 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] }
 cw2 = "2.0.0"
 thiserror = "1.0.59"
 cosmwasm-schema = "2.1.4"
-coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" }
+coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", rev = "a0a00147d65b409bef2d86ebebf35959c96263c3" }
 cw-storage-plus = "2.0.0"
 prost = "0.11.9"
 serde = { version = "1.0.203", default-features = false, features = ["derive"] }

diff --git a/x/asset/ft/keeper/test-contracts/asset-extension/src/contract.rs b/x/asset/ft/keeper/test-contracts/asset-extension/src/contract.rs
@@ -4,8 +4,8 @@ use crate::msg::{
     TransferContext,
 };
 use crate::state::{DENOM, EXTRA_DATA};
-use coreum_wasm_sdk::assetft::{FREEZING, WHITELISTING};
-use coreum_wasm_sdk::core::{CoreumMsg, CoreumResult};
+use coreum_wasm_sdk::deprecated::assetft::{FREEZING, WHITELISTING};
+use coreum_wasm_sdk::deprecated::core::{CoreumMsg, CoreumResult};
 use coreum_wasm_sdk::types::coreum::asset::ft::v1::{
     MsgBurn, MsgMint, QueryFrozenBalanceRequest, QueryFrozenBalanceResponse, QueryTokenRequest,
     QueryTokenResponse, QueryWhitelistedBalanceRequest, QueryWhitelistedBalanceResponse, Token,