Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update everlend package version #1003

Merged
merged 5 commits into from
Sep 1, 2022
Merged

update everlend package version #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05b0217
Fix/verif (#4)
EvgeniiVoznyuk Aug 30, 2022
1d45b25
hotfix (#5)
EvgeniiVoznyuk Aug 30, 2022
55b4ffd
Merge branch 'solana-labs:main' into main
EvgeniiVoznyuk Aug 31, 2022
dfd70a7
Merge branch 'solana-labs:main' into main
EvgeniiVoznyuk Sep 1, 2022
cd6cca9
update general pool package
EvgeniiVoznyuk Sep 1, 2022
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: 0 additions & 2 deletions Strategies/components/EverlendModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ const EverlendModalContent = ({

useEffect(() => {
const loadMaxAmount = async () => {
console.log('owner', owner.toString())
const poolMintATA = await findAssociatedTokenAccount(
owner,
new PublicKey(proposedInvestment.poolMint)
)
console.log('tokenmintata', poolMintATA.toString())
let poolMintATABalance = 0
let tokenMintATABalance = 0
try {
Expand Down
5 changes: 1 addition & 4 deletions Strategies/protocols/everlend/depositTools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ export const prepareSolDepositTx = async (
new DepositTx(
{ feePayer: payerPublicKey },
{
registryPoolConfig,
registry,
poolConfig: registryPoolConfig,
poolMarket,
pool,
source,
Expand Down Expand Up @@ -367,7 +366,6 @@ export async function handleEverlendDeposit(
const { tx: depositTx } = await prepareDepositTx(
{ connection: connection.current, payerPublicKey: owner },
new PublicKey(poolPubKey),
REGISTRY,
amount,
REWARD_PROGRAM_ID,
CONFIG,
Expand Down Expand Up @@ -400,7 +398,6 @@ export async function handleEverlendWithdraw(
payerPublicKey: owner,
},
new PublicKey(poolPubKey),
REGISTRY,
amount,
REWARD_PROGRAM_ID,
CONFIG,
Expand Down
1 change: 0 additions & 1 deletion hooks/useAccountInvestments/loadData/loadEverlendStrategies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export default async function loadEverlendStrategies(args: {
: undefined

let tokenMintATABalance = 0
console.log(args)

try {
const tokenMintATABalanceFetched = tokenMintAta
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@everlend/core": "^0.0.6",
"@everlend/general-pool": "^0.0.22",
"@everlend/general-pool": "^0.0.23",
"@foresight-tmp/foresight-sdk": "^0.1.46",
"@friktion-labs/friktion-sdk": "^1.1.118",
"@headlessui/react": "^1.6.6",
Expand Down
39 changes: 7 additions & 32 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,10 +2356,10 @@
"@project-serum/anchor" "0.24.2"
"@solana/spl-token" "^0.2.0"

"@everlend/general-pool@^0.0.22":
version "0.0.22"
resolved "https://registry.yarnpkg.com/@everlend/general-pool/-/general-pool-0.0.22.tgz#428a04f605cc5cf8cebdd8973288fa286756d320"
integrity sha512-B6FOC8Zhsm1R4ft7ZOoCLToJWNQHis4ngaIPsiS4IGQEUYUW4eduW3DJzvjIWwkpkZpkcXI+76evyH1Pxp3qcQ==
"@everlend/general-pool@^0.0.23":
version "0.0.23"
resolved "https://registry.yarnpkg.com/@everlend/general-pool/-/general-pool-0.0.23.tgz#8f52bd28150f73bda021e4e6c286fe96f0f7061b"
integrity sha512-eIa/pGXHwJ72jJOiRFrHbQZ2y4wY0Z1ynmBpyC9FXY8O3YPHLtLPaRdXxGzO2uLEKJAxVLVmYHWlcKOL9DSGQQ==
dependencies:
"@everlend/common" "^0.0.3"
"@solana/spl-token" "^0.1.5"
Expand Down Expand Up @@ -4933,7 +4933,7 @@
superstruct "^0.14.2"
tweetnacl "^1.0.0"

"@solana/web3.js@^1.15.0", "@solana/web3.js@^1.37.0":
"@solana/web3.js@^1.15.0", "@solana/web3.js@^1.37.0", "@solana/web3.js@^1.48.0":
version "1.55.0"
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.55.0.tgz#9d7ceb7f71a7316b1e5dbd4434ef82f6537de5d9"
integrity sha512-hXEc5CtA/5tZMvwEy0Cv6iynBpWoSLk6ud2PmoiGfWrZXZqkrfgTPkgd4yBw+VNZJRBRMKVbs/P7kT1sBwZUrw==
Expand Down Expand Up @@ -5089,28 +5089,6 @@
superstruct "^0.14.2"
tweetnacl "^1.0.0"

"@solana/web3.js@^1.48.0":
version "1.55.0"
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.55.0.tgz#9d7ceb7f71a7316b1e5dbd4434ef82f6537de5d9"
integrity sha512-hXEc5CtA/5tZMvwEy0Cv6iynBpWoSLk6ud2PmoiGfWrZXZqkrfgTPkgd4yBw+VNZJRBRMKVbs/P7kT1sBwZUrw==
dependencies:
"@babel/runtime" "^7.12.5"
"@noble/ed25519" "^1.7.0"
"@noble/hashes" "^1.1.2"
"@noble/secp256k1" "^1.6.3"
"@solana/buffer-layout" "^4.0.0"
bigint-buffer "^1.1.5"
bn.js "^5.0.0"
borsh "^0.7.0"
bs58 "^4.0.1"
buffer "6.0.1"
fast-stable-stringify "^1.0.0"
jayson "^3.4.4"
js-sha3 "^0.8.0"
node-fetch "2"
rpc-websockets "^7.5.0"
superstruct "^0.14.2"

"@solendprotocol/solend-sdk@^0.4.4":
version "0.4.9"
resolved "https://registry.yarnpkg.com/@solendprotocol/solend-sdk/-/solend-sdk-0.4.9.tgz#c0e3f24148c4951bf0cfdf16c884bc4ffbb42b7b"
Expand Down Expand Up @@ -5191,9 +5169,6 @@
version "1.0.1"
resolved "https://registry.yarnpkg.com/@stablelib/chacha/-/chacha-1.0.1.tgz#deccfac95083e30600c3f92803a3a1a4fa761371"
integrity sha512-Pmlrswzr0pBzDofdFuVe1q7KdsHKhhU24e8gkEwnTGOmlC7PADzLVxGdn2PoNVBBabdg0l/IfLKg6sHAbTQugg==
dependencies:
"@stablelib/binary" "^1.0.1"
"@stablelib/wipe" "^1.0.1"

"@stablelib/constant-time@^1.0.1":
version "1.0.1"
Expand Down Expand Up @@ -8760,9 +8735,9 @@ dezalgo@1.0.3, dezalgo@^1.0.0:
asap "^2.0.0"
wrappy "1"

"did-jwt@git+https://github.com/civicteam/did-jwt.git":
"did-jwt@git+https://github.com/civicteam/did-jwt":
version "6.1.0"
resolved "git+https://github.com/civicteam/did-jwt.git#d4e318df78bd88e3127e62784915c7a334881eb6"
resolved "git+https://github.com/civicteam/did-jwt#d4e318df78bd88e3127e62784915c7a334881eb6"
dependencies:
"@stablelib/ed25519" "^1.0.2"
"@stablelib/random" "^1.0.1"
Expand Down