account/abi/bind/v2: fix TestDeploymentWithOverrides

[stevemilk]

The root cause of the flaky test was a nonce conflict caused by async contract deployments.

This solution defines a custom deployer with automatic nonce management.

[rjl493456442]

We can probably define another customized deployer to solve the nonce conflict issue?

// DeployerWithNonceAssignment is basically identical to DefaultDeployer,
// but it additionally tracks the nonce to enable automatic assignment.
func DeployerWithNonceAssignment(opts *TransactOpts, backend ContractBackend) DeployFn {
	var pendingNonce int64
	if opts.Nonce != nil {
		pendingNonce = opts.Nonce.Int64()
	}
	return func(input []byte, deployer []byte) (common.Address, *types.Transaction, error) {
		if pendingNonce != 0 {
			opts.Nonce = big.NewInt(pendingNonce)
		}
		addr, tx, err := DeployContract(opts, deployer, backend, input)
		if err != nil {
			return common.Address{}, nil, err
		}
		pendingNonce = int64(tx.Nonce() + 1)
		return addr, tx, nil
	}
}

cc @jwasinger

[stevemilk]

Agreed — I’ve made the update, and this makes more sense, thx!

[jwasinger]

Yeah, I was going to comment that we shouldn't change the semantics of DeployContract. Introducing a new deployer here is the right way to go IMO