Fixes/post audit

.env.example

@@ -1,2 +1,2 @@
-# Deployment Config
-DEPLOYER_PRIVATE_KEY=
+PRIVATE_KEY=
+CATAPULTA_API_KEY=

.github/workflows/main.yaml

@@ -33,9 +33,7 @@ jobs:
           node-version: 16.x.x
 
       - name: Install Foundry
-        uses: onbjerg/foundry-toolchain@v1
-        with:
-          version: nightly
+        uses: foundry-rs/foundry-toolchain@v1
 
       - name: Run Forge build
         run: "forge build"
@@ -52,12 +50,10 @@ jobs:
           node-version: 16.x.x
 
       - name: Install Foundry
-        uses: onbjerg/foundry-toolchain@v1
-        with:
-          version: nightly
+        uses: foundry-rs/foundry-toolchain@v1
 
       - name: Run Forge build
         run: "forge build"
 
       - name: Run Forge test
-        run: "forge test"
+        run: "forge test -vvv"

.gitignore

@@ -17,3 +17,5 @@ node_modules/
 .gitpod.yml
 pnpm-lock.yaml
 count_lines.py
+lib
+lib/

README.md

@@ -36,6 +36,13 @@ To get started with RiftLend:
 
 ---
 
+### Contracts libraries
+
+```bash
+forge install  @openzeppelin/openzeppelin-contracts Vectorized/solady layerzero-labs/devtools layerzero-labs/layerzero-v1 layerzero-labs/layerzero-v2  GNSPS/solidity-bytes-utils --no-commit
+
+```
+
 ## Contributing
 
 We welcome community contributions! Here's how to get involved:

configs/deploy-config.toml

@@ -1,51 +1,72 @@
 [deploy_config]
-salt = "ethers phoenix"
-chains = ["op_chain_a","op_chain_b"]
-
-[token]
-salt = "ethers phoenix"
-owner_address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-name = "TestSuperchainERC20"
-symbol = "TSU"
+chains = ["eth_mainnet","op_mainnet","sepolia-eth"]
+[owner]
+address = "0x34b13101802b97cbfbC33a4eb597017dd20dd31C"
+
+[underlying]
+# riftlendUnderlying
+salt = "riftlendUnderlying"
+name = "TestUSDC"
+symbol = "TUSDC"
 decimals = 18
 
-[rTokenImpl]
-salt = "ethers phoenix rTokenImpl"
+[super_token]
+# riftlendSuperToken
+salt = "riftlendSuperToken"
+name = "superTestUSDC"
+symbol = "STUSDC"
+decimals = 18
 
-[stableDebtTokenImpl]
-salt = "ethers phoenix stableDebtTokenImpl"
+[rvault_asset]
+# riftlendRVaultAsset
+salt="riftlendRVaultAsset"
+max_deposit_limit="1000000000000000000000" # 1000 ether
+withdraw_cool_down_period=86400
+name = "rVaultAsset-TUSDC"
+symbol = "rVaultAsset-rTUSDC"
+
+[rToken]
+# riftlendRToken
+salt = "riftlendRToken"
+name = "rToken-TestUSDC"
+symbol = "rTUSDC"
+decimals = 18
 
-[variableDebtTokenImpl]
-salt = "ethers phoenix variableDebtTokenImpl"
+[variable_debt_token]
+# riftlendVdebt
+salt = "riftlendVdebt"
+name = "variableDebt-TUSDC"
+symbol = "vdebt-TUSDC"
 
 [lending_pool_addresses_provider]
-salt = "ethers phoenix lpap"
-owner_address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-marketId = "TSU Market"
+# riftlendLpAddressesProvider
+salt = "riftlendLpAddressesProvider"
+marketId = "TUSDC Market"
+lpType="OpSuperchain_LENDING_POOL"
 
 [proxy_admin]
-salt = "ethers phoenix proxyAdmin"
-owner_address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-
-[superchain_asset_1]
-salt = "ethers phoenix sa1"
-owner_address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-name = "SuperTestSuperchainERC20"
-symbol = "STSU"
-decimals = 18
-# TODO:Add correct lz addresses
-lzEndpoint = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-lzDelegate = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+# riftlendProxyAdmin
+salt = "riftlendProxyAdmin"
 
+[pool_admin]
+address="0x34b13101802b97cbfbC33a4eb597017dd20dd31C"
 
-[lending_pool_impl]
-salt = "ethers phoenix laimpl"
+
+[lending_pool]
+# riftlendLendingPool
+salt = "riftlendLendingPool"
 
 [lending_pool_configurator]
