continue to skip first rate in simple fee ranges
This commit is contained in:
		
							parent
							
								
									54f5dc5ded
								
							
						
					
					
						commit
						e9398f24a7
					
				@ -121,7 +121,7 @@
 | 
			
		||||
    <ng-container *ngIf="!isLoadingBlock; else loadingRest">
 | 
			
		||||
      <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
 | 
			
		||||
        <td i18n="mempool-block.fee-span">Fee span</td>
 | 
			
		||||
        <td><span>{{ block.extras.feeRange[0] | number:'1.0-0' }} - {{ block.extras.feeRange[block.extras.feeRange.length - 1] | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
 | 
			
		||||
        <td><span>{{ getMinBlockFee(block) | number:'1.0-0' }} - {{ getMaxBlockFee(block) | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
 | 
			
		||||
      </tr>
 | 
			
		||||
      <tr *ngIf="block?.extras?.medianFee != undefined">
 | 
			
		||||
        <td class="td-width" i18n="block.median-fee">Median fee</td>
 | 
			
		||||
 | 
			
		||||
@ -663,4 +663,23 @@ export class BlockComponent implements OnInit, OnDestroy {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  getMinBlockFee(block: BlockExtended): number {
 | 
			
		||||
    if (block?.extras?.feeRange) {
 | 
			
		||||
      // heuristic to check if feeRange is adjusted for effective rates
 | 
			
		||||
      if (block.extras.medianFee === block.extras.feeRange[3]) {
 | 
			
		||||
        return block.extras.feeRange[1];
 | 
			
		||||
      } else {
 | 
			
		||||
        return block.extras.feeRange[0];
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return 0;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  getMaxBlockFee(block: BlockExtended): number {
 | 
			
		||||
    if (block?.extras?.feeRange) {
 | 
			
		||||
      return block.extras.feeRange[block.extras.feeRange.length - 1];
 | 
			
		||||
    }
 | 
			
		||||
    return 0;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@ -32,8 +32,8 @@
 | 
			
		||||
            </ng-template>
 | 
			
		||||
            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span"
 | 
			
		||||
              *ngIf="block?.extras?.feeRange; else emptyfeespan">
 | 
			
		||||
              {{ block?.extras?.feeRange?.[0] | number:feeRounding }} - {{
 | 
			
		||||
              block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container
 | 
			
		||||
              {{ getMinBlockFee(block) | number:feeRounding }} - {{
 | 
			
		||||
              getMaxBlockFee(block) | number:feeRounding }} <ng-container
 | 
			
		||||
                i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
 | 
			
		||||
            </div>
 | 
			
		||||
            <ng-template #emptyfeespan>
 | 
			
		||||
 | 
			
		||||
@ -365,4 +365,23 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
 | 
			
		||||
    }
 | 
			
		||||
    return emptyBlocks;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  getMinBlockFee(block: BlockExtended): number {
 | 
			
		||||
    if (block?.extras?.feeRange) {
 | 
			
		||||
      // heuristic to check if feeRange is adjusted for effective rates
 | 
			
		||||
      if (block.extras.medianFee === block.extras.feeRange[3]) {
 | 
			
		||||
        return block.extras.feeRange[1];
 | 
			
		||||
      } else {
 | 
			
		||||
        return block.extras.feeRange[0];
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    return 0;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  getMaxBlockFee(block: BlockExtended): number {
 | 
			
		||||
    if (block?.extras?.feeRange) {
 | 
			
		||||
      return block.extras.feeRange[block.extras.feeRange.length - 1];
 | 
			
		||||
    }
 | 
			
		||||
    return 0;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user