@aurigami/sdk 1.5.0 → 1.5.1

package/dist/Papermill.d.ts

@@ -16,8 +16,10 @@ export declare class PapermillRead extends BlockchainEntityRead {
     getPlyBalance(userAddress: Address): Promise<TokenAmount>;
     getPulpBalance(userAddress: Address): Promise<TokenAmount>;
     getUnclaimedPlyReward(userAddress: Address): Promise<TokenAmount>;
+    private getWeek;
     getLockingDetails(userAddress: Address): Promise<UserLockingDetails>;
     getTimestampToUnlock(userAddress: Address, targetUnlockPortion: number): Promise<number>;
+    getUnlockPortionAt(userAddress: Address, timestamp: number): Promise<number>;
 }
 export declare class PapermillReadWrite extends PapermillRead {
     constructor(networkConnection: NetworkConnection);

package/dist/sdk.cjs.development.js

@@ -3386,6 +3386,7 @@ var MoneyMarket = /*#__PURE__*/function (_BlockchainEntity) {
   return MoneyMarket;
 }(BlockchainEntity);
 
+var LOCKING_DENOMINATOR = /*#__PURE__*/ethers.BigNumber.from(10000);
 var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
   _inheritsLoose(PapermillRead, _BlockchainEntityRead);
 
@@ -3496,40 +3497,42 @@ var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return getUnclaimedPlyReward;
   }();
 
