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

75 commits

Author SHA1 Message Date
dependabot[bot]
a231e12caa
Bump json5 in /asset-transfer-basic/rest-api-typescript (#898) 
Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-24 09:34:28 -05:00
dependabot[bot]
7c46fdb087
Bump cookiejar in /asset-transfer-basic/rest-api-typescript (#916) 
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.2 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-24 08:47:59 -05:00
dependabot[bot]
a96efaebde
Bump qs and express in /asset-transfer-basic/rest-api-typescript (#880) 
Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.10.2 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.2...v6.11.0)

Updates `qs` from 6.10.1 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.2...v6.11.0)

Updates `express` from 4.17.1 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
- dependency-name: qs
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-14 09:23:23 +01:00
ali
05c06f4931
Fixed comment consistency problem (#844) 
* fixed comment consistency problem with erc20 chaincode

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>
Co-authored-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>
 2022-12-14 09:18:21 +01:00
dependabot[bot]
ea533d61b9
Bump passport in /asset-transfer-basic/rest-api-typescript (#828) 
Bumps [passport](https://github.com/jaredhanson/passport) from 0.4.1 to 0.6.0.
- [Release notes](https://github.com/jaredhanson/passport/releases)
- [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jaredhanson/passport/compare/v0.4.1...v0.6.0)

---
updated-dependencies:
- dependency-name: passport
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-09 17:48:14 +02:00
dependabot[bot]
3841318020
Bump moment-timezone in /asset-transfer-basic/rest-api-typescript (#821) 
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.33 to 0.5.37.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.33...0.5.37)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-09 17:47:05 +02:00
dependabot[bot]
a4245810a0
Bump jsrsasign in /asset-transfer-basic/rest-api-typescript (#795) 
Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.1 to 10.5.26.
- [Release notes](https://github.com/kjur/jsrsasign/releases)
- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.1...10.5.26)

---
updated-dependencies:
- dependency-name: jsrsasign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-09 14:33:44 +02:00
dependabot[bot]
f39e55e6f5
Bump moment in /asset-transfer-basic/rest-api-typescript (#794) 
Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-09 14:33:01 +02:00
dependabot[bot]
70c5aa7a28
Bump nconf in /asset-transfer-basic/rest-api-typescript (#722) 
Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.3 to 0.11.4.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.3...v0.11.4)

---
updated-dependencies:
- dependency-name: nconf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-26 09:46:10 +02:00
dependabot[bot]
05c1a1459f
Bump protobufjs in /asset-transfer-basic/rest-api-typescript (#755) 
Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.11.2 to 6.11.3.
- [Release notes](https://github.com/protobufjs/protobuf.js/releases)
- [Changelog](https://github.com/protobufjs/protobuf.js/blob/v6.11.3/CHANGELOG.md)
- [Commits](https://github.com/protobufjs/protobuf.js/compare/v6.11.2...v6.11.3)

---
updated-dependencies:
- dependency-name: protobufjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-21 18:13:38 -04:00
dependabot[bot]
c4886eda11
Bump moment in /asset-transfer-basic/rest-api-typescript (#711) 
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-04-18 09:40:29 -04:00
Tatsuya Sato
2df09e554d
Fix typos and broken links in docs (#712) 
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
 2022-04-18 09:36:49 -04:00
Matthew B White
99e7ae8536
CORS Enablement (#696) 
After feedback from the community, this PR adds CORS support in, but as an option
to enable.

Along with warnings that the default wildcard origin might not be applicable
in a production use case

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2022-04-01 09:35:57 -04:00
Matthew B White
9fa171f824
Update the REST Example (#689) 
1. The default chaincode use Capitalized JSON Names, whereas for new asset the REST validation didn't.. Adjusted
so it matches the chaincode

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2022-03-31 08:19:34 -04:00
Arnaud J Le Hors
75bdde97cd
Improve REST sample README (#647) 
Add that one needs to have the ledger initialized for the sample to
work.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2022-02-17 16:55:26 +00:00
dependabot[bot]
6739199db2
Bump follow-redirects in /asset-transfer-basic/rest-api-typescript (#643) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-02-15 15:36:23 +01:00
James Taylor
e7074ba941
Update REST sample with Redis password (#629) 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2022-02-04 14:27:40 +00:00
James Taylor
5edae7c444
Update samples to use published fabric-rest-sample (#626) 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2022-02-03 12:15:29 -05:00
James Taylor
980da6f8aa
Add REST sample to CI (#611) 
Build, test, and publish the REST server sample

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2022-02-02 16:34:08 +00:00
James Taylor
5d3cc66c25
Convert comments to tsdoc in REST sample (#606) 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2022-02-01 17:12:07 +01:00
dependabot[bot]
84c101fb8a
Bump follow-redirects in /asset-transfer-basic/rest-api-typescript (#584) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-19 14:36:23 +01:00
James Taylor
887e4a3578
Update REST sample readme (#575) 
Move signposts to sample source files from index.ts to the readme and reinforce the key aspects of the sample

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2022-01-12 10:38:44 +00:00
James Taylor
af2f6e005c Prepare REST sample for fabric-samples repository 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-15 14:25:09 +00:00
James Taylor
fce803af24 Add jobs spec tests 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-15 14:24:58 +00:00
James Taylor
dfe79f7fb4 Add comments to jobs.ts 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-15 14:24:34 +00:00
James Taylor
5447e3534d Add node, and npm version requirements 
Match the versions required in asset-transfer-basic/application-typescript

Also update to latest version of fabric-network

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
711f1f560b Use app.locals to store contracts and jobq 
“The app.locals object has properties that are local variables within the application.”

…which looks like a better option than app.get and app.set for app settings.

Also passes app to the initJobQueueWorker function for consistency.

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
66199000ca Fix lint errors 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
5d92abc52d Clarify retry logic 
Improve the separation between Fabric logic and the job queue implementation details

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
b0256a57b5 Signpost configuration details 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
5a32d803c9 Use user credentials 
Use User1 certificate and private key for org1 and org2 instead of Admin credentials

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
2d7da062d8 Update Dockerfile 
Fabric is on alpine 3.14 so update the sample to match

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
b1bc6663b8 Update readme 
Minor changes for Fabric 2.4 and the main branch of fabric-samples

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:24 +00:00
James Taylor
ad3fd7e832 Update retry logic 
Previously transactions were only retried after being successfully endorsed, and always with the same transaction ID

Transactions will now be added to a queue for processing and will also be retried if endorsement fails (with a different transaction id for invalid transactions)

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
0456a9e94c Move error related functions to errors.ts 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
fd269237d4 Add comments to fabric.ts 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
00a2dea50b Add block event listener config 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
f1a9fea77d Fix lint errors 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
e6738818e5 Update readmes 
Move usage instructions to the node sample directory and add overview/next steps
to top level readme

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:23 +00:00
sapthasurendran
9aec7ffd2a Clear Transaction when no contract found 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-14 14:31:23 +00:00
James Taylor
bf91df7ef3 Update transaction retry to use correct user 
Also improves test coverage

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:21 +00:00
James Taylor
82b1249f4e Improve Docker support 
- default command should be start, rather than start:dev in the docker image
- added a multistage build
- fixed node-gyp error
- removed dev dependencies
- added a start:dotenv script to support a .env file in production (may be useful for
k8s later)
- updated Readme and generateEnv script to simplify the setup
- updated external network in docker-compose.yaml to match the test network

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:21 +00:00
James Taylor
5d1adddd03 Refactor health routes in to separate file 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:21 +00:00
James Taylor
45683b2a1a Simplify fabric code 
Attempt to make fabric code easier to document

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:21 +00:00
James Taylor
862080773e Initial API tests 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:21 +00:00
sapthasurendran
6477333743 redis mock class 
code cleanup

created fabric.spec

redis testcases and additional checks

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-14 14:31:21 +00:00
James Taylor
f904adbf6f Add config spec tests 
Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:20 +00:00
James Taylor
e81a7a8b46 Update port number config 
Discovered that env-var will validate port numbers, which is nice

Signed-off-by: James Taylor <jamest@uk.ibm.com>
 2021-12-14 14:31:20 +00:00
sapthasurendran
5bea58e501 retry condition moved to startretryloop 
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-14 14:31:20 +00:00
sapthasurendran
b8509490ad retry count check 
build err fix

retry condition testcase

retryCount to maxRetryCount

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
 2021-12-14 14:31:18 +00:00