Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Claim hooks 2 - ready to fetch (#2043)
Browse files Browse the repository at this point in the history 
* Added helper function to convert between repo and internal types

* Refactored claim repo base url

* Transformed repo claims into internal claims

* New fake return data, now at the fetch level

* Restored original useUserClaims and commented it out

and added modded version

* Removed unused import on hooksMod

* Updating fake data and commenting out real implementation

* Always show vCOW button, and renamed it to just vCOW

* Refactor RepoClaimType

Co-authored-by: Federico Giacon <[email protected]>

* Removed unnecessary claim type mapping const

Co-authored-by: Leandro Boscariol <[email protected]>
Co-authored-by: Federico Giacon <[email protected]>
Co-authored-by: L B <[email protected]>
  • Loading branch information
@alfetopito @fedgiac
4 people authored Jan 3, 2022
1 parent 956c342 commit 8d53e6b
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 174 deletions.
4 changes: 2 additions & 2 deletions src/components/claim/ClaimModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function ClaimModal() {

const { chainId } = useActiveWeb3React()

const account = '0x0Ae21f9700eD15E1a83baa3183a67d54b1DA2086'
const account = '0x0010B775429d6C92333E363CBd6BF28dDF1A87E6'
// used for UI loading states
const [attempting, setAttempting] = useState<boolean>(false)

Expand All @@ -69,7 +69,7 @@ export default function ClaimModal() {
function onClaim() {
console.log(`Trying to claim!!!`, unclaimedAmount?.toString(), claimConfirmed)
setAttempting(true)
claimCallback([{ index: 1080 }])
claimCallback([{ index: 3 }])
// reset modal and log error
.catch((error) => {
setAttempting(false)
Expand Down
38 changes: 18 additions & 20 deletions src/custom/components/Header/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ import NetworkCard, { NetworkInfo } from './NetworkCard'
import SVG from 'react-inlinesvg'
import {
useModalOpen,
useShowClaimPopup,
/*useShowClaimPopup,*/
// useToggleSelfClaimModal
} from 'state/application/hooks'
import { useUserHasAvailableClaim } from 'state/claim/hooks'
//import { useUserHasAvailableClaim } from 'state/claim/hooks'
import { useUserHasSubmittedClaim } from 'state/transactions/hooks'

import Modal from 'components/Modal'
Expand Down Expand Up @@ -223,10 +223,10 @@ export default function Header() {
const [darkMode, toggleDarkMode] = useDarkModeManager()

// const toggleClaimModal = useToggleSelfClaimModal()
const availableClaim: boolean = useUserHasAvailableClaim(account)
// const availableClaim: boolean = useUserHasAvailableClaim(account)
const { claimTxn } = useUserHasSubmittedClaim(account ?? undefined)
const [showUniBalanceModal, setShowUniBalanceModal] = useState(false)
const showClaimPopup = useShowClaimPopup()
// const showClaimPopup = useShowClaimPopup()

const [isOrdersPanelOpen, setIsOrdersPanelOpen] = useState<boolean>(false)
const closeOrdersPanel = () => setIsOrdersPanelOpen(false)
Expand Down Expand Up @@ -264,22 +264,20 @@ export default function Header() {
<HeaderControls>
<NetworkCard />
<HeaderElement>
{availableClaim && !showClaimPopup && (
<UNIWrapper onClick={handleOnClickClaim}>
<VCowAmount active={!!account && !availableClaim} style={{ pointerEvents: 'auto' }}>
{claimTxn && !claimTxn?.receipt ? (
<Dots>
<Trans>Claiming vCOW...</Trans>
</Dots>
) : (
<>
<CowProtocolLogo />
<Trans>Claim vCOW</Trans>
</>
)}
</VCowAmount>
</UNIWrapper>
)}
<UNIWrapper onClick={handleOnClickClaim}>
<VCowAmount active={!!account} style={{ pointerEvents: 'auto' }}>
{claimTxn && !claimTxn?.receipt ? (
<Dots>
<Trans>Claiming vCOW...</Trans>
</Dots>
) : (
<>
<CowProtocolLogo />
<Trans>vCOW</Trans>
</>
)}
</VCowAmount>
</UNIWrapper>
<AccountElement active={!!account} style={{ pointerEvents: 'auto' }}>
{account && userEthBalance && (
<BalanceText style={{ flexShrink: 0, userSelect: 'none' }} pl="0.75rem" pr="0.5rem" fontWeight={500}>
Expand Down
251 changes: 103 additions & 148 deletions src/custom/state/claim/hooks/hooksMod.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// import { useSingleCallResult } from 'state/multicall/hooks'
import { isAddress } from 'utils/index'
// import { useTransactionAdder } from 'state/enhancedTransactions/hooks'
import { ClaimType, UserClaims } from '.'
import { CLAIMS_REPO, RepoClaims, UserClaims } from '.'
import { transformRepoClaimsToUserClaims } from 'state/claim/hooks/utils'
// import { useSingleCallResult } from '@src/state/multicall/hooks'
export { useUserClaimData } from '@src/state/claim/hooks'

Expand All @@ -26,34 +27,80 @@ export { useUserClaimData } from '@src/state/claim/hooks'

type LastAddress = string
type ClaimAddressMapping = { [firstAddress: string]: LastAddress }
let FETCH_CLAIM_MAPPING_PROMISE: Promise<ClaimAddressMapping> | null = null
// let FETCH_CLAIM_MAPPING_PROMISE: Promise<ClaimAddressMapping> | null = null
function fetchClaimsMapping(): Promise<ClaimAddressMapping> {
return (
FETCH_CLAIM_MAPPING_PROMISE ??
(FETCH_CLAIM_MAPPING_PROMISE = fetch(
`https://raw.githubusercontent.com/gnosis/cow-mrkl-drop-data-chunks/final/chunks/mapping.json`
)
.then((res) => res.json())
.catch((error) => {
console.error('Failed to get claims mapping', error)
FETCH_CLAIM_MAPPING_PROMISE = null
}))
)
// return (
// FETCH_CLAIM_MAPPING_PROMISE ??
// (FETCH_CLAIM_MAPPING_PROMISE = fetch(`${CLAIMS_REPO}mapping.json`) // mod
// .then((res) => res.json())
// .catch((error) => {
// console.error('Failed to get claims mapping', error)
// FETCH_CLAIM_MAPPING_PROMISE = null
// }))
// )
return Promise.resolve({ '0x00059034c8759f5C89af6792Eb3cFa2CCd12f6f3': '0x01bE7C603f60ae4b69BeC96816DBAC548cd784E6' })
}

const FETCH_CLAIM_FILE_PROMISES: { [startingAddress: string]: Promise<{ [address: string]: UserClaims }> } = {}
function fetchClaimsFile(key: string): Promise<{ [address: string]: UserClaims }> {
return (
FETCH_CLAIM_FILE_PROMISES[key] ??
(FETCH_CLAIM_FILE_PROMISES[key] = fetch(
`https://raw.githubusercontent.com/gnosis/cow-mrkl-drop-data-chunks/final/chunks/${key}.json`
)
.then((res) => res.json())
.catch((error) => {
console.error(`Failed to get claim file mapping for starting address ${key}`, error)
delete FETCH_CLAIM_FILE_PROMISES[key]
}))
)
// const FETCH_CLAIM_FILE_PROMISES: { [startingAddress: string]: Promise<{ [address: string]: RepoClaims }> } = {} // mod
function fetchClaimsFile(key: string): Promise<{ [address: string]: RepoClaims }> {
console.log(`fetching key`, key)
// return (
// FETCH_CLAIM_FILE_PROMISES[key] ??
// (FETCH_CLAIM_FILE_PROMISES[key] = fetch(`${CLAIMS_REPO}${key}.json`) // mod
// .then((res) => res.json())
// .catch((error) => {
// console.error(`Failed to get claim file mapping for starting address ${key}`, error)
// delete FETCH_CLAIM_FILE_PROMISES[key]
// }))
// )
return Promise.resolve({
'0x0010B775429d6C92333E363CBd6BF28dDF1A87E6': [
{
proof: [
'0xdbbb620e67ead29bcf4a7946340a5742ad85d93431836ce351fc27d758618a77',
'0x9db68d2f44528e21355fa50f2d86b365196dcaac6098b43f752da57948967133',
'0x95668515eeb02f888ae1048b6b5f687565295d1a534248b5be2cf306c373d791',
'0x21c8b0c6ec791a63f0727c6490fd0311f9c9951f2619f0cc1972719a6d2f57a9',
'0x36467d0e58c7d14192421d66badc4d7cdeb551fda697c4de4e7cd1d67f6f4474',
'0x67352be12b02acae43ce9b6f13dba2cc0505d733595d56ac874a4f8275c1d253',
'0xf8100319095c2d8c4ac636cc87c94a8b4ae72fa0c26be8f527958c06824251a1',
'0x0a4979f880c89b6cfdd84f55301848abd50cea3e72b2b2af64239a732dacd528',
'0x08d3e353a1f0dcd57090ee82f383ff038fbc8dbdc1f4449bbfc6109d36002df5',
'0x3cb9f6df35b5e10bdc267da14150d0e2478f1596cdee2715f65aa24afde81ce1',
'0xf10f53b7c2fb9b64282a73abda6114589387bb229cfc27cb42ac66ddbb639d7b',
'0x8db32f710938011f7a52f525fcda77096b5fb6df9a79615fffd2ffacb4eacd25',
'0x3addacdc093b79ee814c396b4df81e4f67d2507638b201bf309531a1e1b46580',
'0x1f84fcb9c266c85347319843efda7c3ddd98d5862064e084fa1dcf3b1c5a014a',
'0x1c5834c15212ba6f0cd97e697b521b41acca40fc7a56d3496e80159ff84887ff',
],
index: 3,
type: 'Team',
amount: '883000000000000000000',
},
{
proof: [
'0x92e08522c31525547c0ef58df43ca63743431e3278b2b6711665748f58504e4a',
'0x70786e6b8fbfba57452644e6fe1ec01ecb0451e170a20e0a9792d1b12bb870e1',
'0x1f74c6eccf115ec05d38dae6834ff6bc456487cafdd12ce9bea2cd565bb4ca32',
'0xeabb061cb2475aff027b8920f8d895a16f2f7bd98e029f17d35cb241054534cb',
'0x2209376ceda8b8ee47a49d1df42a2d1f8cb36be241a6a6612b728c1f9958b63b',
'0xdd9d179c85a43dc0fc26b45fe1383ffc70d10c79680954a283038a83aefd5ced',
'0xada556e1e0a4e5ad6b6081248bd9738c93e6ae2c2ab0733e87b9e514fd178c2b',
'0x7bf4d659add47b5c6104c93eba0763df2993b3978fadc670259b00c9339236dd',
'0x28ad99dbbab5ab6242c3dd44750ef7d70850f013f4f775df66a74523bb05e209',
'0x2c92171ab88f4e4ed180c31dae32ea9776a06feb9212b745cd88b99f29e651d4',
'0x83e113c2e7dda5ec1e4de305d8979969a2e53117767f95a520f91d2ab67ad58a',
'0x9ff9f0773b0b1ee89f87d63f4db6f1025e4f1effe2b5333b47ea42130ab283cc',
'0x6b8a0ed76f8d99a71b2aeb28ebc8a029f84affc531956f579e13fdf0dc5e29a6',
'0x7b019fce542fcfd0d9b2d1a79ca54014d4c77d3db26adfb0f3b60816a0e8c2f8',
'0x3fb9f3c87451effbb58340761f30e2d2057a0a2fb27eee5ec6af3362be0389f9',
],
index: 4,
type: 'Advisor',
amount: '883000000000000000000',
},
],
})
}

const FETCH_CLAIM_PROMISES: { [key: string]: Promise<UserClaims> } = {}
Expand Down Expand Up @@ -83,7 +130,7 @@ export function fetchClaims(account: string): Promise<UserClaims> {
})
.then(fetchClaimsFile)
.then((result) => {
if (result[formatted]) return result[formatted]
if (result[formatted]) return transformRepoClaimsToUserClaims(result[formatted]) // mod
throw new Error(`Claim for ${formatted} was not found in claim file!`)
})
.catch((error) => {
Expand All @@ -95,127 +142,35 @@ export function fetchClaims(account: string): Promise<UserClaims> {

// parse distributorContract blob and detect if user has claim data
// null means we know it does not
export function useUserClaims(account: string | null | undefined): UserClaims | null {
console.log('[useUserClaims] ', account)
// real world mock claim data
return [
{
proof: [
'0x03cc3df79d865ad3bfbdd54ec8ee6001f294655fe0018e660c0879c046d82133',
'0xd044fdd7448e035e36a13a1b3edb2d7158624c6578a31517e8deefc2034c216b',
'0x4531947895cb7cfc7d878e32288a73c04eaf63af8345d47283ba2cb8bac7e8c5',
'0xf1376d3d11b33948440cf71bcfa63e69a9ca436ab3cef016b9da36f2a226d3e2',
'0xa5ff51dde0385f442354e8d2582e81fd7d81f0a9b558ceea8e84136e6b88501c',
'0xdc13f692869b72e45579e0ef7f5afe670ffeb5c2931f5b72cc50a19121c57f68',
'0xbf454c5b68f2a3637a1221ce1e5834ce5725f9fcef7f932f81af24127e312d58',
'0x0c85968537348d6281fb14be6b4528e77fce7adb1ac9a6fae52c83182f64d848',
'0xdc838baad0c5b2844072e96cd5376ca337f80b42746b46a46121afcc0e39e0ee',
'0x52aaac536243500f3d5aae091887032322773b40f7fa906d0043a5d74013a8c4',
'0x57158a64c297f7a0ae2530774437f91667aab006e084f3214986dce3ca898474',
'0xc1d3779a02affbc6b4885b248a636f9a3fd124d356e639347bb04129436133bd',
'0xe0b4fbf77c444bada1498ecbee1431eb297d4fa9a6d04f1dcb19571c334b5dcb',
'0x768e2f52bd7f4c8f1251620800bed30d14d13453dd2f0ced98eff0212d5e5288',
'0x3fb9f3c87451effbb58340761f30e2d2057a0a2fb27eee5ec6af3362be0389f9',
],
index: 1080,
type: ClaimType.Airdrop,
amount: '9289000000000000000000',
},
{
proof: [
'0xe4a4711613f6a6abecec56531200077f399303168c12c794e03a16c7141277c7',
'0x6979fe9243a97222a78662106ec36e652a3b7a96e0306091b441316bb42ee49b',
'0xd60dc85ed37acc5c5623b8ca637210b0c72c578016cbcfc14e0f611683a0ddc4',
'0xf324c5e050526464fff42caa978e415c89dd354721af7312713ce762aa4e3cf9',
'0x111b233c7994b3a246749f97af91788099685536865f43bba299db917624c30f',
'0x5b3bc344c7c6891fb381fb7092f8ef800d58d83d476bcc10cb73ebee97057a6e',
'0x4da4607803446d6145992c69291a9b838eb7fba7a3e47f0783fcf0c5b7ac9e27',
'0x668da11ee65c87085886bdef9d629bcb8f0882e7b375bfe760da962a4d3483ef',
'0xa6bbe6222c6e6c8214d5393eddec4f1e52c968923d5e76f8cea6a45cc30a9033',
'0xa2eb0b6a9bd133c79177ae56ae0f4eb556750562091f659b63462e32464fc4ad',
'0x631279a8a000a2182f0ac5fb7628af58abb740f43541390d3a1b9fc43c240c32',
'0x8db32f710938011f7a52f525fcda77096b5fb6df9a79615fffd2ffacb4eacd25',
'0x3addacdc093b79ee814c396b4df81e4f67d2507638b201bf309531a1e1b46580',
'0x1f84fcb9c266c85347319843efda7c3ddd98d5862064e084fa1dcf3b1c5a014a',
'0x1c5834c15212ba6f0cd97e697b521b41acca40fc7a56d3496e80159ff84887ff',
],
index: 1081,
type: ClaimType.GnoOption,
amount: '9289000000000000000000',
},
{
proof: [
'0x903dad7e81712ab3858558a3ee083d2197c5ab345fc721143a78ac59b2fbe8a7',
'0x4db9088b89dd41f82e2dc34ef47f64389970b50143251a39aa6fe19cdbd656cf',
'0x03be42b4e6980a26ffaed8bebb9e4fe98f9d189baab81045fc3568b847af8080',
'0xa0d55fee34a2b2869e64b66cfe63b6d3eb059020ebce7168558fb96938ad7ff2',
'0x705b26f2b216f99a72e931b1f49161310b22fe21b4dcca40ccd6e63eacd70dc3',
'0x631afde099857df0ccfd45bdba8445e4e0eaaa65a74d3be7db0a586787501f10',
'0x30e698f66f132fd2115c5014f470e7525743f9110469e12dfddd6ea339dd8ccc',
'0xb010642525d139c72ddb4fb874fc19e1b47a866a1976e6898e9d275d2e1b02a8',
'0xdc8c8f45c7346752fe8fa3e3de0442541acb25ff22f2b1813596c75aeb9f3773',
'0x2c92171ab88f4e4ed180c31dae32ea9776a06feb9212b745cd88b99f29e651d4',
'0x83e113c2e7dda5ec1e4de305d8979969a2e53117767f95a520f91d2ab67ad58a',
'0x9ff9f0773b0b1ee89f87d63f4db6f1025e4f1effe2b5333b47ea42130ab283cc',
'0x6b8a0ed76f8d99a71b2aeb28ebc8a029f84affc531956f579e13fdf0dc5e29a6',
'0x7b019fce542fcfd0d9b2d1a79ca54014d4c77d3db26adfb0f3b60816a0e8c2f8',
'0x3fb9f3c87451effbb58340761f30e2d2057a0a2fb27eee5ec6af3362be0389f9',
],
index: 1082,
type: ClaimType.UserOption,
amount: '9289000000000000000000',
},
{
proof: [
'0xac1003d4e9454ec2788204f57830cd442e07aa3c002e96989b4fa1b7ee8fb781',
'0x5d45dbb618e7b8a6e44126d2b31340ec67fef86816adb520b936d496bc2f04da',
'0x069cd55cc7423bf340c19a709779bfaefb73db23c9ca261f36a0695c5809c31f',
'0x9c6d662636dbe17db437904e83710430b7c2f64e668296c01934a32cf7f6d2ad',
'0x9f29f9989c5f2676b9a2ce9e709885db936244244f55a44fb6230c285735fb97',
'0x35d790c7d61eed82fcbeec6228cbf588c53b0127459626d8d43d511f22c8f344',
'0x3142c466c8041cea94c8a93c0856860e55101f932c0e302a63b48df4583fb365',
'0x4eb852823a9f41e409dfc8b4629b7e3de310231fae62355eb76470cdb47ba50b',
'0x35ebda602b28c0a3b6a1d8fe8eba1dbf1d2249430c1b4396d302418f8e8d93f2',
'0x842e5e67e088a322daa9e8f25aa0c9492db9f3359ed5527a1d45fbe64c5547ac',
'0x516f3d9a760004d3d55addc0408764c34cc380551f1cb75efc6801c70ea98c3d',
'0x7bd1e90485acf6b605c462165bc99f821461475bf27aee3783c5bef12a2072ab',
'0xa61b9a8b2e60faeeca7b2972e4278a2e56520cb0621499e8cf2d91d97c181cf1',
'0x1f84fcb9c266c85347319843efda7c3ddd98d5862064e084fa1dcf3b1c5a014a',
'0x1c5834c15212ba6f0cd97e697b521b41acca40fc7a56d3496e80159ff84887ff',
],
index: 1083,
type: ClaimType.Advisor,
amount: '9289000000000000000000',
},
]

// const { chainId } = useActiveWeb3React()
// const [claimInfo, setClaimInfo] = useState<{ [account: string]: UserClaims | null }>({})

// useEffect(() => {
// if (!account || chainId !== 1) return

// fetchClaims(account)
// .then((accountClaimInfo) =>
// setClaimInfo((claimInfo) => {
// return {
// ...claimInfo,
// [account]: accountClaimInfo,
// }
// })
// )
// .catch(() => {
// setClaimInfo((claimInfo) => {
// return {
// ...claimInfo,
// [account]: null,
// }
// })
// })
// }, [account, chainId])

// return account && chainId === 1 ? claimInfo[account] : null
}
// export function useUserClaimData(account: string | null | undefined): UserClaimData | null {
// const { chainId } = useActiveWeb3React()
//
// const [claimInfo, setClaimInfo] = useState<{ [account: string]: UserClaimData | null }>({})
//
// useEffect(() => {
// if (!account || chainId !== 1) return
//
// fetchClaim(account)
// .then((accountClaimInfo) =>
// setClaimInfo((claimInfo) => {
// return {
// ...claimInfo,
// [account]: accountClaimInfo,
// }
// })
// )
// .catch(() => {
// setClaimInfo((claimInfo) => {
// return {
// ...claimInfo,
// [account]: null,
// }
// })
// })
// }, [account, chainId])
//
// return account && chainId === 1 ? claimInfo[account] : null
// }

// check if user is in blob and has not yet claimed UNI
// export function useUserHasAvailableClaim(account: string | null | undefined): boolean {
Expand Down
Loading

0 comments on commit 8d53e6b

Please sign in to comment.