pull from source repo

.gitignore

@@ -12,3 +12,9 @@ yarn-debug.log*
 yarn-error.log*
 *.css
 *.css.map
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local

.vscode/settings.json

@@ -10,6 +10,7 @@
   "cSpell.words": [
     "Addin",
     "Blockhash",
+    "blockworks",
     "Lamport",
     "lamports",
     "localnet",

README.md

@@ -1,3 +1,7 @@
+# oyster 
+
+This repo still exists in archived form, but the maintained version of `governance-sdk` package has now relocated to: https://github.com/Mythic-Project/oyster/tree/main/packages/governance-sdk
+
 ## Setup
 
 Be sure to be running Node v12.16.2 and yarn version 1.22.10.

packages/arweave-push/package.json

@@ -15,18 +15,19 @@
     "test": "mocha test/*.test.js --timeout=60000"
   },
   "devDependencies": {
+    "jest": "^27.4.7",
     "mocha": "^8.0.0",
     "proxyquire": "^2.1.0",
     "sinon": "^10.0.0"
   },
   "dependencies": {
     "@google-cloud/storage": "^5.0.0",
+    "@solana/web3.js": "^1.22.0",
+    "arweave": "1.10.13",
     "busboy": "^0.3.0",
+    "coingecko-api": "1.0.10",
     "escape-html": "^1.0.3",
-    "arweave": "1.10.13",
-    "@solana/web3.js": "^1.22.0",
     "mime-types": "2.1.30",
-    "node-fetch": "2.6.1",
-    "coingecko-api": "1.0.10"
+    "node-fetch": "2.6.1"
   }
 }

packages/bridge-sdk/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@babel/preset-typescript": "^7.13.0",
     "@oyster/common": "0.0.2",
-    "@solana/spl-token": "0.0.13",
+    "@solana/spl-token": "0.1.3",
     "@solana/spl-token-swap": "0.1.0",
     "@solana/web3.js": "^1.22.0",
     "bignumber.js": "^9.0.1",
@@ -77,6 +77,7 @@
     "@types/node": "^12.12.62",
     "arweave-deploy": "^1.9.1",
     "gh-pages": "^3.1.0",
+    "jest": "^27.4.7",
     "prettier": "^2.1.2"
   }
-}
+}

packages/bridge/package.json

@@ -8,10 +8,10 @@
     "@oyster/common": "0.0.2",
     "@project-serum/serum": "^0.13.11",
     "@react-three/drei": "^3.8.0",
-    "@solana/spl-token": "0.0.13",
+    "@solana/bridge-sdk": "0.0.1",
+    "@solana/spl-token": "0.1.3",
     "@solana/spl-token-registry": "^0.2.0",
     "@solana/spl-token-swap": "0.1.0",
-    "@solana/bridge-sdk": "0.0.1",
     "@solana/web3.js": "^1.22.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
@@ -103,6 +103,7 @@
     "@types/node": "^12.12.62",
     "arweave-deploy": "^1.9.1",
     "gh-pages": "^3.1.0",
+    "jest": "^27.4.7",
     "npm-link-shared": "0.5.6",
     "prettier": "^2.1.2",
     "typechain": "^4.0.3"
@@ -115,4 +116,4 @@
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }
-}
+}

packages/bridge/public/robots.txt

@@ -1,3 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
-Disallow:
+Disallow: *

packages/common/package.json

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@project-serum/serum": "^0.13.11",
-    "@solana/spl-token": "0.0.13",
+    "@solana/spl-token": "0.1.3",
     "@solana/spl-token-swap": "0.1.0",
     "@solana/wallet-adapter-base": "^0.6.0",
     "@solana/wallet-adapter-react": "^0.12.6",
@@ -61,6 +61,7 @@
     "@types/node": "^12.12.62",
     "arweave-deploy": "^1.9.1",
     "gh-pages": "^3.1.0",
+    "jest": "^27.4.7",
     "less": "4.1.1",
     "less-watch-compiler": "v1.14.6",
     "prettier": "^2.1.2"
@@ -76,4 +77,4 @@
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }
-}
+}

packages/common/src/contexts/accounts.tsx

