Merge pull request #3 from Tenderize/nv/curve-updates

Curve updates and other fixes

.gitmodules

@@ -12,9 +12,9 @@
 [submodule "lib/clones-with-immutable-args"]
 	path = lib/clones-with-immutable-args
 	url = https://github.com/wighawag/clones-with-immutable-args
-[submodule "lib/staking"]
-	path = lib/staking
-	url = https://github.com/Tenderize/staking
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate
+[submodule "lib/staking"]
+	path = lib/staking
+	url = https://github.com/tenderize/staking

foundry.toml

@@ -1,7 +1,5 @@
 # Full reference https://github.com/foundry-rs/foundry/tree/master/config
 
-# Full reference https://github.com/foundry-rs/foundry/tree/master/config
-
 [profile.default]
 bytecode_hash = "none"
 fuzz = { runs = 1_000 }
@@ -25,25 +23,25 @@ quote_style = "double"
 tab_width = 4
 wrap_comments = true
 
-[etherscan]
-arbitrum_one = { key = "${API_KEY_ARBISCAN}" }
-avalanche = { key = "${API_KEY_SNOWTRACE}" }
-bnb_smart_chain = { key = "${API_KEY_BSCSCAN}" }
-gnosis_chain = { key = "${API_KEY_GNOSISSCAN}" }
-goerli = { key = "${API_KEY_ETHERSCAN}" }
-mainnet = { key = "${API_KEY_ETHERSCAN}" }
-optimism = { key = "${API_KEY_OPTIMISTIC_ETHERSCAN}" }
-polygon = { key = "${API_KEY_POLYGONSCAN}" }
-sepolia = { key = "${API_KEY_ETHERSCAN}" }
+# [etherscan]
+# arbitrum_one = { key = "${API_KEY_ARBISCAN}" }
+# avalanche = { key = "${API_KEY_SNOWTRACE}" }
+# bnb_smart_chain = { key = "${API_KEY_BSCSCAN}" }
+# gnosis_chain = { key = "${API_KEY_GNOSISSCAN}" }
+# goerli = { key = "${API_KEY_ETHERSCAN}" }
+# mainnet = { key = "${API_KEY_ETHERSCAN}" }
+# optimism = { key = "${API_KEY_OPTIMISTIC_ETHERSCAN}" }
+# polygon = { key = "${API_KEY_POLYGONSCAN}" }
+# sepolia = { key = "${API_KEY_ETHERSCAN}" }
 
-[rpc_endpoints]
-arbitrum_one = "https://arbitrum-mainnet.infura.io/v3/${API_KEY_INFURA}"
-avalanche = "https://avalanche-mainnet.infura.io/v3/${API_KEY_INFURA}"
-bnb_smart_chain = "https://bsc-dataseed.binance.org"
-gnosis_chain = "https://rpc.gnosischain.com"
-goerli = "https://goerli.infura.io/v3/${API_KEY_INFURA}"
-localhost = "http://localhost:8545"
-mainnet = "https://eth-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
-optimism = "https://optimism-mainnet.infura.io/v3/${API_KEY_INFURA}"
-polygon = "https://polygon-mainnet.infura.io/v3/${API_KEY_INFURA}"
-sepolia = "https://sepolia.infura.io/v3/${API_KEY_INFURA}"
+# [rpc_endpoints]
+# arbitrum_one = "https://arbitrum-mainnet.infura.io/v3/${API_KEY_INFURA}"
+# avalanche = "https://avalanche-mainnet.infura.io/v3/${API_KEY_INFURA}"
+# bnb_smart_chain = "https://bsc-dataseed.binance.org"
+# gnosis_chain = "https://rpc.gnosischain.com"
+# goerli = "https://goerli.infura.io/v3/${API_KEY_INFURA}"
+# localhost = "http://localhost:8545"
+# mainnet = "https://eth-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+# optimism = "https://optimism-mainnet.infura.io/v3/${API_KEY_INFURA}"
+# polygon = "https://polygon-mainnet.infura.io/v3/${API_KEY_INFURA}"
+# sepolia = "https://sepolia.infura.io/v3/${API_KEY_INFURA}"

script/Add_Liquidity.s.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+import { Script, console2 } from "forge-std/Script.sol";
+import { ERC20 } from "solmate/tokens/ERC20.sol";
+import { TenderSwap, Config } from "@tenderize/swap/Swap.sol";
+
+contract Add_Liquidity is Script {
+    // Contracts are deployed deterministically.
+    // e.g. `foo = new Foo{salt: salt}(constructorArgs)`
+    // The presence of the salt argument tells forge to use https://github.com/Arachnid/deterministic-deployment-proxy
+    bytes32 private constant salt = 0x0;
+
+    // Start broadcasting with private key from `.env` file
+    uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+    address underlying = vm.envAddress("UNDERLYING");
+
+    function run() public {
+        vm.startBroadcast(deployerPrivateKey);
+        TenderSwap swap = TenderSwap(0x4ec6faD51A1957cAb7E8a62e43f0A0a0c2143d3f);
+        ERC20(underlying).approve(address(swap), 500_000 ether);
+        swap.deposit(500_000 ether);
+        console2.log("liabilities", swap.liabilities());
+        console2.log("liquidity", swap.liquidity());
+        // ERC20(0x2eaC4210B90D13666f7E88635096BdC17C51FB70).approve(address(swap), 10 ether);
+
+        // (uint256 out, uint256 fee) = swap.quote(0x2eaC4210B90D13666f7E88635096BdC17C51FB70, 10 ether);
+        // console2.log("quote", out);
+        // ERC20(0x2eaC4210B90D13666f7E88635096BdC17C51FB70).approve(address(swap), 10 ether);
+        // // (out, fee) = swap.swap(0x2eaC4210B90D13666f7E88635096BdC17C51FB70, 10 ether, 0);
+        // console2.log("out", out);
+        // console2.log("fee", fee);
+
+        // // Other Tenderizer: 0xD58Fed21106A046093086903909478AD96D310a8
+        // (out, fee) = swap.quote(0xD58Fed21106A046093086903909478AD96D310a8, 10 ether);
+        // console2.log("quote", out);
+
+        vm.stopBroadcast();
+    }
+}

script/Swap_Deploy.s.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+import { Script, console2 } from "forge-std/Script.sol";
+import { ERC20 } from "solmate/tokens/ERC20.sol";
+import { TenderSwap, Config } from "@tenderize/swap/Swap.sol";
+
+contract Swap_Deploy is Script {
+    // Contracts are deployed deterministically.
+    // e.g. `foo = new Foo{salt: salt}(constructorArgs)`
+    // The presence of the salt argument tells forge to use https://github.com/Arachnid/deterministic-deployment-proxy
+    bytes32 private constant salt = 0x0;
+
+    // Start broadcasting with private key from `.env` file
+    uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+    address underlying = vm.envAddress("UNDERLYING");
+    address registry = vm.envAddress("REGISTRY");
+    address unlocks = vm.envAddress("UNLOCKS");
+    Config cfg = Config({ underlying: ERC20(underlying), registry: registry, unlocks: unlocks });
+
+    function run() public {
+        vm.startBroadcast(deployerPrivateKey);
+        TenderSwap swap = new TenderSwap{salt: salt}(cfg);
+        console2.log("TenderSwap deployed at: ", address(swap));
+        vm.stopBroadcast();
+    }
+}