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

Do not use fork of openzeppelin anymore #5106

Merged
merged 2 commits into from Jan 22, 2019

Conversation

@axic
Copy link
Member

commented Sep 27, 2018

@chriseth

This comment has been minimized.

Copy link
Contributor

commented Sep 27, 2018

Fails.

@nventuro

This comment has been minimized.

Copy link
Contributor

commented Oct 2, 2018

Hey @axic, I noticed your build is failing because of the breaking changes introduced in 0.5.0 (e.g. the data location for certain types now being mandatory). I was actually tracking that in this OpenZeppelin PR, and we even have an issue for this whole thing: OpenZeppelin/openzeppelin-contracts#1211.

What do you think about having a branch in OpenZeppelin that compiles using nightly builds, instead of you having to maintain your own fork? That way we could give you a hand maintaining, making sure the branch gets updated often to reflect the latest changes, and it'd also make it easier for us to upgrade to the latest version once its released.

@chriseth

This comment has been minimized.

Copy link
Contributor

commented Oct 2, 2018

@nventuro that would be wonderful! Do you already have such a branch?

@nventuro

This comment has been minimized.

Copy link
Contributor

commented Oct 2, 2018

I just created the solc-nightly branch, from master, and set the CI to only use the nightly compiler. To bring that branch up to date with 0.5.0, we should open PRs against it: we already have a couple from a while back (OpenZeppelin/openzeppelin-contracts#1068 and OpenZeppelin/openzeppelin-contracts#1144).

@chriseth

This comment has been minimized.

Copy link
Contributor

commented Oct 2, 2018

Will you make the updates? You know about https://github.com/axic/openzeppelin-solidity/tree/solidity-050 do you?

@axic

This comment has been minimized.

Copy link
Member Author

commented Oct 2, 2018

You know about https://github.com/axic/openzeppelin-solidity/tree/solidity-050 do you?

The problem is we haven't merged upstream changes to it for 3 months. We could do that, but I think merging these 2 new PRs will be faster.

@axic axic force-pushed the zeppelin branch from e94d0df to d7e6811 Oct 30, 2018
@codecov

This comment was marked as outdated.

Copy link

commented Oct 30, 2018

Codecov Report

Merging #5106 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #5106   +/-   ##
========================================
  Coverage    88.35%   88.35%           
========================================
  Files          348      348           
  Lines        33431    33431           
  Branches      4005     4005           
========================================
  Hits         29538    29538           
  Misses        2535     2535           
  Partials      1358     1358
Flag Coverage Δ
#all 88.35% <ø> (ø) ⬆️
#syntax 28.32% <ø> (ø) ⬆️
@axic axic force-pushed the zeppelin branch 2 times, most recently from 2e39333 to 58c153b Oct 30, 2018
@axic axic force-pushed the zeppelin branch from 58c153b to 23394bb Nov 13, 2018
@chriseth

This comment has been minimized.

Copy link
Contributor

commented Dec 13, 2018

No reason to keep this open.

@chriseth chriseth closed this Dec 13, 2018
@axic axic reopened this Jan 22, 2019
@axic

This comment has been minimized.

Copy link
Member Author

commented Jan 22, 2019

Zeppelin has released their 0.5.0-compatible version: https://github.com/OpenZeppelin/openzeppelin-solidity/releases/tag/v2.1.1 Updating it here.

@axic axic force-pushed the zeppelin branch from 23394bb to a52de11 Jan 22, 2019
@axic axic requested a review from chriseth Jan 22, 2019
@axic

This comment has been minimized.

Copy link
Member Author

commented Jan 22, 2019

This works now.

test/externalTests.sh Outdated Show resolved Hide resolved
@axic axic force-pushed the zeppelin branch from abe1337 to 028bc7d Jan 22, 2019
@chriseth chriseth merged commit 7a17e7f into develop Jan 22, 2019
19 checks passed
19 checks passed
ci/circleci: build_emscripten Your tests passed on CircleCI!
Details
ci/circleci: build_x86_archlinux Your tests passed on CircleCI!
Details
ci/circleci: build_x86_clang7 Your tests passed on CircleCI!
Details
ci/circleci: build_x86_linux Your tests passed on CircleCI!
Details
ci/circleci: build_x86_mac Your tests passed on CircleCI!
Details
ci/circleci: docs Your tests passed on CircleCI!
Details
ci/circleci: test_buglist Your tests passed on CircleCI!
Details
ci/circleci: test_check_spelling Your tests passed on CircleCI!
Details
ci/circleci: test_check_style Your tests passed on CircleCI!
Details
ci/circleci: test_emscripten_external Your tests passed on CircleCI!
Details
ci/circleci: test_emscripten_solcjs Your tests passed on CircleCI!
Details
ci/circleci: test_x86_archlinux Your tests passed on CircleCI!
Details
ci/circleci: test_x86_linux Your tests passed on CircleCI!
Details
ci/circleci: test_x86_mac Your tests passed on CircleCI!
Details
codecov/patch Coverage not affected when comparing 26c0655...028bc7d
Details
codecov/project 86.94% remains the same compared to 26c0655
Details
codecov/project/syntax 84.78% remains the same compared to 26c0655
Details
codecov/project/tests 91.69% remains the same compared to 26c0655
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@axic axic deleted the zeppelin branch Jan 22, 2019
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.