Skip to content

Commit

Permalink
Update default gas limit, update keplr version to disable fee override
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevenkhong
stevenkhong committed Aug 18, 2021
1 parent 51191ae commit b2b7ebe
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 69 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dependencies": {
"@cityofzion/neon-core": "^4.8.0",
"@cityofzion/neon-js": "^4.8.0",
"@keplr-wallet/types": "^0.9.0-alpha.8",
"@keplr-wallet/types": "^0.8.13",
"@ledgerhq/hw-app-eth": "^5.37.0",
"@ledgerhq/hw-transport": "^5.28.0",
"@ledgerhq/hw-transport-webhid": "^5.38.0",
Expand Down
9 changes: 4 additions & 5 deletions src/lib/tradehub/utils/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ export const BN_ZERO = new BigNumber(0);
export const SWTH_DECIMALS = 8;
export const ONE_SWTH = BN_ONE.shiftedBy(SWTH_DECIMALS);


// 0.0001 SWTH
// 1000 SWTH sats
export const DEFAULT_GAS_PRICE = new BigNumber(1).shiftedBy(2)
export const DEFAULT_GAS = new BigNumber(1000000);
// 0.0000001 SWTH
// 10 SWTH sats
export const DEFAULT_GAS_PRICE = new BigNumber(10);
export const DEFAULT_GAS = new BigNumber(10000000);

