From 957d69c3fae1ec2a31711206cb05781ee866df8e Mon Sep 17 00:00:00 2001 From: Cris Date: Sat, 21 May 2022 16:12:30 -0600 Subject: [PATCH 1/2] forge install: forge-std --- .gitmodules | 3 +++ lib/forge-std | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/forge-std diff --git a/.gitmodules b/.gitmodules index caa0ab19..fb08f8cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts +[submodule "lib/forge-std"] + path = lib/forge-std + url = https://github.com/foundry-rs/forge-std diff --git a/lib/forge-std b/lib/forge-std new file mode 160000 index 00000000..1680d7fb --- /dev/null +++ b/lib/forge-std @@ -0,0 +1 @@ +Subproject commit 1680d7fb3e00b7b197a7336e7c88e838c7e6a3ec From bd8e09d4c80c409a739eacf1754e2e30f3c9d8ed Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 31 May 2022 20:57:45 -0600 Subject: [PATCH 2/2] updated foundry, foundry script --- .gitignore | 1 + lib/ds-test | 2 +- lib/forge-std | 2 +- {scripts => script}/CIP-11.ts | 0 {scripts => script}/CIP-12.ts | 0 {scripts => script}/CIP-13.ts | 0 {scripts => script}/CIP-2.ts | 0 {scripts => script}/CIP-3-4.ts | 0 {scripts => script}/CIP-5.ts | 0 {scripts => script}/CIP-7-10.ts | 0 {scripts => script}/CIP-8.ts | 0 script/Liquidate.sol | 23 +++++++++++++++++++++++ {scripts => script}/proposal.ts | 0 {scripts => script}/utils.ts | 0 14 files changed, 26 insertions(+), 2 deletions(-) rename {scripts => script}/CIP-11.ts (100%) rename {scripts => script}/CIP-12.ts (100%) rename {scripts => script}/CIP-13.ts (100%) rename {scripts => script}/CIP-2.ts (100%) rename {scripts => script}/CIP-3-4.ts (100%) rename {scripts => script}/CIP-5.ts (100%) rename {scripts => script}/CIP-7-10.ts (100%) rename {scripts => script}/CIP-8.ts (100%) create mode 100644 script/Liquidate.sol rename {scripts => script}/proposal.ts (100%) rename {scripts => script}/utils.ts (100%) diff --git a/.gitignore b/.gitignore index c5724a6e..df7c1315 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ typechain/ .idea/ .idea/workspace.xml /out +mnemonic.txt diff --git a/lib/ds-test b/lib/ds-test index 0a5da56b..9310e879 160000 --- a/lib/ds-test +++ b/lib/ds-test @@ -1 +1 @@ -Subproject commit 0a5da56b0d65960e6a994d2ec8245e6edd38c248 +Subproject commit 9310e879db8ba3ea6d5c6489a579118fd264a3f5 diff --git a/lib/forge-std b/lib/forge-std index 1680d7fb..56451005 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit 1680d7fb3e00b7b197a7336e7c88e838c7e6a3ec +Subproject commit 564510058ab3db01577b772c275e081e678373f2 diff --git a/scripts/CIP-11.ts b/script/CIP-11.ts similarity index 100% rename from scripts/CIP-11.ts rename to script/CIP-11.ts diff --git a/scripts/CIP-12.ts b/script/CIP-12.ts similarity index 100% rename from scripts/CIP-12.ts rename to script/CIP-12.ts diff --git a/scripts/CIP-13.ts b/script/CIP-13.ts similarity index 100% rename from scripts/CIP-13.ts rename to script/CIP-13.ts diff --git a/scripts/CIP-2.ts b/script/CIP-2.ts similarity index 100% rename from scripts/CIP-2.ts rename to script/CIP-2.ts diff --git a/scripts/CIP-3-4.ts b/script/CIP-3-4.ts similarity index 100% rename from scripts/CIP-3-4.ts rename to script/CIP-3-4.ts diff --git a/scripts/CIP-5.ts b/script/CIP-5.ts similarity index 100% rename from scripts/CIP-5.ts rename to script/CIP-5.ts diff --git a/scripts/CIP-7-10.ts b/script/CIP-7-10.ts similarity index 100% rename from scripts/CIP-7-10.ts rename to script/CIP-7-10.ts diff --git a/scripts/CIP-8.ts b/script/CIP-8.ts similarity index 100% rename from scripts/CIP-8.ts rename to script/CIP-8.ts diff --git a/script/Liquidate.sol b/script/Liquidate.sol new file mode 100644 index 00000000..173ff2b5 --- /dev/null +++ b/script/Liquidate.sol @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.7.5; + +import "forge-std/Script.sol"; +import "forge-std/console.sol"; +import "../contracts/ERC20VaultHandler.sol"; +import "../contracts/TCAP.sol"; + +contract Liquidate is Script { + function run() public { + vm.startBroadcast(); + // // Liquidate + uint256 vaultId = 1; + IVaultHandler vault = IVaultHandler(0xA5b3Bb6e1f206624B3B8CE0c6A0f7614fd35Fa03); + TCAP tcap = TCAP(0x16c52CeeCE2ed57dAd87319D91B5e3637d50aFa4); + console.log("ratio", vault.ratio()); + console.log("vault ratio", vault.getVaultRatio(vaultId)); + console.log("deployer", msg.sender); + require(vault.ratio() > vault.getVaultRatio(vaultId) && vault.getVaultRatio(vaultId) != 0 , "not liquidable vault above"); + require(tcap.balanceOf(msg.sender)> vault.requiredLiquidationTCAP(vaultId)); + vault.liquidateVault(vaultId, tcap.balanceOf(msg.sender)); + } +} diff --git a/scripts/proposal.ts b/script/proposal.ts similarity index 100% rename from scripts/proposal.ts rename to script/proposal.ts diff --git a/scripts/utils.ts b/script/utils.ts similarity index 100% rename from scripts/utils.ts rename to script/utils.ts