IBC-rate-limiting: modify the contract interface to handle the packet

app/app.go

@@ -176,6 +176,10 @@ func NewOsmosisApp(
 
 	wasmDir := filepath.Join(homePath, "wasm")
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
+
+	// Uncomment this for debugging contracts. In the future this could be made into a param passed by the tests
+	//wasmConfig.ContractDebugMode = true
+
 	if err != nil {
 		panic(fmt.Sprintf("error while reading wasm config: %s", err))
 	}

app/keepers/keepers.go

@@ -351,7 +351,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 
 	// The last arguments can contain custom message handlers, and custom query handlers,
 	// if we want to allow any custom callbacks
-	supportedFeatures := "iterator,staking,stargate,osmosis"
+	supportedFeatures := "iterator,staking,stargate,osmosis,cosmwasm_1_1"
 
 	wasmOpts = append(owasm.RegisterCustomPlugins(appKeepers.GAMMKeeper, appKeepers.BankKeeper, appKeepers.TwapKeeper, appKeepers.TokenFactoryKeeper), wasmOpts...)
 	wasmOpts = append(owasm.RegisterStargateQueries(*bApp.GRPCQueryRouter(), appCodec), wasmOpts...)

tests/e2e/configurer/chain/commands.go

@@ -105,7 +105,7 @@ func (n *NodeConfig) FailIBCTransfer(from, recipient, amount string) {
 
 	cmd := []string{"osmosisd", "tx", "ibc-transfer", "transfer", "transfer", "channel-0", recipient, amount, fmt.Sprintf("--from=%s", from)}
 
-	_, _, err := n.containerManager.ExecTxCmdWithSuccessString(n.t, n.chainId, n.Name, cmd, "Rate Limit exceeded")
+	_, _, err := n.containerManager.ExecTxCmdWithSuccessString(n.t, n.chainId, n.Name, cmd, "rate limit exceeded")
 	require.NoError(n.t, err)
 
 	n.LogActionF("Failed to send IBC transfer (as expected)")

tests/e2e/configurer/chain/queries.go

@@ -85,15 +85,16 @@ func (n *NodeConfig) QueryBalances(address string) (sdk.Coins, error) {
 	return balancesResp.GetBalances(), nil
 }
 
-func (n *NodeConfig) QueryTotalSupply() (sdk.Coins, error) {
-	bz, err := n.QueryGRPCGateway("cosmos/bank/v1beta1/supply")
+func (n *NodeConfig) QuerySupplyOf(denom string) (sdk.Int, error) {
+	path := fmt.Sprintf("cosmos/bank/v1beta1/supply/%s", denom)
+	bz, err := n.QueryGRPCGateway(path)
 	require.NoError(n.t, err)
 
-	var supplyResp banktypes.QueryTotalSupplyResponse
+	var supplyResp banktypes.QuerySupplyOfResponse
 	if err := util.Cdc.UnmarshalJSON(bz, &supplyResp); err != nil {
-		return sdk.Coins{}, err
+		return sdk.NewInt(0), err
 	}
-	return supplyResp.GetSupply(), nil
+	return supplyResp.Amount.Amount, nil
 }
 
 func (n *NodeConfig) QueryContractsFromId(codeId int) ([]string, error) {

tests/e2e/e2e_test.go

@@ -142,9 +142,8 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 	node, err := chainA.GetDefaultNode()
 	s.NoError(err)
 
-	supply, err := node.QueryTotalSupply()
+	osmoSupply, err := node.QuerySupplyOf("uosmo")
 	s.NoError(err)
-	osmoSupply := supply.AmountOf("uosmo")
 
 	// balance, err := node.QueryBalances(chainA.NodeConfigs[1].PublicAddress)
 	// s.NoError(err)

x/ibc-rate-limit/contracts/rate-limiter/Cargo.toml

@@ -32,14 +32,20 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = "1.1.0"
-cosmwasm-storage = "1.1.0"
-cosmwasm-schema = "1.1.0"
-cw-storage-plus = "0.13.2"
+cosmwasm-std = { version =  "1.1.5", features = ["stargate", "cosmwasm_1_1"]}
+cosmwasm-schema = "1.1.5"
+cosmwasm-storage = "1.1.5"
+cw-storage-plus = "0.16.0"
 cw2 = "0.13.2"
 schemars = "0.8.8"
 serde = { version = "1.0.137", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.31" }
+prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
+osmosis-std-derive = {version = "0.12.0"}
+osmosis-std = "0.12.0"
+sha2 = "0.10.6"
+hex = "0.4.3"
 
 [dev-dependencies]
 cw-multi-test = "0.13.2"
+serde-json-wasm = "0.4.1"

x/ibc-rate-limit/contracts/rate-limiter/src/contract.rs

@@ -5,7 +5,7 @@ use cw2::set_contract_version;
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, SudoMsg};
-use crate::state::{FlowType, Path, GOVMODULE, IBCMODULE};
+use crate::state::{FlowType, GOVMODULE, IBCMODULE};
 use crate::{execute, query, sudo};
 
 // version info for migration info
@@ -66,36 +66,33 @@ pub fn execute(
 pub fn sudo(deps: DepsMut, env: Env, msg: SudoMsg) -> Result<Response, ContractError> {
     match msg {
         SudoMsg::SendPacket {
-            channel_id,
-            channel_value,
-            funds,
-            denom,
-        } => sudo::try_transfer(
+            packet,
+            local_denom,
+            channel_value_hint,
+        } => sudo::process_packet(
             deps,
-            &Path::new(&channel_id, &denom),
-            channel_value,
-            funds,
+            packet,
             FlowType::Out,
             env.block.time,
+            local_denom,
+            channel_value_hint,
         ),
         SudoMsg::RecvPacket {
-            channel_id,
-            channel_value,
-            funds,
-            denom,
-        } => sudo::try_transfer(
+            packet,
+            local_denom,
+            channel_value_hint,
+        } => sudo::process_packet(
             deps,
-            &Path::new(&channel_id, &denom),
-            channel_value,
-            funds,
+            packet,
             FlowType::In,
             env.block.time,
+            local_denom,
+            channel_value_hint,
         ),
         SudoMsg::UndoSend {
-            channel_id,
-            denom,
-            funds,
-        } => sudo::undo_send(deps, &Path::new(&channel_id, &denom), funds),
+            packet,
+            local_denom,
+        } => sudo::undo_send(deps, packet, local_denom),
     }
 }