Skip to content

fix: failed to open box #5694

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

Merged
Randolph314 merged 1 commit into from
Feb 21, 2022
+20 −7
Merged

fix: failed to open box #5694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions packages/mask/src/plugins/MaskBox/hooks/useContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function useContext(initialState?: { boxId: string; hashRoot: string }) {
const coder = ABICoder as unknown as ABICoder.AbiCoder

const [boxId, setBoxId] = useState(initialState?.boxId ?? '')
const [hashRoot, setHashRoot] = useState(initialState?.hashRoot || '')
const [rootHash, setRootHash] = useState(initialState?.hashRoot || '')
const [paymentTokenAddress, setPaymentTokenAddress] = useState('')

// #region the box info
Expand Down Expand Up @@ -149,14 +149,14 @@ function useContext(initialState?: { boxId: string; hashRoot: string }) {
// #endregion

// #region qualification
const { value, error: errorProof, loading: loadingProof } = useMerkelProof(hashRoot)
const { value, error: errorProof, loading: loadingProof } = useMerkelProof(rootHash)
const proofBytes = value?.proof
? coder.encodeParameters(['bytes32[]'], [value?.proof?.map((p) => `0x${p}`) ?? []])
: undefined
const qualification = useQualification(
boxInfo?.qualificationAddress,
account,
value?.proof ? coder.encodeParameters(['bytes', 'bytes32'], [proofBytes, hashRoot]) : undefined,
value?.proof ? coder.encodeParameters(['bytes', 'bytes32'], [proofBytes, rootHash]) : undefined,
)

// not in whitelist
Expand All @@ -176,8 +176,9 @@ function useContext(initialState?: { boxId: string; hashRoot: string }) {
if (notInWhiteList) return BoxState.NOT_IN_WHITELIST
if (insufficientHolderToken) return BoxState.INSUFFICIENT_HOLDER_TOKEN
if (qualification?.error_msg) return BoxState.NOT_QUALIFIED
if (errorMaskBoxInfo || errorMaskBoxStatus || errorBoxInfo) return BoxState.ERROR
if (loadingMaskBoxInfo || loadingMaskBoxStatus || loadingBoxInfo || loadingProof) {
if (errorMaskBoxInfo || errorMaskBoxStatus || errorBoxInfo || (rootHash ? errorProof : false))
return BoxState.ERROR
if (loadingMaskBoxInfo || loadingMaskBoxStatus || loadingBoxInfo || (rootHash ? loadingProof : false)) {
if (!maskBoxInfo && !boxInfo) return BoxState.UNKNOWN
}
if (maskBoxInfo && !boxInfo) return BoxState.UNKNOWN
Expand All @@ -194,9 +195,11 @@ function useContext(initialState?: { boxId: string; hashRoot: string }) {
errorBoxInfo,
maskBoxInfo,
loadingMaskBoxInfo,
loadingProof,
errorMaskBoxInfo,
qualification,
loadingProof,
errorProof,
rootHash,
notInWhiteList,
insufficientHolderToken,
beat,
Expand Down
12 changes: 11 additions & 1 deletion packages/mask/src/plugins/MaskBox/hooks/useOpenBoxTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,15 @@ export function useOpenBoxTransaction(
},
method: maskBoxContract.methods.openBox(boxId, amount, paymentTokenIndex, proof ?? '0x00'),
}
}, [account, amount, boxId, maskBoxContract, paymentTokenIndex, paymentTokenPrice, paymentTokenDetailed, overrides])
}, [
account,
amount,
boxId,
maskBoxContract,
paymentTokenIndex,
paymentTokenPrice,
paymentTokenDetailed,
proof,
overrides,
])
}