diff --git a/likenft/contracts/Class.sol b/likenft/contracts/Class.sol index 353b217..1f06ec8 100644 --- a/likenft/contracts/Class.sol +++ b/likenft/contracts/Class.sol @@ -50,8 +50,6 @@ contract Class is ERC721A, Ownable { $.name = msgNewClass.input.name; $.symbol = msgNewClass.input.symbol; $.data.metadata = msgNewClass.input.metadata; - $.data.parent.type_ = msgNewClass.parent.type_; - $.data.parent.iscn_id_prefix = msgNewClass.parent.iscn_id_prefix; $.data.config = msgNewClass.input.config; } @@ -81,7 +79,6 @@ contract Class is ERC721A, Ownable { for (uint i = 0; i < quantity; i++) { uint256 _tokenId = nextTokenId + i; - nftDataMap[_tokenId].class_parent = $.data.parent; nftDataMap[_tokenId].metadata = metadata_list[i]; } } diff --git a/likenft/scripts/examples/newClass.ts b/likenft/scripts/examples/newClass.ts index ad19094..b855c5f 100644 --- a/likenft/scripts/examples/newClass.ts +++ b/likenft/scripts/examples/newClass.ts @@ -18,11 +18,6 @@ async function newClass() { const tx = await likeNFT.newClass({ creator: signer.address, - parent: { - type_: 1, - iscn_id_prefix: - "iscn://likecoin-chain/FyZ13m_hgwzUC6UoaS3vFdYvdG6QXfajU3vcatw7X1c", - }, input: { name: "《所謂「我不投資」,就是 all in 在法定貨幣》", symbol: "BOOK", diff --git a/likenft/test/LikeNFT.test.ts b/likenft/test/LikeNFT.test.ts index 46ffcb2..bd83676 100644 --- a/likenft/test/LikeNFT.test.ts +++ b/likenft/test/LikeNFT.test.ts @@ -33,11 +33,6 @@ describe("LikeNFT", () => { await likeNFTOwnerSigner .newClass({ creator: this.ownerSigner, - parent: { - type_: 1, - iscn_id_prefix: - "iscn://likecoin-chain/FyZ13m_hgwzUC6UoaS3vFdYvdG6QXfajU3vcatw7X1c/1", - }, input: { name: "My Book", symbol: "KOOB", @@ -78,11 +73,6 @@ describe("LikeNFT", () => { await likeNFTOwnerSigner .newClass({ creator: this.ownerSigner, - parent: { - type_: 1, - iscn_id_prefix: - "iscn://likecoin-chain/FyZ13m_hgwzUC6UoaS3vFdYvdG6QXfajU3vcatw7X1c/1", - }, input: { name: "My Book", symbol: "KOOB", @@ -149,11 +139,6 @@ describe("LikeNFT class operations", () => { likeNFTOwnerSigner .newClass({ creator: this.ownerSigner, - parent: { - type_: 1, - iscn_id_prefix: - "iscn://likecoin-chain/FyZ13m_hgwzUC6UoaS3vFdYvdG6QXfajU3vcatw7X1c/1", - }, input: { name: "My Book", symbol: "KOOB", @@ -376,11 +361,6 @@ describe("LikeNFT token operations", () => { likeNFTOwnerSigner .newClass({ creator: this.ownerSigner, - parent: { - type_: 1, - iscn_id_prefix: - "iscn://likecoin-chain/FyZ13m_hgwzUC6UoaS3vFdYvdG6QXfajU3vcatw7X1c/1", - }, input: { name: "My Book", symbol: "KOOB", diff --git a/likenft/types/Class.sol b/likenft/types/Class.sol index b8b5070..1b0c065 100644 --- a/likenft/types/Class.sol +++ b/likenft/types/Class.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.9; import {ClassConfig} from "./ClassConfig.sol"; -import {ClassParent} from "./ClassParent.sol"; struct ClassStorage { string name; @@ -12,6 +11,5 @@ struct ClassStorage { struct ClassDataStorage { string metadata; - ClassParent parent; ClassConfig config; } diff --git a/likenft/types/ClassParent.sol b/likenft/types/ClassParent.sol deleted file mode 100644 index dcfe4c3..0000000 --- a/likenft/types/ClassParent.sol +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; - -struct ClassParent { - ClassParentType type_; - string iscn_id_prefix; - uint64 iscn_version_at_mint; - address account; -} - -enum ClassParentType { - UNKNOWN, - ISCN, - ACCOUNT -} diff --git a/likenft/types/ClassParentInput.sol b/likenft/types/ClassParentInput.sol deleted file mode 100644 index a4c1508..0000000 --- a/likenft/types/ClassParentInput.sol +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; - -import {ClassParentType} from "./ClassParent.sol"; - -struct ClassParentInput { - ClassParentType type_; - string iscn_id_prefix; -} diff --git a/likenft/types/NFTData.sol b/likenft/types/NFTData.sol index f275347..787cc08 100644 --- a/likenft/types/NFTData.sol +++ b/likenft/types/NFTData.sol @@ -1,9 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.9; -import {ClassParent} from "./ClassParent.sol"; - struct NFTData { string metadata; - ClassParent class_parent; } diff --git a/likenft/types/msgs/MsgNewClass.sol b/likenft/types/msgs/MsgNewClass.sol index 90ebccb..f4ce398 100644 --- a/likenft/types/msgs/MsgNewClass.sol +++ b/likenft/types/msgs/MsgNewClass.sol @@ -2,10 +2,8 @@ pragma solidity ^0.8.9; import {ClassInput} from "../ClassInput.sol"; -import {ClassParentInput} from "../ClassParentInput.sol"; struct MsgNewClass { address creator; - ClassParentInput parent; ClassInput input; }