+  _proto.getWeek = function getWeek(timestamp) {
+    return ethers.BigNumber.from(timestamp - REWARD_CLAIM_START).div(ONE_WEEK).toNumber();
+  };
+
   _proto.getLockingDetails = /*#__PURE__*/function () {
     var _getLockingDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4(userAddress) {
-      var currentTime, currentWeek, denominator, promises, values, percentLockCurrentWeek, percentLockNextWeek, totalRewards, _yield$this$_pulp$cal, pulpAmountCurrentWeek, plyAmountCurrentWeek, plyAmountNextWeek, pulpAmountNextWeek, currentUnlockPortion, nextUnlockPortion;
+      var currentWeek, promises, values, percentLockCurrentWeek, percentLockNextWeek, totalRewards, _yield$this$_pulp$cal, pulpAmountCurrentWeek, plyAmountCurrentWeek, plyAmountNextWeek, pulpAmountNextWeek, currentUnlockPortion, nextUnlockPortion;
 
       return runtime_1.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              currentTime = getCurrentTimestamp();
-              currentWeek = ethers.BigNumber.from(currentTime - REWARD_CLAIM_START).div(ONE_WEEK).toNumber();
-              denominator = ethers.BigNumber.from(10000);
+              currentWeek = this.getWeek(getCurrentTimestamp());
               promises = [];
               promises.push(this._auriLens.getPercentLock(this._pulp.address, userAddress, currentWeek));
               promises.push(this._auriLens.getPercentLock(this._pulp.address, userAddress, currentWeek + 1));
               promises.push(this.getUnclaimedPlyReward(userAddress));
-              _context4.next = 9;
+              _context4.next = 7;
               return Promise.all(promises);
 
-            case 9:
+            case 7:
               values = _context4.sent;
               percentLockCurrentWeek = ethers.BigNumber.from(values[0]);
               percentLockNextWeek = ethers.BigNumber.from(values[1]);
               totalRewards = values[2];
-              _context4.next = 15;
+              _context4.next = 13;
               return this._pulp.calcLockAmount(userAddress, totalRewards.rawAmount());
 
-            case 15:
+            case 13:
               _yield$this$_pulp$cal = _context4.sent;
               pulpAmountCurrentWeek = _yield$this$_pulp$cal[0];
               plyAmountCurrentWeek = _yield$this$_pulp$cal[1];
-              plyAmountNextWeek = percentLockNextWeek.mul(totalRewards.rawAmount()).div(denominator);
+              plyAmountNextWeek = percentLockNextWeek.mul(totalRewards.rawAmount()).div(LOCKING_DENOMINATOR);
               pulpAmountNextWeek = ethers.BigNumber.from(totalRewards.rawAmount()).sub(plyAmountNextWeek);
-              currentUnlockPortion = denominator.sub(percentLockCurrentWeek).toString();
-              nextUnlockPortion = denominator.sub(percentLockNextWeek).toString();
+              currentUnlockPortion = LOCKING_DENOMINATOR.sub(percentLockCurrentWeek).toString();
+              nextUnlockPortion = LOCKING_DENOMINATOR.sub(percentLockNextWeek).toString();
               return _context4.abrupt("return", {
                 vestingStart: REWARD_CLAIM_START,
                 currentUnlockPortion: new BigNumber(currentUnlockPortion).dividedBy(100).toNumber(),
@@ -3541,7 +3544,7 @@ var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 nextPulp: new TokenAmount(this.pulpToken, pulpAmountNextWeek.toString())
               });
 
-            case 23:
+            case 21:
             case "end":
               return _context4.stop();
           }
@@ -3585,6 +3588,36 @@ var PapermillRead = /*#__PURE__*/function (_BlockchainEntityRead) {
     return getTimestampToUnlock;
   }();
 
+  _proto.getUnlockPortionAt = /*#__PURE__*/function () {
+    var _getUnlockPortionAt = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(userAddress, timestamp) {
+      var lockPortion, unlockPortion;
+      return runtime_1.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this._auriLens.getPercentLock(this._pulp.address, userAddress, this.getWeek(timestamp));
+
+            case 2:
+              lockPortion = _context6.sent;
+              unlockPortion = LOCKING_DENOMINATOR.sub(lockPortion);
+              return _context6.abrupt("return", unlockPortion.toNumber() / 100);
+
+            case 5:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6, this);
+    }));
+
+    function getUnlockPortionAt(_x7, _x8) {
+      return _getUnlockPortionAt.apply(this, arguments);
+    }
+
+    return getUnlockPortionAt;
+  }();
+
   return PapermillRead;
 }(BlockchainEntityRead);
 var PapermillReadWrite = /*#__PURE__*/function (_PapermillRead) {
@@ -3597,22 +3630,22 @@ var PapermillReadWrite = /*#__PURE__*/function (_PapermillRead) {
   var _proto2 = PapermillReadWrite.prototype;
 
   _proto2.redeem = /*#__PURE__*/function () {
-    var _redeem = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(recipient, amount) {
-      return runtime_1.wrap(function _callee6$(_context6) {
+    var _redeem = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(recipient, amount) {
+      return runtime_1.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
-              return _context6.abrupt("return", this._pulp.connect(this._networkConnection.signer).redeem(recipient, amount.rawAmount()));
+              return _context7.abrupt("return", this._pulp.connect(this._networkConnection.signer).redeem(recipient, amount.rawAmount()));
 
             case 1:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee7, this);
     }));
 
-    function redeem(_x7, _x8) {
+    function redeem(_x9, _x10) {
       return _redeem.apply(this, arguments);
     }
 
@@ -3620,28 +3653,28 @@ var PapermillReadWrite = /*#__PURE__*/function (_PapermillRead) {
   }();
 
   _proto2.selfRedeem = /*#__PURE__*/function () {
-    var _selfRedeem = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(amount) {
+    var _selfRedeem = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8(amount) {
       var msgSender;
-      return runtime_1.wrap(function _callee7$(_context7) {
+      return runtime_1.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return this._networkConnection.signer.getAddress();
 
             case 2:
-              msgSender = _context7.sent;
-              return _context7.abrupt("return", this.redeem(msgSender, amount));
+              msgSender = _context8.sent;
+              return _context8.abrupt("return", this.redeem(msgSender, amount));
 
             case 4:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee8, this);
     }));
 
-    function selfRedeem(_x9) {
+    function selfRedeem(_x11) {
       return _selfRedeem.apply(this, arguments);
     }
 
@@ -3828,7 +3861,7 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
   _proto.getPLYWNEARPoolDetails = /*#__PURE__*/function () {
     var _getPLYWNEARPoolDetails = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2() {
-      var stakedLiquidity, rewardPerSeconds, stakedLiquidityAmount, promises, _i, rewardTokenAddress, rewardToken, rewardPerSecond, rewardPerSecondValuation, totalStakeValuation;
+      var stakedLiquidity, rewardPerSeconds, stakedLiquidityAmount, totalStakeValuation, promises, _i, rewardTokenAddress, rewardToken, rewardPerSecond, APYs;
 
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
@@ -3842,6 +3875,11 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
 
             case 2:
               stakedLiquidityAmount = new TokenAmount(PLYWNEARToken, stakedLiquidity.toString());
+              _context2.next = 5;
+              return fetchValuation(stakedLiquidityAmount, this._networkConnection.provider);
+
+            case 5:
+              totalStakeValuation = _context2.sent;
               promises = [];
 
               for (_i = 0; _i < rewardPerSeconds.length; _i++) {
@@ -3851,18 +3889,20 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                 promises.push(fetchValuation(new TokenAmount(rewardToken, rewardPerSecond.toString()), this._networkConnection.provider));
               }
 
-              _context2.next = 7;
+              APYs = [];
+              _context2.next = 11;
               return Promise.all(promises);
 
-            case 7:
-              rewardPerSecondValuation = _context2.sent.reduce(function (p, v) {
-                return p.plus(v);
-              }, new BigNumber(0));
-              _context2.next = 10;
-              return fetchValuation(stakedLiquidityAmount, this._networkConnection.provider);
+            case 11:
+              _context2.sent.forEach(function (rewardPerSecondValuation, i) {
+                var rewardTokenAddress = PLYWNEAR_REWARD_TOKENS[i];
+                var apy = calcLMRewardApr(rewardPerSecondValuation, totalStakeValuation, ONE_DAY * 365).toFixed(DECIMAL_PRECISION);
+                APYs.push({
+                  address: rewardTokenAddress,
+                  apy: apy
+                });
+              });
 
-            case 10:
-              totalStakeValuation = _context2.sent;
               return _context2.abrupt("return", {
                 totalStakedLiquidity: {
                   tokenAmount: stakedLiquidityAmount,
@@ -3871,10 +3911,10 @@ var SdkRead = /*#__PURE__*/function (_BlockchainEntityRead) {
                     amount: totalStakeValuation.toFixed(DECIMAL_PRECISION)
                   }
                 },
-                apy: calcLMRewardApr(rewardPerSecondValuation, totalStakeValuation, ONE_DAY * 365).toFixed(DECIMAL_PRECISION)
+                APYs: APYs
               });
 
-            case 12:
+            case 13:
             case "end":
               return _context2.stop();
           }