Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: resolve merge conflicts
Browse files Browse the repository at this point in the history
SamMayWork committed Jun 17, 2024

Verified

This commit was signed with the committer’s verified signature.
Okabe-Junya Junya Okabe
2 parents 7d87a00 + 6cb6d68 commit 34abd0a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions charts/firefly/README.md
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ package manager. It can be used to deploy a single FireFly node for an individua
### Table of Contents

- [FireFly](#firefly)
- [Table of Contents](#table-of-contents)
- [Table of Contents](#table-of-contents)
- [Prerequisites](#prerequisites)
- [Get Repo Info](#get-repo-info)
- [Install Chart](#install-chart)
@@ -349,7 +349,7 @@ core:

#### Smart Contract Deployment

Currently, the chart offers no way for one to manage the [FireFly smart contract](../../../smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol).
Currently, the chart offers no way for one to manage the [FireFly smart contract](https://github.com/hyperledger/firefly/blob/main/smart_contracts/ethereum/solidity_firefly/contracts/Firefly.sol).
Instead, the chart assumes it is already pre-provisioned via Ethconnect by one of the organizations.

If you have the contract available as gateway contract on Ethconnect, you can then deploy it via the API:
@@ -393,7 +393,7 @@ its chaincode on behalf of the organization it's representing.

#### Chaincode

By default, the chart assumes the [FireFly chaincode](../../../smart_contracts/fabric/firefly-go/) is deployed to the
By default, the chart assumes the [FireFly chaincode](https://github.com/hyperledger/firefly/blob/main/smart_contracts/fabric/firefly-go) is deployed to the
`default-channel` with the name `firefly_go`. If the chaincode was deployed to a different channel or with a different
name you can set `config.fabconnectChannel` and `config.fireflyChaincode` accordingly.

0 comments on commit 34abd0a

Please sign in to comment.