diff --git a/build/contracts/BEBadge.json b/build/contracts/BEBadge.json index 38f0d05..ed0ce38 100644 --- a/build/contracts/BEBadge.json +++ b/build/contracts/BEBadge.json @@ -31100,7 +31100,7 @@ } }, "schemaVersion": "3.4.10", - "updatedAt": "2023-06-26T03:51:12.352Z", + "updatedAt": "2023-06-26T04:38:01.534Z", "devdoc": { "kind": "dev", "methods": { diff --git a/build/contracts/IMetaData.json b/build/contracts/IMetaData.json new file mode 100644 index 0000000..69228fb --- /dev/null +++ b/build/contracts/IMetaData.json @@ -0,0 +1,211 @@ +{ + "contractName": "IMetaData", + "abi": [ + { + "inputs": [ + { + "internalType": "address", + "name": "token", + "type": "address" + }, + { + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" + } + ], + "name": "getMetaData", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + } + ], + "metadata": "{\"compiler\":{\"version\":\"0.8.10+commit.fc410830\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"tokenId\",\"type\":\"uint256\"}],\"name\":\"getMetaData\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"project:/contracts/interfaces/IMetaData.sol\":\"IMetaData\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"project:/contracts/interfaces/IMetaData.sol\":{\"keccak256\":\"0x30907dd89502219f11e6a2584bdcadecd842115ba17db1a86d3e5a43acdb8662\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e719ea33d0f10b6094da881360bc033248e90d0f6c85d590762c6b8e555e8bb2\",\"dweb:/ipfs/Qmf4MV5wH2fsE4nwheutoMKSZmoGghZrnr5pzgWMgm3Q9D\"]}},\"version\":1}", + "bytecode": "0x", + "deployedBytecode": "0x", + "immutableReferences": {}, + "generatedSources": [], + "deployedGeneratedSources": [], + "sourceMap": "", + "deployedSourceMap": "", + "source": "// SPDX-License-Identifier: MIT\r\npragma solidity 0.8.10;\r\n\r\ninterface IMetaData {\r\n function getMetaData(\r\n address token,\r\n uint256 tokenId\r\n ) external view returns (string memory);\r\n}\r\n", + "sourcePath": "D:\\res\\CEBG\\becrypto\\contracts\\interfaces\\IMetaData.sol", + "ast": { + "absolutePath": "project:/contracts/interfaces/IMetaData.sol", + "exportedSymbols": { + "IMetaData": [ + 2345 + ] + }, + "id": 2346, + "license": "MIT", + "nodeType": "SourceUnit", + "nodes": [ + { + "id": 2335, + "literals": [ + "solidity", + "0.8", + ".10" + ], + "nodeType": "PragmaDirective", + "src": "33:23:13" + }, + { + "abstract": false, + "baseContracts": [], + "canonicalName": "IMetaData", + "contractDependencies": [], + "contractKind": "interface", + "fullyImplemented": false, + "id": 2345, + "linearizedBaseContracts": [ + 2345 + ], + "name": "IMetaData", + "nameLocation": "70:9:13", + "nodeType": "ContractDefinition", + "nodes": [ + { + "functionSelector": "f666196d", + "id": 2344, + "implemented": false, + "kind": "function", + "modifiers": [], + "name": "getMetaData", + "nameLocation": "94:11:13", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2340, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2337, + "mutability": "mutable", + "name": "token", + "nameLocation": "120:5:13", + "nodeType": "VariableDeclaration", + "scope": 2344, + "src": "112:13:13", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2336, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "112:7:13", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "visibility": "internal" + }, + { + "constant": false, + "id": 2339, + "mutability": "mutable", + "name": "tokenId", + "nameLocation": "140:7:13", + "nodeType": "VariableDeclaration", + "scope": 2344, + "src": "132:15:13", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2338, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "132:7:13", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "visibility": "internal" + } + ], + "src": "105:47:13" + }, + "returnParameters": { + "id": 2343, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2342, + "mutability": "mutable", + "name": "", + "nameLocation": "-1:-1:-1", + "nodeType": "VariableDeclaration", + "scope": 2344, + "src": "176:13:13", + "stateVariable": false, + "storageLocation": "memory", + "typeDescriptions": { + "typeIdentifier": "t_string_memory_ptr", + "typeString": "string" + }, + "typeName": { + "id": 2341, + "name": "string", + "nodeType": "ElementaryTypeName", + "src": "176:6:13", + "typeDescriptions": { + "typeIdentifier": "t_string_storage_ptr", + "typeString": "string" + } + }, + "visibility": "internal" + } + ], + "src": "175:15:13" + }, + "scope": 2345, + "src": "85:106:13", + "stateMutability": "view", + "virtual": false, + "visibility": "external" + } + ], + "scope": 2346, + "src": "60:134:13", + "usedErrors": [] + } + ], + "src": "33:163:13" + }, + "compiler": { + "name": "solc", + "version": "0.8.10+commit.fc410830.Emscripten.clang" + }, + "networks": {}, + "schemaVersion": "3.4.10", + "updatedAt": "2023-06-26T04:38:01.520Z", + "devdoc": { + "kind": "dev", + "methods": {}, + "version": 1 + }, + "userdoc": { + "kind": "user", + "methods": {}, + "version": 1 + } +} \ No newline at end of file diff --git a/build/contracts/JSONMetadata.json b/build/contracts/JSONMetadata.json index 9dc177e..6aa2fd5 100644 --- a/build/contracts/JSONMetadata.json +++ b/build/contracts/JSONMetadata.json @@ -10710,7 +10710,7 @@ }, "networks": {}, "schemaVersion": "3.4.10", - "updatedAt": "2023-06-26T03:51:47.475Z", + "updatedAt": "2023-06-26T04:37:34.730Z", "devdoc": { "kind": "dev", "methods": { diff --git a/init_scripts/generate_badge.js b/init_scripts/generate_badge.js index 871c737..d60934a 100644 --- a/init_scripts/generate_badge.js +++ b/init_scripts/generate_badge.js @@ -5,10 +5,10 @@ module.exports = async function main(callback) { let account = "0x93Ee7F7eBAeF20613cFc0137f64Df0157b5fFa69"; const badgeInstance = await Badge.deployed(); { - await badgeInstance.batchMint(account, 1); + // await badgeInstance.batchMint(account, 1); console.log(`success mint`); } - await badgeInstance.updateBaseURI("https://gateway.pinata.cloud/ipfs/QmY6AS9NwbZERqoRRfLUwqwwBRepAhu2M4hkj39XRUfYro"); + await badgeInstance.updateBaseURI("https://gateway.pinata.cloud/ipfs/QmRWDE2y8Zw32tQYtwaCT8JtJJVrGnQoNj4AbKyTPF4Atb"); console.log("update uri over!") callback(0); } catch (err) { diff --git a/migrations/8_deploy_claim_activity.js b/migrations/8_deploy_claim_activity.js index 49ef50b..37df25f 100644 --- a/migrations/8_deploy_claim_activity.js +++ b/migrations/8_deploy_claim_activity.js @@ -7,57 +7,57 @@ const config = require("../config/config"); module.exports = async function (deployer, network, accounts) { const name = "Gacha"; const symbol = "GACHA"; - await deployer.deploy(Box, name, symbol, 0); + // await deployer.deploy(Box, name, symbol, 0); const gachaInstance = await Box.deployed(); if (gachaInstance) { console.log("claim box successfully deployed."); } - base.updateArray({ - name: "Gacha", - type: "erc721", - json: "assets/contracts/BEBadge.json", - address: gachaInstance.address, - network, - }); + // base.updateArray({ + // name: "Gacha", + // type: "erc721", + // json: "assets/contracts/BEBadge.json", + // address: gachaInstance.address, + // network, + // }); - await deployer.deploy(Factory); + // await deployer.deploy(Factory); const factoryInstance = await Factory.deployed(); if (factoryInstance) { console.log("claim box factory successfully deployed."); } - base.updateArray({ - name: "ClaimGachaFactory", - type: "logic", - json: "assets/contracts/ClaimBoxFactory.json", - address: factoryInstance.address, - network, - }); + // base.updateArray({ + // name: "ClaimGachaFactory", + // type: "logic", + // json: "assets/contracts/ClaimBoxFactory.json", + // address: factoryInstance.address, + // network, + // }); - await deployer.deploy(Metadata); + // await deployer.deploy(Metadata); const metadataInstance = await Metadata.deployed(); if (metadataInstance) { console.log("metadataInstance successfully deployed."); } - base.updateArray({ - name: "JSONMetadata", - type: "logic", - json: "assets/contracts/JSONMetadata.json", - address: metadataInstance.address, - network, - }); + // base.updateArray({ + // name: "JSONMetadata", + // type: "logic", + // json: "assets/contracts/JSONMetadata.json", + // address: metadataInstance.address, + // network, + // }); - await gachaInstance.setMintRole(factoryInstance.address); + // await gachaInstance.setMintRole(factoryInstance.address); console.log( `success set mint role to: ${factoryInstance.address} claim box ` ); - await factoryInstance.addTokenSupport(gachaInstance.address); + // await factoryInstance.addTokenSupport(gachaInstance.address); console.log(`success add token support to: ${gachaInstance.address}`); - await factoryInstance.updateExecutor(config.admins.admin); + // await factoryInstance.updateExecutor(config.admins.admin); console.log(`success update executor to: ${config.admins.admin}`); - await gachaInstance.updateMetaAddress(metadataInstance.address); + // await gachaInstance.updateMetaAddress(metadataInstance.address); console.log(`success update meta address for: ${gachaInstance.address}`); await metadataInstance.setMetaData( gachaInstance.address, diff --git a/out_arbitrum_one_release.json b/out_arbitrum_one_release.json index 7b5f8d4..1e6ba70 100644 --- a/out_arbitrum_one_release.json +++ b/out_arbitrum_one_release.json @@ -3,12 +3,18 @@ "name": "Gacha", "type": "erc721", "json": "assets/contracts/BEBadge.json", - "address": "0x24d88d25EC6A240aC836fD405d73081102e434EE" + "address": "0x3F13F83E6363D97d0353cAAfACA08B05D9BF3637" }, { "name": "ClaimGachaFactory", "type": "logic", "json": "assets/contracts/ClaimBoxFactory.json", - "address": "0xcb5ce7F377053AF487Ca5995ec06AD5ED49b9D46" + "address": "0x8E2ab40CA9dc6871131AacC1F82bf73B28DB75F9" + }, + { + "name": "JSONMetadata", + "type": "logic", + "json": "assets/contracts/JSONMetadata.json", + "address": "0xB628D151790Dde4A645469350089aCE8628e8Aa4" } ] \ No newline at end of file diff --git a/package.json b/package.json index ec1b2e5..415b2fd 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "update:nft_setting": "npx truffle exec --network arbitrum_testnet ./init_scripts/update_nft_setting.js", "mint_presale:dev": "npx truffle exec --network development ./init_scripts/generate_presalebox.js", "mint_badge:one": "npx truffle exec --network arbitrum_one ./init_scripts/generate_badge.js", - "gacha_deploy:one": "DEPLOY_ENV=release truffle migrate --network arbitrum_one -f 8 --to 8 --compile-none", + "gacha_deploy:one": "truffle migrate --network arbitrum_one -f 8 --to 8 --compile-none", "size": "truffle run contract-size" }, "author": "", diff --git a/truffle-config.js b/truffle-config.js index b1fea6a..d2fb49d 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -158,8 +158,8 @@ module.exports = { production: true, disableConfirmationListener: true, from: arbOneAddr, - gas: 1000000, // Gas sent with each transaction (default: ~6700000) - gasPrice: 5000000000, // 20 gwei (in wei) (default: 100 gwei) + gas: 20000000, // Gas sent with each transaction (default: ~6700000) + gasPrice: 100000000, // 20 gwei (in wei) (default: 100 gwei) }, kcc_testnet: { provider: () =>