Merge branch 'master' into nymkappa/bugfix/ignore-too-low-lightning-timestamps
This commit is contained in:
		
						commit
						a5acb81def
					
				@ -247,7 +247,11 @@ export class Common {
 | 
			
		||||
 | 
			
		||||
  static findSocketNetwork(addr: string): {network: string | null, url: string} {
 | 
			
		||||
    let network: string | null = null;
 | 
			
		||||
    let url = addr.split('://')[1];
 | 
			
		||||
    let url: string = addr;
 | 
			
		||||
 | 
			
		||||
    if (config.LIGHTNING.BACKEND === 'cln') {
 | 
			
		||||
      url = addr.split('://')[1];
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (!url) {
 | 
			
		||||
      return {
 | 
			
		||||
@ -264,7 +268,7 @@ export class Common {
 | 
			
		||||
      }
 | 
			
		||||
    } else if (addr.indexOf('i2p') !== -1) {
 | 
			
		||||
      network = 'i2p';
 | 
			
		||||
    } else if (addr.indexOf('ipv4') !== -1) {
 | 
			
		||||
    } else if (addr.indexOf('ipv4') !== -1 || (config.LIGHTNING.BACKEND === 'lnd' && isIP(url.split(':')[0]) === 4)) {
 | 
			
		||||
      const ipv = isIP(url.split(':')[0]);
 | 
			
		||||
      if (ipv === 4) {
 | 
			
		||||
        network = 'ipv4';
 | 
			
		||||
@ -274,7 +278,7 @@ export class Common {
 | 
			
		||||
          url: addr,
 | 
			
		||||
        };
 | 
			
		||||
      }
 | 
			
		||||
    } else if (addr.indexOf('ipv6') !== -1) {
 | 
			
		||||
    } else if (addr.indexOf('ipv6') !== -1 || (config.LIGHTNING.BACKEND === 'lnd' && url.indexOf(']:'))) {
 | 
			
		||||
      url = url.split('[')[1].split(']')[0];
 | 
			
		||||
      const ipv = isIP(url);
 | 
			
		||||
      if (ipv === 6) {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user