进阶,购买, mint等事件增加nonce

This commit is contained in:
cebgcontract 2022-11-01 10:28:59 +08:00
parent 3632df27d3
commit ec8282b0f7
26 changed files with 44964 additions and 40551 deletions

View File

@ -45539,6 +45539,268 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x0a33c0cb495b2bff686a3ec8d191fcbfa1cd7428140872325d46e427258b083e": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "uint256",
"name": "boxId",
"type": "uint256"
},
{
"indexed": true,
"internalType": "address",
"name": "buyer",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "boxType",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "price",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "paymentToken",
"type": "address"
}
],
"name": "BEBoxPaid",
"type": "event"
},
"0xc2617efa69bab66782fa219543714338489c4e9e178271560a91b82c3f612b58": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "uint256",
"name": "index",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "target",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"indexed": false,
"internalType": "bytes",
"name": "data",
"type": "bytes"
}
],
"name": "CallExecuted",
"type": "event"
},
"0x4cf4410cc57040e44862ef0f45f3dd5a5e02db8eb8add648d4b0e236f1d07dca": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "uint256",
"name": "index",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "target",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"indexed": false,
"internalType": "bytes",
"name": "data",
"type": "bytes"
},
{
"indexed": false,
"internalType": "bytes32",
"name": "predecessor",
"type": "bytes32"
},
{
"indexed": false,
"internalType": "uint256",
"name": "delay",
"type": "uint256"
}
],
"name": "CallScheduled",
"type": "event"
},
"0xbaa1eb22f2a492ba1a5fea61b8df4d27c6c8b5f3971e63bb58fa14ff72eedb70": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "Cancelled",
"type": "event"
},
"0x11c24f4ead16507c69ac467fbd5e4eed5fb5c699626d2cc6d66421df253886d5": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "oldDuration",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "newDuration",
"type": "uint256"
}
],
"name": "MinDelayChange",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
}
},
"links": {},
"address": "0x9095b8e8a5a4E7Fcb7F569dDc325eAB089732B26",
"transactionHash": "0xcad1cc7649d6cf501cd91a3ac63e4b79ce9e0c96baecd772ca0f4a8da4d33e6e"
},
"80001": {
"events": {},
"links": {},
"address": "0xE34c5EA0C3083d11a735DC0609533b92130319F5",
"transactionHash": "0x1210bcc03834e53cbb9b64c2baf22f237d3127fcd11409aa9bba52b1b7411f88"
},
"1660724532588": {
"events": {},
"links": {},
@ -45618,8 +45880,8 @@
"transactionHash": "0xaacc3d8ba7d2cc8a5cba501539ecc556790c2eb9424d53522fa12e8b8fb46e9b"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:18:04.009Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:52.008Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -29225,6 +29225,231 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": false,
"internalType": "bool",
"name": "approved",
"type": "bool"
}
],
"name": "ApprovalForAll",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
"0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256[]",
"name": "ids",
"type": "uint256[]"
},
{
"indexed": false,
"internalType": "uint256[]",
"name": "values",
"type": "uint256[]"
}
],
"name": "TransferBatch",
"type": "event"
},
"0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "id",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "TransferSingle",
"type": "event"
},
"0x6bb7ff708619ba0610cba295a58592e0451dee2622938c8755667688daf3529b": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "string",
"name": "value",
"type": "string"
},
{
"indexed": true,
"internalType": "uint256",
"name": "id",
"type": "uint256"
}
],
"name": "URI",
"type": "event"
}
},
"links": {},
"address": "0xe3eEC5619ec9189E5d27F258Ca68A5c85136E4A6",
"transactionHash": "0xb1795696b6a4a72ae2cc2fc4d9f543209ac05134ac8df14f2f81a6a7736c451a"
},
"80001": {
"events": {},
"links": {},
"address": "0xc058411B15E544291765F15B13c88582b7bceaD0",
"transactionHash": "0x5855ab4f4fe1719a29a179ce9ae135ad1923823f469874a5645ed814c5623a89"
},
"1660724532588": {
"events": {},
"links": {},
@ -29304,8 +29529,8 @@
"transactionHash": "0xfbe283bb3366f9738c1c367206d720bf363fbcbebdcaad0ca8e59ecc28c5251b"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:52.438Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:36.328Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -9635,6 +9635,69 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "spender",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
}
},
"links": {},
"address": "0x72440269630E393d38975Db7fA7Cb4D14e7eC061",
"transactionHash": "0x71310f381430446eafe06dc3118c8f424211bc2d6874a5a316a29aca894914d5"
},
"80001": {
"events": {},
"links": {},
"address": "0xC76c692450d6221A8B1E035CB8bdB639bC60658D",
"transactionHash": "0x949cf9e693d01c4712bd7d6cf710f0b50aa962aeb7a8047d31f510004a102a6a"
},
"1660724532588": {
"events": {},
"links": {},
@ -9714,8 +9777,8 @@
"transactionHash": "0x400b62e208d61ab31e85685fdf3ecc0b2e114d00fd475117cfafeef1af6f1328"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:42.147Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:22.607Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -22245,6 +22245,182 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "approved",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
"0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": false,
"internalType": "bool",
"name": "approved",
"type": "bool"
}
],
"name": "ApprovalForAll",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
}
},
"links": {},
"address": "0xE1c08596DEb9465184820f2815182157db42757B",
"transactionHash": "0x6abc23b1eaa44c7de109f247d3e2fa4efa6851546ec44ffadde3bacfb2bfdf2e"
},
"1660724532588": {
"events": {},
"links": {},
@ -22324,8 +22500,8 @@
"transactionHash": "0xf3a6ef59fbeb987b4ef4432b654e78345d5e7973fdcd5a525cd05f8e7db9138b"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:49.869Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:32.669Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -11683,6 +11683,114 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "spender",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0x62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "Paused",
"type": "event"
},
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
},
"0x5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "Unpaused",
"type": "event"
}
},
"links": {},
"address": "0xFA64858C14345C0a3aD805E0da64900C4d7ec5e6",
"transactionHash": "0x51ce82e367711959596d049ba18a80ab61cdb6326dc84b887e90e7fd57ee4915"
},
"80001": {
"events": {},
"links": {},
"address": "0x9895D4A938111A747C543CBE5e7479FaD7306ff6",
"transactionHash": "0x2b815c966ddf41bb7289996ee04a0e1ab1d94aa742c89143350bce28569e4b30"
},
"1660724532588": {
"events": {},
"links": {},
@ -11762,8 +11870,8 @@
"transactionHash": "0xff7b55a20a44e9b2b3f0844fd4bfd293a0d1394f9359e6d1890baaa4181bf847"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:44.731Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:25.978Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -22245,6 +22245,188 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "approved",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
"0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": false,
"internalType": "bool",
"name": "approved",
"type": "bool"
}
],
"name": "ApprovalForAll",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
}
},
"links": {},
"address": "0x6bf5b6F9b59DF885bD241304C902C5bF7d816fbd",
"transactionHash": "0x443d826178486704ba7bd0d84ea9ee35f3f1c5964b443a22a95207ccd70cd1ce"
},
"80001": {
"events": {},
"links": {},
"address": "0xaE08adb5278B107D2501e7c61907e41FEf3887D7",
"transactionHash": "0x20142a25878845bee905d8aab036cf10992e32d0a83d33f31503fcf35bd6a2b9"
},
"1660724532588": {
"events": {},
"links": {},
@ -22324,8 +22506,8 @@
"transactionHash": "0x4d320bac4db524974fd8eb9f9ca1c015c72fdff915a6a7267d6c63bc5c020d91"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:47.326Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:29.418Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

File diff suppressed because one or more lines are too long

View File

@ -25039,6 +25039,182 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "approved",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
},
"0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "owner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": false,
"internalType": "bool",
"name": "approved",
"type": "bool"
}
],
"name": "ApprovalForAll",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
}
},
"links": {},
"address": "0x9e8efB8C27f3012493ce315974A64CAcDE6f4ccC",
"transactionHash": "0xe4eca2d98e5b67366542be6449a2b81fe310363c473f2550940f7a91771de52d"
},
"80001": {
"events": {
"0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": {
@ -25212,8 +25388,8 @@
}
},
"links": {},
"address": "0x7c0a0674c6e8C82c8f35A14a4F08BA4390c13d83",
"transactionHash": "0x5098edadb418ab9df54f193f8d0ca9b48494d21e7fbc70955fca81c10cd59d08"
"address": "0xca5525178b0826A7C0835F0b7a383C802e10b6c7",
"transactionHash": "0x582fc4d6285967aa82429f7c289abc631111b42de69caeec6391f0e42a56723a"
},
"1665724957326": {
"events": {
@ -26096,8 +26272,8 @@
"transactionHash": "0x08cf5e0ace5ed4208125d5aa2f42062b2ab45eadace3036c8072214b208392e9"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:39.621Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:19.477Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -28620,6 +28620,231 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": false,
"internalType": "bool",
"name": "approved",
"type": "bool"
}
],
"name": "ApprovalForAll",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
"0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256[]",
"name": "ids",
"type": "uint256[]"
},
{
"indexed": false,
"internalType": "uint256[]",
"name": "values",
"type": "uint256[]"
}
],
"name": "TransferBatch",
"type": "event"
},
"0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "operator",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "from",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "to",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "id",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
}
],
"name": "TransferSingle",
"type": "event"
},
"0x6bb7ff708619ba0610cba295a58592e0451dee2622938c8755667688daf3529b": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "string",
"name": "value",
"type": "string"
},
{
"indexed": true,
"internalType": "uint256",
"name": "id",
"type": "uint256"
}
],
"name": "URI",
"type": "event"
}
},
"links": {},
"address": "0x464c94ea90fc7D0D08Bb956cffB9AcfE3AAA5313",
"transactionHash": "0xc79fd123d3cca69c758e1035260ef44f9f3fa6afbe437bf35e80d9964804479c"
},
"80001": {
"events": {},
"links": {},
"address": "0x1d4c7908E6a6795aE4335D0F072B0A129AAFFdc1",
"transactionHash": "0x01e1ac027846b47d3ce48f5dce60acf33d144cfb3106ca3789cdd15061a97009"
},
"1660724532588": {
"events": {},
"links": {},
@ -28699,8 +28924,8 @@
"transactionHash": "0xabbadc79825c38f15d06304fb638a9f7a2768f68f0f3dca6ba9f42251d5eed6f"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:17:55.004Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:39.818Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -25157,6 +25157,206 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0xc2617efa69bab66782fa219543714338489c4e9e178271560a91b82c3f612b58": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "uint256",
"name": "index",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "target",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"indexed": false,
"internalType": "bytes",
"name": "data",
"type": "bytes"
}
],
"name": "CallExecuted",
"type": "event"
},
"0x4cf4410cc57040e44862ef0f45f3dd5a5e02db8eb8add648d4b0e236f1d07dca": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "uint256",
"name": "index",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "target",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"indexed": false,
"internalType": "bytes",
"name": "data",
"type": "bytes"
},
{
"indexed": false,
"internalType": "bytes32",
"name": "predecessor",
"type": "bytes32"
},
{
"indexed": false,
"internalType": "uint256",
"name": "delay",
"type": "uint256"
}
],
"name": "CallScheduled",
"type": "event"
},
"0xbaa1eb22f2a492ba1a5fea61b8df4d27c6c8b5f3971e63bb58fa14ff72eedb70": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "id",
"type": "bytes32"
}
],
"name": "Cancelled",
"type": "event"
},
"0x11c24f4ead16507c69ac467fbd5e4eed5fb5c699626d2cc6d66421df253886d5": {
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "oldDuration",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "newDuration",
"type": "uint256"
}
],
"name": "MinDelayChange",
"type": "event"
},
"0xbd79b86ffe0ab8e8776151514217cd7cacd52c909f66475c3af44e129f0b00ff": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
"0xf6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
}
},
"links": {},
"address": "0x8feB2EFEC924f90ccbAA05Cdfeb805C3F810EE75",
"transactionHash": "0xc71726d2e3cd68c5f86459a40ee777def3f46a1e92e2f19d7d02e4c81eb908da"
},
"1660724532588": {
"events": {},
"links": {},
@ -25236,8 +25436,8 @@
"transactionHash": "0x01c0cef2a0eb05f919d10aea894b80b95b5f25b9dc7239f401b845dc1c95b488"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:18:12.969Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:34:04.132Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

File diff suppressed because one or more lines are too long

View File

@ -33708,6 +33708,87 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {
"0x7ec91832f8e94cceb462065487af39394e7520f22662d527e383864c041380cf": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "uint256",
"name": "tokenId",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "contractAddress",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "price",
"type": "uint256"
},
{
"indexed": false,
"internalType": "address",
"name": "paymentToken",
"type": "address"
},
{
"indexed": false,
"internalType": "address",
"name": "seller",
"type": "address"
},
{
"indexed": false,
"internalType": "address",
"name": "buyer",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "fee",
"type": "uint256"
}
],
"name": "MatchTransaction",
"type": "event"
},
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "previousOwner",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "OwnershipTransferred",
"type": "event"
}
},
"links": {},
"address": "0xFd8643CeE37DaE121Ca0E84FD2Ceeb49E828B493",
"transactionHash": "0x9199794eac958125f0239204bf8a6fd39ae6d8f49a543ae0f9b1f9ca99190f92"
},
"80001": {
"events": {},
"links": {},
"address": "0x8dd1439E0C3254b4543d6D68b3C0C891E5Bd2eCE",
"transactionHash": "0xc40417e528b6fbbd91f524f518bce8cdd7b6c2c162fe521a989d980d5392aa0c"
},
"1660724532588": {
"events": {},
"links": {},
@ -33787,8 +33868,8 @@
"transactionHash": "0xc78a39c59ea05ecc953e6cff89a77e0168d444530a2ec0abca7bd4e0664bdbd1"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:18:01.354Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:33:48.288Z",
"networkType": "ethereum",
"devdoc": {
"kind": "dev",

View File

@ -3137,11 +3137,17 @@
"version": "0.8.10+commit.fc410830.Emscripten.clang"
},
"networks": {
"1338": {
"events": {},
"links": {},
"address": "0x74E33B80BC77cdB5d49861a53913A8301CB72B4D",
"transactionHash": "0x2b31f92500748510dd182950424cbc3e21fc4d6ba6d2afab82393b593c62135c"
},
"80001": {
"events": {},
"links": {},
"address": "0x5987D5e8b825e9900F9a8BeF5BC131Baa12AC9b2",
"transactionHash": "0xb4fb5a8da86e6099919b786f138251b25f29a0d7e35bede53206e56bb30973e5"
"address": "0x2da654B1b04fdF57eDE9Aea103AA21BbdF41E854",
"transactionHash": "0xfe7070981d6080730cd6d7735ddb5b7fa29f99b88d58c4aa1b6cfc0c976972bf"
},
"1660724532588": {
"events": {},
@ -3228,8 +3234,8 @@
"transactionHash": "0x3963c496ad636403fa000de1dd33d0c363f7f3104afa6f2140d13dedaccb56a6"
}
},
"schemaVersion": "3.4.4",
"updatedAt": "2022-10-19T08:18:12.978Z",
"schemaVersion": "3.4.9",
"updatedAt": "2022-10-31T03:34:04.140Z",
"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

View File

@ -4,29 +4,29 @@ const market = {
paymentTokens: [
"0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT
],
}
};
const admins = {
admin: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
proposers: [
"0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
"0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
"0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
],
executors: [
"0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
"0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
"0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b"
]
}
"0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b",
],
};
const token = {
baseTokenURI: 'https://market.cebg.games/api/nft/info/',
}
baseTokenURI: "https://market.cebg.games/api/nft/info/",
};
var config = {
market,
admins,
token
}
token,
};
module.exports = config;

