Skip to content
This repository was archived by the owner on May 3, 2024. It is now read-only.

add MintWithOptions (#116) #117

Merged
merged 3 commits into from
Mar 24, 2023
Merged

add MintWithOptions (#116) #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3af4e46
add MintWithOptions (#116)
ricebin Mar 17, 2023
9d959e6
add MintWithOptions (#118)
ricebin Mar 24, 2023
add0e9c
Fix line
Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/thirdweb/nft_collection_commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ var nftSigmintCmd = &cobra.Command{
} else if !valid {
panic("Invalid signature")
}
tx, err := nftCollection.Signature.Mint(context.Background(), payload)

tx, err := nftCollection.Signature.MintAndAwait(context.Background(), payload)
if err != nil {
panic(err)
}
Expand Down
22 changes: 13 additions & 9 deletions thirdweb/erc1155_signature_minting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,25 @@ func newERC1155SignatureMinting(provider *ethclient.Client, address common.Addre
// signedPayload, err := contract.Signature.Generate(payload)
// tx, err := contract.Signature.Mint(signedPayload)
func (signature *ERC1155SignatureMinting) Mint(ctx context.Context, signedPayload *SignedPayload1155) (*types.Transaction, error) {
message, err := signature.mapPayloadToContractStruct(ctx, signedPayload.Payload)
txOpts, err := signature.Helper.GetTxOptions(ctx)
if err != nil {
return nil, err
}

txOpts, err := signature.Helper.GetTxOptions(ctx)
tx, err := signature.MintWithOpts(ctx, signedPayload, txOpts)
if err != nil {
return nil, err
}

return signature.Helper.AwaitTx(ctx, tx.Hash())
}

func (signature *ERC1155SignatureMinting) MintWithOpts(ctx context.Context, signedPayload *SignedPayload1155, txOpts *bind.TransactOpts) (*types.Transaction, error) {
message, err := signature.mapPayloadToContractStruct(ctx, signedPayload.Payload)
if err != nil {
return nil, err
}

if err := setErc20Allowance(
ctx,
signature.Helper,
Expand All @@ -77,12 +87,7 @@ func (signature *ERC1155SignatureMinting) Mint(ctx context.Context, signedPayloa
return nil, err
}

tx, err := signature.abi.MintWithSignature(txOpts, *message, signatureBytes)
if err != nil {
return nil, err
}

return signature.Helper.AwaitTx(ctx, tx.Hash())
return signature.abi.MintWithSignature(txOpts, *message, signatureBytes)
}

// Mint a batch of token with the data in given payload.
Expand Down Expand Up @@ -515,7 +520,6 @@ func (signature *ERC1155SignatureMinting) mapPayloadToContractStruct(ctx context
return nil, errors.New("Specified price was not a valid big.Int")
}


// If tokenID < 0, set it to MaxUin256 (to mint a new NFT)
tokenId := big.NewInt(int64(mintRequest.TokenId))
if mintRequest.TokenId < 0 {
Expand Down
32 changes: 22 additions & 10 deletions thirdweb/erc721_signature_minting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,33 @@ func newERC721SignatureMinting(provider *ethclient.Client, address common.Addres
// // Learn more about how to craft a payload in the Generate() function
// signedPayload, err := contract.Signature.Generate(payload)
// tx, err := contract.Signature.Mint(context.Background(), signedPayload)

// Deprecated: use MintAndAwait
func (signature *ERC721SignatureMinting) Mint(ctx context.Context, signedPayload *SignedPayload721) (*types.Transaction, error) {
message, err := signature.mapPayloadToContractStruct(ctx, signedPayload.Payload)
return signature.MintAndAwait(ctx, signedPayload)
}

func (signature *ERC721SignatureMinting) MintAndAwait(ctx context.Context, signedPayload *SignedPayload721) (*types.Transaction, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason to rename this here? If possible, would probably be best to keep the Mint API here available just so it isn't a breaking change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as a sdk.. we should be really explicit and obvious when we are doing loop/poll .. hence the suffix

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sent another pr then: #118

txOpts, err := signature.Helper.GetTxOptions(ctx)
if err != nil {
return nil, err
}

txOpts, err := signature.Helper.GetTxOptions(ctx)
tx, err := signature.MintWithOpts(ctx, signedPayload, txOpts)

if err != nil {
return nil, err
}

return signature.Helper.AwaitTx(ctx, tx.Hash())
}

func (signature *ERC721SignatureMinting) MintWithOpts(ctx context.Context, signedPayload *SignedPayload721, txOpts *bind.TransactOpts) (*types.Transaction, error) {
message, err := signature.mapPayloadToContractStruct(ctx, signedPayload.Payload)
if err != nil {
return nil, err
}

if err := setErc20Allowance(
ctx,
signature.Helper,
Expand All @@ -78,12 +95,7 @@ func (signature *ERC721SignatureMinting) Mint(ctx context.Context, signedPayload
return nil, err
}

tx, err := signature.abi.MintWithSignature(txOpts, *message, signatureBytes)
if err != nil {
return nil, err
}

return signature.Helper.AwaitTx(ctx, tx.Hash())
return signature.abi.MintWithSignature(txOpts, *message, signatureBytes)
}

// Mint a batch of token with the data in given payload.
Expand Down Expand Up @@ -128,7 +140,7 @@ func (signature *ERC721SignatureMinting) MintBatch(ctx context.Context, signedPa
if err != nil {
return nil, err
}

tx, err := signature.abi.MintWithSignature(txOpts, *payload, signatureBytes)
if err != nil {
return nil, err
Expand Down Expand Up @@ -390,7 +402,7 @@ func (signature *ERC721SignatureMinting) GenerateBatchWithUris(ctx context.Conte
if err != nil {
return nil, err
}

body, err := signature.storage.Get(ctx, p.MetadataUri)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion thirdweb/nft_collection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestSignatureMintNft(t *testing.T) {

assert.True(t, valid)

_, err = nft.Signature.Mint(context.Background(), payload)
_, err = nft.Signature.MintAndAwait(context.Background(), payload)
assert.Nil(t, err)

balance, _ = nft.Balance(context.Background())
Expand Down