Skip to content

Commit

Permalink
fix: tokenized vault library function modifier
Browse files Browse the repository at this point in the history
  • Loading branch information
amarinkovic committed Nov 23, 2023
1 parent 1c2b562 commit 1e1a2ac
Show file tree
Hide file tree
Showing 2 changed files with 148 additions and 4 deletions.
150 changes: 147 additions & 3 deletions gemforge.deployments.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"txHash": "0x147d5ab4233c3028cad72002959cb3d49381ec2e49188ad7043cdf08a0f2ae4d",
"onChain": {
"address": "0x1e560E6adDF76b9335540565a96F4a93f371a56c",
"constructorArgs": ["0x931c3aC09202650148Edb2316e97815f904CF4fa"]
"constructorArgs": [
"0x931c3aC09202650148Edb2316e97815f904CF4fa"
]
}
},
{
Expand Down Expand Up @@ -319,7 +321,9 @@
"txHash": "0x04eb4da00d7a43cdb3b79a44c96515820d1b80eb952af4135cc39c4cc48f71a9",
"onChain": {
"address": "0xeb91C729D4bD06F41C7624E6ef0a40a828479af2",
"constructorArgs": ["0x931c3aC09202650148Edb2316e97815f904CF4fa"]
"constructorArgs": [
"0x931c3aC09202650148Edb2316e97815f904CF4fa"
]
}
},
{
Expand Down Expand Up @@ -497,6 +501,146 @@
"mainnetFork": {
"chainId": 1,
"contracts": [
{
"name": "ACLFacet",
"fullyQualifiedName": "ACLFacet.sol:ACLFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xdc3d1bfc966aefdeafa960cb8036954dcd1f76a01c44e3c402ae7fcb8073536a",
"onChain": {
"address": "0x1e560E6adDF76b9335540565a96F4a93f371a56c",
"constructorArgs": []
}
},
{
"name": "AdminFacet",
"fullyQualifiedName": "AdminFacet.sol:AdminFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xa28b71d74ace3806bdeefbf201779ff02faa93a53072557195f48184891c6e7a",
"onChain": {
"address": "0xeb91C729D4bD06F41C7624E6ef0a40a828479af2",
"constructorArgs": []
}
},
{
"name": "DiamondLoupeFacet",
"fullyQualifiedName": "DiamondLoupeFacet.sol:DiamondLoupeFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x85c57b442d010fdc6fac3709dfb8492032c80ea8c3deb100ef7c31efa07b6afc",
"onChain": {
"address": "0xd6c79E894570d90739c44c2923F84C276567ABf8",
"constructorArgs": []
}
},
{
"name": "EntityFacet",
"fullyQualifiedName": "EntityFacet.sol:EntityFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xcdfd174f4101691276715984690731b18cf77c5bf618abe10e7f2f6975c1ee27",
"onChain": {
"address": "0x4F10acBA59A206a66713380De02F9c09880A822F",
"constructorArgs": []
}
},
{
"name": "GovernanceFacet",
"fullyQualifiedName": "GovernanceFacet.sol:GovernanceFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xb8a133bbab39cac659afd97b62523a5295b29eb6650bad278915b66451e1761d",
"onChain": {
"address": "0x175a1077Ccdb3bF380db95889610BF6877Fb104C",
"constructorArgs": []
}
},
{
"name": "MarketFacet",
"fullyQualifiedName": "MarketFacet.sol:MarketFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xb747be6d9bdb54e77ee2178b685f4a17f43a86cb1afbb0d09564c818eb45843b",
"onChain": {
"address": "0x76Ab1953794E1a7F522ADaf20112501dFc671b9f",
"constructorArgs": []
}
},
{
"name": "NaymsOwnershipFacet",
"fullyQualifiedName": "NaymsOwnershipFacet.sol:NaymsOwnershipFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x1279a7e82c216675871780c1dbc23b3ca665f7389a740c1300cf19d11fc5661f",
"onChain": {
"address": "0xC0009342F733B8338C933505B3CE3F30285bb439",
"constructorArgs": []
}
},
{
"name": "NaymsTokenFacet",
"fullyQualifiedName": "NaymsTokenFacet.sol:NaymsTokenFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x3e10bb5f3a1748cc69f5114837d1653b734a99fc2cbe007cdf7f0a2eb0306140",
"onChain": {
"address": "0xfADB5dB5d08BBf950256f79C3665CE8d71d8710f",
"constructorArgs": []
}
},
{
"name": "PhasedDiamondCutFacet",
"fullyQualifiedName": "PhasedDiamondCutFacet.sol:PhasedDiamondCutFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xc14993efb502e609942b9c7e4b4faacbe4ba8747139d4cfb6c6678e36f7549fe",
"onChain": {
"address": "0x60EA14Bad701260fAE76F97639BC568F4e750b29",
"constructorArgs": []
}
},
{
"name": "SimplePolicyFacet",
"fullyQualifiedName": "SimplePolicyFacet.sol:SimplePolicyFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x384a579bd0e009d9d436f73de8688258fe3696d15bd0130c044bac2d9282d96f",
"onChain": {
"address": "0x2F64b09a41b400a58D4485f08f6BCF14D944Ad6f",
"constructorArgs": []
}
},
{
"name": "SystemFacet",
"fullyQualifiedName": "SystemFacet.sol:SystemFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x2298c5e31baa37b4feaa9c6a5bd22045bf608a0e97207d78d7b0b9e15ba6b2c7",
"onChain": {
"address": "0xE8737e94DcaA61B3354644D3a7177d91Abb7fBC0",
"constructorArgs": []
}
},
{
"name": "TokenizedVaultFacet",
"fullyQualifiedName": "TokenizedVaultFacet.sol:TokenizedVaultFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xdfd36c1a2b72d171484e4a283ef3c3a456c69d5605cbb790607277715cb3e470",
"onChain": {
"address": "0xC09f543dD405347105146BfD5b799233c69A7C70",
"constructorArgs": []
}
},
{
"name": "TokenizedVaultIOFacet",
"fullyQualifiedName": "TokenizedVaultIOFacet.sol:TokenizedVaultIOFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0xa0bcb041d3e47ffb3fd65b99baa88fa7ca7744d4632fd12b1e8d3c0815d0d8eb",
"onChain": {
"address": "0x0c6815cEB188B0d877B08CF4B1F850Ed0F0929F0",
"constructorArgs": []
}
},
{
"name": "UserFacet",
"fullyQualifiedName": "UserFacet.sol:UserFacet",
"sender": "0x931c3aC09202650148Edb2316e97815f904CF4fa",
"txHash": "0x71e27a9f3b81a27cd07fe76960baf21e5b8c6c5deae867074299f93e769779a1",
"onChain": {
"address": "0xfc12A71BF96d541F439C79E3F16654e1c9B97935",
"constructorArgs": []
}
},
{
"name": "DiamondProxy",
"fullyQualifiedName": "DiamondProxy.sol:DiamondProxy",
Expand Down Expand Up @@ -524,4 +668,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion src/libs/LibTokenizedVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ library LibTokenizedVault {
return s.lockedBalances[_accountId][_tokenId];
}

function _totalDividends(bytes32 _tokenId, bytes32 _dividendDenominationId) external view returns (uint256) {
function _totalDividends(bytes32 _tokenId, bytes32 _dividendDenominationId) internal view returns (uint256) {
AppStorage storage s = LibAppStorage.diamondStorage();

return s.totalDividends[_tokenId][_dividendDenominationId];
Expand Down

0 comments on commit 1e1a2ac

Please sign in to comment.