Skip to content

Commit fa1b06a

Browse files
committed
fix example
1 parent 053c3e4 commit fa1b06a

11 files changed

+8638
-31
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bring Real World Assets (RWA) on-chain via flexible tokenization framework - Tok
77

88
TokenF and NFTF architecture:
99

10-
!["AssetF Architecture"](https://github.com/user-attachments/assets/5594c199-db9b-4aa3-b16a-5b464621311c)
10+
!["AssetF Architecture"](https://github.com/user-attachments/assets/7d63be40-4211-43ad-b08e-7a39c53da2a9)
1111

1212
Built with [Solarity](https://github.com/dl-solarity), [OpenZeppelin](https://github.com/OpenZeppelin/openzeppelin-contracts), and aspiration to perfection.
1313

examples/equity-token/contracts/EquityToken.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.21;
33

4-
import {TokenF} from "@tokenf/contracts/core/TokenF.sol";
4+
import {TokenF} from "@tokenf/contracts/TokenF.sol";
55

66
contract EquityToken is TokenF {
77
function __EquityToken_init(

examples/equity-token/contracts/EquityKYCCompliance.sol renamed to examples/equity-token/contracts/facets/KYCComplianceFacet.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.21;
33

44
import {KYCCompliance} from "@tokenf/contracts/core/KYCCompliance.sol";
55

6-
contract EquityKYCCompliance is KYCCompliance {
7-
function __EquityKYCCompliance_init() external onlyInitializing {
6+
contract KYCComplianceFacet is KYCCompliance {
7+
function __KYCComplianceFacet_init() external onlyInitializing {
88
__KYCCompliance_init();
99
}
1010
}

examples/equity-token/contracts/EquityRegulatoryCompliance.sol renamed to examples/equity-token/contracts/facets/RegulatoryComplianceFacet.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.21;
33

44
import {RegulatoryCompliance} from "@tokenf/contracts/core/RegulatoryCompliance.sol";
55

6-
contract EquityRegulatoryCompliance is RegulatoryCompliance {
7-
function __EquityRegulatoryCompliance_init() external onlyInitializing {
6+
contract RegulatoryComplianceFacet is RegulatoryCompliance {
7+
function __RegulatoryComplianceFacet_init() external onlyInitializing {
88
__RegulatoryCompliance_init();
99
}
1010
}

examples/equity-token/contracts/LandERC721TransferLimitsModule.sol renamed to examples/equity-token/contracts/modules/LandERC721TransferLimitsModule.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.21;
33

4-
import {IAssetF} from "@tokenf/contracts/contracts/interfaces/IAssetF.sol";
5-
import {ERC721TransferLimitsModule} from "@tokenf/contracts/contracts/modules/regulatory/ERC721TransferLimitsModule.sol";
4+
import {IAssetF} from "@tokenf/contracts/interfaces/IAssetF.sol";
5+
import {ERC721TransferLimitsModule} from "@tokenf/contracts/modules/regulatory/ERC721TransferLimitsModule.sol";
66

77
contract LandERC721TransferLimitsModule is ERC721TransferLimitsModule {
88
uint256 public constant MAX_TRANSFERS_PER_PERIOD = 10;

examples/equity-token/deploy/1_equity-token.migration.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Deployer, Reporter } from "@solarity/hardhat-migrate";
22

33
import {
4-
EquityKYCCompliance,
5-
EquityKYCCompliance__factory,
4+
KYCComplianceFacet,
5+
KYCComplianceFacet__factory,
66
EquityRarimoModule,
77
EquityRarimoModule__factory,
8-
EquityRegulatoryCompliance,
9-
EquityRegulatoryCompliance__factory,
8+
RegulatoryComplianceFacet,
9+
RegulatoryComplianceFacet__factory,
1010
EquityToken,
1111
EquityToken__factory,
1212
EquityERC20TransferLimitsModule,
@@ -17,15 +17,15 @@ import {
1717

1818
async function setupCoreContracts(
1919
deployer: Deployer,
20-
): Promise<[EquityToken, EquityKYCCompliance, EquityRegulatoryCompliance]> {
20+
): Promise<[EquityToken, KYCComplianceFacet, RegulatoryComplianceFacet]> {
2121
const tokenF = await deployer.deploy(EquityToken__factory);
22-
const kycCompliance = await deployer.deploy(EquityKYCCompliance__factory);
23-
const regulatoryCompliance = await deployer.deploy(EquityRegulatoryCompliance__factory);
22+
const kycCompliance = await deployer.deploy(KYCComplianceFacet__factory);
23+
const regulatoryCompliance = await deployer.deploy(RegulatoryComplianceFacet__factory);
2424

2525
const regulatoryComplianceInitData = regulatoryCompliance.interface.encodeFunctionData(
26-
"__EquityRegulatoryCompliance_init",
26+
"__RegulatoryComplianceFacet_init",
2727
);
28-
const kycComplianceInitData = kycCompliance.interface.encodeFunctionData("__EquityKYCCompliance_init");
28+
const kycComplianceInitData = kycCompliance.interface.encodeFunctionData("__KYCComplianceFacet_init");
2929

3030
await tokenF.__EquityToken_init(
3131
regulatoryCompliance,
@@ -36,8 +36,8 @@ async function setupCoreContracts(
3636

3737
return [
3838
tokenF,
39-
kycCompliance.attach(tokenF) as EquityKYCCompliance,
40-
regulatoryCompliance.attach(tokenF) as EquityRegulatoryCompliance,
39+
kycCompliance.attach(tokenF) as KYCComplianceFacet,
40+
regulatoryCompliance.attach(tokenF) as RegulatoryComplianceFacet,
4141
];
4242
}
4343

examples/equity-token/deploy/2_equity-nft.migration.ts renamed to examples/equity-token/deploy/2_land-nft.migration.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
import { Deployer, Reporter } from "@solarity/hardhat-migrate";
22

33
import {
4-
EquityKYCCompliance,
5-
EquityKYCCompliance__factory,
4+
KYCComplianceFacet,
5+
KYCComplianceFacet__factory,
66
LandNFT,
77
LandNFT__factory,
88
EquityRarimoModule,
99
EquityRarimoModule__factory,
10-
EquityRegulatoryCompliance__factory,
10+
RegulatoryComplianceFacet,
11+
RegulatoryComplianceFacet__factory,
1112
RarimoSBT,
1213
RarimoSBT__factory,
13-
EquityRegulatoryCompliance,
1414
LandERC721TransferLimitsModule,
1515
LandERC721TransferLimitsModule__factory,
1616
} from "@ethers-v6";
1717

1818
async function setupCoreContracts(
1919
deployer: Deployer,
20-
): Promise<[LandNFT, EquityKYCCompliance, EquityRegulatoryCompliance]> {
20+
): Promise<[LandNFT, KYCComplianceFacet, RegulatoryComplianceFacet]> {
2121
const nftF = await deployer.deploy(LandNFT__factory);
22-
const kycCompliance = await deployer.deploy(EquityKYCCompliance__factory);
23-
const regulatoryCompliance = await deployer.deploy(EquityRegulatoryCompliance__factory);
22+
const kycCompliance = await deployer.deploy(KYCComplianceFacet__factory);
23+
const regulatoryCompliance = await deployer.deploy(RegulatoryComplianceFacet__factory);
2424

2525
const regulatoryComplianceInitData = regulatoryCompliance.interface.encodeFunctionData(
26-
"__EquityRegulatoryCompliance_init",
26+
"__RegulatoryComplianceFacet_init",
2727
);
28-
const kycComplianceInitData = kycCompliance.interface.encodeFunctionData("__EquityKYCCompliance_init");
28+
const kycComplianceInitData = kycCompliance.interface.encodeFunctionData("__KYCComplianceFacet_init");
2929

3030
await nftF.__LandNFT_init(regulatoryCompliance, kycCompliance, regulatoryComplianceInitData, kycComplianceInitData);
3131

3232
return [
3333
nftF,
34-
kycCompliance.attach(nftF) as EquityKYCCompliance,
35-
regulatoryCompliance.attach(nftF) as EquityRegulatoryCompliance,
34+
kycCompliance.attach(nftF) as KYCComplianceFacet,
35+
regulatoryCompliance.attach(nftF) as RegulatoryComplianceFacet,
3636
];
3737
}
3838

0 commit comments

Comments
 (0)