Pre slot - DO NOT MERGE

README.md

@@ -28,3 +28,44 @@ Then, test that css transpiling is working:
 ## ⚠️ Warning
 
 Any content produced by Solana, or developer resources that Solana provides, are for educational and inspiration purposes only. Solana does not encourage, induce or sanction the deployment of any such applications in violation of applicable laws or regulations.
+
+# Disclaimer
+
+All claims, content, designs, algorithms, estimates, roadmaps,
+specifications, and performance measurements described in this project
+are done with the Solana Foundation's ("SF") best efforts. It is up to
+the reader to check and validate their accuracy and truthfulness.
+Furthermore nothing in this project constitutes a solicitation for
+investment.
+
+Any content produced by SF or developer resources that SF provides, are
+for educational and inspiration purposes only. SF does not encourage,
+induce or sanction the deployment, integration or use of any such
+applications (including the code comprising the Solana blockchain
+protocol) in violation of applicable laws or regulations and hereby
+prohibits any such deployment, integration or use. This includes use of
+any such applications by the reader (a) in violation of export control
+or sanctions laws of the United States or any other applicable
+jurisdiction, (b) if the reader is located in or ordinarily resident in
+a country or territory subject to comprehensive sanctions administered
+by the U.S. Office of Foreign Assets Control (OFAC), or (c) if the
+reader is or is working on behalf of a Specially Designated National
+(SDN) or a person subject to similar blocking or denied party
+prohibitions.
+
+The reader should be aware that U.S. export control and sanctions laws
+prohibit U.S. persons (and other persons that are subject to such laws)
+from transacting with persons in certain countries and territories or
+that are on the SDN list. As a project based primarily on open-source
+software, it is possible that such sanctioned persons may nevertheless
+bypass prohibitions, obtain the code comprising the Solana blockchain
+protocol (or other project code or applications) and deploy, integrate,
+or otherwise use it. Accordingly, there is a risk to individuals that
+other persons using the Solana blockchain protocol may be sanctioned
+persons and that transactions with such persons would be a violation of
+U.S. export controls and sanctions law. This risk applies to
+individuals, organizations, and other ecosystem participants that
+deploy, integrate, or use the Solana blockchain protocol code directly
+(e.g., as a node operator), and individuals that transact on the Solana
+blockchain through light clients, third party interfaces, and/or wallet
+software.

packages/arweave-push/package.json

@@ -24,7 +24,7 @@
     "busboy": "^0.3.0",
     "escape-html": "^1.0.3",
     "arweave": "1.10.13",
-    "@solana/web3.js": "^1.5.0",
+    "@solana/web3.js": "^1.22.0",
     "mime-types": "2.1.30",
     "node-fetch": "2.6.1",
     "coingecko-api": "1.0.10"

packages/bridge-sdk/package.json

@@ -16,12 +16,10 @@
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.13.0",
-    "@oyster/common": "0.0.1",
+    "@oyster/common": "0.0.2",
     "@solana/spl-token": "0.0.13",
     "@solana/spl-token-swap": "0.1.0",
-    "@solana/wallet-base": "0.0.1",
-    "@solana/wallet-ledger": "0.0.1",
-    "@solana/web3.js": "^1.5.0",
+    "@solana/web3.js": "^1.22.0",
     "bignumber.js": "^9.0.1",
     "bn.js": "^5.1.3",
     "bs58": "^4.0.1",

packages/bridge-sdk/src/bridge/transfer/fromSolana.ts

@@ -1,10 +1,14 @@
-import { programIds, sendTransactionWithRetry, sleep } from '@oyster/common';
-import { WalletAdapter } from '@solana/wallet-base';
+import {
+  programIds,
+  sendTransactionWithRetry,
+  sleep,
+  WalletSigner,
+} from '@oyster/common';
 import { ethers } from 'ethers';
 import { WormholeFactory } from '../../contracts/WormholeFactory';
 import { bridgeAuthorityKey } from './../helpers';
 import { Connection, PublicKey, SystemProgram } from '@solana/web3.js';
-import { Token } from '@solana/spl-token';
+import { Token, u64 } from '@solana/spl-token';
 import { ProgressUpdate, TransferRequest } from './interface';
 import BN from 'bn.js';
 import { createLockAssetInstruction } from '../lock';
