This commit is contained in:
		
					parent
					
						
							
								5a0d9957c5
							
						
					
				
			
			
				commit
				
					
						81463d28ed
					
				
			
		
					 9 changed files with 20401 additions and 8937 deletions
				
			
		
							
								
								
									
										8
									
								
								.idea/.gitignore
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								.idea/.gitignore
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,8 @@
 | 
			
		|||
# Default ignored files
 | 
			
		||||
/shelf/
 | 
			
		||||
/workspace.xml
 | 
			
		||||
# Editor-based HTTP Client requests
 | 
			
		||||
/httpRequests/
 | 
			
		||||
# Datasource local storage ignored files
 | 
			
		||||
/dataSources/
 | 
			
		||||
/dataSources.local.xml
 | 
			
		||||
							
								
								
									
										8
									
								
								.idea/modules.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								.idea/modules.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,8 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<project version="4">
 | 
			
		||||
  <component name="ProjectModuleManager">
 | 
			
		||||
    <modules>
 | 
			
		||||
      <module fileurl="file://$PROJECT_DIR$/.idea/nanocurrency-js.iml" filepath="$PROJECT_DIR$/.idea/nanocurrency-js.iml" />
 | 
			
		||||
    </modules>
 | 
			
		||||
  </component>
 | 
			
		||||
</project>
 | 
			
		||||
							
								
								
									
										12
									
								
								.idea/nanocurrency-js.iml
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								.idea/nanocurrency-js.iml
									
										
									
										generated
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<module type="WEB_MODULE" version="4">
 | 
			
		||||
  <component name="NewModuleRootManager">
 | 
			
		||||
    <content url="file://$MODULE_DIR$">
 | 
			
		||||
      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
 | 
			
		||||
      <excludeFolder url="file://$MODULE_DIR$/temp" />
 | 
			
		||||
      <excludeFolder url="file://$MODULE_DIR$/tmp" />
 | 
			
		||||
    </content>
 | 
			
		||||
    <orderEntry type="inheritedJdk" />
 | 
			
		||||
    <orderEntry type="sourceFolder" forTests="false" />
 | 
			
		||||
  </component>
 | 
			
		||||
</module>
 | 
			
		||||
							
								
								
									
										6
									
								
								.idea/vcs.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.idea/vcs.xml
									
										
									
										generated
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<project version="4">
 | 
			
		||||
  <component name="VcsDirectoryMappings">
 | 
			
		||||
    <mapping directory="" vcs="Git" />
 | 
			
		||||
  </component>
 | 
			
		||||
</project>
 | 
			
		||||
							
								
								
									
										19799
									
								
								package-lock.json
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										19799
									
								
								package-lock.json
									
										
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
				
			
			@ -98,7 +98,7 @@ describe('addresses', () => {
 | 
			
		|||
    expect.assertions(VALID_KEYS.length)
 | 
			
		||||
    for (let key of VALID_KEYS) {
 | 
			
		||||
      expect(nano.deriveAddress(key.publicKey, { useNanoPrefix: true })).toBe(
 | 
			
		||||
        key.account.replace('xrb_', 'nano_')
 | 
			
		||||
        key.account.replace('xrb_', 'nano_').replace('nano_', 'dn_')
 | 
			
		||||
      )
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -105,7 +105,7 @@ export function deriveAddress(
 | 
			
		|||
  const paddedPublicKeyBytes = hexToByteArray(publicKey)
 | 
			
		||||
 | 
			
		||||
  let prefix = 'xrb_'
 | 
			
		||||
  if (params.useNanoPrefix === true) prefix = 'nano_'
 | 
			
		||||
  if (params.useNanoPrefix === true) prefix = 'dn_'
 | 
			
		||||
 | 
			
		||||
  const encodedPublicKey = encodeNanoBase32(paddedPublicKeyBytes)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@ export function parseAddress(address: {}): ParseAddressResult {
 | 
			
		|||
  const invalid = { valid: false, publicKeyBytes: null }
 | 
			
		||||
  if (
 | 
			
		||||
    !checkString(address) ||
 | 
			
		||||
    !/^(xrb_|nano_)[13][13-9a-km-uw-z]{59}$/.test(address as string)
 | 
			
		||||
    !/^(xrb_|nano_|dn_)[13][13-9a-km-uw-z]{59}$/.test(address as string)
 | 
			
		||||
  ) {
 | 
			
		||||
    return invalid
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			@ -28,9 +28,11 @@ export function parseAddress(address: {}): ParseAddressResult {
 | 
			
		|||
  let prefixLength
 | 
			
		||||
  if ((address as string).startsWith('xrb_')) {
 | 
			
		||||
    prefixLength = 4
 | 
			
		||||
  } else {
 | 
			
		||||
    // nano_
 | 
			
		||||
  } else if ((address as string).startsWith('nano_')) {
 | 
			
		||||
    prefixLength = 5
 | 
			
		||||
  } else {
 | 
			
		||||
    // dn_
 | 
			
		||||
    prefixLength = 3
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const publicKeyBytes = decodeNanoBase32(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue