增加升级英雄或装备时, 当前帐号是否是要升级的nft owner的检查

This commit is contained in:
zhl 2022-01-17 15:25:09 +08:00
parent 43082c1e8a
commit 3f10e62bdd
13 changed files with 7674 additions and 5079 deletions

File diff suppressed because one or more lines are too long

View File

@ -23898,12 +23898,12 @@
}
},
"links": {},
"address": "0xD833215cBcc3f914bD1C9ece3EE7BF8B14f841bb",
"transactionHash": "0x610506d46c1d9bd6111b5eeeb55ca8a989bb920babfb437e93e14e0929f86027"
"address": "0x4b0159075b3a6942AA9B173169982de07511C063",
"transactionHash": "0x89282fefe054d55ae895c01adab9630a41b87f3c94256aed7c43e1320ec6c3a2"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.051Z",
"updatedAt": "2022-01-17T07:22:04.499Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -18080,12 +18080,12 @@
}
},
"links": {},
"address": "0xCfEB869F69431e42cdB54A4F4f105C19C080A601",
"transactionHash": "0x95d266d505c8a80c5d1c7add0b73516fcfa4f52fe796135c02ab771c3ec9fd8d"
"address": "0x8869E6808E298c8A99BB54BAE26A18C5EE2a11A9",
"transactionHash": "0x3215b7816ea7312cb069736cfaa0842e08782c8dd2b6d3cd832aee984d2a850d"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.081Z",
"updatedAt": "2022-01-17T07:22:04.535Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -23898,12 +23898,12 @@
}
},
"links": {},
"address": "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550",
"transactionHash": "0xaad29d56d55e3ca128b8d40318686207f3f678582f7fb47b489690ac471dc084"
"address": "0x0ec016eA87F6026340ac121fcD0c9cdEe9254499",
"transactionHash": "0xab535f67ae2171a9901ffdd8bf2f76a42debcf2a81f69b42e02e733cf1c4b796"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.037Z",
"updatedAt": "2022-01-17T07:22:04.484Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -23904,12 +23904,12 @@
}
},
"links": {},
"address": "0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B",
"transactionHash": "0xfd03d495eeddc5997c72304e3355d532a4c91aff1d5b4b7b2dafa5f7683bbb9e"
"address": "0xCE1393b70A8891a056113E6810134B02DA2Ec674",
"transactionHash": "0xd481d60bf8042a55f32531b29ad2a2d4f70b49360621c1066b55d6023e5f332e"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.025Z",
"updatedAt": "2022-01-17T07:22:04.469Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2323,12 +2323,12 @@
"1338": {
"events": {},
"links": {},
"address": "0xe78A0F7E598Cc8b0Bb87894B0F60dD2a88d6a8Ab",
"transactionHash": "0xc62fd784e5fc778af0987072f3c3560722e4a573ed440c86ade7973a92477328"
"address": "0xF9595A0570deCe5D9f654C1aF648308A5B360A19",
"transactionHash": "0xdb00a999608016e75436182a3acaee323380318ac831ee705e9a383c339cae67"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.103Z",
"updatedAt": "2022-01-17T07:22:04.559Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -8953,12 +8953,12 @@
}
},
"links": {},
"address": "0x9561C133DD8580860B6b7E504bC5Aa500f0f06a7",
"transactionHash": "0x05bb6da3b63a909ac145cd163885f1720d110bf77d251500c4b935394029874a"
"address": "0x982DBFffA7E75CE1aC6F531a040FfF64DE59f5D1",
"transactionHash": "0x21b877ddd70d686dde36e3ffd9f93f9bd747c331edbeca9d3a02c1ee4774051a"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-17T05:52:19.059Z",
"updatedAt": "2022-01-17T07:22:04.509Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -35,6 +35,7 @@ contract EvolveProxy is Ownable, Initializable {
*/
function evolveHero(address to, uint256[3] calldata tokenIds) external {
require(publicEvolveAllowed || _msgSender() == owner());
require(hero.ownerOf(tokenIds[0]) == to, "current address is not owner of this hero now");
hero.burn(to, tokenIds[1]);
if (tokenIds[2] > 0) {
chip.burn(to, tokenIds[2]);
@ -48,6 +49,7 @@ contract EvolveProxy is Ownable, Initializable {
*/
function evolveEquip(address to, uint256[3] calldata tokenIds) external{
require(publicEvolveAllowed || _msgSender() == owner());
require(equip.ownerOf(tokenIds[0]) == to, "current address is not owner of this equipment now");
equip.burn(to, tokenIds[1]);
if (tokenIds[2] > 0) {
chip.burn(to, tokenIds[2]);

View File

@ -15,6 +15,6 @@ contract HasSignature {
);
address recovered = ECDSA.recover(ethSignedMessageHash, signature);
require(recovered == signer, "[BE] invalid seller signature");
require(recovered == signer, "[BE] invalid signature");
}
}