@@ -13,7 +17,7 @@ import { SolanaBridge } from '../../core';
 
 export const fromSolana = async (
   connection: Connection,
-  wallet: WalletAdapter,
+  wallet: WalletSigner,
   request: TransferRequest,
   provider: ethers.providers.Web3Provider,
   setProgress: (update: ProgressUpdate) => void,
@@ -62,20 +66,23 @@ export const fromSolana = async (
         return;
       }
 
+      const amountBN = ethers.utils.parseUnits(
+        request.amount.toString(),
+        request.info.decimals || 0,
+      );
+      const amountBI = BigInt(amountBN.toString())
+
       let group = 'Initiate transfer';
       const programs = programIds();
       const bridgeId = programs.wormhole.pubkey;
       const authorityKey = await bridgeAuthorityKey(bridgeId);
 
-      const precision = Math.pow(10, request.info?.decimals || 0);
-      const amount = Math.floor(request.amount * precision);
-
       let { ix: lock_ix, transferKey } = await createLockAssetInstruction(
         authorityKey,
         wallet.publicKey,
         new PublicKey(request.info.address),
         new PublicKey(request.info.mint),
-        new BN(amount),
+        new BN(amountBN.toString()),
         request.to,
         request.recipient,
         {
@@ -93,7 +100,7 @@ export const fromSolana = async (
         authorityKey,
         wallet.publicKey,
         [],
-        amount,
+        new u64(amountBI.toString(16), 16),
       );
 
       setProgress({

packages/bridge-sdk/src/bridge/transfer/toSolana.ts

@@ -6,6 +6,7 @@ import {
   TokenAccountParser,
   ParsedAccount,
   createAssociatedTokenAccountInstruction,
+  WalletSigner,
 } from '@oyster/common';
 import { ethers } from 'ethers';
 import { ERC20Factory } from '../../contracts/ERC20Factory';
@@ -20,17 +21,21 @@ import {
 } from '@solana/web3.js';
 import { AccountInfo } from '@solana/spl-token';
 import { TransferRequest, ProgressUpdate } from './interface';
-import { WalletAdapter } from '@solana/wallet-base';
 import { BigNumber } from 'bignumber.js';
 
 export const toSolana = async (
   connection: Connection,
-  wallet: WalletAdapter,
+  wallet: WalletSigner,
   request: TransferRequest,
   provider: ethers.providers.Web3Provider,
   setProgress: (update: ProgressUpdate) => void,
 ) => {
-  if (!request.asset || !request.amount || !request.info) {
+  if (
+    !request.asset ||
+    !request.amount ||
+    !request.info ||
+    !request.info.address
+  ) {
     return;
   }
   const walletName = 'MetaMask';
@@ -68,21 +73,30 @@ export const toSolana = async (
 
       const group = 'Initiate transfer';
       try {
+        let mintKey: PublicKey;
+
         const bridgeId = programIds().wormhole.pubkey;
         const authority = await bridgeAuthorityKey(bridgeId);
         const meta: AssetMeta = {
           decimals: Math.min(request.info?.decimals, 9),
           address: request.info?.assetAddress,
           chain: request.from,
         };
-        const mintKey = await wrappedAssetMintKey(bridgeId, authority, meta);
+        if (request.info.mint) {
+          mintKey = new PublicKey(request.info.mint);
+        } else {
+          mintKey = await wrappedAssetMintKey(bridgeId, authority, meta);
+        }
 
         const recipientKey =
           cache
             .byParser(TokenAccountParser)
             .map(key => {
               let account = cache.get(key) as ParsedAccount<AccountInfo>;
-              if (account?.info.mint.toBase58() === mintKey.toBase58()) {
+              if (
+                account?.info.mint.toBase58() === mintKey.toBase58() &&
+                account?.info.owner.toBase58() === wallet?.publicKey?.toBase58()
+              ) {
                 return key;
               }
 
@@ -114,6 +128,7 @@ export const toSolana = async (
 
         if (!accounts.array[0]) {
           // create mint using wormhole instruction
+
           instructions.push(
             await createWrappedAssetInstruction(
               meta,
@@ -164,14 +179,14 @@ export const toSolana = async (
     },
     // approves assets for transfer
     approve: async (request: TransferRequest) => {
-      if (!request.asset) {
+      if (!request.info?.address) {
         return;
       }
 
       const group = 'Approve assets';
       try {
         if (request.info?.allowance.lt(amountBN)) {
-          let e = ERC20Factory.connect(request.asset, signer);
+          let e = ERC20Factory.connect(request.info.address, signer);
           setProgress({
             message: `Waiting for ${walletName} approval`,
             type: 'user',
@@ -180,7 +195,8 @@ export const toSolana = async (
           });
           let res = await e.approve(programIds().wormhole.bridge, amountBN);
           setProgress({
-            message: 'Waiting for ETH transaction to be mined... (Up to few min.)',
+            message:
+              'Waiting for ETH transaction to be mined... (Up to few min.)',
             type: 'wait',
             group,
             step: counter++,
@@ -216,7 +232,7 @@ export const toSolana = async (
     lock: async (request: TransferRequest) => {
       if (
         !amountBN ||
-        !request.asset ||
+        !request.info?.address ||
         !request.recipient ||
         !request.to ||
         !request.info
@@ -235,15 +251,16 @@ export const toSolana = async (
           step: counter++,
         });
         let res = await wh.lockAssets(
-          request.asset,
+          request.info.address,
           amountBN,
           request.recipient,
           request.to,
           nonce,
           false,
         );
         setProgress({
-          message: 'Waiting for ETH transaction to be mined... (Up to few min.)',
+          message:
+            'Waiting for ETH transaction to be mined... (Up to few min.)',
           type: 'wait',
           group,
           step: counter++,

packages/bridge/package.json

@@ -5,17 +5,14 @@
     "@ant-design/icons": "^4.4.0",
     "@babel/preset-typescript": "^7.12.13",
     "@craco/craco": "^5.7.0",
-    "@oyster/common": "0.0.1",
+    "@oyster/common": "0.0.2",
     "@project-serum/serum": "^0.13.11",
-    "@project-serum/sol-wallet-adapter": "^0.1.4",
     "@react-three/drei": "^3.8.0",
     "@solana/spl-token": "0.0.13",
     "@solana/spl-token-registry": "^0.2.0",
     "@solana/spl-token-swap": "0.1.0",
-    "@solana/wallet-base": "0.0.1",
-    "@solana/wallet-ledger": "0.0.1",
     "@solana/bridge-sdk": "0.0.1",
-    "@solana/web3.js": "^1.5.0",
+    "@solana/web3.js": "^1.22.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

packages/bridge/public/CNAME

@@ -1 +1 @@
-www.wormholebridge.com
+v1.wormholebridge.com

packages/bridge/src/components/CurrentUserWalletBadge/index.tsx

@@ -1,12 +1,11 @@
 import React from 'react';
 
-import { useWallet, WALLET_PROVIDERS } from '@oyster/common';
-import { shortenAddress } from '@oyster/common';
+import { shortenAddress, useWallet } from '@oyster/common';
 
 export const CurrentUserWalletBadge = (props: { showDisconnect?: boolean }) => {
-  const { wallet, disconnect } = useWallet();
+  const { wallet, publicKey, disconnect } = useWallet();
 
-  if (!wallet || !wallet.publicKey) {
+  if (!wallet || !publicKey) {
     return null;
   }
 
@@ -17,10 +16,10 @@ export const CurrentUserWalletBadge = (props: { showDisconnect?: boolean }) => {
           alt={'icon'}
           width={20}
           height={20}
-          src={WALLET_PROVIDERS.filter(p => p.name === 'Sollet')[0]?.icon}
+          src={wallet.icon}
           style={{ marginRight: 8 }}
         />
-        {shortenAddress(`${wallet.publicKey}`)}
+        {shortenAddress(`${publicKey}`)}
         {props.showDisconnect && (
           <span className={'disconnect'} onClick={() => disconnect()}>
             X

packages/bridge/src/components/Input/style.less

@@ -119,7 +119,6 @@
     font-weight: normal;
     font-size: 16px;
     line-height: 21px;
-    color: @tungsten-40;
   }
   .input-chain{
     margin-top: 13px;
@@ -151,7 +150,9 @@
       padding: 0 36px 0 36px;
       font-size: 32px;
       line-height: 39px;
-      color: @tungsten-80;
+      ::placeholder {
+        color: @tungsten-40;
+      }
       height: 100%;
     }
     .input-select {
@@ -181,7 +182,7 @@
   }
 }
 
-.dashed-input-container.right {
+.dashed-input-container {
   & > button.ant-btn:not(.ant-dropdown-trigger) {
     text-transform: uppercase;
     color: white;

packages/bridge/src/components/Layout/index.tsx

@@ -24,9 +24,10 @@ export const AppLayout = React.memo((props: any) => {
             {props.children}
           </Content>
           <Footer>
-            <div className={'description-text'} style={{ color: '#2F506F' }}>
-
-            </div>
+            <div
+              className={'description-text'}
+              style={{ color: '#2F506F' }}
+            ></div>
           </Footer>
         </Layout>
       </div>

packages/bridge/src/components/RecentTransactionsTable/index.tsx

@@ -34,7 +34,9 @@ export const RecentTransactionsTable = (props: {
   showUserTransactions?: boolean;
   tokenAccounts: TokenAccount[];
 }) => {
-  const { loading: loadingTransfers, transfers } = useWormholeTransactions(props.tokenAccounts);
+  const { loading: loadingTransfers, transfers } = useWormholeTransactions(
+    props.tokenAccounts,
+  );
   const { provider } = useEthereum();
   const bridge = useBridge();
 
@@ -338,7 +340,6 @@ export const RecentTransactionsTable = (props: {
           scrollToFirstRowOnChange: false,
           x: 900,
         }}
-
         dataSource={transfers.sort((a, b) => b.date - a.date)}
         columns={userColumns}
         loading={loadingTransfers}

packages/bridge/src/components/Settings/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import { Button, Select } from 'antd';
-import { contexts } from '@oyster/common';
+import { contexts, useWallet } from '@oyster/common';
 
-const { useWallet, WALLET_PROVIDERS } = contexts.Wallet;
 const { ENDPOINTS, useConnectionConfig } = contexts.Connection;
 
 export const Settings = () => {