Merge pull request #46 from dmccartney/daniel-fix-sweep-addr

fix: check for array of addresses when prepping sweep
dmccartney · Jun 26, 2024 · eb30c42 · eb30c42
2 parents 47ad93c + 29bc873
commit eb30c42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/web/src/components/SafeSweepCard.js b/web/src/components/SafeSweepCard.js
@@ -41,6 +41,7 @@ import {
   estimateDistributeConsensusBatchGas,
   estimateFinalizeGas,
   estimateTipsMevGas,
+  firstOrOnly,
   MinipoolStatus,
   safeAppUrl,
 } from "../utils";
@@ -499,7 +500,7 @@ function useSweeper({ nodeAddress }) {
       txs = txs.concat([
         {
           operation: "0x00",
-          to: contracts.RocketMerkleDistributorMainnet.address,
+          to: firstOrOnly(contracts.RocketMerkleDistributorMainnet.address),
           value: "0",
           data: new ethers.utils.Interface(
             contracts.RocketMerkleDistributorMainnet.abi

diff --git a/web/src/utils.js b/web/src/utils.js
@@ -1,6 +1,10 @@
 import { ethers } from "ethers";
 import _ from "lodash";
 
+export function firstOrOnly(arrayOrNot) {
+  return Array.isArray(arrayOrNot) ? arrayOrNot[0] : arrayOrNot;
+}
+
 // Trim the input address to be "0x####...####"
 export function shortenAddress(address, charCount = 4) {
   // .getAddress here ensures we're dealing with the checksum address