Skip to content
This repository was archived by the owner on Mar 23, 2021. It is now read-only.

Commit dacb4d0

Browse files
Merge #1744 #1747
1744: Bump serde_json from 1.0.43 to 1.0.44 r=mergify[bot] a=dependabot-preview[bot] Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.43 to 1.0.44. <details> <summary>Release notes</summary> *Sourced from [serde_json's releases](https://github.com/serde-rs/json/releases).* > ## v1.0.44 > - Implement IntoDeserializer for serde_json::Value to allow deserializing from types like `HashMap<String, Value>` ([#591](https://github-redirect.dependabot.com/serde-rs/json/issues/591)) </details> <details> <summary>Commits</summary> - [`1977e69`](serde-rs/json@1977e69) Release 1.0.44 - [`9f13db7`](serde-rs/json@9f13db7) Merge pull request 591 from erickt/value-into-deserializer - [`4ae13a5`](serde-rs/json@4ae13a5) Implement IntoDeserializer for Value - See full diff in [compare view](serde-rs/json@v1.0.43...v1.0.44) </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=serde_json&package-manager=cargo&previous-version=1.0.43&new-version=1.0.44)](https://dependabot.com/compatibility-score.html?dependency-name=serde_json&package-manager=cargo&previous-version=1.0.43&new-version=1.0.44) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> 1747: Bump comit-sdk from 0.7.1 to 0.7.2 in /api_tests r=mergify[bot] a=dependabot-preview[bot] Bumps [comit-sdk](https://github.com/comit-network/comit-js-sdk) from 0.7.1 to 0.7.2. <details> <summary>Release notes</summary> *Sourced from [comit-sdk's releases](https://github.com/comit-network/comit-js-sdk/releases).* > ## Release 0.7.2 > ### Added > - New function `createActor` to setup an actor's `comitClient`, retrieve its `ID` and bundle it with btc/eth wallets. </details> <details> <summary>Changelog</summary> *Sourced from [comit-sdk's changelog](https://github.com/comit-network/comit-js-sdk/blob/master/CHANGELOG.md).* > ## [0.7.2] - 2019-12-05 > > ### Added > - New function `createActor` to setup an actor's `comitClient`, retrieve its `ID` and bundle it with btc/eth wallets. </details> <details> <summary>Commits</summary> - [`2b772cc`](comit-network/comit-js-sdk@2b772cc) Merge pull request [#71](https://github-redirect.dependabot.com/comit-network/comit-js-sdk/issues/71) from comit-network/release/0.7.2 - [`be5af94`](comit-network/comit-js-sdk@be5af94) Update changelog - [`0b67291`](comit-network/comit-js-sdk@0b67291) Update version in package.json - [`ca15e04`](comit-network/comit-js-sdk@ca15e04) Merge pull request [#70](https://github-redirect.dependabot.com/comit-network/comit-js-sdk/issues/70) from comit-network/sdk-fixes-2 - [`84128d5`](comit-network/comit-js-sdk@84128d5) Expose the negotiation protocol from index.ts - [`b97dcc9`](comit-network/comit-js-sdk@b97dcc9) Make identifying name of actor optional - [`aeffe5d`](comit-network/comit-js-sdk@aeffe5d) Merge pull request [#69](https://github-redirect.dependabot.com/comit-network/comit-js-sdk/issues/69) from comit-network/61-createActor-function - [`c8998ae`](comit-network/comit-js-sdk@c8998ae) Update CHANGELOG.md - [`30a4673`](comit-network/comit-js-sdk@30a4673) Undo formatter - [`c30a395`](comit-network/comit-js-sdk@c30a395) Add createActor function - Additional commits viewable in [compare view](comit-network/comit-js-sdk@0.7.1...0.7.2) </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=comit-sdk&package-manager=npm_and_yarn&previous-version=0.7.1&new-version=0.7.2)](https://dependabot.com/compatibility-score.html?dependency-name=comit-sdk&package-manager=npm_and_yarn&previous-version=0.7.1&new-version=0.7.2) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
3 parents 31b2073 + f195ff7 + f39629e commit dacb4d0

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

Cargo.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api_tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"chai-json-schema": "^1.5.0",
4343
"chai-string": "^1.5.0",
4444
"chai-subset": "^1.6.0",
45-
"comit-sdk": "^0.7.1",
45+
"comit-sdk": "^0.7.2",
4646
"commander": "^4.0.1",
4747
"ethers": "^4.0.40",
4848
"get-port": "^5.0.0",

api_tests/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -936,10 +936,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
936936
dependencies:
937937
delayed-stream "~1.0.0"
938938

939-
comit-sdk@^0.7.1:
940-
version "0.7.1"
941-
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.1.tgz#1853baef36067214868b289d51af2be7aaaa6994"
942-
integrity sha512-M8j6iUf8G9zf7we0aBXSZQz7dvYuUkSUtEPMxlAWinpW+Ll5vAGsAVGlVC7rDFW+k//wk1XmcnQYGQx7omNPdw==
939+
comit-sdk@^0.7.2:
940+
version "0.7.2"
941+
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.2.tgz#121f3fb7409fea4b695259f9c522fd4828b579a6"
942+
integrity sha512-9lUkYLvt9wP/B9gmfVbPS+71lUMLCqoWEh5AVe1KfDYRC3rv+Bt5V+/tso90zgeyD4LecbVoab0g737uycOB1Q==
943943
dependencies:
944944
axios "^0.19.0"
945945
bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"

0 commit comments

Comments
 (0)