epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-23 10:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
363 commits 20 branches 63 tags 635 MiB
Commit graph

363 commits

This branch
This branch
All branches
Author SHA1 Message Date
zeoio
83dbfcb2dc distribute-deploy: delete binaries file 2020-04-30 17:37:04 +08:00
何跃江
10e0a21eed distributed-deploy: update the english logs 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
何跃江
96327c7723 distributed-deploy: update the english logs 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
9ff3d3bdc2 distributed-deploy: delete start.sh file 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
11f808769f distributed-deploy: change the chinese logs to english logs 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
59bed6da40 distributed-deploy: fix README link image name error 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
3a73787abe distributed-deploy: update README_CN/EN, add images for them 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
fa0b04aaeb distributed-depoly: add copyright to codes, configs file 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
df18ef60d8 distributed-deploy: add copyright to codes and config files 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
21c70e084a distributed-deploy: delete temp files 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:42 +08:00
zeoio
0222eae216 distributed-deploy: add LICENSE, AUTHORS, etc 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:39 +08:00
zeoio
958749e76c distributed-deploy: add distributed deploy tools for prod env 
Signed-off-by: zeoio <kinsleer@outlook.com>
 2020-04-29 10:01:39 +08:00
Arnaud J Le Hors
1343ccb628
FAB-17419 Fix off_chain_data sample error (#146) 
Before fix:

$ node blockEventListener.js
fabric-samples/off_chain_data/blockProcessing.js:53
              continue();
                      ^

SyntaxError: Unexpected token '('
    at Module._compile (internal/modules/cjs/loader.js:895:18)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:995:10)
    at Module.load (internal/modules/cjs/loader.js:815:32)
    at Function.Module._load (internal/modules/cjs/loader.js:727:14)
    at Module.require (internal/modules/cjs/loader.js:852:19)
    at require (internal/modules/cjs/helpers.js:74:18)
    at Object.<anonymous> (fabric-samples/off_chain_data/blockEventListener.js:48:25)
    at Module._compile (internal/modules/cjs/loader.js:959:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:995:10)
    at Module.load (internal/modules/cjs/loader.js:815:32)

After fix:

