Merge pull request #117 from spacemeshos/bump-postrs-v0.1.4

Bump post-rs to v0.1.4

Makefile.Inc

@@ -93,7 +93,7 @@ else
   endif
 endif
 
-POSTRS_SETUP_REV = 0.1.3
+POSTRS_SETUP_REV = 0.1.4
 POSTRS_SETUP_ZIP = libpost-$(platform)-v$(POSTRS_SETUP_REV).zip
 POSTRS_SETUP_URL_ZIP ?= https://github.com/spacemeshos/post-rs/releases/download/v$(POSTRS_SETUP_REV)/$(POSTRS_SETUP_ZIP)
 

postrs/bridge.go

@@ -30,7 +30,7 @@ func translateScryptParams(params config.ScryptParams) C.ScryptParams {
 	}
 }
 
-func GenerateProof(datadir string, challenge []byte, cfg config.Config, nonces uint, powScrypt config.ScryptParams) (*shared.Proof, error) {
+func GenerateProof(datadir string, challenge []byte, cfg config.Config, nonces uint, threads uint, powScrypt config.ScryptParams) (*shared.Proof, error) {
 	datadirPtr := C.CString(datadir)
 	defer C.free(unsafe.Pointer(datadirPtr))
 
@@ -48,9 +48,9 @@ func GenerateProof(datadir string, challenge []byte, cfg config.Config, nonces u
 	cProof := C.generate_proof(
 		datadirPtr,
 		(*C.uchar)(challengePtr),
-		C.size_t(len(challenge)),
 		config,
 		C.size_t(nonces),
+		C.size_t(threads),
 	)
 
 	if cProof == nil {

proving/proving.go

@@ -21,6 +21,7 @@ const (
 // TODO (mafa): replace Logger with zap.
 func Generate(ctx context.Context, ch shared.Challenge, cfg config.Config, logger shared.Logger, opts ...OptionFunc) (*shared.Proof, *shared.ProofMetadata, error) {
 	options := option{
+		threads:   1,
 		nonces:    20,
 		powScrypt: config.DefaultPowParams(),
 	}
@@ -33,7 +34,7 @@ func Generate(ctx context.Context, ch shared.Challenge, cfg config.Config, logge
 		return nil, nil, err
 	}
 
-	result, err := postrs.GenerateProof(options.datadir, ch, cfg, options.nonces, options.powScrypt)
+	result, err := postrs.GenerateProof(options.datadir, ch, cfg, options.nonces, options.threads, options.powScrypt)
 	if err != nil {
 		return nil, nil, fmt.Errorf("generating proof: %w", err)
 	}

proving/proving_options.go

@@ -16,6 +16,9 @@ type option struct {
 	powScrypt       config.ScryptParams
 	// How many nonces to try in parallel.
 	nonces uint
+	// How many threads to use to generate a proof.
+	// 0 - automatically detect
+	threads uint
 }
 
 func (o *option) validate() error {
@@ -75,3 +78,10 @@ func WithNonces(nonces uint) OptionFunc {
 		return nil
 	}
 }
+
+func WithThreads(threads uint) OptionFunc {
+	return func(o *option) error {
+		o.threads = threads
+		return nil
+	}
+}

proving/proving_test.go

@@ -73,6 +73,7 @@ func Test_Generate(t *testing.T) {
 				cfg,
 				log,
 				WithDataSource(cfg, nodeId, commitmentAtxId, opts.DataDir),
+				WithThreads(2),
 			)
 			r.NoError(err, "numUnits: %d", opts.NumUnits)
 			r.NotNil(proof)