fix: sdk prefix change handle for neutron and archway

relayer/chains/icon/icon_chain_processor.go

@@ -353,6 +353,9 @@ loop:
 					break
 				}
 
+				icp.log.Debug("Verified block ",
+					zap.Int64("height", int64(processedheight)))
+
 				icp.latestBlock = provider.LatestBlock{
 					Height: uint64(processedheight),
 				}

relayer/chains/wasm/provider.go

@@ -346,8 +346,6 @@ func (ap *WasmProvider) Init(ctx context.Context) error {
 	}
 	ap.LightProvider = lightprovider
 
-	ap.SetSDKContext()
-
 	clientCtx := client.Context{}.
 		WithClient(rpcClient).
 		WithFromName(ap.PCfg.Key).

relayer/chains/wasm/query.go

@@ -313,20 +313,20 @@
 }
 
 func (ap *WasmProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) {
 
 	consensusStateParam, err := types.NewConsensusStateByHeight(clientid, uint64(clientHeight.GetRevisionHeight())).Bytes()
 	consensusState, err := ap.QueryIBCHandlerContractProcessed(ctx, consensusStateParam)
 	if err != nil {
 		return nil, err
 	}
 
 	cdc := codec.NewProtoCodec(ap.Cdc.InterfaceRegistry)
 	csState, err := clienttypes.UnmarshalConsensusState(cdc, consensusState)
 	if err != nil {
 		return nil, err
 	}
 
 	anyConsensusState, err := clienttypes.PackConsensusState(csState)
 	if err != nil {
 		return nil, err
 	}
@@ -334,7 +334,8 @@
 }
 
 func (ap *WasmProvider) QueryIBCHandlerContract(ctx context.Context, param wasmtypes.RawContractMessage) (*wasmtypes.QuerySmartContractStateResponse, error) {
-
+	done := ap.SetSDKContext()
+	defer done()
 	return ap.QueryClient.SmartContractState(ctx, &wasmtypes.QuerySmartContractStateRequest{
 		Address:   ap.PCfg.IbcHandlerAddress,
 		QueryData: param,

relayer/chains/wasm/tx.go

@@ -745,16 +745,16 @@
 		}
 
 		if msg.Type() == MethodUpdateClient {
 			if err := retry.Do(func() error {
 				if err := ap.BroadcastTx(cliCtx, txBytes, []provider.RelayerMessage{msg}, asyncCtx, defaultBroadcastWaitTimeout, asyncCallback, true); err != nil {
 					if strings.Contains(err.Error(), sdkerrors.ErrWrongSequence.Error()) {
 						ap.handleAccountSequenceMismatchError(err)
 					}
 				}
 				return err
 			}, retry.Context(ctx), rtyAtt, retry.Delay(time.Millisecond*time.Duration(ap.PCfg.BlockInterval)), rtyErr); err != nil {
 				ap.log.Error("Failed to update client", zap.Any("Message", msg))
 				return err
 			}
 			continue
 		}
@@ -807,6 +807,8 @@
 func (ap *WasmProvider) LogSuccessTx(res *sdk.TxResponse, msgs []provider.RelayerMessage) {
 	// Include the chain_id
 	fields := []zapcore.Field{zap.String("chain_id", ap.ChainId())}
+	done := ap.SetSDKContext()
+	defer done()
 
 	// Include the gas used
 	fields = append(fields, zap.Int64("gas_used", res.GasUsed))
@@ -879,6 +881,9 @@
 }
 
 func (ap *WasmProvider) buildMessages(clientCtx client.Context, txf tx.Factory, msgs ...sdk.Msg) ([]byte, uint64, error) {
+	done := ap.SetSDKContext()
+	defer done()
+
 	for _, msg := range msgs {
 		if err := msg.ValidateBasic(); err != nil {
 			return nil, 0, err
@@ -1006,8 +1011,8 @@
 
 	ap.log.Info("Submitted transaction",
 		zap.String("chain_id", ap.PCfg.ChainID),
 		zap.String("tx_hash", res.TxHash),
 		msgTypesField(msgs),
 	)
 
 	if shouldWait {

relayer/chains/wasm/wasm_prefix.go

@@ -16,12 +16,13 @@
 // SetSDKContext sets the SDK config to the proper bech32 prefixes for wasm.
 // Don't use this unless you know what you're doing.
 // TODO: :dagger: :knife: :chainsaw: remove this function
-func (ap *WasmProvider) SetSDKContext() {
+func (ap *WasmProvider) SetSDKContext() func() {
+
 	sdkConfigMutex.Lock()
-	cfg := sdk.GetConfig()
-	cfg.SetBech32PrefixForAccount(ap.PCfg.AccountPrefix, app.Bech32PrefixAccPub)
-	cfg.SetBech32PrefixForValidator(ap.PCfg.AccountPrefix, app.Bech32PrefixValPub)
-	cfg.SetBech32PrefixForConsensusNode(app.Bech32PrefixConsAddr, app.Bech32PrefixConsPub)
-	cfg.SetAddressVerifier(wasmtypes.VerifyAddressLen())
-	sdkConfigMutex.Unlock()
+	cfg_update := sdk.GetConfig()
+	cfg_update.SetBech32PrefixForAccount(ap.PCfg.AccountPrefix, app.Bech32PrefixAccPub)
+	cfg_update.SetBech32PrefixForValidator(ap.PCfg.AccountPrefix, app.Bech32PrefixValPub)
+	cfg_update.SetBech32PrefixForConsensusNode(app.Bech32PrefixConsAddr, app.Bech32PrefixConsPub)
+	cfg_update.SetAddressVerifier(wasmtypes.VerifyAddressLen())
+	return sdkConfigMutex.Unlock
 }