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

CMTAT 3.0.0 #283

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
75dd083
Separate ERC20 calls inside snapshotModule
rya-sge Nov 12, 2024
be8669a
Merge pull request #282 from CMTA/snapshot-update
rya-sge Nov 12, 2024
37078ca
Add TransferEngineModule, remove snapshotModule
rya-sge Nov 13, 2024
115ac4d
Use a struct to represent a document
rya-sge Nov 13, 2024
694b4a6
Merge pull request #284 from CMTA/update-document
rya-sge Jan 13, 2025
ac24d33
Replace transferEngine by SnapshotEngine
rya-sge Jan 16, 2025
fb17fcc
Add enforcement
rya-sge Jan 22, 2025
6b39163
Remove authorisationEngine, add snapshotEngine
rya-sge Jan 22, 2025
1c41498
Update OZ and solidity, setter for ERC20Name and ERC20Symbol, move en…
rya-sge Feb 5, 2025
6f1846d
Merge pull request #288 from CMTA/update-snapshot-2
rya-sge Feb 5, 2025
693a41b
Remove factory contract
rya-sge Feb 6, 2025
b06a5b6
Merge branch 'dev' into update-snapshot-2
rya-sge Feb 6, 2025
39480f7
Merge pull request #289 from CMTA/update-snapshot-2
rya-sge Feb 6, 2025
0a0385e
SnapsModule: clean-up + add doc
rya-sge Feb 10, 2025
3e81a65
FIx bug with snapshot Engine
rya-sge Feb 10, 2025
9ae7f60
Remove useless package
rya-sge Feb 10, 2025
7a361dc
Add ERC-1363
rya-sge Feb 11, 2025
7fa2d8f
Add terms as document + improve doc
rya-sge Feb 11, 2025
70c46bb
Improvement initialize function
rya-sge Feb 12, 2025
8304fd4
Code clean-up + linter
rya-sge Feb 12, 2025
b282d75
Remove useless node js package + improve doc
rya-sge Feb 12, 2025
76a2b88
improve test and doc
rya-sge Feb 13, 2025
9dc4896
improve doc, generate slither report
rya-sge Feb 13, 2025
9d01630
Add burn without reason, change burn/mint interface + improve doc
rya-sge Feb 13, 2025
0add5ee
Use require with custom error
rya-sge Feb 13, 2025
fd7ce10
Update readme
rya-sge Feb 13, 2025
5725d6c
Add ERC3643 partial support + correspondance table
rya-sge Feb 17, 2025
15ee4bc
Rename validateTransfer in canTransfer, remove IERC1404Wrapper, add I…
rya-sge Feb 18, 2025
b3fb525
Create interface to share spend event between ERC20Base and ERC20Burn
rya-sge Feb 18, 2025
b9e7261
Add RuleEngine check with approve + rename function for IERC3643
rya-sge Feb 18, 2025
2d54578
Add test for ERC20 approve
rya-sge Feb 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.17.0
v20.5.0
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,31 @@ Please follow <https://changelog.md/> conventions.

- Update changelog

## 3.0.0

- Update DocumentModule to use a struct

- ERC20BaseModule:
- Add function`enforceTransfer` (forceTransfer)
- Add function to update ERC20 Symbol and Name

- BaseModule: Terms are represented as document (name, hash, uri, last on-chain modification date).

Deployment

- Add deployment version for ERC-1363
- Create a separate directory for factory contract. See [CMTATFactory](https://github.com/CMTA/CMTATFactory)

Engine:

- Remove AuthorizationEngine
- Add SnapshotEngine instead of snapshotModule. See also [SnapshotEngine](https://github.com/CMTA/SnapshotEngine)

Lib:

- Update solidity to version 0.8.28
- Update OpenZeppelin to version 5.2.0

## 2.5.1 - 20241003

- Beacon Factory: deploy an implementation inside the constructor if no implementation is provided
Expand Down
467 changes: 375 additions & 92 deletions README.md

Large diffs are not rendered by default.

109 changes: 0 additions & 109 deletions contracts/deployment/CMTAT_BEACON_FACTORY.sol

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.20;

import "./modules/CMTAT_BASE.sol";
import {CMTAT_BASE, MetaTxModule, ICMTATConstructor} from "../modules/CMTAT_BASE.sol";


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//SPDX-License-Identifier: MPL-2.0

pragma solidity ^0.8.20;
import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import "./modules/CMTAT_BASE.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import {CMTAT_BASE, MetaTxModule, ICMTATConstructor} from "../modules/CMTAT_BASE.sol";


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.20;

import "./modules/CMTAT_BASE.sol";
import {CMTAT_BASE, MetaTxModule, ICMTATConstructor} from "../modules/CMTAT_BASE.sol";


/**
Expand Down
97 changes: 0 additions & 97 deletions contracts/deployment/CMTAT_TP_FACTORY.sol

This file was deleted.

92 changes: 0 additions & 92 deletions contracts/deployment/CMTAT_UUPS_FACTORY.sol

This file was deleted.

25 changes: 25 additions & 0 deletions contracts/deployment/ERC1363/CMTAT_PROXY_ERC1363.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//SPDX-License-Identifier: MPL-2.0

pragma solidity ^0.8.20;

import {CMTAT_ERC1363_BASE} from "../../modules/CMTAT_ERC1363_BASE.sol";
import {CMTAT_BASE, MetaTxModule, ICMTATConstructor} from "../../modules/CMTAT_BASE.sol";


/**
* @title CMTAT Proxy version for ERC1363
*/
contract CMTAT_PROXY_ERC1363 is CMTAT_ERC1363_BASE {
/**
* @notice Contract version for the deployment with a proxy
* @param forwarderIrrevocable address of the forwarder, required for the gasless support
*/
/// @custom:oz-upgrades-unsafe-allow constructor
constructor(
address forwarderIrrevocable
) MetaTxModule(forwarderIrrevocable) {
// Disable the possibility to initialize the implementation
_disableInitializers();
}

}
Loading