Skip to content

Commit

Permalink
fixing didregistry / erc1155 mess
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrsmkl
mrsmkl committed Nov 30, 2021
1 parent f0dae8c commit 37ae953
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 46 deletions.
14 changes: 7 additions & 7 deletions contracts/conditions/NFTs/NFTHolderCondition.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import './INFTHolder.sol';
*/
contract NFTHolderCondition is Condition, INFTHolder {

ERC1155BurnableUpgradeable private nftRegistry;
ERC1155BurnableUpgradeable private erc1155;

bytes32 private constant CONDITION_TYPE = keccak256('NFTHolderCondition');

Expand All @@ -28,19 +28,19 @@ contract NFTHolderCondition is Condition, INFTHolder {
* initialization.
* @param _owner contract's owner account address
* @param _conditionStoreManagerAddress condition store manager address
* @param _didRegistryAddress DIDRegistry address
* @param _ercAddress Nevermined ERC-1155 address
*/
function initialize(
address _owner,
address _conditionStoreManagerAddress,
address _didRegistryAddress
address _ercAddress
)
external
initializer()
{
require(
_owner != address(0) &&
_didRegistryAddress != address(0) &&
_ercAddress != address(0) &&
_conditionStoreManagerAddress != address(0),
'Invalid address'
);
Expand All @@ -49,7 +49,7 @@ contract NFTHolderCondition is Condition, INFTHolder {
conditionStoreManager = ConditionStoreManager(
_conditionStoreManagerAddress
);
nftRegistry = ERC1155BurnableUpgradeable(_didRegistryAddress);
erc1155 = ERC1155BurnableUpgradeable(_ercAddress);
}

/**
Expand All @@ -69,7 +69,7 @@ contract NFTHolderCondition is Condition, INFTHolder {
view
returns (bytes32)
{
return hashValues(_did, _holderAddress, _amount, address(nftRegistry));
return hashValues(_did, _holderAddress, _amount, address(erc1155));
}

function hashValues(
Expand Down Expand Up @@ -105,7 +105,7 @@ contract NFTHolderCondition is Condition, INFTHolder {
public
returns (ConditionStoreLibrary.ConditionState)
{
return fulfill(_agreementId, _did, _holderAddress, _amount, address(nftRegistry));
return fulfill(_agreementId, _did, _holderAddress, _amount, address(erc1155));
}

function fulfill(
Expand Down
16 changes: 8 additions & 8 deletions contracts/conditions/NFTs/NFTLockCondition.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.
*/
contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IERC1155ReceiverUpgradeable {

IERC1155Upgradeable private registry;
IERC1155Upgradeable private erc1155;

bytes32 constant public CONDITION_TYPE = keccak256('NFTLockCondition');

Expand All @@ -37,19 +37,19 @@ contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IE
* initialization.
* @param _owner contract's owner account address
* @param _conditionStoreManagerAddress condition store manager address
* @param _didRegistryAddress DIDRegistry contract address
* @param _ercAddress Nevermined ERC-1155 address
*/
function initialize(
address _owner,
address _conditionStoreManagerAddress,
address _didRegistryAddress
address _ercAddress
)
external
initializer()
{
require(
_conditionStoreManagerAddress != address(0) &&
_didRegistryAddress != address(0),
_ercAddress != address(0),
'Invalid address'
);
OwnableUpgradeable.__Ownable_init();
Expand All @@ -58,7 +58,7 @@ contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IE
_conditionStoreManagerAddress
);

registry = IERC1155Upgradeable(_didRegistryAddress);
erc1155 = IERC1155Upgradeable(_ercAddress);
}

/**
Expand All @@ -78,7 +78,7 @@ contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IE
view
returns (bytes32)
{
return hashValues(_did, _lockAddress, _amount, address(registry));
return hashValues(_did, _lockAddress, _amount, address(erc1155));
}

/**
Expand Down Expand Up @@ -132,7 +132,7 @@ contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IE
public
returns (ConditionStoreLibrary.ConditionState)
{
return fulfill(_agreementId, _did, _lockAddress, _amount, address(registry));
return fulfill(_agreementId, _did, _lockAddress, _amount, address(erc1155));
}

/**
Expand All @@ -159,7 +159,7 @@ contract NFTLockCondition is Condition, INFTLock, ReentrancyGuardUpgradeable, IE
nonReentrant
returns (ConditionStoreLibrary.ConditionState)
{
registry.safeTransferFrom(msg.sender, _lockAddress, uint256(_did), _amount, '');
erc1155.safeTransferFrom(msg.sender, _lockAddress, uint256(_did), _amount, '');

bytes32 _id = generateId(
_agreementId,
Expand Down
8 changes: 4 additions & 4 deletions contracts/conditions/NFTs/TransferNFTCondition.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ contract TransferNFTCondition is Condition, ITransferNFT, ReentrancyGuardUpgrade
* initialization.
* @param _owner contract's owner account address
* @param _conditionStoreManagerAddress condition store manager address
* @param _didRegistryAddress DID Registry address
* @param _ercAddress Nevermined ERC-1155 address
* @param _nftContractAddress Market address
*/
function initialize(
address _owner,
address _conditionStoreManagerAddress,
address _didRegistryAddress,
address _ercAddress,
address _nftContractAddress
)
external
Expand All @@ -46,7 +46,7 @@ contract TransferNFTCondition is Condition, ITransferNFT, ReentrancyGuardUpgrade
require(
_owner != address(0) &&
_conditionStoreManagerAddress != address(0) &&
_didRegistryAddress != address(0),
_ercAddress != address(0),
'Invalid address'
);

Expand All @@ -58,7 +58,7 @@ contract TransferNFTCondition is Condition, ITransferNFT, ReentrancyGuardUpgrade
);

erc1155 = NFTUpgradeable(
_didRegistryAddress
_ercAddress
);

_setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
Expand Down
68 changes: 41 additions & 27 deletions scripts/deploy/truffle-wrapper/deploy/initializeContracts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,28 @@ async function initializeContracts({
verbose
})
}
if (contracts.indexOf('NFT721HolderCondition') > -1) {
addressBook.NFT721HolderCondition = await zosCreate({
contract: 'NFT721HolderCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager')
],
verbose
})
}
if (contracts.indexOf('NFT721HolderCondition') > -1) {
addressBook.NFT721HolderCondition = await zosCreate({
contract: 'NFT721HolderCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager')
],
verbose
})
}
}

