Merge pull request #188 from akiraonstarknet/dev

Add Endur, raffle improvements, mobile connector fixes, toast fixes
strkfarm · Nov 29, 2024 · d296674 · d296674
2 parents 9fd1614 + bac885a
commit d296674
Show file tree

Hide file tree

Showing 27 changed files with 1,728 additions and 338 deletions.
diff --git a/.env.sample b/.env.sample
@@ -12,3 +12,8 @@ NEXT_PUBLIC_OG_NFT_CONTRACT=0x3cb654f2f557a7f71a0c16d97c05a2dec62a0b744979d11afc
 
 
 CRON_SECRET=
+
+# mainnet or sepolia
+# Note: Not everything is supported on sepolia
+# Default: mainnet
+NEXT_PUBLIC_NETWORK=mainnet
diff --git a/next.config.mjs b/next.config.mjs
@@ -2,9 +2,9 @@
 const nextConfig = {
   // output: 'export',
   compiler: {
-    // removeConsole: {
-    //   exclude: ['error', 'debug'],
-    // },
+    removeConsole: {
+      exclude: ['error'],
+    },
   },
   async rewrites() {
     return [

diff --git a/public/banners/endur.svg b/public/banners/endur.svg
diff --git a/public/banners/endur_mobile.svg b/public/banners/endur_mobile.svg
diff --git a/src/abi/master.abi.json b/src/abi/master.abi.json
@@ -1,12 +1,12 @@
 [
   {
-    "name": "ExternalImpl",
     "type": "impl",
+    "name": "ExternalImpl",
     "interface_name": "strkfarm::strats::master::IMaster"
   },
   {
-    "name": "core::integer::u256",
     "type": "struct",
+    "name": "core::integer::u256",
     "members": [
       {
         "name": "low",
@@ -19,12 +19,85 @@
     ]
   },
   {
-    "name": "strkfarm::strats::master::IMaster",
+    "type": "struct",
+    "name": "strkfarm::strats::master::Settings",
+    "members": [
+      {
+        "name": "nimbora_referral",
+        "type": "core::starknet::contract_address::ContractAddress"
+      }
+    ]
+  },
+  {
     "type": "interface",
+    "name": "strkfarm::strats::master::IMaster",
     "items": [
       {
+        "type": "function",
         "name": "invest_auto_strk",
+        "inputs": [
+          {
+            "name": "strategy",
+            "type": "core::starknet::contract_address::ContractAddress"
+          },
+          {
+            "name": "amount",
+            "type": "core::integer::u256"
+          },
+          {
+            "name": "receiver",
+            "type": "core::starknet::contract_address::ContractAddress"
+          }
+        ],
+        "outputs": [
+          {
+            "type": "core::integer::u256"
+          }
+        ],
+        "state_mutability": "external"
+      },
+      {
         "type": "function",
+        "name": "deposit_nimbora",
+        "inputs": [
+          {
+            "name": "nimbora_strategy_address",
+            "type": "core::starknet::contract_address::ContractAddress"
+          },
+          {
+            "name": "harvest_invest_strategy",
+            "type": "core::starknet::contract_address::ContractAddress"
+          },
+          {
+            "name": "token_address",
+            "type": "core::starknet::contract_address::ContractAddress"
+          },
+          {
+            "name": "assets",
+            "type": "core::integer::u256"
+          }
+        ],
+        "outputs": [
+          {
+            "type": "core::integer::u256"
+          }
+        ],
+        "state_mutability": "external"
+      },
+      {
+        "type": "function",
+        "name": "get_settings",
+        "inputs": [],
+        "outputs": [
+          {
+            "type": "strkfarm::strats::master::Settings"
+          }
+        ],
+        "state_mutability": "view"
+      },
+      {
+        "type": "function",
+        "name": "invest_to_xstrk_auto",
         "inputs": [
           {
             "name": "strategy",
@@ -47,8 +120,8 @@
         "state_mutability": "external"
       },
       {
-        "name": "upgrade",
         "type": "function",
+        "name": "upgrade",
         "inputs": [
           {
             "name": "class_hash",
@@ -61,17 +134,17 @@
     ]
   },
   {
-    "name": "OwnableTwoStepImpl",
     "type": "impl",
-    "interface_name": "openzeppelin::access::ownable::interface::IOwnableTwoStep"
+    "name": "OwnableTwoStepImpl",
+    "interface_name": "openzeppelin_access::ownable::interface::IOwnableTwoStep"
   },
   {
-    "name": "openzeppelin::access::ownable::interface::IOwnableTwoStep",
     "type": "interface",
+    "name": "openzeppelin_access::ownable::interface::IOwnableTwoStep",
     "items": [
       {
-        "name": "owner",
         "type": "function",
+        "name": "owner",
         "inputs": [],
         "outputs": [
           {
@@ -81,8 +154,8 @@
         "state_mutability": "view"
       },
       {
-        "name": "pending_owner",
         "type": "function",
+        "name": "pending_owner",
         "inputs": [],
         "outputs": [
           {
@@ -92,15 +165,15 @@
         "state_mutability": "view"
       },
       {
-        "name": "accept_ownership",
         "type": "function",
+        "name": "accept_ownership",
         "inputs": [],
         "outputs": [],
         "state_mutability": "external"
       },
       {
-        "name": "transfer_ownership",
         "type": "function",
+        "name": "transfer_ownership",
         "inputs": [
           {
             "name": "new_owner",
@@ -111,124 +184,166 @@
         "state_mutability": "external"
       },
       {
-        "name": "renounce_ownership",
         "type": "function",
+        "name": "renounce_ownership",
         "inputs": [],
         "outputs": [],
         "state_mutability": "external"
       }
     ]
   },
   {
-    "name": "constructor",
+    "type": "struct",
+    "name": "strkfarm::interfaces::zkLend::IZkLendMarketDispatcher",
+    "members": [
+      {
+        "name": "contract_address",
+        "type": "core::starknet::contract_address::ContractAddress"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "strkfarm::interfaces::oracle::IPriceOracleDispatcher",
+    "members": [
+      {
+        "name": "contract_address",
+        "type": "core::starknet::contract_address::ContractAddress"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "strkfarm::components::zkLend::zkLendStruct",
+    "members": [
+      {
+        "name": "zkLendRouter",
+        "type": "strkfarm::interfaces::zkLend::IZkLendMarketDispatcher"
+      },
+      {
+        "name": "oracle",
+        "type": "strkfarm::interfaces::oracle::IPriceOracleDispatcher"
+      }
+    ]
+  },
+  {
     "type": "constructor",
+    "name": "constructor",
     "inputs": [
       {
         "name": "owner",
         "type": "core::starknet::contract_address::ContractAddress"
+      },
+      {
+        "name": "lend_settings",
+        "type": "strkfarm::components::zkLend::zkLendStruct"
+      },
+      {
+        "name": "nimbora_referral",
+        "type": "core::starknet::contract_address::ContractAddress"
       }
     ]
   },
   {
-    "kind": "enum",
-    "name": "openzeppelin::security::reentrancyguard::ReentrancyGuardComponent::Event",
     "type": "event",
+    "name": "openzeppelin_security::reentrancyguard::ReentrancyGuardComponent::Event",
+    "kind": "enum",
     "variants": []
   },
   {
-    "kind": "struct",
-    "name": "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred",
     "type": "event",
+    "name": "openzeppelin_access::ownable::ownable::OwnableComponent::OwnershipTransferred",
+    "kind": "struct",
     "members": [
       {
-        "kind": "key",
         "name": "previous_owner",
-        "type": "core::starknet::contract_address::ContractAddress"
+        "type": "core::starknet::contract_address::ContractAddress",
+        "kind": "key"
       },
       {
-        "kind": "key",
         "name": "new_owner",
-        "type": "core::starknet::contract_address::ContractAddress"
+        "type": "core::starknet::contract_address::ContractAddress",
+        "kind": "key"
       }
     ]
   },
   {
-    "kind": "struct",
-    "name": "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferStarted",
     "type": "event",
+    "name": "openzeppelin_access::ownable::ownable::OwnableComponent::OwnershipTransferStarted",
+    "kind": "struct",
     "members": [
       {
-        "kind": "key",
         "name": "previous_owner",
-        "type": "core::starknet::contract_address::ContractAddress"
+        "type": "core::starknet::contract_address::ContractAddress",
+        "kind": "key"
       },
       {
-        "kind": "key",
         "name": "new_owner",
-        "type": "core::starknet::contract_address::ContractAddress"
+        "type": "core::starknet::contract_address::ContractAddress",
+        "kind": "key"
       }
     ]
   },
   {
-    "kind": "enum",
-    "name": "openzeppelin::access::ownable::ownable::OwnableComponent::Event",
     "type": "event",
+    "name": "openzeppelin_access::ownable::ownable::OwnableComponent::Event",
+    "kind": "enum",
     "variants": [
       {
-        "kind": "nested",
         "name": "OwnershipTransferred",
-        "type": "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred"
+        "type": "openzeppelin_access::ownable::ownable::OwnableComponent::OwnershipTransferred",
+        "kind": "nested"
       },
       {
-        "kind": "nested",
         "name": "OwnershipTransferStarted",
-        "type": "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferStarted"
+        "type": "openzeppelin_access::ownable::ownable::OwnableComponent::OwnershipTransferStarted",
+        "kind": "nested"
       }
     ]
   },
   {
-    "kind": "struct",
-    "name": "openzeppelin::upgrades::upgradeable::UpgradeableComponent::Upgraded",
     "type": "event",
+    "name": "openzeppelin_upgrades::upgradeable::UpgradeableComponent::Upgraded",
+    "kind": "struct",
     "members": [
       {
-        "kind": "data",
         "name": "class_hash",
-        "type": "core::starknet::class_hash::ClassHash"
+        "type": "core::starknet::class_hash::ClassHash",
+        "kind": "data"
       }
     ]
   },
   {
-    "kind": "enum",
-    "name": "openzeppelin::upgrades::upgradeable::UpgradeableComponent::Event",
     "type": "event",
+    "name": "openzeppelin_upgrades::upgradeable::UpgradeableComponent::Event",
+    "kind": "enum",
     "variants": [
       {
-        "kind": "nested",
         "name": "Upgraded",
-        "type": "openzeppelin::upgrades::upgradeable::UpgradeableComponent::Upgraded"
+        "type": "openzeppelin_upgrades::upgradeable::UpgradeableComponent::Upgraded",
+        "kind": "nested"
       }
     ]
   },
   {
-    "kind": "enum",
-    "name": "strkfarm::strats::master::Master::Event",
     "type": "event",
+    "name": "strkfarm::strats::master::Master::Event",
+    "kind": "enum",
     "variants": [
       {
-        "kind": "flat",
         "name": "ReentrancyGuardEvent",
-        "type": "openzeppelin::security::reentrancyguard::ReentrancyGuardComponent::Event"
+        "type": "openzeppelin_security::reentrancyguard::ReentrancyGuardComponent::Event",
+        "kind": "flat"
       },
       {
-        "kind": "flat",
         "name": "OwnableEvent",
-        "type": "openzeppelin::access::ownable::ownable::OwnableComponent::Event"
+        "type": "openzeppelin_access::ownable::ownable::OwnableComponent::Event",
+        "kind": "flat"
       },
       {
-        "kind": "flat",
         "name": "UpgradeableEvent",
-        "type": "openzeppelin::upgrades::upgradeable::UpgradeableComponent::Event"
+        "type": "openzeppelin_upgrades::upgradeable::UpgradeableComponent::Event",
+        "kind": "flat"
       }
     ]
   }