Merge pull request #1129 from ethereumjs/yolov3-client

Common: add YoloV3 network

Author: holgerd77

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ethereum-tests"]
 	path = packages/ethereum-tests
-	url = https://github.com/qbzzt/tests.git
+	url = https://github.com/ethereum/tests.git
 	branch = develop

package-lock.json

@@ -42,7 +42,7 @@
     "@ethereumjs/common": "^2.1.0",
     "merkle-patricia-tree": "^4.1.0",
     "@ethereumjs/tx": "^3.0.2",
-    "ethereumjs-util": "^7.0.8"
+    "ethereumjs-util": "^7.0.9"
   },
   "devDependencies": {
     "@ethereumjs/config-coverage": "^2.0.0",

packages/block/package.json

@@ -40,7 +40,7 @@
     "@ethereumjs/common": "^2.1.0",
     "@ethereumjs/ethash": "^1.0.0",
     "debug": "^2.2.0",
-    "ethereumjs-util": "^7.0.8",
+    "ethereumjs-util": "^7.0.9",
     "level-mem": "^5.0.1",
     "lru-cache": "^5.1.1",
     "rlp": "^2.2.3",

packages/blockchain/package.json

@@ -150,7 +150,7 @@ export class EthProtocol extends Protocol {
    */
   decodeStatus(status: any): any {
     return {
-      networkId: bufferToInt(status.networkId),
+      networkId: new BN(status.networkId),
       td: new BN(status.td),
       bestHash: status.bestHash,
       genesisHash: status.genesisHash,

packages/client/lib/net/protocol/ethprotocol.ts

@@ -202,7 +202,7 @@ export class LesProtocol extends Protocol {
       }
     }
     return {
-      networkId: bufferToInt(status.networkId),
+      networkId: new BN(status.networkId),
       headTd: new BN(status.headTd),
       headHash: status.headHash,
       headNum: new BN(status.headNum),

packages/client/lib/net/protocol/lesprotocol.ts

@@ -58,7 +58,7 @@
     "merkle-patricia-tree": "^4.1.0",
     "@ethereumjs/vm": "^5.1.0",
     "chalk": "^2.4.2",
-    "ethereumjs-util": "^7.0.8",
+    "ethereumjs-util": "^7.0.9",
     "fs-extra": "^7.0.1",
     "it-pipe": "^1.1.0",
     "it-pushable": "^1.4.2",

packages/client/package.json

@@ -64,7 +64,7 @@ tape('[EthProtocol]', (t) => {
       genesisHash: '0xbb',
     })
     t.ok(
-      status.networkId === 1 &&
+      status.networkId.toNumber() === 1 &&
         status.td.toNumber() === 100 &&
         status.bestHash === '0xaa' &&
         status.genesisHash === '0xbb',

packages/client/test/net/protocol/ethprotocol.spec.ts

@@ -82,7 +82,7 @@ tape('[LesProtocol]', (t) => {
     status = { ...status, networkId: [0x01] }
     status = p.decodeStatus(status)
     t.ok(
-      status.networkId === 1 &&
+      status.networkId.toNumber() === 1 &&
         status.headTd.toString('hex') === '64' &&
         status.headHash === '0xaa' &&
         status.headNum.toNumber() === 100 &&

packages/client/test/net/protocol/lesprotocol.spec.ts

@@ -4,6 +4,7 @@ import ropsten from './ropsten.json'
 import rinkeby from './rinkeby.json'
 import kovan from './kovan.json'
 import goerli from './goerli.json'
+import yolov3 from './yolov3.json'
 
 /**
  * @hidden
@@ -15,13 +16,15 @@ export function _getInitializedChains(customChains?: Chain[]) {
     '4': 'rinkeby',
     '42': 'kovan',
     '5': 'goerli',
+    '34180983699157880': 'yolov3',
   }
   const chains: any = {
     mainnet,
     ropsten,
     rinkeby,
     kovan,
     goerli,
+    yolov3,
   }
   if (customChains) {
     for (const chain of customChains) {