univ2 set up

loadtest/config.json

@@ -43,7 +43,7 @@
             "begin_redelegate_percentage": "0.25"
         }
     },
-    "message_type": "bank,evm,erc20",
+    "message_type": "bank,evm,erc20,univ2",
     "run_oracle": false,
     "metrics_port": 9695,
     "wasm_msg_types": {

loadtest/contracts/deploy_univ2.sh

@@ -14,17 +14,60 @@ cd loadtest/contracts/evm || exit 1
 # git submodule update --init --recursive
 
 # deploy the uniswapV2 factory contract
-feeCollector=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+feeCollector=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 # first anvil address, just need a random address
+wallet=0xF87A299e6bC7bEba58dbBe5a5Aa21d49bCD16D52
 
-which forge
-
-forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/univ2/UniswapV2Factory.sol:UniswapV2Factory --json --constructor-args $feeCollector # | jq -r '.deployedTo'
+factoryAddress=$(forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/univ2/UniswapV2Factory.sol:UniswapV2Factory --json --constructor-args $feeCollector | jq -r '.deployedTo')
 
 echo "UniswapV2Factory deployed to $factoryAddress"
 
 # deploy the uniswapV2 router02 contract
-/root/.foundry/bin/forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/univ2/UniswapV2Router02.sol:UniswapV2Router02 --json --constructor-args $factoryAddress 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 | jq -r '.deployedTo'
+routerAddress=$(forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/univ2/UniswapV2Router.sol:UniswapV2Router --json --constructor-args $factoryAddress $feeCollector | jq -r '.deployedTo')
+
+echo "UniswapV2Router deployed to $routerAddress"
+
 # create ERC20s
+token1Address=$(forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/ERC20Token.sol:ERC20Token --json --constructor-args "Token1" "T1" | jq -r '.deployedTo')
+
+echo "Token1 deployed to $token1Address"
+
+token2Address=$(forge create -r "$evm_endpoint" --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e src/ERC20Token.sol:ERC20Token --json --constructor-args "Token2" "T2" | jq -r '.deployedTo')
+
+echo "Token2 deployed to $token2Address"
+
+# mint tokens
+cast send -r "$evm_endpoint" $token1Address --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "mint(address,uint256)" $wallet 1000000000 --legacy
+
+cast send -r "$evm_endpoint" $token2Address --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "mint(address,uint256)" $wallet 1000000000 --legacy
+
+balanceToken1=$(cast call -r "$evm_endpoint" $token1Address "balanceOf(address)" $wallet)
+balanceToken2=$(cast call -r "$evm_endpoint" $token2Address "balanceOf(address)" $wallet)
+
+echo "Token1 balance: $balanceToken1"
+echo "Token2 balance: $balanceToken2"
+
 # create a pool
-# add liquidity
-# temp
+echo "Creating a pool"
+cast send -r "$evm_endpoint" $factoryAddress --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "createPair(address,address)" $token1Address $token2Address --legacy --json
+
+# get the pair address
+pairAddress=$(cast call -r "$evm_endpoint" $factoryAddress "getAllPairsIndex(uint256)" 0)
+
+echo "Pair address: $pairAddress"
+
+echo "Approving router to spend tokens..."
+cast send -r "$evm_endpoint" $token1Address --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "approve(address,uint256)" $routerAddress 1000000000 --legacy --json
+cast send -r "$evm_endpoint" $token2Address --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "approve(address,uint256)" $routerAddress 1000000000 --legacy --json
+
+echo "Check allowance..."
+token1ToRouterAllowance=$(cast call -r "$evm_endpoint" $token1Address "allowance(address,address)(uint256)" $wallet $routerAddress)
+token2ToRouterAllowance=$(cast call -r "$evm_endpoint" $token2Address "allowance(address,address)(uint256)" $wallet $routerAddress)
+
+echo "Token1 to router allowance: $token1ToRouterAllowance"
+echo "Token2 to router allowance: $token2ToRouterAllowance"
+
+echo "Adding liquidity to pool"
+echo "cast send -r $evm_endpoint $routerAddress --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e 'addLiquidity(address,address,uint256,uint256,uint256,uint256,address,uint256)' \
+    $token1Address $token2Address 1000000 1000000 0 0 $wallet 1000000000000000000 --legacy --json"
+cast send -r "$evm_endpoint" $routerAddress --private-key 57acb95d82739866a5c29e40b0aa2590742ae50425b7dd5b5d279a986370189e "addLiquidity(address,address,uint256,uint256,uint256,uint256,address,uint256)" \
+    $token1Address $token2Address 1000000 1000000 0 0 $wallet 1000000000000000000 --legacy --json

loadtest/contracts/evm/src/ERC20Token.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract ERC20Token is ERC20 {
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) {}
+    function mint(address to, uint256 amount) public {
+        _mint(to, amount);
+    }
+}

