2.0.3 further tweaked precision

EthSign · Nov 28, 2023 · 810e7c9 · 810e7c9
1 parent 47e9b03
commit 810e7c9
Show file tree

Hide file tree

Showing 9 changed files with 840 additions and 70 deletions.
diff --git a/contracts/core/TokenTableUnlockerV2.sol b/contracts/core/TokenTableUnlockerV2.sol
@@ -500,7 +500,7 @@ contract TokenTableUnlockerV2 is
         override
         returns (uint256 deltaAmountClaimable, uint256 updatedAmountClaimed)
     {
-        uint256 precisionDecimals = 10 ** 10;
+        uint256 precisionDecimals = 10 ** 5;
         UnlockingScheduleActual memory actual = unlockingScheduleActuals[
             actualId
         ];
@@ -555,15 +555,13 @@ contract TokenTableUnlockerV2 is
                 preset.linearStartTimestampsRelative[
                     latestIncompleteLinearIndex
                 ];
-        uint256 numOfClaimableUnlocksInIncompleteLinear = (latestIncompleteLinearClaimableTimestampRelative *
-                precisionDecimals) /
+        uint256 numOfClaimableUnlocksInIncompleteLinear = latestIncompleteLinearClaimableTimestampRelative /
                 latestIncompleteLinearIntervalForEachUnlock;
         updatedAmountClaimed +=
             (preset.linearBips[latestIncompleteLinearIndex] *
                 precisionDecimals *
                 numOfClaimableUnlocksInIncompleteLinear) /
-            preset.numOfUnlocksForEachLinear[latestIncompleteLinearIndex] /
-            precisionDecimals;
+            preset.numOfUnlocksForEachLinear[latestIncompleteLinearIndex];
         updatedAmountClaimed =
             (updatedAmountClaimed * actual.totalAmount) /
             BIPS_PRECISION /

diff --git a/deployments/polygonMumbai/solcInputs/1924329d63f13163784fb582996c47a2.json b/deployments/polygonMumbai/solcInputs/1924329d63f13163784fb582996c47a2.json
diff --git a/deployments/polygonMumbai/solcInputs/86931b9575c4bba1b533257df568d3d9.json b/deployments/polygonMumbai/solcInputs/86931b9575c4bba1b533257df568d3d9.json
diff --git a/deployments/polygonMumbai/solcInputs/fc82edb6cf7d7f53c210846a2c2e7cc1.json b/deployments/polygonMumbai/solcInputs/fc82edb6cf7d7f53c210846a2c2e7cc1.json
diff --git a/deployments/zkSyncEra/TokenTableUnlockerV2.json b/deployments/zkSyncEra/TokenTableUnlockerV2.json
diff --git a/deployments/zkSyncEra/solcInputs/2f2c481e30ec55c0f8ffc0acb17729d6.json b/deployments/zkSyncEra/solcInputs/2f2c481e30ec55c0f8ffc0acb17729d6.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -167,7 +167,9 @@ export default {
             polygonMumbai: process.env.POLYGONSCAN_KEY,
             mantaPacific: process.env.MANTAPACIFIC_KEY,
             mantaPacificTestnet: process.env.MANTAPACIFIC_TEST_KEY,
-            avaxC: process.env.SNOWTRACE_KEY
+            avaxC: process.env.SNOWTRACE_KEY,
+            sepolia: process.env.ETHERSCAN_KEY,
+            mainnet: process.env.ETHERSCAN_KEY
         },
         customChains: [
             {

diff --git a/test/TokenTableUnlockerV2.test.ts b/test/TokenTableUnlockerV2.test.ts
@@ -80,15 +80,14 @@ const calculateAmountOfTokensToClaimAtTimestamp = (
         claimTimestampRelative -
         linearStartTimestampsRelative[latestIncompleteLinearIndex]
     const numOfClaimableUnlocksInIncompleteLinear =
-        (latestIncompleteLinearClaimableTimestampRelative * precisionDecimals) /
+        latestIncompleteLinearClaimableTimestampRelative /
         latestIncompleteLinearIntervalForEachUnlock
 
     const latestIncompleteLinearClaimableBips =
         (linearBips[latestIncompleteLinearIndex] *
             precisionDecimals *
             numOfClaimableUnlocksInIncompleteLinear) /
-        numOfUnlocksForEachLinear[latestIncompleteLinearIndex] /
-        precisionDecimals
+        numOfUnlocksForEachLinear[latestIncompleteLinearIndex]
 
     claimableBips += latestIncompleteLinearClaimableBips
     if (claimableBips > bipsPrecision * precisionDecimals) {

diff --git a/test/playground.ts b/test/playground.ts
@@ -8,7 +8,7 @@ const calculateAmountOfTokensToClaimAtTimestamp = (
     bipsPrecision: bigint,
     totalAmount: bigint
 ): bigint => {
-    const precisionDecimals = 10n ** 10n
+    const precisionDecimals = 10n ** 5n
     let claimableBips = 0n
     const claimTimestampRelative =
         claimTimestampAbsolute - startTimestampAbsolute
@@ -51,15 +51,14 @@ const calculateAmountOfTokensToClaimAtTimestamp = (
         claimTimestampRelative -
         linearStartTimestampsRelative[latestIncompleteLinearIndex]
     const numOfClaimableUnlocksInIncompleteLinear =
-        (latestIncompleteLinearClaimableTimestampRelative * precisionDecimals) /
+        latestIncompleteLinearClaimableTimestampRelative /
         latestIncompleteLinearIntervalForEachUnlock
 
     const latestIncompleteLinearClaimableBips =
         (linearBips[latestIncompleteLinearIndex] *
             precisionDecimals *
             numOfClaimableUnlocksInIncompleteLinear) /
-        numOfUnlocksForEachLinear[latestIncompleteLinearIndex] /
-        precisionDecimals
+        numOfUnlocksForEachLinear[latestIncompleteLinearIndex]
 
     claimableBips += latestIncompleteLinearClaimableBips
     if (claimableBips > bipsPrecision * precisionDecimals) {