Merge branch 'dev' into 'master'

Merge dev into master

See merge request ergo/rosen-bridge/ui!259

.changeset/tasty-carrots-press.md

@@ -0,0 +1,5 @@
+---
+'@rosen-ui/asset-calculator': minor
+---
+
+Save bridged token ids inside bridged assets table

apps/guard/package.json

@@ -15,11 +15,11 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@rosen-bridge/icons": "^0.4.0",
-    "@rosen-bridge/ui-kit": "^1.1.1",
-    "@rosen-ui/constants": "^0.0.2",
+    "@rosen-bridge/ui-kit": "^1.1.2",
+    "@rosen-ui/constants": "^0.0.3",
     "@rosen-ui/swr-helpers": "^0.1.0",
     "@rosen-bridge/shared-contexts": "^0.0.1",
-    "@rosen-ui/utils": "^0.2.0",
+    "@rosen-ui/utils": "^0.3.0",
     "moment": "^2.29.4",
     "next": "14.1.0",
     "react": "^18.2.0",

apps/rosen/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @rosen-bridge/rosen-app
 
+## 1.1.1
+
+### Patch Changes
+
+- Refactor the Network constant usage and eliminate unnecessary utilities
+- Implement validation for Bitcoin addresses
+- Prevent the assets page from crashing if tokens file networks mismatch with the project networks
+- Updated dependencies
+  - @rosen-ui/nami-wallet@0.1.3
+  - @rosen-ui/nautilus-wallet@0.2.0
+  - @rosen-ui/xdefi-wallet@0.4.0
+  - @rosen-ui/utils@0.3.0
+  - @rosen-network/bitcoin@0.2.0
+  - @rosen-network/ergo@0.1.2
+  - @rosen-ui/eternl-wallet@0.1.3
+  - @rosen-ui/flint-wallet@0.1.3
+  - @rosen-ui/lace-wallet@0.1.3
+  - @rosen-ui/vespr-wallet@0.0.7
+  - @rosen-ui/wallet-api@1.0.2
+
 ## 1.1.0
 
 ### Minor Changes

apps/rosen/app/(bridge)/BridgeForm.tsx

@@ -14,6 +14,7 @@ import {
   Button,
   CircularProgress,
   SvgIcon,
+  Alert,
 } from '@rosen-bridge/ui-kit';
 
 import useBridgeForm from '@/_hooks/useBridgeForm';
@@ -331,6 +332,11 @@ const BridgeForm = () => {
         {...addressField}
         value={addressField.value ?? ''}
       />
+      {targetField.value == 'bitcoin' && (
+        <Alert severity="warning">
+          Only Native SegWit (P2WPKH or P2WSH) addresses are supported.
+        </Alert>
+      )}
     </FormContainer>
   );
 };

apps/rosen/app/_actions/calculateFee.ts

@@ -12,19 +12,22 @@ const ergoExplorerClient = ergoExplorerClientFactory(
   process.env.ERGO_EXPLORER_API!,
 );
 
