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.

Sign up for GitHub

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

Jump to bottom

Implement Ethereum adapter #432

Merged

aklenik merged 1 commit into hyperledger:master from russanto:ethereum-adapter

Oct 10, 2019

Contributor

russanto commented May 6, 2019 •

edited

Loading

No description provided.

russanto force-pushed the ethereum-adapter branch from 8120b1d to 2bfea26 Compare

May 6, 2019 22:25

Contributor

aklenik commented May 20, 2019

@russanto Great addition to the platform support 👍
Could you provide some documentation for it:

Official adapter documentation about how to configure Caliper for this platform and how to use the adapter from the user modules (style/content reference: Fabric-CCP docs)
Some high-level architecture doc for us, the reviewers to navigate and review your code more easily :) You can add this description to this PR's description.

aklenik added the PR: work in progress label

russanto force-pushed the ethereum-adapter branch from dc75fb3 to 3347ae3 Compare

June 9, 2019 13:43

russanto mentioned this pull request

Adds Ethereum adapter configuration doc #476

Merged

aklenik mentioned this pull request

Removed old fabric adapter and related examples #520

Merged

nklincoln closed this in #520

nklincoln reopened this

Contributor

feihujiang commented Aug 2, 2019

Ethereum adapter is a great addition. +1

russanto force-pushed the ethereum-adapter branch 5 times, most recently from 9c05837 to f670884 Compare

August 5, 2019 21:25

russanto force-pushed the ethereum-adapter branch from 083b4fe to 1b3ae92 Compare

August 12, 2019 00:46

stale bot commented Sep 11, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

stale bot added the wontfix label

aklenik removed the wontfix label

Contributor

aklenik commented Sep 11, 2019

@russanto I'll start to review the pr soon. I'll leave pr remarks, so we can keep the discussion here

aklenik self-assigned this

aklenik added the PR/under review label

aklenik added this to the v0.2.0 milestone

Contributor

aklenik commented Sep 25, 2019

@russanto Can you join the Caliper call next week (Oct. 2, 3PM UTC+0)? Or even today, but I know it's really short notice :)
I'd like to discuss some things before actually writing up a PR review.

aklenik requested changes

View reviewed changes

Contributor

aklenik left a comment

General remarks:

Please squash your commits into a single commit after applying the requested changes.
See other remarks among the code remarks.

packages/caliper-ethereum/lib/ethereum.js Outdated Show resolved Hide resolved

packages/caliper-ethereum/package.json Outdated

