Merge pull request #9 from knownorigin/token-marketplace-v2

knownorigin · Nov 19, 2020 · 41ad347 · 41ad347
2 parents ccf2303 + 0247b3d
commit 41ad347
Show file tree

Hide file tree

Showing 34 changed files with 101,890 additions and 25,929 deletions.
diff --git a/build/contracts/ArtistAcceptingBids.json b/build/contracts/ArtistAcceptingBids.json
diff --git a/build/contracts/ArtistAcceptingBidsV2.json b/build/contracts/ArtistAcceptingBidsV2.json
diff --git a/build/contracts/ArtistEditionBurner.json b/build/contracts/ArtistEditionBurner.json
diff --git a/build/contracts/ArtistEditionControls.json b/build/contracts/ArtistEditionControls.json
@@ -5060,7 +5060,71 @@
   },
   "networks": {
     "1": {
-      "events": {},
+      "events": {
+        "0x7b9e70728348c5a660506950e5eeb19dee00e0a53e8ce602353738185a8cd372": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            },
+            {
+              "indexed": true,
+              "name": "_artist",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "name": "_priceInWei",
+              "type": "uint256"
+            }
+          ],
+          "name": "PriceChanged",
+          "type": "event"
+        },
+        "0x6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff625": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Pause",
+          "type": "event"
+        },
+        "0x7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b33": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Unpause",
+          "type": "event"
+        },
+        "0xf8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c64820": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipRenounced",
+          "type": "event"
+        },
+        "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "name": "newOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipTransferred",
+          "type": "event"
+        }
+      },
       "links": {},
       "address": "0x06c741e6df49d7fda1f27f75fffd238d87619ba1",
       "transactionHash": "0x3a9e07323bb40a3f4d3ad1c8b6916a2d9cfefc0f7a262c252a41b01da4880037"
@@ -5072,20 +5136,149 @@
       "transactionHash": "0xdda2812e7686a85e3ec9b5967170b22733b324499491390423c50d7bae8bee39"
     },
     "4": {
-      "events": {},
+      "events": {
+        "0x7b9e70728348c5a660506950e5eeb19dee00e0a53e8ce602353738185a8cd372": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            },
+            {
+              "indexed": true,
+              "name": "_artist",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "name": "_priceInWei",
+              "type": "uint256"
+            }
+          ],
+          "name": "PriceChanged",
+          "type": "event"
+        },
+        "0x6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff625": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Pause",
+          "type": "event"
+        },
+        "0x7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b33": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Unpause",
+          "type": "event"
+        },
+        "0xf8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c64820": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipRenounced",
+          "type": "event"
+        },
+        "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "name": "newOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipTransferred",
+          "type": "event"
+        }
+      },
       "links": {},
       "address": "0x73ab17b11ec1e4fa18934115f9d170cbf0d5c6c6",
       "transactionHash": "0xf0b75b0a2987dcc95207731b28f7456363c7f552bb114bc8f5e0bf4180d999c6"
     },
     "5777": {
-      "events": {},
+      "events": {
+        "0x7b9e70728348c5a660506950e5eeb19dee00e0a53e8ce602353738185a8cd372": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            },
+            {
+              "indexed": true,
+              "name": "_artist",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "name": "_priceInWei",
+              "type": "uint256"
+            }
+          ],
+          "name": "PriceChanged",
+          "type": "event"
+        },
+        "0x6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff625": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Pause",
+          "type": "event"
+        },
+        "0x7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b33": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Unpause",
+          "type": "event"
+        },
+        "0xf8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c64820": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipRenounced",
+          "type": "event"
+        },
+        "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "name": "newOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipTransferred",
+          "type": "event"
+        }
+      },
       "links": {},
-      "address": "0xa56ef73bC76c56b27A613CB4c80a5DEfB651A1F6",
-      "transactionHash": "0xaf0cc3afd620cb3a15543e9e1e3c3a2bc394674e5739a61ecc6013d49af49a2d"
+      "address": "0xDCA914C314617Cf4A2da2f6B4a26b77407B50F69",
+      "transactionHash": "0x9114d1e1dbebe5e8d5552aec340087d6fed7d7ade4f05b71bf0c84a671602e76"
     }
   },
-  "schemaVersion": "3.0.19",
-  "updatedAt": "2020-03-13T15:52:57.824Z",
+  "schemaVersion": "3.1.0",
+  "updatedAt": "2020-11-13T16:55:37.447Z",
+  "networkType": "ethereum",
   "devdoc": {
     "methods": {
       "gift(address,uint256)": {

diff --git a/build/contracts/ArtistEditionControlsV2.json b/build/contracts/ArtistEditionControlsV2.json
@@ -7439,14 +7439,113 @@
       "transactionHash": "0x4d7b617a87ef5e60e081069b1737b6240f3be41f66baedb177d532857ab9653f"
     },
     "5777": {
-      "events": {},
+      "events": {
+        "0x7b9e70728348c5a660506950e5eeb19dee00e0a53e8ce602353738185a8cd372": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            },
+            {
+              "indexed": true,
+              "name": "_artist",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "name": "_priceInWei",
+              "type": "uint256"
+            }
+          ],
+          "name": "PriceChanged",
+          "type": "event"
+        },
+        "0x77c159b62cf9bb44a58d77815fbbb0c7d28272bbb6459f92f90a0cd41aadab03": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            },
+            {
+              "indexed": true,
+              "name": "_artist",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "name": "_tokenId",
+              "type": "uint256"
+            }
+          ],
+          "name": "EditionGifted",
+          "type": "event"
+        },
+        "0x348df167e29ec37668ed9a0fc6ab683a2ccb42aea11f5a58732e0614674b1298": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "_editionNumber",
+              "type": "uint256"
+            }
+          ],
+          "name": "EditionDeactivated",
+          "type": "event"
+        },
+        "0x6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff625": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Pause",
+          "type": "event"
+        },
+        "0x7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b33": {
+          "anonymous": false,
+          "inputs": [],
+          "name": "Unpause",
+          "type": "event"
+        },
+        "0xf8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c64820": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipRenounced",
+          "type": "event"
+        },
+        "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "name": "previousOwner",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "name": "newOwner",
+              "type": "address"
+            }
+          ],
+          "name": "OwnershipTransferred",
+          "type": "event"
+        }
+      },
       "links": {},
-      "address": "0x6DAE18c3E98e5D6E63Dc5cd244CbDCbBE07E2558",
-      "transactionHash": "0xf9d3fa51a5efcce75f3460e8cc8b580e6e06913321b5dc437fb82d5122007e23"
+      "address": "0x51A884b74686C85A7BC84A8b0E8C4bc5d32cBB6A",
+      "transactionHash": "0x293113144d1904a4fdd58e16cfe7798bc95ad331297032577c81b48d5a8215e4"
     }
   },
-  "schemaVersion": "3.0.19",
-  "updatedAt": "2020-03-13T15:52:57.832Z",
+  "schemaVersion": "3.1.0",
+  "updatedAt": "2020-10-23T11:53:48.504Z",
+  "networkType": "ethereum",
   "devdoc": {
     "methods": {
       "deactivateEdition(uint256)": {