Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/goerli cleanup #438

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Enhancement/goerli cleanup #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7628c0f
Fix CoinbaseWallet and TrustWallet open new windows if only MetaMask …
ccali11 Oct 25, 2023
f123d64
Disable EigenLayer support on add operator form
ccali11 Oct 25, 2023
edc95d3
Fix tableData overwrite bug and remove export button
ccali11 Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/web/src/components/ConnectWalletsFlow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { onMounted, ref, watch, onUnmounted } from 'vue'
import { CryptoAddress, Currency, LoginCredentials, ProviderString } from '@casimir/types'
import VueFeather from 'vue-feather'
import useAuth from '@/composables/auth'
import useEnvironment from '@/composables/environment'
import useEthers from '@/composables/ethers'
import useFormat from '@/composables/format'
import useLedger from '@/composables/ledger'
Expand All @@ -24,6 +25,7 @@ const supportedWalletProviders = [
] as ProviderString[]

const { login, loginWithSecondaryAddress } = useAuth()
const { requiredNetwork } = useEnvironment()
const { ethersProviderList, getEthersAddressesWithBalances } = useEthers()
const { convertString, trimAndLowercaseAddress } = useFormat()
const { getLedgerAddress } = useLedger()
Expand Down Expand Up @@ -134,8 +136,8 @@ async function selectProvider(provider: ProviderString, currency: Currency = 'ET
selectedProvider.value = provider
selectProviderLoading.value = true
if (provider === 'WalletConnect') {
// TODO: Clarify this.
walletProviderAddresses.value = await connectWalletConnectV2('5') as CryptoAddress[]
// TODO: @@cali1 - pass in the network id dynamically
walletProviderAddresses.value = await connectWalletConnectV2(requiredNetwork) as CryptoAddress[]
} else if (ethersProviderList.includes(provider)) {
walletProviderAddresses.value = await getEthersAddressesWithBalances(provider) as CryptoAddress[]
} else if (provider === 'Ledger') {
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/composables/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ const provider = new ethers.providers.JsonRpcProvider(ethereumUrl)
const usersUrl = import.meta.env.PUBLIC_USERS_URL || 'http://localhost:4000'
const walletConnectProjectId = import.meta.env.PUBLIC_WALLET_CONNECT_PROJECT_ID

/** Network */
const requiredNetwork: '1' | '5' = origin.includes('localhost') ? '5' : origin.includes('app.dev') ? '5' : '1'

/* Addresses */
const factoryAddress = import.meta.env.PUBLIC_FACTORY_ADDRESS
const factory = new ethers.Contract(factoryAddress, ICasimirFactoryAbi, provider) as CasimirFactory
Expand All @@ -37,6 +40,7 @@ export default function useEnvironment() {
provider,
origin,
ledgerType,
requiredNetwork,
speculosUrl,
ssvNetworkAddress,
ssvViewsAddress,
Expand Down
9 changes: 7 additions & 2 deletions apps/web/src/composables/ethers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { TransactionRequest } from '@casimir/types'
import { GasEstimate, LoginCredentials, MessageRequest, ProviderString } from '@casimir/types'
import useEnvironment from '@/composables/environment'
import useSiwe from '@/composables/siwe'
import useWallets from '@/composables/wallets'

interface ethereumWindow extends Window {
ethereum: any;
Expand All @@ -12,6 +13,7 @@ declare const window: ethereumWindow

const { ethereumUrl, provider } = useEnvironment()
const { createSiweMessage, signInWithEthereum } = useSiwe()
const { installedWallets } = useWallets()

export default function useEthers() {
const ethersProviderList = ['BraveWallet', 'CoinbaseWallet', 'MetaMask', 'OkxWallet', 'TrustWallet']
Expand Down Expand Up @@ -261,9 +263,10 @@ export default function useEthers() {
function getBrowserProvider(providerString: ProviderString) {
try {
const { ethereum } = window
const isInstalled = installedWallets.value.includes(providerString)
if (providerString === 'CoinbaseWallet') {
if (!ethereum.providerMap) return alert('TrustWallet or another wallet may be interfering with CoinbaseWallet. Please disable other wallets and try again.')
if (ethereum?.providerMap.get(providerString)) return ethereum.providerMap.get(providerString)
if (!ethereum.providerMap && isInstalled) return alert('TrustWallet or another wallet may be interfering with CoinbaseWallet. Please disable other wallets and try again.')
if (ethereum?.providerMap) return ethereum.providerMap.get(providerString)
else window.open('https://www.coinbase.com/wallet/downloads', '_blank')
} else if (providerString === 'MetaMask') {
if (ethereum.providerMap && ethereum.providerMap.get('MetaMask')) {
Expand Down Expand Up @@ -308,6 +311,8 @@ function getTrustWallet() {
for (const provider of providers) {
if (provider.isTrustWallet) return provider
}
} else {
window.open('https://trustwallet.com/download', '_blank')
}
}

Expand Down
103 changes: 59 additions & 44 deletions apps/web/src/pages/operators/Operator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ function toggleEigenLayerSupport() {
toggleBackgroundColor.value = eigenIsToggled.value ? 'green' : '#eee'
operatorType.value = eigenIsToggled.value ? 'eigen' : 'default'

console.log('nonregisteredDefaultOperators.value :>> ', nonregisteredDefaultOperators.value)
console.log('registeredDefaultOperators.value :>> ', registeredDefaultOperators.value)

console.log('nonregisteredEigenOperators.value :>> ', nonregisteredEigenOperators.value)
console.log('registeredEigenOperators.value :>> ', registeredEigenOperators.value)

console.log('operatorType.value :>> ', operatorType.value)
// Update stakeType
// stakeType.value = eigenIsToggled.value ? 'eigen' : 'default'
}
Expand Down Expand Up @@ -100,17 +93,18 @@ const operatorTableHeaders = ref(
title: 'Node URL',
value: 'nodeURL'
},
{
title: '',
value: 'deactivate'
},
{
title: '',
value: 'withdraw_collateral'
},
// {
// title: '',
// value: 'deactivate'
// },
// {
// title: '',
// value: 'withdraw_collateral'
// },
]
)

const allInputsValid = ref(false)
const tableData = ref<any>([])
const filteredData = ref(tableData.value)
const checkedItems = ref([] as any)
Expand Down Expand Up @@ -163,23 +157,9 @@ watch(selectedWallet, async () =>{
}
})

watch(registeredDefaultOperators, () => {
openAddOperatorModal.value = false
tableData.value = [...registeredDefaultOperators.value].map((operator: any) => {
return {
id: operator.id,
walletAddress: operator.ownerAddress,
collateral: operator.collateral + ' ETH',
poolCount: operator.poolCount,
nodeURL: operator.url
}
})
filterData()
})

watch(registeredEigenOperators, () => {
watch([registeredDefaultOperators, registeredEigenOperators], () => {
openAddOperatorModal.value = false
tableData.value = [...registeredEigenOperators.value].map((operator: any) => {
tableData.value = [...registeredDefaultOperators.value, ...registeredEigenOperators.value].map((operator: any) => {
return {
id: operator.id,
walletAddress: operator.ownerAddress,
Expand All @@ -201,8 +181,6 @@ watch([searchInput, selectedHeader, selectedOrientation, currentPage], ()=>{
filterData()
})



const openWalletsModal = () => {
const el = document.getElementById('connect_wallet_button')
if (el) {
Expand Down Expand Up @@ -266,8 +244,6 @@ const removeItemFromCheckedList = (item:any) => {
}
}

const allInputsValid = ref(false)

watch([selectedWallet, selectedOperatorID, selectedPublicNodeURL, selectedCollateral], ()=>{
if(selectedWallet.value.address !== '' && selectedOperatorID.value !== undefined && selectedPublicNodeURL.value !== '' && selectedCollateral.value !== undefined) {
allInputsValid.value = true
Expand Down Expand Up @@ -483,11 +459,15 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
<h6 class="text-[16px] font-[400] mt-[15px] mb-[4px] pl-[5px]">
Add Eigen Support to Your Validator (Optional)
</h6>
<div
ref="confettiButton"
<button
class="toggle_container mt-10 w-full max-w-[400px] relative"
:disabled="true"
@click="toggleEigenLayerSupport"
>
<div class="tooltip_container">
COMING SOON!
<div class="tooltip_triangle" />
</div>
<img
class="eigen-logo"
src="/eigen.svg"
Expand All @@ -504,7 +484,7 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
>
<div class="toggle-circle" />
</div>
</div>
</button>

<!-- operator id input -->
<h6 class="text-[16px] font-[400] mt-[15px] mb-[4px] pl-[5px]">
Expand Down Expand Up @@ -748,6 +728,7 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
<!-- TODO: @Chris, wanna hook up this button? -->
<button
class="bg-decline text-white rounded-[3px] px-[8px] py-[4px] text-[14px] font-[500]"
disabled
>
Deactivate
</button>
Expand Down Expand Up @@ -1021,12 +1002,13 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
justify-content: flex-start;
padding-left: 10px; /* space from the left edge */
position: relative;
width: 100%; /* takes full width of parent container */
height: 44px; /* adjust as needed if required */
background-color: rgb(26 12 109);
overflow: hidden;
/* overflow: hidden; */
text-align: center;
color: #fff; /* or any suitable color for better visibility */
font-size: 14px; /* adjust based on preference */
font-size: 14px;
border-radius: 8px;
transition: background-color 0.3s; /* This will animate the color change */
}
Expand All @@ -1036,7 +1018,40 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
/* cursor: not-allowed; This changes the cursor to indicate the button is not clickable */
}

.shine-effect {
.tooltip_container {
position: absolute;
bottom: 100%; /* position it above the button */
left: 50%; /* center it horizontally */
transform: translateX(-50%); /* shift it back by half its width to truly center it */
padding: 8px 12px; /* space around the text */
background-color: #000; /* or any desired tooltip color */
color: #fff; /* text color */
border-radius: 4px; /* round the corners */
opacity: 0; /* starts hidden */
transition: opacity 0.3s; /* smooth fade in */
white-space: nowrap; /* prevents the text from wrapping */
font-size: 12px;
pointer-events: none; /* ensures it doesn't block any interactions */
z-index: 10; /* positions it above other elements */
}

.toggle_container:hover .tooltip_container {
opacity: 1; /* show on hover */
}

.tooltip_triangle {
position: absolute;
bottom: -5px; /* position at the bottom of the tooltip */
left: 50%; /* center it horizontally */
transform: translateX(-50%); /* shift it back by half its width to truly center it */
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 5px solid #000; /* same color as the tooltip background */
}

/* .shine-effect {
content: '';
position: absolute;
top: -50%;
Expand All @@ -1047,9 +1062,9 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
transform: rotate(30deg);
pointer-events: none;
animation: shine 2.5s infinite;
}
} */

@keyframes shine {
/* @keyframes shine {
0% {
left: -150%;
}
Expand All @@ -1059,7 +1074,7 @@ watch([loadingSessionLogin || loadingInitializeOperators], () =>{
100% {
left: 150%;
}
}
} */
.toggle-button {
position: absolute;
top: 50%;
Expand Down
Loading