fix beraborrow script (#66)

Author: milonite

outputs/berachain/beraborrow/nect-usde.json

@@ -1,28 +1,28 @@
 [
   [
-    "0xb65d95ec01ffffffffffff0907899ac8be7462151d6515fcd4773dd9267c9911",
-    "0x2e1cc2f601ffffffffffff0a07899ac8be7462151d6515fcd4773dd9267c9911",
-    "0x095ea7b3010a00ffffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
-    "0x095ea7b3010a00ffffffffff78f87aa41a4c32a619467d5b36e0319f3eaf2da2",
-    "0x70a082310109ffffffffff0a5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
+    "0xb65d95ec01ffffffffffff0807899ac8be7462151d6515fcd4773dd9267c9911",
+    "0x2e1cc2f601ffffffffffff0907899ac8be7462151d6515fcd4773dd9267c9911",
+    "0x095ea7b3010900ffffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
+    "0x095ea7b3010900ffffffffff78f87aa41a4c32a619467d5b36e0319f3eaf2da2",
+    "0x70a082310108ffffffffff095d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
     "0x0ff4c9160101ffffffffff0139027795ae6f2b56ada04f0c25cf5adbd095933b",
-    "0xb67d77c5010a01ffffffff0aca99eaa38e8f37a168214a3a57c9a45a58563ed5",
+    "0xb67d77c5010901ffffffff09ca99eaa38e8f37a168214a3a57c9a45a58563ed5",
     "0x095ea7b3010201ffffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
-    "0x6e553f65010109ffffffff015623554ece4e1fd78e8a4ce13d588a8e0053825d",
+    "0x6e553f65010108ffffffff015623554ece4e1fd78e8a4ce13d588a8e0053825d",
     "0x0ff4c9160103ffffffffff0339027795ae6f2b56ada04f0c25cf5adbd095933b",
     "0x0ff4c9160104ffffffffff0439027795ae6f2b56ada04f0c25cf5adbd095933b",
     "0x4bf6a8f0010103ffffffff03d0af6f692bfa10d6a535a3a321dc8377f4eeef12",
-    "0x4bf6a8f0010a04ffffffff04d0af6f692bfa10d6a535a3a321dc8377f4eeef12",
-    "0x0ff4c9160105ffffffffff0239027795ae6f2b56ada04f0c25cf5adbd095933b",
+    "0x4bf6a8f0010904ffffffff04d0af6f692bfa10d6a535a3a321dc8377f4eeef12",
+    "0x0ff4c9160105ffffffffff0039027795ae6f2b56ada04f0c25cf5adbd095933b",
     "0x095ea7b3010601ffffffffff1ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
-    "0x095ea7b301060affffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
+    "0x095ea7b3010609ffffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
     "0x74dbc248c1000000000000ffca4a9ae6712aff3948c871503fc46cbe6da3cae5",
-    "0x07010a03040209ffffffffffffffffffffffffffffffffffffffffffffffffff",
+    "0x07010903040008ffffffffffffffffffffffffffffffffffffffffffffffffff",
     "0x095ea7b3010605ffffffffff1ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
     "0x095ea7b3010605ffffffffff5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
-    "0x70a082310109ffffffffff061ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
-    "0x095ea7b3010806ffffffffff1ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
-    "0xb460af9401060909ffffffffcab847887a2d516dfa690fa346638429415c089b"
+    "0x70a082310108ffffffffff061ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
+    "0x095ea7b3010206ffffffffff1ce0a25d13ce4d52071ae7e02cf1f6606f4c79d3",
+    "0xb460af9401060808ffffffff5623554ece4e1fd78e8a4ce13d588a8e0053825d"
   ],
   [
     "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -33,7 +33,6 @@
     "0x0000000000000000000000000000000000000000000000000000000000000000",
     "0x000000000000000000000000ca4a9ae6712aff3948c871503fc46cbe6da3cae5",
     "0x00000000000000000000000078f87aa41a4c32a619467d5b36e0319f3eaf2da2",
-    "0x000000000000000000000000cab847887a2d516dfa690fa346638429415c089b",
     "0x",
     "0x"
   ]

src/shortcuts/beraborrow/nect-honey.ts

@@ -15,7 +15,7 @@ import {
   mintHoney,
   mintNectWithUsdc,
   redeemHoney,
-  redeemNect,
+  redeemNectForUsc,
 } from '../../utils';
 
 export class BeraborrowNectHoneyShortcut implements Shortcut {
@@ -69,7 +69,7 @@ export class BeraborrowNectHoneyShortcut implements Shortcut {
     const nectLeftoversAmount = builder.add(balanceOf(nect, walletAddress()));
 
     await redeemHoney(usdc, honeyLeftoverAmount, builder);
-    await redeemNect(nectLeftoversAmount, builder);
+    await redeemNectForUsc(nectLeftoversAmount, builder);
 
     const payload = await builder.build({
       requireWeiroll: true,

src/shortcuts/beraborrow/nect-usde.ts

@@ -7,7 +7,7 @@ import { StaticJsonRpcProvider } from '@ethersproject/providers';
 
 import { chainIdToDeFiAddresses, chainIdToTokenHolder } from '../../constants';
 import { AddressData, Input, Output, Shortcut } from '../../types';
-import { balanceOf, depositKodiak, getSetterValue, mintNectWithUsde, redeemNect } from '../../utils';
+import { balanceOf, depositKodiak, getSetterValue, mintNectWithUsde, redeemNectForUsde } from '../../utils';
 
 export class BeraborrowNectUsdeShortcut implements Shortcut {
   name = 'beraborrow-nect-usde';
@@ -47,7 +47,7 @@ export class BeraborrowNectUsdeShortcut implements Shortcut {
     await depositKodiak(provider, builder, [nect, usde], [mintedAmount, remainingUsde], island, this.setterInputs);
 
     const nectLeftoversAmount = builder.add(balanceOf(nect, walletAddress()));
-    await redeemNect(nectLeftoversAmount, builder);
+    await redeemNectForUsde(nectLeftoversAmount, builder);
 
     const payload = await builder.build({
       requireWeiroll: true,

src/utils/index.ts

@@ -165,7 +165,7 @@ export async function redeemHoney(asset: AddressArg, amount: NumberArg, builder:
   return amountOut as FromContractCallArg;
 }
 
-export async function redeemNect(amount: NumberArg, builder: Builder) {
+export async function redeemNectForUsc(amount: NumberArg, builder: Builder) {
   const approvals = {
     tokens: [chainIdToDeFiAddresses[builder.chainId].nect],
     amounts: [amount],
@@ -183,6 +183,24 @@ export async function redeemNect(amount: NumberArg, builder: Builder) {
   builder.add(redeem);
 }
 
+export async function redeemNectForUsde(amount: NumberArg, builder: Builder) {
+  const approvals = {
+    tokens: [chainIdToDeFiAddresses[builder.chainId].nect],
+    amounts: [amount],
+    spender: chainIdToDeFiAddresses[builder.chainId].usdePsmBond,
+  };
+
+  addApprovals(builder, approvals);
+  const redeem = contractCall({
+    address: chainIdToDeFiAddresses[builder.chainId].usdePsmBond,
+    functionName: 'withdraw',
+    abi: ['function withdraw(uint shares, address receiver, address owner) '],
+    args: [amount, walletAddress(), walletAddress()],
+  });
+
+  builder.add(redeem);
+}
+
 export async function burnTokens(token: AddressArg, amount: NumberArg, builder: Builder) {
   const erc20 = getStandardByProtocol('erc20', builder.chainId);
   await erc20.transfer.addToBuilder(builder, {