From 309686b9dbf60c1fc4284a274dbe1975e464995d Mon Sep 17 00:00:00 2001 From: shanejonas Date: Fri, 27 Dec 2019 22:09:00 -0800 Subject: [PATCH 1/4] fix: bump multi-geth to 1.9.7 --- src/service-runner-config.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/service-runner-config.json b/src/service-runner-config.json index 9e8eec22..43d9f6e3 100644 --- a/src/service-runner-config.json +++ b/src/service-runner-config.json @@ -4,7 +4,7 @@ { "name": "multi-geth", "rpcPort": "${DYNAMIC_TCP_PORT_1}", - "version": "1.9.2", + "version": "1.9.7", "summary": "An Ethereum Classic and Ethereum client", "environments": [{ "name": "mainnet", @@ -13,9 +13,9 @@ "start": [ "--classic", "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/classic", + "${SERVICE_DIR}/multi-geth/1.9.7/classic", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/classic/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/classic/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -41,9 +41,9 @@ "start": [ "--kotti", "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/kotti", + "${SERVICE_DIR}/multi-geth/1.9.7/kotti", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/kotti/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/kotti/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -71,9 +71,9 @@ "start": [ "--dev", "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/dev", + "${SERVICE_DIR}/multi-geth/1.9.7/dev", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/dev/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/dev/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -98,9 +98,9 @@ "args": { "start": [ "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/ethereum", + "${SERVICE_DIR}/multi-geth/1.9.7/ethereum", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/ethereum/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/ethereum/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -126,9 +126,9 @@ "start": [ "--goerli", "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/goerli", + "${SERVICE_DIR}/multi-geth/1.9.7/goerli", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/goerli/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/goerli/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -154,9 +154,9 @@ "start": [ "--rinkeby", "--datadir", - "${SERVICE_DIR}/multi-geth/1.9.2/rinkeby", + "${SERVICE_DIR}/multi-geth/1.9.7/rinkeby", "--ipcpath", - "${SERVICE_DIR}/multi-geth/1.9.2/rinkeby/geth.ipc", + "${SERVICE_DIR}/multi-geth/1.9.7/rinkeby/geth.ipc", "--port", "${DYNAMIC_TCP_PORT_2}", "--rpc", @@ -193,7 +193,7 @@ "teardown": "" }, "assets": [ - "https://github.com/multi-geth/multi-geth/releases/download/v1.9.2/multi-geth-osx.zip" + "https://github.com/multi-geth/multi-geth/releases/download/v1.9.7/multi-geth-osx.zip" ] }, "linux": { @@ -212,7 +212,7 @@ "teardown": "" }, "assets": [ - "https://github.com/multi-geth/multi-geth/releases/download/v1.9.2/multi-geth-linux.zip" + "https://github.com/multi-geth/multi-geth/releases/download/v1.9.7/multi-geth-linux.zip" ] }, "windows": { @@ -223,7 +223,7 @@ "teardown": "" }, "assets": [ - "https://github.com/multi-geth/multi-geth/releases/download/v1.9.2/multi-geth-win64.zip" + "https://github.com/multi-geth/multi-geth/releases/download/v1.9.7/multi-geth-win64.zip" ] } } From c22c8964f2ae8d7bc4b3299460bbd44caf0c883c Mon Sep 17 00:00:00 2001 From: Zane Starr Date: Thu, 2 Jan 2020 17:17:09 -0800 Subject: [PATCH 2/4] fix: 1.9.7 configuration gzip response --- package-lock.json | 132 ++++++++++++------------- src/lib/config.test.ts | 8 +- src/lib/connectionManager.ts | 7 +- src/lib/frontends/httpFrontend.test.ts | 10 +- src/lib/frontends/httpFrontend.ts | 11 ++- 5 files changed, 90 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 140c0540..4516d115 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4556,28 +4556,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -4588,14 +4588,14 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": false, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, @@ -4606,42 +4606,42 @@ }, "chownr": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -4651,28 +4651,28 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, @@ -4682,14 +4682,14 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -4706,7 +4706,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -4721,14 +4721,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": false, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -4738,7 +4738,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -4748,7 +4748,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -4759,21 +4759,21 @@ }, "inherits": { "version": "2.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, @@ -4783,14 +4783,14 @@ }, "isarray": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, @@ -4800,14 +4800,14 @@ }, "minimist": { "version": "0.0.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true, "optional": true }, "minipass": { "version": "2.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "optional": true, @@ -4818,7 +4818,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, @@ -4828,7 +4828,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "optional": true, @@ -4838,14 +4838,14 @@ }, "ms": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -4857,7 +4857,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -4876,7 +4876,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -4887,14 +4887,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -4905,7 +4905,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -4918,21 +4918,21 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, @@ -4942,21 +4942,21 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -4967,21 +4967,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -4994,7 +4994,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true @@ -5003,7 +5003,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -5019,7 +5019,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -5029,49 +5029,49 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, @@ -5083,7 +5083,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -5093,7 +5093,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, @@ -5103,14 +5103,14 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, @@ -5126,14 +5126,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -5143,14 +5143,14 @@ }, "wrappy": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true }, "yallist": { "version": "3.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true, "optional": true diff --git a/src/lib/config.test.ts b/src/lib/config.test.ts index 686978d4..bb923eac 100644 --- a/src/lib/config.test.ts +++ b/src/lib/config.test.ts @@ -8,7 +8,7 @@ describe("configuration test", () => { const mockConfig = { services: [ { - version: "1.9.2", + version: "1.9.7", name: "multi-geth", environments: [ { @@ -22,7 +22,7 @@ describe("configuration test", () => { }, { name: "eth-classic", - version: "1.9.2", + version: "1.9.7", environments: [ { name: "dev", @@ -58,7 +58,7 @@ describe("configuration test", () => { it("should retrieve service info", () => { const cfg = new Config(mockConfig); - const svc = cfg.getService("multi-geth", "1.9.2", "osx"); + const svc = cfg.getService("multi-geth", "1.9.7", "osx"); expect(svc.name === "multi-geth").toBe(true); expect(svc.environments.find((env: any) => env.name === "test-dev")); const defaultService = defaultConfig.services.find((service: any) => service.name === "multi-geth") as any; @@ -86,7 +86,7 @@ describe("configuration test", () => { it("should retrieve installation information", () => { const config = new Config(mockConfig); - const service = config.getService("multi-geth", "1.9.2", OSTypes.OSX); + const service = config.getService("multi-geth", "1.9.7", OSTypes.OSX); expect(service.name === "multi-geth").toBe(true); expect(service.rpcPort).toEqual("${DYNAMIC_TCP_PORT_1}"); }); diff --git a/src/lib/connectionManager.ts b/src/lib/connectionManager.ts index 7dbf1d98..79ec79b5 100644 --- a/src/lib/connectionManager.ts +++ b/src/lib/connectionManager.ts @@ -60,13 +60,14 @@ export class ConnectionManager { case "http": const response = await request.conn.send(request.payload.body, request.payload.headers, request.payload.method); const { statusCode, statusMessage, headers } = response; - let payloadStr = ""; + /*let payloadStr = ""; response.on("data", (data) => { - payloadStr += data.toString("utf-8"); + payloadStr += data; }); response.on("end", () => { request.conn.respond({ headers, statusCode, reason: statusMessage, payload: payloadStr }); - }); + });/*/ + request.conn.respond({ headers, statusCode, reason: statusMessage, payload: response }); return; } } diff --git a/src/lib/frontends/httpFrontend.test.ts b/src/lib/frontends/httpFrontend.test.ts index a02d3490..3a0f433c 100644 --- a/src/lib/frontends/httpFrontend.test.ts +++ b/src/lib/frontends/httpFrontend.test.ts @@ -9,6 +9,7 @@ import _ from "lodash"; import { httpBackend } from "../backends/httpBackend"; import fetch from "node-fetch"; import { HttpDataResponse } from "../connection"; +import { Readable } from "stream"; describe("Frontend allows for a connection", () => { let httpServiceServer: http.Server; @@ -24,7 +25,7 @@ describe("Frontend allows for a connection", () => { }); }); - it("should allow http client connection to reach established backend", async () => { + it.only("should allow http client connection to reach established backend", async () => { const address = httpServiceServer.address() as AddressInfo; const location = `http://localhost:${address.port}`; @@ -48,7 +49,12 @@ describe("Frontend allows for a connection", () => { const res = await backendClient.conn.send(data.payload.body, data.payload.headers, data.payload.method); res.on("data", (d) => { const { statusCode, headers } = res; - connResponse.emit("response", { headers, reason: "testreason", statusCode, payload: d }); + const s = new Readable(); + // tslint:disable-next-line:no-empty + s._read = () => { }; + s.push(d); + s.push(null); + connResponse.emit("response", { headers, reason: "testreason", statusCode, payload: s }); }); } }); diff --git a/src/lib/frontends/httpFrontend.ts b/src/lib/frontends/httpFrontend.ts index e675ef42..e26373ea 100644 --- a/src/lib/frontends/httpFrontend.ts +++ b/src/lib/frontends/httpFrontend.ts @@ -51,11 +51,16 @@ const httpProxy = (connectionBus: ConnectionBus) => { connectionBus.emit("establish", { req, res: responseBus, type: "http" }); responseBus.on("response", (data) => { - logger.debug(`received response: ${JSON.stringify(data, null, 2)}`); + const { headers, reason } = data; + logger.debug(`received response: ${JSON.stringify({ headers, statusCode: data.statusCode, reason }, null, 2)}`); const status = data.statusCode || 500; response.writeHead(status, data.reason, data.headers); - response.write(data.payload); - response.end(null); + data.payload.on("data", (dd: any) => { + response.write(dd); + }); + data.payload.on("end", () => { + response.end(null); + }); }); }; From 9004da7cfba60740c4e4466e12a0d3ae1ce7fbfc Mon Sep 17 00:00:00 2001 From: Zane Starr Date: Fri, 3 Jan 2020 15:10:02 -0800 Subject: [PATCH 3/4] chore: remove dead code comments --- src/lib/connectionManager.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lib/connectionManager.ts b/src/lib/connectionManager.ts index 79ec79b5..332cdfb6 100644 --- a/src/lib/connectionManager.ts +++ b/src/lib/connectionManager.ts @@ -60,13 +60,6 @@ export class ConnectionManager { case "http": const response = await request.conn.send(request.payload.body, request.payload.headers, request.payload.method); const { statusCode, statusMessage, headers } = response; - /*let payloadStr = ""; - response.on("data", (data) => { - payloadStr += data; - }); - response.on("end", () => { - request.conn.respond({ headers, statusCode, reason: statusMessage, payload: payloadStr }); - });/*/ request.conn.respond({ headers, statusCode, reason: statusMessage, payload: response }); return; } From 4962b5ce5a793b953e2bc518c286a1e7eb59f6bf Mon Sep 17 00:00:00 2001 From: Zane Starr Date: Fri, 3 Jan 2020 15:10:37 -0800 Subject: [PATCH 4/4] feat: add mordor environment configuration --- src/service-runner-config.json | 95 ++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 33 deletions(-) diff --git a/src/service-runner-config.json b/src/service-runner-config.json index 43d9f6e3..b95b08e3 100644 --- a/src/service-runner-config.json +++ b/src/service-runner-config.json @@ -6,7 +6,8 @@ "rpcPort": "${DYNAMIC_TCP_PORT_1}", "version": "1.9.7", "summary": "An Ethereum Classic and Ethereum client", - "environments": [{ + "environments": [ + { "name": "mainnet", "summary": "Ethereum Classic Mainnet", "args": { @@ -21,18 +22,46 @@ "--rpc", "--rpcport", "${DYNAMIC_TCP_PORT_1}", - "--rpccorsdomain", + "--rpccorsdomain", "*" ], "stop": [], "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } + }, + { + "name": "mordor", + "summary": "Ethereum Classic Mordor", + "args": { + "start": [ + "--mordor", + "--datadir", + "${SERVICE_DIR}/multi-geth/1.9.7/mordor", + "--ipcpath", + "${SERVICE_DIR}/multi-geth/1.9.7/mordor/geth.ipc", + "--port", + "${DYNAMIC_TCP_PORT_2}", + "--rpc", + "--rpcport", + "${DYNAMIC_TCP_PORT_1}", + "--rpccorsdomain", + "*" + ], + "stop": [], + "teardown": [] + }, + "health": { + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } }, { "name": "kotti", @@ -58,11 +87,11 @@ "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } }, { "name": "dev", @@ -79,18 +108,18 @@ "--rpc", "--rpcport", "${DYNAMIC_TCP_PORT_1}", - "--rpccorsdomain", + "--rpccorsdomain", "*" ], "stop": [], "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } }, { "name": "ethereum", @@ -113,11 +142,11 @@ "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } }, { "name": "goerli", @@ -141,11 +170,11 @@ "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } }, { "name": "rinkeby", @@ -169,11 +198,11 @@ "teardown": [] }, "health": { - "interval": 20000, - "retries": 5, - "port": "${DYNAMIC_TCP_PORT_1}", - "protocol": "tcp" - } + "interval": 20000, + "retries": 5, + "port": "${DYNAMIC_TCP_PORT_1}", + "protocol": "tcp" + } } ], "os": {