first draft of Batch swap DEX

jatZama · Feb 15, 2024 · b2134ee · b2134ee
1 parent e26201e
commit b2134ee
Show file tree

Hide file tree

Showing 10 changed files with 304 additions and 400 deletions.
diff --git a/contracts/EncryptedERC20.sol b/contracts/EncryptedERC20.sol
@@ -11,7 +11,7 @@ contract EncryptedERC20 is Reencrypt, Ownable2Step {
     event Approval(address indexed owner, address indexed spender);
     event Mint(address indexed to, uint32 amount);
 
-    uint32 private _totalSupply;
+    uint32 internal _totalSupply;
     string private _name;
     string private _symbol;
     uint8 public constant decimals = 0;
@@ -75,6 +75,11 @@ contract EncryptedERC20 is Reencrypt, Ownable2Step {
         return TFHE.reencrypt(TFHE.asEuint32(0), publicKey, 0);
     }
 
+    // Returns the balance of the caller encrypted under the provided public key.
+    function balanceOfMe() public view returns (euint32) {
+        return balances[msg.sender];
+    }
+
     // Sets the `encryptedAmount` as the allowance of `spender` over the caller's tokens.
     function approve(address spender, bytes calldata encryptedAmount) public virtual returns (bool) {
         approve(spender, TFHE.asEuint32(encryptedAmount));
@@ -145,4 +150,5 @@ contract EncryptedERC20 is Reencrypt, Ownable2Step {
         balances[from] = balances[from] - TFHE.cmux(isTransferable, amount, TFHE.asEuint32(0));
         emit Transfer(from, to);
     }
-}
+}
+
diff --git a/contracts/Token.sol b/contracts/Token.sol
diff --git a/contracts/UniswapV2Factory.sol b/contracts/UniswapV2Factory.sol
@@ -13,6 +13,7 @@ contract UniswapV2Factory {
         return allPairs.length;
     }
 
+    // tokenA and tokenB should be EncryptedERC20_32 contracts
     function createPair(address tokenA, address tokenB) external returns (address pair) {
         require(tokenA != tokenB, "UniswapV2: IDENTICAL_ADDRESSES");
         (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);
@@ -26,4 +27,5 @@ contract UniswapV2Factory {
         allPairs.push(pair);
         emit PairCreated(token0, token1, pair, allPairs.length);
     }
+
 }
diff --git a/contracts/UniswapV2Pair.sol b/contracts/UniswapV2Pair.sol
diff --git a/contracts/UniswapV2Router.sol b/contracts/UniswapV2Router.sol
diff --git a/contracts/libraries/UniswapV2Library.sol b/contracts/libraries/UniswapV2Library.sol
diff --git a/package.json b/package.json
@@ -21,14 +21,15 @@
     "@types/node": "^18.11.9",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
+    "bigint-buffer": "^1.1.5",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "dotenv": "^16.0.3",
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "ethers": "^6.8.0",
     "fhevm": "^0.3.0",
-    "fhevmjs": "^0.3.1",
+    "fhevmjs": "^0.4.0-3",
     "fs-extra": "^10.1.0",
     "hardhat": "^2.19.4",
     "hardhat-deploy": "^0.11.29",
@@ -82,7 +83,7 @@
     "task:mint": "hardhat task:mint",
     "task:deployERC20": "hardhat task:deployERC20",
     "task:accounts": "hardhat task:accounts",
-    "fhevm:start": "docker run -i -p 8545:8545 -p 8546:8546 --rm --name fhevm ghcr.io/zama-ai/ethermint-dev-node:v0.2.4",
+    "fhevm:start": "docker run -i -p 8545:8545 -p 8546:8546 --rm --name fhevm ghcr.io/zama-ai/ethermint-dev-node:v0.3.0-0",
     "fhevm:stop": "docker rm -f fhevm",
     "fhevm:restart": "fhevm:stop && fhevm:start",
     "fhevm:faucet": "npm run fhevm:faucet:alice && sleep 5 && npm run fhevm:faucet:bob && sleep 5 && npm run fhevm:faucet:carol && sleep 5 && npm run fhevm:faucet:dave && sleep 5 && npm run fhevm:faucet:eve",