Merge pull request #115 from valory-xyz/proposals

chore: updating proposals
valory-xyz · Aug 17, 2023 · 3763b5a · 3763b5a
2 parents b51b448 + 0b5ea29
commit 3763b5a
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 32 deletions.
diff --git a/scripts/proposals/proposal_03_calculate_LP.js b/scripts/proposals/proposal_03_calculate_LP.js
@@ -9,22 +9,8 @@ async function main() {
     const globalsFile = "globals.json";
     const dataFromJSON = fs.readFileSync(globalsFile, "utf8");
     let parsedData = JSON.parse(dataFromJSON);
-    const useLedger = parsedData.useLedger;
-    const derivationPath = parsedData.derivationPath;
     const providerName = parsedData.providerName;
-    let EOA;
-
     const provider = await ethers.providers.getDefaultProvider(providerName);
-    const signers = await ethers.getSigners();
-
-    if (useLedger) {
-        EOA = new LedgerSigner(provider, derivationPath);
-    } else {
-        EOA = signers[0];
-    }
-    // EOA address
-    const deployer = await EOA.getAddress();
-    console.log("EOA is:", deployer);
 
     // Get all the necessary contract addresses
     const depositoryTwoAddress = parsedData.depositoryTwoAddress;
@@ -62,12 +48,12 @@ async function main() {
     priceOLAS = ethers.BigNumber.from(Math.floor(priceOLAS * 100));
 
     // Get current LP price
-    let priceLP = ethers.BigNumber.from(await depository.getCurrentPriceLP(tokenAddress));
+    let priceLP = ethers.BigNumber.from(await depository.getCurrentPriceLP(tokenAddress)).mul(2);
     console.log("Initial priceLP", priceLP.toString());
 
     // Estimate the average ETH amount of swaps the last number of days
     const numDays = 7;
-    console.log("Last number of days:", numDays);
+    console.log("Last number of days to compute the average swap volume:", numDays);
     const numBlocksBack = Math.floor((3600 * 24 * numDays) / 12);
 
     // Get events
@@ -142,17 +128,16 @@ async function main() {
     // Swap to get upper bound prices
     let priceCompare;
     let targetPrice = Number(priceOLAS);
-    let pcStep = 20;
-    let targetPcStep = Math.floor((targetPrice * pcStep) / 100);
-    let totalPriceIncrease = 200;
+    let pcStep = 5;
+    let numSteps = 10;
     const pricesOLASIncrease = new Array();
     const pricesLPIncrease = new Array();
 
     // We need to iteratively swap by adding average ETH into the pool each time such that the price of OLAS increases
     // to the desired value.
     const condition = true;
     while (condition) {
-        targetPrice += targetPcStep;
+        targetPrice += pcStep;
         pricesOLASIncrease.push(targetPrice);
         while (condition) {
             //console.log("targetPrice", targetPrice);
@@ -174,8 +159,8 @@ async function main() {
         pricesLPIncrease.push(priceLP);
 
         // Decrease the total price increase as we reached the new price, and break when we found all prices
-        totalPriceIncrease -= pcStep;
-        if (totalPriceIncrease == 0) {
+        numSteps -= 1;
+        if (numSteps == 0) {
             break;
         }
     }
@@ -190,16 +175,15 @@ async function main() {
 
     // Swap to get lower bound prices
     targetPrice = Number(priceOLAS);
-    pcStep = 20;
-    targetPcStep = Math.floor((targetPrice * pcStep) / 100);
-    let totalPriceDecrease = 80;
+    pcStep = 5;
+    numSteps = 10;
     const pricesOLASDecrease = new Array();
     const pricesLPDecrease = new Array();
 
     // We need to iteratively swap by adding average ETH into the pool each time such that the price of OLAS increases
     // to the desired value.
     while (condition) {
-        targetPrice -= targetPcStep;
+        targetPrice -= pcStep;
         pricesOLASDecrease.push(targetPrice);
         while (condition) {
             //console.log("targetPrice", targetPrice);
@@ -221,8 +205,8 @@ async function main() {
         pricesLPDecrease.push(priceLP);
 
         // Decrease the total price increase as we reached the new price, and break when we found all prices
-        totalPriceDecrease -= pcStep;
-        if (totalPriceDecrease == 0) {
+        numSteps -= 1;
+        if (numSteps == 0 || targetPrice <= pcStep) {
             break;
         }
     }
@@ -234,13 +218,13 @@ async function main() {
 
     // Get effective bond
     const effectiveBond = ethers.BigNumber.from(await tokenomics.effectiveBond());
-    // Vesting is 7 days
-    const vesting = 3600 * 24 * 7;
+    // One day time
+    const oneDay = 3600 * 24;
 
     // Price LP for OLAS price of corresponding prices
     const pricesLP = [pricesOLASIncrease[0]];
-    const supplies = ["1000000" + "0".repeat(18)];
-    const vestings = [vesting];
+    const supplies = ["100000" + "0".repeat(18)];
+    const vestings = [28 * oneDay];
 
     const numPrices = pricesLP.length;
     const targets = new Array(numPrices).fill(depositoryTwoAddress);

diff --git a/scripts/proposals/proposal_06_change_fractions_and_manage_products.js b/scripts/proposals/proposal_06_change_fractions_and_manage_products.js
@@ -0,0 +1,67 @@
+/*global process*/
+
+const { ethers } = require("hardhat");
+
+async function main() {
+    const fs = require("fs");
+    const globalsFile = "globals.json";
+    const dataFromJSON = fs.readFileSync(globalsFile, "utf8");
+    let parsedData = JSON.parse(dataFromJSON);
+    const providerName = parsedData.providerName;
+
+    const provider = await ethers.providers.getDefaultProvider(providerName);
+    const signers = await ethers.getSigners();
+
+    // EOA address
+    const EOA = signers[0];
+    const deployer = await EOA.getAddress();
+    console.log("EOA is:", deployer);
+
+    // Get all the necessary contract addresses
+    const tokenomicsProxyAddress = parsedData.tokenomicsProxyAddress;
+    const depositoryTwoAddress = parsedData.depositoryTwoAddress;
+
+    // Get contract instances
+    const tokenomics = await ethers.getContractAt("Tokenomics", tokenomicsProxyAddress);
+    const depository = await ethers.getContractAt("Depository", depositoryTwoAddress);
+
+    const AddressZero = "0x" + "0".repeat(40);
+
+    // Proposal preparation
+    console.log("Proposal 5. Change tokenomics top-up and bonding fractions, close old products and create new ones");
+    const targets = [depositoryTwoAddress, tokenomicsProxyAddress];
+    const values = [0, 0];
+    const callDatas = [
+        depository.interface.encodeFunctionData("close", [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]]),
+        tokenomics.interface.encodeFunctionData("changeIncentiveFractions", [83, 17, 90, 8, 2])
+    ];
+
+    // Additional products to create with depository contract
+    const oneDay = 3600 * 24;
+    const pricesLP = ["185491475634516176834","171739930293108999394","159606213815396784008","149090326201379530672",
+        "140504866934837734890", "133345477624551759418", "125737933372879003894", "119271520758957161698", "113565862570202595056"];
+    const supplies = ["100000" + "0".repeat(18), "100000" + "0".repeat(18), "100000" + "0".repeat(18), "100000" + "0".repeat(18),
+        "100000" + "0".repeat(18), "150000" + "0".repeat(18), "150000" + "0".repeat(18), "150000" + "0".repeat(18), "150000" + "0".repeat(18)];
+    const vestings = [28 * oneDay, 28 * oneDay, 21 * oneDay, 21 * oneDay, 14 * oneDay, 14 * oneDay, 7 * oneDay, 7 * oneDay, 7 * oneDay];
+
+    for (let i = 0; i < pricesLP.length; i++) {
+        targets.push(depositoryTwoAddress);
+        values.push(0);
+        callDatas.push(depository.interface.encodeFunctionData("create", [parsedData.OLAS_ETH_PairAddress, pricesLP[i], supplies[i], vestings[i]]));
+    }
+
+    const description = "Change tokenomics top-up and bonding fractions, close old products and create new ones";
+
+    // Proposal details
+    console.log("targets:", targets);
+    console.log("values:", values);
+    console.log("call datas:", callDatas);
+    console.log("description:", description);
+}
+
+main()
+    .then(() => process.exit(0))
+    .catch((error) => {
+        console.error(error);
+        process.exit(1);
+    });