We currently just set a fixed number for the gas, we should use a better approach. We should honor the gasLimit field set by the user.