Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Contracts): DApp registry contract using ENS and FDS registrar as base #27

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8b134e3
feat(contracts): init commit
molekilla May 25, 2022
a360067
feat(contracts): init commit
molekilla May 25, 2022
fc58443
feat(contracts): refactoring propose
molekilla May 27, 2022
7111b38
feat(contracts): burn / transfer placeholders
molekilla May 27, 2022
7f18ede
feat(contracts): init dapp registry implementation
molekilla May 27, 2022
1448c17
feat(contracts): removing voting/challenge
molekilla May 30, 2022
a7bd882
feat(contracts): dapp add record test
molekilla May 31, 2022
2c790ea
Merge branch 'master' into dapp-tcr
molekilla May 31, 2022
cbc7204
feat(contracts): more tests
molekilla May 31, 2022
4521e38
feat(contracts): tests
molekilla Jun 2, 2022
89466c8
feat(contracts): fds registrar contracts
molekilla Jun 2, 2022
52f4668
feat(contracts): unit tests for fds registrar
molekilla Jun 4, 2022
ad9826d
feat(contracts): fds base registrar
molekilla Jun 7, 2022
79157a0
feat(contracts): negative tests
molekilla Jun 7, 2022
81b50cd
feat(contracts): using @ensdomains contract library
molekilla Jun 7, 2022
448339a
feat(contracts): grace period unit tests
molekilla Jun 7, 2022
d95bbf1
Merge remote-tracking branch 'origin/fds-registrar' into dapp-tcr
molekilla Jun 9, 2022
647cfef
feat(contracts): unit tests
molekilla Jun 9, 2022
a07150c
feat(contracts): dappregistry is using ENS and FDS as base registries
molekilla Jun 10, 2022
509e8c1
feat(contracts): removing unnecesary dependencies
molekilla Jun 15, 2022
7b766b8
Merge branch 'master' into dapp-tcr
molekilla Jun 17, 2022
b367a07
feat(contracts): removed stale code. refactor dapp registry. added da…
molekilla Jun 23, 2022
f79bc29
Merge branch 'master' into dapp-tcr
molekilla Jul 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions contracts/DappRegistry.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;


import "@ensdomains/ens-contracts/contracts/registry/ENS.sol";
import "./FDSRegistrar.sol";

contract DappRegistry {

struct Record {
// ENS app name
bytes32 node;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this necessary? we just store records in the records mapping where you need to pass the node as key.

// owner
address owner;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be tracked by the ENS contract.

// DApp description
string description;
// app version
uint8 version;
// indexation type
uint8 indexType;
// Data structure format
bytes32 dataFormat;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you elaborate this one please? it is related to BeeSon or any other datastructure signiture?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should leave this agnostic, beeson by default, but they could use other dataformats. If is always beeson, then I wil remove it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eg based on the multibase tables.csv values

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it is fine as it is for now

// Data structure reference
bytes32 blobRef;
// Creation date
uint256 timestamp;
}

event DappRecordAdded(
bytes32 indexed node,
bytes32 label,
uint256 duration,
address indexed owner
Copy link
Collaborator

@nugaon nugaon Jun 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why should we index owner?

Suggested change
bytes32 indexed node,
bytes32 label,
uint256 duration,
address indexed owner
bytes32 indexed node,
bytes32 label,
uint256 duration,
address owner

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably from the old design pattern, with ENS not required

);
event TransferRecord(
address from,
address to,
bytes32 node
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe index node?

Suggested change
bytes32 node
bytes32 indexed node

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

);

// Maps listingHashes to associated node data
mapping(bytes32 => Record) private records;
Comment on lines +41 to +42
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it is the node => Record mapping, isn't it?

Suggested change
// Maps listingHashes to associated node data
mapping(bytes32 => Record) private records;
// Maps ENS node to associated dApp record
mapping(bytes32 => Record) private records;



// Global Variables
ENS public ensInstance;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove indent

FDSRegistrar fdsRegistrar;
bytes32 baseNode;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

explicitly mark visibility of state.


constructor(
ENS _ens,
FDSRegistrar _fdsRegistrar,
bytes32 _node
) {
ensInstance = _ens;
baseNode = _node;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you need this baseNode? you don't use it for anything.

fdsRegistrar = _fdsRegistrar;
}

/**
* @dev Gets dapp record.
*
* Returns a Record object.
*/
function get(bytes32 _nodehash)
public
view
returns (Record memory)
{

require(
records[_nodehash].node == _nodehash,
"Dapp does not exist."
Comment on lines +69 to +70
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be possible just check for a null value for records[_nodehash]?

);

return (records[_nodehash]);
}


/**
* @dev Registers a new dapp record.
*
* Returns a boolean value indicating whether the operation succeeded.
*
* Emits an {DappRecordAdded} event.
*/
function add(
bytes32 _nodehash,
bytes32 _label,
address _owner,
uint _duration,
Record calldata _record
) external returns (bytes32) {
fdsRegistrar.register(uint256(_label), _owner, _duration);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may need an additional optional parameter for register that indicates it was a dApp registration. Its default parameter should be false, and we need to save it to the ENS record.


// Sets record
records[_nodehash] = _record;
emit DappRecordAdded(_nodehash, _label, _duration, msg.sender);

return _nodehash;
}
}
216 changes: 216 additions & 0 deletions contracts/ERC20/Address.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.0;

