File tree Expand file tree Collapse file tree 1 file changed +0
-22
lines changed
modules/abstract-utxo/src Expand file tree Collapse file tree 1 file changed +0
-22
lines changed Original file line number Diff line number Diff line change @@ -530,28 +530,6 @@ export abstract class AbstractUtxoCoin extends BaseCoin {
530530 }
531531
532532 /**
533- <<<<<<< HEAD
534- * @param first
535- * @param second
536- * @returns {Array } All outputs that are in the first array but not in the second
537- */
538- public static outputDifference ( first : Output [ ] , second : Output [ ] ) : Output [ ] {
539- const keyFunc = ( { address, amount } : Output ) : string => `${ address } :${ amount } ` ;
540- const groupedOutputs = _ . groupBy ( first , keyFunc ) ;
541-
542- second . forEach ( ( output ) => {
543- const group = groupedOutputs [ keyFunc ( output ) ] ;
544- if ( group ) {
545- group . pop ( ) ;
546- }
547- } ) ;
548-
549- return _ . flatten ( _ . values ( groupedOutputs ) ) ;
550- }
551-
552- /**
553- =======
554- >>>>>>> 8cc76f6e8 (refactor(abstract-utxo): factor fixedScript parseTransaction)
555533 * Determine an address' type based on its witness and redeem script presence
556534 * @param addressDetails
557535 */
You can’t perform that action at this time.
0 commit comments