Skip to content

Commit 1749cfa

Browse files
author
sam
committed
feat(v0.2.0): release v0.2.0
1 parent 294cd79 commit 1749cfa

14 files changed

+333
-335
lines changed

.prettierrc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"singleQuote": false,
3-
"trailingComma": "all",
4-
"bracketSpacing": true,
5-
"semi": true
2+
"singleQuote": false,
3+
"trailingComma": "all",
4+
"bracketSpacing": true,
5+
"semi": true
66
}

.solcover.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const shell = require("shelljs");
22

33
module.exports = {
4-
testCommand: "yarn test",
5-
compileCommand: "yarn compile",
6-
istanbulReporter: ["html"],
7-
mocha: {
8-
delay: true,
9-
},
10-
onCompileComplete: async function (_config) {
11-
await run("typechain");
12-
},
13-
onIstanbulComplete: async function (_config) {
14-
/* We need to do this because solcover generates bespoke artifacts. */
15-
shell.rm("-rf", "./artifacts");
16-
shell.rm("-rf", "./typechain");
17-
},
18-
skipFiles: ["mocks", "test"],
4+
testCommand: "yarn test",
5+
compileCommand: "yarn compile",
6+
istanbulReporter: ["html"],
7+
mocha: {
8+
delay: true,
9+
},
10+
onCompileComplete: async function (_config) {
11+
await run("typechain");
12+
},
13+
onIstanbulComplete: async function (_config) {
14+
/* We need to do this because solcover generates bespoke artifacts. */
15+
shell.rm("-rf", "./artifacts");
16+
shell.rm("-rf", "./typechain");
17+
},
18+
skipFiles: ["mocks", "test"],
1919
};

.solhint.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"extends": "solhint:recommended",
3-
"rules": {
4-
"prettier/prettier": "error"
5-
},
6-
"plugins": ["prettier"]
2+
"extends": "solhint:recommended",
3+
"rules": {
4+
"prettier/prettier": "error"
5+
},
6+
"plugins": ["prettier"]
77
}

README.md

+42-44
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<!-- FIXME: YOUR COPYRIGHT / SPDX LICENSE HEADER -->
2-
# Baseline Protocol DApp [@trufflesuite]
32

3+
# Baseline Protocol DApp [@trufflesuite]
44

