Skip to content

Commit

Permalink
Merge pull request #173 from 1inch/deploy/kyc-nft
Browse files Browse the repository at this point in the history
[SC-1261] Redeploy KycNFT
  • Loading branch information
ZumZoom authored Aug 29, 2024
2 parents e3850b2 + 725d80a commit ad0977d
Show file tree
Hide file tree
Showing 16 changed files with 344 additions and 481 deletions.
6 changes: 3 additions & 3 deletions contracts/KycNFT.sol
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ contract KycNFT is Ownable, ERC721Burnable {
* @param to The address to transfer the token to.
* @param tokenId The ID of the token to be transferred.
*/
function transferFrom(address from, address to, uint256 tokenId) public override onlyOwner() {
function transferFrom(address from, address to, uint256 tokenId) public override onlyOwner {
_transfer(from, to, tokenId);
}

Expand All @@ -67,15 +67,15 @@ contract KycNFT is Ownable, ERC721Burnable {
* @param tokenId The ID of the token to be minted.
*/
function mint(address to, uint256 tokenId) external onlyOwner {
_safeMint(to, tokenId);
_mint(to, tokenId);
}

/**
* @notice See {mint} method. This function using a valid owner's signature instead of only owner permission.
* @param signature The signature of the owner permitting the mint.
*/
function mint(address to, uint256 tokenId, bytes calldata signature) external onlyOwnerSignature(to, tokenId, signature) {
_safeMint(to, tokenId);
_mint(to, tokenId);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion deploy/deploy-kyc-nft.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
contractName: 'KycNFT',
constructorArgs: ['Resolver Access Token', 'RES', '0x56E44874F624EbDE6efCc783eFD685f0FBDC6dcF'],
create3Deployer: '0xD935a2bb926019E0ed6fb31fbD5b1Bbb7c05bf65',
salt: '0x6a836dae74a446aa8cb5d26951222246d1cad2d4a744b961f7986bf35f4d35d7',
salt: '0x66339c4a68cbacc2ed7a777541e493b2d1cad2d4a744b961f7986bf35f4d35d7',
deployments,
skipVerify: network.name === 'klaytn',
});
Expand Down
36 changes: 18 additions & 18 deletions deployments/arbitrum/KycNFT.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions deployments/aurora/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/avax/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/base/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/bsc/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/fantom/KycNFT.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions deployments/klaytn/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/mainnet/KycNFT.json

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions deployments/matic/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/optimistic/KycNFT.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions deployments/xdai/KycNFT.json

Large diffs are not rendered by default.

93 changes: 48 additions & 45 deletions deployments/zksync/KycNFT.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"@openzeppelin/contracts": "5.0.2"
},
"devDependencies": {
"@matterlabs/hardhat-zksync-deploy": "1.3.0",
"@matterlabs/hardhat-zksync-solc": "1.1.4",
"@matterlabs/hardhat-zksync-verify": "1.4.2",
"@matterlabs/hardhat-zksync-deploy": "1.5.0",
"@matterlabs/hardhat-zksync-solc": "1.2.3",
"@matterlabs/hardhat-zksync-verify": "1.6.0",
"@nomicfoundation/hardhat-chai-matchers": "2.0.4",
"@nomicfoundation/hardhat-network-helpers": "1.0.10",
"@nomicfoundation/hardhat-verify": "2.0.3",
Expand All @@ -56,7 +56,7 @@
"ethers": "6.11.0",
"hardhat": "2.19.5",
"hardhat-dependency-compiler": "1.1.3",
"hardhat-deploy": "0.11.45",
"hardhat-deploy": "0.12.4",
"hardhat-gas-reporter": "1.0.10",
"hardhat-tracer": "2.7.0",
"prettier": "3.2.5",
Expand All @@ -65,6 +65,6 @@
"solhint": "4.1.1",
"solidity-coverage": "0.8.7",
"solidity-docgen": "0.5.17",
"zksync-ethers": "6.3.0"
"zksync-ethers": "6.12.0"
}
}
312 changes: 86 additions & 226 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit ad0977d

Please sign in to comment.