performed modifications after adding sqrt computation

[ovatman]

Changes include:

• UniswapV2Router02.addLiquidity() and UniswapV2Pair.mint() functions are added (together with functions they use such as math_sqrt())
• testRouterAddLiquidity() test added that checks for newly added functionality
• output from regression tests are updated

[mariaKt]

I believe that this is failing due to compound assignment no longer being supported.

[dwightguth]

Please also make sure you are applying the same modifications to the version of the contract in test/regression/swaps.sol. The two files differ slightly, but we want to keep them enough in sync that they are running the same computations. Also, that version is the only version that is currently being regression tested.

[dwightguth]

I will happily investigate the failures in the semantics if there are any, but now that we have a working version of the semantics on one version of the contract, changes to the contract need to only go through if they don't break the semantics.

[dwightguth]

Also, just fyi, auto formatting a file in the same PR that you make other modifications to that file is a bad idea; it makes it vastly more difficult to review the code.

[mariaKt]

I tried this version of Uniswap locally, and it does not run. It fails in setUp (

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 673 in ca576a1

function setUp() public {

). Looking very briefly, it seems that is attempts to create a UniswapV2Swap using two different constructors.

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 677 in ca576a1

_uni = new UniswapV2Swap(address(_weth), address(_dai), address(_usdc));

and

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 689 in ca576a1

_uni = new UniswapV2Swap(address(_weth), address(_dai), address(_usdc), address(_router));

Only the one with 3 parameters exists though.

[ovatman]

@mariaKt I have addressed the issue below; Uniswap is compiling now.

I tried this version of Uniswap locally, and it does not run. It fails in setUp (

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 673 in ca576a1

function setUp() public {

). Looking very briefly, it seems that is attempts to create a UniswapV2Swap using two different constructors.

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 677 in ca576a1

_uni = new UniswapV2Swap(address(_weth), address(_dai), address(_usdc));

and

solidity-demo-semantics/test/examples/swaps/UniswapV2Swap.sol

Line 689 in ca576a1

_uni = new UniswapV2Swap(address(_weth), address(_dai), address(_usdc), address(_router));

Only the one with 3 parameters exists though.

[ovatman]

@dwightguth last commit performs this synchronization.

Please also make sure you are applying the same modifications to the version of the contract in test/regression/swaps.sol. The two files differ slightly, but we want to keep them enough in sync that they are running the same computations. Also, that version is the only version that is currently being regression tested.

[ovatman]

@dwightguth @mariaKt as far as I can see current state of semantics don't work well with the sqrt() related modifications. I believe it should be possible to keep the older version but still add sqrt() related functionality.
However, I'm not certain how it will work with retesteth related stuff.

[dwightguth]

Can you show me what the change to the contract and the resulting stuck configuration were?

[mariaKt]

@dwightguth if you meant me: I made no changes to the contract, and simply added the transaction

txn(1, 2, 0, 1724300000, testRouterAddLiquidity, )

after the others (so it is similar to the UniswapTest.txn file in this PR). Here is the stuck configuration.
conf.txt

[ovatman]

@dwightguth @mariaKt I went over the error and performed necessary modifications. krun progressed when I replaced integer literals in the addLiquidity() call with local variables keeping the same values.

I have also updated the reference output accordingly, I wasn't able to see any problems with the output reference please check if you can see anything odd.

[dwightguth]

I'm approving so as to make you not stuck, but please address my comment prior to merging.

[dwightguth]

This should not be here. This program tests just the swap function.

it has been addressed