conflicts

Mississippi-Labs · Nov 22, 2023 · 31820d9 · 31820d9
2 parents 200d60b + d009460
commit 31820d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/client/src/pages/home/index.tsx b/packages/client/src/pages/home/index.tsx
@@ -257,6 +257,7 @@ const Home = () => {
       let urls = await Promise.all([userContract.tokenURI(userTokenId), lootContract.tokenURI(lootTokenId)])
       let url = urls[0]
       let lootUrl = urls[1]
+      console.log("get loot and user success")
       console.log(urls, 'url')
       url = atobUrl(url)
       lootUrl = atobUrl(lootUrl)

diff --git a/packages/contracts/worlds.json b/packages/contracts/worlds.json
@@ -8,11 +8,11 @@
     "blockNumber": 413937
   },
   "31337": {
-    "address": "0x02b0B4EFd909240FCB2Eb5FAe060dC60D112E3a4"
+    "address": "0x2428109A9e775E4406fe079132F216dc77117333"
   },
   "33784": {
-    "address": "0xA183bc858540FFf7bbB69A4053e22f1B055B5451",
-    "blockNumber": 349565
+    "address": "0x2428109A9e775E4406fe079132F216dc77117333",
+    "blockNumber": 75
   },
   "421613": {
     "address": "0x2Bc1034975c3df48D6f3026802f372677844b85d",