Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Feature/bdls2.3 #9

Open
wants to merge 148 commits into
base: bdls-release-2.3
Choose a base branch
from
Open

Feature/bdls2.3 #9

wants to merge 148 commits into from

Conversation

ahmed82
Copy link
Member

@ahmed82 ahmed82 commented Jan 27, 2023

Type of change

  • Bug fix
  • New feature
  • Improvement (improvement to code, performance, etc)
  • Test update
  • Documentation update

Description

Additional details

Related issues

denyeart and others added 30 commits November 18, 2020 14:19
Update docs and download script for v2.3.0.

Signed-off-by: David Enyeart <[email protected]>
Signed-off-by: Nikhil Gupta <[email protected]>
(cherry picked from commit f1294ed)
 go chaincode now sets the Asset owner as client identity certificate string (instead of base64 str)
 ref hyperledger/fabric-samples#374
 better PDC description

Signed-off-by: Sijo Cherian <[email protected]>
(cherry picked from commit 3406c35)
Signed-off-by: NIKHIL E GUPTA <[email protected]>
(cherry picked from commit 02b63bd)
Signed-off-by: Lazar955 <[email protected]>
(cherry picked from commit 109bcb1)
Change-Id: If775789bd29f767aab3647a49ee019c5b7c2a6b6
Signed-off-by: joe-alewine <[email protected]>
(cherry picked from commit 5446f10)
Document that chaincode must marshal and unmarshal
JSON deterministically in order for endorsements and
client responses to match across peers.

This commit also makes various other updates to the CouchDB
documentation topic.

