Skip to content

Commit

Permalink
style: add solidity prettier plugin (#221)
Browse files Browse the repository at this point in the history
  • Loading branch information
1weiho committed Sep 18, 2023
1 parent 164cf83 commit d849437
Show file tree
Hide file tree
Showing 18 changed files with 484 additions and 348 deletions.
3 changes: 2 additions & 1 deletion apps/blockchain/.prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"endOfLine": "auto"
"endOfLine": "auto",
"plugins": ["prettier-plugin-solidity"]
}
15 changes: 9 additions & 6 deletions apps/blockchain/contracts/AddressRecord.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
pragma solidity ^0.8.9;

contract AddressRecord {
address[] public latestAddressRecord;
function setLatestDeployAddress(address latestDeployAddress) external returns (string memory) {
latestAddressRecord.push(latestDeployAddress);
return "success";
}
}
address[] public latestAddressRecord;

function setLatestDeployAddress(
address latestDeployAddress
) external returns (string memory) {
latestAddressRecord.push(latestDeployAddress);
return 'success';
}
}
43 changes: 22 additions & 21 deletions apps/blockchain/contracts/Authentication.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@
pragma solidity ^0.8.9;

contract Authentication {
event Register(bool isRegistered);

event Register(bool isRegistered);
address[] public users;

address[] public users;

function register(address _walletAddress) public {
if (!verifyUserIsRegistered(_walletAddress)) {
users.push(_walletAddress);
emit Register(true);
} else {
emit Register(false);
}
function register(address _walletAddress) public {
if (!verifyUserIsRegistered(_walletAddress)) {
users.push(_walletAddress);
emit Register(true);
} else {
emit Register(false);
}
}

function getUsers() external view returns (address[] memory) {
return users;
}
function getUsers() external view returns (address[] memory) {
return users;
}

function verifyUserIsRegistered(address _walletAddress) public view returns (bool) {
for (uint256 i = 0; i < users.length; i++) {
if (users[i] == _walletAddress) {
return true;
}
}
return false;
function verifyUserIsRegistered(
address _walletAddress
) public view returns (bool) {
for (uint256 i = 0; i < users.length; i++) {
if (users[i] == _walletAddress) {
return true;
}
}
}
return false;
}
}
128 changes: 73 additions & 55 deletions apps/blockchain/contracts/Controller.sol
Original file line number Diff line number Diff line change
@@ -1,62 +1,80 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.9;

import "./NumericProcess.sol";
import "./StringProcess.sol";
import "./Authentication.sol";
import "./ProvideEvent.sol";
import './NumericProcess.sol';
import './StringProcess.sol';
import './Authentication.sol';
import './ProvideEvent.sol';

contract Controller {
Authentication private authentication;
NumericProcess private numericProcess;
StringProcess private stringProcess;
ProvideEvent private provideEvent;

constructor(address addressOfAuthContract, address addressOfNumericContract, address addressOfStringContract, address addressOfProvideEventContract) {
authentication = Authentication(addressOfAuthContract);
numericProcess = NumericProcess(addressOfNumericContract);
stringProcess = StringProcess(addressOfStringContract);
provideEvent = ProvideEvent(addressOfProvideEventContract);
Authentication private authentication;
NumericProcess private numericProcess;
StringProcess private stringProcess;
ProvideEvent private provideEvent;

constructor(
address addressOfAuthContract,
address addressOfNumericContract,
address addressOfStringContract,
address addressOfProvideEventContract
) {
authentication = Authentication(addressOfAuthContract);
numericProcess = NumericProcess(addressOfNumericContract);
stringProcess = StringProcess(addressOfStringContract);
provideEvent = ProvideEvent(addressOfProvideEventContract);
}

function auth(address walletAddress) external returns (string memory) {
try authentication.register(walletAddress) {
return 'success';
} catch {
return 'invalid';
}
}

function auth(address walletAddress) external returns (string memory) {
try authentication.register(walletAddress) {
return "success";
} catch {
return "invalid";
}
}

function getNumericEvent(address walletAddress) external view returns (string memory) {
try provideEvent.getNumericQuestions(walletAddress) {
return "success";
} catch {
return "invalid";
}
}

function getStringEvent(address walletAddress) external view returns (string memory) {
try provideEvent.getStringQuestions(walletAddress) {
return "success";
} catch {
return "invalid";
}
}

function answerNumericQuestion(uint256 questionId, uint256 answerContent, address walletAddress) external returns (string memory) {
try numericProcess.answerQuestion(questionId, answerContent, walletAddress) {
return "success";
} catch {
return "invalid";
}
}

function answerStringQuestion(uint256 questionId, string memory answerContent, address walletAddress) external returns (string memory) {
try stringProcess.answerQuestion(questionId, answerContent, walletAddress) {
return "success";
} catch {
return "invalid";
}
}

}
function getNumericEvent(
address walletAddress
) external view returns (string memory) {
try provideEvent.getNumericQuestions(walletAddress) {
return 'success';
} catch {
return 'invalid';
}
}

function getStringEvent(
address walletAddress
) external view returns (string memory) {
try provideEvent.getStringQuestions(walletAddress) {
return 'success';
} catch {
return 'invalid';
}
}

function answerNumericQuestion(
uint256 questionId,
uint256 answerContent,
address walletAddress
) external returns (string memory) {
try
numericProcess.answerQuestion(questionId, answerContent, walletAddress)
{
return 'success';
} catch {
return 'invalid';
}
}

function answerStringQuestion(
uint256 questionId,
string memory answerContent,
address walletAddress
) external returns (string memory) {
try stringProcess.answerQuestion(questionId, answerContent, walletAddress) {
return 'success';
} catch {
return 'invalid';
}
}
}
23 changes: 13 additions & 10 deletions apps/blockchain/contracts/DataVerification.sol
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.9;

import "hardhat/console.sol";
import "./Oracle.sol";
import "./Authentication.sol";
import 'hardhat/console.sol';
import './Oracle.sol';
import './Authentication.sol';

contract DataVerification {
event ResponseEvent(bool success, bytes data);

event ResponseEvent(bool success, bytes data);
function sendAnswerToDApp(uint256 _questionId, address _callBackAddress) external payable {
(bool success, bytes memory data) = _callBackAddress.call{value: msg.value}(
abi.encodeWithSignature("receiveAnswer(string)", "answer")
);
emit ResponseEvent(success, data);
}
function sendAnswerToDApp(
uint256 _questionId,
address _callBackAddress
) external payable {
(bool success, bytes memory data) = _callBackAddress.call{value: msg.value}(
abi.encodeWithSignature('receiveAnswer(string)', 'answer')
);
emit ResponseEvent(success, data);
}
}
23 changes: 13 additions & 10 deletions apps/blockchain/contracts/NodeVoting.sol
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.9;

import "hardhat/console.sol";
import "./Oracle.sol";
import "./Authentication.sol";
import 'hardhat/console.sol';
import './Oracle.sol';
import './Authentication.sol';

contract NodeVoting {
event ResponseEvent(bool success, bytes data);

event ResponseEvent(bool success, bytes data);
function sendAnswerToDApp(uint256 _questionId, address _callBackAddress) external payable {
(bool success, bytes memory data) = _callBackAddress.call{value: msg.value}(
abi.encodeWithSignature("receiveAnswer(string)", "answer")
);
emit ResponseEvent(success, data);
}
function sendAnswerToDApp(
uint256 _questionId,
address _callBackAddress
) external payable {
(bool success, bytes memory data) = _callBackAddress.call{value: msg.value}(
abi.encodeWithSignature('receiveAnswer(string)', 'answer')
);
emit ResponseEvent(success, data);
}
}
22 changes: 12 additions & 10 deletions apps/blockchain/contracts/NumericIntegration.sol
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.9;

import "hardhat/console.sol";
import "./DataVerification.sol";
import 'hardhat/console.sol';
import './DataVerification.sol';

contract NumericIntegration {
DataVerification private dataVerification;

DataVerification private dataVerification;
constructor(address _dataVerificationAddr) {
dataVerification = DataVerification(_dataVerificationAddr);
}

constructor(address _dataVerificationAddr) {
dataVerification = DataVerification(_dataVerificationAddr);
}

function dataIntergration(uint256 _questionId, address _callBackAddress) external {
dataVerification.sendAnswerToDApp(_questionId, _callBackAddress);
}
function dataIntergration(
uint256 _questionId,
address _callBackAddress
) external {
dataVerification.sendAnswerToDApp(_questionId, _callBackAddress);
}
}
Loading

0 comments on commit d849437

Please sign in to comment.