Merge pull request #1519 from AmbireTech/bull-run-campaign

Fix humanizations
AmbireTech · Jan 12, 2024 · 947830b · 947830b
2 parents cb9b971 + 760c6f7
commit 947830b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 24 deletions.
diff --git a/src/lib/humanizers/GMX.js b/src/lib/humanizers/GMX.js
@@ -31,19 +31,19 @@ const GMX = (humanizerInfo) => {
       if (extended)
         return [
           [
-            'Open GMX position',
+            'Interact with GMX position',
             'from',
-            { type: 'token', ...token(humanizerInfo, tokens[tokens.length - 2], -1, true) },
+            { type: 'token', ...token(humanizerInfo, tokens[tokens.length - 2], 0, true) },
             'to',
-            { type: 'token', ...token(humanizerInfo, tokens[0], -1, true) }
+            { type: 'token', ...token(humanizerInfo, tokens[0], 0, true) }
           ]
         ]
       return [
-        `Open GMX position from ${token(humanizerInfo, tokens[tokens.length - 1], -1)} to ${token(
+        `Interact with GMX position from ${token(
           humanizerInfo,
-          tokens[0],
-          -1
-        )}`
+          tokens[tokens.length - 1],
+          0
+        )} to ${token(humanizerInfo, tokens[0], 0)}`
       ]
     }
   }

diff --git a/src/lib/humanizers/Lido.js b/src/lib/humanizers/Lido.js
@@ -53,24 +53,34 @@ const Lido = (humanizerInfo) => {
       const { _amounts, _owner } = unstIfaceETH.parseTransaction(txn).args
       if (extended) {
         return _owner === txn.from || _owner === '0x0000000000000000000000000000000000000000'
-          ? [
-              'Request',
-              'withdrawal from',
-              { type: 'address', address: txn.to, name: getName(txn.to) }
-            ]
+          ? [['Request', 'withdrawal from', getAddress(humanizerInfo, txn.to)]]
           : [
-              'Request',
-              'withdrawal from',
-              { type: 'address', address: txn.to, name: getName(txn.to) },
-              'for',
-              { type: 'address', address: _owner, name: getName(_owner) }
+              [
+                'Request',
+                'withdrawal from',
+                getAddress(humanizerInfo, txn.to),
+                'for',
+                getAddress(humanizerInfo, _owner)
+              ]
             ]
       }
       return [
-        _owner === txn.from || _owner === ethers.constants.AddressZero
-          ? [`Request withdrawal from ${getName(txn.to)}`]
-          : [`Request withdrawal from ${getName(txn.to)} for ${_owner}`]
+        _owner === txn.from || _owner === '0x0000000000000000000000000000000000000000'
+          ? [`Request withdrawal from ${getName(humanizerInfo, txn.to)}`]
+          : [`Request withdrawal from ${getName(humanizerInfo, txn.to)} for ${_owner}`]
       ]
+    },
+    [ifaceMATIC.getSighash('requestWithdraw')]: (txn, network, { extended }) => {
+      const { _amount } = ifaceMATIC.parseTransaction(txn).args
+      if (extended) {
+        return [
+          [
+            'Withdraw',
+            { type: 'token', ...token(humanizerInfo, MATIC_ON_ETH_ADDRESS, _amount, true) }
+          ]
+        ]
+      }
+      return [[`Withdraw  ${token(humanizerInfo, MATIC_ON_ETH_ADDRESS, _amount)}`]]
     }
   }
 }

diff --git a/src/lib/humanizers/MeanFinance.js b/src/lib/humanizers/MeanFinance.js
@@ -36,7 +36,7 @@ const MeanFinance = (humanizerInfo) => {
             'for',
             {
               type: 'token',
-              ...token(humanizerInfo, _to, -1, true)
+              ...token(humanizerInfo, _to, 0, true)
             },
             `Split into ${_amountOfSwaps} swaps over ${getInterval(
               _swapInterval * _amountOfSwaps
@@ -74,7 +74,7 @@ const MeanFinance = (humanizerInfo) => {
             'for',
             {
               type: 'token',
-              ...token(humanizerInfo, _to, -1, true)
+              ...token(humanizerInfo, _to, 0, true)
             },
             `Split into ${_amountOfSwaps} swaps over ${getInterval(
               _swapInterval * _amountOfSwaps

diff --git a/src/lib/humanizers/UniswapV3Pool.js b/src/lib/humanizers/UniswapV3Pool.js
@@ -149,6 +149,25 @@ const UniswapV3Pool = (humanizerInfo) => {
         shouldUnwrapNativeToken,
         referralCode
       ] = params
+      if (orderType === 4) {
+        return !opts.extended
+          ? [
+              `Close ${isLong ? 'long' : 'short'} position with ${token(
+                humanizerInfo,
+                addresses[4],
+                -1
+              )} in ${getName(txn.to)}`
+            ]
+          : [
+              [
+                `Close ${isLong ? 'long' : 'short'} position`,
+                'with',
+                { type: 'token', ...token(humanizerInfo, addresses[4], 0, true) },
+                'in',
+                { type: 'address', address: txn.to, name: getName(humanizerInfo, txn.to) }
+              ]
+            ]
+      }
       return !opts.extended
         ? [
             `Open ${isLong ? 'long' : 'short'} position with collateral ${token(
@@ -161,7 +180,7 @@ const UniswapV3Pool = (humanizerInfo) => {
             [
               `Open ${isLong ? 'long' : 'short'} position`,
               'with collateral',
-              { type: 'token', ...token(humanizerInfo, addresses[4], -1, true) },
+              { type: 'token', ...token(humanizerInfo, addresses[4], 0, true) },
               'in',
               { type: 'address', address: txn.to, name: getName(humanizerInfo, txn.to) }
             ]
@@ -194,7 +213,7 @@ const UniswapV3Pool = (humanizerInfo) => {
           ? nativeToken(network, _minTokenOut, opts.extended)
           : token(humanizerInfo, _tokenOut, _minTokenOut, opts.extended)
       return !opts.extended
-        ? [`Swap ${tokenA}} for ${tokenB}`]
+        ? [`Swap ${tokenA} for ${tokenB}`]
         : [['Swap', { type: 'token', ...tokenA }, 'for', { type: 'token', ...tokenB }]]
     },
     [DCAHubCompanion.getSighash('sendBalanceOnContractToRecipient')]: (