Skip to content

Commit

Permalink
Merge pull request #11 from Hephaestus-V/main
Browse files Browse the repository at this point in the history 
Added deposit and withdraw events in HyperHarvest.sol
  • Loading branch information
@Hephaestus-V
Hephaestus-V authored Sep 3, 2024
2 parents adced87 + 093318f commit ffcd075
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 282 deletions.
4 changes: 4 additions & 0 deletions packages/foundry/contracts/HyperHarvest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ contract HyperHarvest is ERC4626, CCIPReceiver, ReentrancyGuard {
uint64 DestinationChainSelector
);
event CrossChainAssetsUpdated(uint256 oldValue, uint256 newValue);
event UserDeposited(address indexed user, uint256 assets, uint256 shares);
event UserWithdrawn(address indexed user, uint256 assets, uint256 shares);


// Modifiers
Expand Down Expand Up @@ -134,6 +136,7 @@ contract HyperHarvest is ERC4626, CCIPReceiver, ReentrancyGuard {
if (assets == 0) revert HyperHarvest__AmountCantBeZero();
uint256 shares = previewDeposit(assets);
_deposit(msg.sender, msg.sender, assets, shares);
emit UserDeposited(msg.sender, assets, shares);
return shares;
}

Expand All @@ -159,6 +162,7 @@ contract HyperHarvest is ERC4626, CCIPReceiver, ReentrancyGuard {

// Transfer the assets to the user
IERC20(asset()).safeTransfer(msg.sender, assets);
emit UserWithdrawn(msg.sender, assets, shares);
return assets;
}

Expand Down
276 changes: 66 additions & 210 deletions packages/nextjs/scripts/strategyExecutor.js
View file
Original file line number Diff line number Diff line change
@@ -1,150 +1,3 @@
// import { ethers } from 'ethers';
// import { encryptStrategy } from '../utils/lit-protocol/strategyEncryption.js';
// import strategyAction from '../utils/lit-protocol/strategyAction.js';
// import * as LitJsSdk from "@lit-protocol/lit-node-client-nodejs";
// import { LitAccessControlConditionResource,LitPKPResource,createSiweMessageWithRecaps, LitActionResource, LitAbility, generateAuthSig } from "@lit-protocol/auth-helpers";
// import { LitContracts } from "@lit-protocol/contracts-sdk";
// import { LitNetwork } from "@lit-protocol/constants";
// import { LitNodeClient } from "@lit-protocol/lit-node-client";

// async function main() {
// const strategy = {
// threshold: 0.5
// };
// const ONE_WEEK_FROM_NOW = new Date(
// Date.now() + 1000 * 60 * 60 * 24 * 7
// ).toISOString();

// const wallet = new ethers.Wallet('6e5903d22b6717cc4d809b07f2df78f22ffe24a0568f1f8d099a2bd54a91327a', new ethers.providers.JsonRpcProvider('https://yellowstone-rpc.litprotocol.com/'));
// console.log(wallet.address,"wallet address");
// const client = new LitNodeClient({
// litNetwork: LitNetwork.DatilTest,
// debug: false,
// });
// await client.connect();

// console.log("clientConnected");

// const litContractClient = new LitContracts({
// signer: wallet,
// network: LitNetwork.DatilTest,
// });
// await litContractClient.connect();

// console.log("litContractClientConnected");
// const capacityCreditInfo = await litContractClient.mintCapacityCreditsNFT({
// requestsPerKilosecond: 80,
// // requestsPerDay: 14400,
// // requestsPerSecond: 10,
// daysUntilUTCMidnightExpiration: 10,
// });
// console.log(capacityCreditInfo, "capacityCreditInfo");
// console.log(capacityCreditInfo.capacityTokenId, "capacityCreditInfo.capacityTokenId");

// const { capacityDelegationAuthSig } = await client.createCapacityDelegationAuthSig({
// dAppOwnerWallet: wallet,
// capacityTokenId: capacityCreditInfo.capacityTokenIdStr,
// delegateeAddresses: [wallet.address],
// uses: "1",
// expiration: new Date(Date.now() + 1000 * 60 * 30).toISOString(), // 10 minutes
// });

// console.log(capacityDelegationAuthSig, "capacityDelegationAuthSig");

