fix nil pointer in manifold minter (after tx sent!)

dakma-dev · Aug 1, 2023 · e599a9d · e599a9d
1 parent a17f50f
commit e599a9d
Showing 1 changed file with 21 additions and 28 deletions.
diff --git a/cmd/mintcmd/manifold.go b/cmd/mintcmd/manifold.go
@@ -486,6 +486,10 @@ func mintERC1155(rpcEndpoints mapset.Set[string], mintWallet *MintWallet, txsPer
 		txOpts.GasFeeCap = gasFeeCap
 		txOpts.GasTipCap = gasTipCap
 
+		if viper.GetBool("dev.mode") {
+			txOpts.NoSend = true
+		}
+
 		log.Printf("%s | txOpts: %#v", mintWallet.tag, txOpts)
 
 		// create the transaction
@@ -503,50 +507,39 @@ func mintERC1155(rpcEndpoints mapset.Set[string], mintWallet *MintWallet, txsPer
 			sentTx, err = lazyClaimERC1155.MintBatch(txOpts, mintInfo.PublicData.CreatorContractAddress, manifoldInstanceID, amountPerTx, mintIndices, merkelProofs, *mintWallet.address)
 			if err != nil {
 				prErr(mintInfo, claimInfo)
-				log.Printf("%s | ❌ creating batch transaction failed: %+v", mintWallet.tag, style.BoldAlmostWhite(err.Error()))
-
-				if !viper.GetBool("dev.mode") {
-					continue
-				}
-
-				sentTx = types.NewTransaction(nonce, internal.ManifoldLazyClaimERC1155, big.NewInt(1), 1337, big.NewInt(1337), nil)
+				log.Printf("%s | ❌ creating batch transaction failed: %#v | %#v", mintWallet.tag, style.BoldAlmostWhite(err.Error()), err)
 			}
 		} else {
 			sentTx, err = lazyClaimERC1155.Mint(txOpts, mintInfo.PublicData.CreatorContractAddress, manifoldInstanceID, 0, [][32]byte{claimInfo.MerkleRoot}, *mintWallet.address)
 			if err != nil {
 				prErr(mintInfo, claimInfo)
-				log.Printf("%s | ❌ creating transaction failed: %+v", mintWallet.tag, style.BoldAlmostWhite(err.Error()))
+				log.Printf("%s | ❌ creating transaction failed: %#v | %#v", mintWallet.tag, style.BoldAlmostWhite(err.Error()), err)
+			}
+		}
 
-				if !viper.GetBool("dev.mode") {
-					continue
-				}
+		if sentTx == nil {
+			log.Printf("%s | ❌ executing transaction failed - sentTx is %#v", mintWallet.tag, sentTx)
 
-				sentTx = types.NewTransaction(nonce, internal.ManifoldLazyClaimERC1155, big.NewInt(1), 1337, big.NewInt(1337), nil)
-			}
+			continue
 		}
 
 		log.Printf("%s | 🙌 tx sent! → %s 🙌", mintWallet.tag, style.TerminalLink(utils.GetEtherscanTxURL(sentTx.Hash().Hex()), style.BoldAlmostWhite(sentTx.Hash().Hex())))
 
 		// wait for the transaction to be mined
-		for {
-			log.Printf("%s | waiting for tx confirmation...", mintWallet.tag)
-			time.Sleep(time.Second * 2)
-
-			receipt, err := rpcClient.TransactionReceipt(context.Background(), sentTx.Hash())
-			if err != nil {
-				log.Errorf("%s | error waiting for tx: %+v", mintWallet.tag, err)
+		receipt, err := bind.WaitMined(context.Background(), rpcClient, sentTx)
+		if err != nil {
+			prErr(mintInfo, claimInfo)
 
-				continue
-			}
+			log.Printf("%s | ❌ transaction failed: %+v", mintWallet.tag, style.BoldAlmostWhite(err.Error()))
 
-			if receipt != nil {
-				log.Printf("%s | 🎉 transaction mined! → %s 🎉", mintWallet.tag, style.TerminalLink(utils.GetEtherscanTxURL(sentTx.Hash().Hex()), style.BoldAlmostWhite(sentTx.Hash().Hex())))
-				pretty.Println(receipt)
+			continue
+		}
 
-				txConfirmed++
+		if receipt != nil {
+			log.Printf("%s | 🎉 transaction mined! → %s 🎉", mintWallet.tag, style.TerminalLink(utils.GetEtherscanTxURL(receipt.TxHash.Hex()), style.BoldAlmostWhite(receipt.TxHash.Hex())))
+			pretty.Println(receipt)
 
-				break
-			}
+			txConfirmed++
 		}
 
 		if txConfirmed >= int(txsPerWallet) {