feat: Remove HRP from port ID to comply with the IBC port ID format (#2266)

* feat: Remove HRP from port ID to comply with the IBC port ID format

* Update x/wasm/keeper/ibc_test.go

Co-authored-by: Christoph Otter <chris@confio.gmbh>

---------

Co-authored-by: Christoph Otter <chris@confio.gmbh>

Author: kulikthebird

CHANGELOG.md

@@ -14,6 +14,8 @@
  - Remove IBC fee handling, as it is no longer supported by the IBC protocol [\#2254](https://github.com/CosmWasm/wasmd/pull/2254)
  - Add support for IBCv2 Send entry point [\#2252](https://github.com/CosmWasm/wasmd/pull/2252)
  - Introduce IBCv2 endpoint for receiving message acknowledgements [\#2261](https://github.com/CosmWasm/wasmd/pull/2261)
+ - IBCv2 WriteAcknowledgement handler for async ACK [\#2173](https://github.com/CosmWasm/wasmd/pull/2173)
+ - Remove HRP from port ID to comply with the IBC port ID format [\#2266](https://github.com/CosmWasm/wasmd/pull/2266)
 
 ## [v0.55.0](https://github.com/CosmWasm/wasmd/tree/v0.55.0) (2025-03-11)
 

x/wasm/keeper/ibc.go

@@ -28,12 +28,14 @@ func ContractFromPortID(portID string) (sdk.AccAddress, error) {
 const portIDPrefixV2 = "wasm2"
 
 func PortIDForContractV2(addr sdk.AccAddress) string {
-	return portIDPrefixV2 + addr.String()
+	blockchainPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
+	return portIDPrefixV2 + strings.TrimPrefix(addr.String(), blockchainPrefix)
 }
 
 func ContractFromPortID2(portID string) (sdk.AccAddress, error) {
 	if !strings.HasPrefix(portID, portIDPrefixV2) {
 		return nil, errorsmod.Wrapf(types.ErrInvalid, "without prefix")
 	}
-	return sdk.AccAddressFromBech32(portID[len(portIDPrefixV2):])
+	blockchainPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
+	return sdk.AccAddressFromBech32(blockchainPrefix + portID[len(portIDPrefixV2):])
 }

x/wasm/keeper/ibc_test.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -50,3 +51,47 @@ func TestContractFromPortID(t *testing.T) {
 		})
 	}
 }
+
+func TestContractFromPortID2(t *testing.T) {
+	contractAddr := BuildContractAddressClassic(1, 100)
+	trimmed := strings.TrimPrefix(contractAddr.String(), sdk.GetConfig().GetBech32AccountAddrPrefix())
+	specs := map[string]struct {
+		srcPort string
+		expAddr sdk.AccAddress
+		expErr  bool
+	}{
+		"all good": {
+			srcPort: fmt.Sprintf("wasm2%s", trimmed),
+			expAddr: contractAddr,
+		},
+		"hrp present in bech32": {
+			srcPort: fmt.Sprintf("wasm2%s", contractAddr.String()),
+			expErr:  true,
+		},
+		"without prefix": {
+			srcPort: trimmed,
+			expErr:  true,
+		},
+		"invalid prefix": {
+			srcPort: fmt.Sprintf("wasmx%s", contractAddr.String()),
+			expErr:  true,
+		},
+		"invalid account": {
+			srcPort: "wasm2foobar",
+			expErr:  true,
+		},
+	}
+	for name, spec := range specs {
+		t.Run(name, func(t *testing.T) {
+			gotAddr, gotErr := ContractFromPortID2(spec.srcPort)
+			if spec.expErr {
+				require.Error(t, gotErr)
+				return
+			}
+			require.NoError(t, gotErr)
+			assert.Equal(t, spec.expAddr, gotAddr)
+			gotPort := PortIDForContractV2(gotAddr)
+			assert.Equal(t, spec.srcPort, gotPort)
+		})
+	}
+}

x/wasm/keeper/keeper_test.go

@@ -423,7 +423,7 @@ func TestInstantiate(t *testing.T) {
 
 	gasAfter := ctx.GasMeter().GasConsumed()
 	if types.EnableGasVerification {
-		require.Equal(t, uint64(0x1c527), gasAfter-gasBefore)
+		require.Equal(t, uint64(0x1c473), gasAfter-gasBefore)
 	}
 
 	// ensure it is stored properly
@@ -891,7 +891,7 @@ func TestInstantiateWithContractFactoryChildQueriesParent(t *testing.T) {
 
 	// when
 	contractAddress, data, err := keepers.ContractKeeper.Instantiate(ctx, example.CodeID, example.CreatorAddr, nil, nil, "test", nil)
-	ibc2PortID := "wasm2" + contractAddress.String()
+	ibc2PortID := PortIDForContractV2(contractAddress)
 
 	// then
 	require.NoError(t, err)
@@ -961,7 +961,7 @@ func TestExecute(t *testing.T) {
 	// make sure gas is properly deducted from ctx
 	gasAfter := ctx.GasMeter().GasConsumed()
 	if types.EnableGasVerification {
-		require.Equal(t, uint64(0x1adc3), gasAfter-gasBefore)
+		require.Equal(t, uint64(0x1adb1), gasAfter-gasBefore)
 	}
 	// ensure bob now exists and got both payments released
 	bobAcct = accKeeper.GetAccount(ctx, bob)

x/wasm/keeper/recurse_test.go

@@ -56,8 +56,8 @@ func initRecurseContract(t *testing.T) (contract sdk.AccAddress, ctx sdk.Context
 
 func TestGasCostOnQuery(t *testing.T) {
 	const (
-		GasNoWork uint64 = 64_209
-		GasWork50 uint64 = 64_456
+		GasNoWork uint64 = 64_191
+		GasWork50 uint64 = 64_438
 		// should be discounted exactly by the difference between normal instance cost and discounted instance cost
 		GasNoWorkDiscounted uint64 = GasNoWork - (types.DefaultInstanceCost - types.DefaultInstanceCostDiscount)
 		GasWork50Discounted uint64 = GasWork50 - (types.DefaultInstanceCost - types.DefaultInstanceCostDiscount)
@@ -214,7 +214,7 @@ func TestLimitRecursiveQueryGas(t *testing.T) {
 
 	const (
 		// Note: about 100 SDK gas (10k CosmWasm gas) for each round of sha256
-		GasWork2k uint64 = 77_038 // = SetupContractCost + x // we have 6x gas used in cpu than in the instance
+		GasWork2k uint64 = 77_020 // = SetupContractCost + x // we have 6x gas used in cpu than in the instance
 
 		// should be discounted exactly by the difference between normal instance cost and discounted instance cost
 		GasWork2kDiscounted uint64 = GasWork2k - (types.DefaultInstanceCost - types.DefaultInstanceCostDiscount)

x/wasm/keeper/relay_test.go

@@ -83,7 +83,7 @@ func TestOnOpenChannel(t *testing.T) {
 			}
 			require.NoError(t, err)
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 		})
 	}
@@ -189,7 +189,7 @@ func TestOnConnectChannel(t *testing.T) {
 			}
 			require.NoError(t, err)
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expContractGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 			// verify msgs dispatched
 			require.Len(t, *capturedMsgs, len(spec.contractResp.Messages))
@@ -299,7 +299,7 @@ func TestOnCloseChannel(t *testing.T) {
 			}
 			require.NoError(t, err)
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expContractGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 			// verify msgs dispatched
 			require.Len(t, *capturedMsgs, len(spec.contractResp.Messages))
@@ -318,7 +318,7 @@ func TestOnRecvPacket(t *testing.T) {
 	parentCtx, keepers := CreateTestInput(t, false, AvailableCapabilities, WithMessageHandler(messenger))
 	example := SeedNewContractInstance(t, parentCtx, keepers, &m)
 	const myContractGas = 40
-	const storageCosts = storetypes.Gas(3119)
+	const storageCosts = storetypes.Gas(3101)
 
 	specs := map[string]struct {
 		contractAddr       sdk.AccAddress
@@ -495,7 +495,7 @@ func TestOnRecvPacket(t *testing.T) {
 			}
 
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expContractGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 
 			// verify msgs dispatched on success/ err response
@@ -606,7 +606,7 @@ func TestOnAckPacket(t *testing.T) {
 			}
 			require.NoError(t, err)
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expContractGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 			// verify msgs dispatched
 			require.Len(t, *capturedMsgs, len(spec.contractResp.Messages))
@@ -726,7 +726,7 @@ func TestOnTimeoutPacket(t *testing.T) {
 			}
 			require.NoError(t, err)
 			// verify gas consumed
-			const storageCosts = storetypes.Gas(3119)
+			const storageCosts = storetypes.Gas(3101)
 			assert.Equal(t, spec.expContractGas, ctx.GasMeter().GasConsumed()-before-storageCosts)
 			// verify msgs dispatched
 			require.Len(t, *capturedMsgs, len(spec.contractResp.Messages))