[WIP] Lending: cross-collateral+ support

packages/common/package.json

@@ -25,7 +25,7 @@
     "prepare": "run-s clean build"
   },
   "dependencies": {
-    "@project-serum/serum": "^0.13.11",
+    "@project-serum/serum": "^0.13.38",
     "@project-serum/sol-wallet-adapter": "^0.1.4",
     "@solana/spl-token": "0.0.13",
     "@solana/spl-token-swap": "0.1.0",
@@ -44,7 +44,7 @@
     "bn.js": "^5.1.3",
     "borsh": "^0.3.1",
     "bs58": "^4.0.1",
-    "buffer-layout": "^1.2.0",
+    "buffer-layout": "^1.2.1",
     "eventemitter3": "^4.0.7",
     "identicon.js": "^2.3.3",
     "jazzicon": "^1.5.0",

packages/common/src/contexts/connection.tsx

@@ -1,4 +1,9 @@
 import { sleep, useLocalStorageState } from '../utils/utils';
+import {
+  ENV as ChainId,
+  TokenInfo,
+  TokenListProvider,
+} from '@solana/spl-token-registry';
 import {
   Account,
   BlockhashAndFeeCalculator,
@@ -13,24 +18,17 @@ import {
   TransactionSignature,
 } from '@solana/web3.js';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
-import { notify } from '../utils/notifications';
 import { ExplorerLink } from '../components/ExplorerLink';
 import { setProgramIds } from '../utils/ids';
-import {
-  TokenInfo,
-  TokenListProvider,
-  ENV as ChainId,
-} from '@solana/spl-token-registry';
+import { notify } from '../utils/notifications';
 import { SendTransactionError, SignTransactionError } from '../utils/errors';
 
 export type ENV =
   | 'mainnet-beta (Serum)'
   | 'mainnet-beta'
-  | 'mainnet-beta (Serum)'
   | 'testnet'
   | 'devnet'
-  | 'localnet'
-  | 'lending';
+  | 'localnet';
 
 export const ENDPOINTS = [
   {
@@ -58,16 +56,6 @@ export const ENDPOINTS = [
     endpoint: 'http://127.0.0.1:8899',
     ChainId: ChainId.Devnet,
   },
-  {
-    name: 'Oyster Dev' as ENV,
-    endpoint: 'http://oyster-dev.solana.com/',
-    ChainId: ChainId.Devnet,
-  },
-  {
-    name: 'Lending' as ENV,
-    endpoint: 'https://tln.solana.com/',
-    ChainId: ChainId.Devnet,
-  },
 ];
 
 const DEFAULT = ENDPOINTS[0].endpoint;
@@ -108,14 +96,12 @@ export function ConnectionProvider({ children = undefined as any }) {
     DEFAULT_SLIPPAGE.toString(),
   );
 
-  const connection = useMemo(
-    () => new Connection(endpoint, 'recent'),
-    [endpoint],
-  );
-  const sendConnection = useMemo(
-    () => new Connection(endpoint, 'recent'),
-    [endpoint],
-  );
+  const connection = useMemo(() => new Connection(endpoint, 'recent'), [
+    endpoint,
+  ]);
+  const sendConnection = useMemo(() => new Connection(endpoint, 'recent'), [
+    endpoint,
+  ]);
 
   const env =
     ENDPOINTS.find(end => end.endpoint === endpoint)?.name || ENDPOINTS[0].name;
@@ -125,21 +111,53 @@ export function ConnectionProvider({ children = undefined as any }) {
   useEffect(() => {
     // fetch token files
     new TokenListProvider().resolve().then(container => {
-      const list = container
+      const tokens = container
         .excludeByTag('nft')
         .filterByChainId(
           ENDPOINTS.find(end => end.endpoint === endpoint)?.ChainId ||
             ChainId.MainnetBeta,
         )
         .getList();
 
-      const knownMints = [...list].reduce((map, item) => {
+      // @FIXME: remove hardcoded values
+      if (endpoint.ChainId === ChainId.Devnet) {
+        tokens.push(
+          {
+            chainId: 103,
+            address: '9FbAMDvXqNjPqZSYt4EWTguJuDrGkfvwr3gSFpiSbX9S',
+            symbol: 'SRM',
+            name: 'Serum',
+            decimals: 6,
+            logoURI:
+              'https://cdn.jsdelivr.net/gh/trustwallet/assets@master/blockchains/ethereum/assets/0x476c5E26a75bd202a9683ffD34359C0CC15be0fF/logo.png',
+            tags: [],
+            extensions: {
+              website: 'https://projectserum.com/',
+            },
+          },
+          {
+            chainId: 103,
+            address: '7KBVenLz5WNH4PA5MdGkJNpDDyNKnBQTwnz1UqJv9GUm',
+            symbol: 'USDT',
+            name: 'USDT',
+            decimals: 6,
+            logoURI:
+              'https://cdn.jsdelivr.net/gh/solana-labs/explorer/public/tokens/usdt.svg',
+            tags: ['stablecoin'],
+            extensions: {
+              website: 'https://tether.to/',
+            },
+          },
+        );
+      }
+
+      const tokenMap = tokens.reduce((map, item) => {
         map.set(item.address, item);
         return map;
       }, new Map<string, TokenInfo>());
 
-      setTokenMap(knownMints);
-      setTokens(list);
+      setTokenMap(tokenMap);
+      setTokens(tokens);
     });
   }, [env]);
 

packages/common/src/utils/ids.ts

@@ -1,17 +1,16 @@
 import { PublicKey } from '@solana/web3.js';
 import { TokenSwapLayout, TokenSwapLayoutV1 } from '../models/tokenSwap';
 
+export let SYSTEM = new PublicKey('11111111111111111111111111111111');
 export const WRAPPED_SOL_MINT = new PublicKey(
   'So11111111111111111111111111111111111111112',
 );
 export let TOKEN_PROGRAM_ID = new PublicKey(
   'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
 );
-
 export let LENDING_PROGRAM_ID = new PublicKey(
   'LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi',
 );
-
 export let SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID = new PublicKey(
   'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
 );
@@ -21,24 +20,21 @@ export let BPF_UPGRADE_LOADER_ID = new PublicKey(
 export let METADATA_PROGRAM_ID = new PublicKey(
   'metaTA73sFPqA8whreUbBsbn3SLJH2vhrW9fP5dmfdC',
 );
-
 export const MEMO_ID = new PublicKey(
   'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr',
 );
-
 export const VAULT_ID = new PublicKey(
   '94wRaYAQdC2gYF76AUTYSugNJ3rAC4EimjAMPwM7uYry',
 );
-
 export const AUCTION_ID = new PublicKey(
   'C9nHkL6BfGx9M9MyYrJqAD5hPsGJd1fHpp1uAJA6vTCn',
 );
-
 export const METAPLEX_ID = new PublicKey(
   'EPtpKdKW8qciGVd1UFyGjgbBHTbSAyvbY61h9uQGVgeu',
 );
-
-export let SYSTEM = new PublicKey('11111111111111111111111111111111');
+export const PYTH_PROGRAM_ID = new PublicKey(
+  'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
+);
 
 let WORMHOLE_BRIDGE: {
   pubkey: PublicKey;
@@ -84,6 +80,7 @@ export const PROGRAM_IDS = [
         // new PublicKey("9qvG1zUp8xF1Bi4m6UdRNby1BAAuaDrUxSpv4CmRRMjL"),
       ],
     }),
+    lending: () => new PublicKey('LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi'),
   },
   {
     name: 'testnet',
@@ -102,8 +99,8 @@ export const PROGRAM_IDS = [
       },
       legacy: [],
     }),
+    lending: () => new PublicKey('6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH'),
   },
-
   {
     name: 'devnet',
     governance: () => ({
@@ -121,6 +118,7 @@ export const PROGRAM_IDS = [
       },
       legacy: [new PublicKey('BSfTAcBdqmvX5iE2PW88WFNNp2DHhLUaBKk5WrnxVkcJ')],
     }),
+    lending: () => new PublicKey('6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH'),
   },
   {
     name: 'localnet',
@@ -139,6 +137,7 @@ export const PROGRAM_IDS = [
       },
       legacy: [],
     }),
+    lending: () => new PublicKey('6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH'),
   },
 ];
 
