Skip to content

Commit

Permalink
Add balanceInfo in ERC20BaseModule, improve schema
Browse files Browse the repository at this point in the history
  • Loading branch information
@rya-sge
rya-sge committed Mar 18, 2024
1 parent d6a14ec commit 5d183e2
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 9 deletions.
2 changes: 1 addition & 1 deletion contracts/mocks/AuthorizationEngineMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
import "../interfaces/engine/IAuthorizationEngine.sol";

/*
@title a mock for testing, not suitable for production
* @title a mock for testing, not suitable for production
*/
contract AuthorizationEngineMock is IAuthorizationEngine {
address nextAdmin;
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/RuleEngine/RuleEngineMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "./RuleMock.sol";
import "./CodeList.sol";

/*
@title a mock for testing, not suitable for production
* @title a mock for testing, not suitable for production
*/
contract RuleEngineMock is IRuleEngineMock {
IRule[] internal _rules;
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/RuleEngine/RuleMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "./interfaces/IRule.sol";
import "./CodeList.sol";

/*
@title a mock for testing, not suitable for production
* @title a mock for testing, not suitable for production
*/
contract RuleMock is IRule, CodeList {
function validateTransfer(
Expand All @@ -18,7 +18,7 @@ contract RuleMock is IRule, CodeList {
}

/**
@dev 20 the limit of the maximum amount
* @dev 20 the limit of the maximum amount
*/
function detectTransferRestriction(
address /* _from */,
Expand Down
4 changes: 2 additions & 2 deletions contracts/modules/CMTAT_BASE.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import "./wrapper/core/EnforcementModule.sol";
import "./wrapper/core/ERC20BaseModule.sol";
import "./wrapper/core/PauseModule.sol";
/*
SnapshotModule:
Add this import in case you add the SnapshotModule
* SnapshotModule:
* Add this import in case you add the SnapshotModule
*/
import "./wrapper/extensions/ERC20SnapshotModule.sol";

Expand Down
11 changes: 11 additions & 0 deletions contracts/modules/wrapper/core/ERC20BaseModule.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,16 @@ abstract contract ERC20BaseModule is ERC20Upgradeable {
return result;
}

/**
* @param from address
* @param to address
* @dev useful for the snapshot rule
*/
function balanceInfo(address from, address to) public view returns(uint256 fromBalance, uint256 toBalance, uint256 totalSupply) {
fromBalance = ERC20Upgradeable.balanceOf(from);
toBalance = ERC20Upgradeable.balanceOf(to);
totalSupply = ERC20Upgradeable.totalSupply();
}

uint256[50] private __gap;
}
Binary file added doc/schema/drawio/Engine-DebtVault.drawio.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/schema/drawio/Engine-RuleEngine.drawio.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/schema/drawio/Engine.drawio
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="Electron" modified="2024-01-22T16:39:21.216Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.6.2 Chrome/106.0.5249.199 Electron/21.3.3 Safari/537.36" etag="B_WfKLa2oXxgwmXu4CIb" version="20.6.2" type="device" pages="2"><diagram name="AuthorizationEngine" id="LucZvkCPMq8z-S9me4Yl">1Vrdc+MmEP9rNNM+xKPv2I+J89Hp3PVuLtdp05cbLGGLBgsVodi+v74gIUuAHMuJ5Th+SMQCK9j97bK7yPKmy/U9BVnymcQQW64dry3vxnJdLxyP+T9B2VQUN3SCirKgKK5oTkN4QD+hJNqSWqAY5spARghmKFOJEUlTGDGFBiglK3XYnGD1rRlYQIPwEAFsUv9CMUvkNjwvbDp+g2iR1K8OA7/qWYJ6tNxKnoCYrFok79byppQQVj0t11OIhfhqwfy+evw+nRTjZ/jn51suOfvL/eNFxezukCnbPVCYsuOydivWzwAXUmALClL2jWD4C+V/LHcqFBFFpEjZr5bY953lhpgv43pGhVDYRoo6/K8Qkriek5Rd5CUQrvgAx884mq6bfv60EP8pfCZPcOebXIW5Szk5hmIrNp+7ShCDDxmIRO+KQ5fTErbEvOXIJUgoOn75yl7yk3J+hpTBdQs+Up73kCwhoxs+pO69lNCQ1hHK5qpBmlOjJ2mBrJ4GJLgXW86N/viDVOEB6vQMdRqChGl8JeyKtyIM8hxFquxUQcM1Yn+L51EgW49ynHi+WbeG3WzqRsq30pokmo/tvmZa2arnvU1rOSloBPdDnQG6gC/xk/4NxopjMTHQUnLQoeOaRiEGDD2r7qhL8fINXwni291CLLBViHm2hp1q33JW2/w1RnymwsgZa4wqwRiMShxut90Lmj9+PK2DVT6N56uE/REhx3+KtsbVQHMOcA5NfHK5P8gmoSwhC5ICfNtQNYQ2Yz4Rkklw/gsZ20gsgYIRFeItgPrupQLRke0Ge2Batr5CirhEID0NdoOe2HUmPcH7RlT6KpY4TIfC0kviaGHpquAooOgn3xRJb9MFSqGQKxRrtrw78zhJyHJW5Gd0lPjuKFANtOs0uQxMT+P4Qx0noSHnb1Bs6WOczt5YRanv9zyew6HkOek4nqtYSsikVzQV7oimOg2g4s2XWrGvRhrKy1doiUEKz0dzfqidVR2a88IOzQ0XWdX5TEt3XzJIS3GL90nxcxt4H4czOVTGjqPKeNxhHF6HiIfzNo4ZIpjRwaui1zpefVQi2e7o9TQn+ZlEl54WXRqur290qVvsqSMCx0xk+2SVQg2fwAxiFUUAo0UqIMZ1LkK8a2FWKAL4SnYsURxXsSjkvhnMSn4CPZnYYLnl4NoKbt6Ap11Oc1sqkW+12sWILkO/sEdjx9Zii+Ogx+1iWs8n83kZfw2g7OOnue+Ssu4P58/LW+hG7ulHQe9cNNAYeYPlot1y9Q0AfaeFyBiIqGmViemHcha1QRzDWYT2RHUWF2/0FidwCGZCGCUweioXnRe4I2E5t/zPvdxhWy3Tvuww7eEC3rEhU1bayMnriQNHZGfmZF0tJAuc1zpZreDn61DZ4WS5NsGmNUx6qSHM1syHeU6V/gOzDGKUjoyriA92O+AG3QpoAakTSYPVH1wziTXtGWOU5VAVWZ6ATPRzY39ggIneOcJ4SjCh5TSeSIifGMooeYKtnvlc9pzMlXqq3IOO1LYrs9WDkOPdypiu9K5II1k6YMQSl6dAWOFddSkmFpE2eUu5dL5yThC6ymCE5tzNcldTmoWmQC4lpmlPUUlKUl1/ktQ/kumyMNUGT6XsC62MURdI22WMrkrRYMr2zUz0MBvLuV9mH8DKHD1KfGcr8/tkhXsvl1oK0dE/I4yRZZkDbkMews+riiJlPn5ROce0kb2BTY3EoS+D9EBDP74GTuZ8M/g39X5QkKrr5TVB65F1WYdKe0sG9RF/LtGsho0gHI/sscqld0DrTrQrsmBij+zWT1vewDfafRz9Ry9Xn1ly5GsXz8Frv4bQGfl6Kevg5KjfezwZnzRQrDgeFZhmdWv3pxbvXtB60bSOUc+yJ/ZE0cE7lrNEhL/9XrAa3nx36d3+Dw==</diagram><diagram id="DAAOtlNPQXlgdxxzfJ90" name="RuleEngine">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</diagram></mxfile>
<mxfile host="Electron" modified="2024-03-11T14:12:48.379Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.6.2 Chrome/106.0.5249.199 Electron/21.3.3 Safari/537.36" etag="RKnOwahraWetuiixzaji" version="20.6.2" type="device" pages="3"><diagram name="AuthorizationEngine" id="LucZvkCPMq8z-S9me4Yl">1Vrdc+MmEP9rNNM+xKNv24+J89Hp3PVuLtdp05cbImGLBgsVodi+v74gIUuAHMuJ5Th+SMQCK9j97bK7yPJmy/UdBVnymcQQW64dry3v2nJdbxxM+D9B2VQUN3SCirKgKK5oTkO4Rz+hJNqSWqAY5spARghmKFOJEUlTGDGFBiglK3XYnGD1rRlYQINwHwFsUv9CMUvkNjwvbDp+g2iR1K8OA7/qWYJ6tNxKnoCYrFok78byZpQQVj0t1zOIhfhqwfy+evg+mxaTZ/jn5xsuOfvL3cNFxez2kCnbPVCYsuOydivWzwAXUmALClL2jWD4C+V/LHcmFBFFpEjZr5bY963lhpgv4+qRCqGwjRR1+F8hJHE1Jym7yEsgXPIBjp9xNF01/fxpIf5T+Eye4M43uQpzl3JyDMVWbD53lSAG7zMQid4Vhy6nJWyJecuRS5BQdPzylb3kJ+X8DCmD6xZ8pDzvIFlCRjd8SN07ltCQ1hHK5qpBmlOjJ2mBrJ4GJLgXW86N/viDVOEB6vQMdRqChGl8KeyKtyIM8hxFquxUQcM1Yn+L51EgWw9ynHi+XreGXW/qRsq30pokmg/tvmZa2arnvU1rOSloBPdDnQG6gC/xk/4NxopjMTHQUnLQoeOaRiEGDD2r7qhL8fINXwni291CLLBViHm2hp1q33JW2/w1RnymwsiZaIwqwRiMShxut90Lmj9+PK2DVT6L56uE/REhx3+KtsbVQHMOcA5NfHK538smoSwhC5ICfNNQNYQ2Yz4Rkklw/gsZ20gsgYIRFeItgPruWIHoyHaDPTAtW18hRVwikJ4Gu0FP7DrTnuB9Iyp9FUscpkNh6SVxtLB0WXAUUPSTb4qkN+kCpVDIFYo1W96teZwkZPlY5Gd0lPjuKFANtOs0GQemp3H8oY6T0JDzNyi29DFOZ2+iotT3ex7P4VDynHYcz1UsJWTSK5oKd0RTnQZQ8eZLrdhXIw3l5Su0xCCF56M5P9TOqg7NeWGH5oaLrOp8pqW7LxmkpbjF+6T4uQ28j8OZHipjx1FlPOkwDq9DxMN5G8cMEczo4FXRax2vPiiRbHf0epqT/EyiS0+LLg3X1ze61C321BGBYyayfbJKoYZP4BFiFUUAo0UqIMZ1LkK8K2FWKAL4UnYsURxXsSjkvhk8lvwEejKxwXLLwZUVXL8BT7uc5rZUIt9qtYsRXYZ+YY8mjq3FFsdBj9vFtJ5P5vMy/hpA2cdPc98lZd0fzp+Xt9CN3NOPgt65aKAx8gbLRbvl6hsA+k4LkTEQUdMqE9MP5SxqgziGswjtqeosLt7oLU7gEMyEMEpg9FQuOi9wR8JybvmfO95hWy3THneY9nAB78SQKStt5OT1xIEjsjNzsq4WkgXOa52sVvDzdajscLJcm2DTGia91BBma+bDPKdK/4FZBjFKR8ZVxAe7HXCDbgW0gNSJpMHqD66ZxJr2jDHKcqiKLE9AJvq5sd8zwETvHGE8I5jQchpPJMRPDGWUPMFWz3wue07mSj1V7kFHatuV2epByPFuZUxXelukkSwdMGKJy1MgrPC2uhQTi0ibvKVcOl85JwhdZTBCc+5muaspzUJTIJcS07SnqCQlqa4/SeofyXRZmGqDp1L2hVbGqAuk7TJGV6VoMGX7ZiZ6mI3l3C+zD2Bljh4lvrOV+X2ywr2XSy2F6Oh/JIyRZZkDbkMews+riiJlPnlROce0kb2BTY3EoS+D9EBDP74GTuZ8M/g39X5QkKrr5TVB65F1WYdKe0sG9RF/LtGsho0gnIzsicqld0DrTrUrsmBqj+zWT1vewDfafRz9Ry9Xn1ly5GsXz8Frv4bQGfl6Kevg5KjfezwZnzRQrDgeFZhmdWv3pxbvXtB60bSOUc+yp/ZU0cE7lrNEhL/9XrAa3nx36d38Dw==</diagram><diagram id="DAAOtlNPQXlgdxxzfJ90" name="RuleEngine">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</diagram><diagram id="MbCXRZLUIDSdXbS7FTx_" name="DebtVault">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</diagram></mxfile>
30 changes: 28 additions & 2 deletions test/common/ERC20BaseModuleCommon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {
} = require('../../openzeppelin-contracts-upgradeable/test/helpers/customError')
const { should } = require('chai').should()

function BaseModuleCommon (admin, address1, address2, address3, proxyTest) {
function ERC20BaseModuleCommon (admin, address1, address2, address3, proxyTest) {
context('Token structure', function () {
it('testHasTheDefinedName', async function () {
// Act + Assert
Expand All @@ -20,6 +20,32 @@ function BaseModuleCommon (admin, address1, address2, address3, proxyTest) {
})
})

context('Balance', function () {
const TOKEN_AMOUNTS = [BN(31), BN(32), BN(33)]
const TOKEN_INITIAL_SUPPLY = TOKEN_AMOUNTS.reduce((a, b) => {
return a.add(b)
})
beforeEach(async function () {
await this.cmtat.mint(address1, TOKEN_AMOUNTS[0], { from: admin })
await this.cmtat.mint(address2, TOKEN_AMOUNTS[1], { from: admin })
await this.cmtat.mint(address3, TOKEN_AMOUNTS[2], { from: admin })
})
it('testHasTheCorrectBalanceInfo', async function () {
// Act + Assert
// Assert
let result = await this.cmtat.balanceInfo(address1, address2);
result[0].should.be.bignumber.equal(
TOKEN_AMOUNTS[0]
);
result[1].should.be.bignumber.equal(
TOKEN_AMOUNTS[1]
);
result[2].should.be.bignumber.equal(
TOKEN_INITIAL_SUPPLY
);
})
})

context('Allowance', function () {
// address1 -> address3
it('testApproveAllowance', async function () {
Expand Down Expand Up @@ -362,4 +388,4 @@ function BaseModuleCommon (admin, address1, address2, address3, proxyTest) {
})
})
}
module.exports = BaseModuleCommon
module.exports = ERC20BaseModuleCommon

0 comments on commit 5d183e2

Please sign in to comment.