View File

@ -1,32 +0,0 @@
const market = {
feeToAddress: "0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e",
mallFeeAddress: "0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e",
paymentTokens: [
"0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT
],
}
const admins = {
admin: "0x760888706690CA0eB1EeF1E84787E05fc96e01F0",
proposers: [
"0x760888706690CA0eB1EeF1E84787E05fc96e01F0",
"0x760888706690CA0eB1EeF1E84787E05fc96e01F0"
],
executors: [
"0xC8EaDE915060491303B8062b743cC61687eD9d7e",
"0xC8EaDE915060491303B8062b743cC61687eD9d7e",
"0xC8EaDE915060491303B8062b743cC61687eD9d7e"
]
}
const token = {
baseTokenURI: 'https://market.cebg.games/api/nft/info/',
}
var config = {
market,
admins,
token
}
module.exports = config;

View File

@ -0,0 +1,32 @@
const market = {
feeToAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
mallFeeAddress: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
paymentTokens: [
"0x0039f574ee5cc39bdd162e9a88e3eb1f111baf48", // USDT
],
}
const admins = {
admin: "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
proposers: [
"0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
"0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0"
],
executors: [
"0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
"0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
"0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b"
]
}
const token = {
baseTokenURI: 'https://market.cebg.games/api/nft/info/',
}
var config = {
market,
admins,
token
}
module.exports = config;