55
> create-react for etherjs & baseline protocol
66
77
[![Build Status](https://travis-ci.com/sambacha/create-eth-enterprise.svg?branch=trufflesuite)](https://travis-ci.com/ilyakmet/solidity-typescript-template)
88
[![codecov](https://codecov.io/gh/sambacha/create-eth-enterprise/branch/template/graph/badge.svg)](https://codecov.io/gh/ilyakmet/solidity-typescript-template)
99

1010
## 💼 Baseline Protocol
11+
1112
<!-- FIXME: INTRODUCTION -->
12-
The Baseline Protocol is an open source initiative that combines advances in cryptography, messaging, and blockchain to execute secure and private businessprocesses
13-
at low cost via the public Ethereum Mainnet.
13+
14+
The Baseline Protocol is an open source initiative that combines advances in cryptography, messaging, and blockchain to execute secure and private businessprocesses
15+
at low cost via the public Ethereum Mainnet.
1416

1517
[ethereum-oasis/baseline](https://github.com/ethereum-oasis/baseline)
1618

1719
## 🏢 Overview
20+
1821
<!-- FIXME: OVERVIEW -->
22+
1923
The protocol will enable confidential and complex collaboration between enterprises without leaving any sensitive data on-chain.
2024

2125
## Developer Tools 🛠️
@@ -24,46 +28,41 @@ The protocol will enable confidential and complex collaboration between enterpri
2428
- [TypeChain](https://github.com/ethereum-ts/TypeChain)
2529
- [Openzeppelin Contracts](https://openzeppelin.com/contracts/)
2630

27-
28-
29-
3031
## Tested Against
31-
<!-- You can find specific versioning information used here at https://gist.github.com/sambacha/116b0dfc5c99cc8905545d63002b8f94 -->
3232

33-
| Version | Build | Date <br>(yyyy-mm-dd) |
34-
| :---: | :---: | :---: |
35-
| Version 0.6.4 | MDc6UmVsZWFzZTI0MzgwNTQ3 | 2020-03-10T15:26:16Z |
33+
<!-- You can find specific versioning information used here at https://gist.github.com/sambacha/116b0dfc5c99cc8905545d63002b8f94 -->
3634

35+
| Version | Build | Date <br>(yyyy-mm-dd) |
36+
| :-----------: | :----------------------: | :-------------------: |
37+
| Version 0.6.4 | MDc6UmVsZWFzZTI0MzgwNTQ3 | 2020-03-10T15:26:16Z |
3738

3839
### Proposal Responsibility:
3940

40-
| Person | Contact Info | Responsibility |
41-
| -------------------- | ---------------------- | ------------------------ |
42-
| @github_usrname | usr@github_email.com | Proposal Submitter |
43-
| @github_dev1 | posixmeharder@tycoon.com | Developer |
44-
41+
| Person | Contact Info | Responsibility |
42+
| --------------- | ------------------------ | ------------------ |
43+
| @github_usrname | usr@github_email.com | Proposal Submitter |
44+
| @github_dev1 | posixmeharder@tycoon.com | Developer |
4545

4646
## Files
4747

48-
*Explain what is the purpose of each process and process related file in the project.*
48+
_Explain what is the purpose of each process and process related file in the project._
4949

5050
Click to see file details:
5151

5252
<details>
5353
<summary>IYIPX.sol</summary>
5454
<br>
5555

56-
This file does something and its purpose is to do abc.
56+
This file does something and its purpose is to do abc.
5757

58-
5958
<hr>
6059
</details>
6160

6261
<details>
6362
<summary>deploy-mainnet.sh</summary>
6463
<br>
6564

66-
This file deploys the contracts on `mainnet`
65+
This file deploys the contracts on `mainnet`
6766

6867
<hr>
6968
</details>
@@ -72,9 +71,9 @@ Click to see file details:
7271
<summary>myEmailTemplate.ftl</summary>
7372
<br>
7473

75-
This file does something and its purpose is to do abc.
74+
This file does something and its purpose is to do abc.
7675

77-
Image example of the **Rendered** FreeMarker file (if applicable)
76+
Image example of the **Rendered** FreeMarker file (if applicable)
7877

7978
<hr>
8079
</details>
@@ -113,24 +112,24 @@ $ NETWORK=rinkeby yarn deploy
113112
$ NETWORK=rinkeby yarn run verify YourContractName
114113
```
115114

115+
_For further deployment templates and options see:_ [Deployment Documentation](docs/deployment.md)
116116

117-
*For further deployment templates and options see:* [Deployment Documentation](docs/deployment.md)
118-
119-
| Method | Trigger |
120-
| ------------------- |:----------------------- |
121-
| Truffle | On creation of a Production Release. <br> Deployed to mainnet `chainid: 1` |
122-
| Web3 Provider | On commit to branch with pattern `build/development`. <br> Deployed to `testnet` `ropsten`
117+
| Method | Trigger |
118+
| ------------- | :----------------------------------------------------------------------------------------- |
119+
| Truffle | On creation of a Production Release. <br> Deployed to mainnet `chainid: 1` |
120+
| Web3 Provider | On commit to branch with pattern `build/development`. <br> Deployed to `testnet` `ropsten` |
123121

124122
## Changelog
125123

126-
*Store details about the releases of your improvement in the Change Log*
124+
_Store details about the releases of your improvement in the Change Log_
127125

128126
[Improvement Change Log](CHANGELOG.md)
129127

130128
## Informative / Additional Information
129+
131130
<!-- INFORMATION THAT WOULD BE HELPFUL, ETC) -->
132131

133-
*Explanation of other details about the project that may not have been included in the Overview.*
132+
_Explanation of other details about the project that may not have been included in the Overview._
134133

135134
Examples:
136135

@@ -143,7 +142,7 @@ Examples:
143142

144143
## Additional Support documentation
145144

146-
*See the following for additional support documentation related to building and managing process projects:*
145+
_See the following for additional support documentation related to building and managing process projects:_
147146

148147
1. [Best Practices and Documentation Patterns](docs/patterns.md)
149148
1. [Helper Scripts and Snippets](docs/helpers.md)
@@ -152,27 +151,26 @@ Examples:
152151

153152
A list of terms and libraries used by this project.
154153

155-
| Term | Acronym | Definition |
156-
| -------------- | ------- | ------------------ |
157-
| Requestor | | |
158-
| Initiator| | Another term used for requestor. |
159-
| SafeMath | Lib | OpenZeppelin |
160-
| Proxy | | |
161-
| Margin Rate | | |
162-
| Stablecoin | | |
163-
| Tether | USDT | USDT Stablecoin |
154+
| Term | Acronym | Definition |
155+
| ----------- | ------- | -------------------------------- |
156+
| Requestor | | |
157+
| Initiator | | Another term used for requestor. |
158+
| SafeMath | Lib | OpenZeppelin |
159+
| Proxy | | |
160+
| Margin Rate | | |
161+
| Stablecoin | | |
162+
| Tether | USDT | USDT Stablecoin |
164163

165164
## Security
166165

167-
| Point of contact | Method |
168-
| -------------- | ------------------ |
169-
| persons name | contact@method.com |
166+
| Point of contact | Method |
167+
| ---------------- | ------------------ |
168+
| persons name | contact@method.com |
170169

170+
## License
171171

172-
## License
173172
<!-- FIXME: LICENSE -->
174173

175174
This Boilerplte is CC-0 - Public Domain
176175

177-
178176
<!-- Additional information for licenses should be in the SPDX- format -->

contracts/ConvertLib.sol

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pragma solidity >=0.4.25 <0.7.0;
22

33
library ConvertLib {
4-
function convert(uint256 amount, uint256 conversionRate)
5-
public
6-
pure
7-
returns (uint256 convertedAmount)
8-
{
9-
return amount * conversionRate;
10-
}
4+
function convert(uint256 amount, uint256 conversionRate)
5+
public
6+
pure
7+
returns (uint256 convertedAmount)
8+
{
9+
return amount * conversionRate;
10+
}
1111
}

contracts/MetaCoin.sol

+26-26
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ import "./ConvertLib.sol";
88
// token, see: https://github.com/ConsenSys/Tokens. Cheers!
99

1010
contract MetaCoin {
11-
mapping(address => uint256) balances;
12-
13-
event Transfer(address indexed _from, address indexed _to, uint256 _value);
14-
15-
constructor() public {
16-
balances[tx.origin] = 10000;
17-
}
18-
19-
function sendCoin(address receiver, uint256 amount)
20-
public
21-
returns (bool sufficient)
22-
{
23-
if (balances[msg.sender] < amount) return false;
24-
balances[msg.sender] -= amount;
25-
balances[receiver] += amount;
26-
emit Transfer(msg.sender, receiver, amount);
27-
return true;
28-
}
29-
30-
function getBalanceInEth(address addr) public view returns (uint256) {
31-
return ConvertLib.convert(getBalance(addr), 2);
32-
}
33-
34-
function getBalance(address addr) public view returns (uint256) {
35-
return balances[addr];
36-
}
11+
mapping(address => uint256) balances;
12+
13+
event Transfer(address indexed _from, address indexed _to, uint256 _value);
14+
15+
constructor() public {
16+
balances[tx.origin] = 10000;
17+
}
18+
19+
function sendCoin(address receiver, uint256 amount)
20+
public
21+
returns (bool sufficient)
22+
{
23+
if (balances[msg.sender] < amount) return false;
24+
balances[msg.sender] -= amount;
25+
balances[receiver] += amount;
26+
emit Transfer(msg.sender, receiver, amount);
27+
return true;
28+
}
29+
30+
function getBalanceInEth(address addr) public view returns (uint256) {
31+
return ConvertLib.convert(getBalance(addr), 2);
32+
}
33+
34+
function getBalance(address addr) public view returns (uint256) {
35+
return balances[addr];
36+
}
3737
}

contracts/Migrations.sol

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
pragma solidity >=0.4.25 <0.7.0;
22

33
contract Migrations {
4-
address public owner;
5-
uint256 public last_completed_migration;
4+
address public owner;
5+
uint256 public last_completed_migration;
66

7-
modifier restricted() {
8-
if (msg.sender == owner) _;
9-
}
7+
modifier restricted() {
8+
if (msg.sender == owner) _;
9+
}
1010

11-
constructor() public {
12-
owner = msg.sender;
13-
}
11+
constructor() public {
12+
owner = msg.sender;
13+
}
1414

15-
function setCompleted(uint256 completed) public restricted {
16-
last_completed_migration = completed;
17-
}
15+
function setCompleted(uint256 completed) public restricted {
16+
last_completed_migration = completed;
17+
}
1818
}

migrations/1_initial_migration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const Migrations = artifacts.require("Migrations");
22

33
module.exports = function (deployer) {
4-
deployer.deploy(Migrations);
4+
deployer.deploy(Migrations);
55
};

migrations/2_deploy_contracts.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const ConvertLib = artifacts.require("ConvertLib");
22
const MetaCoin = artifacts.require("MetaCoin");
33

44
module.exports = function (deployer) {
5-
deployer.deploy(ConvertLib);
6-
deployer.link(ConvertLib, MetaCoin);
7-
deployer.deploy(MetaCoin);
5+
deployer.deploy(ConvertLib);
6+
deployer.link(ConvertLib, MetaCoin);
7+
deployer.deploy(MetaCoin);
88
};

0 commit comments

Comments
 (0)