redeploy

Amxx · Jul 23, 2022 · ba6d6a7 · ba6d6a7
1 parent 5d407a6
commit ba6d6a7
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git a/.cache-100.json b/.cache-100.json
@@ -1,4 +1,3 @@
 {
-	"VestingFactory-pending": "0x3df7aa3bd7d7c623ad50a074f79da790b7878d2a331bdec1f834c77224c91cbd",
-	"VestingFactory": "0xf09FB50ee40129526358C9a704EB2AAA96bc40c2"
+	"VestingFactory-pending": "0x89acbaea569526b74e4d37afb0d427ace3bc615cc4fb2e7f2299d7c31909ba00"
 }
diff --git a/.cache-245022926.json b/.cache-245022926.json
@@ -1,3 +1,4 @@
 {
-	"VestingFactory": "0xBb1D7c823408d0425a676430589474eD9171eAd2"
-}
+	"VestingFactory-pending": "0x84adb5dd77c7894a9bbbbb4f6979bd29859f210d374181bfcff913ce9e78deaf",
+	"VestingFactory": "0x6BDb65A4b0B1A21C094a5D0531C9736611D160A8"
+}
diff --git a/.cache-338.json b/.cache-338.json
@@ -1,3 +1,4 @@
 {
-	"VestingFactory": "0xBb1D7c823408d0425a676430589474eD9171eAd2"
-}
+	"VestingFactory-pending": "0x0b8daa5358928b5eba6d2e5572e4f0da9a2b696317c42d8589924e21a6880011",
+	"VestingFactory": "0x923359CA476cD17A2502bC22857e6b61809cB13C"
+}
diff --git a/.cache-5.json b/.cache-5.json
@@ -1,4 +1,4 @@
 {
-	"VestingFactory-pending": "0x6b78d66d0772b2b56f866ba1389ad9329fbb8c31849555037254235b03473c1f",
-	"VestingFactory": "0xE5d4cE04E365b58B8DB052A7192eCeB4251A11D9"
+	"VestingFactory-pending": "0xd34c2292833f1de6f7318e969571273f4cff7e77560a991a24d872d1464277e8",
+	"VestingFactory": "0x3c912349aB2AcA8D6a573a34acfA9Ff26D49B7f9"
 }
diff --git a/.cache-80001.json b/.cache-80001.json
@@ -1,4 +1,4 @@
 {
-	"VestingFactory-pending": "0x0520743d05f592546bbb7c848dd51ed39ed22a21200e0f50b0c21c7d2daaaa8b",
-	"VestingFactory": "0xBf772251714AeBff39d488e9CE419cb184672EBd"
+	"VestingFactory-pending": "0xbacb9de18db2f96c17b315cb982792f90d0a17e41a978071f80eddf4965ba211",
+	"VestingFactory": "0x5A593C8dD2cA06D962F13a6D8c2335163CE785ee"
 }
diff --git a/contracts/VestingFactory.sol b/contracts/VestingFactory.sol
@@ -62,6 +62,24 @@ contract VestingTemplate is VestingWalletUpgradeable, Multicall
         return _cliff;
     }
 
+    function releaseable()
+        public
+        view
+        virtual
+        returns (uint256)
+    {
+        return vestedAmount(uint64(block.timestamp)) - released();
+    }
+
+    function releaseable(address token)
+        public
+        view
+        virtual
+        returns (uint256)
+    {
+        return vestedAmount(token, uint64(block.timestamp)) - released(token);
+    }
+
     function _vestingSchedule(uint256 totalAllocation, uint64 timestamp)
         internal
         view

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -7,11 +7,11 @@ const argv = require('yargs/yargs')(process.argv.slice(2))
     coverage:      { type: 'boolean',                                          default: false        },
     report:        { type: 'boolean',                                          default: false        },
     // compilations
-    compiler:      { type: 'string',                                           default: '0.8.14'     },
+    compiler:      { type: 'string',                                           default: '0.8.15'     },
     hardfork:      { type: 'string',                                           default: 'london'     },
     mode:          { type: 'string', choices: [ 'production', 'development' ], default: 'production' },
     runs:          { type: 'number',                                           default: 200          },
-		enableIR:      { type: 'boolean',                                          default: false        },
+    enableIR:      { type: 'boolean',                                          default: false        },
     revertStrings: { type: 'string', choices: [ 'default', 'strip'          ], default: 'default'    },
     // chain
     fork:          { type: 'string',                                                                 },
@@ -46,7 +46,7 @@ module.exports = {
   solidity: {
     compilers: [
       { version: argv.compiler, settings },
-      { version: '0.8.14',      settings },
+      { version: '0.8.15',      settings },
       { version: '0.7.6',       settings },
       { version: '0.6.12',      settings },
       { version: '0.5.16',      settings },