// const { ciphertext, dataToEncryptHash, accsResourceString } = await encryptStrategy(JSON.stringify(strategy));
// console.log("Strategy Encrypted");



// let blockHash = await client.getLatestBlockhash();
// const message = await createSiweMessageWithRecaps({
// walletAddress: wallet.address,
// nonce: blockHash,
// litNodeClient: client,
// expiration:ONE_WEEK_FROM_NOW,
// resources: [{
// resource: new LitActionResource("*"),
// ability: LitAbility.LitActionExecution,
// },{
// resource: new LitAccessControlConditionResource("*"),
// ability: LitAbility.AccessControlConditionDecryption,
// }],
// litNodeClient: client,
// })
// const authSig = await generateAuthSig({
// signer: wallet,
// toSign: message,

// });

// console.log(authSig, "authSig");

// const sessionSigs = await client.getLitActionSessionSigs({
// chain: "ethereum",
// resourceAbilityRequests: [
// {
// resource: new LitActionResource('*'),
// ability: LitAbility.LitActionExecution,
// },
// {
// resource: new LitAccessControlConditionResource("*"),
// ability: LitAbility.AccessControlConditionDecryption,
// },
// {
// resource: new LitPKPResource("*"),
// ability: LitAbility.PKPSigning,
// },
// ],
// authNeededCallback : async (params) => {
// return authSig;
// },

// capabilityAuthSigs:[capacityDelegationAuthSig],

// litActionCode : `(async () => {console.log("This is my Lit Action!");})();`,
// jsParams: {}

// });

// console.log(sessionSigs, "sessionSigs");

// await client.executeJs({
// sessionSigs,
// code:`(async () => {console.log("This is my Lit Action!");})();`,
// });

// // const results = await client.executeJs({
// // code: strategyAction,
// // sessionSigs,
// // jsParams: {
// // ciphertext,
// // dataToEncryptHash,
// // arbitrumYield: await getArbitrumYield(),
// // optimismYield: await getOptimismYield(),
// // currentChain: await getCurrentChain()
// // }
// // });

// // const { shouldMove, targetChain } = JSON.parse(results.response);

// // if (shouldMove) {
// // // Execute the strategy on the contract
// // const provider = new ethers.providers.JsonRpcProvider('YOUR_RPC_URL');
// // const signer = new ethers.Wallet('YOUR_PRIVATE_KEY', provider);
// // // const hyperHarvest = new ethers.Contract('YOUR_CONTRACT_ADDRESS', HyperHarvest.abi, signer);

// // // const destinationChainSelector = getChainSelector(targetChain);
// // const receiver = 'RECEIVER_ADDRESS_ON_TARGET_CHAIN';
// // const gasFeeAmount = 'ESTIMATED_GAS_FEE';

// // // await hyperHarvest.executeStrategy(receiver, gasFeeAmount, destinationChainSelector);
// // }
// }
// main().catch((error) => {
// console.error(error);
// process.exit(1);
// });