if (getAddress('ConditionStoreManager') &&
Expand Down Expand Up @@ -225,29 +247,6 @@ async function initializeContracts({
verbose
})
}
if (contracts.indexOf('NFTHolderCondition') > -1) {
addressBook.NFTHolderCondition = await zosCreate({
contract: 'NFTHolderCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('NFTUpgradeable')
],
verbose
})
}
if (contracts.indexOf('NFT721HolderCondition') > -1) {
addressBook.NFT721HolderCondition = await zosCreate({
contract: 'NFT721HolderCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager')
],
verbose
})
}
if (contracts.indexOf('NFTAccessCondition') > -1) {
addressBook.NFTAccessCondition = await zosCreate({
contract: 'NFTAccessCondition',
Expand All @@ -273,14 +272,29 @@ async function initializeContracts({
verbose
})
}
}
if (getAddress('ConditionStoreManager') &&
getAddress('NFTUpgradeable')) {
if (contracts.indexOf('NFTHolderCondition') > -1) {
addressBook.NFTHolderCondition = await zosCreate({
contract: 'NFTHolderCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('NFTUpgradeable')
],
verbose
})
}
if (contracts.indexOf('TransferNFTCondition') > -1) {
addressBook.TransferNFTCondition = await zosCreate({
contract: 'TransferNFTCondition',
cache,
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('DIDRegistry'),
getAddress('NFTUpgradeable'),
ZeroAddress
],
verbose
Expand All @@ -294,7 +308,7 @@ async function initializeContracts({
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('DIDRegistry')
getAddress('NFTUpgradeable')
],
verbose
})
Expand All @@ -306,7 +320,7 @@ async function initializeContracts({
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('DIDRegistry')
getAddress('NFTUpgradeable')
],
verbose
})
Expand Down Expand Up @@ -351,7 +365,7 @@ async function initializeContracts({
args: [
roles.ownerWallet,
getAddress('ConditionStoreManager'),
getAddress('DIDRegistry'),
getAddress('NFTUpgradeable'),
getAddress('LockPaymentCondition')
],
verbose
Expand Down

0 comments on commit 37ae953

Please sign in to comment.