Merge pull request #4 from Pixura/feature/superrare-legacy

Feature/superrare legacy
superrare · Apr 9, 2020 · af9e86f · af9e86f
2 parents 9ddf83d + e13d0cf
commit af9e86f
Show file tree

Hide file tree

Showing 45 changed files with 2,453 additions and 257 deletions.
diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@
 #### Env
 ######################################################
 MARKETPLACEV2_CONFIG ?= "./deploy-configs/marketplacev2.json"
+SUPERRARE_LEGACY_CONFIG ?= "./deploy-configs/superrareLegacy.json"
 
 ######################################################
 #### Utils
@@ -24,18 +25,18 @@ stylish: ## stylish all
 
 init: ## install node files
 	yarn && \
+	[ -d contracts/v4/node_modules ] || ( cp -r node_modules contracts/v4/node_modules ) && \
+	[ -d contracts/v5/node_modules ] || ( cp -r node_modules contracts/v5/node_modules ) && \
 	yarn spago install && \
 	yarn spago build -d
 
 ######################################################
 #### Smart Contract / Solidity related commands
 ######################################################
 compile-contracts-v4: ## compiles contracts solc v4
-	@[ -d contracts/v4/node_modules ] || ( cp -r node_modules contracts/v4/node_modules ) && \
 	yarn chanterelle -r contracts/v4 compile
 
 compile-contracts-v5: ## compiles contracts solc v5
-	@[ -d contracts/v5/node_modules ] || ( cp -r node_modules contracts/v5/node_modules ) && \
 	yarn chanterelle -r contracts/v5 compile
 
 compile-contracts: ## compiles contracts 
@@ -76,6 +77,10 @@ migrate-marketplaceV2:  ## Deploy test environment and run contract tests
 	CONFIG=$(MARKETPLACEV2_CONFIG) \
 	yarn spago run --main Migrations.SuperRareMarketAuctionV2
 
+migrate-legacy:  ## Deploy test environment and run contract tests
+	CONFIG=$(SUPERRARE_LEGACY_CONFIG) \
+	yarn spago run --main Migrations.SuperRareLegacy
+
 ######################################################
 #### Test
 ######################################################

diff --git a/cliquebait.json b/cliquebait.json
@@ -12,7 +12,7 @@
     "istanbulBlock": 1,
     "muirGlacierBlock": 1,
     "clique": {
-      "period": 0,
+      "period": 1,
       "epoch": 30000
     }
   },

diff --git a/contracts/v4/build/CryptoPunksMarket.json b/contracts/v4/build/CryptoPunksMarket.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036527608,
+    "lastModified": 1586471674282,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ERC20CappedMetadata.json b/contracts/v4/build/ERC20CappedMetadata.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036528978,
+    "lastModified": 1586471675816,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ERC20Metadata.json b/contracts/v4/build/ERC20Metadata.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036529286,
+    "lastModified": 1586471676136,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ERC20MintableMetadata.json b/contracts/v4/build/ERC20MintableMetadata.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530031,
+    "lastModified": 1586471676925,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ERC721Market.json b/contracts/v4/build/ERC721Market.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530200,
+    "lastModified": 1586471677114,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ERC721Old.json b/contracts/v4/build/ERC721Old.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530209,
+    "lastModified": 1586471677124,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/IERC721Creator.json b/contracts/v4/build/IERC721Creator.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530226,
+    "lastModified": 1586471677144,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/ISuperRare.json b/contracts/v4/build/ISuperRare.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530234,
+    "lastModified": 1586471677152,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/Operated.json b/contracts/v4/build/Operated.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036530318,
+    "lastModified": 1586471677251,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/PixuraNFT.json b/contracts/v4/build/PixuraNFT.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036532193,
+    "lastModified": 1586471679245,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/PixuraNFTContractGenerator.json b/contracts/v4/build/PixuraNFTContractGenerator.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036535095,
+    "lastModified": 1586471682312,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/SupeRare.json b/contracts/v4/build/SupeRare.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036535690,
+    "lastModified": 1586471682984,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/SuperRareMarketAuction.json b/contracts/v4/build/SuperRareMarketAuction.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036536345,
+    "lastModified": 1586471683690,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/SuperRareV2.json b/contracts/v4/build/SuperRareV2.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036537691,
+    "lastModified": 1586471685165,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v4/build/Whitelist.json b/contracts/v4/build/Whitelist.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584036537729,
+    "lastModified": 1586471685207,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v5/build/MaybeSendValue.json b/contracts/v5/build/MaybeSendValue.json
@@ -1,6 +1,6 @@
 {
     "networks": {},
-    "lastModified": 1584045258298,
+    "lastModified": 1586471688232,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},

