From 39426690dddbc323fe0c84e2833869c81b3671d2 Mon Sep 17 00:00:00 2001 From: Bowen Wang Date: Tue, 18 Jun 2019 13:02:36 -0700 Subject: [PATCH] update gulp-utils to handle bignum --- blank_project/package.json | 5 +++-- gulp-utils.js | 4 +++- yarn.lock | 40 ++++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/blank_project/package.json b/blank_project/package.json index c5a9185b..9756e13c 100644 --- a/blank_project/package.json +++ b/blank_project/package.json @@ -17,8 +17,9 @@ "gulp": "^3", "jest": "^22.4.4", "jest-environment-node": "^24.5.0", - "near-runtime-ts": "github:nearprotocol/near-runtime-ts#update-as1", - "near-shell": "github:nearprotocol/near-shell" + "near-runtime-ts": "github:nearprotocol/near-runtime-ts#update-as", + "near-shell": "github:nearprotocol/near-shell", + "bignum": "github:MaxGraey/bignum.wasm" }, "wasmStudio": { "name": "Hello World Example", diff --git a/gulp-utils.js b/gulp-utils.js index bbe50429..c4430076 100644 --- a/gulp-utils.js +++ b/gulp-utils.js @@ -57,9 +57,11 @@ function getAsc() { "assembly/near.ts" : "./node_modules/near-runtime-ts/near.ts", "assembly/json/encoder.ts" : "./node_modules/assemblyscript-json/assembly/encoder.ts", "assembly/json/decoder.ts" : "./node_modules/assemblyscript-json/assembly/decoder.ts", - } + }; if (path in mapping) { path = mapping[path] + } else if (path.startsWith("assembly/node_modules/bignum/assembly")) { + path = path.replace("assembly", "."); } } diff --git a/yarn.lock b/yarn.lock index 30296bf5..aebe7c14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -256,6 +256,13 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= +"@types/bn.js@^4.11.5": + version "4.11.5" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.5.tgz#40e36197433f78f807524ec623afcf0169ac81dc" + integrity sha512-AEAZcIZga0JgVMHNtl1CprA/hXX7/wPt79AgR4XqaDt7jyj3QWYw6LPoOiznPtugDmlubUnAahMs2PFxGcQrng== + dependencies: + "@types/node" "*" + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" @@ -281,6 +288,11 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== +"@types/node@*": + version "12.0.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.8.tgz#551466be11b2adc3f3d47156758f610bd9f6b1d8" + integrity sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg== + "@types/node@^10.1.0": version "10.14.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.9.tgz#2e8d678039d27943ce53a1913386133227fd9066" @@ -424,6 +436,11 @@ binaryen@84.0.0-nightly.20190522: resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-84.0.0-nightly.20190522.tgz#31d3e8df90ec01509183d23d15b1ce16b53e87af" integrity sha512-bxSPi3MOkFmK5W6VIlqxnOc1nYzpUCzT/tHz3C7sgbz7jTR2lOBlZnKStTJlBt018xeZK9/JpK/jXdduH7eQFg== +bn.js@^4.11.5: + version "4.11.8" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" + integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -986,7 +1003,7 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== -http-errors@^1.7.1: +http-errors@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== @@ -1551,18 +1568,20 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -nearlib@^0.8: - version "0.8.2" - resolved "https://registry.yarnpkg.com/nearlib/-/nearlib-0.8.2.tgz#b5d6fb40184616d3b5094107ff334a9992ed6a2d" - integrity sha512-HwbbAy7RobqRsAYjA920y7p7AgR0xrBqzRobKazxqyXr+NrAJ/daF7nAFpOsWfANCyHT4sjKr4PSeYhXS0Wrqw== +"nearlib@github:nearprotocol/nearlib#nightshade": + version "0.10.0" + resolved "https://codeload.github.com/nearprotocol/nearlib/tar.gz/206b17fd292a391a5e9210cf6b2ba7717b7c999a" dependencies: + "@types/bn.js" "^4.11.5" + bn.js "^4.11.5" bs58 "^4.0.1" error-polyfill "^0.1.2" - http-errors "^1.7.1" + http-errors "^1.7.2" js-sha256 "^0.9.0" node-fetch "^2.3.0" protobufjs "^6.8.8" - tweetnacl "^1.0.0" + tweetnacl "^1.0.1" + typescript "^3.5.1" needle@^2.2.1: version "2.4.0" @@ -2341,11 +2360,16 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= -tweetnacl@^1.0.0: +tweetnacl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.1.tgz#2594d42da73cd036bd0d2a54683dd35a6b55ca17" integrity sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A== +typescript@^3.5.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.2.tgz#a09e1dc69bc9551cadf17dba10ee42cf55e5d56c" + integrity sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA== + u3@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/u3/-/u3-0.1.0.tgz#0060927663b68353c539cda99e9511d6687edd9d"