loadtest/contracts/evm/src/univ2/UniswapV2Router.sol

@@ -121,17 +121,23 @@ contract UniswapV2Router {
             factory.createPair(tokenA, tokenB);
         }
 
+        // require(false, string(abi.encodePacked(factory)));
+
         (uint112 reserveA, uint112 reserveB) = UniswapV2Library.getReserves(
             address(factory),
             tokenA,
             tokenB
         );
+        // require(false, "after getReserves");
         if (reserveA == 0 && reserveB == 0) {
             (amountA, amountB) = (amountADesired, amountBDesired);
         } else {
             amountB = UniswapV2Library.quote(amountADesired, reserveA, reserveB);
             if (amountB <= amountBDesired) {
-                if (amountB < amountBMin) revert InsufficientAmountB();
+                if (amountB < amountBMin) {
+                    require(false, "InsufficientAmountB");
+                    revert InsufficientAmountB();
+                }
                 amountA = amountADesired;
             } else {
                 amountA = UniswapV2Library.quote(
@@ -141,7 +147,10 @@ contract UniswapV2Router {
                 );
                 assert(amountA <= amountADesired);
 
-                if (amountA < amountAMin) revert InsufficientAmountA();
+                if (amountA < amountAMin) {
+                    require(false, "InsufficientAmountA");
+                    revert InsufficientAmountA();
+                }
                 amountB = amountBDesired;
             }
         }
@@ -154,6 +163,9 @@ contract UniswapV2Router {
         uint256 amount
     ) internal returns (bool success) {
         success = IERC20(token).transferFrom(from, to, amount);
-        if (!success) revert SafeTransferFromFailed();
+        if (!success) {
+            require(false, "SafeTransferFromFailed");
+            revert SafeTransferFromFailed();
+        }
     }
 }

loadtest/contracts/evm/src/univ2/libraries/UniswapV2Library.sol

@@ -2,6 +2,7 @@
 pragma solidity >=0.8.10;
 
 import "../interfaces/IUniswapV2Pair.sol";
+import "../interfaces/IUniswapV2Factory.sol";
 
 /// @title UniswapV2Library
 /// @author Uniswap Labs
@@ -29,9 +30,8 @@ library UniswapV2Library {
         address tokenB
     ) internal view returns (uint112 reserveA, uint112 reserveB) {
         (address token0, address token1) = sortPairs(tokenA, tokenB);
-        (uint112 reserve0, uint112 reserve1, ) = IUniswapV2Pair(
-            pairFor(factory, token0, token1)
-        ).getReserves();
+        IUniswapV2Pair pair = IUniswapV2Pair(IUniswapV2Factory(factory).pairs(token0, token1));
+        (uint112 reserve0, uint112 reserve1, ) = pair.getReserves();
         (reserveA, reserveB) = tokenA == token0
             ? (reserve0, reserve1)
             : (reserve1, reserve0);

loadtest/evm.go

@@ -77,6 +77,8 @@ func (txClient *EvmTxClient) GetTxForMsgType(msgType string) *ethtypes.Transacti
 		return txClient.GenerateSendFundsTx()
 	case ERC20:
 		return txClient.GenerateERC20TransferTx()
+	case UNIV2:
+		return txClient.GenerateUniV2SwapTx()
 	default:
 		panic("invalid message type")
 	}
@@ -118,6 +120,11 @@ func (txClient *EvmTxClient) GenerateERC20TransferTx() *ethtypes.Transaction {
 	return tx
 }
 
+func (txClient *EvmTxClient) GenerateUniV2SwapTx() *ethtypes.Transaction {
+	// TODO
+	opts := txClient.getTransactOpts()
+}
+
 func (txClient *EvmTxClient) getTransactOpts() *bind.TransactOpts {
 	auth, err := bind.NewKeyedTransactorWithChainID(txClient.privateKey, txClient.chainId)
 	if err != nil {

loadtest/loadtest_client.go

@@ -195,6 +195,9 @@ func (c *LoadTestClient) BuildTxs(
 			case EVM, ERC20:
 				fmt.Println("In EVM/ERC20")
 				signedTx = SignedTx{EvmTx: c.generateSignedEvmTx(keyIndex, messageType)}
+			case UNIV2:
+				fmt.Println("In UNIV2")
+				signedTx = SignedTx{EvmTx: c.generateSignedEvmTx(keyIndex, messageType)}
 			default:
 				signedTx = SignedTx{TxBytes: c.generateSignedCosmosTxs(keyIndex, messageType, producedCount)}
 			}

loadtest/types.go

@@ -31,6 +31,7 @@ const (
 	Limit                string = "limit"
 	Market               string = "market"
 	WasmMintNft          string = "wasm_mint_nft"
+	UNIV2                string = "univ2"
 	Vortex               string = "vortex"
 	WasmInstantiate      string = "wasm_instantiate"
 )