Signed-off-by: David Enyeart <[email protected]>
(cherry picked from commit db22a37)
Change-Id: I9a25e7745f38ec442024d815717e03a79ab428ec
Signed-off-by: joe-alewine <[email protected]>
(cherry picked from commit 25457a3)
Signed-off-by: Julian Castrence <[email protected]>
(cherry picked from commit 24459b0)
Change-Id: I1c7f546ec4d2ba2cbd1470f1886c7c554f38c001
Signed-off-by: joe-alewine <[email protected]>
(cherry picked from commit 26c2baa)
… missing (hyperledger#2183) (hyperledger#2200)

Check if txid is available before retrieving private data from the transient store

Signed-off-by: Wenjian Qiao <[email protected]>
(cherry picked from commit 72d5cc8)

Co-authored-by: Wenjian Qiao <[email protected]>
Noticed this character while attempting to copy the commands and use
them as a reference.

Signed-off-by: Will Lahti <[email protected]>
(cherry picked from commit c31cfac)
Fabric 2.2 made gossip state transfer be disabled by default.

When a peer is a gossip follower, it does not pull blocks from the ordering service,
and relies on the leader peer of its organization to forward blocks directly or indirectly.

However, if a peer misses a block and the rest of the peers in its organization advance too much,
it will never catch up because its state transfer is disabled.

This commit makes the peer log a warning if it is lagging behind, and its configuration
might prevent it from obtaining blocks via state transfer and the orderer.

Change-Id: Ie7bc67cb13cb2d8e7ffab638a49e0365535865c2
Signed-off-by: Yacov Manevich <[email protected]>
(cherry picked from commit 5f61ff0)
The error check accidentally checks for a previous
error instead of the current

Signed-off-by: Brett Logan <[email protected]>
(cherry picked from commit 7da02d1)
Signed-off-by: Julian Castrence <[email protected]>
(cherry picked from commit b952638)
Signed-off-by: Will Lahti <[email protected]>
(cherry picked from commit 55d651e)

# Conflicts:
#	docs/source/raft_configuration.md
Signed-off-by: pama-ibm <[email protected]>
(cherry picked from commit eec9341)
The config block output from configtxlator is too large to pipe on Mac,
leading to "configtxlator: error: open /dev/stdout: permission denied, try --help".
Update the tutorial to split the command in two, using a
config_block.json for the configtxlator output instead.

FAB-17815 #done

Signed-off-by: Will Lahti <[email protected]>
(cherry picked from commit 36eec0d)
Prefer running  `configtxlator` and `jq` on local machine
instead of using a CLI container using the `fabric-tools`
docker image.

FAB-18381

Signed-off-by: Will Lahti <[email protected]>
(cherry picked from commit a76ba08)
Signed-off-by: pama-ibm <[email protected]>
(cherry picked from commit bcc0b39)
Signed-off-by: pama-ibm <[email protected]>
(cherry picked from commit f4c3dfc)
With this change, you can now build
the tools container with pkcs11.

Signed-off-by: Gari Singh <[email protected]>
(cherry picked from commit a6017ec)

Co-authored-by: Gari Singh <[email protected]>
…erledger#2281)

Change-Id: I972391863241bbcfcc0e443e874c54fc77934a92
Signed-off-by: joe-alewine <[email protected]>
Signed-off-by: Brett Logan <[email protected]>

Co-authored-by: joealewine <[email protected]>
denyeart and others added 29 commits August 30, 2021 20:47
Run "go mod tidy" to clean up Go modules.

Signed-off-by: David Enyeart <[email protected]>
Go 1.16 changed the CertPool implementation to employ functions to
lazily acquire certificates. This change effectively breaks
`reflect.DeepEqual` used by our test assertions.

This commit changes the assertions compare certificate subjects instead
of the entire pool. While not the same, it's a close approximation.

See https://go-review.googlesource.com/c/go/+/229917

Signed-off-by: Matthew Sykes <[email protected]>

Co-authored-by: Matthew Sykes <[email protected]>
Backport of hyperledger#2336 for Go 1.16 tests.

Signed-off-by: David Enyeart <[email protected]>
The error messages for commands executed outside of a module were
changed in Go 1.16.2. This change loosens our assertion to handle the
old and new messages.

Signed-off-by: Matthew Sykes <[email protected]>
Signed-off-by: David Enyeart <[email protected]>
* Clean up Go modules

Run "go mod tidy" to clean up Go modules.

Signed-off-by: David Enyeart <[email protected]>

* Update Go to v1.16.7 and alpine to 3.14

Update Go to v1.16.7.
Go module support is assumed starting in Go v1.16.
Therefore, for chaincodes without go modules (such as in the integration tests),
need to explicitly set GO111MODULE to off otherwise chaincode will not compile.
See Go v1.16 release notes for more details: https://golang.org/doc/go1.16#go-command

As part of troubleshooting the Go upgrade, also added debug for the chaincode
compile command.

Also update alpine to 3.14.

Signed-off-by: David Enyeart <[email protected]>
Signed-off-by: realnimish <[email protected]>
(cherry picked from commit b563b08)
Update docs and release notes for v2.3.3.

Signed-off-by: David Enyeart <[email protected]>
Update docs to indicate that GitHub issues are now
used instead of Jira issues.

Signed-off-by: David Enyeart <[email protected]>
…of chains. This can happen when in Raft protocol a channel was created, but not marked as done in WAL logs, so at orderer startup it will try to rerun creation tx and panic because the channel already exists.

Signed-off-by: Vladyslav Kopaihorodskyi <[email protected]>
(cherry picked from commit aa8d06b)
…yperledger#2940)

Testcase expects to fail SubmitRequest after
node server restarts, but if restart not closed
streams before sendSubmit submitted; test fails.

It is random failure. Introduced a delay between
restart and submitRequest.

Signed-off-by: Parameswaran Selvam <[email protected]>
(cherry picked from commit 70ff46a)

Co-authored-by: Parameswaran Selvam <[email protected]>
Signed-off-by: D <[email protected]>
(cherry picked from commit c62034e)
Signed-off-by: bellaj <[email protected]>
(cherry picked from commit 9743256)
Signed-off-by: bellaj <[email protected]>
(cherry picked from commit 65321c5)
Signed-off-by: bellaj <[email protected]>
(cherry picked from commit 123b75c)
Co-authored-by: Dave Enyeart <[email protected]>
Signed-off-by: bellaj <[email protected]>
(cherry picked from commit f415aa8)
* - Fix failure to generate all possible combinations

Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1.
For example, when there are 6 organizations and the endorsement policy is set
to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN()
in original code are as below.
	[0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5],
	[0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5],
	[0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5],
	[1 2 4 5], [1 3 4 5], [2 3 4 5]

Obviously, the function fails to find out all the possible combinations. Some of
 the combinations are overrided by child's call. This bug would trigger below
error sometimes when the alive peers are not within the above combinations.

	[discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for
	chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the
	endorsement policy

To fix it, the last line of choose() should be changed to pass a copy of
"currentSubGroup" to the recursive call instead, i.e.

	choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups)

After applying the fix, the resulting combinations generated should be corrected
as below.
	[0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4],
	[0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5],
	[0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5],
	[1 2 4 5], [1 3 4 5], [2 3 4 5]

Signed-off-by: Tim <[email protected]>

* - Fix failure to generate all possible combinations

Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1.
For example, when there are 6 organizations and the endorsement policy is set
to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN()
in original code are as below.
	[0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5],
	[0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5],
	[0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5],
	[1 2 4 5], [1 3 4 5], [2 3 4 5]

Obviously, the function fails to find out all the possible combinations. Some of
 the combinations are overrided by child's call. This bug would trigger below
error sometimes when the alive peers are not within the above combinations.

	[discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for
	chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the
	endorsement policy

To fix it, the last line of choose() should be changed to pass a copy of
"currentSubGroup" to the recursive call instead, i.e.

	choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups)

After applying the fix, the resulting combinations generated should be corrected
as below.
	[0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4],
	[0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5],
	[0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5],
	[1 2 4 5], [1 3 4 5], [2 3 4 5]

Signed-off-by: Tim <[email protected]>

* - Update choose_test.go

Signed-off-by: Tim <[email protected]>

* - Fix build error

Signed-off-by: Tim <[email protected]>
(cherry picked from commit 21a17ee)
…edger#3249) (hyperledger#3253)

Signed-off-by: Ana Maria Franco <[email protected]>
(cherry picked from commit 0e6c8d4)

Co-authored-by: Ana Maria Franco <[email protected]>
Add additional TLS troubleshooting information to the TLS doc.
Also remove outdated information from Fabric v1.1.

Signed-off-by: David Enyeart <[email protected]>
(cherry picked from commit 0b2e6b5)
* certs mgmt guide

Signed-off-by: Josh Horton <[email protected]>

* PR review comments and dir trees

Signed-off-by: Josh Horton <[email protected]>

* trees and edits

Signed-off-by: Josh Horton <[email protected]>

* tree tweaks

Signed-off-by: Josh Horton <[email protected]>

* tree tweaks 2

Signed-off-by: Josh Horton <[email protected]>

* trees again

Signed-off-by: Josh Horton <[email protected]>

* trees no code

Signed-off-by: Josh Horton <[email protected]>

* try pre

Signed-off-by: Josh Horton <[email protected]>

* try pre 2

Signed-off-by: Josh Horton <[email protected]>

* try pre 3

Signed-off-by: Josh Horton <[email protected]>

* update copyright date

Signed-off-by: Josh Horton <[email protected]>

* review from joshk

Signed-off-by: Josh Horton <[email protected]>

* review from davee

Signed-off-by: Josh Horton <[email protected]>

* CA links need absolute url

Signed-off-by: Josh Horton <[email protected]>

* most of the latest from dave e

Signed-off-by: Josh Horton <[email protected]>

* final 3 updates per PR review

Signed-off-by: Josh Horton <[email protected]>

* davee latest comments

Signed-off-by: Josh Horton <[email protected]>

* final 2 comments on admin certs signing

Signed-off-by: Josh Horton <[email protected]>

* a few missing comments

Signed-off-by: Josh Horton <[email protected]>
(cherry picked from commit 85c7a5e)
Uses Go 1.16 on release-2.3.

Signed-off-by: Julian Castrence <[email protected]>
Signed-off-by: Matthew B White <[email protected]>
(cherry picked from commit a397739)
Signed-off-by: Julian Castrence <[email protected]>
(cherry picked from commit 74b1f15)
Signed-off-by: Julian Castrence <[email protected]>
(cherry picked from commit 399e6fe)
With the Github Actions CI and release workflows in place,
we can now remove the Azure Pipelines artifacts.

Signed-off-by: David Enyeart <[email protected]>
If commit hash is not specified, the release action will tag the latest commit on main branch.
This change allows for a commit hash to be specified, e.g. using the release commit from a release branch.

Signed-off-by: David Enyeart <[email protected]>
(cherry picked from commit 0fea950)
Make orderer Dockerfile consistent with peer Dockerfile
with respect to /etc/nsswitch.conf.

The orderer Dockerfile stopped working with alpine 3.16.3 (November 12 release),
since etc/nsswitch.conf was added to the alpine image.

The new alpine etc/nsswitch.conf file content is the same as
what Fabric has been adding to the image, so we'll keep
the Fabric file content in case the Dockerfile is used on other platforms.

Relevant Alpine 3.16.3 commit:
https://git.alpinelinux.org/aports/commit/?h=v3.16.3&id=348653a9ba0701e8e968b3344e72313a9ef334e4

Signed-off-by: David Enyeart <[email protected]>

Signed-off-by: David Enyeart <[email protected]>
(cherry picked from commit 0b9a5c6)
Copy link
Member Author

@ahmed82 ahmed82 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include the BDLS lib

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.