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

1108 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Taylor
19e28d817b Fix retry 
Adding multiple contracts had broken the retry loop

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:57 +00:00
James Taylor
3667dd9322 Add Jira link to readme 
Also adds new transactions endpoint example

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
432da5defd Add get transaction endpoint 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
60aedf1b82 Refactor transaction logic 
Remove duplication and handle errors from the asset transfer smart contract

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
273fc2833a Add REST Client demo file 
Add demo file for use with the REST Client for Visual Studio Code

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
400367e8a6 Add get all assets endpoint 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
d810128fcd Add patch endpoint 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
8250359db6 Add delete and put endpoints 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
8ebca62b40 Fix lint errors 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
f06f1eed4b Update logging 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
d9e0de606b Update readme 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
3b50404763 Initial create asset logic 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
324f1c8683 Specify query handler strategy 
Avoid load on a single peer by specifying the PREFER_MSPID_SCOPE_ROUND_ROBIN
strategy

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
9c98450946 Initial asset route 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
1f8bc889cf Enable alwaysStrict compile option 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
063b21dd3f Initial REST API skeleton 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:56 +00:00
James Taylor
bbf7096e44 Initial commit 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:14:39 +00:00
Mark S. Lewis
72559dfbb5
More Gateway asset-transfer-basic tweaks to support docs (#556) 
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
 2021-12-10 08:51:21 +00:00
sapthasurendran
9df7e9f86d
Configtxlator script changes (#552) 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-09 11:37:38 +00:00
Baran Kılıç
06d67ecbfa
Add acknowledgement text for erc1155 chaincode (#554) 
Signed-off-by: Baran Kılıç <baran.kilic@boun.edu.tr>
 2021-12-09 10:21:16 +00:00
Mark S. Lewis
f151039f8a
Updates to asset-transfer-basic Gateway sample to align with docs (#553) 
Also install goimports globally to run the linting check rather than installing to each gomodule, which was causing dependency conflicts.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
 2021-12-09 10:20:52 +00:00
sapthasurendran
e963ddc726
lint Fix (#555) 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-09 09:44:25 +00:00
David Faulstich Diniz Reis
7fd6edb662
Query assets with pagination functions of marbles02 and asset_transfer_ledger_chaincode chaincodes without ResponseMetadata fetchedRecordsCount and bookmark (#547) 
Signed-off-by: David Faulstich Diniz Reis <davidfdr@gmail.com>
 2021-11-25 15:51:51 +00:00
fraVlaca
ce66638035
Extend test network to support prometheus/grafana performances framework (#542) 
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
 2021-11-24 16:04:42 +00:00
Matthew B White
a97e8d1267
Get label for chaincode from metadata.json (#509) 
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-11-22 08:25:38 -05:00
sapthasurendran
3d17cf066d
Updated fabric-gateway changes and added node14 dependency (#539) 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-11-22 08:55:14 +00:00
Dave Enyeart
f898a3768d
Update test-network-k8s readme with High Availability doc link (#540) 
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2021-11-22 08:54:39 +00:00
Dave Enyeart
22c54b4690
Fix test network nano peer4 id (#541) 
Fix CORE_PEER_ID for peer4.
This fix ensures that peer3 and peer4 don't share the
same chaincode container.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2021-11-22 08:54:14 +00:00
jkneubuh
ab19b8e01d
Address Issue #511 with docs and better error handling (#533) 
* Address Issue #511 with docs and better error handling

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* Set the TEST_NETWORK_FABRIC_VERSION in documentation for local development.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
 2021-11-19 16:09:58 +00:00
Matthew B White
d19a7e4b02
Setup basic HA features for the Peers (#532) 
- Add a new label to each peer to mark which org it is in
- Create new service per org, that matches this label - so the service can pick from one of multiple pods
- Update the kubeproxy to give more choice of ha stratergies
- Update the application configmaps and samples to refer to this new service rather than specific peers

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-11-19 16:08:26 +00:00
denyeart
271dfbb9bc
Nominate Josh Kneubuhl as fabric-samples maintainer (#536) 
Josh has been helping to update samples for the Kubernetes age.
He has contributed the test-network-k8s sample and has been active in
managing fabric-samples issues. Let's welcome Josh
as a fabric-samples maintainer!

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2021-11-15 08:36:43 +00:00
James Taylor
60d5d3e218
Update application-gateway-typescript (#531) 
The fabric-gateway node module has been renamed to @hyperledger/fabric-gateway

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-11-11 09:35:50 +00:00
denyeart
4640ab2e69
Retire dormant maintainers (#535) 
Several fabric-samples maintainers have moved on to other projects.
See maintainer policies at
https://hyperledger-fabric.readthedocs.io/en/latest/CONTRIBUTING.html#becoming-a-maintainer

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2021-11-10 21:15:21 +01:00
James Taylor
d2eef4786d
Update node version in CI (#534) 
Several Fabric projects have updated their supported node versions and 16.x is the active LTS version

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-11-10 17:17:18 +00:00
jkneubuh
8183da6666
Add an option to stage docker images locally to KIND (#528) 
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
 2021-11-10 09:56:57 +00:00
Tatsuya Sato
8c1c36ae09 Fix type error when using the latest sort-keys-recursive 
The latest version (2.1.2) of sort-keys-recursive adds TypeScript
typing, which includes export default function.
This change has caused the TS2349 type error.

This patch modifies the import form in assetTransfer.ts to fix the error.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
 2021-11-05 11:47:55 -04:00
Sam Yuan
0a1efc45cd
nit fixs (#519) 
1. busybox latest image tag
2. pull images with more images
3. load images to kind cluster at local

Signed-off-by: Sam Yuan <yy19902439@126.com>
 2021-11-02 15:43:31 +00:00
Matthew B White
6627cd6d65 review cmts 
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-11-01 16:15:30 -04:00
Matthew B White
337584045d Updated logging 
- updated the logging for the application command; wasn't very good
- added some information to the help option. the current settings
  useful if you're not sure what you've set

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-11-01 16:15:30 -04:00
Matthew B White
cc8123bdc5 Remove temporary buildfiles 
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-11-01 16:12:58 -04:00
jkneubuh
1b1ef046c1
Allow overrides of the docker registry for fabric images (#518) 
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
 2021-10-27 16:24:26 +01:00
Justin Yang
d47b2c286a
test-network: Make the regexp of checking version more strict (#515) 
Signed-off-by: Justin Yang <justin.yang@themedium.io>
 2021-10-26 11:24:15 +01:00
denyeart
3ba21b4f11
Fix function comment in asset-transfer-ledger-queries (#502) 
Fix typo in function comment.

Thanks to RobertBetschinger for finding this issue.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2021-10-26 11:22:42 +01:00
Sam Yuan
d81684fa0a
resolve for #512 (#513) 
Signed-off-by: Sam Yuan <yy19902439@126.com>
 2021-10-25 16:02:06 +01:00
sapthasurendran
5355fb1b39 Asset Transfer typescript app using fabric-gateway 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Added Fabric gateway and removed ca,tslint dependencies

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

eslint migration

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Added gitignore

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Transaction Flow Changes

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Removed serviceClient import,removed outer try catch from main

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

updated fabric-gateway version

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

transaction verification flow change

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Improved main function readability

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

extra comments

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Updated fabric-gateway to latest

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-10-15 09:51:16 -04:00
jkneubuh
576b2e74c9
Do not weep for the KIND prototype. The [new one](test-network-k8s) is much better. (#503) 
"Farewell! thou art too dear for my possessing,
And like enough thou knowst thy estimate.
The Charter of thy worth gives thee releasing;
My bonds in thee are all determinate.
For how do I hold thee but by thy granting,
And for that riches where is my deserving?
The cause of this fair gift in me is wanting,
And so my patent back again is swerving.
Thy self thou gav'st, thy own worth then not knowing,
Or me, to whom thou gav'st it, else mistaking,
So thy great gift, upon misprision growing,
Comes home again, on better judgement making.
   Thus have I had thee as a dream doth flatter:
   In sleep a king, but waking no such matter."

  - bill

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
 2021-10-07 14:08:22 -04:00
jkneubuh
30fb81a341
Run the fabric test network on Kubernetes (#498) 
* Run the fabric test network on Kubernetes

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* Re-LINT

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
 2021-10-06 15:50:39 +00:00
Matthew B White
3ba63b15d6
Update go.mod (#500) 
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2021-10-06 11:35:43 -04:00
nao
216d422f11
Fix: Cannot launch chaincode in nano bash in Linux (#468) 
CHAINCODEADDRESS is set to host.docker.internal which is
only available in MAC and Windows environments.
For that reason, it cannot launch chaincode on Linux.
This PR sets CHAINCODEADDRESS to 127.0.0.1 instead of
host.docker.internal.

Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
 2021-10-06 13:34:04 +01:00
sapthasurendran
56a1bf3e19
* Made consistent lint command (#495) 
* Removed global install of lint modules
* Fixed Lint Issues

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added lint script forapplication javascript

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

updated lint command  for chaincode javascript

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

updated lint script

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

remove installing dependencies

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added lint script to js projects

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added more lint scripts

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added more lint scripts

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added missing npm lint command

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added missing eslint npm module

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Fix missing npm lint command

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added missing eslint npm module to auction-simple javascctipt app

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added eslint npm module

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added eslint dependency

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added eslint dependency

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

added eslint dependency

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Single command for ts js lint

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Fix or condition in lint.sh

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-10-06 13:33:29 +01:00