Skip to content
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

Manually calculate the package id #612

Merged
merged 4 commits into from
Apr 22, 2024
Merged

Manually calculate the package id #612

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be8b873
Manually calculate the package id
xiaor2 Apr 17, 2024
090d4b3
Merge branch 'hyperledger:main' into xiaor2
xiaor2 Apr 17, 2024
192a70a
Avoided adding the same chaincode package
xiaor2 Apr 22, 2024
b8d6c0e
Added the error message return
xiaor2 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 43 additions & 16 deletions src/api-engine/api/routes/chaincode/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
)
from api.common import ok, err
import threading
import hashlib


class ChainCodeViewSet(viewsets.ViewSet):
Expand Down Expand Up @@ -61,6 +62,7 @@ def _read_cc_pkg(self, pk, filename, ccpackage_path):
os.remove(meta_path)

chaincode = ChainCode.objects.get(id=pk)
chaincode.package_id = chaincode.package_id
chaincode.language = language
chaincode.label = label
chaincode.save()
Expand Down Expand Up @@ -133,23 +135,48 @@ def package(self, request):
for chunk in file.chunks():
f.write(chunk)

with tarfile.open(temp_cc_path, "r:gz") as tar:
# Locate the metadata file
metadata_file = None
for member in tar.getmembers():
if member.name.endswith("metadata.json"):
metadata_file = member
break

if metadata_file is not None:
# Extract the metadata file
metadata_content = tar.extractfile(metadata_file).read().decode("utf-8")
metadata = json.loads(metadata_content)
label = metadata.get("label")
else:
return Response(
err("Metadata file not found in the chaincode package."), status=status.HTTP_400_BAD_REQUEST
)

org = request.user.organization
qs = Node.objects.filter(type="peer", organization=org)
if not qs.exists():
return Response(
err("at least 1 peer node is required for the chaincode package upload."),
status=status.HTTP_400_BAD_REQUEST
)
peer_node = qs.first()
envs = init_env_vars(peer_node, org)
peer_channel_cli = PeerChainCode("v2.2.0", **envs)
return_code, content = peer_channel_cli.lifecycle_calculatepackageid(temp_cc_path)
if (return_code != 0):
return Response(
err("calculate packageid failed for {}.".format(content)),
status=status.HTTP_400_BAD_REQUEST
)
packageid = content.strip()
# qs = Node.objects.filter(type="peer", organization=org)
# if not qs.exists():
# return Response(
# err("at least 1 peer node is required for the chaincode package upload."),
# status=status.HTTP_400_BAD_REQUEST
# )
# peer_node = qs.first()
# envs = init_env_vars(peer_node, org)
# peer_channel_cli = PeerChainCode("v2.2.0", **envs)
# return_code, content = peer_channel_cli.lifecycle_calculatepackageid(temp_cc_path)
# if (return_code != 0):
# return Response(
# err("calculate packageid failed for {}.".format(content)),
# status=status.HTTP_400_BAD_REQUEST
# )
# packageid = content.strip()

# manually calculate the package id
sha256_hash = hashlib.sha256()
with open(temp_cc_path, "rb") as f:
for byte_block in iter(lambda: f.read(4096), b""):
sha256_hash.update(byte_block)
packageid = label + ":" + sha256_hash.hexdigest()

# check if packageid exists
cc = ChainCode.objects.filter(package_id=packageid)
Expand Down
Loading