From 261c0b56f82c42d3af9ada9c50f450185533be4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D1=88=D0=B5=D0=BD=D1=8C=D0=BA=D0=B0?= Date: Fri, 22 May 2020 15:47:57 +0300 Subject: [PATCH] IDE-592 --- package-lock.json | 235 +++++++++++++++++++++++++++++---- package.json | 4 +- src/core/lib/contextBinding.ts | 4 +- 3 files changed, 215 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b224a2..c9cbff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,60 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, "@types/babel-types": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz", @@ -33,6 +87,14 @@ "resolved": "https://registry.npmjs.org/@types/base64-js/-/base64-js-1.2.5.tgz", "integrity": "sha1-WCskdhaabLpGCiFNR2x0REHYc9U=" }, + "@types/bignumber.js": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/bignumber.js/-/bignumber.js-5.0.0.tgz", + "integrity": "sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA==", + "requires": { + "bignumber.js": "*" + } + }, "@types/classnames": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.6.tgz", @@ -53,8 +115,16 @@ "@types/node": { "version": "10.11.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz", - "integrity": "sha512-3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ==", - "dev": true + "integrity": "sha512-3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ==" + }, + "@types/node-fetch": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz", + "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==", + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + } }, "@types/prop-types": { "version": "15.5.6", @@ -101,16 +171,51 @@ "redux": "^4.0.0" } }, + "@waves/bignumber": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@waves/bignumber/-/bignumber-0.0.1.tgz", + "integrity": "sha512-+bQCa8fPCYdkLtwKsKtgbvDD7MzZTv6bc2ZpGMqn9uq+RjO8Qf4XSrs0DVhtWWhCHplkVIqOeS4bzgW1i3P7rw==", + "requires": { + "@types/bignumber.js": "^5.0.0", + "bignumber.js": "^8.1.1" + } + }, "@waves/marshall": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@waves/marshall/-/marshall-0.8.0.tgz", - "integrity": "sha512-YyojnIYXl8MEiIS21CPHYevHdJcqInjn/ukvulXNHkLRo4LmqMQmaeKQecleQ1Rrxw83Rb0UjDFeYdY3cRjG3g==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@waves/marshall/-/marshall-0.10.0.tgz", + "integrity": "sha512-I51GmHK7+acy3oqq+NvXrx4ZQNqNmzt9wZvr5dMJ8b9uj4mijqLocojNP03c1/7PR2SIZ56T5sQlHcP1GWWGXw==", "requires": { "@types/base64-js": "^1.2.5", "@types/long": "^4.0.0", + "@waves/parse-json-bignumber": "^1.0.1", "base64-js": "^1.3.0", - "long": "^4.0.0", - "parse-json-bignumber": "^0.1.2" + "long": "^4.0.0" + } + }, + "@waves/node-api-js": { + "version": "0.1.4-beta.1", + "resolved": "https://registry.npmjs.org/@waves/node-api-js/-/node-api-js-0.1.4-beta.1.tgz", + "integrity": "sha512-BfUiXyujJNOkTp+P8dtIMrojD/aydJQ6jQXYprb2Y6S5R9dVx02yYyyd3czy0cB9Pa/PjuuC3vQtxx79tyHBKg==", + "requires": { + "@types/node-fetch": "^2.5.4", + "@waves/bignumber": "0.0.1", + "@waves/ts-types": "^0.3.2", + "node-fetch": "^2.6.0", + "typed-ts-events": "^1.1.1" + } + }, + "@waves/parse-json-bignumber": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@waves/parse-json-bignumber/-/parse-json-bignumber-1.0.3.tgz", + "integrity": "sha512-zBHIQUjjMYMQXNQcwJwzNShUZnoTM6JfVJDwa0eDGUVk+JAKVGiXxv/k29Ng9TsIDi97hwVravlPPwfZcy4XXQ==" + }, + "@waves/protobuf-serialization": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@waves/protobuf-serialization/-/protobuf-serialization-0.3.0.tgz", + "integrity": "sha512-0T5f/yApE0OA44SZfQaRTOrDBy31RGBRNqujNawIGqntIOyDtH2s4t6riYNT2doTs1Sj/VEOfu9MwWn22TgAkA==", + "requires": { + "@types/long": "^4.0.0", + "protobufjs": "^6.8.8" } }, "@waves/ride-js": { @@ -123,10 +228,11 @@ } }, "@waves/ts-lib-crypto": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@waves/ts-lib-crypto/-/ts-lib-crypto-1.1.0.tgz", - "integrity": "sha512-1l1QSg2gSZ7x6mzcwkfVBvBzGEl+CaZ6UCSMaD11gMd9r9QgXhY0VuJSjrUyUbd2emZqqMtHNQvdUstmrTfNjA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@waves/ts-lib-crypto/-/ts-lib-crypto-1.4.3.tgz", + "integrity": "sha512-2pKgyvtLapgM5vpaUEYzX7NYe2bkB+HdWn9W/4d7UFKwyg6zoOYhRQWyb6GuLi3OLHTETgiqpcMZvciFA0Ds6g==", "requires": { + "js-sha3": "^0.8.0", "node-forge": "^0.8.5" }, "dependencies": { @@ -137,14 +243,22 @@ } } }, + "@waves/ts-types": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@waves/ts-types/-/ts-types-0.3.2.tgz", + "integrity": "sha512-HMP8498rjlQ4Yslpzxnd0XFw6JPRmlQjmTFUZjsUMQpqJ5+4+xXF50TjKcDp/poteJLK4hPVx10B0kZoL+8xWQ==" + }, "@waves/waves-transactions": { - "version": "3.16.2", - "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.16.2.tgz", - "integrity": "sha512-J67747XSL3/7RAi2gxR6jxLssi0Pxd1Ss3sF3xjSxs1E2QkpjvqW/03hauKJ03DfaCFQq9oePo7+33cUWWIeAw==", + "version": "4.0.0-beta.12", + "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-4.0.0-beta.12.tgz", + "integrity": "sha512-ZM4g2WYNvLvgBvdzI0QoHjO2N6pYQTF45HKmGmLJXF3ZwdmAEOZDAiTq8iftZNNOwBTnaNdaUI9Af1frjRIpCA==", "requires": { - "@waves/marshall": "^0.8.0", - "@waves/ts-lib-crypto": "^1.1.0", - "axios": "^0.19.0" + "@waves/marshall": "^0.10.0", + "@waves/node-api-js": "0.1.4-beta.1", + "@waves/protobuf-serialization": "^0.3.0", + "@waves/ts-lib-crypto": "^1.4.2", + "@waves/ts-types": "^0.3.2", + "long": "^4.0.0" } }, "@webassemblyjs/ast": { @@ -535,6 +649,11 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -772,6 +891,11 @@ "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", "dev": true }, + "bignumber.js": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz", + "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ==" + }, "binary-extensions": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", @@ -1206,6 +1330,14 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "commander": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", @@ -1758,6 +1890,11 @@ "rimraf": "^2.2.8" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -2403,6 +2540,16 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -3814,6 +3961,11 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, + "js-sha3": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", + "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4092,14 +4244,12 @@ "mime-db": { "version": "1.37.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", - "dev": true + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" }, "mime-types": { "version": "2.1.21", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", - "dev": true, "requires": { "mime-db": "~1.37.0" } @@ -4273,6 +4423,11 @@ "lower-case": "^1.1.1" } }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-forge": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", @@ -4640,11 +4795,6 @@ "json-parse-better-errors": "^1.0.1" } }, - "parse-json-bignumber": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/parse-json-bignumber/-/parse-json-bignumber-0.1.3.tgz", - "integrity": "sha512-eE2NSq0PNe3yrtGVTuxrJSpP1pm2/NTRhfhsKA8oy2jDiYAK8BETabTFSymvw3pz6uuu8c4GpWRCCuVEdDFr8g==" - }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -5062,6 +5212,38 @@ "object-assign": "^4.1.1" } }, + "protobufjs": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.9.0.tgz", + "integrity": "sha512-LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg==", + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": "^13.7.0", + "long": "^4.0.0" + }, + "dependencies": { + "@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + }, + "@types/node": { + "version": "13.13.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.9.tgz", + "integrity": "sha512-EPZBIGed5gNnfWCiwEIwTE2Jdg4813odnG8iNPMQGrqVxrI+wL68SPtPeCX+ZxGBaA6pKAVc6jaKgP/Q0QzfdQ==" + } + } + }, "proxy-addr": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", @@ -6281,6 +6463,11 @@ "mime-types": "~2.1.18" } }, + "typed-ts-events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/typed-ts-events/-/typed-ts-events-1.1.1.tgz", + "integrity": "sha512-sYjxQrhBTg3HGzNBOXSURlIfmUGXS//dVGY08ofz9dbusX/IdcN8LD9SsFNbk4UgHy8reQPgSZw+ADpkLcPtDA==" + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", diff --git a/package.json b/package.json index 72187b2..c70830e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@waves/waves-repl", - "version": "2.5.2", + "version": "2.6.0-beta.1", "description": "Javascript console to interact with waves blockchain. React component", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -20,7 +20,7 @@ "@waves/ride-js": "^0.17.7" }, "dependencies": { - "@waves/waves-transactions": "^3.16.2", + "@waves/waves-transactions": "^4.0.0-beta.12", "axios": "^0.19.0", "babylon": "^6.18.0", "babylon-walk": "^1.0.2", diff --git a/src/core/lib/contextBinding.ts b/src/core/lib/contextBinding.ts index c3d542d..8d65d40 100644 --- a/src/core/lib/contextBinding.ts +++ b/src/core/lib/contextBinding.ts @@ -80,7 +80,7 @@ const getApiMethodWrappers = (consoleApi: WavesConsoleAPI, console: Console): IA ? 'W' : 'T'; - const href = generateExplorerLinkToTx(networkByte, res.id); + const href = generateExplorerLinkToTx(networkByte, (res as any).id); pushExplorerLinkToConsole(href); } else { @@ -90,7 +90,7 @@ const getApiMethodWrappers = (consoleApi: WavesConsoleAPI, console: Console): IA const isWavesNetwork = networkByte === 'W' || networkByte === 'T'; if (isWavesNetwork) { - const href = generateExplorerLinkToTx(networkByte, res.id); + const href = generateExplorerLinkToTx(networkByte, (res as any).id); pushExplorerLinkToConsole(href); }