Broaden event parsing after mint calls (#118)

* Broaden event parsing after mint calls

* update mainnet rpc

* try to fix build issue

* disable novella for now

Author: joaquim-verges

hardhat.config.js

@@ -1,15 +1,14 @@
-
 // Do not modify the existing settings
 module.exports = {
-    networks: {
-        hardhat: {
-            forking: {
-                url: `https://eth-mainnet.alchemyapi.io/v2/${process.env.SDK_ALCHEMY_KEY}`,
-            },
-            chainId: 1,
-            initialBaseFeePerGas: 0, // Allow 0 gas fees when testing
-            throwOnTransactionFailures: true, // Brownie expects transactions to throw on revert
-            throwOnCallFailures: true, // Brownie expects calls to throw on failure
-       }
-    }
-}
+  networks: {
+    hardhat: {
+      forking: {
+        url: `https://ethereum.rpc.thirdweb.com/39a3c037d7a88e6692c6681bccfd1f1cf36370324c4051a83acd0edcffb20708`,
+      },
+      chainId: 1,
+      initialBaseFeePerGas: 0, // Allow 0 gas fees when testing
+      throwOnTransactionFailures: true, // Brownie expects transactions to throw on revert
+      throwOnCallFailures: true, // Brownie expects calls to throw on failure
+    },
+  },
+};

package.json

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "hardhat": "^2.12.0"
+    "hardhat": "^2.13.0"
   }
 }

pyproject.toml

@@ -36,9 +36,9 @@ mkdocstrings = "^0.18.1"
 pymdown-extensions = "^9.3"
 eth-brownie = "^1.18.1"
 
-[tool.poetry.extras]
-novella = ["novella >=0.1.10,<0.3.0"]
-docs = ["novella >=0.1.10,<0.3.0", "mkdocs", "mkdocs-material"]
+# [tool.poetry.extras]
+# novella = ["novella>=0.1.10,<0.3.0"]
+# docs = ["novella>=0.1.10,<0.3.0", "mkdocs", "mkdocs-material"]
 
 [tool.poetry.scripts]
 pydoc-markdown = "pydoc_markdown.main:cli"

thirdweb/contracts/edition.py

@@ -133,12 +133,12 @@ def mint_to(
         receipt = self._contract_wrapper.send_transaction(
             "mint_to", [to, int(MAX_INT, 16), uri, metadata_with_supply.supply]
         )
-        events = self._contract_wrapper.get_events("TokensMinted", receipt)
+        events = self._contract_wrapper.get_events("TransferSingle", receipt)
 
         if len(events) == 0:
-            raise Exception("No TokensMinted event found")
+            raise Exception("No TransferSingle event found")
 
-        id = events[0].get("args").get("tokenIdMinted")  # type: ignore
+        id = events[0].get("args").get("id")  # type: ignore
 
         return TxResultWithId(receipt, id=id, data=lambda: self.get(id))
 

thirdweb/contracts/nft_collection.py

@@ -164,12 +164,12 @@ def mint_to(
 
         uri = upload_or_extract_uri(metadata, self._storage)
         receipt = self._contract_wrapper.send_transaction("mint_to", [to, uri])
-        events = self._contract_wrapper.get_events("TokensMinted", receipt)
+        events = self._contract_wrapper.get_events("Transfer", receipt)
 
         if len(events) == 0:
-            raise Exception("No TokensMinted event found")
+            raise Exception("No Transfer event found")
 
-        id = events[0].get("args").get("tokenIdMinted")  # type: ignore
+        id = events[0].get("args").get("tokenId")  # type: ignore
 
         return TxResultWithId(receipt, id=id, data=lambda: self.get(id))
 

yarn.lock

@@ -1210,10 +1210,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
-hardhat@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.12.0.tgz#51e59f1ff4991bcb66d1a380ea807e6c15fcac34"
-  integrity sha512-mNJFbVG479HwOzxiaLxobyvED2M1aEAuPPYhEo1+88yicMDSTrU2JIS7vV+V0GSNQKaDoiHCmV6bcKjiljT/dQ==
+hardhat@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.13.0.tgz#d52a0ec9b733a651687e5b1c1b0ee9a11a30f3d0"
+  integrity sha512-ZlzBOLML1QGlm6JWyVAG8lVTEAoOaVm1in/RU2zoGAnYEoD1Rp4T+ZMvrLNhHaaeS9hfjJ1gJUBfiDr4cx+htQ==
   dependencies:
     "@ethersproject/abi" "^5.1.2"
     "@metamask/eth-sig-util" "^4.0.0"
@@ -1262,7 +1262,7 @@ hardhat@^2.12.0:
     source-map-support "^0.5.13"
     stacktrace-parser "^0.1.10"
     tsort "0.0.1"
-    undici "^5.4.0"
+    undici "^5.14.0"
     uuid "^8.3.2"
     ws "^7.4.6"
 
@@ -2080,10 +2080,10 @@ type-fest@^0.7.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
   integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
 
-undici@^5.4.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.11.0.tgz#1db25f285821828fc09d3804b9e2e934ae86fc13"
-  integrity sha512-oWjWJHzFet0Ow4YZBkyiJwiK5vWqEYoH7BINzJAJOLedZ++JpAlCbUktW2GQ2DS2FpKmxD/JMtWUUWl1BtghGw==
+undici@^5.14.0:
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.20.0.tgz#6327462f5ce1d3646bcdac99da7317f455bcc263"
+  integrity sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==
   dependencies:
     busboy "^1.6.0"