Merge in latest front-end changes

apps/web/src/composables/contracts.ts

@@ -48,23 +48,29 @@ export default function useContracts() {
     const { isWalletConnectSigner, getEthersWalletConnectSigner } = useWalletConnect()
 
     async function deposit({ amount, walletProvider }: { amount: string, walletProvider: ProviderString }) {
-        // const ethAmount = (parseInt(amount) / (await getCurrentPrice({ coin: 'ETH', currency: 'USD' }))).toString()
-        const signerCreators = {
-            'Browser': getEthersBrowserSigner,
-            'Ledger': getEthersLedgerSigner,
-            'Trezor': getEthersTrezorSigner,
-            'WalletConnect': getEthersWalletConnectSigner
+        try {
+            // const ethAmount = (parseInt(amount) / (await getCurrentPrice({ coin: 'ETH', currency: 'USD' }))).toString()
+            const signerCreators = {
+                'Browser': getEthersBrowserSigner,
+                'Ledger': getEthersLedgerSigner,
+                'Trezor': getEthersTrezorSigner,
+                'WalletConnect': getEthersWalletConnectSigner
+            }
+            const signerType = ethersProviderList.includes(walletProvider) ? 'Browser' : walletProvider
+            const signerCreator = signerCreators[signerType as keyof typeof signerCreators]
+            let signer = signerCreator(walletProvider)
+            if (isWalletConnectSigner(signer)) signer = await signer
+            const managerSigner = manager.connect(signer as ethers.Signer)
+            const fees = await managerSigner.feePercent()
+            const depositAmount = parseFloat(amount) * ((100 + fees) / 100)
+            const value = ethers.utils.parseEther(depositAmount.toString())
+            const result = await managerSigner.depositStake({ value, type: 0 })
+            await result.wait()
+            return true
+        } catch (err) {
+            console.error(`There was an error in despoit function: ${err}`)
+            return false
         }
-        const signerType = ethersProviderList.includes(walletProvider) ? 'Browser' : walletProvider
-        const signerCreator = signerCreators[signerType as keyof typeof signerCreators]
-        let signer = signerCreator(walletProvider)
-        if (isWalletConnectSigner(signer)) signer = await signer
-        const managerSigner = manager.connect(signer as ethers.Signer)
-        const fees = await managerSigner.feePercent()
-        const depositAmount = parseFloat(amount) * ((100 + fees) / 100)
-        const value = ethers.utils.parseEther(depositAmount.toString())
-        const result = await managerSigner.depositStake({ value, type: 0 })
-        return await result.wait()
     }
 
     async function getCurrentStaked() : Promise<BreakdownAmount> {

apps/web/src/pages/overview/components/Staking.vue

@@ -2,20 +2,24 @@
 import { ref, onMounted, onUnmounted, watch } from 'vue'
 import { FormattedWalletOption, ProviderString } from '@casimir/types'
 import VueFeather from 'vue-feather'
+import usePrice from '@/composables/price'
 import useEthers from '@/composables/ethers'
 import useUsers from '@/composables/users'
 import useContracts from '@/composables/contracts'
 
 import TermsOfService from '@/components/TermsOfService.vue'
 
+const { deposit, getDepositFees } = useContracts()
 const { getEthersBalance } = useEthers()
 const { user, getUserAnalytics } = useUsers()
-const { deposit, withdraw } = useContracts()
+const { getCurrentPrice } = usePrice()
 
 const selectedProvider = ref<ProviderString>('')
 const selectedWallet = ref(null as null | string)
 const formattedAmountToStake = ref<string>('')
 const address_balance = ref(null as null | string)
+const currentEthPrice = ref<number>(0)
+const estimatedFees = ref<number|string>('-')
 
 const openSelectWalletInput = ref(false)
 
@@ -101,7 +105,6 @@ const aggregateAddressesByProvider = () => {
 }
 
 watch(selectedWallet, async () => {
-  // const currentEthPrice = await getCurrentPrice({coin: 'ETH', currency: 'USD'})
   address_balance.value = selectedWallet.value ?  (Math.round( await getEthersBalance(selectedWallet.value) * 100) / 100 ) + ' ETH': '- - -'
 })
 
@@ -124,7 +127,7 @@ watch(formattedAmountToStake, async () => {
     }else {
       errorMessage.value = null
     }
-  }else{
+  } else{
     errorMessage.value = null
   }
 })
@@ -133,11 +136,14 @@ watch(user, () => {
   aggregateAddressesByProvider()
 })
 
-onMounted(() => {
+onMounted(async () => {
   window.addEventListener('click', handleOutsideClick)
   aggregateAddressesByProvider()
+  currentEthPrice.value = Math.round((await getCurrentPrice({coin: 'ETH', currency: 'USD'})) * 100) / 100
+  estimatedFees.value = await getDepositFees()
 })
 
+
 onUnmounted(() =>{
   window.removeEventListener('click', handleOutsideClick)
 })
@@ -146,37 +152,31 @@ const loading = ref(false)
 const success = ref(false)
 const failure = ref(false)
 const stakeButtonText = ref('Stake')
-const handleDeposit = () => {
-  deposit({ amount: formattedAmountToStake.value, walletProvider: selectedProvider.value })
-
-  const isSuccess = Math.random() < 0.5 // Replace with your actual logic
 
+const handleDeposit = async () => {
   loading.value = true
+  const isSuccess = await deposit({ amount: formattedAmountToStake.value, walletProvider: selectedProvider.value })
+  loading.value = false
+  if (isSuccess) {
+    success.value = true
+    stakeButtonText.value = 'Transaction Successfully Submitted'
+  } else {
+    failure.value = true
+    stakeButtonText.value = 'Transaction Failed'
+  }
 
   setTimeout(() => {
-
-    loading.value = false
-    if (isSuccess) {
-      success.value = true
-      stakeButtonText.value = 'Success'
-    } else {
-      failure.value = true
-      stakeButtonText.value = 'Transaction Failed'
-    }
-
-    setTimeout(() => {
-      success.value = false
-      failure.value = false
-      stakeButtonText.value = 'Stake'
-
-      // empty out staking comp
-      selectedProvider.value = ''
-      selectedWallet.value = null
-      formattedAmountToStake.value = ''
-      address_balance.value = null
-      
-    }, 3000)
-  }, 2000)
+    success.value = false
+    failure.value = false
+    stakeButtonText.value = 'Stake'
+
+    // empty out staking comp
+    selectedProvider.value = ''
+    selectedWallet.value = null
+    formattedAmountToStake.value = ''
+    address_balance.value = null
+    
+  }, 3000)
   
 
   
@@ -305,17 +305,17 @@ const handleDeposit = () => {
         </h6>
       </div>
       <h6 class="card_analytics_amount">
-        0.0002 ETH
+        {{ estimatedFees }}.00%
       </h6>
     </div>
     <div class="flex justify-between items-center my-[10px]">
       <div class="flex items-center gap-[12px]">
         <h6 class="card_analytics_label">
-          Exchange Price
+          Exchange Rate
         </h6>
       </div>
       <h6 class="card_analytics_amount">
-        1 USD - 0.000ETH
+        ${{ currentEthPrice }}/ETH
       </h6>
     </div>
     <div class="flex justify-between items-center mb-[39px]">
@@ -362,13 +362,6 @@ const handleDeposit = () => {
         {{ stakeButtonText }}
       </div>
     </button>
-    <button
-      class="h-[37px] w-full mt-8"
-      @click="withdraw({ amount: formattedAmountToStake, walletProvider: selectedProvider })"
-    >
-      Withdraw
-    </button>
-
     <div
       v-show="openTermsOfService"
       id="termsOfServiceContainer"

go.work

@@ -0,0 +1,3 @@
+go 1.19
+
+use ./services/crawler

go.work.sum

@@ -0,0 +1,8 @@
+github.com/aws/aws-sdk-go-v2 v1.2.0 h1:BS+UYpbsElC82gB+2E2jiCBg36i8HlubTB/dO/moQ9c=
+github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo=
+github.com/aws/aws-sdk-go-v2/credentials v1.1.1 h1:NbvWIM1Mx6sNPTxowHgS2ewXCRp+NGTzUYb/96FZJbY=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2 h1:EtEU7WRaWliitZh2nmuxEXrN0Cb8EgPUFGIoTMeqbzI=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2 h1:4AH9fFjUlVktQMznF+YN33aWNXaR4VgDXyP28qokJC0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.1.1 h1:37QubsarExl5ZuCBlnRP+7l1tNwZPBSTqpTBrPH98RU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.1.1 h1:TJoIfnIFubCX0ACVeJ0w46HEH5MwjwYN4iFhuYIhfIY=
+github.com/aws/smithy-go v1.1.0 h1:D6CSsM3gdxaGaqXnPgOBCeL6Mophqzu7KJOu7zW78sU=

services/crawler/.gitignore

@@ -4,3 +4,4 @@
 log.txt
 .env
 build
+data

services/crawler/Makefile

@@ -1,18 +1,26 @@
-,PHONY: build clean dep test
+,PHONY: build clean
 
-name=processor
-bin = ./build/$(name)
+name=crawler
+bin = ./bin/$(name)
 os = $(shell go env GOOS)
 arch = $(shell go env GOARCH)
 
 test:
-	go test -v ./...
+	go test -v ./... -count=1
+
+test-coverage:
+	rm -rf ./coverage.out
+	go test -v ./... -count=1 -coverprofile=coverage.out
+	go tool cover -html=coverage.out
 
 build:
-	GOOS=$(os) GOARCH=$(arch) go build -o $(bin)
+	GOOS=$(os) GOARCH=$(arch) CGO_ENABLED=1 go build -o $(bin) .
 	chmod +x $(bin)
 
 clean:
-	rm -rf ./build
-	rm -rf ./logs
+	rm -rf ./bin ./data ./logs
 	go clean
+
+dep:
+	go mod tidy
+