From 7ec8bd49c76482bcf75c8ca81925ecbb70be52d9 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 7 Mar 2022 09:28:30 -0600 Subject: [PATCH] [GridPlus] Updates Lattice dependencies (#13834) --- app/manifest/_base.json | 2 +- lavamoat/browserify/beta/policy.json | 2 ++ lavamoat/browserify/flask/policy.json | 2 ++ lavamoat/browserify/main/policy.json | 2 ++ package.json | 2 +- yarn.lock | 39 ++++++++++++++++++--------- 6 files changed, 34 insertions(+), 15 deletions(-) diff --git a/app/manifest/_base.json b/app/manifest/_base.json index bc63ce27d..c2b20b4db 100644 --- a/app/manifest/_base.json +++ b/app/manifest/_base.json @@ -66,7 +66,7 @@ "clipboardWrite", "http://localhost:8545/", "https://*.infura.io/", - "https://wallet.gridplus.io/*", + "https://lattice.gridplus.io/*", "activeTab", "webRequest", "*://*.eth/", diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index fd9c5466a..bb6798360 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -2337,6 +2337,7 @@ "gridplus-sdk": { "globals": { "console.error": true, + "console.warn": true, "setTimeout": true }, "packages": { @@ -2350,6 +2351,7 @@ "crc-32": true, "elliptic": true, "eth-eip712-util-browser": true, + "hash.js": true, "js-sha3": true, "rlp-browser": true, "secp256k1": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index fc9b78a8e..d3c537308 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2356,6 +2356,7 @@ "gridplus-sdk": { "globals": { "console.error": true, + "console.warn": true, "setTimeout": true }, "packages": { @@ -2369,6 +2370,7 @@ "crc-32": true, "elliptic": true, "eth-eip712-util-browser": true, + "hash.js": true, "js-sha3": true, "rlp-browser": true, "secp256k1": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index fd9c5466a..bb6798360 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -2337,6 +2337,7 @@ "gridplus-sdk": { "globals": { "console.error": true, + "console.warn": true, "setTimeout": true }, "packages": { @@ -2350,6 +2351,7 @@ "crc-32": true, "elliptic": true, "eth-eip712-util-browser": true, + "hash.js": true, "js-sha3": true, "rlp-browser": true, "secp256k1": true, diff --git a/package.json b/package.json index 99824e2e4..fe00c5d76 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "eth-json-rpc-infura": "^5.1.0", "eth-json-rpc-middleware": "^8.0.0", "eth-keyring-controller": "^6.2.0", - "eth-lattice-keyring": "^0.4.0", + "eth-lattice-keyring": "^0.5.0", "eth-method-registry": "^2.0.0", "eth-query": "^2.1.2", "eth-rpc-errors": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index 561e6bf79..a78c3288e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11084,16 +11084,16 @@ eth-keyring-controller@^6.2.0, eth-keyring-controller@^6.2.1: loglevel "^1.5.0" obs-store "^4.0.3" -eth-lattice-keyring@^0.4.0: - version "0.4.9" - resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.4.9.tgz#327a41fa25ef28dfc9fe87f2ce11e95139adfd67" - integrity sha512-ZflOgYrbuGJGPSDWgDA6PndCIlYRS2M+/bxKsJupbPgz/O8XwQdTGttszp0mHwOqPdvUULUmW08QCqd8trnuVg== +eth-lattice-keyring@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.5.0.tgz#19dbbc2de31008dfd576531fa44a5d34061e61c8" + integrity sha512-+6iTQqrAqneUDfLR5aLVmYtys++a8C5N6F/9ibEtGT3YNYUE0NLZMI/DvFz/JhjpHhTjSXXtSb3yUajW6liAaQ== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.1.1" bignumber.js "^9.0.1" ethereumjs-util "^7.0.10" - gridplus-sdk "^0.9.7" + gridplus-sdk "^1.0.0" eth-lib@0.2.8: version "0.2.8" @@ -11405,10 +11405,10 @@ ethers@^4.0.20, ethers@^4.0.28: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^5.0.8, ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5: - version "5.5.1" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.1.tgz#d3259a95a42557844aa543906c537106c0406fbf" - integrity sha512-RodEvUFZI+EmFcE6bwkuJqpCYHazdzeR1nMzg+YWQSmQEsNtfl1KHGfp/FWZYl48bI/g7cgBeP2IlPthjiVngw== +ethers@^5.0.8, ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1: + version "5.5.4" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.4.tgz#e1155b73376a2f5da448e4a33351b57a885f4352" + integrity sha512-N9IAXsF8iKhgHIC6pquzRgPBJEzc9auw3JoRkaKe+y4Wl/LFBtDDunNe7YmdomontECAcC5APaAgWZBiu1kirw== dependencies: "@ethersproject/abi" "5.5.0" "@ethersproject/abstract-provider" "5.5.1" @@ -13456,10 +13456,22 @@ graphql-request@^1.8.2: dependencies: cross-fetch "2.2.2" -gridplus-sdk@^0.9.7: - version "0.9.10" - resolved "https://registry.yarnpkg.com/gridplus-sdk/-/gridplus-sdk-0.9.10.tgz#8835e8bc9a2ca7ae163520ddcc0b313350e67dd2" - integrity sha512-CNvhyaz3F8UvlHqihFJlOt+FenmFkb2dFrbBTyRth/nlzD8Tm0HjW+uyY1W0ekDp45Exz9l0VY0EmdvjphBe1w== +graphql-subscriptions@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d" + integrity sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g== + dependencies: + iterall "^1.3.0" + +"graphql@^14.0.2 || ^15.5": + version "15.8.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" + integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== + +gridplus-sdk@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gridplus-sdk/-/gridplus-sdk-1.0.0.tgz#008a24a8ec5b50a6fdb8005723a77f5d24fc88cd" + integrity sha512-vVyLyAY7Ockkf8hv+em1KkjPwvKkLmb7mYZFY2Vtt60+qpmPut1S2/WjrZGdNGGawWAKAmpw8WKdw5MSg2UkpA== dependencies: aes-js "^3.1.1" bech32 "^2.0.0" @@ -13471,6 +13483,7 @@ gridplus-sdk@^0.9.7: crc-32 "^1.2.0" elliptic "6.5.4" eth-eip712-util-browser "^0.0.3" + hash.js "^1.1.7" js-sha3 "^0.8.0" rlp-browser "^1.0.1" secp256k1 "4.0.2"