+                ],
+                "dependencies": {
+                  "caliper-core" : "0.1.0",
+                  "web3": "^1.2.0"

Contributor

aklenik Sep 26, 2019

Web3 should be put under devDeps. It will be installed during binding, similarly to the other adapters. So you need to modify the following file also:

caliper/packages/caliper-cli/lib/bind/config.yaml

Line 29 in 6ddd600

sut:

sut:
  ethereum:
    1.0.0:
      packages: [ 'web3@1.0.0' ]

There could be more 1.X.0 entries of course.

Contributor Author

russanto Oct 2, 2019 •

edited

Loading

I added the latest version, I don't know if it can be useful to add all the 1.X ones

Member

ryjones Oct 3, 2019

@russanto this is awesome! Please do a squash commit so there is only one commit being merged.

aklenik added PR/change requested PR/merge conflict and removed PR: work in progress labels

russanto requested review from feihujiang, jiangyaoguo and liam-grace as code owners

October 2, 2019 16:53

russanto requested a review from panyu4 as a code owner

October 2, 2019 16:53

russanto force-pushed the ethereum-adapter branch 2 times, most recently from 90dd29c to f9bfc87 Compare

October 2, 2019 17:02

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/.editorconfig

		@@ -0,0 +1,26 @@
		#

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/.eslintignore

		@@ -0,0 +1,16 @@
		#
		# Licensed under the Apache License, Version 2.0 (the "License");

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/index.js

		@@ -0,0 +1,18 @@
		/*

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/lib/ethereum.js

		@@ -0,0 +1,213 @@
		/**

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/lib/ethereumClientFactory.js

		@@ -0,0 +1,56 @@
		/**

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-samples/network/ethereum/1node/docker-compose.yml

		@@ -0,0 +1,25 @@
		#

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-samples/network/ethereum/1node/Dockerfile

		@@ -0,0 +1,17 @@
		# Licensed under the Apache License, Version 2.0 (the "License");

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-samples/network/ethereum/1node-clique/Dockerfile

		@@ -0,0 +1,17 @@
		# Licensed under the Apache License, Version 2.0 (the "License");

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-samples/benchmark/simple/config-ethereum.yaml Outdated

		@@ -0,0 +1,53 @@
		#

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

packages/caliper-ethereum/lib/ethereumClientWorker.js

		@@ -0,0 +1,56 @@
		/**

Member

ryjones Oct 3, 2019

consider adding the SPDX header for Apache 2

ryjones reviewed

View reviewed changes

Member

ryjones left a comment

On new files with license headers, please consider adding the SPDX header as well.

https://spdx.org/licenses/Apache-2.0.html

https://spdx.org/ids-how

Contributor

aklenik commented Oct 3, 2019

On new files with license headers, please consider adding the SPDX header as well.

https://spdx.org/licenses/Apache-2.0.html

https://spdx.org/ids-how

@ryjones I think we'll need to add this to the automatic license check format on the repo-level. Currently, the CI only enforces the above header formats.

Member

ryjones commented Oct 3, 2019

@ryjones I think we'll need to add this to the automatic license check format on the repo-level. Currently, the CI only enforces the above header formats.

Understood! Don't block this PR based on my comments.

aklenik requested changes

View reviewed changes

Contributor

aklenik left a comment

Just some minor modifications needed (aside from querySmartContract, but that's also easy).

packages/caliper-cli/lib/bind/config.yaml Show resolved Hide resolved

packages/caliper-samples/benchmark/simple/config-ethereum.yaml Outdated Show resolved Hide resolved

packages/caliper-tests-integration/scripts/run-tests.sh Outdated Show resolved Hide resolved

packages/caliper-ethereum/lib/ethereum.js Outdated Show resolved Hide resolved

packages/caliper-ethereum/lib/ethereum.js Show resolved Hide resolved

aklenik removed the PR/merge conflict label

aklenik requested changes

View reviewed changes

Contributor

aklenik left a comment

There are two linting errors (missing semicolons), should be an easy fix

lerna ERR! execute /home/travis/build/hyperledger/caliper/packages/caliper-ethereum/lib/ethereum.js
lerna ERR! execute    70:79  error  Missing semicolon  semi
lerna ERR! execute   202:10  error  Missing semicolon  semi

Contributor

aklenik commented Oct 8, 2019 •

edited

Loading

@russanto After buliding the caliper-ethereum-clique image, the test flow stopped with the following error:

2019.10.08-11:16:24.031 error [caliper] [caliper-flow]    	Error: Error: Invalid JSON RPC response: ""

This is originating from your init function. The reason is that the clique container stopped. Docker logs:

Fatal: Account unlock with HTTP access is forbidden!
INFO [10-08|11:29:32.246] HTTP endpoint opened                     url=http://0.0.0.0:8545      cors= vhosts=*
Fatal: Account unlock with HTTP access is forbidden!

UPDATE: Adding this to the command of the docker-compose file solves the problem: --allow-insecure-unlock

russanto force-pushed the ethereum-adapter branch 3 times, most recently from 261a396 to 19d8724 Compare

October 8, 2019 14:32


          Add Ethereum adapter

c73bf0f

Signed-off-by: Antonio Russo <rjproj@gmail.com>

russanto force-pushed the ethereum-adapter branch from 19d8724 to c73bf0f Compare

October 8, 2019 14:35

aklenik approved these changes

View reviewed changes

aklenik removed PR/change requested PR/under review labels

aklenik merged commit 01f053f into hyperledger:master

russanto deleted the ethereum-adapter branch

October 10, 2019 22:14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

ryjones ryjones left review comments

aklenik aklenik approved these changes

feihujiang Awaiting requested review from feihujiang

jiangyaoguo Awaiting requested review from jiangyaoguo

liam-grace Awaiting requested review from liam-grace

nklincoln Awaiting requested review from nklincoln

panyu4 Awaiting requested review from panyu4

Labels

None yet