-import { ERGO_EXPLORER_URL, Networks, feeConfigTokenId } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
+import { ERGO_EXPLORER_URL, feeConfigTokenId } from '@/_constants';
+import { AvailableNetworks } from '@/_networks';
 
 const GetHeight = {
-  cardano: async () => (await cardanoKoiosClient.getTip())[0].block_no,
-  ergo: async () =>
+  [Networks.CARDANO]: async () =>
+    (await cardanoKoiosClient.getTip())[0].block_no,
+  [Networks.ERGO]: async () =>
     Number((await ergoExplorerClient.v1.getApiV1Networkstate()).height),
-  bitcoin: async (): Promise<number> => {
+  [Networks.BITCOIN]: async (): Promise<number> => {
     const response = await fetch(
       `${process.env.BITCOIN_ESPLORA_API}/api/blocks/tip/height`,
     );
     return response.json();
   },
-};
+} as const;
 
 /**
  * fetches and return the minimum fee object for a specific token in network
@@ -37,8 +40,8 @@ const GetHeight = {
  */
 
 export const calculateFee = async (
-  sourceNetwork: keyof typeof Networks,
-  targetNetwork: keyof typeof Networks,
+  sourceNetwork: AvailableNetworks,
+  targetNetwork: AvailableNetworks,
   tokenId: string,
   nextHeightInterval: number,
 ) => {

apps/rosen/app/_actions/validateAddress.ts

@@ -1,24 +1,30 @@
 'use server';
 
 import { Address } from 'ergo-lib-wasm-nodejs';
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 
 import * as wasm from '@emurgo/cardano-serialization-lib-nodejs';
+import { AvailableNetworks } from '@/_networks';
+import { isValidAddress } from '@rosen-network/bitcoin';
 
 /**
  * server action to verify the wallet addresses
  * @param walletAddress - wallet address to verify
  * @returns the validation results for the passed address
  */
 export const validateAddress = (
-  chain: keyof typeof Networks,
+  chain: AvailableNetworks,
   walletAddress: string,
 ) => {
   try {
-    if (chain === Networks.ergo) {
+    if (chain === Networks.ERGO) {
       Address.from_base58(walletAddress);
-    } else if (chain === Networks.cardano) {
+    } else if (chain === Networks.CARDANO) {
       wasm.Address.from_bech32(walletAddress);
+    } else if (chain == Networks.BITCOIN) {
+      if (!isValidAddress(walletAddress)) {
+        throw new Error();
+      }
     }
     return { isValid: true };
   } catch {

apps/rosen/app/_backend/events/event-service.ts

@@ -14,16 +14,25 @@ const tokenMap = new TokenMap(getRosenTokens());
  * @param chain
  */
 const getFullTokenData = (tokenId: string, chain: string) => {
-  const token = tokenMap.search(chain, {
-    [tokenMap.getIdKey(chain)]: tokenId,
-  });
-
-  return {
-    tokenId: tokenId,
-    name: token[0]?.[chain].name ?? UNSUPPORTED_TOKEN_NAME,
-    decimals: token[0]?.[chain].decimals ?? 0,
-    isNativeToken: token[0]?.[chain].metaData.type === 'native',
-  };
+  try {
+    const token = tokenMap.search(chain, {
+      [tokenMap.getIdKey(chain)]: tokenId,
+    });
+
+    return {
+      tokenId: tokenId,
+      name: token[0]?.[chain].name ?? UNSUPPORTED_TOKEN_NAME,
+      decimals: token[0]?.[chain].decimals ?? 0,
+      isNativeToken: token[0]?.[chain].metaData.type === 'native',
+    };
+  } catch {
+    return {
+      tokenId: tokenId,
+      name: UNSUPPORTED_TOKEN_NAME,
+      decimals: 0,
+      isNativeToken: false,
+    };
+  }
 };
 
 /**

apps/rosen/app/_constants/index.ts

@@ -1,9 +1,3 @@
-export const Networks = {
-  ergo: 'ergo',
-  cardano: 'cardano',
-  bitcoin: 'bitcoin',
-} as const;
-
 export const feeConfigTokenId = process.env.NEXT_PUBLIC_FEE_CONFIG_TOKEN_ID!;
 
 export const ERGO_EXPLORER_URL = 'https://api.ergoplatform.com/';

apps/rosen/app/_hooks/useNetwork.ts

@@ -1,7 +1,7 @@
 import { TokenMap } from '@rosen-bridge/tokens';
 import { useMemo } from 'react';
 
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 import { AvailableNetworks, availableNetworks } from '@/_networks';
 
 import useBridgeForm from './useBridgeForm';

apps/rosen/app/_hooks/useTransactionFees.ts

@@ -10,15 +10,15 @@ import { useTokensMap } from './useTokensMap';
 
 import { calculateFee } from '@/_actions/calculateFee';
 
-import { Networks } from '@/_constants';
+import { AvailableNetworks } from '@/_networks';
 
 /**
  * calculates the fees for a token swap between
  * two networks
  */
 const useTransactionFees = (
-  sourceChain: keyof typeof Networks | null,
-  targetChain: keyof typeof Networks | null,
+  sourceChain: AvailableNetworks | null,
+  targetChain: AvailableNetworks | null,
   token: RosenChainToken | null,
   amount: string | null,
 ) => {

apps/rosen/app/_networks/bitcoin/index.ts

@@ -5,7 +5,7 @@ import { compact } from 'lodash-es';
 
 import getMaxTransfer from './getMaxTransfer';
 
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 
 import { BitcoinNetwork as BitcoinNetworkType } from '@/_types/network';
 
@@ -22,7 +22,7 @@ import {
  * functionality
  */
 const BitcoinNetwork: BitcoinNetworkType = {
-  name: Networks.bitcoin,
+  name: Networks.BITCOIN,
   label: 'Bitcoin',
   logo: BitcoinIcon,
   supportedWallets: [xdefiWalletInfo],

apps/rosen/app/_networks/cardano/index.ts

@@ -1,16 +1,14 @@
 import { compact } from 'lodash-es';
 
-import { validateDecimalPlaces } from '@rosen-ui/utils';
+import { convertNumberToBigint, validateDecimalPlaces } from '@rosen-ui/utils';
 
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 
 import { CardanoNetwork as CardanoNetworkType } from '@/_types/network';
 
 import { RosenChainToken } from '@rosen-bridge/tokens';
 import { CardanoIcon } from '@rosen-bridge/icons';
 
-import { convertNumberToBigint } from '@/_utils';
-
 import { eternlWalletCreator, eternlWalletInfo } from '@rosen-ui/eternl-wallet';
 import { flintWalletCreator, flintWalletInfo } from '@rosen-ui/flint-wallet';
 import { laceWalletCreator, laceWalletInfo } from '@rosen-ui/lace-wallet';
@@ -36,7 +34,7 @@ import getVesprWallet, {
  * functionality
  */
 const CardanoNetwork: CardanoNetworkType = {
-  name: Networks.cardano,
+  name: Networks.CARDANO,
   label: 'Cardano',
   supportedWallets: [
     eternlWalletInfo,

apps/rosen/app/_networks/ergo/index.ts

@@ -4,7 +4,7 @@ import {
 } from '@rosen-ui/nautilus-wallet';
 import { compact } from 'lodash-es';
 
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 
 import { ErgoNetwork as ErgoNetworkType } from '@/_types/network';
 import { ErgoIcon } from '@rosen-bridge/icons';
@@ -22,7 +22,7 @@ import { generateUnsignedTx } from './server';
  * functionality
  */
 const ErgoNetwork: ErgoNetworkType = {
-  name: Networks.ergo,
+  name: Networks.ERGO,
   label: 'Ergo',
   supportedWallets: [nautilusWalletInfo],
   availableWallets: compact([

apps/rosen/app/_networks/index.ts

@@ -2,12 +2,15 @@ import BitcoinNetwork from './bitcoin';
 import CardanoNetwork from './cardano';
 import ErgoNetwork from './ergo';
 
-import { Networks } from '@/_constants';
+import { Networks } from '@rosen-ui/constants';
 
 export const availableNetworks = {
-  [Networks.ergo]: ErgoNetwork,
-  [Networks.cardano]: CardanoNetwork,
-  [Networks.bitcoin]: BitcoinNetwork,
-};
+  [Networks.ERGO]: ErgoNetwork,
+  [Networks.CARDANO]: CardanoNetwork,
+  [Networks.BITCOIN]: BitcoinNetwork,
+} as const;
 
-export type AvailableNetworks = keyof typeof Networks;
+export type AvailableNetworks = Exclude<
+  (typeof Networks)[keyof typeof Networks],
+  'ethereum'
+>;

apps/rosen/app/_types/network.ts

@@ -1,8 +1,6 @@
 import { Wallet, WalletInfo } from '@rosen-ui/wallet-api';
 
-import { Networks } from '@/_constants';
-
-type NetworksType = typeof Networks;
+import { AvailableNetworks } from '@/_networks';
 
 interface GetMaxTransferParams {
   balance: number;
@@ -13,7 +11,7 @@ interface GetMaxTransferParams {
  * the main network interface for all supported networks
  */
 export interface BaseNetwork<
-  NetworkName extends keyof NetworksType,
+  NetworkName extends AvailableNetworks,
   GetMaxTransferParamsExtra = {},
 > {
   name: NetworkName;

apps/rosen/app/_utils/index.ts

@@ -5,18 +5,17 @@ import { getDecimalString } from '@rosen-ui/utils';
 
 import { calculateFee } from '@/_actions/calculateFee';
 
-import { Networks } from '@/_constants';
-
-import { encode } from 'cbor-x';
+import { Networks } from '@rosen-ui/constants';
+import { AvailableNetworks } from '@/_networks';
 
 /**
  * a utility to make unique interface for accessing token name
  */
 export const getTokenNameAndId = (
   token: RosenChainToken,
-  network: keyof typeof Networks,
+  network: AvailableNetworks,
 ) => {
-  if ([Networks.ergo, Networks.cardano, Networks.bitcoin].includes(network)) {
+  if ([Networks.ERGO, Networks.CARDANO, Networks.BITCOIN].includes(network)) {
     return {
       tokenName: token.name,
       tokenId: token.tokenId,
@@ -32,8 +31,8 @@ export const getTokenNameAndId = (
  */
 export const getMinTransfer = async (
   token: RosenChainToken,
-  sourceChain: keyof typeof Networks,
-  targetChain: keyof typeof Networks,
+  sourceChain: AvailableNetworks,
+  targetChain: AvailableNetworks,
   tokensMap: any,
 ) => {
   const tokenMap = new TokenMap(tokensMap);
@@ -62,19 +61,3 @@ export const getMinTransfer = async (
       )
     : '0';
 };
-
-/**
- * convert a hex to cbor
- * @param hex
- */
-export const hexToCbor = (hex: string) =>
-  Buffer.from(encode(Buffer.from(hex, 'hex'))).toString('hex');
-
-/**
- * remove the decimal points from the input number and
- * convert number to bigInt
- * @param inputNumber
- */
-
-export const convertNumberToBigint = (inputNumber: number) =>
-  BigInt(Math.trunc(inputNumber));