diff --git a/CHANGELOG.md b/CHANGELOG.md
index f048c6283..36d5a87e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ release of `ink!`. It is *not* backwards compatible with older versions of `ink!
### Added
- `--output-json` support for `call`, `instantiate` and `upload` commands - [#722](https://github.com/paritytech/cargo-contract/pull/722)
+- Denominated units for Balances - [#750](https://github.com/paritytech/cargo-contract/pull/750)
- Use new ink entrance crate - [#728](https://github.com/paritytech/cargo-contract/pull/728)
### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index ac380160e..28fed9e1b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,20 +33,29 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
dependencies = [
"memchr",
]
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "ansi_term"
version = "0.12.1"
@@ -64,9 +73,9 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "array-init"
-version = "2.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6945cc5422176fc5e602e590c2878d2c2acd9a4fe20a4baa7c28022521698ec6"
+checksum = "bfb6d71005dc22a708c7496eee5c8dc0300ee47355de6256c3b35b12b5fef596"
[[package]]
name = "arrayref"
@@ -127,9 +136,9 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.6.1"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -152,27 +161,27 @@ dependencies = [
[[package]]
name = "async-global-executor"
-version = "2.0.4"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43"
+checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
dependencies = [
"async-channel",
"async-executor",
"async-io",
- "async-mutex",
+ "async-lock",
"blocking",
"futures-lite",
- "num_cpus",
"once_cell",
"tokio",
]
[[package]]
name = "async-io"
-version = "1.6.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
dependencies = [
+ "autocfg",
"concurrent-queue",
"futures-lite",
"libc",
@@ -195,15 +204,6 @@ dependencies = [
"event-listener",
]
-[[package]]
-name = "async-mutex"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
-dependencies = [
- "event-listener",
-]
-
[[package]]
name = "async-std"
version = "1.12.0"
@@ -233,15 +233,15 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.2.0"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
[[package]]
name = "async-trait"
-version = "0.1.53"
+version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
+checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
dependencies = [
"proc-macro2",
"quote",
@@ -273,9 +273,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.65"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
dependencies = [
"addr2line",
"cc",
@@ -300,9 +300,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "beef"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736"
+checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
dependencies = [
"serde",
]
@@ -315,9 +315,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitvec"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
dependencies = [
"funty",
"radium",
@@ -331,7 +331,7 @@ version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388"
dependencies = [
- "digest 0.10.3",
+ "digest 0.10.5",
]
[[package]]
@@ -362,16 +362,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
]
[[package]]
name = "block-buffer"
-version = "0.10.2"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
]
[[package]]
@@ -419,9 +419,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.9.1"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
[[package]]
name = "byte-slice-cast"
@@ -443,9 +443,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.1.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
[[package]]
name = "cache-padded"
@@ -455,9 +455,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
name = "camino"
-version = "1.0.8"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fd178c5af4d59e83498ef15cf3f154e1a6f9d091270cb86283c65ef44e9ef0"
+checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
dependencies = [
"serde",
]
@@ -487,6 +487,7 @@ dependencies = [
"predicates",
"pretty_assertions",
"regex",
+ "rust_decimal",
"rustc_version",
"semver",
"serde",
@@ -546,11 +547,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.19"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
dependencies = [
- "libc",
+ "iana-time-zone",
"num-integer",
"num-traits",
"winapi",
@@ -625,9 +626,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "1.2.2"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
dependencies = [
"cache-padded",
]
@@ -694,9 +695,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
dependencies = [
"libc",
]
@@ -712,12 +713,11 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
dependencies = [
"cfg-if",
- "lazy_static",
]
[[package]]
@@ -728,11 +728,11 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
-version = "0.1.3"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
"typenum",
]
@@ -742,7 +742,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
"subtle",
]
@@ -752,15 +752,15 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
"subtle",
]
[[package]]
name = "ctor"
-version = "0.1.22"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
dependencies = [
"quote",
"syn",
@@ -901,9 +901,9 @@ dependencies = [
[[package]]
name = "diff"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "difflib"
@@ -926,16 +926,16 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
]
[[package]]
name = "digest"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
"crypto-common",
"subtle",
]
@@ -995,9 +995,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.5"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
[[package]]
name = "ed25519"
@@ -1024,9 +1024,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "env_logger"
@@ -1058,9 +1058,9 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "fake-simd"
@@ -1070,9 +1070,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
[[package]]
name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
dependencies = [
"instant",
]
@@ -1133,9 +1133,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
dependencies = [
"futures-channel",
"futures-core",
@@ -1148,9 +1148,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
dependencies = [
"futures-core",
"futures-sink",
@@ -1158,15 +1158,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
[[package]]
name = "futures-executor"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
dependencies = [
"futures-core",
"futures-task",
@@ -1176,9 +1176,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
[[package]]
name = "futures-lite"
@@ -1197,9 +1197,9 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
dependencies = [
"proc-macro2",
"quote",
@@ -1208,15 +1208,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
[[package]]
name = "futures-task"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
[[package]]
name = "futures-timer"
@@ -1226,9 +1226,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.21"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
dependencies = [
"futures-channel",
"futures-core",
@@ -1253,9 +1253,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.5"
+version = "0.14.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
dependencies = [
"typenum",
"version_check",
@@ -1276,20 +1276,20 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
dependencies = [
"cfg-if",
"libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "gimli"
-version = "0.26.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
[[package]]
name = "glob"
@@ -1326,9 +1326,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.12.1"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash",
]
@@ -1381,26 +1381,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
dependencies = [
"digest 0.9.0",
- "generic-array 0.14.5",
+ "generic-array 0.14.6",
"hmac 0.8.1",
]
[[package]]
name = "http"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.2",
+ "itoa 1.0.3",
]
[[package]]
name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "humantime"
@@ -1408,6 +1408,19 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+[[package]]
+name = "iana-time-zone"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -1535,7 +1548,7 @@ dependencies = [
"parity-scale-codec",
"rand 0.8.5",
"secp256k1 0.24.0",
- "sha2 0.10.2",
+ "sha2 0.10.6",
"sha3",
]
@@ -1562,7 +1575,7 @@ dependencies = [
"rlibc",
"scale-info",
"secp256k1 0.24.0",
- "sha2 0.10.2",
+ "sha2 0.10.6",
"sha3",
"static_assertions",
]
@@ -1700,9 +1713,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
[[package]]
name = "jobserver"
@@ -1721,9 +1734,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
[[package]]
name = "js-sys"
-version = "0.3.57"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
dependencies = [
"wasm-bindgen",
]
@@ -1812,9 +1825,9 @@ dependencies = [
[[package]]
name = "keccak"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
[[package]]
name = "kv-log-macro"
@@ -1833,15 +1846,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.126"
+version = "0.2.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
[[package]]
name = "libsecp256k1"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37"
+checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
dependencies = [
"arrayref",
"base64",
@@ -1896,9 +1909,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
@@ -1975,18 +1988,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.5.1"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
dependencies = [
"adler",
]
[[package]]
name = "mio"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
dependencies = [
"libc",
"log",
@@ -2103,18 +2116,18 @@ dependencies = [
[[package]]
name = "object"
-version = "0.28.4"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.13.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
[[package]]
name = "opaque-debug"
@@ -2136,9 +2149,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "os_str_bytes"
-version = "6.0.1"
+version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "output_vt100"
@@ -2243,9 +2256,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
[[package]]
name = "parking_lot"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -2266,9 +2279,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
[[package]]
name = "pbkdf2"
@@ -2296,18 +2309,18 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pin-project"
-version = "1.0.10"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.10"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
@@ -2334,10 +2347,11 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
[[package]]
name = "polling"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
dependencies = [
+ "autocfg",
"cfg-if",
"libc",
"log",
@@ -2408,10 +2422,11 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
dependencies = [
+ "once_cell",
"thiserror",
"toml",
]
@@ -2451,9 +2466,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.18"
+version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
dependencies = [
"proc-macro2",
]
@@ -2486,7 +2501,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha 0.3.1",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
]
[[package]]
@@ -2506,7 +2521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
]
[[package]]
@@ -2520,11 +2535,11 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
]
[[package]]
@@ -2547,9 +2562,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
@@ -2560,25 +2575,25 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"redox_syscall",
"thiserror",
]
[[package]]
name = "ref-cast"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab"
+checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
+checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa"
dependencies = [
"proc-macro2",
"quote",
@@ -2641,6 +2656,17 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
+[[package]]
+name = "rust_decimal"
+version = "1.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c"
+dependencies = [
+ "arrayvec 0.7.2",
+ "num-traits",
+ "serde",
+]
+
[[package]]
name = "rustc-demangle"
version = "0.1.21"
@@ -2694,24 +2720,24 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
dependencies = [
"base64",
]
[[package]]
name = "rustversion"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
[[package]]
name = "ryu"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
[[package]]
name = "same-file"
@@ -2885,9 +2911,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.6.1"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
dependencies = [
"bitflags",
"core-foundation",
@@ -2941,7 +2967,7 @@ version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
dependencies = [
- "itoa 1.0.2",
+ "itoa 1.0.3",
"ryu",
"serde",
]
@@ -2986,22 +3012,22 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.2"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.3",
+ "digest 0.10.5",
]
[[package]]
name = "sha3"
-version = "0.10.1"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86"
+checksum = "e2904bea16a1ae962b483322a1c7b81d976029203aea1f461e51cd7705db7ba9"
dependencies = [
- "digest 0.10.3",
+ "digest 0.10.5",
"keccak",
]
@@ -3016,15 +3042,18 @@ dependencies = [
[[package]]
name = "signature"
-version = "1.5.0"
+version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
+checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9"
[[package]]
name = "slab"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
[[package]]
name = "smallvec"
@@ -3034,9 +3063,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
dependencies = [
"libc",
"winapi",
@@ -3384,9 +3413,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "ss58-registry"
-version = "1.18.0"
+version = "1.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc"
+checksum = "1de151faef619cb7b5c26b32d42bc7ddccac0d202beb7a84344b44e9232b92f7"
dependencies = [
"Inflector",
"num-format",
@@ -3657,14 +3686,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.18.2"
+version = "1.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
dependencies = [
+ "autocfg",
"libc",
"mio",
"num_cpus",
- "once_cell",
"pin-project-lite",
"socket2",
"tokio-macros",
@@ -3673,9 +3702,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
dependencies = [
"proc-macro2",
"quote",
@@ -3695,9 +3724,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
dependencies = [
"bytes",
"futures-core",
@@ -3861,9 +3890,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]]
name = "uint"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601"
dependencies = [
"byteorder",
"crunchy",
@@ -3879,15 +3908,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
[[package]]
name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
@@ -3900,9 +3929,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
[[package]]
name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "untrusted"
@@ -3999,12 +4028,6 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -4013,9 +4036,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -4023,13 +4046,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
dependencies = [
"bumpalo",
- "lazy_static",
"log",
+ "once_cell",
"proc-macro2",
"quote",
"syn",
@@ -4038,9 +4061,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
dependencies = [
"cfg-if",
"js-sys",
@@ -4050,9 +4073,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4060,9 +4083,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
@@ -4073,9 +4096,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
name = "wasm-opt"
@@ -4144,9 +4167,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.57"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4164,9 +4187,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.22.3"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
dependencies = [
"webpki",
]
@@ -4276,9 +4299,9 @@ dependencies = [
[[package]]
name = "xxhash-rust"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074914ea4eec286eb8d1fd745768504f420a1f7b7919185682a4a267bed7d2e7"
+checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70"
[[package]]
name = "yansi"
@@ -4294,9 +4317,9 @@ checksum = "5fc77f52dc9e9b10d55d3f4462c3b7fc393c4f17975d641542833ab2d3bc26ef"
[[package]]
name = "zeroize"
-version = "1.5.5"
+version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07"
+checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
dependencies = [
"zeroize_derive",
]
diff --git a/crates/cargo-contract/Cargo.toml b/crates/cargo-contract/Cargo.toml
index b73ea498c..14b3db533 100644
--- a/crates/cargo-contract/Cargo.toml
+++ b/crates/cargo-contract/Cargo.toml
@@ -40,6 +40,7 @@ serde_json = "1.0.87"
tempfile = "3.3.0"
url = { version = "2.3.1", features = ["serde"] }
impl-serde = "0.4.0"
+rust_decimal = "1.26"
wasm-opt = "0.110.2"
# dependencies for extrinsics (deploying and calling a contract)
diff --git a/crates/cargo-contract/src/cmd/extrinsics/balance.rs b/crates/cargo-contract/src/cmd/extrinsics/balance.rs
new file mode 100644
index 000000000..10d2669e4
--- /dev/null
+++ b/crates/cargo-contract/src/cmd/extrinsics/balance.rs
@@ -0,0 +1,677 @@
+// Copyright 2018-2022 Parity Technologies (UK) Ltd.
+// This file is part of cargo-contract.
+//
+// cargo-contract is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// cargo-contract is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with cargo-contract. If not, see .
+
+use std::{
+ fmt::Display,
+ result::Result::Ok,
+ str::FromStr,
+};
+
+use rust_decimal::{
+ prelude::FromPrimitive,
+ Decimal,
+};
+use serde_json::json;
+
+use super::{
+ Balance,
+ Client,
+};
+
+use anyhow::{
+ anyhow,
+ Context,
+ Result,
+};
+
+/// Represents different formats of a balance
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BalanceVariant {
+ /// Default format: no symbol, no token_decimals
+ Default(Balance),
+ /// Denominated format: symbol and token_decimals are present
+ Denominated(DenominatedBalance),
+}
+
+#[derive(Debug, Clone)]
+pub struct TokenMetadata {
+ /// Number of token_decimals used for denomination
+ pub token_decimals: usize,
+ /// Token symbol
+ pub symbol: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct DenominatedBalance {
+ value: Decimal,
+ unit: UnitPrefix,
+ symbol: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum UnitPrefix {
+ Giga,
+ Mega,
+ Kilo,
+ One,
+ Milli,
+ Micro,
+ Nano,
+}
+
+impl TokenMetadata {
+ /// Query [TokenMetadata] through the node's RPC
+ pub async fn query(client: &Client) -> Result {
+ let sys_props = client.rpc().system_properties().await?;
+
+ let default_decimals = json!(12);
+ let default_units = json!("UNIT");
+ let token_decimals = sys_props
+ .get("tokenDecimals")
+ .unwrap_or(&default_decimals)
+ .as_u64()
+ .context("error converting decimal to u64")?
+ as usize;
+ let symbol = sys_props
+ .get("tokenSymbol")
+ .unwrap_or(&default_units)
+ .as_str()
+ .context("error converting symbol to string")?;
+ Ok(Self {
+ token_decimals,
+ symbol: symbol.to_string(),
+ })
+ }
+}
+
+impl FromStr for BalanceVariant {
+ type Err = anyhow::Error;
+
+ /// Attempts to parse the balance either in plain or denominated formats
+ /// If the balance is provide without the token symbol,
+ /// then it is treated as raw.
+ /// Otherwise, the balance is attempted to be parsed in a denominated format
+ fn from_str(input: &str) -> Result {
+ let input = input.replace('_', "");
+ // if we cannot parse the balance in raw format
+ // it means it is in a denominated format
+ let result = match input.parse::() {
+ Ok(balance) => BalanceVariant::Default(balance),
+ Err(_) => BalanceVariant::Denominated(DenominatedBalance::from_str(&input)?),
+ };
+ Ok(result)
+ }
+}
+
+impl FromStr for DenominatedBalance {
+ type Err = anyhow::Error;
+
+ fn from_str(value: &str) -> Result {
+ let symbols = value
+ .trim_start_matches(|ch: char| ch.is_numeric() || ch == '.' || ch == ',');
+ let unit_char = symbols
+ .chars()
+ .next()
+ .context("no units or symbols present")?;
+ let unit: UnitPrefix = match unit_char {
+ 'G' => UnitPrefix::Giga,
+ 'M' => UnitPrefix::Mega,
+ 'k' => UnitPrefix::Kilo,
+ 'm' => UnitPrefix::Milli,
+ '\u{3bc}' => UnitPrefix::Micro,
+ 'n' => UnitPrefix::Nano,
+ _ => UnitPrefix::One,
+ };
+ let symbol = if unit != UnitPrefix::One {
+ let (start, _) = symbols
+ .char_indices()
+ .nth(1)
+ .context("cannot find the first char's index")?;
+ symbols[start..].to_string()
+ } else {
+ String::new()
+ };
+ let value = value.trim_end_matches(|ch: char| ch.is_alphabetic());
+ let value = Decimal::from_str_exact(value)
+ .context("Error while parsing the value. Please denominate and normalize the balance first.")?
+ .normalize();
+ Ok(Self {
+ value,
+ unit,
+ symbol,
+ })
+ }
+}
+
+impl BalanceVariant {
+ /// Converts BalanceVariant into Balance.
+ ///
+ /// It is a reverse process of `from>()`
+ ///
+ /// Throws Error if `value` is of nigher precision that allowed.
+ ///
+ /// ```rust
+ /// use anyhow::{Result, Ok};
+ /// let decimals = 6;
+ /// let tm = TokenMetadata {
+ /// token_decimals: decimals,
+ /// symbol: String::from("DOT"),
+ /// };
+ /// let sample_den_balance = Balance::Denominated(DenominatedBalance {
+ /// value: Decimal::new(4, 1),
+ /// unit: UnitPrefix::Micro,
+ /// symbol: String::new("DOT")
+ /// });
+ /// let result = sample_den_balance.denominate_balance(tm);
+ /// assert!(result.is_err());
+ /// ```
+ ///
+ /// Otherwise, [Balance] is returned:
+ /// ```rust
+ /// use anyhow::{Result, Ok};
+ /// let decimals = 6;
+ /// let tm = TokenMetadata {
+ /// token_decimals: decimals,
+ /// symbol: String::from("DOT"),
+ /// };
+ /// let sample_den_balance = Balance::Denominated(DenominatedBalance {
+ /// value: Decimal::new(4123, 0),
+ /// unit: UnitPrefix::Micro,
+ /// symbol: String::new("DOT")
+ /// });
+ /// let balance = 4123;
+ /// let result = sample_den_balance.denominate_balance(tm).unwrap()
+ /// assert_eq!(balance, result);
+ /// ```
+ pub fn denominate_balance(&self, token_metadata: &TokenMetadata) -> Result {
+ match self {
+ BalanceVariant::Default(balance) => Ok(*balance),
+ BalanceVariant::Denominated(den_balance) => {
+ let zeros: usize = (token_metadata.token_decimals as isize
+ + match den_balance.unit {
+ UnitPrefix::Giga => 9,
+ UnitPrefix::Mega => 6,
+ UnitPrefix::Kilo => 3,
+ UnitPrefix::One => 0,
+ UnitPrefix::Milli => -3,
+ UnitPrefix::Micro => -6,
+ UnitPrefix::Nano => -9,
+ })
+ .try_into()?;
+ let multiple =
+ Decimal::from_str_exact(&format!("1{}", "0".repeat(zeros)))?;
+ let fract_scale = den_balance.value.fract().scale();
+ let mantissa_difference = zeros as isize - fract_scale as isize;
+ if mantissa_difference < 0 {
+ return Err(anyhow!(
+ "Given precision of a Balance value is higher than allowed"
+ ))
+ }
+ let balance: Balance = den_balance
+ .value
+ .checked_mul(multiple)
+ .context("error while converting balance to raw format. Overflow during multiplication!")?
+ .try_into()?;
+ Ok(balance)
+ }
+ }
+ }
+
+ /// # Summary
+ /// Display token units in a denominated format.
+ ///
+ /// I takes `value` of `Into` and [TokenMetadata]
+ /// and calculates the value in an denominated format
+ /// by manipulating the token_decimals.
+ ///
+ /// If the number is divisible by 10^(`token_decimals` + `unit_zeros`),
+ /// It sets the [UnitPrefix] and divides the `value` into `Decimal`
+ ///
+ /// If no [TokenMetadata] was present, than that means
+ /// that [Balance] is to be displayed in *normal* format
+ /// and `BalanceVariant::Default` is returned
+ ///
+ /// # Examples
+ /// ```rust
+ /// use anyhow::{Result, Ok};
+ /// let decimals = 10;
+ /// let tm = TokenMetadata {
+ /// token_decimals: decimals,
+ /// symbol: String::from("DOT"),
+ /// };
+ /// let sample_den_balance = BalanceVariant::Denominated(DenominatedBalance {
+ /// value: Decimal::new(5005, 1),
+ /// unit: UnitPrefix::Mega,
+ /// symbol: String::from("DOT")
+ /// });
+ /// let balance: Balance = 5_005_000_000_000_000_000;
+ /// let den_balance = BalanceVariant::from(balance, Some(tm));
+ /// assert_eq!(Ok(sample_den_balance), Ok(den_balance));
+ /// ```
+ pub fn from>(
+ value: T,
+ token_metadata: Option<&TokenMetadata>,
+ ) -> Result {
+ let n: u128 = value.into();
+
+ if let Some(token_metadata) = token_metadata {
+ if n == 0 {
+ return Ok(BalanceVariant::Denominated(DenominatedBalance {
+ value: Decimal::ZERO,
+ unit: UnitPrefix::One,
+ symbol: token_metadata.symbol.clone(),
+ }))
+ }
+
+ let number_of_digits = n.to_string().len();
+
+ let giga_units_zeros = token_metadata.token_decimals + 9;
+ let mega_units_zeros = token_metadata.token_decimals + 6;
+ let kilo_units_zeros = token_metadata.token_decimals + 3;
+ let one_unit_zeros = token_metadata.token_decimals;
+ let milli_units_zeros = token_metadata.token_decimals.checked_sub(3);
+ let micro_units_zeros = token_metadata.token_decimals.checked_sub(6);
+ let nano_units_zeros = token_metadata.token_decimals.checked_sub(9);
+
+ let unit: UnitPrefix;
+ let zeros: usize;
+ if (giga_units_zeros + 1..).contains(&number_of_digits) {
+ zeros = giga_units_zeros;
+ unit = UnitPrefix::Giga;
+ } else if (mega_units_zeros + 1..=giga_units_zeros)
+ .contains(&number_of_digits)
+ {
+ zeros = mega_units_zeros;
+ unit = UnitPrefix::Mega;
+ } else if (kilo_units_zeros + 1..=mega_units_zeros)
+ .contains(&number_of_digits)
+ {
+ zeros = kilo_units_zeros;
+ unit = UnitPrefix::Kilo;
+ } else if (one_unit_zeros + 1..=kilo_units_zeros).contains(&number_of_digits)
+ {
+ zeros = one_unit_zeros;
+ unit = UnitPrefix::One;
+ } else if milli_units_zeros.is_some()
+ && (milli_units_zeros.unwrap() + 1..=one_unit_zeros)
+ .contains(&number_of_digits)
+ {
+ zeros = match milli_units_zeros {
+ Some(val) => val,
+ None => return Err(anyhow!("the number is checked to be >= 0. qed")),
+ };
+ unit = UnitPrefix::Milli;
+ } else if milli_units_zeros.is_some()
+ && micro_units_zeros.is_some()
+ && (micro_units_zeros.unwrap() + 1..=milli_units_zeros.unwrap())
+ .contains(&number_of_digits)
+ {
+ zeros = match micro_units_zeros {
+ Some(val) => val,
+ None => return Err(anyhow!("the number is checked to be >= 0. qed")),
+ };
+ unit = UnitPrefix::Micro;
+ } else if nano_units_zeros.is_some() {
+ zeros = match nano_units_zeros {
+ Some(val) => val,
+ None => return Err(anyhow!("the number is checked to be >= 0. qed")),
+ };
+ unit = UnitPrefix::Nano;
+ } else {
+ return Err(anyhow!("Invalid denomination"))
+ }
+ let multiple = Decimal::from_str_exact(&format!("1{}", "0".repeat(zeros)))?;
+ let value = Decimal::from_u128(n)
+ .context("value can not be converted into decimal")?
+ / multiple;
+
+ let den_balance = DenominatedBalance {
+ value,
+ unit,
+ symbol: token_metadata.symbol.clone(),
+ };
+
+ Ok(BalanceVariant::Denominated(den_balance))
+ } else {
+ Ok(BalanceVariant::Default(n))
+ }
+ }
+}
+
+impl Display for BalanceVariant {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ BalanceVariant::Default(balance) => f.write_str(&balance.to_string()),
+ BalanceVariant::Denominated(input) => f.write_str(&input.to_string()),
+ }
+ }
+}
+
+impl Display for DenominatedBalance {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ let prefix = match self.unit {
+ UnitPrefix::Giga => "G",
+ UnitPrefix::Mega => "M",
+ UnitPrefix::Kilo => "k",
+ UnitPrefix::One => "",
+ UnitPrefix::Milli => "m",
+ UnitPrefix::Micro => "μ",
+ UnitPrefix::Nano => "n",
+ };
+ f.write_fmt(format_args!("{}{}{}", self.value, prefix, self.symbol))
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn correct_balances_parses_success() {
+ assert!(
+ BalanceVariant::from_str("500DOT").is_ok(),
+ "<500DOT> was not parsed correctly"
+ );
+ assert!(
+ BalanceVariant::from_str("500").is_ok(),
+ "<500> was not parsed correctly"
+ );
+ assert!(
+ BalanceVariant::from_str("1.0").is_err(),
+ "<1.0> was not parsed correctly. Units must be provided"
+ );
+ assert!(
+ BalanceVariant::from_str("1.0DOT").is_ok(),
+ "<1.0DOt> was not parsed correctly"
+ );
+ }
+
+ #[test]
+ fn incorrect_balances() {
+ assert!(
+ BalanceVariant::from_str("500%").is_err(),
+ "expected to fail parsing incorrect balance"
+ );
+ }
+
+ #[test]
+ fn balance_variant_denominated_success() {
+ let tm = TokenMetadata {
+ token_decimals: 10,
+ symbol: String::from("DOT"),
+ };
+ let bv = BalanceVariant::from_str("500MDOT").expect("successful parsing. qed");
+ assert!(
+ bv.denominate_balance(&tm).is_ok(),
+ "balances could not be denominated correctly"
+ );
+ }
+
+ #[test]
+ fn balance_variant_denominated_equal() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 500 * 1_000_000 * 10_000_000_000;
+ let bv = BalanceVariant::from_str("500MDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn balance_variant_denominated_equal_fraction() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000_000_000_000_000;
+ let bv = BalanceVariant::from_str("500.5MDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn balance_variant_denominated_equal_small_units() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000;
+ let bv = BalanceVariant::from_str("500.5μDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+ #[test]
+ fn smallest_value() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 1;
+ let bv = BalanceVariant::from_str("0.1nDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn value_less_than_precision() {
+ // here we test if the user tries to input the denominated balance
+ // which results in value less than zero
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let bv =
+ BalanceVariant::from_str("0.01546nDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm);
+ assert!(balance_parsed.is_err())
+ }
+
+ #[test]
+ fn giga() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000_000_000_000_000_000;
+ let bv = BalanceVariant::from_str("500.5GDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn kilo() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000_000_000_000;
+ let bv = BalanceVariant::from_str("500.5kDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn unit() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000_000_000;
+ let bv = BalanceVariant::from_str("500.5DOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn milli() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000_000;
+ let bv = BalanceVariant::from_str("500.5mDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+ #[test]
+ fn micro() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005_000;
+ let bv = BalanceVariant::from_str("500.5μDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+ #[test]
+ fn nano() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_005;
+ let bv = BalanceVariant::from_str("500.5nDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn different_digits() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 5_235_456_210_000_000;
+ let bv =
+ BalanceVariant::from_str("523.545621kDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn non_standard_token_decimals() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance: Balance = 50_015_000_000_000;
+ let bv = BalanceVariant::from_str("5001.5DOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm).expect("successful parsing. qed");
+ assert_eq!(balance, balance_parsed);
+ }
+
+ #[test]
+ fn small_number_of_decimals_zero() {
+ let decimals = 6;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let bv = BalanceVariant::from_str("0.4μDOT").expect("successful parsing. qed");
+ let balance_parsed = bv.denominate_balance(&tm);
+ assert!(balance_parsed.is_err())
+ }
+
+ #[test]
+ fn big_input_to_denominate() {
+ // max value of Decimal:MAX is 79_228_162_514_264_337_593_543_950_335
+ let s = "79_228_162_514_264_337_593_543_950_336DOT";
+ let bv = BalanceVariant::from_str(s);
+ assert!(bv.is_err())
+ }
+
+ #[test]
+ fn big_input_to_raw() {
+ // max value of Decimal:MAX is 79_228_162_514_264_337_593_543_950_335
+ let s = "79_228_162_514_264_337_593_543_950_336";
+ let bv = BalanceVariant::from_str(s);
+ assert!(bv.is_ok())
+ }
+
+ #[test]
+ fn convert_from_u128() {
+ let decimals = 6;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance = 532_500_000_000_u128;
+ let denominated_balance =
+ BalanceVariant::from(balance, Some(&tm)).expect("successful conversion");
+ let sample = BalanceVariant::Denominated(DenominatedBalance {
+ value: Decimal::new(5325, 1),
+ unit: UnitPrefix::Kilo,
+ symbol: String::from("DOT"),
+ });
+ assert_eq!(sample, denominated_balance);
+ }
+
+ #[test]
+ fn convert_one_from_u128() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ let balance = 532_500_000_000_u128;
+ let denominated_balance =
+ BalanceVariant::from(balance, Some(&tm)).expect("successful conversion");
+ let sample = BalanceVariant::Denominated(DenominatedBalance {
+ value: Decimal::new(5325, 2),
+ unit: UnitPrefix::One,
+ symbol: String::from("DOT"),
+ });
+ assert_eq!(sample, denominated_balance);
+ }
+
+ #[test]
+ fn convert_small_from_u128() {
+ let decimals = 10;
+ let tm = TokenMetadata {
+ token_decimals: decimals,
+ symbol: String::from("DOT"),
+ };
+ // 10_000_000_000 - One
+ // 10_000_000 - Milli
+ // 10_000 - Micro
+ // 532_500 - 52.25 Micro
+ let balance = 532_500_u128;
+ let denominated_balance =
+ BalanceVariant::from(balance, Some(&tm)).expect("successful conversion");
+ let sample = BalanceVariant::Denominated(DenominatedBalance {
+ value: Decimal::new(5325, 2),
+ unit: UnitPrefix::Micro,
+ symbol: String::from("DOT"),
+ });
+ assert_eq!(sample, denominated_balance);
+ }
+}
diff --git a/crates/cargo-contract/src/cmd/extrinsics/call.rs b/crates/cargo-contract/src/cmd/extrinsics/call.rs
index e5f5c32ec..b2dcf925d 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/call.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/call.rs
@@ -16,7 +16,6 @@
use super::{
display_contract_exec_result,
- parse_balance,
prompt_confirm_tx,
runtime_api::{
api,
@@ -25,12 +24,14 @@ use super::{
state_call,
submit_extrinsic,
Balance,
+ BalanceVariant,
Client,
ContractMessageTranscoder,
CrateMetadata,
DefaultConfig,
ExtrinsicOpts,
PairSigner,
+ TokenMetadata,
MAX_KEY_COL_WIDTH,
};
@@ -80,8 +81,8 @@ pub struct CallCommand {
#[clap(name = "gas", long)]
gas_limit: Option,
/// The value to be transferred as part of the call.
- #[clap(name = "value", long, value_parser = parse_balance, default_value = "0")]
- value: Balance,
+ #[clap(name = "value", long, default_value = "0")]
+ value: BalanceVariant,
/// Export the call output in JSON format.
#[clap(long, conflicts_with = "verbose")]
output_json: bool,
@@ -107,7 +108,7 @@ impl CallCommand {
let client = OnlineClient::from_url(url.clone()).await?;
if self.extrinsic_opts.dry_run {
- let result = self.call_dry_run(call_data, &signer).await?;
+ let result = self.call_dry_run(call_data, &client, &signer).await?;
match result.result {
Ok(ref ret_val) => {
@@ -154,15 +155,22 @@ impl CallCommand {
async fn call_dry_run(
&self,
input_data: Vec,
+ client: &Client,
signer: &PairSigner,
) -> Result> {
let url = self.extrinsic_opts.url_to_string();
let gas_limit = *self.gas_limit.as_ref().unwrap_or(&5_000_000_000_000);
- let storage_deposit_limit = self.extrinsic_opts.storage_deposit_limit;
+ let token_metadata = TokenMetadata::query(client).await?;
+ let storage_deposit_limit = self
+ .extrinsic_opts
+ .storage_deposit_limit
+ .as_ref()
+ .map(|bv| bv.denominate_balance(&token_metadata))
+ .transpose()?;
let call_request = CallRequest {
origin: signer.account_id().clone(),
dest: self.contract.clone(),
- value: self.value,
+ value: self.value.denominate_balance(&token_metadata)?,
gas_limit: Weight::from_ref_time(gas_limit),
storage_deposit_limit,
input_data,
@@ -195,11 +203,13 @@ impl CallCommand {
})?;
}
+ let token_metadata = TokenMetadata::query(client).await?;
+
let call = api::tx().contracts().call(
self.contract.clone().into(),
- self.value,
+ self.value.denominate_balance(&token_metadata)?,
gas_limit,
- self.extrinsic_opts.storage_deposit_limit(),
+ self.extrinsic_opts.storage_deposit_limit(&token_metadata)?,
data,
);
@@ -211,7 +221,8 @@ impl CallCommand {
let output = if self.output_json {
display_events.to_json()?
} else {
- display_events.display_events(self.extrinsic_opts.verbosity()?)
+ display_events
+ .display_events(self.extrinsic_opts.verbosity()?, &token_metadata)?
};
println!("{}", output);
@@ -238,7 +249,7 @@ impl CallCommand {
if !self.output_json {
super::print_dry_running_status(&self.message);
}
- let call_result = self.call_dry_run(data, signer).await?;
+ let call_result = self.call_dry_run(data, client, signer).await?;
match call_result.result {
Ok(_) => {
if !self.output_json {
diff --git a/crates/cargo-contract/src/cmd/extrinsics/events.rs b/crates/cargo-contract/src/cmd/extrinsics/events.rs
index d57534868..f335fbd53 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/events.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/events.rs
@@ -16,7 +16,9 @@
use super::{
runtime_api::api::contracts::events::ContractEmitted,
+ BalanceVariant,
DefaultConfig,
+ TokenMetadata,
};
use crate::{
Verbosity,
@@ -44,11 +46,18 @@ pub struct Field {
pub name: String,
/// value of a field
pub value: Value,
+ /// The name of a type as defined in the pallet Source Code
+ #[serde(skip_serializing)]
+ pub type_name: Option,
}
impl Field {
- pub fn new(name: String, value: Value) -> Self {
- Field { name, value }
+ pub fn new(name: String, value: Value, type_name: Option) -> Self {
+ Field {
+ name,
+ value,
+ type_name,
+ }
}
}
@@ -97,16 +106,20 @@ impl DisplayEvents {
let event_data = &mut event.field_bytes();
let mut unnamed_field_name = 0;
- for field in event_fields {
+ for field_metadata in event_fields {
if ::is_event(
event.pallet_name(),
event.variant_name(),
- ) && field.name() == Some("data")
+ ) && field_metadata.name() == Some("data")
{
tracing::debug!("event data: {:?}", hex::encode(&event_data));
match transcoder.decode_contract_event(event_data) {
Ok(contract_event) => {
- let field = Field::new(String::from("data"), contract_event);
+ let field = Field::new(
+ String::from("data"),
+ contract_event,
+ field_metadata.type_name().map(|s| s.to_string()),
+ );
event_entry.fields.push(field);
}
Err(err) => {
@@ -117,8 +130,10 @@ impl DisplayEvents {
}
}
} else {
- let field_name =
- field.name().map(ToOwned::to_owned).unwrap_or_else(|| {
+ let field_name = field_metadata
+ .name()
+ .map(|s| s.to_string())
+ .unwrap_or_else(|| {
let name = unnamed_field_name.to_string();
unnamed_field_name += 1;
name
@@ -126,10 +141,14 @@ impl DisplayEvents {
let decoded_field = events_transcoder.decode(
&runtime_metadata.types,
- field.type_id(),
+ field_metadata.type_id(),
event_data,
)?;
- let field = Field::new(field_name, decoded_field);
+ let field = Field::new(
+ field_name,
+ decoded_field,
+ field_metadata.type_name().map(|s| s.to_string()),
+ );
event_entry.fields.push(field);
}
}
@@ -140,7 +159,11 @@ impl DisplayEvents {
}
/// Displays events in a human readable format
- pub fn display_events(&self, verbosity: Verbosity) -> String {
+ pub fn display_events(
+ &self,
+ verbosity: Verbosity,
+ token_metadata: &TokenMetadata,
+ ) -> Result {
let event_field_indent: usize = DEFAULT_KEY_COL_WIDTH - 3;
let mut out = format!(
"{:>width$}\n",
@@ -159,18 +182,27 @@ impl DisplayEvents {
for field in &event.fields {
if verbosity.is_verbose() {
+ let mut value: String = field.value.to_string();
+ if field.type_name == Some("T::Balance".to_string())
+ || field.type_name == Some("BalanceOf".to_string())
+ {
+ if let Value::UInt(balance) = field.value {
+ value = BalanceVariant::from(balance, Some(token_metadata))?
+ .to_string();
+ }
+ }
let _ = writeln!(
out,
"{:width$}{}: {}",
"",
field.name.bright_white(),
- field.value,
+ value,
width = event_field_indent,
);
}
}
}
- out
+ Ok(out)
}
/// Returns an event result in json format
diff --git a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
index 61f90e955..db60f884e 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
@@ -16,7 +16,6 @@
use super::{
display_contract_exec_result,
- parse_balance,
prompt_confirm_tx,
runtime_api::{
api,
@@ -25,6 +24,7 @@ use super::{
state_call,
submit_extrinsic,
Balance,
+ BalanceVariant,
Client,
CodeHash,
ContractMessageTranscoder,
@@ -39,6 +39,7 @@ use crate::{
display_contract_exec_result_debug,
events::DisplayEvents,
ErrorVariant,
+ TokenMetadata,
},
name_value_println,
util::decode_hex,
@@ -95,8 +96,8 @@ pub struct InstantiateCommand {
#[clap(flatten)]
extrinsic_opts: ExtrinsicOpts,
/// Transfers an initial balance to the instantiated contract
- #[clap(name = "value", long, default_value = "0", value_parser = parse_balance)]
- value: Balance,
+ #[clap(name = "value", long, default_value = "0")]
+ value: BalanceVariant,
/// Maximum amount of gas to be used for this command.
/// If not specified will perform a dry-run to estimate the gas consumed for the instantiation.
#[clap(name = "gas", long)]
@@ -169,19 +170,26 @@ impl InstantiateCommand {
}?;
let salt = self.salt.clone().map(|s| s.0).unwrap_or_default();
- let args = InstantiateArgs {
- constructor: self.constructor.clone(),
- raw_args: self.args.clone(),
- value: self.value,
- gas_limit: self.gas_limit.map(Weight::from_ref_time),
- storage_deposit_limit: self.extrinsic_opts.storage_deposit_limit,
- data,
- salt,
- };
-
async_std::task::block_on(async move {
let client = OnlineClient::from_url(url.clone()).await?;
+ let token_metadata = TokenMetadata::query(&client).await?;
+
+ let args = InstantiateArgs {
+ constructor: self.constructor.clone(),
+ raw_args: self.args.clone(),
+ value: self.value.denominate_balance(&token_metadata)?,
+ gas_limit: self.gas_limit.map(Weight::from_ref_time),
+ storage_deposit_limit: self
+ .extrinsic_opts
+ .storage_deposit_limit
+ .as_ref()
+ .map(|bv| bv.denominate_balance(&token_metadata))
+ .transpose()?,
+ data,
+ salt,
+ };
+
let exec = Exec {
args,
opts: self.extrinsic_opts.clone(),
@@ -306,7 +314,9 @@ impl Exec {
.find_first::()?
.ok_or_else(|| anyhow!("Failed to find Instantiated event"))?;
- self.display_result(&result, code_hash, instantiated.contract)
+ let token_metadata = TokenMetadata::query(&self.client).await?;
+ self.display_result(&result, code_hash, instantiated.contract, &token_metadata)
+ .await
}
async fn instantiate(&self, code_hash: CodeHash) -> Result<(), ErrorVariant> {
@@ -340,14 +350,17 @@ impl Exec {
.find_first::()?
.ok_or_else(|| anyhow!("Failed to find Instantiated event"))?;
- self.display_result(&result, None, instantiated.contract)
+ let token_metadata = TokenMetadata::query(&self.client).await?;
+ self.display_result(&result, None, instantiated.contract, &token_metadata)
+ .await
}
- fn display_result(
+ async fn display_result(
&self,
result: &TxEvents,
code_hash: Option,
contract_address: sp_core::crypto::AccountId32,
+ token_metadata: &TokenMetadata,
) -> Result<(), ErrorVariant> {
let events = DisplayEvents::from_events(
result,
@@ -368,7 +381,7 @@ impl Exec {
name_value_println!("Code hash", format!("{:?}", code_hash));
}
name_value_println!("Contract", contract_address);
- println!("{}", events.display_events(self.verbosity))
+ println!("{}", events.display_events(self.verbosity, token_metadata)?)
};
Ok(())
}
diff --git a/crates/cargo-contract/src/cmd/extrinsics/mod.rs b/crates/cargo-contract/src/cmd/extrinsics/mod.rs
index 708e54b7e..607a860fc 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/mod.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/mod.rs
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with cargo-contract. If not, see .
+mod balance;
mod call;
mod error;
mod events;
@@ -28,6 +29,7 @@ mod integration_tests;
use anyhow::{
anyhow,
Context,
+ Ok,
Result,
};
use colored::Colorize;
@@ -67,6 +69,12 @@ use subxt::{
OnlineClient,
};
+use std::option::Option;
+
+pub use balance::{
+ BalanceVariant,
+ TokenMetadata,
+};
pub use call::CallCommand;
pub use error::ErrorVariant;
pub use instantiate::InstantiateCommand;
@@ -106,8 +114,8 @@ pub struct ExtrinsicOpts {
dry_run: bool,
/// The maximum amount of balance that can be charged from the caller to pay for the storage
/// consumed.
- #[clap(long, value_parser = parse_balance)]
- storage_deposit_limit: Option,
+ #[clap(long)]
+ storage_deposit_limit: Option,
/// Before submitting a transaction, do not dry-run it via RPC first.
#[clap(long)]
skip_dry_run: bool,
@@ -140,19 +148,19 @@ impl ExtrinsicOpts {
}
/// Get the storage deposit limit converted to compact for passing to extrinsics.
- pub fn storage_deposit_limit(&self) -> Option> {
- self.storage_deposit_limit.map(Into::into)
+ pub fn storage_deposit_limit(
+ &self,
+ token_metadata: &TokenMetadata,
+ ) -> Result>> {
+ Ok(self
+ .storage_deposit_limit
+ .as_ref()
+ .map(|bv| bv.denominate_balance(token_metadata))
+ .transpose()?
+ .map(Into::into))
}
}
-/// Parse Rust style integer balance literals which can contain underscores.
-fn parse_balance(input: &str) -> Result {
- input
- .replace('_', "")
- .parse::()
- .map_err(Into::into)
-}
-
/// Create a new [`PairSigner`] from the given [`sr25519::Pair`].
pub fn pair_signer(pair: sr25519::Pair) -> PairSigner {
PairSigner::new(pair)
@@ -242,7 +250,7 @@ async fn state_call(url: &str, func: &str, args: A) -> Res
Ok(R::decode(&mut bytes.as_ref())?)
}
-/// Prompt the user to confirm transaction submission
+/// Prompt the user to confirm transaction submission.
fn prompt_confirm_tx(show_details: F) -> Result<()> {
println!(
"{} (skip with --skip-confirm)",
diff --git a/crates/cargo-contract/src/cmd/extrinsics/upload.rs b/crates/cargo-contract/src/cmd/extrinsics/upload.rs
index 6dcccf455..f8191c2a3 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/upload.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/upload.rs
@@ -26,6 +26,7 @@ use super::{
DefaultConfig,
ExtrinsicOpts,
PairSigner,
+ TokenMetadata,
};
use crate::{
cmd::extrinsics::{
@@ -88,7 +89,7 @@ impl UploadCommand {
let client = OnlineClient::from_url(url.clone()).await?;
if self.extrinsic_opts.dry_run {
- match self.upload_code_rpc(code, &signer).await? {
+ match self.upload_code_rpc(code, &client, &signer).await? {
Ok(result) => {
let upload_result = UploadDryRunResult {
result: String::from("Success!"),
@@ -134,10 +135,17 @@ impl UploadCommand {
async fn upload_code_rpc(
&self,
code: Vec,
+ client: &Client,
signer: &PairSigner,
) -> Result> {
let url = self.extrinsic_opts.url_to_string();
- let storage_deposit_limit = self.extrinsic_opts.storage_deposit_limit;
+ let token_metadata = TokenMetadata::query(client).await?;
+ let storage_deposit_limit = self
+ .extrinsic_opts
+ .storage_deposit_limit
+ .as_ref()
+ .map(|bv| bv.denominate_balance(&token_metadata))
+ .transpose()?;
let call_request = CodeUploadRequest {
origin: signer.account_id().clone(),
code,
@@ -153,9 +161,12 @@ impl UploadCommand {
signer: &PairSigner,
transcoder: &ContractMessageTranscoder,
) -> Result, ErrorVariant> {
+ let token_metadata = TokenMetadata::query(client).await?;
+ let storage_deposit_limit =
+ self.extrinsic_opts.storage_deposit_limit(&token_metadata)?;
let call = super::runtime_api::api::tx()
.contracts()
- .upload_code(code, self.extrinsic_opts.storage_deposit_limit());
+ .upload_code(code, storage_deposit_limit);
let result = submit_extrinsic(client, &call, signer).await?;
let display_events =
@@ -164,7 +175,9 @@ impl UploadCommand {
let output = if self.output_json {
display_events.to_json()?
} else {
- display_events.display_events(self.extrinsic_opts.verbosity()?)
+ let token_metadata = TokenMetadata::query(client).await?;
+ display_events
+ .display_events(self.extrinsic_opts.verbosity()?, &token_metadata)?
};
println!("{}", output);
let code_stored = result.find_first::()?;