Sanchezol/dev

.gitignore

@@ -2,6 +2,8 @@
 cache/
 out/
 
+broadcast/
+
 # Ignores development broadcast logs
 !/broadcast
 /broadcast/*/31337/

.gitmodules

@@ -10,3 +10,15 @@
 [submodule "lib/openzeppelin-foundry-upgrades"]
 	path = lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+[submodule "lib/contracts"]
+	path = lib/contracts
+	url = https://github.com/berachain/contracts
+[submodule "lib/bera-contracts"]
+	path = lib/bera-contracts
+	url = https://github.com/berachain/contracts
+[submodule "lib/layerzero"]
+	path = lib/layerzero
+	url = https://github.com/LayerZero-Labs/devtools
+[submodule "lib/lz-address-book"]
+	path = lib/lz-address-book
+	url = https://github.com/LayerZero-Labs/lz-address-book

NOTES.txt

@@ -31,13 +31,25 @@ cast balance --erc20 0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0 0xf39Fd6e51aad88
 # sfluv balance = anvil address 0
 cast balance --erc20 0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --rpc-url  http://127.0.0.1:8545
 
-forge verify-contract 0x881cAd4f885c6701D8481c0eD347f6d35444eA7e src/SFLUVv2.sol:SFLUVv2 --verifier-url 'https://api.berascan.com/api' --etherscan-api-key WMP6HJHJ9NAK8A63SNAG1G4KHAUKU5X4SQ --num-of-optimizations 200
+forge verify-contract 0x881cAd4f885c6701D8481c0eD347f6d35444eA7e src/SFLUVv2.sol:SFLUVv2 --verifier-url 'https://api.berascan.com/api' --etherscan-api-key $$ETHERSCAN_API_KEY --num-of-optimizations 200
 
 forge verify-contract --watch --chain-id 80094 0x881cAd4f885c6701D8481c0eD347f6d35444eA7e src/SFLUVv2.sol:SFLUVv2 --verifier-url 'https://api.berascan.com/api'
 
 forge verify-contract 0x881cAd4f885c6701D8481c0eD347f6d35444eA7e  \
 src/SFLUVv2.sol:SFLUVv2 \
 --rpc-url https://rpc.berachain.com \
---etherscan-api-key WMP6HJHJ9NAK8A63SNAG1G4KHAUKU5X4SQ \
+--etherscan-api-key $$ETHERSCAN_API_KEY \
 --verifier-url 'https://api.berascan.com/api' \
 --watch
+
+# deploy zapper
+forge script script/DeploySFLUVZapperv1.s.sol:DeploySFLUVZapperv1 --rpc-url https://rpc.berachain.com --private-key $PRIVATE_KEY --broadcast
+0xd0EBD0495750899D18b915BDeba789E2defdC394
+
+forge script script/UpgradeSFLUVZapper.sol:UpgradeSFLUVZapper \
+  --rpc-url https://rpc.berachain.com \
+  --private-key $PRIVATE_KEY \
+  --broadcast \
+  --verify \
+  --etherscan-api-key $ETHERSCAN_API_KEY \
+  -vvvv

foundry.lock

@@ -0,0 +1,23 @@
+{
+  "lib/bera-contracts": {
+    "rev": "b7562f2bcd4bef30c9833469ddb98b8fbc419cc9"
+  },
+  "lib/contracts": {
+    "rev": "b7562f2bcd4bef30c9833469ddb98b8fbc419cc9"
+  },
+  "lib/forge-std": {
+    "rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
+  },
+  "lib/layerzero": {
+    "rev": "6c95cd3c1d96ae9b3594a352f6f209f3a7733bcb"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "e4f70216d759d8e6a64144a9e1f7bbeed78e7079"
+  },
+  "lib/openzeppelin-contracts-upgradeable": {
+    "rev": "60b305a8f3ff0c7688f02ac470417b6bbf1c4d27"
+  },
+  "lib/openzeppelin-foundry-upgrades": {
+    "rev": "cbce1e00305e943aa1661d43f41e5ac72c662b07"
+  }
+}

foundry.toml

@@ -8,3 +8,6 @@ build_info = true
 extra_output = ["storageLayout"]
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+
+[etherscan]
+berachain = { key = "${ETHERSCAN_API_KEY}", url = "https://rpc.berachain.com" }

remappings.txt

@@ -1,8 +1,16 @@
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/
 forge-std/=lib/forge-std/src/
 halmos-cheatcodes/=lib/openzeppelin-contracts-upgradeable/lib/halmos-cheatcodes/src/
 openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/
 openzeppelin-contracts/=lib/openzeppelin-contracts/
 openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/
+@berachain/contracts=lib/bera-contracts/src/
+solady/src/=lib/bera-contracts/lib/solady/src
+@layerzerolabs/lz-evm-protocol-v2/=lib/lz-address-book/lib/LayerZero-v2/packages/layerzero-v2/evm/protocol/
+@layerzerolabs/lz-evm-messagelib-v2/=lib/lz-address-book/lib/LayerZero-v2/packages/layerzero-v2/evm/messagelib/
+@layerzerolabs/oft-evm/=lib/lz-address-book/lib/devtools/packages/oft-evm/
+@layerzerolabs/oapp-evm/=lib/lz-address-book/lib/devtools/packages/oapp-evm/
+@openzeppelin/contracts/=lib/lz-address-book/lib/openzeppelin-contracts/contracts/
+solidity-bytes-utils/=lib/lz-address-book/lib/solidity-bytes-utils/
+forge-std/=lib/forge-std/src/

script/DeploySFLUVUSDCeZapper.s.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.26;
+
+import "forge-std/Script.sol";
+import {SFLUVUSDCeZapper, SFLUVUSDCeZapperStorageInit} from "../src/SFLUVUSDCeZapper.sol";
+import {SFLUVv2} from "../src/SFLUVv2.sol";
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import {IDeployErrors} from "./IDeployErrors.sol";
+
+contract DeploySFLUVUSDCeZapper is Script, IDeployErrors {
+
+    function run() public {
+        address honeyFactory = vm.envAddress("HONEY_FACTORY_ADDRESS");
+        address sfluv = vm.envAddress("SFLUV_ADDRESS");
+        address honey = vm.envAddress("HONEY_ADDRESS");
+        address usdc = vm.envAddress("USDC_E_ADDRESS");
+        address usdcAdapter = vm.envAddress("USDC_E_ADAPTER_ADDRESS");
+        address usdcVault = vm.envAddress("USDC_E_VAULT_ADDRESS");
+        address honeyToUSDCPool = vm.envAddress("HONEY_USDC_POOL_ADDRESS");
+        uint32 usdcDstEid = uint32(vm.envUint("USDC_DST_EID"));
+
+        SFLUVUSDCeZapperStorageInit memory s = SFLUVUSDCeZapperStorageInit(
+            honeyFactory,
+            sfluv,
+            honey,
+            usdc,
+            usdcAdapter,
+            usdcVault,
+            honeyToUSDCPool,
+            usdcDstEid
+        );
+
+        vm.startBroadcast();
+
+        SFLUVv2 token = SFLUVv2(sfluv);
+
+        bool isAdmin = token.hasRole(token.DEFAULT_ADMIN_ROLE(), msg.sender);
+        if (!isAdmin) revert NotAdmin();
+
+        bool isRedeemerAdmin = token.hasRole(token.REDEEMER_ADMIN_ROLE(), msg.sender);
+        if (!isRedeemerAdmin) {
+            token.grantRole(token.REDEEMER_ADMIN_ROLE(), msg.sender);
+        }
+
+        SFLUVUSDCeZapper impl = new SFLUVUSDCeZapper();
+
+        ERC1967Proxy proxy = new ERC1967Proxy(address(impl),
+            abi.encodeCall(impl.initialize, (msg.sender, s))
+        );
+
+        token.grantRole(token.REDEEMER_ROLE(), address(proxy));
+
+        vm.stopBroadcast();
+
+        console.log("UUPS Proxy Address:", address(proxy));
+    }
+}

script/DeploySFLUVZapperv1.s.sol

@@ -0,0 +1,53 @@
+pragma solidity ^0.8.26;
+
+import "forge-std/Script.sol";
+import {SFLUVZapperv1, SFLUVZapperStorageInit} from "../src/SFLUVZapperv1.sol";
+import {SFLUVv2} from "../src/SFLUVv2.sol";
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IDeployErrors} from "./IDeployErrors.sol";
+
+contract DeploySFLUVZapperv1 is Script, IDeployErrors {
+
+    function run() public {
+        address honeyFactory = vm.envAddress("HONEY_FACTORY_ADDRESS");
+        address sfluv = vm.envAddress("SFLUV_ADDRESS");
+        address byusd = vm.envAddress("BYUSD_ADDRESS");
+        address honey = vm.envAddress("HONEY_ADDRESS");
+        address honeyToBYUSDPool = vm.envAddress("HONEY_BYUSD_POOL_ADDRESS");
+        address byusdVault = vm.envAddress("BYUSD_VAULT_ADDRESS");
+
+        SFLUVZapperStorageInit memory s = SFLUVZapperStorageInit(
+            honeyFactory,
+            sfluv,
+            byusd,
+            honey,
+            honeyToBYUSDPool,
+            byusdVault
+        );
+
+        vm.startBroadcast();
+
+        SFLUVv2 token = SFLUVv2(sfluv);
+
+        bool isAdmin = token.hasRole(token.DEFAULT_ADMIN_ROLE(), msg.sender);
+        if (!isAdmin) revert NotAdmin();
+
+        bool isMinterAdmin = token.hasRole(token.MINTER_ADMIN_ROLE(), msg.sender);
+        require(isMinterAdmin);
+        bool isRedeemerAdmin = token.hasRole(token.REDEEMER_ADMIN_ROLE(), msg.sender);
+        require(isRedeemerAdmin);
+
+        SFLUVZapperv1 impl = new SFLUVZapperv1();
+
+        ERC1967Proxy proxy = new ERC1967Proxy(address(impl),
+            abi.encodeCall(impl.initialize, (msg.sender, s)));
+
+        token.grantRole(token.MINTER_ROLE(), address(proxy));
+        token.grantRole(token.REDEEMER_ROLE(), address(proxy));
+
+        vm.stopBroadcast();
+
+        console.log("UUPS Proxy Address:", address(proxy));
+    }
+}

script/GrantSFLUVv2.s.sol

@@ -10,12 +10,13 @@ contract GrantSFLUVv2 is Script {
     address constant private SFLUV_V2_ADDR = 0x881cAd4f885c6701D8481c0eD347f6d35444eA7e;
 
     // mainnet gov account
-    address constant private TARGET_ADDR = 0x90496e23825aD0C8107d04671e6a27f30630Fc35;
+    address constant private TARGET_ADDR = 0x8b631C26537a784082A55528eaD52271ce88572e;
 
     function run() public {
         vm.startBroadcast();
         SFLUVv2 impl = SFLUVv2(SFLUV_V2_ADDR);
-        impl.grantRole(impl.MINTER_ADMIN_ROLE(), TARGET_ADDR);
+        // impl.grantRole(impl.MINTER_ADMIN_ROLE(), TARGET_ADDR);
+        impl.grantRole(impl.REDEEMER_ROLE(), TARGET_ADDR);
         vm.stopBroadcast();
     }
-}
+}

script/IDeployErrors.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.26;
+
+interface IDeployErrors {
+    // Signature: 0xd92e233d
+    error ZeroAddress();
+
+    error NotAdmin();
+}

script/SFLUVStorageSlots.s.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.26;
+
+import {Script, console} from "forge-std/Script.sol";
+
+contract SFLUVStorageSlotScript is Script {
+    function setUp() public {}
+
+    function run() public pure {
+        bytes32 SFLUVZapperStorage =
+            keccak256(abi.encode(uint256(keccak256("SFLUV.storage.SFLUVZapper")) - 1)) & ~bytes32(uint256(0xff));
+
+        console.log("SFLUVZapper Storage:         ", vm.toString(SFLUVZapperStorage));
+    }
+}

script/UpgradeSFLUVZapper.sol

@@ -0,0 +1,39 @@
+pragma solidity ^0.8.26;
+
+import "forge-std/Script.sol";
+import {SFLUVZapperv1} from "../src/SFLUVZapperv1.sol";
+// import {SFLUVZapperv2} from "../src/SFLUVZapperv2.sol"; // Your new implementation
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {IDeployErrors} from "./IDeployErrors.sol";
+
+interface IUUPSUpgradeable {
+    function upgradeToAndCall(address newImplementation, bytes memory data) external payable;
+}
+
+contract UpgradeSFLUVZapper is Script, IDeployErrors {
+
+    function run() public {
+        address payable proxyAddress = payable(vm.envAddress("SFLUV_ZAPPER_PROXY_ADDRESS"));
+
+        vm.startBroadcast();
+
+        // Get reference to the proxy (using the old interface)
+        SFLUVZapperv1 proxy = SFLUVZapperv1(proxyAddress);
+
+        // Verify caller has upgrade authority
+        if (!proxy.hasRole(proxy.DEFAULT_ADMIN_ROLE(), msg.sender)) revert NotAdmin();
+
+        // Deploy new implementation
+        SFLUVZapperv1 newImpl = new SFLUVZapperv1();
+
+        console.log("New Implementation:", address(newImpl));
+
+        // For simple upgrade without reinitialization:
+        IUUPSUpgradeable(proxyAddress).upgradeToAndCall(address(newImpl), "");
+
+        console.log("Upgrade successful!");
+        console.log("Proxy Address:", proxyAddress);
+
+        vm.stopBroadcast();
+    }
+}

src/ILiquidityPool.sol

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.26;
+
+interface ILiquidityPool {
+    /// Swap token0 <-> token1
+    /// @param recipient Address receiving output tokens
+    /// @param zeroForOne True = token0 → token1, false = token1 → token0
+    /// @param amountSpecified Positive = exact input, negative = exact output
+    /// @param sqrtPriceLimitX96 Q64.96 price limit, 0 = no limit
+    /// @param data Bytes passed to callback
+    function swap(
+        address recipient,
+        bool zeroForOne,
+        int256 amountSpecified,
+        uint160 sqrtPriceLimitX96,
+        bytes calldata data
+    ) external returns (int256 amount0Delta, int256 amount1Delta);
+
+    function token0() external view returns (address);
+    function token1() external view returns (address);
+    function slot0() external view returns (
+        uint160 sqrtPriceX96,
+        int24 tick,
+        uint16 observationIndex,
+        uint16 observationCardinality,
+        uint16 observationCardinalityNext,
+        uint32 feeProtocol,
+        bool unlocked
+    );
+}

src/ISFLUVZapperErrors.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.26;
+
+interface ISFLUVZapperErrors {
+    // Signature: 0xd92e233d
+    error ZeroAddress();
+
+    error TransferFailed(address token, address to, address from, uint256 value);
+    error MintFailed();
+    error RedeemFailed();
+}