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

Updated meta-tx work #45

Merged
merged 10 commits into from
Aug 1, 2017
Merged

Updated meta-tx work #45

merged 10 commits into from
Aug 1, 2017

Conversation

naterush
Copy link
Contributor

This pull request simplifies the meta-tx pull request dramatically (and contains both the IdentityManager from the MetaIdentityManager). For the write-up, still see here: https://consensys.quip.com/CoClAjSTyBZI

@naterush
Copy link
Contributor Author

@pelle quick note: I'll get 1. tests working, and 2. update MetaIdentityManager to take into account the recent changes in IdentityManager. Should be pretty simple. I'll update you when ready for reveiw :). Thanks!

oed
oed previously requested changes Jul 31, 2017
Copy link
Contributor

@oed oed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Let's just update the tests to use async/await everywhere for consistancy.

test/txRelay.js Outdated

function signPayload(signingAddr, sendingAddr, txRelay, destinationAddress, functionName,
functionTypes, functionParams, lw, keyFromPw) {
return new Promise(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

await could be used in this function instead.

test/txRelay.js Outdated

errorThrown = false

MetaTxRelay.new().then(instance => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using await should work here as well

@oed
Copy link
Contributor

oed commented Jul 31, 2017

Also: we need to add MetaIdentityManager and TxRelay to index.js

@naterush
Copy link
Contributor Author

@oed changed tests to await. Added files to index.js

Copy link
Contributor

@coder5876 coder5876 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! async/await is so nice! :)

}

modifier onlyOwner(address identity, address sender) {
if (owners[identity][sender] > 0 && (owners[identity][sender] + userTimeLock) <= now ) _ ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to use isOwner here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think this makes sense for clarity. I will update now. Here and in IdentityManager

Copy link
Contributor

@pelle pelle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM great team work @oed, @naterush and @christianlundkvist

@coder5876
Copy link
Contributor

Ok, merging! 😃

@coder5876 coder5876 merged commit 68ba461 into develop Aug 1, 2017
@naterush naterush deleted the feature/new-meta-tx branch November 15, 2017 22:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants