Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

linux proving keys #292

Merged
merged 5 commits into from
Feb 13, 2023
Merged

linux proving keys #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e46e73c
linux proving keys
Apokalip Feb 11, 2023
c6e3c8a
remove testing line
Apokalip Feb 11, 2023
d2e2abb
Changelog
Apokalip Feb 13, 2023
d340346
Changelopg
Apokalip Feb 13, 2023
ce9f444
Update CHANGELOG.md
Apokalip Feb 13, 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
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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