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

Commit d11167c

Browse files
bors[bot]Franck Royer
bors[bot]
and
Franck Royer
authored
Merge #283
283: Upgrade to [email protected] r=bonomat a=D4nte This brings in the Ether float fix needed for testnet. Co-authored-by: Franck Royer <[email protected]>
2 parents fe1d703 + 4e631b4 commit d11167c

File tree

9 files changed

+45
-29
lines changed

9 files changed

+45
-29
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
### Changed
10+
- Upgrade all examples and new project to `[email protected]`.
11+
912
## [0.6.0] - 2019-12-07
1013

11-
## Added
14+
### Added
1215
- Windows support :tada:.
1316

1417
## [0.5.2] - 2019-12-06
1518

16-
## Changed
19+
### Changed
1720
- Upgrade all examples and new project to `[email protected]`.
1821

1922
## [0.5.1] - 2019-12-02
2023

21-
## Fixed
24+
### Fixed
2225
- Upgrade `separate_apps` example to comit-sdk 0.7.1 to fix maker auto-accept.
2326
- Add code comments in `separate_apps` to describe the behaviour and help app developers understand how to use COMIT SDK.
2427

2528
## [0.5.0] - 2019-11-28
2629

27-
## Changed
30+
### Changed
2831
- `separate_apps` example now uses the negotiation protocol provided by comit-sdk.
2932
- Upgrade to `comit-rs:0.4.0`
3033
- Upgrade all examples and new project to `[email protected]`.

