Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

[WIP] Lending: cross-collateral+ support #75

Draft
wants to merge 62 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
26418b9
make typeRoots consistent
jordaaash Apr 13, 2021
0a04850
config/tokens.json doesn't exist
jordaaash Apr 13, 2021
91b6fff
simplify parent paths
jordaaash Apr 13, 2021
c4be0d7
models
jordaaash Apr 22, 2021
b9a71a4
actions
jordaaash Apr 22, 2021
1fd342b
hooks
jordaaash Apr 22, 2021
0624bb1
components
jordaaash Apr 22, 2021
7020d41
views
jordaaash Apr 22, 2021
251f2fe
utils
jordaaash Apr 22, 2021
65e65f6
contexts
jordaaash Apr 22, 2021
6296ef3
root
jordaaash Apr 22, 2021
97bc5f7
refactoring
jordaaash Apr 30, 2021
cee89c0
refactoring
jordaaash May 6, 2021
002723f
Merge branch 'main' into lending/xcl-master
jordaaash Jun 10, 2021
955ade8
update state and instructions
jordaaash Jun 11, 2021
5c89ff1
remove quote token mint
jordaaash Jun 11, 2021
3d021c1
add pyth program id
jordaaash Jun 15, 2021
c054734
oracle/dex fixes
jordaaash Jun 15, 2021
df62cdc
fix all actions
jordaaash Jun 15, 2021
5e6daf6
add and fix buffer layout types
jordaaash Jun 15, 2021
934cf06
todos
jordaaash Jun 15, 2021
86ed2f1
sort exports
jordaaash Jun 15, 2021
4a5362b
fix all typescript and lint errors
jordaaash Jun 15, 2021
b013894
add pyth client + hook
jordaaash Jun 17, 2021
30e26ba
mintPubkey is defined
jordaaash Jun 17, 2021
dfc05c4
revise fixme comments
jordaaash Jun 17, 2021
9827db6
pyth context + refactor
jordaaash Jun 17, 2021
33a3fa3
don't parse liquidity oracle as dex market
jordaaash Jun 17, 2021
b95301d
remove bad connections
jordaaash Jun 18, 2021
4769706
add pyth program id
jordaaash Jun 18, 2021
e751324
use oyster/common from file
jordaaash Jun 18, 2021
c2b1dc3
remove unused import
jordaaash Jun 18, 2021
99783c0
add placeholders for lending program ids
jordaaash Jun 18, 2021
258a01c
Merge branch 'main' into lending/xcl
jordaaash Jun 18, 2021
29b352a
update serum, buffer-layout deps
jordaaash Jun 18, 2021
f39b03e
fixing pubkeys
jordaaash Jun 23, 2021
4580be5
fixing config
jordaaash Jun 23, 2021
f811d7a
working on fixing dex market init
jordaaash Jun 23, 2021
aeadf50
refresh reserves and obligation as needed
jordaaash Jun 25, 2021
0027e7d
add devnet tokens from mango
jordaaash Jun 25, 2021
b865087
remove old pyth hook
jordaaash Jun 25, 2021
11d8ba6
fix pyth subscription
jordaaash Jun 25, 2021
1256f4e
fix dex market
jordaaash Jun 25, 2021
ce889d9
shorthand object literals
jordaaash Jun 25, 2021
9d8ad54
[WIP] fix borrowing
jordaaash Jun 25, 2021
64f7ee3
Merge branch 'main' into lending/xcl
jordaaash Jun 25, 2021
05571e5
fix compilation
jordaaash Jun 28, 2021
230582d
add flashloan placeholder
jordaaash Jun 28, 2021
5719ae9
make route components consistent
jordaaash Jun 28, 2021
16ad2b1
obligation init working
jordaaash Jun 29, 2021
9cbb9dd
wallet.info.account doesn't exist
jordaaash Jun 29, 2021
effeeeb
check for reserves, obligations also have a lendingMarket pubkey
jordaaash Jun 29, 2021
6fcbdf1
handle new obligations
jordaaash Jun 29, 2021
fd48391
obligations view
jordaaash Jun 29, 2021
8898bb5
fix setter name
jordaaash Jun 29, 2021
b4255ea
update deps, add @solana/spl-token-lending
jordaaash Jul 2, 2021
dce8607
remove broken views
jordaaash Jul 2, 2021
682c1ed
models and instructions extracted to lib
jordaaash Jul 2, 2021
944758b
refactor after lib move
jordaaash Jul 2, 2021
dde74ae
more ui refactoring after views removed
jordaaash Jul 2, 2021
10a6a5d
Merge branch 'main' into lending/xcl
jordaaash Jul 2, 2021
e8fae31
more refactoring
jordaaash Jul 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/bridge-sdk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"downlevelIteration": true,
"noEmit": true,
"jsx": "react",
"typeRoots": ["../../types"]
"typeRoots": ["types", "../../types", "../../node_modules/@types"]
},
"include": ["src"]
}
2 changes: 1 addition & 1 deletion packages/bridge/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"downlevelIteration": true,
"noEmit": true,
"jsx": "react",
"typeRoots": ["../../types"]
"typeRoots": ["types", "../../types", "../../node_modules/@types"]
},
"include": ["src"]
}
4 changes: 2 additions & 2 deletions packages/common/src/contexts/wallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { WalletAdapter } from "@solana/wallet-base";
import Wallet from "@project-serum/sol-wallet-adapter";
import { Button, Modal } from "antd";
import React, { useCallback, useContext, useEffect, useMemo, useState} from "react";
import { notify } from "./../utils/notifications";
import { notify } from "../utils/notifications";
import { useConnectionConfig } from "./connection";
import { useLocalStorageState } from "./../utils/utils";
import { useLocalStorageState } from "../utils/utils";
import { LedgerProvider } from "@solana/wallet-ledger";
import { SolongWalletAdapter } from "../wallet-adapters/solong";
import { PhantomWalletAdapter } from "../wallet-adapters/phantom";
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/wallet-adapters/solong_adapter.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import EventEmitter from "eventemitter3";
import { PublicKey } from "@solana/web3.js";
import { notify } from "./../utils/notifications";
import { notify } from "../utils/notifications";

export class SolongAdapter extends EventEmitter {
_publicKey: any;
Expand Down
4 changes: 2 additions & 2 deletions packages/common/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"typeRoots": ["../../types/", "../../node_modules/@types", "../../types"]
"typeRoots": ["types", "../../types", "../../node_modules/@types"]
},
"include": ["src/**/*", "src/config/tokens.json"],
"include": ["src/**/*"],
"exclude": ["src/**/*.test.ts", "**/node_modules"]
}
1 change: 1 addition & 0 deletions packages/lending/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
6 changes: 3 additions & 3 deletions packages/lending/src/App.tsx
Original file line number Diff line number Diff line change
@@ -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 />;
Expand Down
293 changes: 0 additions & 293 deletions packages/lending/src/actions/borrow.tsx

This file was deleted.

Loading