diff --git a/README.md b/README.md index c761e44f..81b69893 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Additional samples demonstrate various Fabric use cases and application patterns | -------------|------------------------------|------------------| | [Commercial paper](commercial-paper) | Explore a use case and detailed application development tutorial in which two organizations use a blockchain network to trade commercial paper. | [Commercial paper tutorial](https://hyperledger-fabric.readthedocs.io/en/latest/tutorial/commercial_paper.html) | | [Off chain data](off_chain_data) | Learn how to use the Peer channel-based event services to build an off-chain database for reporting and analytics. | [Peer channel-based event services](https://hyperledger-fabric.readthedocs.io/en/latest/peer_event_services.html) | -| [Token account-based](token-account-based) | Smart contract demonstrating how to create and transfer fungible tokens using an account-based model. | [README](token-account-based/README.md) | +| [Token ERC-20](token-erc-20) | Smart contract demonstrating how to create and transfer fungible tokens using an account-based model. | [README](token-erc-20/README.md) | | [Token UTXO](token-utxo) | Smart contract demonstrating how to create and transfer fungible tokens using a UTXO (unspent transaction output) model. | [README](token-utxo/README.md) | | [High throughput](high-throughput) | Learn how you can design your smart contract to avoid transaction collisions in high volume environments. | [README](high-throughput/README.md) | | [Chaincode](chaincode) | A set of other sample smart contracts, many of which were used in tutorials prior to the asset transfer sample series. | | diff --git a/token-account-based/chaincode-go/go.mod b/token-account-based/chaincode-go/go.mod deleted file mode 100644 index cac66472..00000000 --- a/token-account-based/chaincode-go/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/hyperledger/fabric-samples/token-account-based/chaincode-go - -go 1.14 - -require github.com/hyperledger/fabric-contract-api-go v1.1.0 diff --git a/token-account-based/README.md b/token-erc-20/README.md similarity index 99% rename from token-account-based/README.md rename to token-erc-20/README.md index ca260fba..1e6aa420 100644 --- a/token-account-based/README.md +++ b/token-erc-20/README.md @@ -33,12 +33,12 @@ You can use the test network script to deploy the account-based token contract t **For a Go Contract:** ``` -./network.sh deployCC -ccn token_account -ccp ../token-account-based/chaincode-go/ +./network.sh deployCC -ccn token_account -ccp ../token-erc-20/chaincode-go/ ``` **For a JavaScript Contract:** ``` -./network.sh deployCC -ccn token_account -ccp ../token-account-based/chaincode-javascript/ -ccl javascript +./network.sh deployCC -ccn token_account -ccp ../token-erc-20/chaincode-javascript/ -ccl javascript ``` The above command deploys the go chaincode with short name `token_account`. The smart contract will use the default endorsement policy of majority of channel members. diff --git a/token-account-based/chaincode-go/chaincode/token_contract.go b/token-erc-20/chaincode-go/chaincode/token_contract.go similarity index 99% rename from token-account-based/chaincode-go/chaincode/token_contract.go rename to token-erc-20/chaincode-go/chaincode/token_contract.go index c01875e1..b7ce689a 100644 --- a/token-account-based/chaincode-go/chaincode/token_contract.go +++ b/token-erc-20/chaincode-go/chaincode/token_contract.go @@ -311,7 +311,7 @@ func (s *SmartContract) TransferFrom(ctx contractapi.TransactionContextInterface // Dependant functions include Transfer and TransferFrom. func transferHelper(ctx contractapi.TransactionContextInterface, from string, to string, value int) error { - if value < 0 { // transfer of 0 is allowed in ERC20, so just validate against negative amounts + if value < 0 { // transfer of 0 is allowed in ERC-20, so just validate against negative amounts return fmt.Errorf("transfer amount cannot be negative") } diff --git a/token-erc-20/chaincode-go/go.mod b/token-erc-20/chaincode-go/go.mod new file mode 100644 index 00000000..6bee34ad --- /dev/null +++ b/token-erc-20/chaincode-go/go.mod @@ -0,0 +1,5 @@ +module github.com/hyperledger/fabric-samples/token-erc-20/chaincode-go + +go 1.14 + +require github.com/hyperledger/fabric-contract-api-go v1.1.0 diff --git a/token-account-based/chaincode-go/go.sum b/token-erc-20/chaincode-go/go.sum similarity index 100% rename from token-account-based/chaincode-go/go.sum rename to token-erc-20/chaincode-go/go.sum diff --git a/token-account-based/chaincode-go/token_account_based.go b/token-erc-20/chaincode-go/token_erc_20.go similarity index 57% rename from token-account-based/chaincode-go/token_account_based.go rename to token-erc-20/chaincode-go/token_erc_20.go index 0174084d..2bcc51d4 100644 --- a/token-account-based/chaincode-go/token_account_based.go +++ b/token-erc-20/chaincode-go/token_erc_20.go @@ -8,16 +8,16 @@ import ( "log" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/fabric-samples/token-account-based/chaincode-go/chaincode" + "github.com/hyperledger/fabric-samples/token-erc-20/chaincode-go/chaincode" ) func main() { tokenChaincode, err := contractapi.NewChaincode(&chaincode.SmartContract{}) if err != nil { - log.Panicf("Error creating token-account-based chaincode: %v", err) + log.Panicf("Error creating token-erc-20 chaincode: %v", err) } if err := tokenChaincode.Start(); err != nil { - log.Panicf("Error starting token-account-based chaincode: %v", err) + log.Panicf("Error starting token-erc-20 chaincode: %v", err) } } diff --git a/token-account-based/chaincode-javascript/.editorconfig b/token-erc-20/chaincode-javascript/.editorconfig similarity index 100% rename from token-account-based/chaincode-javascript/.editorconfig rename to token-erc-20/chaincode-javascript/.editorconfig diff --git a/token-account-based/chaincode-javascript/.eslintignore b/token-erc-20/chaincode-javascript/.eslintignore similarity index 100% rename from token-account-based/chaincode-javascript/.eslintignore rename to token-erc-20/chaincode-javascript/.eslintignore diff --git a/token-account-based/chaincode-javascript/.eslintrc.js b/token-erc-20/chaincode-javascript/.eslintrc.js similarity index 100% rename from token-account-based/chaincode-javascript/.eslintrc.js rename to token-erc-20/chaincode-javascript/.eslintrc.js diff --git a/token-account-based/chaincode-javascript/.gitignore b/token-erc-20/chaincode-javascript/.gitignore similarity index 100% rename from token-account-based/chaincode-javascript/.gitignore rename to token-erc-20/chaincode-javascript/.gitignore diff --git a/token-account-based/chaincode-javascript/index.js b/token-erc-20/chaincode-javascript/index.js similarity index 100% rename from token-account-based/chaincode-javascript/index.js rename to token-erc-20/chaincode-javascript/index.js diff --git a/token-account-based/chaincode-javascript/lib/tokenERC20.js b/token-erc-20/chaincode-javascript/lib/tokenERC20.js similarity index 100% rename from token-account-based/chaincode-javascript/lib/tokenERC20.js rename to token-erc-20/chaincode-javascript/lib/tokenERC20.js diff --git a/token-account-based/chaincode-javascript/package.json b/token-erc-20/chaincode-javascript/package.json similarity index 100% rename from token-account-based/chaincode-javascript/package.json rename to token-erc-20/chaincode-javascript/package.json diff --git a/token-account-based/chaincode-javascript/test/tokenERC20.test.js b/token-erc-20/chaincode-javascript/test/tokenERC20.test.js similarity index 100% rename from token-account-based/chaincode-javascript/test/tokenERC20.test.js rename to token-erc-20/chaincode-javascript/test/tokenERC20.test.js