diff --git a/README.md b/README.md index 0e714b59..3b616baf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# DLC.Link - dlcBTC Bridge +# DLC.Link - iBTC Bridge -**dlcBTC Website** is an interface for interacting with DLC.Link smart contracts and the Bitcoin blockchain. This platform provides a secure and efficient self-custodial way to lock Bitcoin as collateral and mint dlcBTC tokens based on the amount of Bitcoin locked. +**iBTC Website** is an interface for interacting with DLC.Link smart contracts and the Bitcoin blockchain. This platform provides a secure and efficient self-custodial way to lock Bitcoin as collateral and mint iBTC tokens based on the amount of Bitcoin locked. ## Installation diff --git a/config.devnet.json b/config.devnet.json index da279717..bf038547 100644 --- a/config.devnet.json +++ b/config.devnet.json @@ -21,7 +21,7 @@ { "name": "DLC.Link", "addresses": ["0x0DD4f29E21F10cb2E485cf9bDAb9F2dD1f240Bfa"], - "logo": "/images/logos/dlcBTC-logotype.svg" + "logo": "/images/logos/ibtc-logotype.svg" }, { "name": "Smart Bitcoin Labs", diff --git a/config.localhost.json b/config.localhost.json index 246b27a2..8be2a06c 100644 --- a/config.localhost.json +++ b/config.localhost.json @@ -17,7 +17,7 @@ { "name": "DLC.Link", "addresses": ["0x0DD4f29E21F10cb2E485cf9bDAb9F2dD1f240Bfa"], - "logo": "/images/logos/dlcBTC-logotype.svg" + "logo": "/images/logos/ibtc-logotype.svg" } ], "protocols": [ diff --git a/config.mainnet.json b/config.mainnet.json index 30288755..915bbee4 100644 --- a/config.mainnet.json +++ b/config.mainnet.json @@ -25,7 +25,7 @@ { "name": "DLC.Link", "addresses": ["0x0DD4f29E21F10cb2E485cf9bDAb9F2dD1f240Bfa"], - "logo": "/images/logos/dlcBTC-logotype.svg" + "logo": "/images/logos/ibtc-logotype.svg" }, { "name": "Smart Bitcoin Labs", diff --git a/config.testnet.json b/config.testnet.json index ac5dad86..81e7f9bc 100644 --- a/config.testnet.json +++ b/config.testnet.json @@ -21,7 +21,7 @@ { "name": "DLC.Link", "addresses": ["0x0DD4f29E21F10cb2E485cf9bDAb9F2dD1f240Bfa"], - "logo": "/images/logos/dlcBTC-logotype.svg" + "logo": "/images/logos/ibtc-logotype.svg" }, { "name": "Smart Bitcoin Labs", diff --git a/index.html b/index.html index 6e7b70f6..3054b1df 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - DLC.Link dlcBTC Website + DLC.Link iBTC Website
diff --git a/public/images/logos/dlc-btc-logo.svg b/public/images/logos/ibtc-logo.svg similarity index 100% rename from public/images/logos/dlc-btc-logo.svg rename to public/images/logos/ibtc-logo.svg diff --git a/public/images/logos/dlcBTC-logotype.svg b/public/images/logos/ibtc-logotype.svg similarity index 100% rename from public/images/logos/dlcBTC-logotype.svg rename to public/images/logos/ibtc-logotype.svg diff --git a/src/app/components/attestor-details/attestor-details-select.tsx b/src/app/components/attestor-details/attestor-details-select.tsx index a2af4cb5..7b6bb280 100644 --- a/src/app/components/attestor-details/attestor-details-select.tsx +++ b/src/app/components/attestor-details/attestor-details-select.tsx @@ -82,7 +82,7 @@ export function AttestorDetailsSelect(): React.JSX.Element { diff --git a/src/app/components/attestor-details/attestor-details.tsx b/src/app/components/attestor-details/attestor-details.tsx index bd9d6b8a..b86096c5 100644 --- a/src/app/components/attestor-details/attestor-details.tsx +++ b/src/app/components/attestor-details/attestor-details.tsx @@ -20,7 +20,7 @@ export function AttestorDetails(): React.JSX.Element { return ( - dlcBTC Attestor Details + iBTC Attestor Details diff --git a/src/app/components/attestor-details/components/attestor-details-card/attestor-details-rate-card.tsx b/src/app/components/attestor-details/components/attestor-details-card/attestor-details-rate-card.tsx index 101b9769..f9bfeb5b 100644 --- a/src/app/components/attestor-details/components/attestor-details-card/attestor-details-rate-card.tsx +++ b/src/app/components/attestor-details/components/attestor-details-card/attestor-details-rate-card.tsx @@ -1,5 +1,5 @@ import { Divider, HStack, Image, Spacer, Text, VStack } from '@chakra-ui/react'; -import { dlcBTC } from '@models/token'; +import { iBTC } from '@models/token'; interface AttestorDetailsRateCardProps { width: string; @@ -16,9 +16,9 @@ export function AttestorDetailsRateCard({ Nakamoto Coefficient - {dlcBTC.logoAlt} + {iBTC.logoAlt} - dlcBTC + iBTC diff --git a/src/app/components/attestor-details/components/attestor-details-table/components/attestor-details-table-item.tsx b/src/app/components/attestor-details/components/attestor-details-table/components/attestor-details-table-item.tsx index 5e2b3f0c..24b7a85a 100644 --- a/src/app/components/attestor-details/components/attestor-details-table/components/attestor-details-table-item.tsx +++ b/src/app/components/attestor-details/components/attestor-details-table/components/attestor-details-table-item.tsx @@ -38,7 +38,7 @@ export function AttestorDetailsTableItem( justifyContent={'space-between'} > - {'dlcBTC + {'iBTC - {'dlcBTC + {'iBTC {hash} diff --git a/src/app/components/company-website-button/company-website-button.tsx b/src/app/components/company-website-button/company-website-button.tsx index def33795..1f4a75b5 100644 --- a/src/app/components/company-website-button/company-website-button.tsx +++ b/src/app/components/company-website-button/company-website-button.tsx @@ -5,8 +5,8 @@ import { Button, Image, useBreakpointValue } from '@chakra-ui/react'; export function CompanyWebsiteButton(): React.JSX.Element { const navigate = useNavigate(); - const logoPath = './images/logos/dlc-btc-logo.svg'; - const altText = 'dlcBTC Logo'; + const logoPath = './images/logos/ibtc-logo.svg'; + const altText = 'iBTC Logo'; const isMobile = useBreakpointValue({ base: true, md: false }); return ( diff --git a/src/app/components/header/components/tabs.tsx b/src/app/components/header/components/tabs.tsx index 09739fa6..8e7ab180 100644 --- a/src/app/components/header/components/tabs.tsx +++ b/src/app/components/header/components/tabs.tsx @@ -34,7 +34,7 @@ export function NavigationTabs({ {isActiveTabs && ( <> handleTabClick('/mint-withdraw')} /> diff --git a/src/app/components/how-it-works/bottom/components/how-to-mint.tsx b/src/app/components/how-it-works/bottom/components/how-to-mint.tsx index b5b56e0c..d49b4209 100644 --- a/src/app/components/how-it-works/bottom/components/how-to-mint.tsx +++ b/src/app/components/how-it-works/bottom/components/how-to-mint.tsx @@ -16,7 +16,7 @@ export function HowToMint(): React.JSX.Element { { <> - How to Mint dlcBTC + How to Mint iBTC {'mint Ethereum Wallet.{' '} - You will receive your deposit token dlcBTC to the same address. + You will receive your deposit token iBTC to the same address. } hasBadge={false} @@ -49,18 +49,18 @@ export function HowToMint(): React.JSX.Element { /> Wait for Bitcoin to get locked on chain{' '} (~1 hour).{' '} - After confirmation dlcBTC tokens will automatically appear in your{' '} + After confirmation iBTC tokens will automatically appear in your{' '} Ethereum Wallet.{' '} {' '} - You can use dlcBTC in big{' '} + You can use iBTC in big{' '} supported DeFi protocols {' '} @@ -83,7 +83,7 @@ export function HowToMint(): React.JSX.Element { }} variant={'account'} > - Mint dlcBTC + Mint iBTC } diff --git a/src/app/components/how-it-works/bottom/components/how-to-unmint.tsx b/src/app/components/how-it-works/bottom/components/how-to-unmint.tsx index 28c802ba..607bcf52 100644 --- a/src/app/components/how-it-works/bottom/components/how-to-unmint.tsx +++ b/src/app/components/how-it-works/bottom/components/how-to-unmint.tsx @@ -15,15 +15,15 @@ export function HowToUnmint(): React.JSX.Element { { <> - How to Unmint dlcBTC + How to withdraw BTC {'unmint - Select the vault you would like to unmint. After a successful unmint you will + Select the vault you would like to redeem from. After a successful withdraw you will receive BTC in the same amount back to your wallet. } @@ -39,7 +39,7 @@ export function HowToUnmint(): React.JSX.Element { }} variant={'account'} > - Unmint dlcBTC + Unmint iBTC } diff --git a/src/app/components/how-it-works/middle/middle-section.tsx b/src/app/components/how-it-works/middle/middle-section.tsx index fa022f99..458e4c67 100644 --- a/src/app/components/how-it-works/middle/middle-section.tsx +++ b/src/app/components/how-it-works/middle/middle-section.tsx @@ -17,11 +17,11 @@ export function MiddleSection(): React.JSX.Element { > } content={ - dlcBTC is a{' '} + iBTC is a{' '} non-custodial {' '} diff --git a/src/app/components/how-it-works/top/top-section.tsx b/src/app/components/how-it-works/top/top-section.tsx index 1f15b55f..22b6fdb8 100644 --- a/src/app/components/how-it-works/top/top-section.tsx +++ b/src/app/components/how-it-works/top/top-section.tsx @@ -16,10 +16,10 @@ export function TopSection(): React.JSX.Element { - dlcBTC + iBTC - dlcBTC lets you use your Bitcoin on different DeFi platforms, all without giving up + iBTC lets you use your Bitcoin on different DeFi platforms, all without giving up control of your actual Bitcoin. diff --git a/src/app/components/mint-unmint/components/landing-page/components/welcome-stack.tsx b/src/app/components/mint-unmint/components/landing-page/components/welcome-stack.tsx index 655424d2..9ffc16cb 100644 --- a/src/app/components/mint-unmint/components/landing-page/components/welcome-stack.tsx +++ b/src/app/components/mint-unmint/components/landing-page/components/welcome-stack.tsx @@ -8,7 +8,7 @@ export function WelcomeStack(): React.JSX.Element { // const navigate = useNavigate(); const dispatch = useDispatch(); - const setupText = 'Ready to\n mint dlcBTC?'; + const setupText = 'Ready to\n mint iBTC?'; function onConnectWalletClick(): void { dispatch(modalActions.toggleSelectWalletModalVisibility()); diff --git a/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx b/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx index 3668ee82..75df337f 100644 --- a/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx +++ b/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx @@ -21,7 +21,7 @@ export function ProgressTimeline({ - + @@ -49,7 +49,7 @@ export function ProgressTimeline({ stepIndex={3} width={'12.5%'} isLastStep - title="Mint dlcBTC" + title="Mint iBTC" /> diff --git a/src/app/components/mint-unmint/components/setup-vault-screen/components/setup-vault-screen.vault-graphics.tsx b/src/app/components/mint-unmint/components/setup-vault-screen/components/setup-vault-screen.vault-graphics.tsx index 8ee091b2..270e5e3d 100644 --- a/src/app/components/mint-unmint/components/setup-vault-screen/components/setup-vault-screen.vault-graphics.tsx +++ b/src/app/components/mint-unmint/components/setup-vault-screen/components/setup-vault-screen.vault-graphics.tsx @@ -27,7 +27,7 @@ export function SetupVaultScreenVaultGraphics(): React.JSX.Element { right="37.5%" /> {'DLC - BTC/dlcBTC Vault + BTC/iBTC Vault diff --git a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx index 2d2bf3a9..490aa7d8 100644 --- a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx +++ b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx @@ -65,7 +65,7 @@ export function Walkthrough({ Enter the Bitcoin amount you wish to deposit into the vault, then verify the transaction through your Bitcoin Wallet which will lock your Bitcoin on-chain. You - will receive equivalent amount of dlcBTC. + will receive equivalent amount of iBTC. ); @@ -74,17 +74,17 @@ export function Walkthrough({ - Wait for Bitcoin to get locked on chain (~1 hour). After 6 confirmations, dlcBTC + Wait for Bitcoin to get locked on chain (~1 hour). After 6 confirmations, iBTC tokens will appear in your Wallet. {networkType === NetworkType.EVM && ( <> - To ensure your dlcBTC tokens + To ensure your iBTC tokens are visible simply add them to your Ethereum Wallet. @@ -92,11 +92,7 @@ export function Walkthrough({ @@ -109,7 +105,7 @@ export function Walkthrough({ @@ -122,18 +118,18 @@ export function Walkthrough({ {networkType === NetworkType.EVM ? ( - Select the dlcBTC vault you would like to withdraw from. Burn the desired amount - of dlcBTC to receive the equivalent amount of BTC. + Select the iBTC vault you would like to withdraw from. Burn the desired amount of + iBTC to receive the equivalent amount of BTC. ) : ( - Select the dlcBTC vault you would like to withdraw from. Sign a check with the - desired amount of dlcBTC to receive the equivalent amount of BTC. + Select the iBTC vault you would like to withdraw from. Sign a check with the + desired amount of iBTC to receive the equivalent amount of BTC. )} @@ -147,7 +143,7 @@ export function Walkthrough({ blockchain={NetworkType.BTC} /> - {`Once the dlcBTC has been burned, you can withdraw an `} + {`Once the iBTC has been burned, you can withdraw an `} {` equivalent amount of Bitcoin `} @@ -175,7 +171,7 @@ export function Walkthrough({ diff --git a/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx b/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx index acc305f3..a556036e 100644 --- a/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx +++ b/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx @@ -15,9 +15,9 @@ interface SuccessfulFlowModalProps extends ModalComponentProps { function getModalText(flow: 'mint' | 'burn', assetAmount?: number): string { if (flow === 'mint') { - return `You have successfully deposited ${assetAmount} BTC from your Bitcoin Wallet into your Vault, and minted ${assetAmount} dlcBTC to your destination address.`; + return `You have successfully deposited ${assetAmount} BTC from your Bitcoin Wallet into your Vault, and minted ${assetAmount} iBTC to your destination address.`; } else { - return `You have successfully burned ${assetAmount} dlcBTC from your destination address, and withdrawn ${assetAmount} BTC from your Vault into your Bitcoin Wallet.`; + return `You have successfully burned ${assetAmount} iBTC from your destination address, and withdrawn ${assetAmount} BTC from your Vault into your Bitcoin Wallet.`; } } diff --git a/src/app/components/my-vaults-small/my-vaults-small.tsx b/src/app/components/my-vaults-small/my-vaults-small.tsx index be0bb3b5..02db6693 100644 --- a/src/app/components/my-vaults-small/my-vaults-small.tsx +++ b/src/app/components/my-vaults-small/my-vaults-small.tsx @@ -35,7 +35,7 @@ export function MyVaultsSmall(): React.JSX.Element { vaultState={VaultState.READY} /> diff --git a/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx b/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx index 6c6d5b6b..c5abb282 100644 --- a/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx +++ b/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx @@ -4,13 +4,13 @@ import { MyVaultsHeaderBalanceInfo } from './components/my-vaults-header-balance interface MyVaultsLargeHeaderProps { isConnected: boolean; - dlcBTCBalance?: number; + iBTCBalance?: number; lockedBTCBalance?: number; } export function MyVaultsLargeHeader({ isConnected, - dlcBTCBalance, + iBTCBalance, lockedBTCBalance, }: MyVaultsLargeHeaderProps): React.JSX.Element { return ( @@ -22,10 +22,10 @@ export function MyVaultsLargeHeader({ diff --git a/src/app/components/my-vaults/my-vaults-large.tsx b/src/app/components/my-vaults/my-vaults-large.tsx index 03d35c9b..f7c09678 100644 --- a/src/app/components/my-vaults/my-vaults-large.tsx +++ b/src/app/components/my-vaults/my-vaults-large.tsx @@ -15,7 +15,7 @@ import { MyVaultsSetupInformationStack } from './components/my-vaults-setup-info export function MyVaultsLarge(): React.JSX.Element { const { isConnected } = useContext(NetworkConnectionContext); - const { dlcBTCBalance, lockedBTCBalance } = useContext(BalanceContext); + const { iBTCBalance, lockedBTCBalance } = useContext(BalanceContext); const { readyVaults, pendingVaults, fundedVaults, closingVaults, closedVaults, allVaults } = useContext(VaultContext); @@ -24,7 +24,7 @@ export function MyVaultsLarge(): React.JSX.Element { @@ -54,7 +54,7 @@ export function MyVaultsLarge(): React.JSX.Element { )} 0} > diff --git a/src/app/components/points/components/points-table/components/points-table-item.tsx b/src/app/components/points/components/points-table/components/points-table-item.tsx index e6a05407..16c7eb86 100644 --- a/src/app/components/points/components/points-table/components/points-table-item.tsx +++ b/src/app/components/points/components/points-table/components/points-table-item.tsx @@ -47,7 +47,7 @@ export function PointsTableItem(pointsTableItem: ProtocolRewards): React.JSX.Ele ) : ( <> - {'dlc + {'dlc {formatToFourDecimals(unshiftValue(currentTokens))} diff --git a/src/app/components/points/components/points-table/points-table.tsx b/src/app/components/points/components/points-table/points-table.tsx index e26a52da..7080949e 100644 --- a/src/app/components/points/components/points-table/points-table.tsx +++ b/src/app/components/points/components/points-table/points-table.tsx @@ -24,7 +24,7 @@ export function PointsTable({ items }: PointsTableProps): React.JSX.Element { ) : ( <> - dlcBTC Used + iBTC Used Points Earned DeFi Protocol diff --git a/src/app/components/points/points.tsx b/src/app/components/points/points.tsx index 30ada3e0..4cd70420 100644 --- a/src/app/components/points/points.tsx +++ b/src/app/components/points/points.tsx @@ -12,7 +12,7 @@ import { } from '@chakra-ui/react'; import { TokenStatsBoardLayout } from '@components/proof-of-reserve/components/token-stats-board/token-stats-board.layout'; import { usePoints } from '@hooks/use-points'; -import { dlcBTC } from '@models/token'; +import { iBTC } from '@models/token'; import { modalActions } from '@store/slices/modal/modal.actions'; import { useAccount } from 'wagmi'; @@ -38,7 +38,7 @@ export function Points(): React.JSX.Element { <> - Use dlcBTC -{' '} + Use iBTC -{' '} Earn Points @@ -83,7 +83,7 @@ export function Points(): React.JSX.Element { direction={isMobile ? 'column' : 'row'} > @@ -94,7 +94,7 @@ export function Points(): React.JSX.Element { variant={'thick'} /> p.name == 'dlcBTC')?.points} tokenSuffix={'Hold'} /> @@ -128,8 +128,8 @@ export function Points(): React.JSX.Element { {'dlcBTC - Use dlcBTC + Use iBTC - Put your dlcBTC to work in various activities like lending, staking, or - trading Participate and earn points for your involvement. + Put your iBTC to work in various activities like lending, staking, or trading + Participate and earn points for your involvement. @@ -173,7 +173,7 @@ export function Points(): React.JSX.Element { {'dlcBTC - + - + diff --git a/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-details-table-item.tsx b/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-details-table-item.tsx index 43bdec8d..855d6f32 100644 --- a/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-details-table-item.tsx +++ b/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-details-table-item.tsx @@ -10,7 +10,7 @@ export function MerchantDetailsTableItem(merchantFocusTableItem: DetailedEvent): if (!merchantFocusTableItem) return ; const { - dlcBTCAmount, + iBTCAmount, txHash, date, isMint, @@ -40,9 +40,9 @@ export function MerchantDetailsTableItem(merchantFocusTableItem: DetailedEvent): - {'dlc + {'dlc - {unshiftValue(dlcBTCAmount)} + {unshiftValue(iBTCAmount)} @@ -67,9 +67,9 @@ export function MerchantDetailsTableItem(merchantFocusTableItem: DetailedEvent): - {'dlc + {'dlc - {unshiftValue(dlcBTCAmount)} + {unshiftValue(iBTCAmount)} {/* add back the USD calculation later and adjus the width accordingly */} diff --git a/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-table-item.tsx b/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-table-item.tsx index efc596b8..ae40693b 100644 --- a/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-table-item.tsx +++ b/src/app/components/proof-of-reserve/components/merchant-table/components/merchant-table-item.tsx @@ -16,12 +16,12 @@ import { Merchant } from '@models/merchant'; interface MerchantTableItemProps { merchant: Merchant; - dlcBTCAmount: number | undefined; + iBTCAmount: number | undefined; } export function MerchantTableItem({ merchant, - dlcBTCAmount, + iBTCAmount, }: MerchantTableItemProps): React.ReactElement { const navigate = useNavigate(); @@ -42,8 +42,8 @@ export function MerchantTableItem({ {merchant.name} - {'dlcBTC - + {'iBTC + - {Number(dlcBTCAmount?.toFixed(4))} + {Number(iBTCAmount?.toFixed(4))} diff --git a/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx b/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx index 3cfbbd52..f986380f 100644 --- a/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx +++ b/src/app/components/proof-of-reserve/components/merchant-table/merchant-table.tsx @@ -23,12 +23,12 @@ export function MerchantTable({ items }: MerchantTableProps): React.JSX.Element > Merchant - dlcBTC Minted + iBTC Minted {items - ?.sort((a, b) => b.dlcBTCAmount - a.dlcBTCAmount) + ?.sort((a, b) => b.iBTCAmount - a.iBTCAmount) .map(item => )} diff --git a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx index e74da9b4..1679a92f 100644 --- a/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx +++ b/src/app/components/proof-of-reserve/components/token-stats-board/components/token-stats-board-token.tsx @@ -12,7 +12,7 @@ export function TokenStatsBoardToken({ }: TokenStatsBoardTokenProps): React.JSX.Element { let tokenSuffix: string; switch (token.name) { - case 'dlcBTC': + case 'iBTC': tokenSuffix = 'Minted'; break; default: diff --git a/src/app/components/proof-of-reserve/proof-of-reserve.tsx b/src/app/components/proof-of-reserve/proof-of-reserve.tsx index 3a1f2a0b..c3ef8299 100644 --- a/src/app/components/proof-of-reserve/proof-of-reserve.tsx +++ b/src/app/components/proof-of-reserve/proof-of-reserve.tsx @@ -3,7 +3,7 @@ import { useContext } from 'react'; import { Divider, Stack, Text, useBreakpointValue } from '@chakra-ui/react'; import { ProtocolHistoryTable } from '@components/protocol-history-table/protocol-history-table'; import { Merchant } from '@models/merchant'; -import { bitcoin, dlcBTC } from '@models/token'; +import { bitcoin, iBTC } from '@models/token'; import { ProofOfReserveContext } from '@providers/proof-of-reserve-context-provider'; import { titleTextSize } from '@shared/utils'; @@ -23,7 +23,7 @@ export function ProofOfReserve(): React.JSX.Element { appConfiguration.merchants.map((merchant: Merchant) => { return { merchant, - dlcBTCAmount: undefined, + iBTCBalance: undefined, }; }), ]; @@ -50,7 +50,7 @@ export function ProofOfReserve(): React.JSX.Element { height={isMobile ? '1px' : '75px'} variant={'thick'} /> - + - {'dlcBTC + {'iBTC - {unshiftValue(dlcBTCAmount)} + {unshiftValue(iBTCAmount)} @@ -60,9 +60,9 @@ export function ProtocolHistoryTableItem( ) : ( <> - {'dlcBTC + {'iBTC - {unshiftValue(dlcBTCAmount)} + {unshiftValue(iBTCAmount)} @@ -96,9 +96,9 @@ export function ProtocolHistoryTableItem( )} {/* - {'dlcBTC + {'iBTCAmount - {unshiftValue(dlcBTCAmount)} + {unshiftValue(iBTCAmount)} diff --git a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.input.tsx b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.input.tsx index 42194f64..9ef3c6ee 100644 --- a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.input.tsx +++ b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.input.tsx @@ -12,9 +12,9 @@ const bitcoinFormProperties = { color: 'orange.01', }; const tokenFormProperties = { - label: 'Burn dlcBTC', - logo: '/images/logos/dlc-btc-logo.svg', - symbol: 'dlcBTC', + label: 'Burn iBTC', + logo: '/images/logos/ibtc-logo.svg', + symbol: 'iBTC', color: 'purple.01', }; diff --git a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.progress-stack/components/transaction-screen.transaction-form.progress-stack.tsx b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.progress-stack/components/transaction-screen.transaction-form.progress-stack.tsx index 358574bf..b589127d 100644 --- a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.progress-stack/components/transaction-screen.transaction-form.progress-stack.tsx +++ b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/components/transaction-screen.transaction-form.progress-stack/components/transaction-screen.transaction-form.progress-stack.tsx @@ -14,10 +14,10 @@ interface ProgressStackItemProps { const componentsMap = { mint: { A: { label: 'Deposit', assetLogo: '/images/logos/bitcoin-logo.svg', assetSymbol: 'BTC' }, - B: { label: 'Mint', assetLogo: '/images/logos/dlc-btc-logo.svg', assetSymbol: 'dlcBTC' }, + B: { label: 'Mint', assetLogo: '/images/logos/ibtc-logo.svg', assetSymbol: 'iBTC' }, }, burn: { - A: { label: 'Burn', assetLogo: '/images/logos/dlc-btc-logo.svg', assetSymbol: 'dlcBTC' }, + A: { label: 'Burn', assetLogo: '/images/logos/ibtc-logo.svg', assetSymbol: 'iBTC' }, B: { label: 'Withdraw', assetLogo: '/images/logos/bitcoin-logo.svg', assetSymbol: 'BTC' }, }, }; diff --git a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/transaction-screen.transaction-form.tsx b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/transaction-screen.transaction-form.tsx index 0c8b0f63..f5a4a71f 100644 --- a/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/transaction-screen.transaction-form.tsx +++ b/src/app/components/transaction-screen/transaction-screen.transaction-form/components/transaction-screen.transaction-form/transaction-screen.transaction-form.tsx @@ -38,9 +38,9 @@ function validateBurnAmount(value: number, valueMinted: number): string | undefi let error; if (!value) { - error = 'Please enter a valid amount of dlcBTC'; + error = 'Please enter a valid amount of iBTC'; } else if (valueMinted && value > valueMinted) { - error = `You can't burn more than ${valueMinted} dlcBTC`; + error = `You can't burn more than ${valueMinted} iBTC`; } return error; } diff --git a/src/app/components/vault/components/vault.detaills/components/vault.details.button-group/vault.details.button-group.tsx b/src/app/components/vault/components/vault.detaills/components/vault.details.button-group/vault.details.button-group.tsx index 7d63307b..cd1ac9ed 100644 --- a/src/app/components/vault/components/vault.detaills/components/vault.details.button-group/vault.details.button-group.tsx +++ b/src/app/components/vault/components/vault.detaills/components/vault.details.button-group/vault.details.button-group.tsx @@ -38,7 +38,7 @@ export function VaultExpandedInformationButtonGroup({ diff --git a/src/app/components/vault/components/vault.main-stack/components/vault.main-stack.asset-information-stack/vault.main-stack.asset-information-stack.tsx b/src/app/components/vault/components/vault.main-stack/components/vault.main-stack.asset-information-stack/vault.main-stack.asset-information-stack.tsx index 813f466a..2b7a0aa5 100644 --- a/src/app/components/vault/components/vault.main-stack/components/vault.main-stack.asset-information-stack/vault.main-stack.asset-information-stack.tsx +++ b/src/app/components/vault/components/vault.main-stack/components/vault.main-stack.asset-information-stack/vault.main-stack.asset-information-stack.tsx @@ -13,9 +13,9 @@ export function VaultAssetInformationStack({ return ( await addToken()} > - {'dlcBTC'} + {iBTC.logoAlt} {' '} Add Token to Wallet diff --git a/src/app/hooks/use-add-token.ts b/src/app/hooks/use-add-token.ts index 7f5741d4..0b0da83f 100644 --- a/src/app/hooks/use-add-token.ts +++ b/src/app/hooks/use-add-token.ts @@ -19,7 +19,7 @@ export function useAddToken(): () => Promise { await walletClient.watchAsset({ type: 'ERC20', options: { - address: ethereumNetworkConfiguration.dlcBTCContract.address, + address: ethereumNetworkConfiguration.iBTCContract.address, symbol: 'IBTC', decimals: 8, image: 'https://dlc-public-assets.s3.amazonaws.com/dlcBTC_Token.png', diff --git a/src/app/hooks/use-deposit-limits.ts b/src/app/hooks/use-deposit-limits.ts index 4e278c71..4595c8b1 100644 --- a/src/app/hooks/use-deposit-limits.ts +++ b/src/app/hooks/use-deposit-limits.ts @@ -52,7 +52,7 @@ export function useDepositLimits(): UseDepositLimitsReturnType { } const { data: evmDepositLimit } = useQuery({ - queryKey: ['evmDepositLimit', ethereumNetworkConfiguration.dlcBTCContract.address], + queryKey: ['evmDepositLimit', ethereumNetworkConfiguration.iBTCContract.address], queryFn: fetchEVMDepositLimit, enabled: !!ethereumNetworkConfiguration, }); diff --git a/src/app/hooks/use-proof-of-reserve.ts b/src/app/hooks/use-proof-of-reserve.ts index 0bfccaf2..49812383 100644 --- a/src/app/hooks/use-proof-of-reserve.ts +++ b/src/app/hooks/use-proof-of-reserve.ts @@ -51,7 +51,7 @@ export function useProofOfReserve(): UseProofOfReserveReturnType { ); return { merchant, - dlcBTCAmount: unshiftValue(proofOfReserve), + iBTCAmount: unshiftValue(proofOfReserve), }; }); @@ -66,7 +66,7 @@ export function useProofOfReserve(): UseProofOfReserveReturnType { appConfiguration.merchants.map((merchant: Merchant) => { return { merchant, - dlcBTCAmount: undefined, + iBTCAmount: undefined, }; }), ], diff --git a/src/app/providers/balance-context-provider.tsx b/src/app/providers/balance-context-provider.tsx index 0cc1722f..00294e2d 100644 --- a/src/app/providers/balance-context-provider.tsx +++ b/src/app/providers/balance-context-provider.tsx @@ -17,18 +17,18 @@ import { NetworkConnectionContext } from './network-connection.provider'; import { XRPWalletContext } from './xrp-wallet-context-provider'; interface VaultContextType { - dlcBTCBalance: number | undefined; + iBTCBalance: number | undefined; lockedBTCBalance: number | undefined; } export const BalanceContext = createContext({ - dlcBTCBalance: undefined, + iBTCBalance: undefined, lockedBTCBalance: undefined, }); export function BalanceContextProvider({ children }: HasChildren): React.JSX.Element { const { - ethereumNetworkConfiguration: { dlcBTCContract, dlcManagerContract }, + ethereumNetworkConfiguration: { iBTCContract, dlcManagerContract }, } = useContext(EthereumNetworkConfigurationContext); const { networkType } = useContext(NetworkConfigurationContext); const { isConnected } = useContext(NetworkConnectionContext); @@ -38,19 +38,19 @@ export function BalanceContextProvider({ children }: HasChildren): React.JSX.Ele const { address: ethereumUserAddress } = useAccount(); const fetchEVMBalances = async () => { - const dlcBTCBalance = await getAddressDLCBTCBalance(dlcBTCContract, ethereumUserAddress!); + const iBTCBalance = await getAddressDLCBTCBalance(iBTCContract, ethereumUserAddress!); const lockedBTCBalance = await getLockedBTCBalance( await getAllAddressVaults(dlcManagerContract, ethereumUserAddress!) ); - return { dlcBTCBalance, lockedBTCBalance }; + return { iBTCBalance, lockedBTCBalance }; }; const fetchXRPLBalances = async () => { - const dlcBTCBalance = await xrpHandler?.getDLCBTCBalance(); + const iBTCBalance = await xrpHandler?.getDLCBTCBalance(); const lockedBTCBalance = await xrpHandler?.getLockedBTCBalance(); - return { dlcBTCBalance, lockedBTCBalance }; + return { iBTCBalance, lockedBTCBalance }; }; const { data } = useQuery({ @@ -62,7 +62,7 @@ export function BalanceContextProvider({ children }: HasChildren): React.JSX.Ele return ( {children} diff --git a/src/app/providers/ethereum-network-configuration.provider.tsx b/src/app/providers/ethereum-network-configuration.provider.tsx index 86ad0330..3cbb64d5 100644 --- a/src/app/providers/ethereum-network-configuration.provider.tsx +++ b/src/app/providers/ethereum-network-configuration.provider.tsx @@ -54,10 +54,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', appConfiguration.l1Websocket ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(mainnet), mainnet, - 'DLCBTC', + 'IBTC', appConfiguration.l1Websocket ), chain: mainnet, @@ -75,10 +75,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', appConfiguration.l1Websocket ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(sepolia), sepolia, - 'DLCBTC', + 'IBTC', appConfiguration.l1Websocket ), chain: sepolia, @@ -96,10 +96,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', appConfiguration.baseWebsocket ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(base), base, - 'DLCBTC', + 'IBTC', appConfiguration.baseWebsocket ), chain: base, @@ -117,10 +117,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', baseSepolia.rpcUrls.default.http[0] ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(baseSepolia), baseSepolia, - 'DLCBTC', + 'IBTC', baseSepolia.rpcUrls.default.http[0] ), chain: baseSepolia, @@ -138,10 +138,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', appConfiguration.arbitrumWebsocket ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(arbitrum), arbitrum, - 'DLCBTC', + 'IBTC', appConfiguration.arbitrumWebsocket ), chain: arbitrum, @@ -159,10 +159,10 @@ function getEthereumNetworkConfiguration( 'DLCManager', appConfiguration.arbitrumWebsocket ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(arbitrumSepolia), arbitrumSepolia, - 'DLCBTC', + 'IBTC', appConfiguration.arbitrumWebsocket ), chain: arbitrumSepolia, @@ -179,10 +179,10 @@ function getEthereumNetworkConfiguration( hardhat, 'DLCManager' ), - dlcBTCContract: getEthereumContractWithProvider( + iBTCContract: getEthereumContractWithProvider( getEthereumNetworkDeploymentPlans(hardhat), hardhat, - 'DLCBTC' + 'IBTC' ), chain: hardhat, }; diff --git a/src/shared/examples/example-attestor-select-table-items.ts b/src/shared/examples/example-attestor-select-table-items.ts index baac68ee..1ba44213 100644 --- a/src/shared/examples/example-attestor-select-table-items.ts +++ b/src/shared/examples/example-attestor-select-table-items.ts @@ -4,7 +4,7 @@ export const exampleAttestorSelectTableItems = [ time: '8 hours ago', action: 'Update Vote State', programs: 'TS', - value: '0.8059 dlcBTC', + value: '0.8059 iBTC', token: 'N/A', }, { @@ -12,7 +12,7 @@ export const exampleAttestorSelectTableItems = [ time: '1 hours ago', action: 'Create Proposal', programs: 'VP', - value: '0.8415 dlcBTC', + value: '0.8415 iBTC', token: 'N/A', }, { @@ -20,7 +20,7 @@ export const exampleAttestorSelectTableItems = [ time: '11 hours ago', action: 'Execute Transaction', programs: 'DL', - value: '0.5634 dlcBTC', + value: '0.5634 iBTC', token: 'N/A', }, { @@ -28,7 +28,7 @@ export const exampleAttestorSelectTableItems = [ time: '13 hours ago', action: 'Create Proposal', programs: 'DL2', - value: '0.6588 dlcBTC', + value: '0.6588 iBTC', token: 'N/A', }, { @@ -36,7 +36,7 @@ export const exampleAttestorSelectTableItems = [ time: '3 hours ago', action: 'Update Vote State', programs: 'VP', - value: '0.4762 dlcBTC', + value: '0.4762 iBTC', token: 'N/A', }, { @@ -44,7 +44,7 @@ export const exampleAttestorSelectTableItems = [ time: '18 hours ago', action: 'Create Proposal', programs: 'TS', - value: '0.1499 dlcBTC', + value: '0.1499 iBTC', token: 'N/A', }, { @@ -52,7 +52,7 @@ export const exampleAttestorSelectTableItems = [ time: '7 hours ago', action: 'Update Vote State', programs: 'DL2', - value: '0.5255 dlcBTC', + value: '0.5255 iBTC', token: 'N/A', }, { @@ -60,7 +60,7 @@ export const exampleAttestorSelectTableItems = [ time: '6 hours ago', action: 'Create Proposal', programs: 'TS', - value: '0.9675 dlcBTC', + value: '0.9675 iBTC', token: 'N/A', }, ]; diff --git a/src/shared/models/ethereum-models.ts b/src/shared/models/ethereum-models.ts index 4c72a60f..d4e0b0da 100644 --- a/src/shared/models/ethereum-models.ts +++ b/src/shared/models/ethereum-models.ts @@ -17,7 +17,7 @@ export interface EthereumNetworkConfiguration { | 'evm-hardhat-eth'; enabledEthereumNetworks: EthereumNetwork[]; dlcManagerContract: Contract; - dlcBTCContract: Contract; + iBTCContract: Contract; chain: Chain; } @@ -33,7 +33,7 @@ export interface DetailedEvent { } export interface FormattedEvent { merchant: string; - dlcBTCAmount: number; + iBTCAmount: number; txHash: string; date: string; chain: string; diff --git a/src/shared/models/merchant.ts b/src/shared/models/merchant.ts index 8e4d4dfc..d0982fb7 100644 --- a/src/shared/models/merchant.ts +++ b/src/shared/models/merchant.ts @@ -6,5 +6,5 @@ export interface Merchant { export interface MerchantProofOfReserve { merchant: Merchant; - dlcBTCAmount: number | undefined; + iBTCAmount: number | undefined; } diff --git a/src/shared/models/token.ts b/src/shared/models/token.ts index ef793425..31cb5722 100644 --- a/src/shared/models/token.ts +++ b/src/shared/models/token.ts @@ -4,10 +4,10 @@ export interface Token { logoAlt: string; } -export const dlcBTC: Token = { - name: 'dlcBTC', - logo: '/images/logos/dlc-btc-logo.svg', - logoAlt: 'dlcBTC Logo', +export const iBTC: Token = { + name: 'iBTC', + logo: '/images/logos/ibtc-logo.svg', + logoAlt: 'iBTC Logo', }; export const bitcoin: Token = { diff --git a/src/shared/utils.ts b/src/shared/utils.ts index 91f22573..e7f52334 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -39,7 +39,7 @@ export function formatEvent(event: DetailedEvent): FormattedEvent { const isMint = event.eventType === 'mint'; const date = new Date(event.timestamp * 1000); return { - dlcBTCAmount: isMint ? event.value : -event.value, + iBTCAmount: isMint ? event.value : -event.value, merchant: isMint ? event.to : event.from, txHash: event.txHash, date: date diff --git a/vite.config.ts b/vite.config.ts index 052bfd72..4070689d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -20,7 +20,7 @@ async function fetchEthereumDeploymentPlans( network => network.id === ethereumNetworkID ); - const networkDeploymentPlans = await Promise.all(['DLCManager', 'DLCBTC'].map(async (contractName) => { + const networkDeploymentPlans = await Promise.all(['DLCManager', 'IBTC'].map(async (contractName) => { let deploymentPlanURL: string; switch (appEnvironment) { case 'mainnet':