View File

@ -19,7 +19,11 @@ contract EvolveFactory is Ownable, TimeChecker, Initializable, HasSignature {
address public executor;
mapping(address => bool) public nftTokenSupported;
event TokenEvolved(address indexed owner, uint256[] tokenIds);
event TokenEvolved(
address indexed owner,
uint256 indexed nonce,
uint256[] tokenIds
);
constructor() HasSignature("EvolveFactory", "1") {}
@ -80,7 +84,7 @@ contract EvolveFactory is Ownable, TimeChecker, Initializable, HasSignature {
checkSigner(executor, criteriaMessageHash, signature);
nft.burn(to, tokenIds[1]);
_useSignature(signature);
emit TokenEvolved(to, signArray);
emit TokenEvolved(to, saltNonce, signArray);
}
function evolveChip(
@ -113,7 +117,7 @@ contract EvolveFactory is Ownable, TimeChecker, Initializable, HasSignature {
checkSigner(executor, criteriaMessageHash, signature);
chip.burnBatch(to, idsForBurn, amounts);
_useSignature(signature);
emit TokenEvolved(to, tokenIds);
emit TokenEvolved(to, saltNonce, tokenIds);
}
function getMessageHash(

View File

@ -32,13 +32,15 @@ contract MinterFactory is
event TokenMinted(
address contractAddress,
address to,
address indexed to,
uint256 indexed nonce,
uint256 indexed tokenId
);
event TokenMintedBatch(
address contractAddress,
address indexed to,
uint256 indexed nonce,
uint256[] ids,
uint256[] amounts
);
@ -71,35 +73,35 @@ contract MinterFactory is
/**
* @dev mint function to distribute Hero NFT to user
*/
function mintHeroTo(address to, uint256 tokenId) external onlyOwner {
mint721NFT(to, tokenId, hero);
function mintHeroTo(address to, uint256 tokenId, uint256 nonce) external onlyOwner {
mint721NFT(to, tokenId, nonce, hero);
}
/**
* @dev mint function to distribute Equipment NFT to user
*/
function mintEquipTo(address to, uint256 tokenId) external onlyOwner {
mint721NFT(to, tokenId, equip);
function mintEquipTo(address to, uint256 tokenId, uint256 nonce) external onlyOwner {
mint721NFT(to, tokenId, nonce, equip);
}
/**
* @dev mint function to distribute Chip NFT to user
*/
function mintChipTo(address to, uint256 tokenId) external onlyOwner {
mint1155NFT(to, tokenId, 1, chip);
function mintChipTo(address to, uint256 tokenId, uint256 nonce) external onlyOwner {
mint1155NFT(to, tokenId, nonce, 1, chip);
}
/**
* @dev mint function to distribute Shard NFT to user
*/
function mintShardTo(address to, uint256 tokenId) external onlyOwner {
mint1155NFT(to, tokenId, 1, shard);
function mintShardTo(address to, uint256 tokenId, uint256 nonce) external onlyOwner {
mint1155NFT(to, tokenId, nonce, 1, shard);
}
/**
* @dev batch mint 1155 Chip to user
*/
function mintChipBatch(address to, uint256[] memory ids) external onlyOwner {
function mintChipBatch(address to, uint256[] memory ids, uint256 nonce) external onlyOwner {
require(
to != address(0),
"MinterFactory::mintChipBatch: to address can not be zero"
@ -113,7 +115,7 @@ contract MinterFactory is
for (uint256 i = 0; i < len; ++i) {
amounts[i] = 1;
}
mint1155NFTBatch(to, ids, amounts, chip);
mint1155NFTBatch(to, nonce, ids, amounts, chip);
}
/**
@ -121,6 +123,7 @@ contract MinterFactory is
*/
function mintShardBatch(
address to,
uint256 nonce,
uint256[] memory ids,
uint256[] memory amounts
) external onlyOwner {
@ -130,7 +133,7 @@ contract MinterFactory is
ids.length == amounts.length,
"MinterFactory: ids and amounts length mismatch"
);
mint1155NFTBatch(to, ids, amounts, shard);
mint1155NFTBatch(to, nonce, ids, amounts, shard);
}
function mint721ByUser(
@ -151,7 +154,7 @@ contract MinterFactory is
signArray
);
checkSigner(executor, criteriaMessageHash, signature);
mint721NFT(to, id, nft);
mint721NFT(to, id, saltNonce, nft);
_useSignature(signature);
}
@ -187,7 +190,7 @@ contract MinterFactory is
signArray
);
checkSigner(executor, criteriaMessageHash, signature);
mint1155NFTBatch(to, ids, amounts, nft);
mint1155NFTBatch(to, saltNonce, ids, amounts, nft);
_useSignature(signature);
}
@ -232,39 +235,42 @@ contract MinterFactory is
// transfer money to address
paymentContract.safeTransferFrom(param.to, feeToAddress, param.payAmount);
shard.burnBatch(param.to, ids, amounts);
mint721NFT(param.to, param.nftId, nft);
mint721NFT(param.to, param.nftId, param.saltNonce, nft);
_useSignature(signature);
}
function mint721NFT(
address to,
uint256 tokenId,
uint256 nonce,
IBEERC721 nft
) internal {
require(to != address(0), "MinterFactory: to address can not be zero");
nft.mint(to, tokenId);
emit TokenMinted(address(nft), to, tokenId);
emit TokenMinted(address(nft), to, nonce, tokenId);
}
function mint1155NFT(
address to,
uint256 id,
uint256 nonce,
uint256 amount,
IBEERC1155 nft
) internal {
require(to != address(0), "MinterFactory: to address can not be zero");
nft.mintBatch(to, id.asSingletonArray(), amount.asSingletonArray(), "");
emit TokenMinted(address(chip), to, id);
emit TokenMinted(address(chip), to, nonce, id);
}
function mint1155NFTBatch(
address to,
uint256 nonce,
uint256[] memory ids,
uint256[] memory amounts,
IBEERC1155 nft
) internal {
nft.mintBatch(to, ids, amounts, "");
emit TokenMintedBatch(address(nft), to, ids, amounts);
emit TokenMintedBatch(address(nft), to, nonce, ids, amounts);
}
function getMessageHash(

View File

@ -10,6 +10,7 @@ contract UserEvolveFactory is Ownable, Initializable {
event TokenEvolveFail(
address indexed to,
uint256 indexed nonce,
bytes signature,
string reason,
bytes byteReason
@ -39,12 +40,12 @@ contract UserEvolveFactory is Ownable, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenEvolveFail(to, signature, reason, by);
emit TokenEvolveFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenEvolveFail(to, signature, reason, lowLevelData);
emit TokenEvolveFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}
@ -64,12 +65,12 @@ contract UserEvolveFactory is Ownable, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenEvolveFail(to, signature, reason, by);
emit TokenEvolveFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenEvolveFail(to, signature, reason, lowLevelData);
emit TokenEvolveFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}

View File

@ -16,6 +16,7 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
event TokenMintFail(
address indexed to,
uint256 indexed nonce,
bytes signature,
string reason,
bytes byteReason
@ -46,12 +47,12 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenMintFail(to, signature, reason, by);
emit TokenMintFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenMintFail(to, signature, reason, lowLevelData);
emit TokenMintFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}
@ -73,12 +74,12 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenMintFail(to, signature, reason, by);
emit TokenMintFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenMintFail(to, signature, reason, lowLevelData);
emit TokenMintFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}
@ -113,12 +114,12 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenMintFail(to, signature, reason, by);
emit TokenMintFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenMintFail(to, signature, reason, lowLevelData);
emit TokenMintFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}
@ -149,12 +150,12 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenMintFail(to, signature, reason, by);
emit TokenMintFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenMintFail(to, signature, reason, lowLevelData);
emit TokenMintFail(to, saltNonce, signature, reason, lowLevelData);
return false;
}
}
@ -193,12 +194,12 @@ contract UserMinterFactory is Ownable, FactoryBase, Initializable {
} catch Error(string memory reason) {
bytes memory by;
factory.useSignature(signature);
emit TokenMintFail(to, signature, reason, by);
emit TokenMintFail(to, saltNonce, signature, reason, by);
return false;
} catch (bytes memory lowLevelData) {
factory.useSignature(signature);
string memory reason;
emit TokenMintFail(to, signature, reason, lowLevelData);
emit TokenMintFail(to, saltNonce, signature, reason, lowLevelData);
}
}
}

