cleanup

Official-MoonDao · Nov 26, 2024 · 240b6f4 · 240b6f4
1 parent e85f46b
commit 240b6f4
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 359 deletions.
diff --git a/contracts/README.md b/contracts/README.md
@@ -33,10 +33,7 @@ yarn install
 cp .env.sample .env
 
 # Install Vyper
-pip install vyper==0.3.1
-
-# Add vyper to path
-export PATH="$PATH:$HOME/Library/Python/3.9/bin"
+pip install vyper==0.2.4
 
 # Install Git submodules
 forge install

diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -1,12 +1,4 @@
-[profile.default]
+[default]
 src = "src"
 out = "out"
 libs = ["lib"]
-evm_version = "berlin"
-
-#[profile.default.compiler]
-#version = "0.8.10"
-
-# Vyper compiler settings
-[profile.default.vyper]
-vyper_version = "0.3.1"
diff --git a/contracts/scripts/VotingEscrowDepositor.s.sol b/contracts/scripts/VotingEscrowDepositor.s.sol
diff --git a/contracts/src/governance/IVotingEscrow.sol b/contracts/src/governance/IVotingEscrow.sol
@@ -10,16 +10,4 @@ interface IVotingEscrow {
     function locked(address) external view returns (LockedBalance memory);
 
     function balanceOf(address) external view returns (uint256);
-    function deploy_for(address _addr, uint256 _value) external;
-    function commit_smart_wallet_checker(address) external;
-    function apply_smart_wallet_checker() external;
-
-    function admin() external view returns (address);
-    function create_lock(uint256 _value, uint256 _unlock_time) external;
-    function totalSupply() external view returns (uint256);
-    function checkpoint() external;
-    function user_point_history(address, uint256) external view returns (uint256, uint256);
-    function user_point_history__ts(address, uint256) external view returns (uint256);
-    function get_last_user_slope(address) external view returns (int128);
-
 }
diff --git a/contracts/src/governance/SmartWalletChecker.sol b/contracts/src/governance/SmartWalletChecker.sol
diff --git a/contracts/src/governance/VotingEscrow.vy b/contracts/src/governance/VotingEscrow.vy
@@ -1,4 +1,4 @@
-# @version 0.3.1
+# @version 0.3.0
 """
 @title Voting Escrow
 @author Curve Finance
@@ -94,7 +94,6 @@ epoch: public(uint256)
 point_history: public(Point[100000000000000000000000000000])  # epoch -> unsigned point
 user_point_history: public(HashMap[address, Point[1000000000]])  # user -> Point[user_epoch]
 user_point_epoch: public(HashMap[address, uint256])
-
 slope_changes: public(HashMap[uint256, int128])  # time -> signed slope change
 
 # Aragon's view methods for compatibility
@@ -669,4 +668,4 @@ def changeController(_newController: address):
     @dev Dummy method required for Aragon compatibility
     """
     assert msg.sender == self.controller
-    self.controller = _newController
+    self.controller = _newController
diff --git a/contracts/src/governance/VotingEscrowDepositor.sol b/contracts/src/governance/VotingEscrowDepositor.sol
diff --git a/contracts/src/test/VotingEscrowDepositor.t.sol b/contracts/src/test/VotingEscrowDepositor.t.sol
diff --git a/ui/components/nance/DePrize.tsx b/ui/components/nance/DePrize.tsx
@@ -39,7 +39,6 @@ import ContentLayout from '@/components/layout/ContentLayout'
 import Head from '@/components/layout/Head'
 import { NoticeFooter } from '@/components/layout/NoticeFooter'
 import { JoinDePrizeModal } from '@/components/nance/JoinDePrizeModal'
-import { TeamPreview } from '@/components/subscription/TeamPreview'
 import StandardButton from '../layout/StandardButton'
 import { useVotingPowers } from '@/lib/snapshot'
 import useTokenBalances from '@/lib/tokens/hooks/useTokenBalances'

diff --git a/ui/components/onboarding/TeamTier.tsx b/ui/components/onboarding/TeamTier.tsx
@@ -18,13 +18,12 @@ const TeamTier = ({ setSelectedTier, compact = false }: TeamTierProps) => {
   const [applyModalEnabled, setApplyModalEnabled] = useState(false)
 
   const handleTeamClick = async () => {
-    //const teamWhitelistContract = await sdk?.getContract(
-    //TEAM_WHITELIST_ADDRESSES[selectedChain.slug]
-    //)
-    //const isWhitelisted = await teamWhitelistContract?.call('isWhitelisted', [
-    //address,
-    //])
-    const isWhitelisted = true
+    const teamWhitelistContract = await sdk?.getContract(
+      TEAM_WHITELIST_ADDRESSES[selectedChain.slug]
+    )
+    const isWhitelisted = await teamWhitelistContract?.call('isWhitelisted', [
+      address,
+    ])
     if (isWhitelisted || process.env.NEXT_PUBLIC_ENV === 'dev') {
       setSelectedTier('team')
     } else {
@@ -48,8 +47,8 @@ const TeamTier = ({ setSelectedTier, compact = false }: TeamTierProps) => {
           'Capital Raising Tools: Leverage new tools to raise capital or solicit donations from a global network of space enthusiasts.',
           'Onchain Tools: Utilize advanced and secure onchain tools to manage your organization and interface with smart contracts.',
         ]}
-        buttoncta={compact ? 'Learn More' : 'Create a Team'}
-        onClick={compact ? () => {} : handleTeamClick}
+        buttoncta={compact ? "Learn More" : "Create a Team"}
+        onClick={compact ? ()=>{} :handleTeamClick}
         type="team"
         compact={compact}
       />