/**
* @dev Collection of functions related to the address type
*/
library Address {
/**
* @dev Returns true if `account` is a contract.
*
* [IMPORTANT]
* ====
* It is unsafe to assume that an address for which this function returns
* false is an externally-owned account (EOA) and not a contract.
*
* Among others, `isContract` will return false for the following
* types of addresses:
*
* - an externally-owned account
* - a contract in construction
* - an address where a contract will be created
* - an address where a contract lived, but was destroyed
* ====
*/
function isContract(address account) internal view returns (bool) {
// This method relies on extcodesize, which returns 0 for contracts in
// construction, since the code is only stored at the end of the
// constructor execution.

uint256 size;
assembly {
size := extcodesize(account)
}
return size > 0;
}

/**
* @dev Replacement for Solidity's `transfer`: sends `amount` wei to
* `recipient`, forwarding all available gas and reverting on errors.
*
* https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost
* of certain opcodes, possibly making contracts go over the 2300 gas limit
* imposed by `transfer`, making them unable to receive funds via
* `transfer`. {sendValue} removes this limitation.
*
* https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].
*
* IMPORTANT: because control is transferred to `recipient`, care must be
* taken to not create reentrancy vulnerabilities. Consider using
* {ReentrancyGuard} or the
* https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].
*/
function sendValue(address payable recipient, uint256 amount) internal {
require(address(this).balance >= amount, "Address: insufficient balance");

(bool success, ) = recipient.call{value: amount}("");
require(success, "Address: unable to send value, recipient may have reverted");
}

/**
* @dev Performs a Solidity function call using a low level `call`. A
* plain `call` is an unsafe replacement for a function call: use this
* function instead.
*
* If `target` reverts with a revert reason, it is bubbled up by this
* function (like regular Solidity function calls).
*
* Returns the raw returned data. To convert to the expected return value,
* use https://solidity.readthedocs.io/en/latest/units-and-global-variables.html?highlight=abi.decode#abi-encoding-and-decoding-functions[`abi.decode`].
*
* Requirements:
*
* - `target` must be a contract.
* - calling `target` with `data` must not revert.
*
* _Available since v3.1._
*/
function functionCall(address target, bytes memory data) internal returns (bytes memory) {
return functionCall(target, data, "Address: low-level call failed");
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`], but with
* `errorMessage` as a fallback revert reason when `target` reverts.
*
* _Available since v3.1._
*/
function functionCall(
address target,
bytes memory data,
string memory errorMessage
) internal returns (bytes memory) {
return functionCallWithValue(target, data, 0, errorMessage);
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],
* but also transferring `value` wei to `target`.
*
* Requirements:
*
* - the calling contract must have an ETH balance of at least `value`.
* - the called Solidity function must be `payable`.
*
* _Available since v3.1._
*/
function functionCallWithValue(
address target,
bytes memory data,
uint256 value
) internal returns (bytes memory) {
return functionCallWithValue(target, data, value, "Address: low-level call with value failed");
}

/**
* @dev Same as {xref-Address-functionCallWithValue-address-bytes-uint256-}[`functionCallWithValue`], but
* with `errorMessage` as a fallback revert reason when `target` reverts.
*
* _Available since v3.1._
*/
function functionCallWithValue(
address target,
bytes memory data,
uint256 value,
string memory errorMessage
) internal returns (bytes memory) {
require(address(this).balance >= value, "Address: insufficient balance for call");
require(isContract(target), "Address: call to non-contract");

(bool success, bytes memory returndata) = target.call{value: value}(data);
return verifyCallResult(success, returndata, errorMessage);
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],
* but performing a static call.
*
* _Available since v3.3._
*/
function functionStaticCall(address target, bytes memory data) internal view returns (bytes memory) {
return functionStaticCall(target, data, "Address: low-level static call failed");
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],
* but performing a static call.
*
* _Available since v3.3._
*/
function functionStaticCall(
address target,
bytes memory data,
string memory errorMessage
) internal view returns (bytes memory) {
require(isContract(target), "Address: static call to non-contract");

(bool success, bytes memory returndata) = target.staticcall(data);
return verifyCallResult(success, returndata, errorMessage);
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],
* but performing a delegate call.
*
* _Available since v3.4._
*/
function functionDelegateCall(address target, bytes memory data) internal returns (bytes memory) {
return functionDelegateCall(target, data, "Address: low-level delegate call failed");
}

/**
* @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],
* but performing a delegate call.
*
* _Available since v3.4._
*/
function functionDelegateCall(
address target,
bytes memory data,
string memory errorMessage
) internal returns (bytes memory) {
require(isContract(target), "Address: delegate call to non-contract");

(bool success, bytes memory returndata) = target.delegatecall(data);
return verifyCallResult(success, returndata, errorMessage);
}

/**
* @dev Tool to verifies that a low level call was successful, and revert if it wasn't, either by bubbling the
* revert reason using the provided one.
*
* _Available since v4.3._
*/
function verifyCallResult(
bool success,
bytes memory returndata,
string memory errorMessage
) internal pure returns (bytes memory) {
if (success) {
return returndata;
} else {
// Look for revert reason and bubble it up if present
if (returndata.length > 0) {
// The easiest way to bubble the revert reason is using memory via assembly

assembly {
let returndata_size := mload(returndata)
revert(add(32, returndata), returndata_size)
}
} else {
revert(errorMessage);
}
}
}
}
23 changes: 23 additions & 0 deletions contracts/ERC20/Context.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.0;

/**
* @dev Provides information about the current execution context, including the
* sender of the transaction and its data. While these are generally available
* via msg.sender and msg.data, they should not be accessed in such a direct
* manner, since when dealing with meta-transactions the account sending and
* paying for execution may not be the actual sender (as far as an application
* is concerned).
*
* This contract is only required for intermediate, library-like contracts.
*/
abstract contract Context {
function _msgSender() internal view virtual returns (address) {
return msg.sender;
}

function _msgData() internal view virtual returns (bytes calldata) {
return msg.data;
}
}
Loading