@@ -158,11 +157,7 @@ export const setProgramIds = (envName: string) => {
 
   GOVERNANCE = instance.governance();
 
-  if (envName === 'mainnet-beta') {
-    LENDING_PROGRAM_ID = new PublicKey(
-      'LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi',
-    );
-  }
+  LENDING_PROGRAM_ID = instance.lending();
 };
 
 export const programIds = () => {

packages/lending/.prettierignore

@@ -0,0 +1 @@
+build

packages/lending/package.json

@@ -2,18 +2,20 @@
   "name": "lending",
   "version": "0.1.0",
   "dependencies": {
-    "@solana/wallet-base": "0.0.1",
-    "@solana/wallet-ledger": "0.0.1",
     "@ant-design/icons": "^4.4.0",
     "@ant-design/pro-layout": "^6.7.0",
     "@babel/preset-typescript": "^7.12.13",
     "@craco/craco": "^5.7.0",
     "@oyster/common": "0.0.1",
-    "@project-serum/serum": "^0.13.11",
+    "@project-serum/serum": "^0.13.38",
     "@project-serum/sol-wallet-adapter": "^0.1.4",
-    "@solana/spl-token": "0.0.13",
-    "@solana/spl-token-swap": "0.1.0",
-    "@solana/web3.js": "^1.5.0",
+    "@pythnetwork/client": "^2.0.0",
+    "@solana/spl-token": "^0.1.6",
+    "@solana/spl-token-lending": "^0.3.3",
+    "@solana/spl-token-swap": "^0.1.0",
+    "@solana/wallet-base": "0.0.1",
+    "@solana/wallet-ledger": "0.0.1",
+    "@solana/web3.js": "^1.20.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
@@ -23,9 +25,9 @@
     "@types/testing-library__react": "^10.2.0",
     "@welldone-software/why-did-you-render": "^6.0.5",
     "antd": "^4.6.6",
+    "bignumber.js": "^9.0.1",
     "bn.js": "^5.1.3",
     "bs58": "^4.0.1",
-    "buffer-layout": "^1.2.0",
     "chart.js": "^2.9.4",
     "craco-alias": "^2.1.1",
     "craco-babel-loader": "^0.1.4",
@@ -46,7 +48,6 @@
   "scripts": {
     "prestart": "npm-link-shared ../common/node_modules/ . react",
     "start": "craco start --verbose",
-    "start:lending": "craco start --verbose",
     "build": "craco build",
     "test": "craco test",
     "eject": "react-scripts eject",
@@ -87,15 +88,16 @@
     "@types/node": "^12.12.62",
     "arweave-deploy": "^1.9.1",
     "gh-pages": "^3.1.0",
-    "prettier": "^2.1.2",
-    "npm-link-shared": "0.5.6"
+    "npm-link-shared": "0.5.6",
+    "prettier": "^2.1.2"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "resolutions": {
     "react": "16.13.1",
-    "react-dom": "16.13.1"
+    "react-dom": "16.13.1",
+    "@oyster/common": "file:../common/dist/lib"
   }
 }

packages/lending/src/App.tsx

@@ -1,6 +1,6 @@
-import React from "react";
-import "./App.less";
-import { Routes } from "./routes";
+import React from 'react';
+import './App.less';
+import { Routes } from './routes';
 
 function App() {
   return <Routes />;