Compare commits

..

No commits in common. "0677ee477d15c5b1d19e4ba6d362a822b97ea3c7" and "be76f716b10b59b149c8359079c86276de464c73" have entirely different histories.

2 changed files with 4 additions and 20 deletions

View File

@ -18,9 +18,6 @@ contract CurioERC1155Wrapper is ERC1155, ERC1155Metadata_URI, ERC1155Metadata, E
mapping (uint256 => address) public contracts; mapping (uint256 => address) public contracts;
mapping (uint256 => string) public urls; mapping (uint256 => string) public urls;
string public name = "Masters of the Fediverse";
string public symbol = "MASTERS";
uint96 internal defaultRoyalty = 100; uint96 internal defaultRoyalty = 100;
/** /**
@ -51,22 +48,9 @@ contract CurioERC1155Wrapper is ERC1155, ERC1155Metadata_URI, ERC1155Metadata, E
_setDefaultRoyalty(msg.sender, defaultRoyalty); _setDefaultRoyalty(msg.sender, defaultRoyalty);
} }
function setDefaultRoyalty(address receiver, uint96 feeNumerator) public onlyOwner { function transferOwnership(address newOwner) public override onlyOwner {
_setDefaultRoyalty(receiver, feeNumerator); _setDefaultRoyalty(newOwner, defaultRoyalty);
} super.transferOwnership(newOwner);
function deleteDefaultRoyalty() public onlyOwner {
_deleteDefaultRoyalty();
}
function setTokenRoyalty(uint256 _id, address receiver, uint96 feeNumerator) public onlyOwner {
require(contracts[_id] != address(0), "token does not exist");
_setTokenRoyalty(_id, receiver, feeNumerator);
}
function resetTokenRoyalty(uint256 _id) public onlyOwner {
require(contracts[_id] != address(0), "token does not exist");
_resetTokenRoyalty(_id);
} }
/** /**

View File

@ -54,7 +54,7 @@ module.exports = {
}, },
ubiq: { ubiq: {
provider: () => new HDWalletProvider(mnemonic, "https://rpc.octano.dev"), provider: () => new HDWalletProvider(mnemonic, "https://rpc.octano.dev"),
gas: 6150000, gas: 5500000,
network_id: 8, network_id: 8,
confirmations: 2, confirmations: 2,
timeoutBlocks: 200, timeoutBlocks: 200,