diff --git a/contracts/v5/build/SendValueOrEscrow.json b/contracts/v5/build/SendValueOrEscrow.json
diff --git a/contracts/v5/build/SuperRareLegacy.json b/contracts/v5/build/SuperRareLegacy.json
diff --git a/contracts/v5/build/SuperRareMarketAuctionV2.json b/contracts/v5/build/SuperRareMarketAuctionV2.json
diff --git a/contracts/v5/build/TestAssertFailOnPay.json b/contracts/v5/build/TestAssertFailOnPay.json
@@ -1,14 +1,14 @@
 {
     "networks": {},
-    "lastModified": 1584045203313,
+    "lastModified": 1586471692522,
     "code": {
         "deployedBytecode": {
             "linkReferences": {},
-            "object": "60806040526004361061001e5760003560e01c80634da00aea14610028575b600061002657fe5b005b61009e6004803603608081101561003e57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100a0565b005b8073ffffffffffffffffffffffffffffffffffffffff1663c0f4ed31348686866040518563ffffffff1660e01b8152600401808481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506000604051808303818588803b15801561012f57600080fd5b505af1158015610143573d6000803e3d6000fd5b50505050505050505056fea265627a7a7231582032269c9cee04c7d922f02e54ec6591ae86dad8c7efc061f61f444805e971446264736f6c63430005100032"
+            "object": "60806040526004361061001e5760003560e01c80634da00aea14610028575b600061002657fe5b005b61009e6004803603608081101561003e57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100a0565b005b8073ffffffffffffffffffffffffffffffffffffffff1663c0f4ed31348686866040518563ffffffff1660e01b8152600401808481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506000604051808303818588803b15801561012f57600080fd5b505af1158015610143573d6000803e3d6000fd5b50505050505050505056fea265627a7a7231582039acde23ed6c74ada63b286d8fc989bfd8e77c66ea92ae8653817ef5e912570664736f6c63430005100032"
         },
         "bytecode": {
             "linkReferences": {},
-            "object": "608060405234801561001057600080fd5b50610183806100206000396000f3fe60806040526004361061001e5760003560e01c80634da00aea14610028575b600061002657fe5b005b61009e6004803603608081101561003e57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100a0565b005b8073ffffffffffffffffffffffffffffffffffffffff1663c0f4ed31348686866040518563ffffffff1660e01b8152600401808481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506000604051808303818588803b15801561012f57600080fd5b505af1158015610143573d6000803e3d6000fd5b50505050505050505056fea265627a7a7231582032269c9cee04c7d922f02e54ec6591ae86dad8c7efc061f61f444805e971446264736f6c63430005100032"
+            "object": "608060405234801561001057600080fd5b50610183806100206000396000f3fe60806040526004361061001e5760003560e01c80634da00aea14610028575b600061002657fe5b005b61009e6004803603608081101561003e57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100a0565b005b8073ffffffffffffffffffffffffffffffffffffffff1663c0f4ed31348686866040518563ffffffff1660e01b8152600401808481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506000604051808303818588803b15801561012f57600080fd5b505af1158015610143573d6000803e3d6000fd5b50505050505050505056fea265627a7a7231582039acde23ed6c74ada63b286d8fc989bfd8e77c66ea92ae8653817ef5e912570664736f6c63430005100032"
         }
     },
     "abi": [