Skip to content

Commit

Permalink
Merge pull request #80 from CirclesUBI/20240201-register-avatars
Browse files Browse the repository at this point in the history
20240201 register avatars
  • Loading branch information
jaensen authored Feb 7, 2024
2 parents bed822d + b8dde27 commit 9287ee6
Show file tree
Hide file tree
Showing 9 changed files with 578 additions and 114 deletions.
4 changes: 4 additions & 0 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ds-test/=lib/forge-std/lib/ds-test/src/
erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/
forge-std/=lib/forge-std/src/
@openzeppelin/=lib/openzeppelin-contracts/
7 changes: 7 additions & 0 deletions src/circles/Circles.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.13;

import "openzeppelin-contracts/contracts/token/ERC1155/ERC1155.sol";
import "openzeppelin-contracts/contracts/token/ERC1155/utils/ERC1155Holder.sol";

abstract contract Circles is ERC1155 {}
14 changes: 0 additions & 14 deletions src/circles/IERC20.sol

This file was deleted.

6 changes: 1 addition & 5 deletions src/circles/TemporalDiscount.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity >=0.8.13;

import "../lib/Math64x64.sol";
import "./IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

contract TemporalDiscount is IERC20 {
// Constants
Expand Down Expand Up @@ -93,8 +93,6 @@ contract TemporalDiscount is IERC20 {

// Events

event Transfer(address indexed from, address indexed to, uint256 amount);

/**
* @notice DiscountCost is emitted when the owner sends or receives tokens
* in a new time span and emits the discounted amount
Expand All @@ -104,8 +102,6 @@ contract TemporalDiscount is IERC20 {
*/
event DiscountCost(address indexed owner, uint256 cost);

event Approval(address indexed owner, address indexed spender, uint256 amount);

// External functions

function transfer(address _to, uint256 _amount) external returns (bool) {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/ICircleNode.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.13;

import "../circles/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

/// @author CirclesUBI
/// @title Circle Node interface
Expand Down
2 changes: 1 addition & 1 deletion src/migration/IToken.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.13;

import "../circles/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

/**
* @title IToken v1
Expand Down
Loading

0 comments on commit 9287ee6

Please sign in to comment.