crypto/becrypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改进化事件的结构

Browse Source
This commit is contained in:
zhl 2022-01-13 16:45:34 +08:00
parent dd9d251cba
commit e05c141ad6
13 changed files with 15916 additions and 9661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7406
build/contracts/BEBoxMall.json
View File

File diff suppressed because one or more lines are too long

6
build/contracts/BEChip.json
View File

@ -23922,12 +23922,12 @@
}
},
"links": {},
"address": "0xE35AB2c0988b7Eb2139B5d83412524766cf6a0aE",
"transactionHash": "0xe19ec35e2fe57cbef275dab7a5a76fea7ac845fe9ddc1f235732dcab780e481b"
"address": "0xD833215cBcc3f914bD1C9ece3EE7BF8B14f841bb",
"transactionHash": "0x439993a0c0c706464aa982fedace2335ae425a7a468c8cac7a3933c086140fb1"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.337Z",
"updatedAt": "2022-01-13T08:43:45.768Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

6
build/contracts/BECoin.json
View File

@ -18080,12 +18080,12 @@
}
},
"links": {},
"address": "0xAD5D74570Ad4ce647FB3a46426aA33bDAD614E55",
"transactionHash": "0xc713f2402f6c9ac9475f92fc06f817a40e58e682e72d12f91f97ed791efa740c"
"address": "0xCfEB869F69431e42cdB54A4F4f105C19C080A601",
"transactionHash": "0x95d266d505c8a80c5d1c7add0b73516fcfa4f52fe796135c02ab771c3ec9fd8d"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.378Z",
"updatedAt": "2022-01-13T08:43:45.807Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

6
build/contracts/BEEquipment.json
View File

@ -23922,12 +23922,12 @@
}
},
"links": {},
"address": "0xEe3C6D9eE4a7BF7719355941ea114231C83149bC",
"transactionHash": "0x262461199049b8b9ca5cc798569c2ea56c1ce27218c9f3da37c927d3e1ca9638"
"address": "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550",
"transactionHash": "0x568c57b5e3be920ccf720b54dfeb522b33430a84cecbc510e58b9a5b406fc91c"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.319Z",
"updatedAt": "2022-01-13T08:43:45.751Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

6
build/contracts/BEHero.json
View File

@ -23928,12 +23928,12 @@
}
},
"links": {},
"address": "0xcC7561AcfE97B1F155d37E6891BF2f3Dd1fF36ca",
"transactionHash": "0x3218f234bf42ec24b7238e9a5993c2c560f568c170ef1fb0ba1d5067c5dd2d23"
"address": "0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B",
"transactionHash": "0xa4a0ee161ab9f333a690e325b982eb498d63fb627f7de2ba619213e06d47fa1d"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.303Z",
"updatedAt": "2022-01-13T08:43:45.735Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

5530
build/contracts/EvolveProxy.json
View File

File diff suppressed because one or more lines are too long

2390
build/contracts/HasSignature.json
View File

File diff suppressed because one or more lines are too long

5730
build/contracts/IBurnableERC721.json Normal file
View File

File diff suppressed because one or more lines are too long

4470
build/contracts/MarketPlace.json
View File

File diff suppressed because one or more lines are too long

6
build/contracts/Migrations.json
View File

@ -2323,12 +2323,12 @@
"1338": {
"events": {},
"links": {},
"address": "0x6078d24213D93A12d8e315b799c8c60E0EeE0490",
"transactionHash": "0xb242b36c10edf8000a85589ca4c8cbf7296a2f0feac00e4fff4524910b006aed"
"address": "0xe78A0F7E598Cc8b0Bb87894B0F60dD2a88d6a8Ab",
"transactionHash": "0xc62fd784e5fc778af0987072f3c3560722e4a573ed440c86ade7973a92477328"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.407Z",
"updatedAt": "2022-01-13T08:43:45.832Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

6
build/contracts/MinterFactory.json
View File

@ -8953,12 +8953,12 @@
}
},
"links": {},
"address": "0x6d9cAe6ad50C270C3E8261529FE3Bc257C8f7FA1",
"transactionHash": "0x267d1ebe3ef001598cee7aba47294ea4b28c8fa99b180b781b674d3d929b4c5e"
"address": "0x9561C133DD8580860B6b7E504bC5Aa500f0f06a7",
"transactionHash": "0x05bb6da3b63a909ac145cd163885f1720d110bf77d251500c4b935394029874a"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-01-12T09:15:06.350Z",
"updatedAt": "2022-01-13T08:43:45.782Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

12
contracts/EvolveProxy.sol
View File

@ -17,7 +17,9 @@ contract EvolveProxy is Ownable, Initializable {
event TokenEvolved(
address contractAddress,
address owner,
uint256[3] tokenIds
uint256 indexed tokenEvolved,
uint256 tokenBurned,
uint256 chip
);
@ -29,7 +31,7 @@ contract EvolveProxy is Ownable, Initializable {
/**
* @dev evolve function to Blissful Elites Hero NFT
* tokenIds: [hero_to_evolve, hero_for_food, chip]
* tokenIds: [hero_to_evolve, hero_for_burn, chip]
*/
function evolveHero(address owner, uint256[3] calldata tokenIds) public onlyOwner returns (bool){
require(publicEvolveAllowed);
@ -37,13 +39,13 @@ contract EvolveProxy is Ownable, Initializable {
if (tokenIds[2] > 0) {
chip.burn(owner, tokenIds[1]);
}
emit TokenEvolved(address(hero), owner, tokenIds);
emit TokenEvolved(address(hero), owner, tokenIds[0], tokenIds[1], tokenIds[2]);
return true;
}
/**
* @dev evolve function to Blissful Elites Equip NFT
* tokenIds: [equip_to_evolve, equip_for_food, chip]
* tokenIds: [equip_to_evolve, equip_for_burn, chip]
*/
function evolveEquip(address owner, uint256[3] calldata tokenIds) public onlyOwner returns (bool){
require(publicEvolveAllowed);
@ -51,7 +53,7 @@ contract EvolveProxy is Ownable, Initializable {
if (tokenIds[2] > 0) {
chip.burn(owner, tokenIds[1]);
}
emit TokenEvolved(address(equip), owner, tokenIds);
emit TokenEvolved(address(equip), owner, tokenIds[0], tokenIds[1], tokenIds[2]);
return true;
}

3
migrations/2_deploy_all.js
View File

@ -128,6 +128,9 @@ module.exports = async function (deployer, network, accounts) {
jsons.push({name: 'mall', json: 'assets/contracts/BEBoxMall.json', address: boxInstance.address})
jsons.push({name: 'proxy', json: 'assets/contracts/EvolveProxy.json', address: proxyInstance.address})
console.log(jsons);
console.log(`export const userAddress = '${accounts[0]}';`)
console.log(`export const privateKey = '';`)
console.log(`export const userBuyAddress = '${accounts[1]}';`)
}
};