$ node blockEventListener.js
Wallet path: fabric-samples/off_chain_data/wallet
2020-03-31T06:14:26.643Z - error: [Channel.js]: Channel:mychannel received discovery error:failed constructing descriptor for chaincodes:<name:"_lifecycle" >
Listening for block events, nextblock: 0
Added block 0 to ProcessingMap
Added block 1 to ProcessingMap
Added block 2 to ProcessingMap
------------------------------------------------
Block Number: 0
------------------------------------------------
Block Number: 1
------------------------------------------------
Block Number: 2

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2020-03-31 20:49:21 +02:00
Brett Logan
0e3a7a7a30
Change Fabric Binary Pull Logic (#147) 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-03-31 16:02:06 +02:00
Arnaud J Le Hors
337f82c513 Fixes Fabcar Java chaincode build dependency (#107) 
This change updates build.gradle to fabric 1.4.4.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2020-01-24 14:13:33 +00:00
Brett Logan
2c1d2ad5b9 [FABCI-482] Update Nexus URL's to Artifactory (#93) 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-01-20 15:30:21 +00:00
Brett Logan
562791dd2b Add support for versioning NodeJS (#105) 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-01-17 21:38:31 +01:00
Brett Logan
d015ca1f82 Update fabric version (#94) 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-01-16 22:25:40 +01:00
Arnaud J Le Hors
0d7c7a1643
Merge pull request #74 from danipisca07/release-1.4 
Fix port numbers for peers in high-throughput.
The test build failed for some unrelated reason that needs to be investigated independently.
 2019-11-30 07:46:32 +01:00
Arnaud J Le Hors
ba63e6533d
Merge pull request #64 from LF-Certification/release-1.4 
Added stop script to remove `fabcar` chaincode containers and images.
I note that the test build failed but it clearly has nothing to do with this change. Fabcar java doesn't seem to be working. This will need to be addressed independently.
 2019-11-29 21:32:19 +01:00
Daniele Piscaglia
cd5b68d040 Fix port numbers for peers in high-throughput 
Signed-off-by: danipisca07 <danielepiscaglia@libero.it>
 2019-11-15 12:58:01 +01:00
Ry Jones
bc72f3e3a6 Remove Stalebot 
Signed-off-by: Ry Jones <ry@linux.com>
 2019-11-04 22:43:20 -05:00
Ry Jones
ce0d06f599
Merge branch 'release-1.4' into release-1.4 2019-10-28 01:01:47 -07:00
Arnaud J Le Hors
e4f147f396
Merge pull request #71 from hyperledger/samples_stalebot_1.4 
Cherrypick stalebot settings from master
 2019-10-27 17:21:52 +01:00
Ry Jones
99657d19c7
Merge branch 'release-1.4' into release-1.4 2019-10-27 09:04:54 -07:00
Brett Logan
797b991b4f Change stalebot settings 
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
 2019-10-26 11:52:34 -04:00
Simon Stone
750474d458 [FAB-16850] Set up CI with Azure Pipelines 
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3821a329ec5eb439ce0f27cfbc71b28e6b0b8a09
 2019-10-17 12:48:04 +01:00
Simon Stone
b92ff73374 [FAB-16849] Various updates for Java version of FabCar 
- Update .gitignore
- Use builds on Sonatype, not Nexus
- Enable new discovery as localhost flag

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ia0904cedf953b5ecbf6aaf859245a9bb431d3f76
(cherry picked from commit 81aabf4c0b)
 2019-10-17 11:01:22 +00:00
Matthew B. White
9915995df7 [FAB-16844] Modify pattern for cc images 
- remove images that match dev-*
- correcting a dependency

Change-Id: I603dc822260be827ca36677e5c05aa5f196858ae
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
 2019-10-16 11:48:02 +01:00
Ry Jones
ca5bcb27ae [IN-68] Add default GitHub SECURITY policy 
this file must exist on the default branch

Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: Ie805816e929f4449689214c74964b71eac56e31d
(cherry picked from commit 7b65a25a86)
 2019-09-29 01:36:29 +00:00
Daniel Ruthardt
0fce873325 Added license header and "signed-off-by". 
Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>
 2019-09-26 20:57:57 +02:00
Daniel Ruthardt
877baa597c Added stop script to remove fabcar chaincode containers and images. 
Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>
 2019-09-26 20:57:57 +02:00
rthatcher
ecd08c0357 [FAB-16474] marbles02 chaincode error 
Signed-off-by: rthatcher <robert.thatcher@uk.ibm.com>
Change-Id: Ib8780cb2a4cbae8c5a55708682490b9c8230b519
 2019-09-24 14:04:44 +01:00
bjzhang03
7e8edb3189 [FAB-16619] Fix the policy warning 
This fixes #FAB-16619

Change-Id: I251d10bc9dc9baf4f7e7d20cc11a34703baffc52
Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
 2019-09-17 16:56:20 +08:00
bjzhang03
70ce148927 [FAB-16592] Add the etcdraft into the config 
This is fix #FAB-16592

Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
Change-Id: If246f455c65403de2edcdc58ff35cde04279950d
 2019-09-17 09:54:51 +08:00
vijaypunugubati
ddf013ba01 FAB-16608 Update base_version on ci.prop 
Update ci.prop file to bring 1.4.4-stables images from
nexus on verify and merge jobs.

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: I25a1ed222aae5bbf7fad79002b18ea59b19c0d89
 2019-09-16 09:31:51 -04:00
jaehyun
0b980ebda7 [FAB-16362] adding chaincode excution comments 
adding chaincode excution comments

Signed-off-by: jaehyun <jaehyun@lgcns.com>
Change-Id: I61ce32561f68fb8db8e0dc3f0d18b0564aaafb70
(cherry picked from commit 48082cfa95)
 2019-09-06 12:12:02 +00:00
Ry Jones
b4e097ff7c [FAB-16487] Update eslint 
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I69233df8716f0bc081b67c771fb7eeaac6fc9d52
(cherry picked from commit a6ce915106)
 2019-08-31 18:34:46 +00:00
Simon Stone
d7932fd420 Merge "[FAB-16402] Fabcar only needs two endorsements" into release-1.4 2019-08-27 08:19:35 +00:00
Varun Agarwal
f86ec95726 [FAB-16390] Added filter for invalid transactions 
Signed-off-by: Varun Agarwal <varunagarwal315@gmail.com>
Change-Id: Idb6c57e047bba9a176b312f86d05c2ee21aeb175
 2019-08-25 14:19:02 +05:30
David Enyeart
78fe781a67 [FAB-16402] Fabcar only needs two endorsements 
Fabcar test currently invokes on 4 peers. Only need endorsement on 2 peers.
This will help the CLI invokes to finish sooner, and eliminate some CI failures.

Change-Id: Iec6bb7c9032ea6344c1d1917ffa3188c3b05c1e0
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2019-08-24 09:13:57 -04:00
David Enyeart
a963990313 Merge "[FAB-16344] Upgrade scripts for v1.4.3" into release-1.4 2019-08-23 22:57:21 +00:00
bharadwajambati1
a4460a9947 [FAB-16344] Upgrade scripts for v1.4.3 
Signed-off-by: bharadwajambati1 <bharadwaj.ambati1@ibm.com>
Change-Id: Icd4eb98e7953288cc51577a7952b5680997934c7
 2019-08-23 11:21:51 -04:00
vijaypunugubati
549e9fdd09 Remove AnsiColor wrapper in Fabric Samples 
FABCI-402 #done

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: Ie4ee8c1eecc63d959b2a8d188d737c5b03face67
 2019-08-22 11:17:14 -04:00
David Enyeart
fc5975b285 [FAB-16322] fabric-samples to V1_4_3 channel capability 
Update fabric-samples to V1_4_3 channel capability to
enable the new NodeOU support.

Change-Id: I63b2a70e612c2fd72c58272543f68b1b8687bdbb
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2019-08-15 23:47:43 -04:00
NIKHIL E GUPTA
3d364ed082 [FAB-16296] Fixes for interest rate sample 
backporting fixes from master to v1.4 for
interest rate sample

Change-Id: If7648c91c53dff737103de178bd8a09556765951
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
 2019-08-13 10:17:40 -04:00
Arnaud J Le Hors
e80379a06f Merge "[FAB-14813] Channel event sample in fabric-samples" into release-1.4 2019-08-08 00:04:55 +00:00
Arnaud J Le Hors
da7f3cd0cc Merge "[FAB-16036] Fix a error of get query in testAPI.sh" into release-1.4 2019-08-07 23:18:44 +00:00
Chris Elder
1efd213110 [FAB-14813] Channel event sample in fabric-samples 
Add a channel event handler sample based on block events.

Scope:

create a block event handler
write events received to the console
write events received to a log file
write events to an off chain couchdb database
demonstrate a basic map reduce view for aggregation

Change-Id: I5420ddc7070dbee785218ce5960f7604ac799f90
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
 2019-08-06 21:43:26 +00:00
Simon Stone
d26e27e0d1 Merge "[FAB-16147] Compilation and Lint Checks" into release-1.4 2019-08-02 09:31:08 +00:00