diff --git a/testutil/keeper/mocks/crosschain/account.go b/testutil/keeper/mocks/crosschain/account.go
index 9044c1009c..626900da83 100644
--- a/testutil/keeper/mocks/crosschain/account.go
+++ b/testutil/keeper/mocks/crosschain/account.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/crosschain/bank.go b/testutil/keeper/mocks/crosschain/bank.go
index 8fef8170d5..cdf1e371ef 100644
--- a/testutil/keeper/mocks/crosschain/bank.go
+++ b/testutil/keeper/mocks/crosschain/bank.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/crosschain/fungible.go b/testutil/keeper/mocks/crosschain/fungible.go
index 2cf14091c0..a6b763b8a3 100644
--- a/testutil/keeper/mocks/crosschain/fungible.go
+++ b/testutil/keeper/mocks/crosschain/fungible.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
@@ -48,25 +48,25 @@ func (_m *CrosschainFungibleKeeper) CallUniswapV2RouterSwapExactETHForToken(ctx
 	return r0, r1
 }
 
-// CallUniswapV2RouterSwapExactTokenForETH provides a mock function with given fields: ctx, sender, to, amountIn, outZRC4, noEthereumTxEvent
-func (_m *CrosschainFungibleKeeper) CallUniswapV2RouterSwapExactTokenForETH(ctx types.Context, sender common.Address, to common.Address, amountIn *big.Int, outZRC4 common.Address, noEthereumTxEvent bool) ([]*big.Int, error) {
-	ret := _m.Called(ctx, sender, to, amountIn, outZRC4, noEthereumTxEvent)
+// CallUniswapV2RouterSwapExactTokensForTokens provides a mock function with given fields: ctx, sender, to, amountIn, inZRC4, outZRC4, noEthereumTxEvent
+func (_m *CrosschainFungibleKeeper) CallUniswapV2RouterSwapExactTokensForTokens(ctx types.Context, sender common.Address, to common.Address, amountIn *big.Int, inZRC4 common.Address, outZRC4 common.Address, noEthereumTxEvent bool) ([]*big.Int, error) {
+	ret := _m.Called(ctx, sender, to, amountIn, inZRC4, outZRC4, noEthereumTxEvent)
 
 	var r0 []*big.Int
 	var r1 error
-	if rf, ok := ret.Get(0).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, bool) ([]*big.Int, error)); ok {
-		return rf(ctx, sender, to, amountIn, outZRC4, noEthereumTxEvent)
+	if rf, ok := ret.Get(0).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, common.Address, bool) ([]*big.Int, error)); ok {
+		return rf(ctx, sender, to, amountIn, inZRC4, outZRC4, noEthereumTxEvent)
 	}
-	if rf, ok := ret.Get(0).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, bool) []*big.Int); ok {
-		r0 = rf(ctx, sender, to, amountIn, outZRC4, noEthereumTxEvent)
+	if rf, ok := ret.Get(0).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, common.Address, bool) []*big.Int); ok {
+		r0 = rf(ctx, sender, to, amountIn, inZRC4, outZRC4, noEthereumTxEvent)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*big.Int)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, bool) error); ok {
-		r1 = rf(ctx, sender, to, amountIn, outZRC4, noEthereumTxEvent)
+	if rf, ok := ret.Get(1).(func(types.Context, common.Address, common.Address, *big.Int, common.Address, common.Address, bool) error); ok {
+		r1 = rf(ctx, sender, to, amountIn, inZRC4, outZRC4, noEthereumTxEvent)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -416,6 +416,32 @@ func (_m *CrosschainFungibleKeeper) QueryUniswapV2RouterGetZRC4AmountsIn(ctx typ
 	return r0, r1
 }
 
+// QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn provides a mock function with given fields: ctx, amountOut, inZRC4, outZRC4
+func (_m *CrosschainFungibleKeeper) QueryUniswapV2RouterGetZRC4ToZRC4AmountsIn(ctx types.Context, amountOut *big.Int, inZRC4 common.Address, outZRC4 common.Address) (*big.Int, error) {
+	ret := _m.Called(ctx, amountOut, inZRC4, outZRC4)
+
+	var r0 *big.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Context, *big.Int, common.Address, common.Address) (*big.Int, error)); ok {
+		return rf(ctx, amountOut, inZRC4, outZRC4)
+	}
+	if rf, ok := ret.Get(0).(func(types.Context, *big.Int, common.Address, common.Address) *big.Int); ok {
+		r0 = rf(ctx, amountOut, inZRC4, outZRC4)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*big.Int)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Context, *big.Int, common.Address, common.Address) error); ok {
+		r1 = rf(ctx, amountOut, inZRC4, outZRC4)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // QueryUniswapV2RouterGetZetaAmountsIn provides a mock function with given fields: ctx, amountOut, outZRC4
 func (_m *CrosschainFungibleKeeper) QueryUniswapV2RouterGetZetaAmountsIn(ctx types.Context, amountOut *big.Int, outZRC4 common.Address) (*big.Int, error) {
 	ret := _m.Called(ctx, amountOut, outZRC4)
diff --git a/testutil/keeper/mocks/crosschain/observer.go b/testutil/keeper/mocks/crosschain/observer.go
index 252c36e1cf..d3f069fcbe 100644
--- a/testutil/keeper/mocks/crosschain/observer.go
+++ b/testutil/keeper/mocks/crosschain/observer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/crosschain/staking.go b/testutil/keeper/mocks/crosschain/staking.go
index f35ad1190d..3027f516b1 100644
--- a/testutil/keeper/mocks/crosschain/staking.go
+++ b/testutil/keeper/mocks/crosschain/staking.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/fungible/account.go b/testutil/keeper/mocks/fungible/account.go
index d94cae3a4f..8ca9535cad 100644
--- a/testutil/keeper/mocks/fungible/account.go
+++ b/testutil/keeper/mocks/fungible/account.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/fungible/bank.go b/testutil/keeper/mocks/fungible/bank.go
index 3d78731354..a061b091f4 100644
--- a/testutil/keeper/mocks/fungible/bank.go
+++ b/testutil/keeper/mocks/fungible/bank.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/fungible/evm.go b/testutil/keeper/mocks/fungible/evm.go
index 42e3917ec1..8f6884d536 100644
--- a/testutil/keeper/mocks/fungible/evm.go
+++ b/testutil/keeper/mocks/fungible/evm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/testutil/keeper/mocks/fungible/observer.go b/testutil/keeper/mocks/fungible/observer.go
index 3dee529922..13f419d80a 100644
--- a/testutil/keeper/mocks/fungible/observer.go
+++ b/testutil/keeper/mocks/fungible/observer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.2. DO NOT EDIT.
+// Code generated by mockery v2.33.3. DO NOT EDIT.
 
 package mocks