fix - fix contract binding issues

Dvisacker · Sep 25, 2024 · 17b1392 · 17b1392
1 parent 74fce75
commit 17b1392
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 88 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,10 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+bindings = { path = "./src/bindings" }
 tokio = { version = "1.40.0", features = ["full"] }
 alloy = { version = "0.3.3", features = ["full"] }
 alloy-primitives = "0.8"
 alloy-rpc-types = "0.3.3"
+alloy-contract = "0.3.3"
 alloy-sol-types = "0.8.3"
 alloy-consensus = "0.3.3"
 teloxide = { version = "0.13.0", features = ["full"] }

diff --git a/aave-pool-abi.json → ILendingPool.json b/aave-pool-abi.json → ILendingPool.json
@@ -2227,21 +2227,4 @@
         "stateMutability": "nonpayable",
         "type": "function"
     }
-]
-
-
-7237005577332262213973187317040823336706252649385398494942757770499441565754,
-1032177298231527184190952531,
-19134320813521574388905924,
-1071435268085129654073234081,
-25987092370809719795466300,
-0,
-1727186935,
-4,
-0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8,
-0xD8Ad37849950903571df17049516a5CD4cbE55F6,
-0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351,
-0xC2c6DF6a8B6cc79a6F927a1FFAE602c701C374Ea,
-315497387612874979,
-0,
-0
+]
diff --git a/bindings/Cargo.toml b/bindings/Cargo.toml
diff --git a/src/bindings/Cargo.toml b/src/bindings/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "bindings"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+alloy = { version = "0.3.3", features = ["full"] }
+# alloy = { git = "https://github.com/alloy-rs/alloy", rev = "0.3.3", features = ["sol-types", "contract"] }
diff --git a/bindings/src/aavelooper.rs → src/bindings/src/aavelooper.rs b/bindings/src/aavelooper.rs → src/bindings/src/aavelooper.rs
diff --git a/bindings/src/address.rs → src/bindings/src/address.rs b/bindings/src/address.rs → src/bindings/src/address.rs
diff --git a/bindings/src/context.rs → src/bindings/src/context.rs b/bindings/src/context.rs → src/bindings/src/context.rs
diff --git a/bindings/src/datatypes.rs → src/bindings/src/datatypes.rs b/bindings/src/datatypes.rs → src/bindings/src/datatypes.rs
diff --git a/bindings/src/erc20.rs → src/bindings/src/erc20.rs b/bindings/src/erc20.rs → src/bindings/src/erc20.rs
diff --git a/bindings/src/iaaveincentivescontroller.rs → ...bindings/src/iaaveincentivescontroller.rs b/bindings/src/iaaveincentivescontroller.rs → ...bindings/src/iaaveincentivescontroller.rs
diff --git a/bindings/src/iaavepriceoracle.rs → src/bindings/src/iaavepriceoracle.rs b/bindings/src/iaavepriceoracle.rs → src/bindings/src/iaavepriceoracle.rs
diff --git a/bindings/src/ierc1155errors.rs → src/bindings/src/ierc1155errors.rs b/bindings/src/ierc1155errors.rs → src/bindings/src/ierc1155errors.rs
diff --git a/bindings/src/ierc20.rs → src/bindings/src/ierc20.rs b/bindings/src/ierc20.rs → src/bindings/src/ierc20.rs
diff --git a/bindings/src/ierc20errors.rs → src/bindings/src/ierc20errors.rs b/bindings/src/ierc20errors.rs → src/bindings/src/ierc20errors.rs
diff --git a/bindings/src/ierc20metadata.rs → src/bindings/src/ierc20metadata.rs b/bindings/src/ierc20metadata.rs → src/bindings/src/ierc20metadata.rs
diff --git a/bindings/src/ierc20permit.rs → src/bindings/src/ierc20permit.rs b/bindings/src/ierc20permit.rs → src/bindings/src/ierc20permit.rs
diff --git a/bindings/src/ierc721errors.rs → src/bindings/src/ierc721errors.rs b/bindings/src/ierc721errors.rs → src/bindings/src/ierc721errors.rs
diff --git a/bindings/src/ilendingpool.rs → src/bindings/src/ilendingpool.rs b/bindings/src/ilendingpool.rs → src/bindings/src/ilendingpool.rs
diff --git a/...ings/src/ilendingpooladdressesprovider.rs → ...ings/src/ilendingpooladdressesprovider.rs b/...ings/src/ilendingpooladdressesprovider.rs → ...ings/src/ilendingpooladdressesprovider.rs
diff --git a/bindings/src/immutableownable.rs → src/bindings/src/immutableownable.rs b/bindings/src/immutableownable.rs → src/bindings/src/immutableownable.rs
diff --git a/bindings/src/istakedaave.rs → src/bindings/src/istakedaave.rs b/bindings/src/istakedaave.rs → src/bindings/src/istakedaave.rs
diff --git a/bindings/src/lib.rs → src/bindings/src/lib.rs b/bindings/src/lib.rs → src/bindings/src/lib.rs
diff --git a/bindings/src/safeerc20.rs → src/bindings/src/safeerc20.rs b/bindings/src/safeerc20.rs → src/bindings/src/safeerc20.rs
diff --git a/src/main.rs b/src/main.rs
@@ -11,75 +11,17 @@ use std::sync::Arc;
 use std::time::Duration;
 use teloxide::prelude::*;
 use tokio::time;
