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

added last fixes for asset-transfer-secured-agreement (#772)

Browse source 
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
This commit is contained in:
fraVlaca 2022-06-21 18:10:06 +01:00 committed by GitHub
parent 8c3534baa3
commit d65bcf8ad1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asset-transfer-secured-agreement/application-javascript/app.js
View file

@ -301,7 +301,7 @@ async function main() {
try { try {
// Agree to a sell by Org1 // Agree to a sell by Org1
const asset_price = { const asset_price = {
asset_id: assetKey, asset_id: assetKey.toString(),
price: 110, price: 110,
trade_id: randomNumber.toString() trade_id: randomNumber.toString()
}; };
@ -402,7 +402,7 @@ async function main() {
// This will fail due to the sell price and the bid price // This will fail due to the sell price and the bid price
// are not the same // are not the same
const asset_price = { const asset_price = {
asset_id: assetKey, asset_id: assetKey.toString(),
price: 110, price: 110,
trade_id: randomNumber.toString() trade_id: randomNumber.toString()
}; };

26
asset-transfer-secured-agreement/chaincode-go/asset_transfer.go
View file

@ -65,7 +65,12 @@ func (s *SmartContract) CreateAsset(ctx contractapi.TransactionContextInterface,
// In this scenario, client is only authorized to read/write private data from its own peer. // In this scenario, client is only authorized to read/write private data from its own peer.
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get verified OrgID: %v", err) return "", err
}
err = verifyClientOrgMatchesPeerOrg(clientOrgID)
if err != nil {
return "", err
} }
asset := Asset{ asset := Asset{
@ -106,7 +111,12 @@ func (s *SmartContract) ChangePublicDescription(ctx contractapi.TransactionConte
// No need to check client org id matches peer org id, rely on the asset ownership check instead. // No need to check client org id matches peer org id, rely on the asset ownership check instead.
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get verified OrgID: %v", err) return err
}
err = verifyClientOrgMatchesPeerOrg(clientOrgID)
if err != nil {
return err
} }
asset, err := s.ReadAsset(ctx, assetID) asset, err := s.ReadAsset(ctx, assetID)
@ -138,7 +148,7 @@ func (s *SmartContract) AgreeToSell(ctx contractapi.TransactionContextInterface,
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get verified OrgID: %v", err) return err
} }
// Verify that this clientOrgId actually owns the asset. // Verify that this clientOrgId actually owns the asset.
@ -165,7 +175,7 @@ func (s *SmartContract) AgreeToBuy(ctx contractapi.TransactionContextInterface,
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get verified OrgID: %v", err) return err
} }
// Asset properties must be retrieved from the transient field as they are private // Asset properties must be retrieved from the transient field as they are private
@ -186,10 +196,10 @@ func (s *SmartContract) AgreeToBuy(ctx contractapi.TransactionContextInterface,
// agreeToPrice adds a bid or ask price to caller's implicit private data collection // agreeToPrice adds a bid or ask price to caller's implicit private data collection
func agreeToPrice(ctx contractapi.TransactionContextInterface, assetID string, priceType string) error { func agreeToPrice(ctx contractapi.TransactionContextInterface, assetID string, priceType string) error {
// In this scenario, client is only authorized to read/write private data from its own peer. // In this scenario, both buyer and seller are authoried to read/write private about transfer after seller agrees to sell.
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get verified OrgID: %v", err) return err
} }
transMap, err := ctx.GetStub().GetTransient() transMap, err := ctx.GetStub().GetTransient()
@ -281,7 +291,7 @@ func (s *SmartContract) VerifyAssetProperties(ctx contractapi.TransactionContext
func (s *SmartContract) TransferAsset(ctx contractapi.TransactionContextInterface, assetID string, buyerOrgID string) error { func (s *SmartContract) TransferAsset(ctx contractapi.TransactionContextInterface, assetID string, buyerOrgID string) error {
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to get verified OrgID: %v", err) return err
} }
transMap, err := ctx.GetStub().GetTransient() transMap, err := ctx.GetStub().GetTransient()
@ -591,7 +601,7 @@ func buildCollectionName(clientOrgID string) string {
func getClientImplicitCollectionName(ctx contractapi.TransactionContextInterface) (string, error) { func getClientImplicitCollectionName(ctx contractapi.TransactionContextInterface) (string, error) {
clientOrgID, err := getClientOrgID(ctx) clientOrgID, err := getClientOrgID(ctx)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get verified OrgID: %v", err) return "", err
} }
err = verifyClientOrgMatchesPeerOrg(clientOrgID) err = verifyClientOrgMatchesPeerOrg(clientOrgID)