Merge branch 'master' into enforce-hex-value-format

holgerd77 · web-flow · commit 26bad87ddfe3 · 2020-04-24T17:38:56.000+02:00
diff --git a/src/account.ts b/src/account.ts
@@ -2,7 +2,7 @@ const ethjsUtil = require('ethjs-util')
 import * as assert from 'assert'
 import * as secp256k1 from 'secp256k1'
 import * as BN from 'bn.js'
-import { toBuffer, zeros, bufferToHex, unpad } from './bytes'
+import { toBuffer, zeros, bufferToHex } from './bytes'
 import { keccak, keccak256, rlphash } from './hash'
 import { assertIsHexString } from './helpers'
 
@@ -118,14 +118,6 @@ export const generateAddress2 = function(
   return address.slice(-20)
 }
 
-/**
- * Returns true if the supplied address belongs to a precompiled account (Byzantium).
- */
-export const isPrecompiled = function(address: Buffer | string): boolean {
-  const a = unpad(address)
-  return a.length === 1 && a[0] >= 1 && a[0] <= 8
-}
-
 /**
  * Checks if the private key satisfies the rules of the curve secp256k1.
  */
diff --git a/test/account.spec.ts b/test/account.spec.ts
@@ -10,7 +10,6 @@ import {
   generateAddress,
   generateAddress2,
   toBuffer,
-  isPrecompiled,
   isValidChecksumAddress,
   isValidAddress,
   toChecksumAddress,
@@ -375,32 +374,6 @@ describe('generateAddress2: EIP-1014 testdata examples', function() {
   }
 })
 
-describe('isPrecompiled', function() {
-  it('should return true', function() {
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000001'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000002'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000003'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000004'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000005'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000006'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000007'), true)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000008'), true)
-    assert.equal(
-      isPrecompiled(Buffer.from('0000000000000000000000000000000000000001', 'hex')),
-      true,
-    )
-  })
-  it('should return false', function() {
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000000'), false)
-    assert.equal(isPrecompiled('0000000000000000000000000000000000000009'), false)
-    assert.equal(isPrecompiled('1000000000000000000000000000000000000000'), false)
-    assert.equal(
-      isPrecompiled(Buffer.from('0000000000000000000000000000000000000000', 'hex')),
-      false,
-    )
-  })
-})
-
 const eip55ChecksumAddresses = [
   // All caps
   '0x52908400098527886E0F7030069857D2E4169EE7',