export const TxTypes = {
Order: {
Expand Down
117 changes: 54 additions & 63 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,25 +679,6 @@
dependencies:
arrify "^1.0.1"

"@cosmjs/crypto@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.20.1.tgz#7765e7a0573818fbaa232e473d77742ff73e8446"
integrity sha512-tXsx9I8GfofovkQGbJMocwPgyqSD73DAUbsBCiMGy7No40Dz7Pdz0928lNR5EzRrZ8HaxvrTprVIPJ/thRmDcg==
dependencies:
"@cosmjs/encoding" "^0.20.1"
"@cosmjs/math" "^0.20.1"
"@cosmjs/utils" "^0.20.1"
bip39 "^3.0.2"
bn.js "^4.11.8"
elliptic "^6.4.0"
js-sha3 "^0.8.0"
libsodium-wrappers "^0.7.6"
pbkdf2 "^3.0.16"
ripemd160 "^2.0.2"
sha.js "^2.4.11"
type-tagger "^1.0.0"
unorm "^1.5.0"

"@cosmjs/crypto@^0.24.1":
version "0.24.1"
resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.24.1.tgz#62da59c32b26344f26b10dd31a02b93655586d04"
Expand All @@ -716,7 +697,7 @@
sha.js "^2.4.11"
unorm "^1.5.0"

"@cosmjs/encoding@^0.20.0", "@cosmjs/encoding@^0.20.1":
"@cosmjs/encoding@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.20.1.tgz#1d1162b3eca51b7244cd45102e313612cea77281"
integrity sha512-aBp153iq2LD4GwDGwodDWZk/eyAUZ8J8bbiqZ1uK8rrylzm9Rdw84aa6JxykezJe+uBPtoI4lx9eH7VQXCGDXw==
Expand Down Expand Up @@ -746,7 +727,7 @@
axios "^0.21.1"
fast-deep-equal "^3.1.3"

"@cosmjs/math@^0.20.0", "@cosmjs/math@^0.20.1":
"@cosmjs/math@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.20.1.tgz#c3c2be821b8b5dbbb9b2c0401bd9f1472e821f2a"
integrity sha512-xt7BmpSw2OVGM2+JhlJvKv9OJs9+3DqgVL6+byUDC355CSISrZhFjJg9GFko1EFssDXz5YgvBZR5FkifC0xazw==
Expand All @@ -769,7 +750,7 @@
long "^4.0.0"
protobufjs "~6.10.2"

"@cosmjs/utils@^0.20.0", "@cosmjs/utils@^0.20.1":
"@cosmjs/utils@^0.20.0":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.20.1.tgz#4d239b7d93c15523cdf109f225cbf61326fb69cd"
integrity sha512-xl9YnIrAAaBd6nFffwFbyrnKjqjD9zKGP8OBKxzyglxamHfqAS+PcJPEiaEpt+oUt7HAIOyhL3KK75Dh52hGvA==
Expand Down Expand Up @@ -1167,12 +1148,32 @@
dependencies:
"@hapi/hoek" "^8.3.0"

"@iov/crypto@^2.1.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@iov/crypto/-/crypto-2.5.0.tgz#bcb60819fa1a83ce1323f41c014b9a72ac999dd6"
integrity sha512-lEqrMRagPyv9S0KQG2c1OfacspHZUTyC2neyy/7mKSfOaJZABJiMzZEHi0Z/aCJOo34Wd/DQqfbaG9o2gtBKnw==
"@iov/[email protected]":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@iov/crypto/-/crypto-2.1.0.tgz#10e91b6692e154958c11626dfd096a80e8a481a4"
integrity sha512-jnb4XuK50admolm7fBxOcxfAW2TO+wYrZlhDWiMETItY/Y5gNNa1zaDSO2wNIjjfGng+8nQ1yqnNhqy7busV2Q==
dependencies:
"@cosmjs/crypto" "^0.20.0"
"@iov/encoding" "^2.1.0"
bip39 "^3.0.2"
bn.js "^4.11.8"
elliptic "^6.4.0"
js-sha3 "^0.8.0"
libsodium-wrappers "^0.7.6"
pbkdf2 "^3.0.16"
ripemd160 "^2.0.2"
sha.js "^2.4.11"
type-tagger "^1.0.0"
unorm "^1.5.0"

"@iov/[email protected]":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@iov/encoding/-/encoding-2.1.0.tgz#434203c39874c68bc1d96e1278251f0feb23be07"
integrity sha512-5IOdLO7Xg/uRykuiCqeMYghQ3IjWDtGxv7NTWXkgpHuna0aewx43mRpT2NPCpOZd1tpuorDtQ7/zbDNRaIIF/w==
dependencies:
base64-js "^1.3.0"
bech32 "^1.1.3"
bn.js "^4.11.8"
readonly-date "^1.0.0"

"@iov/encoding@^2.1.0":
version "2.5.0"
Expand All @@ -1184,12 +1185,10 @@
"@cosmjs/utils" "^0.20.0"
readonly-date "^1.0.0"

"@iov/utils@^2.0.2":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@iov/utils/-/utils-2.5.0.tgz#ef1ff7ca5c63b87d1460a7233f74be3dbf622d34"
integrity sha512-nhWkbh9+a/rP9cHdYm7J4DBh0obEAj6/jB5XU1UmsfafYs/SZAe+vizhMB7h96olPShw5xsgLHq7RNutp/bffA==
dependencies:
"@cosmjs/utils" "^0.20.0"
"@iov/[email protected]":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@iov/utils/-/utils-2.0.2.tgz#3527f376d26100e07ac823bf87bebd0f24680d1c"
integrity sha512-4D8MEvTcFc/DVy5q25vHxRItmgJyeX85dixMH+MxdKr+yy71h3sYk+sVBEIn70uqGP7VqAJkGOPNFs08/XYELw==

"@istanbuljs/nyc-config-typescript@^0.1.3":
version "0.1.3"
Expand Down Expand Up @@ -1222,16 +1221,16 @@
comment-json "^4.1.0"
find-up "^4.1.0"

"@keplr-wallet/types@^0.9.0-alpha.8":
version "0.9.0-alpha.8"
resolved "https://registry.yarnpkg.com/@keplr-wallet/types/-/types-0.9.0-alpha.8.tgz#d513acc0f1504fa01d0b86cf8e8998efd8ad4435"
integrity sha512-e0/8ok5wUzWRUTL84ka79SSMunJcuwgA4o7I1DpPZdYsMe4Q13gEDChp8+fSsVWIO7zcIXaxlpsUGxlYqyB+MA==
"@keplr-wallet/types@^0.8.13":
version "0.8.13"
resolved "https://registry.yarnpkg.com/@keplr-wallet/types/-/types-0.8.13.tgz#c4ea5e5f08af3c8b2708c786b2e85f9aa4c24a4e"
integrity sha512-UaVATHmGaC5REyprLahyNIC3pZZQV+VTxMz10X3+hD6w2YgyLKimmqVg7ndVQhZrNZrVmMqgATl/UCCFgE6hlQ==
dependencies:
"@cosmjs/launchpad" "^0.24.0-alpha.25"
"@cosmjs/proto-signing" "^0.24.0-alpha.25"
axios "^0.21.0"
long "^4.0.0"
secretjs "^0.10.4"
secretjs "^0.16.0"

"@ledgerhq/cryptoassets@^5.37.0":
version "5.37.0"
Expand Down Expand Up @@ -1658,11 +1657,6 @@
dependencies:
"@types/bn.js" "*"

"@types/events@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==

"@types/glob@^7.1.1":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
Expand Down Expand Up @@ -1744,13 +1738,6 @@
"@types/node" "*"
form-data "^3.0.0"

"@types/[email protected]":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@types/node-localstorage/-/node-localstorage-1.3.0.tgz#8341b89abd8ad00afcd3fa9242ed956b8f5ad32c"
integrity sha512-9+s5CWGhkYitklhLgnbf4s5ncCEx0An2jhBuhvw/sh9WNQ+/WvNFkPLyLjXGy+Oeo8CjPl69oz6M2FzZH+KwWA==
dependencies:
"@types/events" "*"

"@types/node@*":
version "14.11.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
Expand Down Expand Up @@ -2327,7 +2314,7 @@ [email protected], axios@^0.19.0:
dependencies:
follow-redirects "1.5.10"

axios@^0.21.0, axios@^0.21.1:
axios@0.21.1, axios@^0.21.0, axios@^0.21.1:
version "0.21.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
Expand Down Expand Up @@ -4806,6 +4793,11 @@ fast-copy@^2.1.0:
resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-2.1.0.tgz#99c1b842aee063f8212d6f749080c196a822b293"
integrity sha512-j4VxAVJsu9NHveYrIj0+nJxXe2lOlibKTlyy0jH8DBwcuV6QyXTy0zTqZhmMKo7EYvuaUk/BFj/o6NU6grE5ag==

[email protected]:
version "3.1.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==

fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
Expand Down Expand Up @@ -7868,7 +7860,7 @@ package-json@^6.3.0:
registry-url "^5.0.0"
semver "^6.2.0"

pako@^1.0.11:
[email protected]:
version "1.0.11"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
Expand Down Expand Up @@ -9027,21 +9019,20 @@ secp256r1@^0.0.3:
nan "^2.2.1"
safe-buffer "^5.1.0"

secretjs@^0.10.4:
version "0.10.5"
resolved "https://registry.yarnpkg.com/secretjs/-/secretjs-0.10.5.tgz#80932a8555e9748b39923a36800ea28fe3463271"
integrity sha512-xHYUK9IT+dboYoqq9ht0WT5vuPDHGaumi/IhithAa8ydF4DecjSu++j3q1R2EmVFQSfEJoRGPsC5yyMyV2vFmQ==
secretjs@^0.16.0:
version "0.16.2"
resolved "https://registry.yarnpkg.com/secretjs/-/secretjs-0.16.2.tgz#c15844c4aeb354650a77336997acec219bca47e9"
integrity sha512-QTXxUqA/lV7G6rF++JLUnIca9/tdoIzHDjQtDEIHa5ZHcGtYeQiSTPX8Xu8P/mz0djsX2aQeDBm1vidxZydINg==
dependencies:
"@iov/crypto" "^2.1.0"
"@iov/encoding" "^2.1.0"
"@iov/utils" "^2.0.2"
"@types/node-localstorage" "1.3.0"
axios "^0.21.1"
"@iov/crypto" "2.1.0"
"@iov/encoding" "2.1.0"
"@iov/utils" "2.0.2"
axios "0.21.1"
curve25519-js "0.0.4"
fast-deep-equal "^3.1.1"
fast-deep-equal "3.1.1"
js-crypto-hkdf "0.7.3"
miscreant "0.3.2"
pako "^1.0.11"
pako "1.0.11"
secure-random "1.1.2"

[email protected]:
Expand Down

0 comments on commit b2b7ebe

Please sign in to comment.