⬆️ upgrade protocol to v0.2.10

exactly · May 23, 2023 · f50d9bf · f50d9bf
1 parent 4d11b68
commit f50d9bf
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/.changeset/flat-hotels-add.md b/.changeset/flat-hotels-add.md
@@ -0,0 +1,5 @@
+---
+"@exactly/liquidation-bot": patch
+---
+
+⬆️ upgrade protocol to `v0.2.10`
diff --git a/Dockerfile b/Dockerfile
@@ -28,6 +28,6 @@ WORKDIR /liq-bot
 
 COPY --from=builder /liq-bot/target/release/liq-bot .
 COPY --from=builder /liq-bot/deployments deployments
-COPY --from=builder /liq-bot/node_modules/@exactly-protocol/protocol/deployments node_modules/@exactly-protocol/protocol/deployments
+COPY --from=builder /liq-bot/node_modules/@exactly/protocol/deployments node_modules/@exactly/protocol/deployments
 
 ENTRYPOINT [ "/liq-bot/liq-bot" ]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@chainlink/contracts": "0.6.1",
-    "@exactly-protocol/protocol": "^0.2.9",
+    "@exactly/protocol": "^0.2.10",
     "@uniswap/v3-core": "1.0.1",
     "@uniswap/v3-periphery": "1.4.3",
     "solmate": "transmissions11/solmate#v7"

diff --git a/src/exactly_events.rs b/src/exactly_events.rs
@@ -14,6 +14,7 @@ use crate::generate_abi::MemberAddedFilter;
 use crate::generate_abi::MemberRemovedFilter;
 use crate::generate_abi::PostTotalSharesFilter;
 use crate::generate_abi::QuorumChangedFilter;
+use crate::generate_abi::RewardsControllerSetFilter;
 use crate::generate_abi::{
     auditor::{
         AdminChangedFilter, InitializedFilter, RoleAdminChangedFilter, RoleGrantedFilter,
@@ -272,6 +273,7 @@ impl EthLogDecode for ExactlyEvents {
         map_filter!(QuorumChangedFilter, exactly_event, log);
         map_filter!(RecoverToVaultFilter, exactly_event, log);
         map_filter!(ScriptResultFilter, exactly_event, log);
+        map_filter!(RewardsControllerSetFilter, exactly_event, log);
 
         let ignored_events: Vec<H256> = [
             "0xe8ec50e5150ae28ae37e493ff389ffab7ffaec2dc4dccfca03f12a3de29d12b2",

diff --git a/src/generate_abi.rs b/src/generate_abi.rs
@@ -2,31 +2,31 @@ use ethers::prelude::abigen;
 
 abigen!(
     MarketProtocol,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/MarketWETH.json",
+    "node_modules/@exactly/protocol/deployments/goerli/MarketWETH.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
     Previewer,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/Previewer.json",
+    "node_modules/@exactly/protocol/deployments/goerli/Previewer.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
     PriceFeedWrapper,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/PriceFeedwstETH.json",
+    "node_modules/@exactly/protocol/deployments/goerli/PriceFeedwstETH.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
     Auditor,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/Auditor.json",
+    "node_modules/@exactly/protocol/deployments/goerli/Auditor.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
     InterestRateModel,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/InterestRateModelWETH.json",
+    "node_modules/@exactly/protocol/deployments/goerli/InterestRateModelWETH.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
@@ -38,7 +38,7 @@ abigen!(
 
 abigen!(
     PriceFeedDouble,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/PriceFeedWBTC.json",
+    "node_modules/@exactly/protocol/deployments/goerli/PriceFeedWBTC.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 

diff --git a/src/market.rs b/src/market.rs
@@ -13,7 +13,7 @@ const INTERVAL: u32 = 4 * 7 * 86_400;
 
 abigen!(
     ERC20,
-    "node_modules/@exactly-protocol/protocol/deployments/goerli/DAI.json",
+    "node_modules/@exactly/protocol/deployments/goerli/DAI.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 

diff --git a/src/protocol.rs b/src/protocol.rs
@@ -230,12 +230,12 @@ impl<
         Previewer<SignerMiddleware<M, S>>,
     ) {
         let (auditor_address, _, deployed_block) = Protocol::<M, W, S>::parse_abi(&format!(
-            "node_modules/@exactly-protocol/protocol/deployments/{}/Auditor.json",
+            "node_modules/@exactly/protocol/deployments/{}/Auditor.json",
             config.chain_id_name
         ));
 
         let (previewer_address, _, _) = Protocol::<M, W, S>::parse_abi(&format!(
-            "node_modules/@exactly-protocol/protocol/deployments/{}/Previewer.json",
+            "node_modules/@exactly/protocol/deployments/{}/Previewer.json",
             config.chain_id_name
         ));
 
@@ -253,7 +253,7 @@ impl<
             Self::get_contracts(Arc::clone(&client), config).await;
 
         let (market_weth_address, _, _) = Self::parse_abi(&format!(
-            "node_modules/@exactly-protocol/protocol/deployments/{}/MarketWETH.json",
+            "node_modules/@exactly/protocol/deployments/{}/MarketWETH.json",
             config.chain_id_name
         ));