‎new_project/examples/btc_eth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"typescript": "^3.7.3"
2424
},
2525
"dependencies": {
26-
"comit-sdk": "^0.7.2",
26+
"comit-sdk": "^0.8.0",
2727
"dotenv": "^8.2.0",
2828
"moment": "^2.24.0",
2929
"satoshi-bitcoin-ts": "^0.2.4"

‎new_project/examples/btc_eth/yarn.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,11 @@ bignumber.js@^4.0.0:
753753
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
754754
integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
755755

756+
bignumber.js@^9.0.0:
757+
version "9.0.0"
758+
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
759+
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
760+
756761
binet@~0.3.5:
757762
version "0.3.5"
758763
resolved "https://registry.yarnpkg.com/binet/-/binet-0.3.5.tgz#bf4f2a1859d08bb5de55fce9faa34274b18cce0b"
@@ -1136,13 +1141,14 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
11361141
dependencies:
11371142
delayed-stream "~1.0.0"
11381143

1139-
comit-sdk@^0.7.2:
1140-
version "0.7.2"
1141-
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.2.tgz#121f3fb7409fea4b695259f9c522fd4828b579a6"
1142-
integrity sha512-9lUkYLvt9wP/B9gmfVbPS+71lUMLCqoWEh5AVe1KfDYRC3rv+Bt5V+/tso90zgeyD4LecbVoab0g737uycOB1Q==
1144+
comit-sdk@^0.8.0:
1145+
version "0.8.0"
1146+
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.8.0.tgz#ac4b64dd69e58f8057d7d96ca52983520011fcf0"
1147+
integrity sha512-5zn+WZw91I8sShtqeMVKANLu9g4hnWdKndWCdrlnWc6Q+eyx3EWFZ2e1xAxP+WfefxmQ4Ut2t2cgGby7ksSlGA==
11431148
dependencies:
11441149
axios "^0.19.0"
11451150
bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"
1151+
bignumber.js "^9.0.0"
11461152
bitcoin-core "^2.2.0"
11471153
content-type "^1.0.4"
11481154
ethers "^4.0.38"

‎new_project/examples/erc20_btc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"typescript": "^3.7.3"
2323
},
2424
"dependencies": {
25-
"comit-sdk": "^0.7.2",
25+
"comit-sdk": "^0.8.0",
2626
"dotenv": "^8.1.0",
2727
"moment": "^2.24.0",
2828
"readline-sync": "^1.4.10",

‎new_project/examples/erc20_btc/yarn.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ bignumber.js@^4.0.0:
245245
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
246246
integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
247247

248+
bignumber.js@^9.0.0:
249+
version "9.0.0"
250+
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
251+
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
252+
248253
binet@~0.3.5:
249254
version "0.3.5"
250255
resolved "https://registry.yarnpkg.com/binet/-/binet-0.3.5.tgz#bf4f2a1859d08bb5de55fce9faa34274b18cce0b"
@@ -514,13 +519,14 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
514519
dependencies:
515520
delayed-stream "~1.0.0"
516521

517-
comit-sdk@^0.7.2:
518-
version "0.7.2"
519-
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.2.tgz#121f3fb7409fea4b695259f9c522fd4828b579a6"
520-
integrity sha512-9lUkYLvt9wP/B9gmfVbPS+71lUMLCqoWEh5AVe1KfDYRC3rv+Bt5V+/tso90zgeyD4LecbVoab0g737uycOB1Q==
522+
comit-sdk@^0.8.0:
523+
version "0.8.0"
524+
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.8.0.tgz#ac4b64dd69e58f8057d7d96ca52983520011fcf0"
525+
integrity sha512-5zn+WZw91I8sShtqeMVKANLu9g4hnWdKndWCdrlnWc6Q+eyx3EWFZ2e1xAxP+WfefxmQ4Ut2t2cgGby7ksSlGA==
521526
dependencies:
522527
axios "^0.19.0"
523528
bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"
529+
bignumber.js "^9.0.0"
524530
bitcoin-core "^2.2.0"
525531
content-type "^1.0.4"
526532
ethers "^4.0.38"

‎new_project/examples/separate_apps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"@types/express": "^4.17.2",
2727
"axios": "^0.19.0",
28-
"comit-sdk": "^0.7.2",
28+
"comit-sdk": "^0.8.0",
2929
"dotenv": "^8.1.0",
3030
"express": "^4.17.1",
3131
"moment": "^2.24.0",

‎new_project/examples/separate_apps/src/lib.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import {
2-
Actor,
3-
BitcoinWallet,
4-
createActor as createActorSdk,
5-
EthereumWallet,
6-
} from "comit-sdk";
1+
import { Actor, BitcoinWallet, createActor as createActorSdk, EthereumWallet } from "comit-sdk";
2+
import dotenv from "dotenv";
73
import fs from "fs";
84
import * as os from "os";
95
import * as path from "path";
10-
import dotenv from "dotenv";
116

127
export async function createActor(index: number): Promise<Actor> {
138
loadEnvironment();
@@ -33,7 +28,7 @@ export async function createActor(index: number): Promise<Actor> {
3328
}
3429

3530
function loadEnvironment() {
36-
let envFilePath = path.join(os.homedir(), ".create-comit-app", "env");
31+
const envFilePath = path.join(os.homedir(), ".create-comit-app", "env");
3732

3833
if (!fs.existsSync(envFilePath)) {
3934
console.log(
@@ -43,7 +38,7 @@ function loadEnvironment() {
4338
process.exit(1);
4439
}
4540

46-
dotenv.config({path: envFilePath});
41+
dotenv.config({ path: envFilePath });
4742
}
4843

4944
export async function sleep(ms: number) {

‎new_project/examples/separate_apps/yarn.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,11 @@ bignumber.js@^4.0.0:
300300
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
301301
integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
302302

303+
bignumber.js@^9.0.0:
304+
version "9.0.0"
305+
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
306+
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
307+
303308
binet@~0.3.5:
304309
version "0.3.5"
305310
resolved "https://registry.yarnpkg.com/binet/-/binet-0.3.5.tgz#bf4f2a1859d08bb5de55fce9faa34274b18cce0b"
@@ -569,13 +574,14 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
569574
dependencies:
570575
delayed-stream "~1.0.0"
571576

572-
comit-sdk@^0.7.2:
573-
version "0.7.2"
574-
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.2.tgz#121f3fb7409fea4b695259f9c522fd4828b579a6"
575-
integrity sha512-9lUkYLvt9wP/B9gmfVbPS+71lUMLCqoWEh5AVe1KfDYRC3rv+Bt5V+/tso90zgeyD4LecbVoab0g737uycOB1Q==
577+
comit-sdk@^0.8.0:
578+
version "0.8.0"
579+
resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.8.0.tgz#ac4b64dd69e58f8057d7d96ca52983520011fcf0"
580+
integrity sha512-5zn+WZw91I8sShtqeMVKANLu9g4hnWdKndWCdrlnWc6Q+eyx3EWFZ2e1xAxP+WfefxmQ4Ut2t2cgGby7ksSlGA==
576581
dependencies:
577582
axios "^0.19.0"
578583
bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"
584+
bignumber.js "^9.0.0"
579585
bitcoin-core "^2.2.0"
580586
content-type "^1.0.4"
581587
ethers "^4.0.38"

‎new_project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start-env": "create-comit-app start-env"
99
},
1010
"dependencies": {
11-
"comit-sdk": "^0.7.1",
11+
"comit-sdk": "^0.8.0",
1212
"dotenv": "^8.2.0",
1313
"readline-sync": "^1.4.10"
1414
},

0 commit comments

Comments
 (0)