-salt = "ethers phoenix lpc"
+# riftlendLpConfigurator
+salt = "riftlendLpConfigurator"
+
+[lending_pool_collateral_manager]
+# riftlendLpCollateralManager
+salt = "riftlendLpCollateralManager"
 
 [default_reserve_interest_rate_strategy]
-salt = "ethers phoenix drirs"
+# riftlendDefaultStrategy
+salt = "riftlendDefaultStrategy"
 # These are random values. TODO these should be in ray terms
 optimalUtilizationRate = 1
 baseVariableBorrowRate = 2
@@ -54,34 +75,87 @@ variableRateSlope2 = 6
 stableRateSlope1 = 4
 stableRateSlope2 = 5
 
-[lending_rate_oracle]
-salt = "ethers phoenix lro"
-owner_address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+[price_oracle]
+# riftlendPriceOracle
+salt = "riftlendPriceOracle"
+owner_address = "0x34b13101802b97cbfbC33a4eb597017dd20dd31C"
 
-[treasury]
-address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+[event_validator]
+# riftlendEventValidator
+salt = "riftlendEventValidator"
 
-[incentives_controller]
-address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+[relayers]
+address1="0xa42Ba52a1c007F64CbEdfe5d68318c47479909B9"
+address2="0x5b82672fE0E4404d02982c57657e912FF2A2aCee"
+address3="0xeea6Fc4dbB9deD44fc97d25a181f4D1C84E4DFCB"
+address4="0x2E36797F103f7747B18171131B7DB321442E7426"
+address5="0x850647427a365238374f6E220EEFa8281ff35A70"
+address6="0x2EEB89646C0fC522980f08a6DF6f9843fefFBA77"
+total=6
 
-[aToken1]
-name = "A-TestSuperchainERC20"
-symbol = "ATUSDC"
+[treasury]
+address = "0x34b13101802b97cbfbC33a4eb597017dd20dd31C"
 
-[variableDebtToken1]
-name = "VDebt-TestSuperchainERC20"
-symbol = "VDTUSDC"
+[incentives_controller]
+address = "0x0000000000000000000000000000000000000000"
 
-[stableDebtToken1]
-name = "SDebt-TestSuperchainERC20"
-symbol = "SDTUSDC"
 
 [router]
-salt = "ethers phoenix router"
+# riftlendRouter
+salt = "riftlendRouter"
+
+[layerzero]
+lz_receive_gas_limit=200000
+lz_compose_gas_limit=500000
 
 [forks]
-chain_a_rpc_url = "https://opt-mainnet.g.alchemy.com/v2/xFdbkJe3ZbpjHxU2qIpikVBgN7TIMyX8"
-chain_a_chain_id = 10
+chain_a_rpc_url = "https://eth-mainnet.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_a_chain_id = 1
 chain_a_cross_l2_prover_address="0x1CCb363c18484A568DCB0Ec37fE5ad716C1D6e77"