-use IAAVE::IAAVEInstance;
+use ILendingPool::ILendingPoolInstance;
 use IERC20::IERC20Instance;
 
 pub mod config;
 pub mod provider;
 
-// sol! {
-
-//     #[derive(Debug, PartialEq, Eq)]
-//     #[sol(rpc)]
-//     struct ReserveConfigurationMap {
-//         uint256 data;
-//     }
-
-//     #[derive(Debug, PartialEq, Eq)]
-//     #[sol(rpc)]
-//     struct ReserveData {
-//         //stores the reserve configuration
-//         ReserveConfigurationMap configuration;
-//         //the liquidity index. Expressed in ray
-//         uint128 liquidityIndex;
-//         //the current supply rate. Expressed in ray
-//         uint128 currentLiquidityRate;
-//         //variable borrow index. Expressed in ray
-//         uint128 variableBorrowIndex;
-//         //the current variable borrow rate. Expressed in ray
-//         uint128 currentVariableBorrowRate;
-//         //the current stable borrow rate. Expressed in ray
-//         uint128 currentStableBorrowRate;
-//         //timestamp of last update
-//         uint40 lastUpdateTimestamp;
-//         //the id of the reserve. Represents the position in the list of the active reserves
-//         uint16 id;
-//         //timestamp until when liquidations are not allowed on the reserve, if set to past liquidations will be allowed
-//         uint40 liquidationGracePeriodUntil;
-//         //aToken address
-//         address aTokenAddress;
-//         //stableDebtToken address
-//         address stableDebtTokenAddress;
-//         //variableDebtToken address
-//         address variableDebtTokenAddress;
-//         //address of the interest rate strategy
-//         address interestRateStrategyAddress;
-//         //the current treasury balance, scaled
-//         uint128 accruedToTreasury;
-//         //the outstanding unbacked aTokens minted through the bridging feature
-//         uint128 unbacked;
-//         //the outstanding debt borrowed against this asset in isolation mode
-//         uint128 isolationModeTotalDebt;
-//         //the amount of underlying accounted for by the protocol
-//         uint128 virtualUnderlyingBalance;
-//       }
-
-//     #[derive(Debug, PartialEq, Eq)]
-//     #[sol(rpc)]
-//     contract IAAVE {
-//         function supply(address asset, uint256 amount, address onBehalfOf, uint16 referralCode) external;
-//         function borrow(address asset, uint256 amount, uint256 interestRateMode, uint16 referralCode, address onBehalfOf) external;
-//         function getUserAccountData(address user) external view returns (uint256 totalCollateralBase, uint256 totalDebtBase, uint256 availableBorrowsBase, uint256 currentLiquidationThreshold, uint256 ltv, uint256 healthFactor);
-//         function getReserveData(address asset) external view returns (ReserveData);
-
-//     }
-// }
-
 sol!(
     #[sol(rpc)]
     #[derive(Debug, PartialEq, Eq)]
-    IAAVE,
-    "aave-pool-abi.json"
+    ILendingPool,
+    "./ILendingPool.json"
 );
 
 sol! {
@@ -95,7 +37,7 @@ struct AaveLooper {
     provider: Arc<SignerProvider>,
     signer_address: Address,
     asset_address: Address,
-    aave: IAAVEInstance<BoxTransport, Arc<SignerProvider>>,
+    aave: ILendingPoolInstance<BoxTransport, Arc<SignerProvider>>,
     asset: IERC20Instance<BoxTransport, Arc<SignerProvider>>,
     amount: U256,
     leverage: u8,
@@ -115,7 +57,7 @@ impl AaveLooper {
         telegram_token: String,
         chat_id: i64,
     ) -> Result<Arc<Self>, Box<dyn Error>> {
-        let aave = IAAVE::new(aave_address, provider.clone());
+        let aave = ILendingPool::new(aave_address, provider.clone());
         let asset = IERC20::new(asset_address, provider.clone());
         let signer_address = provider.default_signer_address();
         // let telegram_bot = Bot::new(telegram_token);