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

feat(bridge-ui-v2): NFT bridging #14949

Merged
merged 11 commits into from
Oct 16, 2023
Merged

feat(bridge-ui-v2): NFT bridging #14949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca81283
initial bridging for erc721
KorbinianK Oct 12, 2023
3455b15
fix wrong check for nft
KorbinianK Oct 13, 2023
356f0f2
update checkOwnership
KorbinianK Oct 13, 2023
c3f4689
add state to id input
KorbinianK Oct 13, 2023
3aaf923
fix tokenInfo for ID 0
KorbinianK Oct 13, 2023
7c2cbac
refactor ownership check and add to api fetch
KorbinianK Oct 13, 2023
f3ad809
approval button for 1155
KorbinianK Oct 13, 2023
fe3acc7
fix manual input
KorbinianK Oct 13, 2023
b5fe5b8
Merge remote-tracking branch 'origin/main' into feat/bridge-ui-v2--nf…
KorbinianK Oct 13, 2023
a2d4998
erc1155 approval and bridging
KorbinianK Oct 13, 2023
9e406e4
cleanup
KorbinianK Oct 13, 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
13 changes: 9 additions & 4 deletions packages/bridge-ui-v2/src/app.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ export const recommentProcessingFee = {
ethGasLimit: BigInt(900_000),
erc20NotDeployedGasLimit: BigInt(3_100_000),
erc20DeployedGasLimit: BigInt(1_100_000),
erc721NotDeployedGasLimit: BigInt(3_400_000),
erc721NotDeployedGasLimit: BigInt(2_400_000),
erc721DeployedGasLimit: BigInt(1_100_000),
erc1155NotDeployedGasLimit: BigInt(4_000_000),
erc1155NotDeployedGasLimit: BigInt(2_600_000),
erc1155DeployedGasLimit: BigInt(1_100_000),
};

Expand All @@ -15,9 +15,14 @@ export const processingFeeComponent = {

export const bridgeService = {
noOwnerGasLimit: BigInt(140_000),
noTokenDeployedGasLimit: BigInt(3_000_000),
noERC20TokenDeployedGasLimit: BigInt(3_000_000),
erc20GasLimitThreshold: BigInt(2_500_000),
unpredictableGasLimit: BigInt(1_000_000),

noERC721TokenDeployedGasLimit: BigInt(2_400_000),
erc721GasLimitThreshold: BigInt(3_000_000),

noERC1155TokenDeployedGasLimit: BigInt(2_600_000),
erc1155GasLimitThreshold: BigInt(3_000_000),
};

export const pendingTransaction = {
Expand Down
38 changes: 30 additions & 8 deletions packages/bridge-ui-v2/src/components/Bridge/Actions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import { Button } from '$components/Button';
import { Icon } from '$components/Icon';
import { TokenType } from '$libs/token';
import { type NFT, TokenType } from '$libs/token';
import { account, network } from '$stores';

import {
Expand All @@ -13,6 +13,7 @@
errorComputingBalance,
insufficientAllowance,
insufficientBalance,
notApproved,
recipientAddress,
selectedToken,
tokenBalance,
Expand Down Expand Up @@ -50,18 +51,40 @@

// Conditions for approve/bridge steps
$: isSelectedERC20 = $selectedToken && $selectedToken.type === TokenType.ERC20;
$: isTokenApproved = isSelectedERC20 && $enteredAmount && !$insufficientAllowance && !$validatingAmount;

$: isTokenApproved =
$selectedToken?.type === TokenType.ERC20
? isSelectedERC20 && $enteredAmount && !$insufficientAllowance && !$validatingAmount
: $selectedToken?.type === TokenType.ERC721 || $selectedToken?.type === TokenType.ERC1155
? allTokensApproved
: false;

// Check if all NFTs are approved
$: allTokensApproved =
$selectedToken?.type === TokenType.ERC721 || $selectedToken?.type === TokenType.ERC1155
? $notApproved.get(($selectedToken as NFT).tokenId)
: false;

// Conditions to disable/enable buttons
$: disableApprove = canDoNothing || !$insufficientAllowance || $validatingAmount || approving;
$: disableBridge = canDoNothing || $insufficientAllowance || $insufficientBalance || $validatingAmount || bridging;
$: disableApprove =
$selectedToken?.type === TokenType.ERC20
? canDoNothing || $insufficientBalance || $validatingAmount || approving || isTokenApproved
: $selectedToken?.type === TokenType.ERC721
? allTokensApproved || approving
: $selectedToken?.type === TokenType.ERC1155
? allTokensApproved || approving
: approving;

// General loading state
// $: loading = approving || bridging;
$: disableBridge =
$selectedToken?.type === TokenType.ERC20
? canDoNothing || $insufficientAllowance || $insufficientBalance || $validatingAmount || bridging
: $selectedToken?.type === TokenType.ERC721 || $selectedToken?.type === TokenType.ERC1155
? !allTokensApproved
: bridging || !hasAddress || !hasNetworks || !hasBalance || !$selectedToken || !$enteredAmount;
</script>

<div class="f-between-center w-full gap-4">
{#if isSelectedERC20}
{#if $selectedToken && $selectedToken.type !== TokenType.ETH}
<Button
type="primary"
class="px-[28px] py-[14px] rounded-full flex-1"
Expand All @@ -81,7 +104,6 @@
</Button>
<Icon type="arrow-right" />
{/if}

<Button
type="primary"
class="px-[28px] py-[14px] rounded-full flex-1 text-white"
Expand Down
10 changes: 5 additions & 5 deletions packages/bridge-ui-v2/src/components/Bridge/AddressInput/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export enum AddressInputState {
Default = 'default',
Valid = 'valid',
Invalid = 'invalid',
TooShort = 'too_short',
Validating = 'validating',
Default,
Valid,
Invalid,
TooShort,
Validating,
}
Loading
Loading