-chain_a_weth="0x4200000000000000000000000000000000000006"
-chain_a_lz_endpoint_v2="0x1a44076050125825900e736c501f859c50fE728c"
+chain_a_weth="0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+chain_a_lz_endpoint_v2="0x1a44076050125825900e736c501f859c50fE728c"
+chain_a_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+chain_b_rpc_url = "https://opt-mainnet.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_b_chain_id = 10
+chain_b_cross_l2_prover_address="0x1CCb363c18484A568DCB0Ec37fE5ad716C1D6e77"
+chain_b_weth="0x4200000000000000000000000000000000000006"
+chain_b_lz_endpoint_v2="0x1a44076050125825900e736c501f859c50fE728c"
+chain_b_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+chain_test_a_rpc_url = "https://opt-sepolia.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_test_a_chain_id = 11155420
+chain_test_a_cross_l2_prover_address="0xb8AcB3FE3117A67b665Bc787c977623612f8a461"
+chain_test_a_weth="0xC355F97a3Aa2808Acb536E555764b8FB26fB4b37"
+chain_test_a_lz_endpoint_v2="0x6EDCE65403992e310A62460808c4b910D972f10f"
+chain_test_a_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+chain_test_b_rpc_url = "https://base-sepolia.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_test_b_chain_id = 84532
+chain_test_b_cross_l2_prover_address = "0xcDa03d74DEc5B24071D1799899B2e0653C24e5Fa"  
+chain_test_b_weth = "0x4200000000000000000000000000000000000006" 
+chain_test_b_lz_endpoint_v2 = "0x6EDCE65403992e310A62460808c4b910D972f10f"  
+chain_test_b_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+chain_test_c_rpc_url = "https://unichain-sepolia.g.alchemy.com/v2/xFdbkJe3ZbpjHxU2qIpikVBgN7TIMyX8"
+chain_test_c_chain_id = 1301
+chain_test_c_cross_l2_prover_address = "0xcDa03d74DEc5B24071D1799899B2e0653C24e5Fa"  
+chain_test_c_weth = "0x4200000000000000000000000000000000000006" 
+chain_test_c_lz_endpoint_v2 = "0xb8815f3f882614048CbE201a67eF9c6F10fe5035"  
+chain_test_c_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+
+chain_test_d_rpc_url = "https://arb-sepolia.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_test_d_chain_id = 421614
+chain_test_d_cross_l2_prover_address = "0xcDa03d74DEc5B24071D1799899B2e0653C24e5Fa"  
+chain_test_d_weth = "0x980b62da83eff3d4576c647993b0c1d7faf17c73" 
+chain_test_d_lz_endpoint_v2 = "0x6EDCE65403992e310A62460808c4b910D972f10f"  
+chain_test_d_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"
+
+
+chain_test_e_rpc_url = "https://eth-sepolia.g.alchemy.com/v2/muWMumYKuC6W7Oa572HjryTPZMMLbPK3"
+chain_test_e_chain_id = 11155111
+chain_test_e_cross_l2_prover_address = "0xcDa03d74DEc5B24071D1799899B2e0653C24e5Fa"  
+chain_test_e_weth = "0xb16f35c0ae2912430dac15764477e179d9b9ebea" 
+chain_test_e_lz_endpoint_v2 = "0x6EDCE65403992e310A62460808c4b910D972f10f"  
+chain_test_e_lz_delegate="0xf9E5bFE615853BC0ce310Dd3187277B0bbAC112c"

foundry.toml

@@ -3,9 +3,12 @@ src = "src"
 script = "scripts"
 out = "out"
 libs = ["lib"]
-via_ir = true
-optimizer = false
-optimizer_runs = 200
+via_ir = false
+optimizer = true
+optimizer_runs = 100
+
+# [fuzz]
+# runs=100
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 

index.d.ts

@@ -1,18 +1,20 @@
 import { Address } from 'viem'
 
 export const deployment: {
-  deployedAddress: Address // address of test token contract (TUSDC)
-  ownerAddress: Address // address of owner of deployed test token contract
-  rTokenAddress: Address // address of deployed aToken contract implementation
-  stableDebtTokenAddress: Address // address of deployed stable debt token contract implementation
-  variableDebtTokenAddress: Address // address of deployed variable debt token contract implementation
-  lendingPoolAddressesProviderAddress: Address // address of deployed lending pool addresses provider contract
-  superchainAssetAddress: Address // address of deployed superchain asset contract
-  lendingPoolAddress: Address // address of deployed lending pool contract
-  proxyAdminAddress: Address // address of deployed proxy admin contract
-  lendingPoolConfiguratorAddress: Address // address of deployed lending pool configurator contract
-  defaultReserveInterestRateStrategyAddress: Address // address of deployed default reserve interest rate strategy contract
-  lendingRateOracleAddress: Address // address of deployed lending rate oracle contract
-  routerAddress: Address // address of deployed router contract
-  routerImplAddress: Address // address of deployed router implementation contract
+  Underlying: Address, 
+  EventValidator: Address, 
+  SuperAsset: Address,
+  ProxyAdmin: Address, 
+  LendingPoolAddressesProvider: Address, 
+  DefaultReserveInterestRateStrategy: Address, 
+  MockPriceOracle: Address, 
+  LendingPool: Address, 
+  LendingPoolConfigurator: Address, 
+  RVaultAsset: Address, 
+  RToken: Address, 
+  VariableDebtToken: Address, 
+  LendingPoolCollateralManager: Address, 
+  RouterImpl: Address, 
+  Router: Address,
+  Owner: Address
 }

lib/LayerZero-v2/packages/layerzero-v2/aptos/contracts/deployer/Move.toml

@@ -0,0 +1,17 @@
+[package]
+name = "deployer"
+version = "1.0.0"
+authors = []
+
+[addresses]
+deployer = "_"
+
+[dev-addresses]
+deployer = "0x90909090"
+
+[dependencies.AptosFramework]
+git = "https://github.com/aptos-labs/aptos-framework.git"
+rev = "mainnet"
+subdir = "aptos-framework"
+
+[dev-dependencies]