View File

@ -29,6 +29,7 @@ contract BENftMall is Ownable, HasSignature, TimeChecker {
// Events
event BuyTransactionBatch(
address indexed buyer,
uint256 indexed nonce,
address[3] addresses,
uint256 price,
uint256[] ids,
@ -36,6 +37,7 @@ contract BENftMall is Ownable, HasSignature, TimeChecker {
);
event BuyTransaction(
address indexed buyer,
uint256 indexed nonce,
uint256 tokenId,
address[3] addresses,
uint256 price
@ -137,7 +139,7 @@ contract BENftMall is Ownable, HasSignature, TimeChecker {
nft.mint(to, values[0]);
_useSignature(signature);
// emit sale event
emit BuyTransaction(to, values[0], addresses, values[1]);
emit BuyTransaction(to, values[2], values[0], addresses, values[1]);
}
function buy1155NFT(
@ -170,7 +172,6 @@ contract BENftMall is Ownable, HasSignature, TimeChecker {
signArray[ids.length * 2 + i] = values[i];
}
address to = _msgSender();
bytes32 criteriaMessageHash = getMessageHash(
addresses[1],
addresses[2],
@ -180,17 +181,17 @@ contract BENftMall is Ownable, HasSignature, TimeChecker {
// Check payment approval and buyer balance
IERC20 paymentContract = IERC20(addresses[2]);
require(
paymentContract.balanceOf(to) >= values[0],
paymentContract.balanceOf(_msgSender()) >= values[0],
"BENftMall: buyer doesn't have enough token to buy this item"
);
require(
paymentContract.allowance(to, address(this)) >= values[0],
paymentContract.allowance(_msgSender(), address(this)) >= values[0],
"BENftMall: buyer doesn't approve marketplace to spend payment amount"
);
paymentContract.safeTransferFrom(to, feeToAddress, values[0]);
nft.mintBatch(to, ids, amounts, "");
paymentContract.safeTransferFrom(_msgSender(), feeToAddress, values[0]);
nft.mintBatch(_msgSender(), ids, amounts, "");
_useSignature(signature);
emit BuyTransactionBatch(to, addresses, values[0], ids, amounts);
emit BuyTransactionBatch(_msgSender(), values[1], addresses, values[0], ids, amounts);
}
function getMessageHash(

View File

@ -25,7 +25,9 @@ module.exports = async function main(callback) {
const chipInstance = await BEChip1155.deployed();
const shardInstance = await BEShard.deployed();
const coinInstance = await BECoin.deployed();
const goldInstance = await BEGold.deployed();
config.market.paymentTokens.push(coinInstance.address);
config.market.paymentTokens.push(goldInstance.address);
await heroInstance.updateBaseURI(config.token.baseTokenURI);
console.log("BEHero baseURI update success.");

View File

@ -22,16 +22,17 @@
//
// const fs = require('fs');
// const mnemonic = fs.readFileSync(".secret").toString().trim();
const HDWalletProvider = require('@truffle/hdwallet-provider');
const fs = require('fs');
const HDWalletProvider = require("@truffle/hdwallet-provider");
const fs = require("fs");
const mnemonic = fs.readFileSync(".secret").toString().trim();
// web3.eth.defaultAccount = '0x50A8e60041A206AcaA5F844a1104896224be6F39'
const kccTestnetKey = 'd9ed33809372932059c1ba7b336a33f406b4c55e7430daef8297134c67429d60';
const kccTestnetKey =
"d9ed33809372932059c1ba7b336a33f406b4c55e7430daef8297134c67429d60";
module.exports = {
plugins: ['truffle-plugin-stdjsonin'],
plugins: ["truffle-plugin-stdjsonin"],
api_keys: {
etherscan: 'ZI9HI3VFZRD346JSRET35Y6AAVGYFGNZ85'
etherscan: "ZI9HI3VFZRD346JSRET35Y6AAVGYFGNZ85",
},
/**
* Networks define how you connect to your ethereum client and let you set the
@ -81,11 +82,12 @@ module.exports = {
// production: true // Treats this network as if it was a public net. (default: false)
// }
polygon_testnet: {
provider: () => new HDWalletProvider({
privateKeys: [kccTestnetKey],
providerOrUrl: `https://rpc-mumbai.maticvigil.com`,
pollingInterval: 8000
}),
provider: () =>
new HDWalletProvider({
privateKeys: [kccTestnetKey],
providerOrUrl: `https://rpc-mumbai.maticvigil.com`,
pollingInterval: 8000,
}),
gasPrice: 28000000000,
network_id: 80001,
confirmations: 6,
@ -95,14 +97,15 @@ module.exports = {
skipDryRun: true,
production: true,
disableConfirmationListener: true,
from: '0x50A8e60041A206AcaA5F844a1104896224be6F39'
from: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
},
polygon: {
provider: () => new HDWalletProvider({
mnemonic: mnemonic,
providerOrUrl: `https://polygon-rpc.com`,
pollingInterval: 8000
}),
provider: () =>
new HDWalletProvider({
mnemonic: mnemonic,
providerOrUrl: `https://polygon-rpc.com`,
pollingInterval: 8000,
}),
network_id: 137,
confirmations: 6,
timeoutBlocks: 5000,
@ -110,55 +113,62 @@ module.exports = {
deploymentPollingInterval: 8000,
skipDryRun: true,
production: true,
from: '0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e'
from: "0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e",
},
kcc_testnet: {
provider: () => new HDWalletProvider(kccTestnetKey, `https://rpc-testnet.kcc.network`),
provider: () =>
new HDWalletProvider(kccTestnetKey, `https://rpc-testnet.kcc.network`),
network_id: 322,
confirmations: 6,
timeoutBlocks: 5000,
skipDryRun: true,
production: true,
from: '0x50A8e60041A206AcaA5F844a1104896224be6F39'
from: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
},
kcc: {
provider: () => new HDWalletProvider(mnemonic, `https://rpc-mainnet.kcc.network`),
provider: () =>
new HDWalletProvider(mnemonic, `https://rpc-mainnet.kcc.network`),
network_id: 321,
confirmations: 10,
timeoutBlocks: 5000,
skipDryRun: true,
from: '0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e'
from: "0x565edA4ef351EB78F03B8AfCb6dCF02E29cAD62e",
},
bsc_testnet: {
provider: () => new HDWalletProvider(mnemonic, `https://data-seed-prebsc-1-s1.binance.org:8545`),
provider: () =>
new HDWalletProvider(
mnemonic,
`https://data-seed-prebsc-1-s1.binance.org:8545`
),
network_id: 97,
confirmations: 10,
timeoutBlocks: 200,
skipDryRun: true,
from: '0x50A8e60041A206AcaA5F844a1104896224be6F39'
from: "0x50A8e60041A206AcaA5F844a1104896224be6F39",
},
bsc: {
provider: () => new HDWalletProvider(mnemonic, `https://bsc-dataseed1.binance.org`),
provider: () =>
new HDWalletProvider(mnemonic, `https://bsc-dataseed1.binance.org`),
network_id: 56,
confirmations: 10,
timeoutBlocks: 200,
skipDryRun: true
skipDryRun: true,
},
lan22: {
host: "192.168.100.22", // Localhost (default: none)
port: 8545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
host: "192.168.100.22", // Localhost (default: none)
port: 8545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
},
lan20: {
host: "10.0.1.20", // Localhost (default: none)
port: 8545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
host: "10.0.1.20", // Localhost (default: none)
port: 8545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
},
development: {
host: "127.0.0.1", // Localhost (default: none)
port: 7545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
}
host: "127.0.0.1", // Localhost (default: none)
port: 7545, // Standard Ethereum port (default: none)
network_id: "*", // Any network (default: none)
},
},
// Set default mocha options here, use special reporters etc.
@ -169,7 +179,7 @@ module.exports = {
// Configure your compilers
compilers: {
solc: {
version: "0.8.10", // Fetch exact version from solc-bin (default: truffle's version)
version: "0.8.10", // Fetch exact version from solc-bin (default: truffle's version)
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
// settings: { // See the solidity docs for advice about optimization and evmVersion
// optimizer: {
@ -178,7 +188,7 @@ module.exports = {
// },
// evmVersion: "byzantium"
// }
}
},
},
// Truffle DB is currently disabled by default; to enable it, change enabled:
@ -188,17 +198,17 @@ module.exports = {
// NOTE: It is not possible to migrate your contracts to truffle DB and you should
// make a backup of your artifacts to a safe location before enabling this feature.
//
// After you backed up your artifacts you can utilize db by running migrate as follows:
// After you backed up your artifacts you can utilize db by running migrate as follows:
// $ truffle migrate --reset --compile-all
//
// db: {
// enabled: false,
// host: "127.0.0.1",
// adapter: {
// name: "sqlite",
// settings: {
// directory: ".db"
// }
// }
// enabled: false,
// host: "127.0.0.1",
// adapter: {
// name: "sqlite",
// settings: {
// directory: ".db"
// }
// }
// }
};