Skip to content

Commit

Permalink
linux proving keys (#292)
Browse files Browse the repository at this point in the history
* linux proving keys

Signed-off-by: Apokalip <simeon@manta.network>

* remove testing line

Signed-off-by: Apokalip <simeon@manta.network>

* Changelog

Signed-off-by: Apokalip <simeon@manta.network>

* Changelopg

Signed-off-by: Apokalip <simeon@manta.network>

* Update CHANGELOG.md

Signed-off-by: Simeon Zahariev <43317481+Apokalip@users.noreply.github.com>

---------

Signed-off-by: Apokalip <simeon@manta.network>
Signed-off-by: Simeon Zahariev <43317481+Apokalip@users.noreply.github.com>
  • Loading branch information
Apokalip authored Feb 13, 2023
1 parent 44c2e8b commit 6821585
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Added

### Changed

### Deprecated

### Removed

### Fixed
- [\#292](https://github.com/Manta-Network/manta-signer/pull/292) Fix linux signer not finding proving keys on system

### Security

## [1.0.1] 2023-01-24
### Added
Expand Down
9 changes: 8 additions & 1 deletion src/parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@ where

// MacOs installation puts assets in another folder "Resources" compared to Win/Linux Installations
let mut directory_check = PathBuf::from(&exec_dir).join("proving");

// check for test server and MacOs installation folder hierachy discrepancy relative to Win/Ubuntu
if !directory_check.is_dir() {
exec_dir.pop();
directory_check = PathBuf::from(&exec_dir).join("proving");

if !directory_check.is_dir() {
exec_dir.push("Resources");
if cfg!(target_os = "macos") {
// macos
exec_dir.push("Resources");
} else {
// linux (ubuntu) specific
exec_dir = PathBuf::from("/usr/lib/manta-signer");
}
}
}
// use absolute paths for release
Expand Down

1 comment on commit 6821585

@vercel
Copy link

@vercel vercel bot commented on 6821585 Feb 13, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.