@@ -287,6 +287,7 @@ function wrapNativeAccount(
     pubkey: pubkey,
     account,
     info: {
+      address: pubkey,
       mint: WRAPPED_SOL_MINT,
       owner: pubkey,
       amount: new u64(account.lamports),

packages/common/src/contexts/connection.tsx

@@ -73,9 +73,9 @@ interface ConnectionConfig {
 
 const ConnectionContext = React.createContext<ConnectionConfig>({
   endpoint: DEFAULT,
-  setEndpoint: () => {},
+  setEndpoint: () => { },
   slippage: DEFAULT_SLIPPAGE,
-  setSlippage: (val: number) => {},
+  setSlippage: (val: number) => { },
   connection: new Connection(DEFAULT, 'recent'),
   sendConnection: new Connection(DEFAULT, 'recent'),
   env: ENDPOINTS[0].name,
@@ -120,7 +120,7 @@ export function ConnectionProvider({ children = undefined as any }) {
         .excludeByTag('nft')
         .filterByChainId(
           ENDPOINTS.find(end => end.endpoint === endpoint)?.ChainId ||
-            ChainId.MainnetBeta,
+          ChainId.MainnetBeta,
         )
         .getList();
 
@@ -153,7 +153,7 @@ export function ConnectionProvider({ children = undefined as any }) {
   // is empty after opening its first time, preventing subsequent subscriptions from receiving responses.
   // This is a hack to prevent the list from every getting empty
   useEffect(() => {
-    const id = connection.onAccountChange(new Account().publicKey, () => {});
+    const id = connection.onAccountChange(new Account().publicKey, () => { });
     return () => {
       connection.removeAccountChangeListener(id);
     };
@@ -169,7 +169,7 @@ export function ConnectionProvider({ children = undefined as any }) {
   useEffect(() => {
     const id = sendConnection.onAccountChange(
       new Account().publicKey,
-      () => {},
+      () => { },
     );
     return () => {
       sendConnection.removeAccountChangeListener(id);
@@ -270,7 +270,7 @@ export const sendTransactions = async (
   signersSet: Account[][],
   sequenceType: SequenceType = SequenceType.Parallel,
   commitment: Commitment = 'singleGossip',
-  successCallback: (txid: string, ind: number) => void = (txid, ind) => {},
+  successCallback: (txid: string, ind: number) => void = (txid, ind) => { },
   failCallback: (reason: string, ind: number) => boolean = (txid, ind) => false,
   block?: BlockhashAndFeeCalculator,
 ): Promise<number> => {
@@ -382,7 +382,7 @@ export const sendTransaction = async (
     try {
       transaction = await wallet.signTransaction(transaction);
     } catch (ex) {
-      throw new SignTransactionError(ex);
+      throw new SignTransactionError(JSON.stringify(ex));
     }
   }
 
@@ -415,11 +415,10 @@ export const sendTransaction = async (
         console.error('getErrorForTransaction() error', ex);
       }
 
-      if ('timeout' in confirmationStatus.err) {
+      if ('timeout' in (confirmationStatus.err as any)) {
         notify({
-          message: `Transaction hasn't been confirmed within ${
-            DEFAULT_TIMEOUT / 1000
-          }s. Please check on Solana Explorer`,
+          message: `Transaction hasn't been confirmed within ${DEFAULT_TIMEOUT / 1000
+            }s. Please check on Solana Explorer`,
           description: (
             <>
               <ExplorerLink
@@ -566,15 +565,15 @@ export async function sendSignedTransaction({
 
     slot = confirmation?.slot || 0;
   } catch (err) {
-    if (err.timeout) {
+    if ((err as any).timeout) {
       throw new Error('Timed out awaiting confirmation on transaction');
     }
     let simulateResult: SimulatedTransactionResponse | null = null;
     try {
       simulateResult = (
         await simulateTransaction(connection, signedTransaction, 'single')
       ).value;
-    } catch (e) {}
+    } catch (e) { }
     if (simulateResult && simulateResult.err) {
       if (simulateResult.logs) {
         for (let i = simulateResult.logs.length - 1; i >= 0; --i) {

packages/common/src/contexts/wallet.tsx

@@ -9,7 +9,7 @@ import {
 } from '@solana/wallet-adapter-base';
 import {
   useWallet as useWalletBase,
-  WalletProvider as BaseWalletProvider
+  WalletProvider as BaseWalletProvider,
 } from '@solana/wallet-adapter-react';
 import {
   getLedgerWallet,
@@ -22,10 +22,19 @@ import {
   Wallet,
   WalletName,
 } from '@solana/wallet-adapter-wallets';
-import { Button, Modal } from "antd";
-import React, { createContext, FC, ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { notify } from "../utils";
-import { useConnectionConfig } from "./connection";
+import { Button, Modal } from 'antd';
+import React, {
+  createContext,
+  FC,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+import { notify } from '../utils';
+import { useConnectionConfig } from './connection';
 
 export interface WalletContextState extends WalletAdapterProps {
   wallets: Wallet[];
@@ -43,20 +52,25 @@ export interface WalletContextState extends WalletAdapterProps {
   signMessage: MessageSignerWalletAdapterProps['signMessage'] | undefined;
 }
 
-export function useWallet (): WalletContextState {
+export function useWallet(): WalletContextState {
   return useWalletBase() as WalletContextState;
 }
 
 export { SignerWalletAdapter, WalletNotConnectedError };
 
-export type WalletSigner = Pick<SignerWalletAdapter, 'publicKey' | 'signTransaction' | 'signAllTransactions'>;
+export type WalletSigner = Pick<
+  SignerWalletAdapter,
+  'publicKey' | 'signTransaction' | 'signAllTransactions'
+>;
 
 export interface WalletModalContextState {
   visible: boolean;
   setVisible: (open: boolean) => void;
 }
 
-export const WalletModalContext = createContext<WalletModalContextState>({} as WalletModalContextState);
+export const WalletModalContext = createContext<WalletModalContextState>(
+  {} as WalletModalContextState,
+);
 
 export function useWalletModal(): WalletModalContextState {
   return useContext(WalletModalContext);
@@ -76,20 +90,23 @@ export const WalletModal = () => {
       onCancel={close}
       width={400}
     >
-      {wallets.map((wallet) => {
+      {wallets.map(wallet => {
         return (
           <Button
             key={wallet.name}
             size="large"
             type={wallet === selected ? 'primary' : 'ghost'}
-            onClick={() => { select(wallet.name); close(); }}
+            onClick={() => {
+              select(wallet.name);
+              close();
+            }}
             icon={
               <img
                 alt={`${wallet.name}`}
                 width={20}
                 height={20}
                 src={wallet.icon}
-                style={{marginRight: 8}}
+                style={{ marginRight: 8 }}
               />
             }
             style={{
@@ -117,13 +134,10 @@ export const WalletModalProvider = ({ children }: { children: ReactNode }) => {
       const base58 = publicKey.toBase58();
       const keyToDisplay =
         base58.length > 20
-          ? `${base58.substring(
-            0,
-            7,
-          )}.....${base58.substring(
-            base58.length - 7,
-            base58.length,
-          )}`
+          ? `${base58.substring(0, 7)}.....${base58.substring(
+              base58.length - 7,
+              base58.length,
+            )}`
           : base58;
 
       notify({
@@ -151,22 +165,22 @@ export const WalletModalProvider = ({ children }: { children: ReactNode }) => {
       }}
     >
       {children}
-      <WalletModal/>
+      <WalletModal />
     </WalletModalContext.Provider>
   );
 };
 
-export const WalletProvider = ({ children }: {children: ReactNode }) => {
+export const WalletProvider = ({ children }: { children: ReactNode }) => {
   const { env } = useConnectionConfig();
 
   const network = useMemo(() => {
     switch (env) {
-      case "mainnet-beta":
+      case 'mainnet-beta':
         return WalletAdapterNetwork.Mainnet;
-      case "testnet":
+      case 'testnet':
         return WalletAdapterNetwork.Testnet;
-      case "devnet":
-      case "localnet":
+      case 'devnet':
+      case 'localnet':
       default:
         return WalletAdapterNetwork.Devnet;
     }
@@ -178,13 +192,13 @@ export const WalletProvider = ({ children }: {children: ReactNode }) => {
       getSlopeWallet(),
       getSolflareWallet(),
       getTorusWallet({
-        options: { clientId: 'Get a client ID @ https://developer.tor.us' }
+        options: { clientId: 'Get a client ID @ https://developer.tor.us' },
       }),
       getLedgerWallet(),
       getSolletWallet({ network }),
       getSolletExtensionWallet({ network }),
     ],
-    []
+    [],
   );
 
   const onError = useCallback((error: WalletError) => {
@@ -196,14 +210,8 @@ export const WalletProvider = ({ children }: {children: ReactNode }) => {
   }, []);
 
   return (
-    <BaseWalletProvider
-      wallets={wallets}
-      onError={onError}
-      autoConnect
-    >
-      <WalletModalProvider>
-        {children}
-      </WalletModalProvider>
+    <BaseWalletProvider wallets={wallets} onError={onError} autoConnect>
+      <WalletModalProvider>{children}</WalletModalProvider>
     </BaseWalletProvider>
   );
-}
+};