Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify mine_block to use wallet V2 API #2892

Merged
merged 2 commits into from Jun 13, 2019

Conversation

@yeastplume
Copy link
Member

commented Jun 12, 2019

Changes the create_coinbase call to use the V2 wallet api's build_coinbase function

yeastplume added 2 commits Jun 12, 2019
Error::WalletComm(report)
})?;

let res: Value = serde_json::from_str(&res).unwrap();

This comment has been minimized.

Copy link
@hashmap

hashmap Jun 12, 2019

Member

Wouldn't be cleaner to create a type for the response (I assume it's Result-like) instead of dealing with raw json Value?

This comment has been minimized.

Copy link
@yeastplume

yeastplume Jun 12, 2019

Author Member

It just seemed simpler for this one-off in the code to do this way, also had the notion of making it obvious what the json structure is underneath for anyone looking at the code. If it were a full wallet API client, I'd say definitely, yes.

}

let cb_data = res["result"]["Ok"].clone();

This comment has been minimized.

Copy link
@hashmap

hashmap Jun 12, 2019

Member

for example it's hard to tell should Ok be in lower case or not (or does it matter)

@yeastplume

This comment has been minimized.

Copy link
Member Author

commented Jun 13, 2019

@hashmap can you live with this as is? Happy to come back to refine it later, but it's tested in this form and works and we need this in place for floonet testing very shortly.

@hashmap hashmap merged commit e15cffb into mimblewimble:milestone/2.0.0 Jun 13, 2019

10 checks passed

mimblewimble.grin Build #20190612.3 succeeded
Details
mimblewimble.grin (linux api/util/store) linux api/util/store succeeded
Details
mimblewimble.grin (linux chain/core/keychain) linux chain/core/keychain succeeded
Details
mimblewimble.grin (linux pool/p2p/src) linux pool/p2p/src succeeded
Details
mimblewimble.grin (linux release) linux release succeeded
Details
mimblewimble.grin (linux servers) linux servers succeeded
Details
mimblewimble.grin (macos release) macos release succeeded
Details
mimblewimble.grin (macos test) macos test succeeded
Details
mimblewimble.grin (windows release) windows release succeeded
Details
mimblewimble.grin (windows test) windows test succeeded
Details
@kargakis

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

@yeastplume @hashmap can one of you open an issue to track the follow-up task? Thanks

yeastplume added a commit that referenced this pull request Jun 27, 2019
Master merge 2.0.0 (#2927)
* create 2.0.0 branch

* fix humansize version

* update grin.yml version

* PoW HardFork (#2866)

* allow version 2 blocks for next 6 months

* add cuckarood.rs with working tests

* switch cuckaroo to cuckarood at right heights

* reorder to reduce conditions

* remove _ prefix on used args; fix typo

* Make Valid Header Version dependant on ChainType

* Rustfmt

* Add tests, uncomment header v2

* Rustfmt

* Add FLOONET_FIRST_HARD_FORK height and simplify logic

* assume floonet stays closer to avg 60s block time

* move floonet hf forward by half a day

* update version in new block when previous no longer valid

* my next commit:-)

* micro optimization

* Support new Bulletproof rewind scheme (#2848)

* Update keychain with new rewind scheme

* Refactor: proof builder trait

* Update tests, cleanup

* rustfmt

* Move conversion of SwitchCommitmentType

* Add proof build trait to tx builders

* Cache hashes in proof builders

* Proof builder tests

* Add ViewKey struct

* Fix some warnings

* Zeroize proof builder secrets on drop

* Modify mine_block to use wallet V2 API (#2892)

* update mine_block to use V2 wallet API

* rustfmt

* Add version endpoint to node API, rename pool/push (#2897)

* add node version API, tweak pool/push parameter

* rustfmt

* Upate version api call (#2899)

* Update version number for next (potential) release

* zeroize: Upgrade to v0.9 (#2914)

* zeroize: Upgrade to v0.9

* missed Cargo.lock

* [PENDING APPROVAL] put phase outs of C32 and beyond on hold (#2714)

* put phase outs of C32 and beyond on hold

* update tests for phaseouts on hold

* Don't wait for p2p-server thread (#2917)

Currently p2p.stop() stops and wait for all peers to exit, that's
basically all we need. However we also run a TCP listener in this thread
which is blocked on `accept` most of the time. We do an attempt to stop
it but it would work only if we get an incoming connection during the
shutdown, which is a week guarantee.

This fix remove joining to p2p-server thread, it stops all peers and
makes an attempt to stop the listener.

Fixes [#2906]

* rustfmt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.