Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

merge from upstream #22

Merged
merged 42 commits into from
Jun 10, 2019
Merged

merge from upstream #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
47ee03c
V2 slate versioning enablement (#85)
yeastplume Apr 23, 2019
bff07eb
fix #88 (#89)
bddap Apr 24, 2019
d774272
Add `check_version` function to Foreign API (#87)
yeastplume Apr 24, 2019
a63f2c7
Merge branch 'master' into master
garyyu Apr 25, 2019
e509405
Revert "Merge branch 'master' into master"
garyyu Apr 25, 2019
92be666
Merge pull request #91 from garyyu/revert
garyyu Apr 25, 2019
3a3057d
[WIP] Invoiced Transactions API Support (#90)
yeastplume May 1, 2019
9d6694b
Add Azure Pipelines to grin-wallet
quentinlesceller May 3, 2019
e673fd9
Remove cursive and fix task names
quentinlesceller May 3, 2019
b76c18d
Do not crash on empty terminal
quentinlesceller May 3, 2019
77a6628
Add LLVM
quentinlesceller May 3, 2019
2a23318
Possible MSFT pipeline bug with . task
quentinlesceller May 3, 2019
6c32174
Change connection name
quentinlesceller May 9, 2019
7a39c7c
Merge pull request #97 from quentinlesceller/azure-pipelines
quentinlesceller May 9, 2019
6f875c5
Command line implementation of invoice commands (#96)
yeastplume May 9, 2019
9f96e43
Add Azure Pipelines badge
quentinlesceller May 9, 2019
b9e3a90
Merge pull request #99 from quentinlesceller/litbadge
quentinlesceller May 9, 2019
0b9b16d
Remove duplicate LMDB wallet backend code (#101)
yeastplume May 11, 2019
af6a624
Simplify slate (de)serialization (#103)
jaspervdm May 16, 2019
45750c8
docstring update and provide a bit of a readme (#104)
yeastplume May 16, 2019
e25c931
Updates for 1.1.0-beta.3 release (#106)
yeastplume May 16, 2019
94aee6f
Fix keybase adapter (#107)
jaspervdm May 16, 2019
4b2bc5f
fix version string in yml (#113)
yeastplume May 20, 2019
a45f8d3
fix: invoice transaction pay need update the slate height (#115)
garyyu May 21, 2019
db818ac
Remove double json encoding on http response (#114)
jaspervdm May 21, 2019
85b55f5
Add participant ID as part of key to stored private transaction conte…
yeastplume May 23, 2019
ad59c60
change the api repository to grin-wallet instead of grin (#118)
garyyu May 24, 2019
84e6c71
Test (#119)
jaspervdm May 27, 2019
757dfd0
Remove Travis.yml (#124)
quentinlesceller May 29, 2019
af16dea
Version Info API Function tweak, remove 'min_compat_version' from sla…
yeastplume May 30, 2019
b1738e3
Changes for 1.1.0 -> 2.0.0 Deployment strategy decisions (#126)
yeastplume May 31, 2019
9a7243f
version bump for beta.4
yeastplume May 31, 2019
36ab785
cargo.lock crate version update, and remove 3 build warning from carg…
garyyu Jun 1, 2019
cc940fb
Merge pull request #130 from garyyu/warning
garyyu Jun 1, 2019
03ab8ad
Fix for API secret on node API startup (#131)
yeastplume Jun 1, 2019
42befd2
More helpful error message on recover when `wallet_data` dir doesn't …
yeastplume Jun 4, 2019
ea4849a
fixes and version update for final 1.0.0 build
yeastplume Jun 5, 2019
3136812
fixes and version update for final 1.0.0 build
yeastplume Jun 5, 2019
97eb7f4
merge from upstream
garyyu Jun 9, 2019
00fe54c
rustfmt
garyyu Jun 9, 2019
bbef157
get back the travis-ci scripts
garyyu Jun 9, 2019
9201a75
fix the test
garyyu Jun 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .ci/release-jobs
100755 → 100644
View file
Open in desktop
Empty file.
218 changes: 123 additions & 95 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "1.1.0-beta.3"
version = "1.1.0"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -29,13 +29,13 @@ prettytable-rs = "0.7"
log = "0.4"
linefeed = "0.5"

grin_wallet_api = { path = "./api", version = "1.1.0-beta.3" }
grin_wallet_impls = { path = "./impls", version = "1.1.0-beta.3" }
grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0-beta.3" }
grin_wallet_controller = { path = "./controller", version = "1.1.0-beta.3" }
grin_wallet_config = { path = "./config", version = "1.1.0-beta.3" }
grin_wallet_api = { path = "./api", version = "1.1.0" }
grin_wallet_impls = { path = "./impls", version = "1.1.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0" }
grin_wallet_controller = { path = "./controller", version = "1.1.0" }
grin_wallet_config = { path = "./config", version = "1.1.0" }

grin_wallet_util = { path = "./util", version = "1.1.0-beta.3" }
grin_wallet_util = { path = "./util", version = "1.1.0" }

[build-dependencies]
built = "0.3"
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![Build Status](https://img.shields.io/travis/gottstech/grin-wallet/master.svg)](https://travis-ci.org/gottstech/grin-wallet)
[![Coverage Status](https://img.shields.io/codecov/c/github/gottstech/grin-wallet/master.svg)](https://codecov.io/gh/gottstech/grin-wallet)
[![Build Status](https://dev.azure.com/mimblewimble/grin-wallet/_apis/build/status/mimblewimble.grin-wallet?branchName=master)](https://dev.azure.com/mimblewimble/grin-wallet/_build/latest?definitionId=3&branchName=master)
[![Coverage Status](https://img.shields.io/codecov/c/github/mimblewimble/grin-wallet/master.svg)](https://codecov.io/gh/mimblewimble/grin-wallet)
[![Chat](https://img.shields.io/gitter/room/grin_community/Lobby.svg)](https://gitter.im/grin_community/Lobby)
[![Support](https://img.shields.io/badge/support-on%20gitter-brightgreen.svg)](https://gitter.im/grin_community/support)
[![Documentation Wiki](https://img.shields.io/badge/doc-wiki-blue.svg)](https://github.com/gottstech/grin-wallet/wiki)
[![Release Version](https://img.shields.io/github/release/gottstech/grin-wallet.svg)](https://github.com/gottstech/grin-wallet/releases)
[![License](https://img.shields.io/github/license/gottstech/grin-wallet.svg)](https://github.com/gottstech/grin-wallet/blob/master/LICENSE)
[![Release Version](https://img.shields.io/github/release/mimblewimble/grin-wallet.svg)](https://github.com/mimblewimble/grin-wallet/releases)
[![License](https://img.shields.io/github/license/mimblewimble/grin-wallet.svg)](https://github.com/mimblewimble/grin-wallet/blob/master/LICENSE)

# Grin Wallet

Expand Down
10 changes: 5 additions & 5 deletions api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "1.1.0-beta.3"
version = "1.1.0"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -18,11 +18,11 @@ serde_json = "1"
easy-jsonrpc = "0.5.1"
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.3" }
grin_wallet_config = { path = "../config", version = "1.1.0-beta.3" }
grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.3" }
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" }
grin_wallet_config = { path = "../config", version = "1.1.0" }
grin_wallet_impls = { path = "../impls", version = "1.1.0" }

grin_wallet_util = { path = "../util", version = "1.1.0-beta.3" }
grin_wallet_util = { path = "../util", version = "1.1.0" }

[dev-dependencies]
serde_json = "1"
Expand Down
44 changes: 24 additions & 20 deletions api/src/foreign_rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,12 @@ pub trait ForeignRpc {
"jsonrpc": "2.0",
"result": {
"Ok": {
"default_slate_version": 2,
"foreign_api_version": 2
"foreign_api_version": 2,
"supported_slate_versions": [
"V0",
"V1",
"V2"
]
}
}
}
Expand Down Expand Up @@ -91,7 +95,7 @@ pub trait ForeignRpc {
"Ok": {
"kernel": {
"excess": "08dfe86d732f2dd24bac36aa7502685221369514197c26d33fac03041d47e4b490",
"excess_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f4f0471a33b6465cdb9e72b635f5611aa6c89ebd51aeee038f69b4cc598a02fe0",
"excess_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841be02fa098c54c9bf638e0ee1ad5eb896caa11565f632be7b9cd65643ba371044f",
"features": "Coinbase",
"fee": "0",
"lock_height": "0"
Expand Down Expand Up @@ -134,7 +138,7 @@ pub trait ForeignRpc {
{
"id": "0",
"message": "my message",
"message_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f756f655333250204644c1cb169e7a78f21b57437930db91e808f39be58134c1d",
"message_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841b1d4c1358be398f801eb90d933774b5218fa7e769b11c4c640402253353656f75",
"part_sig": null,
"public_blind_excess": "034b4df2f0558b73ea72a1ca5c4ab20217c66bbe0829056fca7abe76888e9349ee",
"public_nonce": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f"
Expand Down Expand Up @@ -168,9 +172,9 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
},
"version_info": {
"min_compat_version": 0,
"orig_version": 2,
"version": 2
"orig_version": 2,
"version": 2,
"block_header_version": 1
}
}
]
Expand Down Expand Up @@ -208,7 +212,7 @@ pub trait ForeignRpc {
"version_info": {
"version": 2,
"orig_version": 2,
"min_compat_version": 0
"block_header_version": 1
},
"num_participants": 2,
"id": "0436430c-2b02-624c-2032-570501212b00",
Expand Down Expand Up @@ -288,8 +292,8 @@ pub trait ForeignRpc {
{
"id": "1",
"message": "Thanks, Yeastplume",
"message_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078ff97f43f2eda0f695161ba23dc48db7a1bcbd7f131f1e21bdb4e1ad1eb2f1a130",
"part_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078ffc965b05962362aee43e5264bd3fd0f26dbd7092cfe070069e26d2df28bd352b",
"message_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841b30a1f1b21eade1b4bd211e1f137fbdbca1b78dc43da21b1695f6a0edf2437ff9",
"part_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841b2b35bd28dfd2269e0670e0cf9270bd6df2d03fbd64523ee4ae622396055b96fc",
"public_blind_excess": "038fe0443243dab173c068ef5fa891b242d2b5eb890ea09475e6e381170442ee16",
"public_nonce": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f"
}
Expand Down Expand Up @@ -331,9 +335,9 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
},
"version_info": {
"min_compat_version": 0,
"orig_version": 2,
"version": 2
"orig_version": 2,
"version": 2,
"block_header_version": 1
}
}
}
Expand Down Expand Up @@ -366,7 +370,7 @@ pub trait ForeignRpc {
"version_info": {
"version": 2,
"orig_version": 2,
"min_compat_version": 0
"block_header_version": 1
},
"num_participants": 2,
"id": "0436430c-2b02-624c-2032-570501212b00",
Expand Down Expand Up @@ -423,7 +427,7 @@ pub trait ForeignRpc {
"id": "0",
"public_blind_excess": "029f12f9f8c5489a18904de7cd46dc3384b79369d4cbc17cd74b299da8c2cf7445",
"public_nonce": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f",
"part_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078fe3cccc5ff1d832edb7e3cb3b1414b9e9d3d1d503294224b4c93bf3d59ed64018",
"part_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841b1840d69ed5f33bc9b424422903d5d1d3e9b914143bcbe3b7ed32d8f15fcccce3",
"message": null,
"message_sig": null
}
Expand All @@ -449,15 +453,15 @@ pub trait ForeignRpc {
"id": "1",
"message": null,
"message_sig": null,
"part_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078fc0e6f263f91010a6fea7099029c70eabdf75b48aefd977e14d1ed659b221eac9",
"part_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841bc9ea21b259d61e4de177d9ef8ab475dfab0ec7299009a7fea61010f963f2e6c0",
"public_blind_excess": "033bbe2a419ea2e9d6810a8d66552e709d1783ca50759a44dbaf63fc79c0164c4c",
"public_nonce": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f"
},
{
"id": "0",
"message": null,
"message_sig": null,
"part_sig": "1b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078fe3cccc5ff1d832edb7e3cb3b1414b9e9d3d1d503294224b4c93bf3d59ed64018",
"part_sig": "8f07ddd5e9f5179cff19486034181ed76505baaad53e5d994064127b56c5841b1840d69ed5f33bc9b424422903d5d1d3e9b914143bcbe3b7ed32d8f15fcccce3",
"public_blind_excess": "029f12f9f8c5489a18904de7cd46dc3384b79369d4cbc17cd74b299da8c2cf7445",
"public_nonce": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f"
}
Expand All @@ -477,7 +481,7 @@ pub trait ForeignRpc {
"kernels": [
{
"excess": "09bac6083b05a32a9d9b37710c70dd0a1ef9329fde0848558976b6f1b81d80ceed",
"excess_sig": "4d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766a4b3bec3eae84394b68ad4cb3ddbc896f898aca769d2fc5a56886ba280c1e9a0",
"excess_sig": "66074d25a751c4743342c90ad8ead9454daa00d9b9aed29bca321036d16c4b4da0e9c180a26b88565afcd269a7ac98f896c8db3dcbd48ab69443e8eac3beb3a4",
"features": "Plain",
"fee": "7000000",
"lock_height": "0"
Expand All @@ -499,9 +503,9 @@ pub trait ForeignRpc {
"offset": "d202964900000000d302964900000000d402964900000000d502964900000000"
},
"version_info": {
"min_compat_version": 0,
"orig_version": 2,
"version": 2
"version": 2,
"block_header_version": 1
}
}
}
Expand Down
Loading