diff --git a/dapp/.env b/dapp/.env
index 60e4f4a3b..fee5456ea 100644
--- a/dapp/.env
+++ b/dapp/.env
@@ -17,8 +17,6 @@ VITE_ACRE_API_ENDPOINT="http://localhost:8788/api/v1/"
 VITE_GELATO_RELAY_API_KEY="htaJCy_XHj8WsE3w53WBMurfySDtjLP_TrNPPa6IPIc_"  # this key should not be used on production
 # Get the API key from: https://thegraph.com/studio/apikeys/.
 VITE_SUBGRAPH_API_KEY=""
-# Get the API key from: 1Password.
-VITE_MEZO_PORTAL_API_KEY=""
 
 # Feature flags
 VITE_FEATURE_FLAG_GAMIFICATION_ENABLED="false"
@@ -28,4 +26,5 @@ VITE_FEATURE_FLAG_XVERSE_WALLET_ENABLED="false"
 VITE_FEATURE_FLAG_BEEHIVE_COMPONENT_ENABLED="false"
 VITE_FEATURE_FLAG_ACRE_POINTS_ENABLED="true"
 VITE_FEATURE_FLAG_TVL_ENABLED="false"
+VITE_FEATURE_GATING_DAPP_ENABLED="true"
 
diff --git a/dapp/manifests/ledger-live/ledger-live-manifest-development.json b/dapp/manifests/ledger-live/ledger-live-manifest-development.json
index ed33cbad1..fbea240e6 100644
--- a/dapp/manifests/ledger-live/ledger-live-manifest-development.json
+++ b/dapp/manifests/ledger-live/ledger-live-manifest-development.json
@@ -21,10 +21,6 @@
   "permissions": [
     "account.request",
     "account.list",
-    "message.sign",
-    "transaction.sign",
-    "transaction.signAndBroadcast",
-    "bitcoin.getXPub",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
     "custom.acre.messageSign",
diff --git a/dapp/manifests/ledger-live/ledger-live-manifest-mainnet.json b/dapp/manifests/ledger-live/ledger-live-manifest-mainnet.json
index 3a586a89a..24573e028 100644
--- a/dapp/manifests/ledger-live/ledger-live-manifest-mainnet.json
+++ b/dapp/manifests/ledger-live/ledger-live-manifest-mainnet.json
@@ -21,10 +21,6 @@
   "permissions": [
     "account.request",
     "account.list",
-    "message.sign",
-    "transaction.sign",
-    "transaction.signAndBroadcast",
-    "bitcoin.getXPub",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
     "custom.acre.messageSign",
diff --git a/dapp/manifests/ledger-live/ledger-live-manifest-testnet.json b/dapp/manifests/ledger-live/ledger-live-manifest-testnet.json
index b6ac1c015..f9ab0c798 100644
--- a/dapp/manifests/ledger-live/ledger-live-manifest-testnet.json
+++ b/dapp/manifests/ledger-live/ledger-live-manifest-testnet.json
@@ -1,9 +1,9 @@
 {
   "id": "acre-testnet",
   "name": "Acre [testnet]",
-  "url": "https://ledger-live-updates--acre-dapp-testnet.netlify.app/?embed=ledger-live",
+  "url": "https://stake.test.acre.fi/?embed=ledger-live",
   "homepageUrl": "https:/acre.fi/",
-  "icon": "https://ledger-live-updates--acre-dapp-testnet.netlify.app/acre.svg",
+  "icon": "https://stake.test.acre.fi/acre.svg",
   "platforms": "desktop",
   "apiVersion": "^2.0.0",
   "manifestVersion": "2",
@@ -21,10 +21,6 @@
   "permissions": [
     "account.request",
     "account.list",
-    "message.sign",
-    "transaction.sign",
-    "transaction.signAndBroadcast",
-    "bitcoin.getXPub",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
     "custom.acre.messageSign",
diff --git a/dapp/manifests/ledger-live/ledger-manifest-template.json b/dapp/manifests/ledger-live/ledger-manifest-template.json
index 238522b0b..08fd0883b 100644
--- a/dapp/manifests/ledger-live/ledger-manifest-template.json
+++ b/dapp/manifests/ledger-live/ledger-manifest-template.json
@@ -21,10 +21,6 @@
   "permissions": [
     "account.request",
     "account.list",
-    "message.sign",
-    "transaction.sign",
-    "transaction.signAndBroadcast",
-    "bitcoin.getXPub",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
     "custom.acre.messageSign",
diff --git a/dapp/package.json b/dapp/package.json
index 56137239a..eca779a1e 100644
--- a/dapp/package.json
+++ b/dapp/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "scripts": {
     "start": "vite",
-    "build": "tsc && vite build",
+    "build": "NODE_OPTIONS=--max-old-space-size=8192 vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
     "format": "npm run lint:js && npm run lint:config",
@@ -13,7 +13,7 @@
     "lint:js:fix": "eslint . --fix",
     "lint:config": "prettier -c '**/*.@(json|yaml|toml)'",
     "lint:config:fix": "prettier -w '**/*.@(json|yaml|toml)'",
-    "test": "vitest",
+    "test": "vitest --reporter=verbose",
     "generate:manifests": "for env in development testnet mainnet; do mustache config/$env.json ./manifests/ledger-live/ledger-manifest-template.json > ./manifests/ledger-live/ledger-live-manifest-$env.json; done"
   },
   "dependencies": {
@@ -21,19 +21,20 @@
     "@chakra-ui/react": "^2.8.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@orangekit/react": "1.0.0-beta.32",
-    "@orangekit/sign-in-with-wallet": "1.0.0-beta.6",
-    "@ledgerhq/wallet-api-client": "1.6.0",
     "@ledgerhq/wallet-api-acre-module": "0.1.0-nightly.0",
+    "@ledgerhq/wallet-api-client": "1.6.0",
+    "@orangekit/react": "1.0.0-beta.33",
+    "@orangekit/sign-in-with-wallet": "1.0.0-beta.6",
     "@reduxjs/toolkit": "^2.2.0",
     "@rehooks/local-storage": "^2.4.5",
     "@safe-global/safe-core-sdk-types": "^5.0.1",
-    "@sentry/react": "^7.98.0",
-    "@sentry/types": "^7.102.0",
+    "@sentry/react": "^8.34.0",
+    "@sentry/types": "^8.34.0",
     "@tabler/icons-react": "^3.1.0",
     "@tanstack/react-query": "^5.40.1",
     "@tanstack/react-query-devtools": "^5.49.2",
     "axios": "^1.6.7",
+    "bignumber.js": "^9.1.2",
     "ethers": "^6.10.0",
     "formik": "^2.4.5",
     "framer-motion": "^10.16.5",
@@ -48,6 +49,7 @@
     "wagmi": "^2.9.11"
   },
   "devDependencies": {
+    "@sentry/vite-plugin": "^2.22.5",
     "@thesis-co/eslint-config": "github:thesis/eslint-config#7b9bc8c",
     "@types/react": "^18.2.38",
     "@types/react-dom": "^18.2.17",
diff --git a/dapp/src/acre-react/contexts/AcreSdkContext.tsx b/dapp/src/acre-react/contexts/AcreSdkContext.tsx
index 3cf8e1fce..914d01fa6 100644
--- a/dapp/src/acre-react/contexts/AcreSdkContext.tsx
+++ b/dapp/src/acre-react/contexts/AcreSdkContext.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useMemo, useState } from "react"
-import { Acre } from "@acre-btc/sdk"
-import { BitcoinProvider } from "@acre-btc/sdk/dist/src/lib/bitcoin/providers"
+import { Acre, AcreBitcoinProvider } from "@acre-btc/sdk"
 import { BITCOIN_NETWORK, env } from "#/constants"
 
 const { TBTC_API_ENDPOINT, SUBGRAPH_API_KEY } = env
@@ -9,7 +8,7 @@ const GELATO_API_KEY = env.GELATO_RELAY_API_KEY
 
 type AcreSdkContextValue = {
   acre?: Acre
-  init: (bitcoinProvider?: BitcoinProvider) => Promise<void>
+  init: (bitcoinProvider?: AcreBitcoinProvider) => Promise<void>
   isInitialized: boolean
   isConnected: boolean
 }
@@ -27,7 +26,7 @@ export function AcreSdkProvider({ children }: { children: React.ReactNode }) {
   const [isConnected, setIsConnected] = useState(false)
 
   const init = useCallback<AcreSdkContextValue["init"]>(
-    async (bitcoinProvider?: BitcoinProvider) => {
+    async (bitcoinProvider?: AcreBitcoinProvider) => {
       let sdk = await Acre.initialize(
         BITCOIN_NETWORK,
         TBTC_API_ENDPOINT,
diff --git a/dapp/src/components/Footer.tsx b/dapp/src/components/Footer.tsx
new file mode 100644
index 000000000..7a907a5c5
--- /dev/null
+++ b/dapp/src/components/Footer.tsx
@@ -0,0 +1,88 @@
+import React from "react"
+import {
+  Box,
+  useMultiStyleConfig,
+  List,
+  ListItem,
+  LinkProps,
+  Link,
+  Button,
+  Icon,
+} from "@chakra-ui/react"
+import { EXTERNAL_HREF } from "#/constants"
+import { AcreSignIcon, ArrowUpRight } from "#/assets/icons"
+
+type FooterListItem = Pick<LinkProps, "href" | "children">
+
+const NAVIGATION: FooterListItem[] = [
+  {
+    children: "Acre.fi",
+    href: EXTERNAL_HREF.WEBSITE,
+  },
+  {
+    children: "Docs",
+    href: EXTERNAL_HREF.DOCS,
+  },
+  {
+    children: "FAQ",
+    href: EXTERNAL_HREF.FAQ,
+  },
+  {
+    children: "Blog",
+    href: EXTERNAL_HREF.BLOG,
+  },
+  {
+    children: "Discord",
+    href: EXTERNAL_HREF.DISCORD,
+  },
+  {
+    children: "X",
+    href: EXTERNAL_HREF.X,
+  },
+]
+
+const DOCUMENTS: FooterListItem[] = [
+  {
+    children: "Privacy Policy",
+    href: EXTERNAL_HREF.PRIVACY_POLICY,
+  },
+  {
+    children: "Terms of Use",
+    href: EXTERNAL_HREF.TERMS_OF_USE,
+  },
+]
+
+const getItemsList = (
+  items: FooterListItem[],
+  styles: ReturnType<typeof useMultiStyleConfig>,
+) => (
+  <List __css={styles.list}>
+    {items.map((link) => (
+      <ListItem key={link.href}>
+        <Button
+          as={Link}
+          __css={styles.link}
+          iconSpacing={0}
+          rightIcon={<Icon as={ArrowUpRight} />}
+          {...link}
+          isExternal
+        />
+      </ListItem>
+    ))}
+  </List>
+)
+
+export default function Footer() {
+  const styles = useMultiStyleConfig("Footer")
+
+  return (
+    <Box as="footer" __css={styles.container}>
+      <Box __css={styles.wrapper}>
+        <AcreSignIcon __css={styles.logo} />
+
+        {getItemsList(NAVIGATION, styles)}
+        {getItemsList(DOCUMENTS, styles)}
+      </Box>
+    </Box>
+  )
+}
diff --git a/dapp/src/components/GateModal.tsx b/dapp/src/components/GateModal.tsx
new file mode 100644
index 000000000..34a79a2ee
--- /dev/null
+++ b/dapp/src/components/GateModal.tsx
@@ -0,0 +1,49 @@
+import React, { useCallback } from "react"
+import { Link, ModalBody, ModalFooter, ModalHeader } from "@chakra-ui/react"
+import { TextSm } from "#/components/shared/Typography"
+import { EXTERNAL_HREF } from "#/constants"
+import { BaseModalProps } from "#/types"
+import { useAccessCode } from "#/hooks"
+import withBaseModal from "./ModalRoot/withBaseModal"
+import PasswordForm from "./shared/PasswordForm"
+import { PasswordFormValues } from "./shared/PasswordForm/PasswordFormBase"
+
+export function GateModalBase({ closeModal }: BaseModalProps) {
+  const { saveAccessCode } = useAccessCode()
+
+  const onSubmitForm = useCallback(
+    (values: PasswordFormValues) => {
+      const { password } = values
+      if (!password) return
+
+      closeModal()
+      saveAccessCode(password)
+    },
+    [closeModal, saveAccessCode],
+  )
+
+  return (
+    <>
+      <ModalHeader>Enter password</ModalHeader>
+      <ModalBody>
+        <PasswordForm submitButtonText="Connect" onSubmitForm={onSubmitForm} />
+      </ModalBody>
+      <ModalFooter pt={0}>
+        <TextSm>
+          Don’t have a password? Contact us on{" "}
+          <Link
+            fontWeight="bold"
+            textDecoration="underline"
+            href={EXTERNAL_HREF.DISCORD}
+            isExternal
+          >
+            Discord
+          </Link>
+        </TextSm>
+      </ModalFooter>
+    </>
+  )
+}
+
+const GateModal = withBaseModal(GateModalBase, { closeOnEsc: false })
+export default GateModal
diff --git a/dapp/src/components/Header/Navigation/Navigation.tsx b/dapp/src/components/Header/Navigation/Navigation.tsx
deleted file mode 100644
index f2626dd67..000000000
--- a/dapp/src/components/Header/Navigation/Navigation.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from "react"
-import { Box, BoxProps, HStack, List } from "@chakra-ui/react"
-import { EXTERNAL_HREF } from "#/constants"
-import { routerPath } from "#/router/path"
-import { router } from "#/utils"
-import NavigationItem, { NavigationItemProps } from "./NavigationItem"
-
-const NAVIGATION_ITEMS: NavigationItemProps[] = [
-  { children: "Home", to: EXTERNAL_HREF.WEBSITE, isExternal: true },
-  { children: "Stake", to: routerPath.home },
-  { children: "Docs", to: EXTERNAL_HREF.DOCS, isExternal: true },
-  { children: "FAQ", to: EXTERNAL_HREF.FAQ, isExternal: true },
-  { children: "Blog", to: EXTERNAL_HREF.BLOG, isExternal: true },
-  { children: "Discord", to: EXTERNAL_HREF.DISCORD, isExternal: true },
-  { children: "X", to: EXTERNAL_HREF.X, isExternal: true },
-]
-
-function Navigation(props: BoxProps) {
-  return (
-    <Box as="nav" {...props}>
-      <HStack as={List} spacing={5} ml={12}>
-        {NAVIGATION_ITEMS.map((item) => (
-          <NavigationItem key={router.getURLPath(item.to)} {...item} />
-        ))}
-      </HStack>
-    </Box>
-  )
-}
-
-export default Navigation
diff --git a/dapp/src/components/Header/Navigation/NavigationItem.tsx b/dapp/src/components/Header/Navigation/NavigationItem.tsx
deleted file mode 100644
index 817de9ce8..000000000
--- a/dapp/src/components/Header/Navigation/NavigationItem.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from "react"
-import { ListItem, useMultiStyleConfig } from "@chakra-ui/react"
-import { To, useSearchParams } from "react-router-dom"
-import { useModal } from "#/hooks"
-import { router } from "#/utils"
-import { NavLink, NavLinkProps } from "../../shared/NavLink"
-
-export type NavigationItemProps = NavLinkProps
-
-function NavigationItem(props: NavigationItemProps) {
-  const { children, to: defaultTo, isExternal, ...restProps } = props
-  const styles = useMultiStyleConfig("Link", {
-    variant: "navigation",
-    size: "md",
-  })
-  const [searchParams] = useSearchParams()
-  const { isOpenGlobalErrorModal } = useModal()
-  const isDisabled = isOpenGlobalErrorModal
-
-  const to: To = isExternal
-    ? defaultTo
-    : {
-        pathname: router.getURLPath(defaultTo),
-        search: searchParams.toString(),
-      }
-
-  return (
-    <ListItem>
-      <NavLink
-        to={to}
-        sx={styles.container}
-        pointerEvents={isDisabled ? "none" : "auto"}
-        {...(isExternal && {
-          target: "_blank",
-        })}
-        {...restProps}
-      >
-        {children}
-      </NavLink>
-    </ListItem>
-  )
-}
-
-export default NavigationItem
diff --git a/dapp/src/components/Header/Navigation/index.ts b/dapp/src/components/Header/Navigation/index.ts
deleted file mode 100644
index 168487f66..000000000
--- a/dapp/src/components/Header/Navigation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Navigation } from "./Navigation"
diff --git a/dapp/src/components/Header/index.tsx b/dapp/src/components/Header/index.tsx
index a6c3d1524..8ac5e7ab5 100644
--- a/dapp/src/components/Header/index.tsx
+++ b/dapp/src/components/Header/index.tsx
@@ -1,33 +1,27 @@
 import React from "react"
 import { AcreLogo } from "#/assets/icons"
-import { Flex, HStack, Icon, Link } from "@chakra-ui/react"
+import { HStack, Icon, Link } from "@chakra-ui/react"
 import { EXTERNAL_HREF } from "#/constants"
-import { useMobileMode } from "#/hooks"
 import ConnectWallet from "./ConnectWallet"
-import { Navigation } from "./Navigation"
 
 export default function Header() {
-  const isMobileMode = useMobileMode()
-
   return (
     <HStack
       as="header"
       w="full"
-      mb="4.75rem" // 76px
-      justify="center"
+      maxW="120rem" // 1920px
+      mx="auto"
+      justify="space-between"
+      zIndex="header"
+      pt={12}
+      pb={{ base: 4, xl: 12 }}
+      px={{ base: 10, xl: 30 }}
     >
       <Link href={EXTERNAL_HREF.WEBSITE} isExternal>
         <Icon as={AcreLogo} w={20} h={12} />
       </Link>
 
-      {!isMobileMode && (
-        <>
-          <Navigation />
-          <Flex ml="auto">
-            <ConnectWallet />
-          </Flex>
-        </>
-      )}
+      <ConnectWallet />
     </HStack>
   )
 }
diff --git a/dapp/src/components/Layout.tsx b/dapp/src/components/Layout.tsx
index b1b8c3d52..64d4a99be 100644
--- a/dapp/src/components/Layout.tsx
+++ b/dapp/src/components/Layout.tsx
@@ -1,12 +1,13 @@
 import React from "react"
 import { Outlet } from "react-router-dom"
-import { Flex } from "@chakra-ui/react"
+import { Flex, VStack } from "@chakra-ui/react"
 import { useIsEmbed, useMobileMode } from "#/hooks"
 import DocsDrawer from "./DocsDrawer"
 import Header from "./Header"
 import ModalRoot from "./ModalRoot"
 import Sidebar from "./Sidebar"
 import MobileModeBanner from "./MobileModeBanner"
+import Footer from "./Footer"
 
 const PADDING = "2.5rem" // 40px
 const PAGE_MAX_WIDTH = {
@@ -16,29 +17,36 @@ const PAGE_MAX_WIDTH = {
 
 function Layout() {
   const isMobileMode = useMobileMode()
-  const { isEmbed } = useIsEmbed()
+  const { embeddedApp } = useIsEmbed()
 
   if (isMobileMode) return <MobileModeBanner forceOpen />
 
-  const maxWidth = isEmbed
-    ? // TODO: Select correct max-width by `embeddedApp`
-      PAGE_MAX_WIDTH["ledger-live"]
+  const maxWidth = embeddedApp
+    ? PAGE_MAX_WIDTH[embeddedApp]
     : PAGE_MAX_WIDTH.standalone
 
   return (
-    <Flex
-      flexFlow="column"
-      mx="auto"
-      p={PADDING}
-      maxWidth={`calc(${maxWidth} + 2*${PADDING})`}
-    >
+    <VStack spacing={0} minH="100vh">
       <Header />
-      <Outlet />
 
-      <Sidebar />
-      <DocsDrawer />
-      <ModalRoot />
-    </Flex>
+      <Flex
+        flexFlow="column"
+        mx="auto"
+        p={PADDING}
+        pt={0.5}
+        w="full"
+        maxWidth={`calc(${maxWidth} + 2*${PADDING})`}
+        flex={1}
+      >
+        <Outlet />
+
+        <Sidebar />
+        <DocsDrawer />
+        <ModalRoot />
+      </Flex>
+
+      <Footer />
+    </VStack>
   )
 }
 
diff --git a/dapp/src/components/LoadingModal.tsx b/dapp/src/components/LoadingModal.tsx
new file mode 100644
index 000000000..ca37a45f9
--- /dev/null
+++ b/dapp/src/components/LoadingModal.tsx
@@ -0,0 +1,26 @@
+import React from "react"
+import { ModalBody } from "@chakra-ui/react"
+import { TextMd } from "#/components/shared/Typography"
+import withBaseModal from "./ModalRoot/withBaseModal"
+import Spinner from "./shared/Spinner"
+
+export function LoadingModalBase() {
+  return (
+    <ModalBody>
+      <Spinner
+        size="2xl"
+        variant="filled"
+        borderTopColor="gold.100"
+        borderBottomColor="gold.100"
+        borderLeftColor="gold.100"
+      />
+      <TextMd fontWeight="semibold">Loading...</TextMd>
+    </ModalBody>
+  )
+}
+
+const LoadingModal = withBaseModal(LoadingModalBase, {
+  variant: "unstyled",
+  closeOnEsc: false,
+})
+export default LoadingModal
diff --git a/dapp/src/components/ModalRoot/index.tsx b/dapp/src/components/ModalRoot/index.tsx
index fdf513531..eaa028be4 100644
--- a/dapp/src/components/ModalRoot/index.tsx
+++ b/dapp/src/components/ModalRoot/index.tsx
@@ -7,6 +7,8 @@ import MezoBeehiveModal from "../MezoBeehiveModal"
 import ConnectWalletModal from "../ConnectWalletModal"
 import UnexpectedErrorModal from "../UnexpectedErrorModal"
 import AcrePointsClaimModal from "../AcrePointsClaimModal"
+import GateModal from "../GateModal"
+import LoadingModal from "../LoadingModal"
 
 const MODALS: Record<ModalType, ElementType> = {
   STAKE: TransactionModal,
@@ -16,6 +18,8 @@ const MODALS: Record<ModalType, ElementType> = {
   CONNECT_WALLET: ConnectWalletModal,
   UNEXPECTED_ERROR: UnexpectedErrorModal,
   ACRE_POINTS_CLAIM: AcrePointsClaimModal,
+  GATE: GateModal,
+  LOADING: LoadingModal,
 } as const
 
 export default function ModalRoot() {
diff --git a/dapp/src/components/ModalRoot/withBaseModal.tsx b/dapp/src/components/ModalRoot/withBaseModal.tsx
index 33619079e..5eeb2396a 100644
--- a/dapp/src/components/ModalRoot/withBaseModal.tsx
+++ b/dapp/src/components/ModalRoot/withBaseModal.tsx
@@ -32,8 +32,9 @@ function withBaseModal<T extends BaseModalProps>(
         closeOnEsc={closeOnEsc}
         {...modalProps}
       >
-        <ModalOverlay mt="header_height" />
+        <ModalOverlay zIndex="modalOverlay" />
         <ModalContent
+          zIndex="modalContent"
           mr={{
             base: isSidebarOpen ? "var(--chakra-sizes-sidebar_width)" : 0,
             xl: 0,
diff --git a/dapp/src/components/Sidebar.tsx b/dapp/src/components/Sidebar.tsx
index 5484b4470..c8be39644 100644
--- a/dapp/src/components/Sidebar.tsx
+++ b/dapp/src/components/Sidebar.tsx
@@ -67,7 +67,10 @@ export default function Sidebar() {
   return (
     <Box
       as="aside"
-      mt="header_height"
+      mt={{
+        base: "header_height",
+        xl: "header_height_xl",
+      }}
       w={isOpen ? "sidebar_width" : "0"}
       __css={styles.sidebarContainer}
       mr={isVisible ? scrollbarWidth : 0}
diff --git a/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx b/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx
new file mode 100644
index 000000000..cb076e733
--- /dev/null
+++ b/dapp/src/components/TransactionModal/ActionDurationEstimation.tsx
@@ -0,0 +1,25 @@
+import React from "react"
+import { ActivityType } from "#/types"
+import { getEstimatedDuration } from "#/utils"
+import { useFormField } from "#/hooks"
+import { TextMd } from "../shared/Typography"
+import { TOKEN_AMOUNT_FIELD_NAME } from "../shared/TokenAmountForm/TokenAmountFormBase"
+
+export default function ActionDurationEstimation({
+  type,
+}: {
+  type: ActivityType
+}) {
+  const { value: amount = 0n } = useFormField<bigint | undefined>(
+    TOKEN_AMOUNT_FIELD_NAME,
+  )
+
+  return (
+    <TextMd mt={4} color="grey.400">
+      Estimated duration&nbsp;
+      <TextMd as="span" color="grey.500">
+        ~ {getEstimatedDuration(amount, type)}
+      </TextMd>
+    </TextMd>
+  )
+}
diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx
index 84fa4419c..2307b625d 100644
--- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx
+++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/AcrePointsRewardEstimation.tsx
@@ -12,14 +12,15 @@ import {
 import { H4, TextMd } from "#/components/shared/Typography"
 import { numberToLocaleString } from "#/utils"
 import { IconChevronDown } from "@tabler/icons-react"
-import { useTokenAmountField } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
-import {
-  ONE_MONTH_IN_DAYS,
-  ONE_WEEK_IN_DAYS,
-  ONE_YEAR_IN_DAYS,
-} from "#/constants"
+import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
+import { useFormField } from "#/hooks"
+import { ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS } from "#/constants"
 
 const ACRE_POINTS_DATA = {
+  day: {
+    label: "Per day",
+    multipler: 1,
+  },
   week: {
     label: "Per week",
     multipler: ONE_WEEK_IN_DAYS,
@@ -28,15 +29,11 @@ const ACRE_POINTS_DATA = {
     label: "Per month",
     multipler: ONE_MONTH_IN_DAYS,
   },
-  year: {
-    label: "Per year",
-    multipler: ONE_YEAR_IN_DAYS,
-  },
 }
 
 function AcrePointsRewardEstimation(props: StackProps) {
   const [selectedTierItem, setSelectedTierItem] = useState(
-    ACRE_POINTS_DATA.week,
+    ACRE_POINTS_DATA.month,
   )
 
   const tierItems = [
@@ -48,7 +45,9 @@ function AcrePointsRewardEstimation(props: StackProps) {
     ),
   ]
 
-  const { value = 0n } = useTokenAmountField()
+  const { value = 0n } = useFormField<bigint | undefined>(
+    TOKEN_AMOUNT_FIELD_NAME,
+  )
   const baseReward = Number(value)
   const pointsRate = 10000
 
@@ -111,6 +110,7 @@ function AcrePointsRewardEstimation(props: StackProps) {
                     key={tierItem.label}
                     onClick={() => setSelectedTierItem(tierItem)}
                     fontWeight="semibold"
+                    whiteSpace="nowrap"
                   >
                     {tierItem.label}
                   </MenuItem>
diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx
index bc236151b..ac51f54cd 100644
--- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx
+++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx
@@ -2,14 +2,20 @@ import React from "react"
 import { List } from "@chakra-ui/react"
 import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
 import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
-import { useTokenAmountField } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
+import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
 import { FeesTooltip } from "#/components/TransactionModal/FeesTooltip"
-import { useMinDepositAmount, useTransactionDetails } from "#/hooks"
+import {
+  useFormField,
+  useMinDepositAmount,
+  useTransactionDetails,
+} from "#/hooks"
 import { CurrencyType } from "#/types"
 import { DESIRED_DECIMALS_FOR_FEE } from "#/constants"
 
 function StakeDetails({ currency }: { currency: CurrencyType }) {
-  const { value = 0n } = useTokenAmountField()
+  const { value = 0n } = useFormField<bigint | undefined>(
+    TOKEN_AMOUNT_FIELD_NAME,
+  )
   const minDepositAmount = useMinDepositAmount()
   const amount = value >= minDepositAmount ? value : 0n
   const details = useTransactionDetails(amount)
@@ -17,16 +23,6 @@ function StakeDetails({ currency }: { currency: CurrencyType }) {
 
   return (
     <List spacing={3} mt={10}>
-      <TransactionDetailsAmountItem
-        label="Amount to be deposited"
-        from={{
-          currency,
-          amount: details.amount,
-        }}
-        to={{
-          currency: "usd",
-        }}
-      />
       <FeesDetailsAmountItem
         label="Fees"
         // TODO: Add `Bitcoin Network fee` (funding transaction fee selected by
@@ -42,15 +38,13 @@ function StakeDetails({ currency }: { currency: CurrencyType }) {
           currency: "usd",
         }}
       />
+
       <TransactionDetailsAmountItem
-        label="Approximate staked tokens"
+        label="You will deposit"
         from={{
           currency,
           amount: details.estimatedAmount,
         }}
-        to={{
-          currency: "usd",
-        }}
       />
     </List>
   )
diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx
index 6233134bd..466283099 100644
--- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx
+++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/index.tsx
@@ -8,6 +8,7 @@ import { fixedPointNumberToString, getCurrencyByType } from "#/utils"
 import { featureFlags } from "#/constants"
 import StakeDetails from "./StakeDetails"
 import AcrePointsRewardEstimation from "./AcrePointsRewardEstimation"
+import ActionDurationEstimation from "../../ActionDurationEstimation"
 
 function StakeFormModal({
   onSubmitForm,
@@ -35,6 +36,7 @@ function StakeFormModal({
       )}
       <StakeDetails currency="bitcoin" />
       <FormSubmitButton mt={10}>Deposit</FormSubmitButton>
+      <ActionDurationEstimation type="deposit" />
     </TokenAmountForm>
   )
 }
diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx
index a31cd23b8..b457f1347 100644
--- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx
+++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx
@@ -1,8 +1,12 @@
 import React from "react"
 import { Flex, List } from "@chakra-ui/react"
 import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
-import { useTokenAmountField } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
-import { useMinWithdrawAmount, useTransactionDetails } from "#/hooks"
+import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
+import {
+  useFormField,
+  useMinWithdrawAmount,
+  useTransactionDetails,
+} from "#/hooks"
 import { ACTION_FLOW_TYPES, CurrencyType } from "#/types"
 import { DESIRED_DECIMALS_FOR_FEE, featureFlags } from "#/constants"
 import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
@@ -16,7 +20,9 @@ function UnstakeDetails({
   balance: bigint
   currency: CurrencyType
 }) {
-  const { value = 0n } = useTokenAmountField()
+  const { value = 0n } = useFormField<bigint | undefined>(
+    TOKEN_AMOUNT_FIELD_NAME,
+  )
   const minWithdrawAmount = useMinWithdrawAmount()
   const amount = value >= minWithdrawAmount ? value : 0n
   const details = useTransactionDetails(amount, ACTION_FLOW_TYPES.UNSTAKE)
@@ -24,22 +30,11 @@ function UnstakeDetails({
   const { total, ...restFees } = details.transactionFee
 
   return (
-    <Flex flexDirection="column" gap={10} mt={4}>
+    <Flex flexDirection="column" gap={10} mt={10}>
       {featureFlags.GAMIFICATION_ENABLED && (
         <WithdrawWarning balance={balance} currency={currency} />
       )}
       <List spacing={3}>
-        <TransactionDetailsAmountItem
-          label="Withdraw from pool"
-          from={{
-            currency,
-            amount: details.amount,
-          }}
-          to={{
-            currency: "usd",
-          }}
-        />
-
         <FeesDetailsAmountItem
           label="Fees"
           // TODO: Add `Bitcoin Network fee` (funding transaction fee selected by
@@ -61,9 +56,6 @@ function UnstakeDetails({
             currency,
             amount: details.estimatedAmount,
           }}
-          to={{
-            currency: "usd",
-          }}
         />
       </List>
     </Flex>
diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/WithdrawWarning.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/WithdrawWarning.tsx
index cea012ac0..fb835df86 100644
--- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/WithdrawWarning.tsx
+++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/WithdrawWarning.tsx
@@ -4,8 +4,9 @@ import { CurrencyType } from "#/types"
 import { MINIMUM_BALANCE } from "#/constants"
 import { formatSatoshiAmount, getCurrencyByType } from "#/utils"
 import { TextMd } from "#/components/shared/Typography"
-import { useTokenAmountField } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
+import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
 import { Alert, AlertTitle, AlertIcon } from "#/components/shared/Alert"
+import { useFormField } from "#/hooks"
 
 function WithdrawWarning({
   balance,
@@ -14,7 +15,9 @@ function WithdrawWarning({
   balance: bigint
   currency: CurrencyType
 }) {
-  const { value, isValid } = useTokenAmountField()
+  const { value, isValid } = useFormField<bigint | undefined>(
+    TOKEN_AMOUNT_FIELD_NAME,
+  )
   const amount = value ?? 0n
 
   const { symbol } = getCurrencyByType(currency)
diff --git a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx
index 6aad91f7f..afab79189 100644
--- a/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx
+++ b/dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/index.tsx
@@ -10,6 +10,7 @@ import {
 } from "#/hooks"
 import { fixedPointNumberToString, getCurrencyByType } from "#/utils"
 import UnstakeDetails from "./UnstakeDetails"
+import ActionDurationEstimation from "../../ActionDurationEstimation"
 
 function UnstakeFormModal({
   onSubmitForm,
@@ -22,6 +23,8 @@ function UnstakeFormModal({
   const { decimals } = getCurrencyByType("bitcoin")
   const inputPlaceholder = `Minimum ${fixedPointNumberToString(minTokenAmount, decimals)} BTC`
   const tokenAmountLabel = "Acre balance"
+  const defaultAmount =
+    status === PROCESS_STATUSES.REFINE_AMOUNT ? balance : undefined
 
   return (
     <TokenAmountForm
@@ -33,12 +36,11 @@ function UnstakeFormModal({
       minTokenAmount={minTokenAmount}
       onSubmitForm={onSubmitForm}
       withMaxButton
-      defaultAmount={
-        status === PROCESS_STATUSES.REFINE_AMOUNT ? balance : undefined
-      }
+      defaultAmount={defaultAmount}
     >
       <UnstakeDetails balance={balance} currency="bitcoin" />
-      <FormSubmitButton mt={10}>Withdraw</FormSubmitButton>
+      <FormSubmitButton mt={8}>Withdraw</FormSubmitButton>
+      <ActionDurationEstimation type="withdraw" />
     </TokenAmountForm>
   )
 }
diff --git a/dapp/src/components/shared/Form/FormInput.tsx b/dapp/src/components/shared/Form/FormInput.tsx
new file mode 100644
index 000000000..75e220160
--- /dev/null
+++ b/dapp/src/components/shared/Form/FormInput.tsx
@@ -0,0 +1,39 @@
+import React from "react"
+import { FormControl, FormLabel, Input, InputProps } from "@chakra-ui/react"
+import { useFormField } from "#/hooks"
+import HelperErrorText from "./HelperErrorText"
+
+export type FormInputProps = {
+  name: string
+  label?: string
+  helperText?: string | JSX.Element
+} & Omit<InputProps, "id" | "isInvalid" | "value" | "onChange">
+
+export default function FormInput({
+  name,
+  label,
+  helperText,
+  ...inputProps
+}: FormInputProps) {
+  const { field, value, errorMsgText, hasError, onChange } =
+    useFormField<string>(name)
+
+  return (
+    <FormControl isInvalid={hasError} isDisabled={inputProps.isDisabled}>
+      {label && <FormLabel htmlFor={name}>{label}</FormLabel>}
+      <Input
+        {...inputProps}
+        {...field}
+        id={name}
+        isInvalid={hasError}
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+      />
+      <HelperErrorText
+        helperText={helperText}
+        errorMsgText={errorMsgText}
+        hasError={hasError}
+      />
+    </FormControl>
+  )
+}
diff --git a/dapp/src/components/shared/Form/FormTokenBalanceInput.tsx b/dapp/src/components/shared/Form/FormTokenBalanceInput.tsx
index fc922ea8c..98107eb8b 100644
--- a/dapp/src/components/shared/Form/FormTokenBalanceInput.tsx
+++ b/dapp/src/components/shared/Form/FormTokenBalanceInput.tsx
@@ -1,44 +1,27 @@
-import React, { useCallback, useEffect } from "react"
-import { useField } from "formik"
-import { logPromiseFailure } from "#/utils"
+import React from "react"
+import { useFormField } from "#/hooks"
 import TokenBalanceInput, { TokenBalanceInputProps } from "../TokenBalanceInput"
 
 export type FormTokenBalanceInputProps = {
   name: string
-  defaultValue?: bigint
-} & Omit<TokenBalanceInputProps, "setAmount" | "defaultValue">
+} & Omit<TokenBalanceInputProps, "setAmount">
 
 export function FormTokenBalanceInput({
   name,
-  defaultValue,
   ...restProps
 }: FormTokenBalanceInputProps) {
-  const [field, meta, helpers] = useField(name)
-
-  const setAmount = useCallback(
-    (value?: bigint) => {
-      if (!meta.touched) logPromiseFailure(helpers.setTouched(true))
-      if (meta.error) helpers.setError(undefined)
-
-      logPromiseFailure(helpers.setValue(value))
-    },
-    [helpers, meta.touched, meta.error],
-  )
-
-  useEffect(() => {
-    if (defaultValue) {
-      setAmount(defaultValue)
-    }
-  }, [defaultValue, setAmount])
+  const { field, value, errorMsgText, hasError, onChange } = useFormField<
+    bigint | undefined
+  >(name)
 
   return (
     <TokenBalanceInput
       {...restProps}
       {...field}
-      amount={defaultValue ?? (meta.value as bigint)}
-      setAmount={setAmount}
-      hasError={Boolean(meta.error)}
-      errorMsgText={meta.error}
+      amount={value}
+      setAmount={onChange}
+      hasError={hasError}
+      errorMsgText={errorMsgText}
     />
   )
 }
diff --git a/dapp/src/components/shared/Form/HelperErrorText.tsx b/dapp/src/components/shared/Form/HelperErrorText.tsx
new file mode 100644
index 000000000..9440b445c
--- /dev/null
+++ b/dapp/src/components/shared/Form/HelperErrorText.tsx
@@ -0,0 +1,40 @@
+import React from "react"
+import { FormErrorMessage, FormHelperText, Icon } from "@chakra-ui/react"
+import { IconInfoCircle } from "@tabler/icons-react"
+import { Alert, AlertIcon, AlertDescription } from "../Alert"
+
+export type HelperErrorTextProps = {
+  errorMsgText?: string | JSX.Element
+  hasError?: boolean
+  helperText?: string | JSX.Element
+}
+
+export default function HelperErrorText({
+  helperText,
+  errorMsgText,
+  hasError,
+}: HelperErrorTextProps) {
+  if (hasError) {
+    return (
+      <FormErrorMessage>
+        <Alert status="error">
+          <AlertIcon status="error" />
+          <AlertDescription>
+            {errorMsgText || "Please enter a valid value"}
+          </AlertDescription>
+        </Alert>
+      </FormErrorMessage>
+    )
+  }
+
+  if (helperText) {
+    return (
+      <FormHelperText>
+        <Icon as={IconInfoCircle} />
+        {helperText}
+      </FormHelperText>
+    )
+  }
+
+  return null
+}
diff --git a/dapp/src/components/shared/PasswordForm/PasswordFormBase.tsx b/dapp/src/components/shared/PasswordForm/PasswordFormBase.tsx
new file mode 100644
index 000000000..1390bdf45
--- /dev/null
+++ b/dapp/src/components/shared/PasswordForm/PasswordFormBase.tsx
@@ -0,0 +1,30 @@
+import React from "react"
+import { FormikProps } from "formik"
+import { Form, FormSubmitButton } from "../Form"
+import FormInput from "../Form/FormInput"
+
+const PASSWORD_FIELD_NAME = "password"
+
+export type PasswordFormValues = {
+  [PASSWORD_FIELD_NAME]?: string
+}
+
+export type PasswordFormBaseProps = {
+  formId?: string
+  label?: string
+  submitButtonText: string
+}
+
+export default function PasswordFormBase({
+  formId,
+  label,
+  submitButtonText,
+  ...formikProps
+}: PasswordFormBaseProps & FormikProps<PasswordFormValues>) {
+  return (
+    <Form id={formId} onSubmit={formikProps.handleSubmit} w="100%">
+      <FormInput name={PASSWORD_FIELD_NAME} label={label} type="password" />
+      <FormSubmitButton mt={10}>{submitButtonText}</FormSubmitButton>
+    </Form>
+  )
+}
diff --git a/dapp/src/components/shared/PasswordForm/index.tsx b/dapp/src/components/shared/PasswordForm/index.tsx
new file mode 100644
index 000000000..23904bb6a
--- /dev/null
+++ b/dapp/src/components/shared/PasswordForm/index.tsx
@@ -0,0 +1,30 @@
+import { FormikErrors, withFormik } from "formik"
+import { BaseFormProps } from "#/types"
+import { getErrorsObj, validatePassword } from "#/utils"
+import PasswordFormBase, {
+  PasswordFormBaseProps,
+  PasswordFormValues,
+} from "./PasswordFormBase"
+
+type PasswordFormProps = PasswordFormBaseProps &
+  BaseFormProps<PasswordFormValues>
+
+const PasswordForm = withFormik<PasswordFormProps, PasswordFormValues>({
+  mapPropsToValues: () => ({
+    password: "",
+  }),
+  validate: async ({ password }) => {
+    const errors: FormikErrors<PasswordFormValues> = {}
+
+    errors.password = await validatePassword(password)
+
+    return getErrorsObj(errors)
+  },
+  handleSubmit: (values, { props }) => {
+    props.onSubmitForm(values)
+  },
+  validateOnBlur: false,
+  validateOnChange: false,
+})(PasswordFormBase)
+
+export default PasswordForm
diff --git a/dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx b/dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx
index f14f3f2d6..959d38ae0 100644
--- a/dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx
+++ b/dapp/src/components/shared/TokenAmountForm/TokenAmountFormBase.tsx
@@ -1,25 +1,14 @@
 import React from "react"
-import { FormikProps, useField } from "formik"
+import { FormikProps } from "formik"
 import { CurrencyType } from "#/types"
 import { Form, FormTokenBalanceInput } from "../Form"
 
-const TOKEN_AMOUNT_FIELD_NAME = "amount"
+export const TOKEN_AMOUNT_FIELD_NAME = "amount"
 
 export type TokenAmountFormValues = {
   [TOKEN_AMOUNT_FIELD_NAME]?: bigint
 }
 
-export const useTokenAmountField = () => {
-  const [, { error, touched, value }] = useField<
-    TokenAmountFormValues[typeof TOKEN_AMOUNT_FIELD_NAME]
-  >(TOKEN_AMOUNT_FIELD_NAME)
-
-  const hasError = !!error
-  const isValid = !hasError && touched && value
-
-  return { value, isValid }
-}
-
 export type TokenAmountFormBaseProps = {
   formId?: string
   tokenBalance: bigint
@@ -51,7 +40,7 @@ export default function TokenAmountFormBase({
         tokenAmountLabel={tokenAmountLabel}
         currency={currency}
         withMaxButton={withMaxButton}
-        defaultValue={defaultAmount}
+        defaultAmount={defaultAmount}
         autoFocus
       />
       {children}
diff --git a/dapp/src/components/shared/TokenAmountForm/index.tsx b/dapp/src/components/shared/TokenAmountForm/index.tsx
index a1360ed8e..b3b157fec 100644
--- a/dapp/src/components/shared/TokenAmountForm/index.tsx
+++ b/dapp/src/components/shared/TokenAmountForm/index.tsx
@@ -36,7 +36,7 @@ const TokenAmountForm = withFormik<TokenAmountFormProps, TokenAmountFormValues>(
     handleSubmit: (values, { props }) => {
       props.onSubmitForm(values)
     },
-    validateOnBlur: false,
+    validateOnBlur: true,
     validateOnChange: false,
   },
 )(TokenAmountFormBase)
diff --git a/dapp/src/components/shared/TokenBalanceInput/index.tsx b/dapp/src/components/shared/TokenBalanceInput/index.tsx
index 9a7c13b86..cd92ff160 100644
--- a/dapp/src/components/shared/TokenBalanceInput/index.tsx
+++ b/dapp/src/components/shared/TokenBalanceInput/index.tsx
@@ -1,12 +1,10 @@
-import React, { useRef, useState } from "react"
+import React, { useEffect, useRef, useState } from "react"
 import {
   Box,
   Button,
   FormControl,
-  FormErrorMessage,
   FormHelperText,
   FormLabel,
-  Icon,
   InputGroup,
   InputProps,
   InputRightElement,
@@ -19,52 +17,13 @@ import {
   userAmountToBigInt,
 } from "#/utils"
 import { CurrencyType } from "#/types"
-import { IconInfoCircle } from "@tabler/icons-react"
 import { useCurrencyConversion } from "#/hooks"
 import NumberFormatInput, {
   NumberFormatInputValues,
   NumberFormatInputProps,
 } from "../NumberFormatInput"
 import { CurrencyBalance } from "../CurrencyBalance"
-import { Alert, AlertIcon, AlertDescription } from "../Alert"
-
-const VARIANT = "balance"
-
-type HelperErrorTextProps = {
-  errorMsgText?: string | JSX.Element
-  hasError?: boolean
-  helperText?: string | JSX.Element
-}
-
-function HelperErrorText({
-  helperText,
-  errorMsgText,
-  hasError,
-}: HelperErrorTextProps) {
-  if (hasError) {
-    return (
-      <FormErrorMessage>
-        <Alert status="error">
-          <AlertIcon status="error" />
-          <AlertDescription>
-            {errorMsgText || "Please enter a valid value"}
-          </AlertDescription>
-        </Alert>
-      </FormErrorMessage>
-    )
-  }
-
-  if (helperText) {
-    return (
-      <FormHelperText>
-        <Icon as={IconInfoCircle} />
-        {helperText}
-      </FormHelperText>
-    )
-  }
-
-  return null
-}
+import HelperErrorText, { HelperErrorTextProps } from "../Form/HelperErrorText"
 
 type FiatCurrencyBalanceProps = {
   amount: bigint
@@ -102,6 +61,7 @@ function FiatCurrencyBalance({
 
 export type TokenBalanceInputProps = {
   amount?: bigint
+  defaultAmount?: bigint
   currency: CurrencyType
   tokenBalance: bigint
   placeholder?: string
@@ -110,12 +70,13 @@ export type TokenBalanceInputProps = {
   setAmount: (value?: bigint) => void
   withMaxButton?: boolean
   tokenAmountLabel?: string
-} & InputProps &
+} & Omit<InputProps, "isInvalid" | "value" | "onValueChange" | "onChange"> &
   HelperErrorTextProps &
   Pick<NumberFormatInputProps, "decimalScale">
 
 export default function TokenBalanceInput({
   amount,
+  defaultAmount,
   currency,
   tokenBalance,
   placeholder,
@@ -155,6 +116,16 @@ export default function TokenBalanceInput({
     typeof errorMsgText === "string" &&
     isFormError("EXCEEDED_VALUE", errorMsgText)
 
+  const defaultValue = defaultAmount
+    ? fixedPointNumberToString(defaultAmount, decimals)
+    : undefined
+
+  useEffect(() => {
+    if (!defaultAmount) return
+
+    setAmount(defaultAmount)
+  }, [defaultAmount, setAmount])
+
   return (
     <FormControl isInvalid={hasError} isDisabled={inputProps.isDisabled}>
       <FormLabel htmlFor={inputProps.name} size={size} mr={0}>
@@ -173,18 +144,19 @@ export default function TokenBalanceInput({
           </Box>
         </Box>
       </FormLabel>
-      <InputGroup variant={VARIANT}>
+      <InputGroup>
         <NumberFormatInput
+          variant="outline"
           size={size}
-          variant={VARIANT}
-          isInvalid={hasError}
           suffix={` ${symbol}`}
           placeholder={placeholder}
           integerScale={10}
           decimalScale={decimals}
           allowNegative={false}
           {...inputProps}
+          isInvalid={hasError}
           value={displayedValue}
+          defaultValue={defaultValue}
           onValueChange={onValueChange}
           onChange={onChange}
         />
diff --git a/dapp/src/components/shared/TransactionDetails/AmountItem.tsx b/dapp/src/components/shared/TransactionDetails/AmountItem.tsx
index cf0c29045..c40c35c59 100644
--- a/dapp/src/components/shared/TransactionDetails/AmountItem.tsx
+++ b/dapp/src/components/shared/TransactionDetails/AmountItem.tsx
@@ -1,10 +1,13 @@
 import React, { ComponentProps } from "react"
 import { Flex } from "@chakra-ui/react"
+import { Optional } from "#/types"
 import TransactionDetailsItem, { TransactionDetailsItemProps } from "."
 import { CurrencyBalanceWithConversion } from "../CurrencyBalanceWithConversion"
+import { CurrencyBalance } from "../CurrencyBalance"
 
-type TransactionDetailsAmountItemProps = ComponentProps<
-  typeof CurrencyBalanceWithConversion
+type TransactionDetailsAmountItemProps = Optional<
+  ComponentProps<typeof CurrencyBalanceWithConversion>,
+  "to"
 > &
   Pick<TransactionDetailsItemProps, "label">
 
@@ -13,21 +16,23 @@ function TransactionDetailsAmountItem({
   from,
   to,
 }: TransactionDetailsAmountItemProps) {
+  const fromProps: TransactionDetailsAmountItemProps["from"] = {
+    size: "md",
+    ...from,
+  }
+
+  const toProps: TransactionDetailsAmountItemProps["to"] = to
+    ? { size: "sm", fontWeight: "medium", color: "grey.500", ...to }
+    : undefined
+
   return (
     <TransactionDetailsItem label={label} alignItems="start">
       <Flex flexDirection="column" alignItems="end">
-        <CurrencyBalanceWithConversion
-          from={{
-            size: "md",
-            ...from,
-          }}
-          to={{
-            size: "sm",
-            fontWeight: "medium",
-            color: "grey.500",
-            ...to,
-          }}
-        />
+        {toProps ? (
+          <CurrencyBalanceWithConversion from={fromProps} to={toProps} />
+        ) : (
+          <CurrencyBalance {...fromProps} />
+        )}
       </Flex>
     </TransactionDetailsItem>
   )
diff --git a/dapp/src/constants/env.ts b/dapp/src/constants/env.ts
index d2b31b236..034bd01a9 100644
--- a/dapp/src/constants/env.ts
+++ b/dapp/src/constants/env.ts
@@ -16,8 +16,6 @@ const GELATO_RELAY_API_KEY = import.meta.env.VITE_GELATO_RELAY_API_KEY
 
 const SUBGRAPH_API_KEY = import.meta.env.VITE_SUBGRAPH_API_KEY
 
-const MEZO_PORTAL_API_KEY = import.meta.env.VITE_MEZO_PORTAL_API_KEY
-
 const NETWORK_TYPE = USE_TESTNET ? "testnet" : "mainnet"
 
 const LATEST_COMMIT_HASH = import.meta.env.VITE_LATEST_COMMIT_HASH
@@ -34,7 +32,6 @@ export default {
   TBTC_API_ENDPOINT,
   GELATO_RELAY_API_KEY,
   SUBGRAPH_API_KEY,
-  MEZO_PORTAL_API_KEY,
   NETWORK_TYPE,
   LATEST_COMMIT_HASH,
   ACRE_API_ENDPOINT,
diff --git a/dapp/src/constants/errors.ts b/dapp/src/constants/errors.ts
index 320b53195..5364d8159 100644
--- a/dapp/src/constants/errors.ts
+++ b/dapp/src/constants/errors.ts
@@ -33,6 +33,12 @@ export const TOKEN_FORM_ERRORS = {
     `The amount is below the minimum required deposit of ${minValue} BTC.`,
 }
 
+export const PASSWORD_FORM_ERRORS = {
+  REQUIRED: "Please enter a password.",
+  INCORRECT_VALUE: "Incorrect password. Please try again.",
+  DEFAULT: "Something went wrong...",
+}
+
 export const ACTION_FORM_ERRORS = {
   [ACTION_FLOW_TYPES.STAKE]: TOKEN_FORM_ERRORS,
   [ACTION_FLOW_TYPES.UNSTAKE]: {
diff --git a/dapp/src/constants/externalHref.ts b/dapp/src/constants/externalHref.ts
index 8fc6b45d9..76d742637 100644
--- a/dapp/src/constants/externalHref.ts
+++ b/dapp/src/constants/externalHref.ts
@@ -6,5 +6,7 @@ export const EXTERNAL_HREF = {
   BLOG: "https://blog.acre.fi",
   MEZO_INFO: "https://info.mezo.org",
   WEBSITE: "https://acre.fi",
+  TERMS_OF_USE: "https://acre.fi/terms-of-use",
+  PRIVACY_POLICY: "https://acre.fi/privacy-policy",
   X: "https://x.com/AcreBTC",
 }
diff --git a/dapp/src/constants/featureFlags.ts b/dapp/src/constants/featureFlags.ts
index 67733bdb1..d16bed9bd 100644
--- a/dapp/src/constants/featureFlags.ts
+++ b/dapp/src/constants/featureFlags.ts
@@ -18,6 +18,9 @@ const ACRE_POINTS_ENABLED =
 
 const TVL_ENABLED = import.meta.env.VITE_FEATURE_FLAG_TVL_ENABLED === "true"
 
+const GATING_DAPP_ENABLED =
+  import.meta.env.VITE_FEATURE_GATING_DAPP_ENABLED === "true"
+
 const featureFlags = {
   GAMIFICATION_ENABLED,
   OKX_WALLET_ENABLED,
@@ -26,6 +29,7 @@ const featureFlags = {
   BEEHIVE_COMPONENT_ENABLED,
   ACRE_POINTS_ENABLED,
   TVL_ENABLED,
+  GATING_DAPP_ENABLED,
 }
 
 export default featureFlags
diff --git a/dapp/src/hooks/index.ts b/dapp/src/hooks/index.ts
index 327b4ab5f..8f2905cf1 100644
--- a/dapp/src/hooks/index.ts
+++ b/dapp/src/hooks/index.ts
@@ -38,3 +38,5 @@ export { default as useLastUsedBtcAddress } from "./useLastUsedBtcAddress"
 export { default as useAcrePoints } from "./useAcrePoints"
 export { default as useSignMessageAndCreateSession } from "./useSignMessageAndCreateSession"
 export { default as useScrollbarVisibility } from "./useScrollbarVisibility"
+export { default as useAccessCode } from "./useAccessCode"
+export { default as useFormField } from "./useFormField"
diff --git a/dapp/src/hooks/orangeKit/useBitcoinProvider.ts b/dapp/src/hooks/orangeKit/useBitcoinProvider.ts
index 41e9bce37..34c413c45 100644
--- a/dapp/src/hooks/orangeKit/useBitcoinProvider.ts
+++ b/dapp/src/hooks/orangeKit/useBitcoinProvider.ts
@@ -8,7 +8,11 @@ export function useBitcoinProvider(): UseBitcoinProviderReturn {
   const connector = useConnector()
 
   return useMemo(() => {
-    if (!connector || typeof connector.getBitcoinProvider !== "function")
+    if (
+      !connector ||
+      !connector.getBitcoinProvider ||
+      typeof connector.getBitcoinProvider !== "function"
+    )
       return undefined
 
     return connector.getBitcoinProvider()
diff --git a/dapp/src/hooks/sdk/useInitializeAcreSdk.ts b/dapp/src/hooks/sdk/useInitializeAcreSdk.ts
index acf662946..05cd359b8 100644
--- a/dapp/src/hooks/sdk/useInitializeAcreSdk.ts
+++ b/dapp/src/hooks/sdk/useInitializeAcreSdk.ts
@@ -1,7 +1,7 @@
 import { useEffect } from "react"
 import { logPromiseFailure } from "#/utils"
 import { useAcreContext } from "#/acre-react/hooks"
-import { BitcoinProvider } from "@acre-btc/sdk"
+import { AcreBitcoinProvider } from "@acre-btc/sdk"
 import { useBitcoinProvider } from "../orangeKit/useBitcoinProvider"
 import { useWallet } from "../useWallet"
 
@@ -11,7 +11,7 @@ export function useInitializeAcreSdk() {
   const { address } = useWallet()
 
   useEffect(() => {
-    const initSDK = async (provider?: BitcoinProvider) => {
+    const initSDK = async (provider?: AcreBitcoinProvider) => {
       await init(provider)
     }
 
diff --git a/dapp/src/hooks/sentry/useSentry.ts b/dapp/src/hooks/sentry/useSentry.ts
index 7dedae759..06facd4c0 100644
--- a/dapp/src/hooks/sentry/useSentry.ts
+++ b/dapp/src/hooks/sentry/useSentry.ts
@@ -1,11 +1,11 @@
 import { env } from "#/constants"
-import { initializeSentry } from "#/sentry"
+import sentry from "#/sentry"
 import { useEffect } from "react"
 
 export const useSentry = () => {
   useEffect(() => {
     if (env.SENTRY_SUPPORT) {
-      initializeSentry(env.SENTRY_DSN)
+      sentry.initialize(env.SENTRY_DSN)
     }
   }, [])
 }
diff --git a/dapp/src/hooks/useAccessCode.ts b/dapp/src/hooks/useAccessCode.ts
new file mode 100644
index 000000000..691f16cb7
--- /dev/null
+++ b/dapp/src/hooks/useAccessCode.ts
@@ -0,0 +1,18 @@
+import { useCallback } from "react"
+import useLocalStorage from "./useLocalStorage"
+
+export default function useAccessCode() {
+  const [encodedCode, setAccessCode] = useLocalStorage<string | undefined>(
+    "acre.accessCode",
+    undefined,
+  )
+
+  const saveAccessCode = useCallback(
+    (value: string) => {
+      setAccessCode(window.btoa(value))
+    },
+    [setAccessCode],
+  )
+
+  return { encodedCode, saveAccessCode }
+}
diff --git a/dapp/src/hooks/useAcrePoints.ts b/dapp/src/hooks/useAcrePoints.ts
index f1445b655..49e0097da 100644
--- a/dapp/src/hooks/useAcrePoints.ts
+++ b/dapp/src/hooks/useAcrePoints.ts
@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@tanstack/react-query"
-import { acreApi, bigIntToUserAmount } from "#/utils"
+import { acreApi } from "#/utils"
 import { queryKeysFactory } from "#/constants"
 import { MODAL_TYPES } from "#/types"
 import { useWallet } from "./useWallet"
@@ -38,8 +38,8 @@ export default function useAcrePoints(): UseAcrePointsReturnType {
       await userPointsDataQuery.refetch()
     },
     onSuccess: (data) => {
-      const claimedAmount = bigIntToUserAmount(data.claimed, 0)
-      const totalAmount = bigIntToUserAmount(data.total, 0)
+      const claimedAmount = Number(data.claimed)
+      const totalAmount = Number(data.total)
 
       openModal(MODAL_TYPES.ACRE_POINTS_CLAIM, {
         claimedAmount,
@@ -50,13 +50,9 @@ export default function useAcrePoints(): UseAcrePointsReturnType {
     // onError: (error) => {},
   })
 
-  const { data } = userPointsDataQuery
-  const totalBalance = bigIntToUserAmount(data?.claimed ?? 0n, 0)
-  const claimableBalance = bigIntToUserAmount(data?.unclaimed ?? 0n, 0)
-
   return {
-    totalBalance,
-    claimableBalance,
+    totalBalance: userPointsDataQuery.data?.claimed ?? 0,
+    claimableBalance: userPointsDataQuery.data?.unclaimed ?? 0,
     nextDropTimestamp: pointsDataQuery.data?.dropAt,
     isCalculationInProgress: pointsDataQuery.data?.isCalculationInProgress,
     claimPoints,
diff --git a/dapp/src/hooks/useFormField.ts b/dapp/src/hooks/useFormField.ts
new file mode 100644
index 000000000..b14ec777f
--- /dev/null
+++ b/dapp/src/hooks/useFormField.ts
@@ -0,0 +1,30 @@
+import { logPromiseFailure } from "#/utils"
+import { useField } from "formik"
+import { useCallback } from "react"
+
+export default function useFormField<T>(fieldName: string) {
+  const [field, meta, helpers] = useField<T>(fieldName)
+
+  const hasError = Boolean(meta.error)
+  const errorMsgText = meta.error
+  const isValid = !hasError && meta.touched && meta.value
+
+  const onChange = useCallback(
+    (value: T) => {
+      if (!meta.touched) logPromiseFailure(helpers.setTouched(true))
+      if (meta.error) helpers.setError(undefined)
+
+      logPromiseFailure(helpers.setValue(value))
+    },
+    [helpers, meta.touched, meta.error],
+  )
+
+  return {
+    field,
+    value: meta.value,
+    isValid,
+    hasError,
+    errorMsgText,
+    onChange,
+  }
+}
diff --git a/dapp/src/hooks/useGatingDApp.ts b/dapp/src/hooks/useGatingDApp.ts
new file mode 100644
index 000000000..8a375c9b5
--- /dev/null
+++ b/dapp/src/hooks/useGatingDApp.ts
@@ -0,0 +1,45 @@
+import { useEffect, useRef } from "react"
+import { MODAL_TYPES } from "#/types"
+import { featureFlags } from "#/constants"
+import { useQuery } from "@tanstack/react-query"
+import { acreApi } from "#/utils"
+import { useModal } from "./useModal"
+import useAccessCode from "./useAccessCode"
+import useIsEmbed from "./useIsEmbed"
+
+export default function useGatingDApp() {
+  const { encodedCode } = useAccessCode()
+  const { isEmbed } = useIsEmbed()
+  const { openModal, closeModal, modalType } = useModal()
+  const isMounted = useRef(false)
+  const { data: isValid, isLoading } = useQuery({
+    queryKey: ["verify-access-code"],
+    enabled: !!encodedCode,
+    queryFn: async () => acreApi.verifyAccessCode(encodedCode!),
+  })
+
+  useEffect(() => {
+    if (!featureFlags.GATING_DAPP_ENABLED || isEmbed || !encodedCode) return
+
+    if (modalType === MODAL_TYPES.LOADING && !isLoading) {
+      closeModal()
+      if (!isValid) openModal(MODAL_TYPES.GATE)
+    }
+  }, [
+    closeModal,
+    isValid,
+    encodedCode,
+    isLoading,
+    modalType,
+    openModal,
+    isEmbed,
+  ])
+
+  useEffect(() => {
+    if (!featureFlags.GATING_DAPP_ENABLED || isEmbed || isMounted.current)
+      return
+
+    isMounted.current = true
+    openModal(encodedCode ? MODAL_TYPES.LOADING : MODAL_TYPES.GATE)
+  }, [encodedCode, openModal, isEmbed])
+}
diff --git a/dapp/src/hooks/useInitApp.ts b/dapp/src/hooks/useInitApp.ts
index e87e8955a..3f462d8db 100644
--- a/dapp/src/hooks/useInitApp.ts
+++ b/dapp/src/hooks/useInitApp.ts
@@ -7,6 +7,7 @@ import useDetectEmbed from "./useDetectEmbed"
 import useDetectReferral from "./useDetectReferral"
 import { useDisconnectWallet } from "./useDisconnectWallet"
 import { useFetchBTCPriceUSD } from "./useFetchBTCPriceUSD"
+import useGatingDApp from "./useGatingDApp"
 
 export function useInitApp() {
   // TODO: Let's uncomment when dark mode is ready
@@ -14,6 +15,7 @@ export function useInitApp() {
   useSentry()
   useDetectEmbed()
   useDetectReferral()
+  useGatingDApp()
   useInitializeAcreSdk()
   useInitDataFromSdk()
   useFetchBTCPriceUSD()
diff --git a/dapp/src/hooks/useMats.ts b/dapp/src/hooks/useMats.ts
index c242e485b..fe62d63f2 100644
--- a/dapp/src/hooks/useMats.ts
+++ b/dapp/src/hooks/useMats.ts
@@ -1,13 +1,13 @@
 import { useQuery } from "@tanstack/react-query"
 import { REFETCH_INTERVAL_IN_MILLISECONDS, queryKeysFactory } from "#/constants"
-import { mezoPortalAPI } from "#/utils"
+import { acreApi } from "#/utils"
 
 const { acreKeys } = queryKeysFactory
 
 export default function useMats() {
   return useQuery({
     queryKey: [...acreKeys.mats()],
-    queryFn: async () => mezoPortalAPI.getMats(),
+    queryFn: async () => acreApi.getMats(),
     refetchInterval: REFETCH_INTERVAL_IN_MILLISECONDS,
   })
 }
diff --git a/dapp/src/pages/DashboardPage/index.tsx b/dapp/src/pages/DashboardPage/index.tsx
index 82e3d5cfa..4330f1f68 100644
--- a/dapp/src/pages/DashboardPage/index.tsx
+++ b/dapp/src/pages/DashboardPage/index.tsx
@@ -7,7 +7,6 @@ import DashboardCard from "./DashboardCard"
 import AcrePointsCard from "./AcrePointsCard"
 import { CurrentSeasonCard } from "./CurrentSeasonCard"
 import BeehiveCard from "./BeehiveCard"
-import UsefulLinks from "./UsefulLinks"
 import AcrePointsTemplateCard from "./AcrePointsTemplateCard"
 
 const TEMPLATE_AREAS = `
@@ -47,7 +46,6 @@ export default function DashboardPage() {
       {featureFlags.BEEHIVE_COMPONENT_ENABLED && (
         <BeehiveCard gridArea="beehive" />
       )}
-      <UsefulLinks gridArea="useful-links" />
     </Grid>
   )
 }
diff --git a/dapp/src/sentry/index.ts b/dapp/src/sentry/index.ts
index 0a68296be..ea82f8be0 100644
--- a/dapp/src/sentry/index.ts
+++ b/dapp/src/sentry/index.ts
@@ -1,29 +1,18 @@
 import * as Sentry from "@sentry/react"
-import { Primitive } from "@sentry/types"
 
-export const initializeSentry = (dsn: string) => {
+const initialize = (dsn: string) => {
   Sentry.init({
     dsn,
-    integrations: [new Sentry.BrowserTracing()],
+    integrations: [Sentry.browserTracingIntegration()],
     // Performance Monitoring
-    tracesSampleRate: 0.5,
+    tracesSampleRate: 0.1,
   })
 }
 
-export const captureMessage = (
-  message: string,
-  params?: { [key: string]: unknown },
-  tags?: { [key: string]: Primitive },
-) => {
-  Sentry.withScope((scope) => {
-    if (params) {
-      scope.setExtras(params)
-    }
+const captureException = (exception: unknown) =>
+  Sentry.captureException(exception)
 
-    if (tags) {
-      scope.setTags(tags)
-    }
-
-    Sentry.captureMessage(message)
-  })
+export default {
+  initialize,
+  captureException,
 }
diff --git a/dapp/src/store/btc/btcThunk.ts b/dapp/src/store/btc/btcThunk.ts
index 749c21fb8..87f121201 100644
--- a/dapp/src/store/btc/btcThunk.ts
+++ b/dapp/src/store/btc/btcThunk.ts
@@ -1,15 +1,7 @@
 import { createAsyncThunk } from "@reduxjs/toolkit"
-import { fetchCryptoCurrencyPriceUSD } from "#/utils/exchangeApi"
+import { acreApi } from "#/utils"
 
 export const fetchBTCPriceUSD = createAsyncThunk(
   "btc/fetchBTCPriceUSD",
-  async () => {
-    try {
-      const priceUSD = await fetchCryptoCurrencyPriceUSD("bitcoin")
-      return priceUSD
-    } catch (error) {
-      console.error(error)
-      return 0
-    }
-  },
+  async () => acreApi.getBtcUsdPrice(),
 )
diff --git a/dapp/src/theme/Footer.ts b/dapp/src/theme/Footer.ts
new file mode 100644
index 000000000..8cf4f3229
--- /dev/null
+++ b/dapp/src/theme/Footer.ts
@@ -0,0 +1,63 @@
+import { createMultiStyleConfigHelpers, defineStyle } from "@chakra-ui/react"
+
+const PARTS = ["container", "wrapper", "logo", "list", "link"]
+
+const containerStyles = defineStyle({
+  w: "full",
+  pos: "sticky",
+  bottom: 0,
+  left: 0,
+  borderTop: "1px",
+  borderColor: "gold.500",
+  bgColor: "gold.300",
+  zIndex: "footer",
+})
+
+const wrapperStyles = defineStyle({
+  display: "flex",
+  alignItems: "center",
+  gap: { base: 4, xl: 10 },
+  maxW: "120rem", // 1920px
+  py: 3,
+  px: { base: 10, xl: 30 },
+  mx: "auto",
+})
+
+const logoStyles = defineStyle({
+  boxSize: 8,
+})
+
+const listStyles = defineStyle({
+  display: "flex",
+  gap: { base: 2, xl: 5 },
+  _last: {
+    ml: "auto",
+  },
+})
+
+const linkStyles = defineStyle({
+  display: "flex",
+  color: "grey.700",
+  fontWeight: "medium",
+  fontSize: {
+    base: "xs",
+    md: "sm",
+  },
+  m: -2,
+  p: 2,
+  whiteSpace: "nowrap",
+})
+
+const multiStyleConfig = createMultiStyleConfigHelpers(PARTS)
+
+const baseStyle = multiStyleConfig.definePartsStyle({
+  container: containerStyles,
+  wrapper: wrapperStyles,
+  logo: logoStyles,
+  list: listStyles,
+  link: linkStyles,
+})
+
+export const footerTheme = multiStyleConfig.defineMultiStyleConfig({
+  baseStyle,
+})
diff --git a/dapp/src/theme/Input.ts b/dapp/src/theme/Input.ts
index 32ecb1269..bd998fdb3 100644
--- a/dapp/src/theme/Input.ts
+++ b/dapp/src/theme/Input.ts
@@ -1,7 +1,8 @@
 import { inputAnatomy as parts } from "@chakra-ui/anatomy"
 import { createMultiStyleConfigHelpers, defineStyle } from "@chakra-ui/react"
 
-const variantBalanceField = defineStyle({
+const variantOutlineField = defineStyle({
+  boxShadow: "none !important",
   border: "1px solid",
   borderColor: "gold.300",
   color: "grey.700",
@@ -17,12 +18,20 @@ const variantBalanceField = defineStyle({
     fontWeight: "medium",
   },
 
+  _hover: {
+    borderColor: "gold.300",
+  },
+
+  _focus: {
+    borderColor: "gold.300",
+  },
+
   _invalid: {
-    borderColor: "red.400",
+    borderColor: "red.400 !important",
   },
 })
 
-const variantBalanceElement = defineStyle({
+const variantOutlineElement = defineStyle({
   h: "100%",
   width: 14,
   mr: 2,
@@ -30,13 +39,18 @@ const variantBalanceElement = defineStyle({
 
 const multiStyleConfig = createMultiStyleConfigHelpers(parts.keys)
 
-const variantBalance = multiStyleConfig.definePartsStyle({
-  field: variantBalanceField,
-  element: variantBalanceElement,
+const variantOutline = multiStyleConfig.definePartsStyle({
+  field: variantOutlineField,
+  element: variantOutlineElement,
 })
 
 const variants = {
-  balance: variantBalance,
+  outline: variantOutline,
 }
 
-export const inputTheme = multiStyleConfig.defineMultiStyleConfig({ variants })
+export const inputTheme = multiStyleConfig.defineMultiStyleConfig({
+  variants,
+  defaultProps: {
+    variant: "outline",
+  },
+})
diff --git a/dapp/src/theme/index.ts b/dapp/src/theme/index.ts
index 316b7edaa..bda645651 100644
--- a/dapp/src/theme/index.ts
+++ b/dapp/src/theme/index.ts
@@ -28,6 +28,7 @@ import { skeletonTheme } from "./Skeleton"
 import { closeButtonTheme } from "./CloseButton"
 import { progressTheme } from "./Progress"
 import { countdownTheme } from "./Countdown"
+import { footerTheme } from "./Footer"
 
 const defaultTheme = {
   // TODO: Remove when dark mode is ready
@@ -67,6 +68,7 @@ const defaultTheme = {
     Skeleton: skeletonTheme,
     Progress: progressTheme,
     Countdown: countdownTheme,
+    Footer: footerTheme,
   },
 }
 
diff --git a/dapp/src/theme/utils/semanticTokens.ts b/dapp/src/theme/utils/semanticTokens.ts
index 0211d2455..8ad1298ba 100644
--- a/dapp/src/theme/utils/semanticTokens.ts
+++ b/dapp/src/theme/utils/semanticTokens.ts
@@ -1,6 +1,7 @@
 export const semanticTokens = {
   space: {
-    header_height: 24,
+    header_height: 28,
+    header_height_xl: 36,
     modal_shift: "9.75rem", // 156px
     dashboard_card_padding: 5,
   },
diff --git a/dapp/src/theme/utils/zIndices.ts b/dapp/src/theme/utils/zIndices.ts
index af938f226..8ea14ef60 100644
--- a/dapp/src/theme/utils/zIndices.ts
+++ b/dapp/src/theme/utils/zIndices.ts
@@ -1,5 +1,9 @@
 export const zIndices = {
-  sidebar: 1450,
+  sidebar: 1400,
   drawer: 1470,
   mobileBanner: 1500,
+  header: 1400,
+  footer: 1380,
+  modalContent: 1410,
+  modalOverlay: 1390,
 }
diff --git a/dapp/src/types/coingecko.ts b/dapp/src/types/coingecko.ts
deleted file mode 100644
index 5d43c6fdc..000000000
--- a/dapp/src/types/coingecko.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type CoingeckoIdType = "bitcoin"
-export type CoingeckoCurrencyType = "usd"
diff --git a/dapp/src/types/core.ts b/dapp/src/types/core.ts
index 735e7f372..2fce09a01 100644
--- a/dapp/src/types/core.ts
+++ b/dapp/src/types/core.ts
@@ -1,3 +1,5 @@
 export type Tuple<T> = [T, T]
 
 export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }
+
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>
diff --git a/dapp/src/types/index.ts b/dapp/src/types/index.ts
index dc4d8a4a9..19f167ca6 100644
--- a/dapp/src/types/index.ts
+++ b/dapp/src/types/index.ts
@@ -4,7 +4,6 @@ export * from "./callback"
 export * from "./chain"
 export * from "./action-flow"
 export * from "./activity"
-export * from "./coingecko"
 export * from "./time"
 export * from "./core"
 export * from "./fee"
diff --git a/dapp/src/types/modal.ts b/dapp/src/types/modal.ts
index e400b0cd9..9366ffbb4 100644
--- a/dapp/src/types/modal.ts
+++ b/dapp/src/types/modal.ts
@@ -17,6 +17,8 @@ export const MODAL_TYPES = {
   CONNECT_WALLET: "CONNECT_WALLET",
   UNEXPECTED_ERROR: "UNEXPECTED_ERROR",
   ACRE_POINTS_CLAIM: "ACRE_POINTS_CLAIM",
+  GATE: "GATE",
+  LOADING: "LOADING",
 } as const
 
 export type ModalType = (typeof MODAL_TYPES)[keyof typeof MODAL_TYPES]
diff --git a/dapp/src/utils/acreApi.ts b/dapp/src/utils/acreApi.ts
index a5836d9b3..c174cbd13 100644
--- a/dapp/src/utils/acreApi.ts
+++ b/dapp/src/utils/acreApi.ts
@@ -60,8 +60,8 @@ const getPointsDataByUser = async (address: string) => {
   const response = await axios.get<PointsDataByUserResponse>(url)
 
   return {
-    claimed: BigInt(response.data.claimed),
-    unclaimed: BigInt(response.data.unclaimed),
+    claimed: Number(response.data.claimed),
+    unclaimed: Number(response.data.unclaimed),
     isEligible: response.data.isEligible,
   }
 }
@@ -82,6 +82,30 @@ const claimPoints = async (address: string) => {
   }
 }
 
+const verifyAccessCode = async (encodedCode: string): Promise<boolean> => {
+  const response = await axios.post<{ isValid: boolean }>("access/verify", {
+    encodedCode,
+  })
+
+  return response.data.isValid
+}
+
+async function getMats() {
+  const response = await axios.get<{ totalMats: number; dailyMats: number }>(
+    "mezo/points",
+  )
+
+  return {
+    totalMats: response.data.totalMats,
+    dailyMats: response.data.dailyMats,
+  }
+}
+
+async function getBtcUsdPrice(): Promise<number> {
+  const response = await axios.get<{ btcUsdPrice: number }>("currency/btc")
+  return response.data.btcUsdPrice
+}
+
 export default {
   createSession,
   getSession,
@@ -89,4 +113,7 @@ export default {
   getPointsData,
   getPointsDataByUser,
   claimPoints,
+  verifyAccessCode,
+  getMats,
+  getBtcUsdPrice,
 }
diff --git a/dapp/src/utils/exchangeApi.ts b/dapp/src/utils/exchangeApi.ts
deleted file mode 100644
index 2f83c4ebf..000000000
--- a/dapp/src/utils/exchangeApi.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import axios from "axios"
-import { CoingeckoIdType, CoingeckoCurrencyType } from "#/types"
-
-const coingeckoApiURL = "https://api.coingecko.com/api/v3"
-
-type CoingeckoSimplePriceResponse = {
-  data: {
-    [id in CoingeckoIdType]: Record<CoingeckoCurrencyType, number>
-  }
-}
-
-export const fetchCryptoCurrencyPriceUSD = async (
-  coingeckoId: CoingeckoIdType,
-): Promise<number> => {
-  const response: CoingeckoSimplePriceResponse = await axios.get(
-    `${coingeckoApiURL}/simple/price?ids=${coingeckoId}&vs_currencies=usd`,
-  )
-
-  return response.data[coingeckoId].usd
-}
diff --git a/dapp/src/utils/forms.ts b/dapp/src/utils/forms.ts
index 6196f3b26..705ac9dc4 100644
--- a/dapp/src/utils/forms.ts
+++ b/dapp/src/utils/forms.ts
@@ -1,5 +1,11 @@
-import { ACTION_FORM_ERRORS, TOKEN_FORM_ERRORS } from "#/constants"
+import {
+  ACTION_FORM_ERRORS,
+  PASSWORD_FORM_ERRORS,
+  TOKEN_FORM_ERRORS,
+} from "#/constants"
+import sentry from "#/sentry"
 import { ActionFlowType, CurrencyType } from "#/types"
+import acreApi from "./acreApi"
 import { getCurrencyByType } from "./currency"
 import { fixedPointNumberToString } from "./numbers"
 
@@ -9,6 +15,24 @@ export function getErrorsObj<T>(errors: { [key in keyof T]: string }) {
     : errors
 }
 
+export async function validatePassword(
+  value: string | undefined,
+): Promise<string | undefined> {
+  if (value === undefined || value === "") return PASSWORD_FORM_ERRORS.REQUIRED
+
+  try {
+    const encodedCode = window.btoa(value)
+    const isValid = await acreApi.verifyAccessCode(encodedCode)
+    if (!isValid) return PASSWORD_FORM_ERRORS.INCORRECT_VALUE
+  } catch (error) {
+    sentry.captureException(error)
+    console.error(error)
+    return PASSWORD_FORM_ERRORS.DEFAULT
+  }
+
+  return undefined
+}
+
 export function validateTokenAmount(
   actionType: ActionFlowType,
   value: bigint | undefined,
@@ -35,6 +59,7 @@ export function validateTokenAmount(
 }
 
 type ParametrizedError = (value: number) => string
+
 export const isFormError = (
   type: keyof typeof TOKEN_FORM_ERRORS,
   message: string,
diff --git a/dapp/src/utils/index.ts b/dapp/src/utils/index.ts
index b6843fc0c..8d53b392e 100644
--- a/dapp/src/utils/index.ts
+++ b/dapp/src/utils/index.ts
@@ -6,7 +6,6 @@ export * from "./chain"
 export * from "./text"
 export * from "./time"
 export * from "./promise"
-export * from "./exchangeApi"
 export * from "./verifyDepositAddress"
 export * from "./json"
 export * from "./activities"
@@ -15,7 +14,6 @@ export { default as eip1193 } from "./eip1193"
 export { default as orangeKit } from "./orangekit"
 export { default as userAgent } from "./userAgent"
 export { default as referralProgram } from "./referralProgram"
-export { default as mezoPortalAPI } from "./mezoPortalApi"
 export { default as acreApi } from "./acreApi"
 export { default as router } from "./router"
 export { default as ledgerLive } from "./ledgerLive"
diff --git a/dapp/src/utils/mezoPortalApi.ts b/dapp/src/utils/mezoPortalApi.ts
deleted file mode 100644
index 4897154bd..000000000
--- a/dapp/src/utils/mezoPortalApi.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { env } from "#/constants"
-import axios from "axios"
-
-export const endpoint = env.USE_TESTNET
-  ? "https://portal.api.test.mezo.org/api/v1"
-  : "https://portal.api.mezo.org/api/v1"
-
-async function getMats() {
-  try {
-    const url = `${endpoint}/acre`
-    const response = await axios.get<{ totalMats: number; dailyMats: number }>(
-      url,
-      {
-        headers: { Authorization: `Bearer ${env.MEZO_PORTAL_API_KEY}` },
-      },
-    )
-
-    return response.data
-  } catch (error) {
-    console.error(error)
-    throw error
-  }
-}
-
-export default {
-  getMats,
-}
diff --git a/dapp/src/utils/orangekit/index.ts b/dapp/src/utils/orangekit/index.ts
index c42ff3288..18f355df4 100644
--- a/dapp/src/utils/orangekit/index.ts
+++ b/dapp/src/utils/orangekit/index.ts
@@ -14,8 +14,8 @@ import {
 } from "@orangekit/react"
 import { Connector } from "wagmi"
 import { SignInWithWalletMessage } from "@orangekit/sign-in-with-wallet"
-import { getOrangeKitLedgerLiveConnector } from "./ledger-live"
 import { getExpirationDate } from "../time"
+import { getOrangeKitLedgerLiveConnector } from "./ledger-live"
 
 const getWalletInfo = (connector: OrangeKitConnector) => {
   switch (connector.id) {
diff --git a/dapp/src/utils/orangekit/ledger-live/bitcoin-provider.ts b/dapp/src/utils/orangekit/ledger-live/bitcoin-provider.ts
index fe6690fe5..5fed1e76f 100644
--- a/dapp/src/utils/orangekit/ledger-live/bitcoin-provider.ts
+++ b/dapp/src/utils/orangekit/ledger-live/bitcoin-provider.ts
@@ -4,7 +4,6 @@ import {
   WalletAPIClient,
   WindowMessageTransport,
 } from "@ledgerhq/wallet-api-client"
-import { ethers } from "ethers"
 import { UserRejectedRequestError } from "viem"
 import {
   Balance,
@@ -13,16 +12,17 @@ import {
   OrangeKitBitcoinWalletProvider,
 } from "@orangekit/react/src/wallet/bitcoin-wallet-provider"
 import {
-  BitcoinAddressHelper,
   BitcoinNetwork,
-  BitcoinProvider,
+  AcreBitcoinProvider,
+  BitcoinSignatureHelper,
+  SafeTransactionData,
 } from "@acre-btc/sdk"
 import {
   AcreMessage,
   AcreMessageType,
   AcreModule,
-  AcreWithdrawalData,
 } from "@ledgerhq/wallet-api-acre-module"
+import BigNumber from "bignumber.js"
 
 export type TryRequestFn<T> = (fn: () => Promise<T>) => Promise<T>
 
@@ -47,7 +47,7 @@ function tryRequest<T>(): TryRequestFn<T> {
   }
 }
 
-export type LedgerLiveWalletApiBitcoinProviderOptions = {
+export type AcreLedgerLiveBitcoinProviderOptions = {
   tryConnectToAddress: string | undefined
 }
 
@@ -55,7 +55,7 @@ export type LedgerLiveWalletApiBitcoinProviderOptions = {
  * Ledger Live Wallet API Bitcoin Provider.
  */
 export default class AcreLedgerLiveBitcoinProvider
-  implements OrangeKitBitcoinWalletProvider, BitcoinProvider
+  implements OrangeKitBitcoinWalletProvider, AcreBitcoinProvider
 {
   readonly #walletApiClient: WalletAPIClient<
     (client: WalletAPIClient) => { acre: AcreModule }
@@ -65,17 +65,19 @@ export default class AcreLedgerLiveBitcoinProvider
 
   readonly #network: BitcoinNetwork
 
-  readonly #options: LedgerLiveWalletApiBitcoinProviderOptions
+  readonly #options: AcreLedgerLiveBitcoinProviderOptions
 
   readonly #hwAppId = "Acre"
 
+  readonly #derivationPath = "0/0"
+
   #hasConnectFunctionBeenCalled: boolean = false
 
   #account: Account | undefined
 
   static init(
     network: BitcoinNetwork,
-    options: LedgerLiveWalletApiBitcoinProviderOptions = {
+    options: AcreLedgerLiveBitcoinProviderOptions = {
       tryConnectToAddress: undefined,
     },
   ) {
@@ -100,22 +102,66 @@ export default class AcreLedgerLiveBitcoinProvider
     network: BitcoinNetwork,
     windowMessageTransport: WindowMessageTransport,
     walletApiClient: WalletAPIClient,
-    options: LedgerLiveWalletApiBitcoinProviderOptions = {
+    options: AcreLedgerLiveBitcoinProviderOptions = {
       tryConnectToAddress: undefined,
     },
   ) {
+    this.#network = network
     this.#windowMessageTransport = windowMessageTransport
     this.#walletApiClient = walletApiClient
-    this.#network = network
     this.#options = options
   }
 
+  /**
+   * Connects with the Ledger Live Wallet API.
+   * @returns Connected account address.
+   */
+  async connect(): Promise<BitcoinAddress> {
+    this.#windowMessageTransport.connect()
+
+    const currencyIds = [
+      this.#network === BitcoinNetwork.Mainnet ? "bitcoin" : "bitcoin_testnet",
+    ]
+
+    if (!this.#hasConnectFunctionBeenCalled) {
+      const accounts: Account[] = await this.#walletApiClient.account.list({
+        currencyIds,
+      })
+
+      if (this.#options.tryConnectToAddress) {
+        for (let i = 0; i < accounts.length; i += 1) {
+          const acc = accounts[i]
+          // eslint-disable-next-line no-await-in-loop
+          const address = await this.#getAddress(acc.id)
+
+          if (address === this.#options.tryConnectToAddress) {
+            this.#account = acc
+            break
+          }
+        }
+      } else if (accounts.length === 1) {
+        ;[this.#account] = accounts
+      }
+    }
+
+    if (!this.#account || this.#hasConnectFunctionBeenCalled) {
+      this.#account = await tryRequest<Account>()(async () =>
+        this.#walletApiClient.account.request({
+          currencyIds,
+        }),
+      )
+    }
+
+    this.#hasConnectFunctionBeenCalled = true
+    return this.#getAddress(this.#account.id)
+  }
+
   /**
    * Signs and broadcasts a transaction.
    * @param to The address of the transaction's recipient.
    * @param satoshis The amount of Bitcoin in satoshi to send in the
    *        transaction.
-   * @returns The transaction hash
+   * @returns The transaction hash.
    */
   async sendBitcoin(
     to: BitcoinAddress,
@@ -130,9 +176,7 @@ export default class AcreLedgerLiveBitcoinProvider
         this.#account!.id,
         {
           family: "bitcoin",
-          // @ts-expect-error The Ledger Live lib requires `BigNumber` but we can
-          // pass string.
-          amount: satoshis.toString(),
+          amount: new BigNumber(satoshis),
           recipient: to,
         },
         { hwAppId: this.#hwAppId },
@@ -176,50 +220,6 @@ export default class AcreLedgerLiveBitcoinProvider
     return balance
   }
 
-  /**
-   * Connects with the Ledger Live Wallet API.
-   * @returns Connected account address.
-   */
-  async connect(): Promise<BitcoinAddress> {
-    this.#windowMessageTransport.connect()
-
-    const currencyIds = [
-      this.#network === BitcoinNetwork.Mainnet ? "bitcoin" : "bitcoin_testnet",
-    ]
-
-    if (!this.#hasConnectFunctionBeenCalled) {
-      const accounts: Account[] = await this.#walletApiClient.account.list({
-        currencyIds,
-      })
-
-      if (this.#options.tryConnectToAddress) {
-        for (let i = 0; i < accounts.length; i += 1) {
-          const acc = accounts[i]
-          // eslint-disable-next-line no-await-in-loop
-          const address = await this.#getAddress(acc.id)
-
-          if (address === this.#options.tryConnectToAddress) {
-            this.#account = acc
-            break
-          }
-        }
-      } else if (accounts.length === 1) {
-        ;[this.#account] = accounts
-      }
-    }
-
-    if (!this.#account || this.#hasConnectFunctionBeenCalled) {
-      this.#account = await tryRequest<Account>()(async () =>
-        this.#walletApiClient.account.request({
-          currencyIds,
-        }),
-      )
-    }
-
-    this.#hasConnectFunctionBeenCalled = true
-    return this.#account.address
-  }
-
   // eslint-disable-next-line class-methods-use-this
   isInstalled(): boolean {
     return true
@@ -239,7 +239,7 @@ export default class AcreLedgerLiveBitcoinProvider
    * In the Ledger Live Wallet API the address is "renewed" each time funds are
    * received in order to allow some privacy. But to get the same depositor
    * owner Ethereum address we must always get the same Bitcoin address (under
-   * the `m/purpose'/0'/accountId'/0/0` derivation path)
+   * the `m/purpose'/0'/accountId'/0/0` derivation path).
    *
    * @returns Always the same bitcoin address even the address has been
    *          "renewed" by the Ledger Live Wallet API.
@@ -252,23 +252,21 @@ export default class AcreLedgerLiveBitcoinProvider
     return this.#getAddress(this.#account.id)
   }
 
-  #getAddress(accountId: string, derivationPath: string = "0/0") {
-    return this.#walletApiClient.bitcoin.getAddress(accountId, derivationPath)
+  #getAddress(accountId: string) {
+    return this.#walletApiClient.bitcoin.getAddress(
+      accountId,
+      this.#derivationPath,
+    )
   }
 
   /**
    * Signs withdraw message.
    * @param message Message to sign.
    * @param data Withdrawal transaction data.
-   * @returns Hash of the signed message.
+   * @returns A signature for a given message, which proves that the owner of
+   *          the account has agreed to the message content.
    */
-  async signWithdrawMessage(
-    message: string,
-    data: Omit<AcreWithdrawalData, "operation" | "nonce"> & {
-      operation: number
-      nonce: number
-    },
-  ) {
+  async signWithdrawMessage(message: string, data: SafeTransactionData) {
     return this.#signMessage({
       type: AcreMessageType.Withdraw,
       message: {
@@ -282,8 +280,9 @@ export default class AcreLedgerLiveBitcoinProvider
   /**
    * Signs message.
    * @param message Message to sign.
-   * @returns Hash of the signed message.
-   */
+   * @returns A signature for a given message, which proves that the owner of
+   *          the account has agreed to the message content.
+   * */
   async signMessage(message: string): Promise<string> {
     return this.#signMessage({ type: AcreMessageType.SignIn, message })
   }
@@ -295,49 +294,16 @@ export default class AcreLedgerLiveBitcoinProvider
       this.#walletApiClient.custom.acre.messageSign(
         this.#account!.id,
         message,
-        "0/0",
+        this.#derivationPath,
         { hwAppId: this.#hwAppId },
       ),
     )
 
-    return this.#normalizeV(this.#account.address, signature)
-  }
-
-  async #normalizeV(address: string, signature: Buffer) {
-    const signatureBytes = ethers.decodeBase64(signature.toString("base64"))
-
-    const v = signatureBytes[0]
-    let normalizedV
-
-    if (BitcoinAddressHelper.isP2WPKHAddress(address)) {
-      // For p2wpkh, normalize to the 39-42 range specified by BIP137.
-      normalizedV = BitcoinAddressHelper.normalizeV(v, 39)
-    } else if (BitcoinAddressHelper.isP2PKHAddress(address)) {
-      // For p2pkh, assume that an uncompressed p2pkh signature will already be
-      // in the right range, and normalize any others to the 31-34 range
-      // specified by BIP137.
-      normalizedV =
-        // BIP137 range for uncompressed p2pkh
-        v >= 27 && v <= 30
-          ? v
-          : // BIP137 range for compressed p2pkh
-            BitcoinAddressHelper.normalizeV(v, 31)
-    } else if (
-      BitcoinAddressHelper.isNestedSegwitAddress(
-        // We need the zero address to confirm that this is indeed the nested
-        // segwit address.
-        await this.getAddress(),
-        await this.getPublicKey(),
-      )
-    ) {
-      normalizedV = BitcoinAddressHelper.normalizeV(v, 35)
-    } else {
-      throw new Error("Unsupported Bitcoin address type")
-    }
-
-    signatureBytes[0] = normalizedV
-
-    return ethers.hexlify(signatureBytes)
+    return BitcoinSignatureHelper.normalizeSignature(
+      signature,
+      await this.getAddress(),
+      await this.getPublicKey(),
+    )
   }
 
   /**
@@ -348,6 +314,9 @@ export default class AcreLedgerLiveBitcoinProvider
       throw new Error("Connect first")
     }
 
-    return this.#walletApiClient.bitcoin.getPublicKey(this.#account.id, "0/0")
+    return this.#walletApiClient.bitcoin.getPublicKey(
+      this.#account.id,
+      this.#derivationPath,
+    )
   }
 }
diff --git a/dapp/src/utils/orangekit/ledger-live/connector.ts b/dapp/src/utils/orangekit/ledger-live/connector.ts
index c5c313afe..8bc6d5f4f 100644
--- a/dapp/src/utils/orangekit/ledger-live/connector.ts
+++ b/dapp/src/utils/orangekit/ledger-live/connector.ts
@@ -6,7 +6,7 @@ import { BitcoinNetwork } from "@acre-btc/sdk"
 import icon from "./icon"
 
 import AcreLedgerLiveBitcoinProvider, {
-  LedgerLiveWalletApiBitcoinProviderOptions,
+  AcreLedgerLiveBitcoinProviderOptions,
 } from "./bitcoin-provider"
 
 export default function getOrangeKitLedgerLiveConnector({
@@ -14,7 +14,7 @@ export default function getOrangeKitLedgerLiveConnector({
   chainId,
   relayApiKey,
   options,
-}: ConnectorConfig & { options: LedgerLiveWalletApiBitcoinProviderOptions }) {
+}: ConnectorConfig & { options: AcreLedgerLiveBitcoinProviderOptions }) {
   const bitcoinWalletProvider = AcreLedgerLiveBitcoinProvider.init(
     chainId === 1 ? BitcoinNetwork.Mainnet : BitcoinNetwork.Testnet,
     options,
diff --git a/dapp/src/utils/orangekit/ledger-live/tests/bitcoin-provider.test.ts b/dapp/src/utils/orangekit/ledger-live/tests/bitcoin-provider.test.ts
index 85bb762da..cdf2a4357 100644
--- a/dapp/src/utils/orangekit/ledger-live/tests/bitcoin-provider.test.ts
+++ b/dapp/src/utils/orangekit/ledger-live/tests/bitcoin-provider.test.ts
@@ -7,6 +7,7 @@ import {
 import { Balance } from "@orangekit/react/dist/src/wallet/bitcoin-wallet-provider"
 import { AcreMessageType } from "@ledgerhq/wallet-api-acre-module"
 import { ZeroAddress } from "ethers"
+import BigNumber from "bignumber.js"
 import AcreLedgerLiveBitcoinProvider from "../bitcoin-provider"
 
 describe("AcreLedgerLiveBitcoinProvider", () => {
@@ -15,6 +16,7 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
   const mockedAccount = {
     id: "test",
     address: bitcoinAddress,
+    zeroAddress,
     balance: 100,
     spendableBalance: 80,
   }
@@ -91,7 +93,7 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
             mockedAccount.id,
             {
               family: "bitcoin",
-              amount: satoshis.toString(),
+              amount: new BigNumber(satoshis),
               recipient: bitcoinAddress,
             },
             { hwAppId },
@@ -148,76 +150,146 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
       })
     })
 
-    // TODO: test all supported addresses
-    describe("signWithdrawMessage", () => {
-      const signature =
-        "0x2799a1c1d934dc4b57d031c016f43b65f7910d348a1254a0f9fcec0e997e46d0105b35e115b9155288e15153d8ad3ba6eed5d2823e9b8c50826eabd580f6f960f6"
-      const expectedSignature =
-        "0x1f1dbbf7d6b573577ddf875ce1be7b774df5734d7a7f8ddbeb97fbf75d1ddf8f1ad76e786b47fd7dc79cd1ef7dedee3a774d74e5bdf97b5d796fdd79e76f3c7b5e75e7777c69dddb6ba79e779776f36ddef5bf1ce74f36e9e69b779f347fa7fdeb47fa"
-
-      let result: string
-
-      beforeAll(async () => {
-        mockedWalletApiClient.custom.acre.messageSign.mockResolvedValueOnce(
-          signature,
-        )
-        result = await provider.signWithdrawMessage("", withdrawalData)
-      })
-
-      it("should call the acre custom module to sign withdraw message", () => {
-        expect(
-          mockedWalletApiClient.custom.acre.messageSign,
-        ).toHaveBeenCalledWith(
-          mockedAccount.id,
-          {
-            type: AcreMessageType.Withdraw,
-            message: {
-              ...withdrawalData,
-              operation: withdrawalData.operation.toString(),
-              nonce: withdrawalData.nonce.toString(),
-            },
-          },
-          "0/0",
-          { hwAppId },
-        )
-      })
-
-      it("should return correct signature", () => {
-        expect(result).toBe(expectedSignature)
-      })
-    })
-
-    // TODO: test all supported addresses
     describe("signMessage", () => {
-      const message = "message"
-      const signature =
-        "0x2799a1c1d934dc4b57d031c016f43b65f7910d348a1254a0f9fcec0e997e46d0105b35e115b9155288e15153d8ad3ba6eed5d2823e9b8c50826eabd580f6f960f6"
-      const expectedSignature =
-        "0x1f1dbbf7d6b573577ddf875ce1be7b774df5734d7a7f8ddbeb97fbf75d1ddf8f1ad76e786b47fd7dc79cd1ef7dedee3a774d74e5bdf97b5d796fdd79e76f3c7b5e75e7777c69dddb6ba79e779776f36ddef5bf1ce74f36e9e69b779f347fa7fdeb47fa"
-      let result: string
-
-      beforeAll(async () => {
-        mockedWalletApiClient.custom.acre.messageSign.mockResolvedValueOnce(
-          signature,
-        )
-
-        result = await provider.signMessage(message)
-      })
+      const taprootAddress =
+        "tb1pzfxzc0n399ezjrxkd0xyf2xuymz8a0rdzlka6ynmtatqv64z5ausw5suv2"
+      const mockedPublicKey =
+        "033b37d8b5dda991cdeb628c28c7958cf9d7bc61dfde29357b8a7190b9b3295423"
+      const signInMessage = "test"
+
+      const messageTypesData = [
+        {
+          type: AcreMessageType.Withdraw,
+          methodName: "signWithdrawMessage",
+          args: ["", withdrawalData],
+          messageData: {
+            ...withdrawalData,
+            operation: withdrawalData.operation.toString(),
+            nonce: withdrawalData.nonce.toString(),
+          },
+        },
+        {
+          type: AcreMessageType.SignIn,
+          methodName: "signMessage",
+          args: [signInMessage],
+          messageData: signInMessage,
+        },
+      ]
+
+      const testData = [
+        {
+          addressType: "Nested Segwit (P2SH-P2WPKH)",
+          address: "2N3dhPvUMaGaqrXGrHa8VnKVhfxy38A4YVW",
+          signature: Buffer.from(
+            "1f2d48374c17b5af8da605fbeb1540540f0e4e0a5108c26c13ac4ec3bd9eafa8011951b2160995b9a9da85502a6c3c689a556f542a0e7a57f7cd187670e7d9c4f9",
+            "hex",
+          ),
+          expectedSignature:
+            "0x232d48374c17b5af8da605fbeb1540540f0e4e0a5108c26c13ac4ec3bd9eafa8011951b2160995b9a9da85502a6c3c689a556f542a0e7a57f7cd187670e7d9c4f9",
+          publicKey:
+            "033b37d8b5dda991cdeb628c28c7958cf9d7bc61dfde29357b8a7190b9b3295423",
+        },
+        {
+          addressType: "Legacy (P2PKH)",
+          address: "mrXtbjt4XXcX2aruY1Lx58YF2F8LXYzi1U",
+          signature: Buffer.from(
+            "1fdea55216183919f35950e0bfe5b4889c6103c708d50fd2e0fe7eddc826b295a94a504475fb5f8896a87ac156590575a33390d8bde9ddb637aa096ae61546201f",
+            "hex",
+          ),
+          expectedSignature:
+            "0x1fdea55216183919f35950e0bfe5b4889c6103c708d50fd2e0fe7eddc826b295a94a504475fb5f8896a87ac156590575a33390d8bde9ddb637aa096ae61546201f",
+        },
+        {
+          addressType: "Native Segwit (P2WPKH)",
+          address: "tb1q3x5lk9l83aek9c0vu38tx69u2lyxsdy6tww2rp",
+          signature: Buffer.from(
+            "20ab1f9cc6955f17a18240014fae5303576ea9a7caacabebf26c2b296e7b7b75857b432a1e0b6499b8f4a82f34f02e293b884de1792c5d6cd761eefe4e9f1130c0",
+            "hex",
+          ),
+          expectedSignature:
+            "0x28ab1f9cc6955f17a18240014fae5303576ea9a7caacabebf26c2b296e7b7b75857b432a1e0b6499b8f4a82f34f02e293b884de1792c5d6cd761eefe4e9f1130c0",
+        },
+      ]
+
+      describe.each(messageTypesData)(
+        "$type",
+        ({ methodName, args, type, messageData }) => {
+          describe("with supported address type", () => {
+            describe.each(testData)(
+              "when sign with $addressType address",
+              ({ address, signature, expectedSignature, publicKey }) => {
+                let result: string
+
+                beforeAll(async () => {
+                  mockedWalletApiClient.custom.acre.messageSign.mockResolvedValue(
+                    signature,
+                  )
+                  mockedWalletApiClient.account.request.mockResolvedValue({
+                    ...mockedAccount,
+                    address,
+                  })
+                  mockedWalletApiClient.bitcoin.getAddress.mockResolvedValue(
+                    address,
+                  )
+
+                  if (publicKey) {
+                    mockedWalletApiClient.bitcoin.getPublicKey.mockResolvedValue(
+                      publicKey,
+                    )
+                  }
+
+                  await provider.connect()
+
+                  // @ts-expect-error test
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                  result = await provider[methodName](...args)
+                })
+
+                it("should call the acre custom module to sign message", () => {
+                  expect(
+                    mockedWalletApiClient.custom.acre.messageSign,
+                  ).toHaveBeenCalledWith(
+                    mockedAccount.id,
+                    {
+                      type,
+                      message: messageData,
+                    },
+                    "0/0",
+                    { hwAppId },
+                  )
+                })
+
+                it("should return correct signature", () => {
+                  expect(result).toBe(expectedSignature)
+                })
+              },
+            )
+          })
 
-      it("should call the acre custom module to sign message", () => {
-        expect(
-          mockedWalletApiClient.custom.acre.messageSign,
-        ).toHaveBeenCalledWith(
-          mockedAccount.id,
-          { type: AcreMessageType.SignIn, message },
-          "0/0",
-          { hwAppId },
-        )
-      })
+          describe("with unsupported address type", () => {
+            beforeAll(async () => {
+              mockedWalletApiClient.account.request.mockResolvedValue({
+                ...mockedAccount,
+                address: taprootAddress,
+              })
+              mockedWalletApiClient.bitcoin.getAddress.mockResolvedValue(
+                taprootAddress,
+              )
+              mockedWalletApiClient.bitcoin.getPublicKey.mockResolvedValue(
+                mockedPublicKey,
+              )
+
+              await provider.connect()
+            })
 
-      it("should return correct signature", () => {
-        expect(result).toBe(expectedSignature)
-      })
+            it("should throw an error", async () => {
+              await expect(async () =>
+                provider.signWithdrawMessage("", withdrawalData),
+              ).rejects.toThrowError("Unsupported Bitcoin address type")
+            })
+          })
+        },
+      )
     })
 
     describe("getPublicKey", () => {
@@ -271,7 +343,7 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
       { methodName: "signWithdrawMessage", args: ["", withdrawalData] },
       { methodName: "getAddress", args: [] },
       { methodName: "getBalance", args: [] },
-    ])("%methodName", ({ methodName, args }) => {
+    ])("$methodName", ({ methodName, args }) => {
       it("should throw an error", async () => {
         await expect(() =>
           // @ts-expect-error test
@@ -286,13 +358,15 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
     const account2 = {
       ...mockedAccount,
       id: "2",
-      address: "bc1qxg2cc7p5yur7tr3rr2cl5jw47lluuvy7cr2usu",
+      address: "tb1q3x5lk9l83aek9c0vu38tx69u2lyxsdy6tww2rp",
+      zeroAddress: "tb1qj502nrx8lv4azu4afuxhffma248gq8c00zl8uv",
     }
 
     const account3 = {
       ...mockedAccount,
       id: "3",
-      address: "tb1qhp6ug4hp3cc84spx3l8sddh8w5ffjujvjycqv5",
+      address: "mrXtbjt4XXcX2aruY1Lx58YF2F8LXYzi1U",
+      zeroAddress: "mhKLhBdi7JmtYNxRVTn3u5fSsXtiwDbj4K",
     }
     const accounts = [mockedAccount, account2, account3]
 
@@ -305,6 +379,9 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
             mockedWalletApiClient.account.list.mockReturnValueOnce([
               mockedAccount,
             ])
+            mockedWalletApiClient.bitcoin.getAddress.mockResolvedValueOnce(
+              mockedAccount.zeroAddress,
+            )
 
             provider = new AcreLedgerLiveBitcoinProvider(
               BitcoinNetwork.Testnet,
@@ -321,8 +398,14 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
             })
           })
 
+          it("should get the bitcoin address from bitcoin module", () => {
+            expect(
+              mockedWalletApiClient.bitcoin.getAddress,
+            ).toHaveBeenCalledWith(mockedAccount.id, "0/0")
+          })
+
           it("should return the first account", () => {
-            expect(result).toBe(mockedAccount.address)
+            expect(result).toBe(mockedAccount.zeroAddress)
           })
         })
 
@@ -330,6 +413,9 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
           beforeAll(async () => {
             mockedWalletApiClient.account.list.mockReturnValueOnce(accounts)
             mockedWalletApiClient.account.request.mockReturnValueOnce(account2)
+            mockedWalletApiClient.bitcoin.getAddress.mockResolvedValueOnce(
+              account2.zeroAddress,
+            )
 
             provider = new AcreLedgerLiveBitcoinProvider(
               BitcoinNetwork.Testnet,
@@ -346,23 +432,30 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
             })
           })
 
+          it("should get the bitcoin address from bitcoin module", () => {
+            expect(
+              mockedWalletApiClient.bitcoin.getAddress,
+            ).toHaveBeenCalledWith(mockedAccount.id, "0/0")
+          })
+
           it("should return account selected by the user", () => {
-            expect(result).toBe(account2.address)
+            expect(result).toBe(account2.zeroAddress)
           })
         })
       })
 
       describe("when `tryConnectToAddress` is set", () => {
-        const tryConnectToAddress = account3.address
+        const tryConnectToAddress = account3.zeroAddress
 
         beforeAll(async () => {
           mockedWalletApiClient.bitcoin.getAddress.mockClear()
 
           mockedWalletApiClient.account.list.mockReturnValueOnce(accounts)
           mockedWalletApiClient.bitcoin.getAddress
-            .mockReturnValueOnce(mockedAccount.address)
-            .mockReturnValueOnce(account2.address)
-            .mockReturnValueOnce(account3.address)
+            .mockReturnValueOnce(mockedAccount.zeroAddress)
+            .mockReturnValueOnce(account2.zeroAddress)
+            .mockReturnValueOnce(account3.zeroAddress)
+            .mockResolvedValueOnce(tryConnectToAddress)
 
           provider = new AcreLedgerLiveBitcoinProvider(
             BitcoinNetwork.Testnet,
@@ -381,9 +474,6 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
         })
 
         it("should get zero address for all accounts", () => {
-          expect(
-            mockedWalletApiClient.bitcoin.getAddress,
-          ).toHaveBeenCalledTimes(accounts.length)
           expect(
             mockedWalletApiClient.bitcoin.getAddress,
           ).toHaveBeenNthCalledWith(1, mockedAccount.id, "0/0")
@@ -395,6 +485,13 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
           ).toHaveBeenNthCalledWith(3, account3.id, "0/0")
         })
 
+        it("should get the bitcoin address from bitcoin module", () => {
+          expect(mockedWalletApiClient.bitcoin.getAddress).toHaveBeenCalledWith(
+            account3.id,
+            "0/0",
+          )
+        })
+
         it("should return an account with the same address as `tryConnectToAddress` param", () => {
           expect(result).toBe(tryConnectToAddress)
         })
@@ -402,9 +499,17 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
     })
 
     describe("when the provider is already connected", () => {
+      const selectedAccount = account2
+      let secondConnectionResult: string
+
       beforeAll(async () => {
         mockedWalletApiClient.account.list.mockReturnValueOnce([mockedAccount])
-        mockedWalletApiClient.account.request.mockReturnValueOnce(account2)
+        mockedWalletApiClient.account.request.mockReturnValueOnce(
+          selectedAccount,
+        )
+        mockedWalletApiClient.bitcoin.getAddress
+          .mockReturnValueOnce(mockedAccount.zeroAddress)
+          .mockResolvedValueOnce(selectedAccount.zeroAddress)
 
         provider = new AcreLedgerLiveBitcoinProvider(
           BitcoinNetwork.Testnet,
@@ -413,15 +518,27 @@ describe("AcreLedgerLiveBitcoinProvider", () => {
         )
 
         await provider.connect()
-      })
 
-      it("should ask the user to select an account", async () => {
-        const secondConnectionResult = await provider.connect()
+        secondConnectionResult = await provider.connect()
+      })
 
+      it("should ask the user to select an account", () => {
         expect(mockedWalletApiClient.account.request).toHaveBeenCalledWith({
           currencyIds: ["bitcoin_testnet"],
         })
-        expect(secondConnectionResult).toBe(account2.address)
+      })
+
+      it("should get the bitcoin address from bitcoin module", () => {
+        expect(
+          mockedWalletApiClient.bitcoin.getAddress,
+          // The first connection was when the user connected for the first
+          // time. Here we want to check the second call, after the user
+          // selected the account for the second time.
+        ).toHaveBeenNthCalledWith(2, selectedAccount.id, "0/0")
+      })
+
+      it("should return an account selected by the user", () => {
+        expect(secondConnectionResult).toBe(selectedAccount.zeroAddress)
       })
     })
   })
diff --git a/dapp/src/vite-env.d.ts b/dapp/src/vite-env.d.ts
index 3236c085e..890b327f9 100644
--- a/dapp/src/vite-env.d.ts
+++ b/dapp/src/vite-env.d.ts
@@ -14,8 +14,8 @@ interface ImportMetaEnv {
   readonly VITE_FEATURE_FLAG_BEEHIVE_COMPONENT_ENABLED: string
   readonly VITE_FEATURE_FLAG_ACRE_POINTS_ENABLED: string
   readonly VITE_FEATURE_FLAG_TVL_ENABLED: string
+  readonly VITE_FEATURE_GATING_DAPP_ENABLED: string
   readonly VITE_SUBGRAPH_API_KEY: string
-  readonly VITE_MEZO_PORTAL_API_KEY: string
   readonly VITE_LATEST_COMMIT_HASH: string
   readonly VITE_ACRE_API_ENDPOINT: string
 }
diff --git a/dapp/vite.config.ts b/dapp/vite.config.ts
index f8e213556..cb5172393 100644
--- a/dapp/vite.config.ts
+++ b/dapp/vite.config.ts
@@ -1,3 +1,4 @@
+import { sentryVitePlugin } from "@sentry/vite-plugin"
 import { defineConfig } from "vite"
 import react from "@vitejs/plugin-react"
 import { nodePolyfills } from "vite-plugin-node-polyfills"
@@ -14,8 +15,20 @@ export default defineConfig({
       "#": resolve(__dirname, "./src"),
     },
   },
-  plugins: [nodePolyfills(), react()],
+
+  plugins: [
+    nodePolyfills(),
+    react(),
+    // Sentry plugin for Vite. Uploads source maps to Sentry.
+    sentryVitePlugin(),
+  ],
+
   define: {
     "import.meta.env.VITE_LATEST_COMMIT_HASH": latestCommitHash,
   },
+
+  build: {
+    // Build sourcemaps for Sentry integration.
+    sourcemap: true,
+  },
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 19855043b..4eb8e62b9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,8 +39,8 @@ importers:
         specifier: 1.6.0
         version: 1.6.0
       '@orangekit/react':
-        specifier: 1.0.0-beta.32
-        version: 1.0.0-beta.32(@react-native-async-storage/async-storage@1.23.1(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10)))(@tanstack/query-core@5.45.0)(@tanstack/react-query@5.45.0(react@18.3.1))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(rollup@4.18.0)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)
+        specifier: 1.0.0-beta.33
+        version: 1.0.0-beta.33(@react-native-async-storage/async-storage@1.23.1(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10)))(@tanstack/query-core@5.45.0)(@tanstack/react-query@5.45.0(react@18.3.1))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(rollup@4.18.0)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)
       '@orangekit/sign-in-with-wallet':
         specifier: 1.0.0-beta.6
         version: 1.0.0-beta.6(bech32@2.0.0)(ethers@6.13.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))
@@ -54,11 +54,11 @@ importers:
         specifier: ^5.0.1
         version: 5.0.1(typescript@5.4.5)(zod@3.23.8)
       '@sentry/react':
-        specifier: ^7.98.0
-        version: 7.117.0(react@18.3.1)
+        specifier: ^8.34.0
+        version: 8.36.0(react@18.3.1)
       '@sentry/types':
-        specifier: ^7.102.0
-        version: 7.117.0
+        specifier: ^8.34.0
+        version: 8.36.0
       '@tabler/icons-react':
         specifier: ^3.1.0
         version: 3.6.0(react@18.3.1)
@@ -71,6 +71,9 @@ importers:
       axios:
         specifier: ^1.6.7
         version: 1.6.7
+      bignumber.js:
+        specifier: ^9.1.2
+        version: 9.1.2
       ethers:
         specifier: ^6.10.0
         version: 6.13.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
@@ -108,6 +111,9 @@ importers:
         specifier: ^2.9.11
         version: 2.10.2(krx5tu63huzknimzqydr6nvrbi)
     devDependencies:
+      '@sentry/vite-plugin':
+        specifier: ^2.22.5
+        version: 2.22.6(encoding@0.1.13)
       '@thesis-co/eslint-config':
         specifier: github:thesis/eslint-config#7b9bc8c
         version: https://codeload.github.com/thesis/eslint-config/tar.gz/7b9bc8c(eslint@8.57.0)(prettier@3.3.2)(typescript@5.4.5)
@@ -160,8 +166,8 @@ importers:
         specifier: 2.5.0-dev.3
         version: 2.5.0-dev.3(@keep-network/keep-core@1.8.1-dev.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
       '@orangekit/sdk':
-        specifier: 1.0.0-beta.18-dev.5
-        version: 1.0.0-beta.18-dev.5(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
+        specifier: 1.0.0-beta.18
+        version: 1.0.0-beta.18(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
       ethers:
         specifier: 6.10.0
         version: 6.10.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
@@ -1119,6 +1125,7 @@ packages:
   '@celo/connect@1.5.2':
     resolution: {integrity: sha512-IHsvYp1HizIPfPPeIHyvsmJytIf7HNtNWo9CqCbsqfNfmw53q6dFJu2p5X0qz/fUnR5840cUga8cEyuYZTfp+w==}
     engines: {node: '>=8.13.0'}
+    deprecated: Versions less than 5.1 are deprecated and will no longer be able to submit transactions to celo in a future hardfork
     peerDependencies:
       web3: 1.3.6
 
@@ -1141,6 +1148,7 @@ packages:
   '@celo/wallet-base@1.5.2':
     resolution: {integrity: sha512-NYJu7OtSRFpGcvSMl2Wc8zN32S6oTkAzKqhH7rXisQ0I2q4yNwCzoquzPVYB0G2UVUFKuuxgsA5V+Zda/LQCyw==}
     engines: {node: '>=8.13.0'}
+    deprecated: Versions less than 5.1 are deprecated and will no longer be able to submit transactions to celo in a future hardfork
 
   '@celo/wallet-local@1.5.2':
     resolution: {integrity: sha512-Aas4SwqQc8ap0OFAOZc+jBR4cXr20V9AReHNEI8Y93R3g1+RlSEJ1Zmsu4vN+Rriz58YqgMnr+pihorw8QydFQ==}
@@ -2640,9 +2648,11 @@ packages:
 
   '@openzeppelin/defender-admin-client@1.54.6':
     resolution: {integrity: sha512-P4lxJDySrekWNuPa7FeyW/UmuxnuIXIAGYr5gZnmnMHRsYNaw+XfgkiCDfoGtjEyJbXYxXttYF6iAZhWQPdf1g==}
+    deprecated: This package has been deprecated and will no longer be maintained, please use @openzeppelin/defender-sdk package instead.
 
   '@openzeppelin/defender-base-client@1.54.6':
     resolution: {integrity: sha512-PTef+rMxkM5VQ7sLwLKSjp2DBakYQd661ZJiSRywx+q/nIpm3B/HYGcz5wPZCA5O/QcEP6TatXXDoeMwimbcnw==}
+    deprecated: This package has been deprecated and will no longer be maintained, please use @openzeppelin/defender-sdk package instead.
 
   '@openzeppelin/defender-sdk-base-client@1.13.4':
     resolution: {integrity: sha512-fZjDxdL5WBt6kjKN8j6WlfIsggZKv37W1KoRkT0XwYv7Jslmr22i2qUs8ZreAzATD3ESYQs7YlO7ge0ElqdOKg==}
@@ -2676,14 +2686,11 @@ packages:
   '@orangekit/contracts@1.0.0-beta.3':
     resolution: {integrity: sha512-xP1Oz/JzuHypg5DcsHayINhFSL5M/tCmRP/stmNAvjeebXhrKuALKAHWn98H0Mo3QfYYrz8UcltQPeH6+68n6A==}
 
-  '@orangekit/react@1.0.0-beta.32':
-    resolution: {integrity: sha512-/ztJG0QjGoRDhs7sBCFxsAeTs5eVnm6e5qFKlDTwSbTP5AIQRTdjlQL+ThuTPjeZJBtyCTC+OvEFvt3PfVXEog==}
-
-  '@orangekit/sdk@1.0.0-beta.17':
-    resolution: {integrity: sha512-SWGWbsidxe9qRGTzRcvVxNVC//HBEj7L0QIqduFAu2RVe1Khi4HlS1jEkfcvLTxwjY0qzDQwUyxWovSmnJKZNw==}
+  '@orangekit/react@1.0.0-beta.33':
+    resolution: {integrity: sha512-b5VMFB2tZad86FNdtylwsKaXlXlrSjY9cIMsaJMUh7EEWEoVvtndbCsHrISKbspm7y+S5nNmGlE3WcQvR8RWWw==}
 
-  '@orangekit/sdk@1.0.0-beta.18-dev.5':
-    resolution: {integrity: sha512-2ZMofgGIgcGrd52pE4Gy/V0sisdZN5G4s1ZZvaf6x45ZBCq174epBEs0Zs7TNvxBL8xbJDLQkGpfn0UMZ32gFw==}
+  '@orangekit/sdk@1.0.0-beta.18':
+    resolution: {integrity: sha512-031JkI0F8gdGzj/7sKbJ52k0Xj/E4uwp/O0SWFDCXyZC0vwtjlw3ItAaZz+nIj820b6dSM6pjL+P7um3m9AK3Q==}
 
   '@orangekit/sign-in-with-wallet-parser@1.0.0-beta.6':
     resolution: {integrity: sha512-Yi6ohSJV4/Ovrq5c7jD+kPE8pZxLhWtFbZjKRwUW8JL60P/tcyT5o0etul0reqcY2iBlIo5aoC2Hh0noRGl86w==}
@@ -3143,38 +3150,92 @@ packages:
   '@scure/bip39@1.3.0':
     resolution: {integrity: sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==}
 
-  '@sentry-internal/feedback@7.117.0':
-    resolution: {integrity: sha512-4X+NnnY17W74TymgLFH7/KPTVYpEtoMMJh8HzVdCmHTOE6j32XKBeBMRaXBhmNYmEgovgyRKKf2KvtSfgw+V1Q==}
-    engines: {node: '>=12'}
+  '@sentry-internal/browser-utils@8.36.0':
+    resolution: {integrity: sha512-AVJ9GmQW7jYxaal6hjQnnktsDNype01ajVC4q1RyOn1SfzSnXg6mXwj4xm4ovuJV+aBI7fAZJ55vEX5ASuP0ZA==}
+    engines: {node: '>=14.18'}
 
-  '@sentry-internal/replay-canvas@7.117.0':
-    resolution: {integrity: sha512-7hjIhwEcoosr+BIa0AyEssB5xwvvlzUpvD5fXu4scd3I3qfX8gdnofO96a8r+LrQm3bSj+eN+4TfKEtWb7bU5A==}
-    engines: {node: '>=12'}
+  '@sentry-internal/feedback@8.36.0':
+    resolution: {integrity: sha512-aAMTm3uDBj8Ta7FwoohpLmJOpWzpWXvvtTbtmSgkeCtPJLUS8DZDCTZ9uCILUkpuYrv2savRUHsdPkxNjgL8FA==}
+    engines: {node: '>=14.18'}
 
-  '@sentry-internal/tracing@7.117.0':
-    resolution: {integrity: sha512-fAIyijNvKBZNA12IcKo+dOYDRTNrzNsdzbm3DP37vJRKVQu19ucqP4Y6InvKokffDP2HZPzFPDoGXYuXkDhUZg==}
-    engines: {node: '>=8'}
+  '@sentry-internal/replay-canvas@8.36.0':
+    resolution: {integrity: sha512-KJPLf+qYdrQdmouoAqIPZ2KeapIBlHWbzNdQqNxJFWLHFFjpLUtt0b+87ruvbA/q3NYy2fDwD7EB0tGS1RHBaA==}
+    engines: {node: '>=14.18'}
 
-  '@sentry/browser@7.117.0':
-    resolution: {integrity: sha512-29X9HlvDEKIaWp6XKlNPPSNND0U6P/ede5WA2nVHfs1zJLWdZ7/ijuMc0sH/CueEkqHe/7gt94hBcI7HOU/wSw==}
-    engines: {node: '>=8'}
+  '@sentry-internal/replay@8.36.0':
+    resolution: {integrity: sha512-lbic98GsSkDeinQDix54tBFEgHUlmBtO+HjXECk9jIE0vOzR4As20/s5ta46t1rKMLlnxOtJuT5jKXeUYogBUw==}
+    engines: {node: '>=14.18'}
+
+  '@sentry/babel-plugin-component-annotate@2.22.6':
+    resolution: {integrity: sha512-V2g1Y1I5eSe7dtUVMBvAJr8BaLRr4CLrgNgtPaZyMT4Rnps82SrZ5zqmEkLXPumlXhLUWR6qzoMNN2u+RXVXfQ==}
+    engines: {node: '>= 14'}
+
+  '@sentry/browser@8.36.0':
+    resolution: {integrity: sha512-bLrQNe+wD4DkCfB8OD5TF3Rr8KA2+aTo5wF3t3Bf6KVn8//iX1ia1hhtptYiRnbRkG/0AEPxlqL6XfPZYVPQ5A==}
+    engines: {node: '>=14.18'}
+
+  '@sentry/bundler-plugin-core@2.22.6':
+    resolution: {integrity: sha512-1esQdgSUCww9XAntO4pr7uAM5cfGhLsgTK9MEwAKNfvpMYJi9NUTYa3A7AZmdA8V6107Lo4OD7peIPrDRbaDCg==}
+    engines: {node: '>= 14'}
+
+  '@sentry/cli-darwin@2.38.1':
+    resolution: {integrity: sha512-IHuxm072aSTAvwuHtLg065cF00Pxm2wprnrRr2lkyWp8nLOoO7DmumWZ4pjHvhB8yZXsAbM/PSxLRBoDIRDPzQ==}
+    engines: {node: '>=10'}
+    os: [darwin]
+
+  '@sentry/cli-linux-arm64@2.38.1':
+    resolution: {integrity: sha512-3bj5DS4wDusL0YHwG5qeI+O19kz4N4KDDmnWqIew56MmSSAEM5B0qKk5Hivu1vRU5vPKFwVn8BVjLnKXu9idjg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux, freebsd]
+
+  '@sentry/cli-linux-arm@2.38.1':
+    resolution: {integrity: sha512-xyf4f56O4/eeirol8t1tTQw0cwF34b3v69zn6wHtKfx2lW5IEBGO+agVNdOdosnCx6j3UadgdRXUJlSyM9kx/w==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux, freebsd]
+
+  '@sentry/cli-linux-i686@2.38.1':
+    resolution: {integrity: sha512-VygJO2oTc6GfiqqmPYNpO2bW1hzszuNyn37SSmeRuuhq1/kRwD+ZQj4OmXYEASjSLg+8mDPoWOurPjHEPKNtNw==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [linux, freebsd]
+
+  '@sentry/cli-linux-x64@2.38.1':
+    resolution: {integrity: sha512-9SaPJK5yAGR7qGsDubTT9O7VpNQG9KIolCOov4xJU7scbmjGaFyYBm9c7ZIqbq6B+56YchPbtD0RewZC6CiF2w==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux, freebsd]
+
+  '@sentry/cli-win32-i686@2.38.1':
+    resolution: {integrity: sha512-BVUM5y+ZDBK/LqyVvt0C7oolmg8aq7PI/u04/Pp6FLRExySqwyQim0vNyL2FRjIeX1yhbk7x4Z79UjEKqJBltA==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [win32]
+
+  '@sentry/cli-win32-x64@2.38.1':
+    resolution: {integrity: sha512-+HgsdM3LFSzUNlDpicPRdTKfr5u+nJ2C5p4aDYPb2G+qoYW+66FI4NxgWSyzJsj3nVQ8lW5/6AoMP6U5z/e/0A==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@sentry/cli@2.38.1':
+    resolution: {integrity: sha512-XFO04nP7cn0tboMQ4ALR81QRF/6xoWAFzNld7Io6jHbaFzihqewjxAqy7pSvVPaieepUjqe7m/Ippt00kKOACg==}
+    engines: {node: '>= 10'}
+    hasBin: true
 
   '@sentry/core@5.30.0':
     resolution: {integrity: sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==}
     engines: {node: '>=6'}
 
-  '@sentry/core@7.117.0':
-    resolution: {integrity: sha512-1XZ4/d/DEwnfM2zBMloXDwX+W7s76lGKQMgd8bwgPJZjjEztMJ7X0uopKAGwlQcjn242q+hsCBR6C+fSuI5kvg==}
-    engines: {node: '>=8'}
+  '@sentry/core@8.36.0':
+    resolution: {integrity: sha512-cbq1WQyRqc/+YpPhjwQxfniUM3ZxmO3Pm1oisTB8dw6mlbgQfGD6aznEIjXWWJY6k6acewJlMUx09N7DnprtBw==}
+    engines: {node: '>=14.18'}
 
   '@sentry/hub@5.30.0':
     resolution: {integrity: sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==}
     engines: {node: '>=6'}
 
-  '@sentry/integrations@7.117.0':
-    resolution: {integrity: sha512-U3suSZysmU9EiQqg0ga5CxveAyNbi9IVdsapMDq5EQGNcVDvheXtULs+BOc11WYP3Kw2yWB38VDqLepfc/Fg2g==}
-    engines: {node: '>=8'}
-
   '@sentry/minimal@5.30.0':
     resolution: {integrity: sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==}
     engines: {node: '>=6'}
@@ -3183,15 +3244,11 @@ packages:
     resolution: {integrity: sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==}
     engines: {node: '>=6'}
 
-  '@sentry/react@7.117.0':
-    resolution: {integrity: sha512-aK+yaEP2esBhaczGU96Y7wkqB4umSIlRAzobv7ER88EGHzZulRaocTpQO8HJJGDHm4D8rD+E893BHnghkoqp4Q==}
-    engines: {node: '>=8'}
+  '@sentry/react@8.36.0':
+    resolution: {integrity: sha512-YIJZUx7Q5aulK034cRri0p/7MeP3tdLfdP6vMJMwrVlqoWQI9gKZXikmLIqHUQegZdMRYX5tr03gTWJu3dhYwg==}
+    engines: {node: '>=14.18'}
     peerDependencies:
-      react: 15.x || 16.x || 17.x || 18.x
-
-  '@sentry/replay@7.117.0':
-    resolution: {integrity: sha512-V4DfU+x4UsA4BsufbQ8jHYa5H0q5PYUgso2X1PR31g1fpx7yiYguSmCfz1UryM6KkH92dfTnqXapDB44kXOqzQ==}
-    engines: {node: '>=12'}
+      react: ^16.14.0 || 17.x || 18.x || 19.x
 
   '@sentry/tracing@5.30.0':
     resolution: {integrity: sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==}
@@ -3201,17 +3258,21 @@ packages:
     resolution: {integrity: sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==}
     engines: {node: '>=6'}
 
-  '@sentry/types@7.117.0':
-    resolution: {integrity: sha512-5dtdulcUttc3F0Te7ekZmpSp/ebt/CA71ELx0uyqVGjWsSAINwskFD77sdcjqvZWek//WjiYX1+GRKlpJ1QqsA==}
-    engines: {node: '>=8'}
+  '@sentry/types@8.36.0':
+    resolution: {integrity: sha512-K1pVFfdGHw115RzGHpwSOqoEPeayn4N1F9IfM0kxrYpQSbFT1X29eak88GBfC8gPiLEF0iFGlSaQ4ERmF7oRcA==}
+    engines: {node: '>=14.18'}
 
   '@sentry/utils@5.30.0':
     resolution: {integrity: sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==}
     engines: {node: '>=6'}
 
-  '@sentry/utils@7.117.0':
-    resolution: {integrity: sha512-KkcLY8643SGBiDyPvMQOubBkwVX5IPknMHInc7jYC8pDVncGp7C65Wi506bCNPpKCWspUd/0VDNWOOen51/qKA==}
-    engines: {node: '>=8'}
+  '@sentry/utils@8.36.0':
+    resolution: {integrity: sha512-oJ3EDPj0I00z+AwC3EWBpSidXYUoKW0Id8MfMQP5Hflniz3gif7UEReblT+FJgPEVo6+6uNzAncY0MuNMxmDKQ==}
+    engines: {node: '>=14.18'}
+
+  '@sentry/vite-plugin@2.22.6':
+    resolution: {integrity: sha512-zIieP1VLWQb3wUjFJlwOAoaaJygJhXeUoGd0e/Ha2RLb2eW2S+4gjf6y6NqyY71tZ74LYVZKg/4prB6FAZSMXQ==}
+    engines: {node: '>= 14'}
 
   '@sideway/address@4.1.5':
     resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==}
@@ -5416,6 +5477,7 @@ packages:
 
   eciesjs@0.3.19:
     resolution: {integrity: sha512-b+PkRDZ3ym7HEcnbxc22CMVCpgsnr8+gGgST3U5PtgeX1luvINgfXW7efOyUtmn/jFtA/lg5ywBi/Uazf4oeaA==}
+    deprecated: Please upgrade to v0.4+
 
   ecpair@2.1.0:
     resolution: {integrity: sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==}
@@ -5711,6 +5773,7 @@ packages:
   eslint@8.57.0:
     resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
   esniff@2.0.1:
@@ -5797,6 +5860,7 @@ packages:
 
   ethereum-bloom-filters@1.1.0:
     resolution: {integrity: sha512-J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw==}
+    deprecated: do not use this package use package versions above as this can miss some topics
 
   ethereum-cryptography@0.1.3:
     resolution: {integrity: sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==}
@@ -6659,9 +6723,6 @@ packages:
     engines: {node: '>=16.x'}
     hasBin: true
 
-  immediate@3.0.6:
-    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
-
   immer@10.1.1:
     resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==}
 
@@ -7459,9 +7520,6 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
-  lie@3.1.1:
-    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
-
   lighthouse-logger@1.4.2:
     resolution: {integrity: sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==}
 
@@ -7485,9 +7543,6 @@ packages:
     resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
 
-  localforage@1.10.0:
-    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
-
   locate-path@2.0.0:
     resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
     engines: {node: '>=4'}
@@ -7644,6 +7699,10 @@ packages:
   magic-string@0.30.10:
     resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
+  magic-string@0.30.8:
+    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
+    engines: {node: '>=12'}
+
   make-dir@1.3.0:
     resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
     engines: {node: '>=4'}
@@ -8612,6 +8671,10 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
+  progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+
   promise@8.3.0:
     resolution: {integrity: sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==}
 
@@ -10070,6 +10133,9 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
+  unplugin@1.0.1:
+    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
+
   unstorage@1.10.2:
     resolution: {integrity: sha512-cULBcwDqrS8UhlIysUJs2Dk0Mmt8h7B0E6mtR+relW9nZvsf/u4SkAYyNliPiPW7XtFNb5u3IUMkxGxFTTRTgQ==}
     peerDependencies:
@@ -10769,6 +10835,13 @@ packages:
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
+  webpack-sources@3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
+    engines: {node: '>=10.13.0'}
+
+  webpack-virtual-modules@0.5.0:
+    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
+
   websocket@1.0.35:
     resolution: {integrity: sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==}
     engines: {node: '>=4.0.0'}
@@ -14744,9 +14817,9 @@ snapshots:
     transitivePeerDependencies:
       - ethers
 
-  '@orangekit/react@1.0.0-beta.32(@react-native-async-storage/async-storage@1.23.1(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10)))(@tanstack/query-core@5.45.0)(@tanstack/react-query@5.45.0(react@18.3.1))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(rollup@4.18.0)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)':
+  '@orangekit/react@1.0.0-beta.33(@react-native-async-storage/async-storage@1.23.1(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10)))(@tanstack/query-core@5.45.0)(@tanstack/react-query@5.45.0(react@18.3.1))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(rollup@4.18.0)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)':
     dependencies:
-      '@orangekit/sdk': 1.0.0-beta.17(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
+      '@orangekit/sdk': 1.0.0-beta.18(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
       '@rainbow-me/rainbowkit': 2.0.2(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(viem@2.8.16(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8))(wagmi@2.5.12(@react-native-async-storage/async-storage@1.23.1(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10)))(@tanstack/query-core@5.45.0)(@tanstack/react-query@5.45.0(react@18.3.1))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.2(@babel/core@7.24.7)(@babel/preset-env@7.24.7(@babel/core@7.24.7))(@types/react@18.3.3)(bufferutil@4.0.8)(encoding@0.1.13)(react@18.3.1)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.18.0)(typescript@5.4.5)(utf-8-validate@5.0.10)(viem@2.8.16(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8))
       ethers: 6.12.1(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       react: 18.3.1
@@ -14783,23 +14856,7 @@ snapshots:
       - utf-8-validate
       - zod
 
-  '@orangekit/sdk@1.0.0-beta.17(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)':
-    dependencies:
-      '@gelatonetwork/relay-sdk': 5.5.6(bufferutil@4.0.8)(utf-8-validate@5.0.10)
-      '@noble/curves': 1.4.0
-      '@noble/hashes': 1.4.0
-      '@orangekit/contracts': 1.0.0-beta.3(ethers@6.12.1(bufferutil@4.0.8)(utf-8-validate@5.0.10))
-      '@safe-global/protocol-kit': 3.1.1(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)
-      bitcoinjs-lib: 6.1.5
-      ethers: 6.12.1(bufferutil@4.0.8)(utf-8-validate@5.0.10)
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - encoding
-      - supports-color
-      - utf-8-validate
-
-  '@orangekit/sdk@1.0.0-beta.18-dev.5(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)':
+  '@orangekit/sdk@1.0.0-beta.18(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@5.0.10)':
     dependencies:
       '@gelatonetwork/relay-sdk': 5.5.6(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       '@noble/curves': 1.4.0
@@ -15489,35 +15546,97 @@ snapshots:
       '@noble/hashes': 1.4.0
       '@scure/base': 1.1.7
 
-  '@sentry-internal/feedback@7.117.0':
+  '@sentry-internal/browser-utils@8.36.0':
     dependencies:
-      '@sentry/core': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
 
-  '@sentry-internal/replay-canvas@7.117.0':
+  '@sentry-internal/feedback@8.36.0':
     dependencies:
-      '@sentry/core': 7.117.0
-      '@sentry/replay': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
 
-  '@sentry-internal/tracing@7.117.0':
+  '@sentry-internal/replay-canvas@8.36.0':
     dependencies:
-      '@sentry/core': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry-internal/replay': 8.36.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
 
-  '@sentry/browser@7.117.0':
+  '@sentry-internal/replay@8.36.0':
     dependencies:
-      '@sentry-internal/feedback': 7.117.0
-      '@sentry-internal/replay-canvas': 7.117.0
-      '@sentry-internal/tracing': 7.117.0
-      '@sentry/core': 7.117.0
-      '@sentry/integrations': 7.117.0
-      '@sentry/replay': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry-internal/browser-utils': 8.36.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
+
+  '@sentry/babel-plugin-component-annotate@2.22.6': {}
+
+  '@sentry/browser@8.36.0':
+    dependencies:
+      '@sentry-internal/browser-utils': 8.36.0
+      '@sentry-internal/feedback': 8.36.0
+      '@sentry-internal/replay': 8.36.0
+      '@sentry-internal/replay-canvas': 8.36.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
+
+  '@sentry/bundler-plugin-core@2.22.6(encoding@0.1.13)':
+    dependencies:
+      '@babel/core': 7.24.7
+      '@sentry/babel-plugin-component-annotate': 2.22.6
+      '@sentry/cli': 2.38.1(encoding@0.1.13)
+      dotenv: 16.4.5
+      find-up: 5.0.0
+      glob: 9.3.5
+      magic-string: 0.30.8
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@sentry/cli-darwin@2.38.1':
+    optional: true
+
+  '@sentry/cli-linux-arm64@2.38.1':
+    optional: true
+
+  '@sentry/cli-linux-arm@2.38.1':
+    optional: true
+
+  '@sentry/cli-linux-i686@2.38.1':
+    optional: true
+
+  '@sentry/cli-linux-x64@2.38.1':
+    optional: true
+
+  '@sentry/cli-win32-i686@2.38.1':
+    optional: true
+
+  '@sentry/cli-win32-x64@2.38.1':
+    optional: true
+
+  '@sentry/cli@2.38.1(encoding@0.1.13)':
+    dependencies:
+      https-proxy-agent: 5.0.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      which: 2.0.2
+    optionalDependencies:
+      '@sentry/cli-darwin': 2.38.1
+      '@sentry/cli-linux-arm': 2.38.1
+      '@sentry/cli-linux-arm64': 2.38.1
+      '@sentry/cli-linux-i686': 2.38.1
+      '@sentry/cli-linux-x64': 2.38.1
+      '@sentry/cli-win32-i686': 2.38.1
+      '@sentry/cli-win32-x64': 2.38.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
   '@sentry/core@5.30.0':
     dependencies:
@@ -15527,10 +15646,10 @@ snapshots:
       '@sentry/utils': 5.30.0
       tslib: 1.14.1
 
-  '@sentry/core@7.117.0':
+  '@sentry/core@8.36.0':
     dependencies:
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
 
   '@sentry/hub@5.30.0':
     dependencies:
@@ -15538,13 +15657,6 @@ snapshots:
       '@sentry/utils': 5.30.0
       tslib: 1.14.1
 
-  '@sentry/integrations@7.117.0':
-    dependencies:
-      '@sentry/core': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
-      localforage: 1.10.0
-
   '@sentry/minimal@5.30.0':
     dependencies:
       '@sentry/hub': 5.30.0
@@ -15565,22 +15677,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/react@7.117.0(react@18.3.1)':
+  '@sentry/react@8.36.0(react@18.3.1)':
     dependencies:
-      '@sentry/browser': 7.117.0
-      '@sentry/core': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
+      '@sentry/browser': 8.36.0
+      '@sentry/core': 8.36.0
+      '@sentry/types': 8.36.0
+      '@sentry/utils': 8.36.0
       hoist-non-react-statics: 3.3.2
       react: 18.3.1
 
-  '@sentry/replay@7.117.0':
-    dependencies:
-      '@sentry-internal/tracing': 7.117.0
-      '@sentry/core': 7.117.0
-      '@sentry/types': 7.117.0
-      '@sentry/utils': 7.117.0
-
   '@sentry/tracing@5.30.0':
     dependencies:
       '@sentry/hub': 5.30.0
@@ -15591,16 +15696,24 @@ snapshots:
 
   '@sentry/types@5.30.0': {}
 
-  '@sentry/types@7.117.0': {}
+  '@sentry/types@8.36.0': {}
 
   '@sentry/utils@5.30.0':
     dependencies:
       '@sentry/types': 5.30.0
       tslib: 1.14.1
 
-  '@sentry/utils@7.117.0':
+  '@sentry/utils@8.36.0':
+    dependencies:
+      '@sentry/types': 8.36.0
+
+  '@sentry/vite-plugin@2.22.6(encoding@0.1.13)':
     dependencies:
-      '@sentry/types': 7.117.0
+      '@sentry/bundler-plugin-core': 2.22.6(encoding@0.1.13)
+      unplugin: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
   '@sideway/address@4.1.5':
     dependencies:
@@ -20485,8 +20598,6 @@ snapshots:
     dependencies:
       queue: 6.0.2
 
-  immediate@3.0.6: {}
-
   immer@10.1.1: {}
 
   immutable@4.2.1: {}
@@ -21566,10 +21677,6 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lie@3.1.1:
-    dependencies:
-      immediate: 3.0.6
-
   lighthouse-logger@1.4.2:
     dependencies:
       debug: 2.6.9
@@ -21623,10 +21730,6 @@ snapshots:
       mlly: 1.7.1
       pkg-types: 1.1.1
 
-  localforage@1.10.0:
-    dependencies:
-      lie: 3.1.1
-
   locate-path@2.0.0:
     dependencies:
       p-locate: 2.0.0
@@ -21752,6 +21855,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
+  magic-string@0.30.8:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+
   make-dir@1.3.0:
     dependencies:
       pify: 3.0.0
@@ -22827,6 +22934,8 @@ snapshots:
 
   process@0.11.10: {}
 
+  progress@2.0.3: {}
+
   promise@8.3.0:
     dependencies:
       asap: 2.0.6
@@ -23438,7 +23547,7 @@ snapshots:
 
   rimraf@2.7.1:
     dependencies:
-      glob: 7.2.0
+      glob: 7.2.3
 
   rimraf@3.0.2:
     dependencies:
@@ -24585,6 +24694,13 @@ snapshots:
 
   unpipe@1.0.0: {}
 
+  unplugin@1.0.1:
+    dependencies:
+      acorn: 8.12.0
+      chokidar: 3.6.0
+      webpack-sources: 3.2.3
+      webpack-virtual-modules: 0.5.0
+
   unstorage@1.10.2(idb-keyval@6.2.1):
     dependencies:
       anymatch: 3.1.3
@@ -25805,6 +25921,10 @@ snapshots:
 
   webidl-conversions@3.0.1: {}
 
+  webpack-sources@3.2.3: {}
+
+  webpack-virtual-modules@0.5.0: {}
+
   websocket@1.0.35:
     dependencies:
       bufferutil: 4.0.8
diff --git a/sdk/package.json b/sdk/package.json
index 97e4c85b3..2a79b6f5d 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@acre-btc/contracts": "workspace:*",
     "@keep-network/tbtc-v2.ts": "2.5.0-dev.3",
-    "@orangekit/sdk": "1.0.0-beta.18-dev.5",
+    "@orangekit/sdk": "1.0.0-beta.18",
     "ethers": "6.10.0",
     "ethers-v5": "npm:ethers@^5.5.2"
   }
diff --git a/sdk/src/acre.ts b/sdk/src/acre.ts
index 653f776ca..5a1182bf9 100644
--- a/sdk/src/acre.ts
+++ b/sdk/src/acre.ts
@@ -11,7 +11,7 @@ import {
 } from "./lib/ethereum"
 import Account from "./modules/account"
 import Tbtc from "./modules/tbtc"
-import { BitcoinProvider, BitcoinNetwork } from "./lib/bitcoin"
+import { AcreBitcoinProvider, BitcoinNetwork } from "./lib/bitcoin"
 import { getChainIdByNetwork } from "./lib/ethereum/network"
 import AcreSubgraphApi from "./lib/api/AcreSubgraphApi"
 import Protocol from "./modules/protocol"
@@ -118,7 +118,7 @@ class Acre {
    * @param bitcoinProvider Provider for Bitcoin wallet.
    * @returns Acre SDK instance with connected account.
    */
-  async connect(bitcoinProvider: BitcoinProvider): Promise<Acre> {
+  async connect(bitcoinProvider: AcreBitcoinProvider): Promise<Acre> {
     const accountBitcoinAddress = await bitcoinProvider.getAddress()
     const accountBitcoinPublicKey = await bitcoinProvider.getPublicKey()
     const accountEthereumAddress = EthereumAddress.from(
diff --git a/sdk/src/lib/bitcoin/index.ts b/sdk/src/lib/bitcoin/index.ts
index 4008f4590..110d4a33c 100644
--- a/sdk/src/lib/bitcoin/index.ts
+++ b/sdk/src/lib/bitcoin/index.ts
@@ -1,4 +1,5 @@
 export * from "./transaction"
 export { default as BitcoinNetwork } from "./network"
+export { BitcoinSignatureHelper } from "@orangekit/sdk"
 export * from "./address"
 export * from "./providers"
diff --git a/sdk/src/lib/bitcoin/providers/provider.ts b/sdk/src/lib/bitcoin/providers/provider.ts
index 1b7e06267..16dc459d2 100644
--- a/sdk/src/lib/bitcoin/providers/provider.ts
+++ b/sdk/src/lib/bitcoin/providers/provider.ts
@@ -1,9 +1,11 @@
-// TODO: This is just a temporary interface that should be replaced by the
-// `OrangeKitBitcoinWalletProvider` from the `orangekit` library.
+import { SafeTransactionData } from "@orangekit/sdk"
+
+export { SafeTransactionData }
+
 /**
  * Interface for communication with Bitcoin Wallet.
  */
-export interface BitcoinProvider {
+export interface AcreBitcoinProvider {
   /**
    * Acre SDK must rely on the `BitcoinProvider` implementation to get the
    * bitcoin address because different wallets use different strategies. For
@@ -18,7 +20,8 @@ export interface BitcoinProvider {
   /**
    * Signs message.
    * @param message Message to sign.
-   * @returns Hash of the signed message.
+   * @returns A signature for a given message, which proves that the owner of
+   *          the account has agreed to the message content.
    */
   signMessage(message: string): Promise<string>
 
@@ -28,10 +31,16 @@ export interface BitcoinProvider {
   getPublicKey(): Promise<string>
 
   /**
-   * Signs withdraw message.
+   * Signs withdraw message. This function is optional and if it is not
+   * implemented the `signMessage` function will be used to sign the withdrawal
+   * message.
    * @param message Message to sign.
    * @param data Withdrawal transaction data.
-   * @returns Hash of the signed message.
+   * @returns A signature for a given message, which proves that the owner of
+   *          the account has agreed to the message content.
    */
-  signWithdrawMessage?(message: string, data: unknown): Promise<string>
+  signWithdrawMessage?(
+    message: string,
+    data: SafeTransactionData,
+  ): Promise<string>
 }
diff --git a/sdk/src/lib/redeemer-proxy.ts b/sdk/src/lib/redeemer-proxy.ts
index 67ac83679..e0b778574 100644
--- a/sdk/src/lib/redeemer-proxy.ts
+++ b/sdk/src/lib/redeemer-proxy.ts
@@ -3,9 +3,9 @@ import {
   Hex,
   RedeemerProxy as TbtcRedeemerProxy,
 } from "@keep-network/tbtc-v2.ts"
-import { OrangeKitSdk, SafeTxData } from "@orangekit/sdk"
+import { OrangeKitSdk } from "@orangekit/sdk"
 import { AcreContracts } from "./contracts"
-import { BitcoinProvider } from "./bitcoin"
+import { AcreBitcoinProvider, SafeTransactionData } from "./bitcoin"
 
 export type OnSignMessageStepCallback = (messageToSign: string) => Promise<void>
 export type MessageSignedStepCallback = (signedMessage: string) => Promise<void>
@@ -21,7 +21,7 @@ export default class OrangeKitTbtcRedeemerProxy implements TbtcRedeemerProxy {
     ethereumAddress: ChainIdentifier
   }
 
-  #bitcoinProvider: BitcoinProvider
+  #bitcoinProvider: AcreBitcoinProvider
 
   #sharesAmount: bigint
 
@@ -37,7 +37,7 @@ export default class OrangeKitTbtcRedeemerProxy implements TbtcRedeemerProxy {
       bitcoinAddress: string
       ethereumAddress: ChainIdentifier
     },
-    bitcoinProvider: BitcoinProvider,
+    bitcoinProvider: AcreBitcoinProvider,
     sharesAmount: bigint,
     onSignMessageStepCallback?: OnSignMessageStepCallback,
     messageSignedStepCallback?: MessageSignedStepCallback,
@@ -68,7 +68,7 @@ export default class OrangeKitTbtcRedeemerProxy implements TbtcRedeemerProxy {
       safeTxData.toPrefixedString(),
       this.#account.bitcoinAddress,
       this.#account.publicKey,
-      async (message: string, txData: SafeTxData) => {
+      async (message: string, txData: SafeTransactionData) => {
         await this.#onSignMessageStepCallback?.(message)
         const signedMessage =
           await (this.#bitcoinProvider.signWithdrawMessage?.(message, txData) ??
diff --git a/sdk/src/modules/account.ts b/sdk/src/modules/account.ts
index 4fb568977..2c955d7cf 100644
--- a/sdk/src/modules/account.ts
+++ b/sdk/src/modules/account.ts
@@ -9,7 +9,7 @@ import OrangeKitTbtcRedeemerProxy, {
   MessageSignedStepCallback,
   OnSignMessageStepCallback,
 } from "../lib/redeemer-proxy"
-import { BitcoinProvider } from "../lib/bitcoin"
+import { AcreBitcoinProvider } from "../lib/bitcoin"
 
 export { DepositReceipt } from "./tbtc"
 
@@ -70,7 +70,7 @@ export default class Account {
 
   readonly #bitcoinPublicKey: string
 
-  readonly #bitcoinProvider: BitcoinProvider
+  readonly #bitcoinProvider: AcreBitcoinProvider
 
   readonly #orangeKitSdk: OrangeKitSdk
 
@@ -83,7 +83,7 @@ export default class Account {
       bitcoinPublicKey: string
       ethereumAddress: ChainIdentifier
     },
-    bitcoinProvider: BitcoinProvider,
+    bitcoinProvider: AcreBitcoinProvider,
     orangeKitSdk: OrangeKitSdk,
   ) {
     this.#contracts = contracts
diff --git a/sdk/test/lib/redeemer-proxy.test.ts b/sdk/test/lib/redeemer-proxy.test.ts
index 09418540d..870005d0f 100644
--- a/sdk/test/lib/redeemer-proxy.test.ts
+++ b/sdk/test/lib/redeemer-proxy.test.ts
@@ -1,13 +1,17 @@
 import { RedeemerProxy } from "@keep-network/tbtc-v2.ts"
 import { ethers } from "ethers"
-import { SafeTxData } from "@orangekit/sdk"
+import { SafeTransactionData } from "@orangekit/sdk"
 import { EthereumAddress } from "../../src/lib/ethereum"
 import { ChainIdentifier } from "../../src/lib/contracts"
 import { Hex } from "../../src/lib/utils"
 import OrangeKitTbtcRedeemerProxy from "../../src/lib/redeemer-proxy"
 import { MockAcreContracts } from "../utils/mock-acre-contracts"
 import { MockOrangeKitSdk } from "../utils/mock-orangekit"
-import { MockBitcoinProvider } from "../utils/mock-bitcoin-provider"
+import {
+  MockBitcoinProvider,
+  MockBitcoinProviderWithSignWithdrawMessage,
+} from "../utils/mock-bitcoin-provider"
+import { AcreBitcoinProvider } from "../../src/lib/bitcoin"
 
 describe("OrangeKitTbtcRedeemerProxy", () => {
   let redeemer: RedeemerProxy
@@ -20,6 +24,8 @@ describe("OrangeKitTbtcRedeemerProxy", () => {
     bitcoinAddress: "123",
   }
   const bitcoinProvider = new MockBitcoinProvider()
+  const bitcoinProviderWithSignWithdrawMessage =
+    new MockBitcoinProviderWithSignWithdrawMessage()
   const sharesAmount = 10n
 
   beforeEach(() => {
@@ -52,6 +58,8 @@ describe("OrangeKitTbtcRedeemerProxy", () => {
     const mockedStBTCIdentifier = EthereumAddress.from(
       "0x8FF2A98c1F08FD5a4D12bED447b90d4de045C10b",
     )
+    const mockedMessageToSign = "test"
+    const mockedSafeTxData = { to: "test" } as SafeTransactionData
 
     let result: Hex
     let spyOnSendTransaction: jest.SpyInstance<
@@ -64,7 +72,7 @@ describe("OrangeKitTbtcRedeemerProxy", () => {
         publicKey: string,
         bitcoinSignMessageFn: (
           message: string,
-          data: SafeTxData,
+          data: SafeTransactionData,
         ) => Promise<string>,
       ]
     >
@@ -77,62 +85,104 @@ describe("OrangeKitTbtcRedeemerProxy", () => {
       [spender: ChainIdentifier, amount: bigint, extraData: Hex]
     >
 
-    beforeAll(async () => {
-      spyOnSendTransaction = jest
-        .spyOn(orangeKitSdk, "sendTransaction")
-        .mockResolvedValueOnce(mockedTxHash)
-      spyOnBitcoinRedeemerIdentifier = jest
-        .spyOn(contracts.bitcoinRedeemer, "getChainIdentifier")
-        .mockReturnValueOnce(mockedBitcoinRedeemerIdentifier)
-      spyOnStBTCIdentifier = jest
-        .spyOn(contracts.stBTC, "getChainIdentifier")
-        .mockReturnValueOnce(mockedStBTCIdentifier)
-      spyOnEncodeData = jest
-        .spyOn(contracts.stBTC, "encodeApproveAndCallFunctionData")
-        .mockReturnValueOnce(mockedEncodedApproveAndCallData)
-
-      result = await redeemer.requestRedemption(mockedRedemptionData)
-    })
-
-    it("should get the bitcoin redeemer contract's address", () => {
-      expect(spyOnBitcoinRedeemerIdentifier).toHaveBeenCalled()
-    })
-
-    it("should encode approve and call data function", () => {
-      expect(spyOnEncodeData).toHaveBeenCalledWith(
-        mockedBitcoinRedeemerIdentifier,
-        sharesAmount,
-        mockedRedemptionData,
-      )
-    })
-
-    it("should get the stBTC contract's address", () => {
-      expect(spyOnStBTCIdentifier).toHaveBeenCalled()
-    })
-
-    it("should send transaction via orange kit", () => {
-      expect(spyOnSendTransaction).toHaveBeenCalledWith(
-        `0x${mockedStBTCIdentifier.identifierHex}`,
-        "0x0",
-        mockedEncodedApproveAndCallData.toPrefixedString(),
-        account.bitcoinAddress,
-        account.publicKey,
-        expect.any(Function),
-      )
-    })
-
-    it("the sign message function passed to the orange kit should call the bitcoin provider", async () => {
-      const signMessageFn = spyOnSendTransaction.mock.calls[0][5]
-      const mockedMessage = "test"
-      const mockedSafeTxData = { to: "test" } as SafeTxData
-
-      await signMessageFn(mockedMessage, mockedSafeTxData)
-
-      expect(bitcoinProvider.signMessage).toHaveBeenCalledWith(mockedMessage)
-    })
-
-    it("should return tx hash", () => {
-      expect(result.equals(Hex.from(mockedTxHash))).toBeTruthy()
+    describe.each<{
+      provider: AcreBitcoinProvider
+      description: string
+      functionToCall: "signWithdrawMessage" | "signMessage"
+      functionArgs: [string, SafeTransactionData] | [string]
+    }>([
+      {
+        provider: bitcoinProviderWithSignWithdrawMessage,
+        description:
+          "when the bitcoin provider implements the `signWithdrawMessage` function",
+        functionToCall: "signWithdrawMessage",
+        functionArgs: [mockedMessageToSign, mockedSafeTxData],
+      },
+      {
+        provider: bitcoinProvider,
+        description:
+          "when the bitcoin provider does not implement the `signWithdrawMessage` function",
+        functionToCall: "signMessage",
+        functionArgs: [mockedMessageToSign],
+      },
+    ])("$description", ({ provider, functionToCall, functionArgs }) => {
+      let spies: jest.SpyInstance[]
+
+      beforeAll(async () => {
+        spyOnSendTransaction = jest
+          .spyOn(orangeKitSdk, "sendTransaction")
+          .mockResolvedValueOnce(mockedTxHash)
+        spyOnBitcoinRedeemerIdentifier = jest
+          .spyOn(contracts.bitcoinRedeemer, "getChainIdentifier")
+          .mockReturnValueOnce(mockedBitcoinRedeemerIdentifier)
+        spyOnStBTCIdentifier = jest
+          .spyOn(contracts.stBTC, "getChainIdentifier")
+          .mockReturnValueOnce(mockedStBTCIdentifier)
+        spyOnEncodeData = jest
+          .spyOn(contracts.stBTC, "encodeApproveAndCallFunctionData")
+          .mockReturnValueOnce(mockedEncodedApproveAndCallData)
+
+        spies = [
+          spyOnSendTransaction,
+          spyOnBitcoinRedeemerIdentifier,
+          spyOnStBTCIdentifier,
+          spyOnEncodeData,
+        ]
+
+        redeemer = new OrangeKitTbtcRedeemerProxy(
+          contracts,
+          // @ts-expect-error we only mock used the orangeKit methods
+          orangeKitSdk,
+          account,
+          provider,
+          sharesAmount,
+        )
+
+        result = await redeemer.requestRedemption(mockedRedemptionData)
+      })
+
+      afterAll(() => {
+        spies.forEach((spy) => spy.mockClear())
+      })
+
+      it("should get the bitcoin redeemer contract's address", () => {
+        expect(spyOnBitcoinRedeemerIdentifier).toHaveBeenCalled()
+      })
+
+      it("should encode approve and call data function", () => {
+        expect(spyOnEncodeData).toHaveBeenCalledWith(
+          mockedBitcoinRedeemerIdentifier,
+          sharesAmount,
+          mockedRedemptionData,
+        )
+      })
+
+      it("should get the stBTC contract's address", () => {
+        expect(spyOnStBTCIdentifier).toHaveBeenCalled()
+      })
+
+      it("should send transaction via orange kit", () => {
+        expect(spyOnSendTransaction).toHaveBeenCalledWith(
+          `0x${mockedStBTCIdentifier.identifierHex}`,
+          "0x0",
+          mockedEncodedApproveAndCallData.toPrefixedString(),
+          account.bitcoinAddress,
+          account.publicKey,
+          expect.any(Function),
+        )
+      })
+
+      it("the sign message function passed to the orange kit should call the bitcoin provider", async () => {
+        const signMessageFn = spyOnSendTransaction.mock.calls[0][5]
+
+        await signMessageFn(mockedMessageToSign, mockedSafeTxData)
+
+        expect(provider[functionToCall]).toHaveBeenCalledWith(...functionArgs)
+      })
+
+      it("should return tx hash", () => {
+        expect(result.equals(Hex.from(mockedTxHash))).toBeTruthy()
+      })
     })
   })
 })
diff --git a/sdk/test/utils/mock-bitcoin-provider.ts b/sdk/test/utils/mock-bitcoin-provider.ts
index 3c1527dcf..2eec4148f 100644
--- a/sdk/test/utils/mock-bitcoin-provider.ts
+++ b/sdk/test/utils/mock-bitcoin-provider.ts
@@ -1,6 +1,7 @@
-import { BitcoinProvider } from "../../src/lib/bitcoin/providers"
+// eslint-disable-next-line max-classes-per-file
+import { AcreBitcoinProvider } from "../../src/lib/bitcoin/providers"
 
-class MockBitcoinProvider implements BitcoinProvider {
+class MockBitcoinProvider implements AcreBitcoinProvider {
   getAddress = jest.fn()
 
   getPublicKey = jest.fn()
@@ -8,5 +9,8 @@ class MockBitcoinProvider implements BitcoinProvider {
   signMessage = jest.fn()
 }
 
-// eslint-disable-next-line import/prefer-default-export
-export { MockBitcoinProvider }
+class MockBitcoinProviderWithSignWithdrawMessage extends MockBitcoinProvider {
+  signWithdrawMessage = jest.fn()
+}
+
+export { MockBitcoinProvider, MockBitcoinProviderWithSignWithdrawMessage }
diff --git a/sdk/test/utils/mock-orangekit.ts b/sdk/test/utils/mock-orangekit.ts
index e85814080..bd18e0d1c 100644
--- a/sdk/test/utils/mock-orangekit.ts
+++ b/sdk/test/utils/mock-orangekit.ts
@@ -1,6 +1,9 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { OrangeKitSdk, SafeTxData } from "@orangekit/sdk"
+import {
+  BitcoinSignSafeTransactionMessageFn,
+  OrangeKitSdk,
+} from "@orangekit/sdk"
 import { ContractTransaction } from "ethers"
 
 // @ts-expect-error Error: Property '#private' is missing in type
@@ -37,10 +40,7 @@ export class MockOrangeKitSdk implements OrangeKitSdk {
     data: string,
     bitcoinAddress: string,
     publicKey: string,
-    bitcoinSignMessageFn: (
-      message: string,
-      data: SafeTxData,
-    ) => Promise<string>,
+    bitcoinSignMessageFn: BitcoinSignSafeTransactionMessageFn,
   ): Promise<string> {
     return Promise.resolve("0x0")
   }
diff --git a/solidity/.openzeppelin/mainnet.json b/solidity/.openzeppelin/mainnet.json
index 22afde212..7960279d2 100644
--- a/solidity/.openzeppelin/mainnet.json
+++ b/solidity/.openzeppelin/mainnet.json
@@ -20,6 +20,11 @@
       "address": "0x7e184B0cC12572D12Db6dA248322A0e3618fc756",
       "txHash": "0xcb293d8d2fd76e198a0fe23c1bf6ab0618bfbff145d4c90b6b72a3b3b16b35e9",
       "kind": "transparent"
+    },
+    {
+      "address": "0xB33D938616C328eda0370CDBdb4b02dD78E2cb19",
+      "txHash": "0x2ae30e59643e70aa074bdef089b2cd76dc2a4bf5ee5fa671c8fca9d5f37e022f",
+      "kind": "transparent"
     }
   ],
   "impls": {
@@ -1473,6 +1478,207 @@
           ]
         }
       }
+    },
+    "cb94562b5192a6a2623a8d24d266afc20b387221d2c5b246cb90e369399d219a": {
+      "address": "0xa0E1f0290c5aB6Aa80E1881431b2fe35d8852Fb7",
+      "txHash": "0xf5313f8dc59464de8ab341a07893ffeed9bfca2a4456c4bb0f0a35614dc17fe3",
+      "layout": {
+        "solcVersion": "0.8.24",
+        "storage": [
+          {
+            "label": "mezoPortal",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_contract(IMezoPortal)5767",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:20"
+          },
+          {
+            "label": "depositCount",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_uint256",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:87"
+          },
+          {
+            "label": "supportedAssets",
+            "offset": 0,
+            "slot": "2",
+            "type": "t_mapping(t_address,t_bool)",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:89"
+          },
+          {
+            "label": "deposits",
+            "offset": 0,
+            "slot": "3",
+            "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)))",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:95"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_struct(InitializableStorage)107_storage": {
+            "label": "struct Initializable.InitializableStorage",
+            "members": [
+              {
+                "label": "_initialized",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "_initializing",
+                "type": "t_bool",
+                "offset": 8,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(Ownable2StepStorage)14_storage": {
+            "label": "struct Ownable2StepUpgradeable.Ownable2StepStorage",
+            "members": [
+              {
+                "label": "_pendingOwner",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(OwnableStorage)56_storage": {
+            "label": "struct OwnableUpgradeable.OwnableStorage",
+            "members": [
+              {
+                "label": "_owner",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(ReentrancyGuardStorage)473_storage": {
+            "label": "struct ReentrancyGuardUpgradeable.ReentrancyGuardStorage",
+            "members": [
+              {
+                "label": "_status",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
+          "t_contract(IMezoPortal)5767": {
+            "label": "contract IMezoPortal",
+            "numberOfBytes": "20"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)))": {
+            "label": "mapping(address => mapping(address => mapping(uint256 => struct AcreMultiAssetVault.DepositInfo)))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage))": {
+            "label": "mapping(address => mapping(uint256 => struct AcreMultiAssetVault.DepositInfo))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)": {
+            "label": "mapping(uint256 => struct AcreMultiAssetVault.DepositInfo)",
+            "numberOfBytes": "32"
+          },
+          "t_struct(DepositInfo)4475_storage": {
+            "label": "struct AcreMultiAssetVault.DepositInfo",
+            "members": [
+              {
+                "label": "balance",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "mezoDepositId",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          }
+        },
+        "namespaces": {
+          "erc7201:openzeppelin.storage.ReentrancyGuard": [
+            {
+              "contract": "ReentrancyGuardUpgradeable",
+              "label": "_status",
+              "type": "t_uint256",
+              "src": "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol:40",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Ownable2Step": [
+            {
+              "contract": "Ownable2StepUpgradeable",
+              "label": "_pendingOwner",
+              "type": "t_address",
+              "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:23",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Ownable": [
+            {
+              "contract": "OwnableUpgradeable",
+              "label": "_owner",
+              "type": "t_address",
+              "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:24",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Initializable": [
+            {
+              "contract": "Initializable",
+              "label": "_initialized",
+              "type": "t_uint64",
+              "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69",
+              "offset": 0,
+              "slot": "0"
+            },
+            {
+              "contract": "Initializable",
+              "label": "_initializing",
+              "type": "t_bool",
+              "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73",
+              "offset": 8,
+              "slot": "0"
+            }
+          ]
+        }
+      }
     }
   }
 }
diff --git a/solidity/.openzeppelin/sepolia.json b/solidity/.openzeppelin/sepolia.json
index c952ee25f..33bb8822d 100644
--- a/solidity/.openzeppelin/sepolia.json
+++ b/solidity/.openzeppelin/sepolia.json
@@ -65,6 +65,11 @@
       "address": "0xF4011FD0C77Bd4d909Ae05c7390b88455294dAeA",
       "txHash": "0x81f450c76b0d124122e82e915a16e5ac4479299e224f74884481c1387643fb6a",
       "kind": "transparent"
+    },
+    {
+      "address": "0xfC05e41AEB975148e2fD551aA06A46D37B012D4E",
+      "txHash": "0x6c6ddacdc78c18bca03e31ad185fd04a5beb802b519ffd725be19aecfcd8dbfd",
+      "kind": "transparent"
     }
   ],
   "impls": {
@@ -2914,6 +2919,207 @@
           ]
         }
       }
+    },
+    "cb94562b5192a6a2623a8d24d266afc20b387221d2c5b246cb90e369399d219a": {
+      "address": "0x0E3898286380557235419644f88CaB828d88F495",
+      "txHash": "0x7fef34e65e71cc3bf041be5bb1277b34ad95cd959d76888b67265386f6d7e1c5",
+      "layout": {
+        "solcVersion": "0.8.24",
+        "storage": [
+          {
+            "label": "mezoPortal",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_contract(IMezoPortal)5767",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:20"
+          },
+          {
+            "label": "depositCount",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_uint256",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:87"
+          },
+          {
+            "label": "supportedAssets",
+            "offset": 0,
+            "slot": "2",
+            "type": "t_mapping(t_address,t_bool)",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:89"
+          },
+          {
+            "label": "deposits",
+            "offset": 0,
+            "slot": "3",
+            "type": "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)))",
+            "contract": "AcreMultiAssetVault",
+            "src": "contracts/AcreMultiAssetVault.sol:95"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_struct(InitializableStorage)107_storage": {
+            "label": "struct Initializable.InitializableStorage",
+            "members": [
+              {
+                "label": "_initialized",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "_initializing",
+                "type": "t_bool",
+                "offset": 8,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(Ownable2StepStorage)14_storage": {
+            "label": "struct Ownable2StepUpgradeable.Ownable2StepStorage",
+            "members": [
+              {
+                "label": "_pendingOwner",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(OwnableStorage)56_storage": {
+            "label": "struct OwnableUpgradeable.OwnableStorage",
+            "members": [
+              {
+                "label": "_owner",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(ReentrancyGuardStorage)473_storage": {
+            "label": "struct ReentrancyGuardUpgradeable.ReentrancyGuardStorage",
+            "members": [
+              {
+                "label": "_status",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
+          "t_contract(IMezoPortal)5767": {
+            "label": "contract IMezoPortal",
+            "numberOfBytes": "20"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)))": {
+            "label": "mapping(address => mapping(address => mapping(uint256 => struct AcreMultiAssetVault.DepositInfo)))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_mapping(t_uint256,t_struct(DepositInfo)4475_storage))": {
+            "label": "mapping(address => mapping(uint256 => struct AcreMultiAssetVault.DepositInfo))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(DepositInfo)4475_storage)": {
+            "label": "mapping(uint256 => struct AcreMultiAssetVault.DepositInfo)",
+            "numberOfBytes": "32"
+          },
+          "t_struct(DepositInfo)4475_storage": {
+            "label": "struct AcreMultiAssetVault.DepositInfo",
+            "members": [
+              {
+                "label": "balance",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "mezoDepositId",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          }
+        },
+        "namespaces": {
+          "erc7201:openzeppelin.storage.ReentrancyGuard": [
+            {
+              "contract": "ReentrancyGuardUpgradeable",
+              "label": "_status",
+              "type": "t_uint256",
+              "src": "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol:40",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Ownable2Step": [
+            {
+              "contract": "Ownable2StepUpgradeable",
+              "label": "_pendingOwner",
+              "type": "t_address",
+              "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:23",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Ownable": [
+            {
+              "contract": "OwnableUpgradeable",
+              "label": "_owner",
+              "type": "t_address",
+              "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:24",
+              "offset": 0,
+              "slot": "0"
+            }
+          ],
+          "erc7201:openzeppelin.storage.Initializable": [
+            {
+              "contract": "Initializable",
+              "label": "_initialized",
+              "type": "t_uint64",
+              "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69",
+              "offset": 0,
+              "slot": "0"
+            },
+            {
+              "contract": "Initializable",
+              "label": "_initializing",
+              "type": "t_bool",
+              "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73",
+              "offset": 8,
+              "slot": "0"
+            }
+          ]
+        }
+      }
     }
   }
 }
diff --git a/solidity/deploy/41_deploy_multi_asset_vault.ts b/solidity/deploy/41_deploy_multi_asset_vault.ts
index cb099ee5a..b75784ace 100644
--- a/solidity/deploy/41_deploy_multi_asset_vault.ts
+++ b/solidity/deploy/41_deploy_multi_asset_vault.ts
@@ -10,10 +10,18 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
   const mezoPortal = await deployments.get("MezoPortal")
 
-  const initialSupportedAssets = [
-    "0x7A56E1C57C7475CCf742a1832B028F0456652F97", // SolvBTC
-    "0xd9D920AA40f578ab794426F5C90F6C731D159DEf", // SolvBTC.BBN
-  ]
+  const initialSupportedAssets =
+    // On Sepolia we set addresses to mocked ERC20 contracts used by Mezo Portal:
+    // https://github.com/thesis/mezo-portal/tree/main/solidity/deployments/sepolia
+    hre.network.name === "sepolia"
+      ? [
+          "0x39AB795D11FCC6CE1c340fbDc308cF1D42ca8f86", // Mocked SolvBTC
+          "0x64d92C98793C4a55B9a88c2BB9E356650D0d83F5", // Mocked SolvBTC.BBN
+        ]
+      : [
+          "0x7A56E1C57C7475CCf742a1832B028F0456652F97", // SolvBTC
+          "0xd9D920AA40f578ab794426F5C90F6C731D159DEf", // SolvBTC.BBN
+        ]
 
   let deployment = await deployments.getOrNull("AcreMultiAssetVault")
   if (deployment && helpers.address.isValid(deployment.address)) {
diff --git a/solidity/deployments/mainnet/AcreMultiAssetVault.json b/solidity/deployments/mainnet/AcreMultiAssetVault.json
new file mode 100644
index 000000000..3ce3642fe
--- /dev/null
+++ b/solidity/deployments/mainnet/AcreMultiAssetVault.json
@@ -0,0 +1,607 @@
+{
+  "address": "0xB33D938616C328eda0370CDBdb4b02dD78E2cb19",
+  "abi": [
+    {
+      "inputs": [],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "AssetAlreadySupported",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "AssetNotSupported",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "DepositNotFound",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "InvalidAmount",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        }
+      ],
+      "name": "InvalidDepositOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "InvalidReceiver",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnableInvalidOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "OwnableUnauthorizedAccount",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ReentrancyGuardReentrantCall",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "withdrawnAmount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositedAmount",
+          "type": "uint256"
+        }
+      ],
+      "name": "UnexpectedWithdrawnAmount",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ZeroAddress",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "DepositCreated",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "DepositWithdrawn",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint64",
+          "name": "version",
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferStarted",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferred",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "SupportedAssetAdded",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "SupportedAssetRemoved",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "acceptOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "addSupportedAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "deposit",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "depositCount",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        }
+      ],
+      "name": "depositFor",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "deposits",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "mezoDepositId",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        }
+      ],
+      "name": "getDeposit",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "uint256",
+              "name": "balance",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "mezoDepositId",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct AcreMultiAssetVault.DepositInfo",
+          "name": "",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_mezoPortal",
+          "type": "address"
+        },
+        {
+          "internalType": "address[]",
+          "name": "_supportedAssets",
+          "type": "address[]"
+        }
+      ],
+      "name": "initialize",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "mezoPortal",
+      "outputs": [
+        {
+          "internalType": "contract IMezoPortal",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "pendingOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "removeSupportedAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "renounceOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "supportedAssets",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "withdraw",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "transactionHash": "0x2ae30e59643e70aa074bdef089b2cd76dc2a4bf5ee5fa671c8fca9d5f37e022f",
+  "numDeployments": 1,
+  "implementation": "0xa0E1f0290c5aB6Aa80E1881431b2fe35d8852Fb7",
+  "devdoc": "Contract deployed as upgradable proxy"
+}
\ No newline at end of file
diff --git a/solidity/deployments/sepolia/AcreMultiAssetVault.json b/solidity/deployments/sepolia/AcreMultiAssetVault.json
new file mode 100644
index 000000000..b76ae4a16
--- /dev/null
+++ b/solidity/deployments/sepolia/AcreMultiAssetVault.json
@@ -0,0 +1,607 @@
+{
+  "address": "0xfC05e41AEB975148e2fD551aA06A46D37B012D4E",
+  "abi": [
+    {
+      "inputs": [],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "AssetAlreadySupported",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "AssetNotSupported",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "DepositNotFound",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "InvalidAmount",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        }
+      ],
+      "name": "InvalidDepositOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "InvalidReceiver",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnableInvalidOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "OwnableUnauthorizedAccount",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ReentrancyGuardReentrantCall",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "withdrawnAmount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositedAmount",
+          "type": "uint256"
+        }
+      ],
+      "name": "UnexpectedWithdrawnAmount",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ZeroAddress",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "DepositCreated",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "DepositWithdrawn",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint64",
+          "name": "version",
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferStarted",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferred",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "SupportedAssetAdded",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "SupportedAssetRemoved",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "acceptOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "addSupportedAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "deposit",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "depositCount",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        }
+      ],
+      "name": "depositFor",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "deposits",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "mezoDepositId",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "depositOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        }
+      ],
+      "name": "getDeposit",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "uint256",
+              "name": "balance",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "mezoDepositId",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct AcreMultiAssetVault.DepositInfo",
+          "name": "",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_mezoPortal",
+          "type": "address"
+        },
+        {
+          "internalType": "address[]",
+          "name": "_supportedAssets",
+          "type": "address[]"
+        }
+      ],
+      "name": "initialize",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "mezoPortal",
+      "outputs": [
+        {
+          "internalType": "contract IMezoPortal",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "pendingOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "removeSupportedAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "renounceOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "supportedAssets",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "withdraw",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "transactionHash": "0x6c6ddacdc78c18bca03e31ad185fd04a5beb802b519ffd725be19aecfcd8dbfd",
+  "numDeployments": 1,
+  "implementation": "0x0E3898286380557235419644f88CaB828d88F495",
+  "devdoc": "Contract deployed as upgradable proxy"
+}
\ No newline at end of file
diff --git a/solidity/hardhat.config.ts b/solidity/hardhat.config.ts
index 17d2ab7bb..f1ce95242 100644
--- a/solidity/hardhat.config.ts
+++ b/solidity/hardhat.config.ts
@@ -59,10 +59,10 @@ const config: HardhatUserConfig = {
               url: MAINNET_RPC_URL,
               // Points to the mainnet block that has a state important for the
               // integration tests:
-              // 20941745 - the block where BitcoinRedeemer's ProxyAdmin ownership
-              // has been transferred to the governance account in transaction:
-              // https://etherscan.io/address/0x989cE5eD1ab7d0cb85450599D165E17bD86D93CA
-              blockNumber: 20941745,
+              // 20971177 - the block where AcreMultiAssetVault was deployed in
+              // transaction:
+              // https://etherscan.io/tx/0x2ae30e59643e70aa074bdef089b2cd76dc2a4bf5ee5fa671c8fca9d5f37e022f
+              blockNumber: 20971177,
             }
           : undefined,
     },
diff --git a/solidity/package.json b/solidity/package.json
index 3874ffcee..b51e61c2d 100644
--- a/solidity/package.json
+++ b/solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acre-btc/contracts",
-  "version": "1.1.0",
+  "version": "1.3.0-dev",
   "description": "Bitcoin Liquid Staking",
   "license": "GPL-3.0-only",
   "files": [
diff --git a/solidity/test/integration/Deployment.test.ts b/solidity/test/integration/Deployment.test.ts
index 9939182ac..352dfd64e 100644
--- a/solidity/test/integration/Deployment.test.ts
+++ b/solidity/test/integration/Deployment.test.ts
@@ -90,6 +90,12 @@ describe("Deployment", () => {
   describe("stBTC", () => {
     testUpgradeableInitialization("stBTC", ZeroAddress, ZeroAddress)
 
+    it("should get contract deployed at address", async () => {
+      expect(await stbtc.getAddress()).to.be.equal(
+        expectedMainnetAddresses.stbtc,
+      )
+    })
+
     describe("initializer", () => {
       it("should set asset", async () => {
         expect(await stbtc.asset()).to.be.equal(expectedMainnetAddresses.tbtc)
@@ -156,6 +162,12 @@ describe("Deployment", () => {
       ZeroAddress,
     )
 
+    it("should get contract deployed at address", async () => {
+      expect(await mezoAllocator.getAddress()).to.be.equal(
+        expectedMainnetAddresses.mezoAllocator,
+      )
+    })
+
     it("should set mezoPortal", async () => {
       expect(await mezoAllocator.mezoPortal()).to.be.equal(
         expectedMainnetAddresses.mezoPortal,
@@ -194,6 +206,12 @@ describe("Deployment", () => {
       ZeroAddress,
     )
 
+    it("should get contract deployed at address", async () => {
+      expect(await bitcoinDepositor.getAddress()).to.be.equal(
+        expectedMainnetAddresses.bitcoinDepositor,
+      )
+    })
+
     it("should set bridge", async () => {
       expect(await bitcoinDepositor.bridge()).to.be.equal(
         expectedMainnetAddresses.bridge,
@@ -233,6 +251,12 @@ describe("Deployment", () => {
       ZeroAddress,
     )
 
+    it("should get contract deployed at address", async () => {
+      expect(await bitcoinRedeemer.getAddress()).to.be.equal(
+        expectedMainnetAddresses.bitcoinRedeemer,
+      )
+    })
+
     it("should set tbtcVault", async () => {
       expect(await bitcoinRedeemer.tbtcVault()).to.be.equal(
         expectedMainnetAddresses.tbtcVault,
@@ -266,6 +290,12 @@ describe("Deployment", () => {
       [ZeroAddress],
     )
 
+    it("should get contract deployed at address", async () => {
+      expect(await multiAssetVault.getAddress()).to.be.equal(
+        expectedMainnetAddresses.multiAssetVault,
+      )
+    })
+
     it("should set mezoPortal", async () => {
       expect(await multiAssetVault.mezoPortal()).to.be.equal(
         expectedMainnetAddresses.mezoPortal,
diff --git a/solidity/test/integration/helpers.ts b/solidity/test/integration/helpers.ts
index ba2cf0d3d..5a773badc 100644
--- a/solidity/test/integration/helpers.ts
+++ b/solidity/test/integration/helpers.ts
@@ -50,7 +50,14 @@ export const expectedMainnetAddresses = {
   pauseAdmin: "0x1299C7432034d1B85e148a2033d571a9B578292B",
   maintainer: "0x373C177845cEfaB4Ed85666b99c9fDB40ae7Cd19",
 
-  // Contracts
+  // Acre Contracts
+  stbtc: "0xdF217EFD8f3ecb5E837aedF203C28c1f06854017",
+  mezoAllocator: "0xb90fdAd3DFD180458D62Cc6acedc983D78E20122",
+  bitcoinDepositor: "0x2Ba614a598Cffa5a19d683cDCA97bac3a49313d1",
+  bitcoinRedeemer: "0x7e184B0cC12572D12Db6dA248322A0e3618fc756",
+  multiAssetVault: "0xB33D938616C328eda0370CDBdb4b02dD78E2cb19",
+
+  // External Contracts
   mezoPortal: "0xAB13B8eecf5AA2460841d75da5d5D861fD5B8A39",
   tbtc: "0x18084fbA666a33d37592fA2633fD49a74DD93a88",
   bridge: "0x5e4861a80B55f035D899f66772117F00FA0E8e7B",