import * as ethers from "ethers";
import {
LitAccessControlConditionResource,
Expand All @@ -157,11 +10,13 @@ import { LitContracts } from "@lit-protocol/contracts-sdk";
import { LitNetwork } from "@lit-protocol/constants";
import { LitNodeClient } from "@lit-protocol/lit-node-client";
import { encryptString } from "@lit-protocol/encryption";
import { strategyAction } from "../utils/lit-protocol/strategyAction.js";
import {getStrategy} from "../utils/lit-protocol/strategyExecutionHelpers.js"


async function main() {
const strategy = {
threshold: 0.005,
};

const strategy = getStrategy;

const strategyString=JSON.stringify(strategy);
const ONE_WEEK_FROM_NOW = new Date(
Expand Down Expand Up @@ -231,7 +86,6 @@ async function main() {
{
accessControlConditions,
dataToEncrypt:strategyString,
// "f6b82019ef782c18b67f33f096111d12f5dce74817df4faf56cf399dcb4df2ef",
},
client
);
Expand Down Expand Up @@ -275,66 +129,19 @@ async function main() {
console.log("✅ Got Session Sigs via an Auth Sig");

// Example values for yields and current chain
const arbitrumYield = 0.05; // 5% yield on Arbitrum
const optimismYield = 0.06; // 6% yield on Optimism
const currentChain = "ethereum"; // Current chain where funds are
const arbitrumYield = 0.045; // 4.5% yield on Arbitrum
const optimismYield = 0.055; // 5.5% yield on Optimism
const currentChain = "arbitrum"; // Current chain where funds are
const totalAssets = 100000; // Total assets in USD
const estimatedGasCost = {
arbitrum: 50, // $50 gas cost to move to Arbitrum
optimism: 30, // $30 gas cost to move to Optimism
};
const lastMoveTimestamp = Date.now() - 5 * 24 * 60 * 60 * 1000; // Last move was 5 days ago
const moveCount = 1;


const code = `
(async () => {
const resp = await Lit.Actions.decryptAndCombine({
accessControlConditions,
ciphertext,
dataToEncryptHash,
authSig: null,
chain: 'ethereum',
});
const strategy = JSON.parse(resp);
console.log("Decrypted strategy:", strategy);
const { threshold } = strategy;
let shouldMove = false;
let targetChain = currentChain;
if (currentChain === "ethereum") {
if (arbitrumYield > optimismYield && arbitrumYield > threshold) {
shouldMove = true;
targetChain = "arbitrum";
} else if (optimismYield > arbitrumYield && optimismYield > threshold) {
shouldMove = true;
targetChain = "optimism";
}
} else if (currentChain === "arbitrum") {
if (optimismYield > arbitrumYield && optimismYield > threshold) {
shouldMove = true;
targetChain = "optimism";
} else if (arbitrumYield < threshold) {
shouldMove = true;
targetChain = "ethereum";
}
} else if (currentChain === "optimism") {
if (arbitrumYield > optimismYield && arbitrumYield > threshold) {
shouldMove = true;
targetChain = "arbitrum";
} else if (optimismYield < threshold) {
shouldMove = true;
targetChain = "ethereum";
}
}
const result = {
shouldMove,
targetChain,
currentChain,
arbitrumYield,
optimismYield
};
Lit.Actions.setResponse({ response: JSON.stringify(result) });
})();
`;
const code = strategyAction;


const res = await client.executeJs({
Expand All @@ -346,11 +153,60 @@ async function main() {
dataToEncryptHash,
arbitrumYield,
optimismYield,
currentChain
currentChain,
totalAssets,
estimatedGasCost,
lastMoveTimestamp,
moveCount
},
});

console.log("Result:", res);

const result=JSON.parse(res.response);

if (result.shouldMove) {
console.log(`Moving funds to ${result.targetChain}`);

// Set up the contract interaction
const provider = new ethers.providers.JsonRpcProvider('YOUR_RPC_URL');
const signer = new ethers.Wallet('YOUR_PRIVATE_KEY', provider);
const hyperHarvest = new ethers.Contract('YOUR_CONTRACT_ADDRESS', ['function withdrawBridgeAndSupplyAssetToAave(address _receiver, uint256 _gasFeeAmount, uint64 _destinationChainSelector)'], signer);

// Define chain-specific parameters
const chainParams = {
arbitrum: {
receiver: 'ARBITRUM_RECEIVER_ADDRESS',
destinationChainSelector: 'ARBITRUM_CHAIN_SELECTOR',
},
optimism: {
receiver: 'OPTIMISM_RECEIVER_ADDRESS',
destinationChainSelector: 'OPTIMISM_CHAIN_SELECTOR',
},
ethereum: {
receiver: 'ETHEREUM_RECEIVER_ADDRESS',
destinationChainSelector: 'ETHEREUM_CHAIN_SELECTOR',
},
};

const params = chainParams[result.targetChain];
const gasFeeAmount = ethers.utils.parseEther('0.1'); // Adjust as needed

try {
const tx = await hyperHarvest.withdrawBridgeAndSupplyAssetToAave(
params.receiver,
gasFeeAmount,
params.destinationChainSelector
);
await tx.wait();
console.log(`Transaction successful: ${tx.hash}`);
} catch (error) {
console.error("Error executing strategy:", error);
}
} else {
console.log("No action needed. Keeping funds in the current chain.");
}

}
main().catch((error) => {
console.error(error);
Expand Down
Loading

0 comments on commit ffcd075

Please sign in to comment.