mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-01-21 03:21:08 +03:00
Merge branch 'master' into contracts
This commit is contained in:
Yeastplume
commit
e674c4a2f0
16 changed files with 209 additions and 335 deletions
|
|
@ -1,28 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2019 The Grin Developers
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This script contains test-related jobs.
|
||||
|
||||
case "${CI_JOB}" in
|
||||
"test")
|
||||
for dir in ${CI_JOB_ARGS}; do
|
||||
printf "executing tests in directory \`%s\`...\n" "${dir}"
|
||||
cd "${dir}" && \
|
||||
cargo test --release && \
|
||||
cd - > /dev/null || exit 1
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
steps:
|
||||
- script: 'cargo test --all'
|
||||
displayName: Cargo Test All
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- script: |
|
||||
cargo clean
|
||||
ROARING_ARCH=x86-64-v2
|
||||
cargo build --release
|
||||
displayName: Build Release
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- script: |
|
||||
MY_TAG="$(Build.SourceBranch)"
|
||||
MY_TAG=${MY_TAG#refs/tags/}
|
||||
echo $MY_TAG
|
||||
echo "##vso[task.setvariable variable=build.my_tag]$MY_TAG"
|
||||
echo "##vso[task.setvariable variable=build.platform]$PLATFORM"
|
||||
displayName: "Create my tag variable"
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- task: CopyFiles@2
|
||||
displayName: Copy assets
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
sourceFolder: '$(Build.SourcesDirectory)/target/release'
|
||||
contents: 'grin-wallet'
|
||||
targetFolder: '$(Build.BinariesDirectory)/grin-wallet'
|
||||
- task: ArchiveFiles@2
|
||||
displayName: Gather assets
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
rootFolderOrFile: '$(Build.BinariesDirectory)/grin-wallet'
|
||||
archiveType: 'tar'
|
||||
tarCompression: 'gz'
|
||||
archiveFile: '$(Build.ArtifactStagingDirectory)/grin-wallet-$(build.my_tag)-$(build.platform).tar.gz'
|
||||
- script: |
|
||||
cd $(Build.ArtifactStagingDirectory) && openssl sha256 grin-wallet-$(build.my_tag)-$(build.platform).tar.gz > grin-wallet-$(build.my_tag)-$(build.platform)-sha256sum.txt
|
||||
displayName: Create Checksum
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- task: GithubRelease@0
|
||||
displayName: Github release
|
||||
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
gitHubConnection: 'ignopeverell'
|
||||
repositoryName: 'mimblewimble/grin-wallet'
|
||||
action: 'edit'
|
||||
target: '$(build.sourceVersion)'
|
||||
tagSource: 'manual'
|
||||
tag: '$(build.my_tag)'
|
||||
assets: |
|
||||
$(Build.ArtifactStagingDirectory)/grin-wallet-$(build.my_tag)-$(build.platform).tar.gz
|
||||
$(Build.ArtifactStagingDirectory)/grin-wallet-$(build.my_tag)-$(build.platform)-sha256sum.txt
|
||||
title: '$(build.my_tag)'
|
||||
assetUploadMode: 'replace'
|
||||
addChangeLog: true
|
||||
14
.ci/test.yml
14
.ci/test.yml
|
|
@ -1,14 +0,0 @@
|
|||
steps:
|
||||
- script: 'refreshenv && cargo test --all'
|
||||
env:
|
||||
LIBCLANG_PATH: C:\Program Files\LLVM\lib
|
||||
LLVM_CONFIG_PATH: C:\Program Files\LLVM\bin\llvm-config
|
||||
ROARING_ARCH: x86-64-v2
|
||||
displayName: Windows Cargo Test
|
||||
condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), eq( variables['CI_JOB'], 'test-all' ))
|
||||
- script: 'ROARING_ARCH=x86-64-v2 cargo test --all'
|
||||
displayName: macOS Cargo Test
|
||||
condition: and(eq( variables['Agent.OS'], 'Darwin' ), eq( variables['CI_JOB'], 'test-all' ))
|
||||
- script: 'ROARING_ARCH=x86-64-v2 .ci/general-jobs'
|
||||
displayName: Linux Cargo Test
|
||||
condition: eq( variables['Agent.OS'], 'Linux' )
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
steps:
|
||||
- script: 'refreshenv && cargo test --all'
|
||||
env:
|
||||
LIBCLANG_PATH: C:\Program Files\LLVM\lib
|
||||
LLVM_CONFIG_PATH: C:\Program Files\LLVM\bin\llvm-config
|
||||
ROARING_ARCH: x86-64-v2
|
||||
displayName: Cargo Test All
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- script: 'refreshenv && cargo clean && cargo build --release'
|
||||
env:
|
||||
LIBCLANG_PATH: C:\Program Files\LLVM\lib
|
||||
LLVM_CONFIG_PATH: C:\Program Files\LLVM\bin\llvm-config
|
||||
ROARING_ARCH: x86-64-v2
|
||||
displayName: Build Release
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- script: |
|
||||
SET MY_TAG=$(Build.SourceBranch)
|
||||
SET MY_TAG=%MY_TAG:~10%
|
||||
echo %MY_TAG%
|
||||
echo %PLATFORM%
|
||||
echo ##vso[task.setvariable variable=build.my_tag]%MY_TAG%
|
||||
echo ##vso[task.setvariable variable=build.platform]%PLATFORM%
|
||||
displayName: "Create my tag variable"
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- task: CopyFiles@2
|
||||
displayName: Copy assets
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
sourceFolder: '$(Build.SourcesDirectory)\target\release'
|
||||
contents: 'grin-wallet.exe'
|
||||
targetFolder: '$(Build.BinariesDirectory)\grin-wallet'
|
||||
- task: ArchiveFiles@2
|
||||
displayName: Gather assets
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
rootFolderOrFile: '$(Build.BinariesDirectory)\grin-wallet'
|
||||
archiveType: 'zip'
|
||||
archiveFile: '$(Build.ArtifactStagingDirectory)\grin-wallet-$(build.my_tag)-$(build.platform).zip'
|
||||
- script: |
|
||||
powershell -Command "cd $(Build.ArtifactStagingDirectory); get-filehash -algorithm sha256 grin-wallet-$(build.my_tag)-$(build.platform).zip | Format-List | Out-String | ForEach-Object { $_.Trim() } > grin-wallet-$(build.my_tag)-$(build.platform)-sha256sum.txt"
|
||||
displayName: Create Checksum
|
||||
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
- task: GithubRelease@0
|
||||
displayName: Github release
|
||||
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['CI_JOB'], 'release' ))
|
||||
inputs:
|
||||
gitHubConnection: 'ignopeverell'
|
||||
repositoryName: 'mimblewimble/grin-wallet'
|
||||
action: 'edit'
|
||||
target: '$(build.sourceVersion)'
|
||||
tagSource: 'manual'
|
||||
tag: '$(build.my_tag)'
|
||||
assets: |
|
||||
$(Build.ArtifactStagingDirectory)\grin-wallet-$(build.my_tag)-$(build.platform).zip
|
||||
$(Build.ArtifactStagingDirectory)\grin-wallet-$(build.my_tag)-$(build.platform)-sha256sum.txt
|
||||
title: '$(build.my_tag)'
|
||||
assetUploadMode: 'replace'
|
||||
addChangeLog: true
|
||||
73
.github/workflows/cd.yaml
vendored
Normal file
73
.github/workflows/cd.yaml
vendored
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
name: Continuous Deployment
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*.*.*"
|
||||
|
||||
jobs:
|
||||
linux-release:
|
||||
name: Linux Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Build
|
||||
run: cargo build --release
|
||||
- name: Archive
|
||||
working-directory: target/release
|
||||
run: tar -czvf grin-wallet-${{ github.ref_name }}-linux-x86_64.tar.gz grin-wallet
|
||||
- name: Create Checksum
|
||||
working-directory: target/release
|
||||
run: openssl sha256 grin-wallet-${{ github.ref_name }}-linux-x86_64.tar.gz > grin-wallet-${{ github.ref_name }}-linux-x86_64-sha256sum.txt
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
target/release/grin-wallet-${{ github.ref_name }}-linux-x86_64.tar.gz
|
||||
target/release/grin-wallet-${{ github.ref_name }}-linux-x86_64-sha256sum.txt
|
||||
|
||||
macos-release:
|
||||
name: macOS Release
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Build
|
||||
run: cargo build --release
|
||||
- name: Archive
|
||||
working-directory: target/release
|
||||
run: tar -czvf grin-wallet-${{ github.ref_name }}-macos-x86_64.tar.gz grin-wallet
|
||||
- name: Create Checksum
|
||||
working-directory: target/release
|
||||
run: openssl sha256 grin-wallet-${{ github.ref_name }}-macos-x86_64.tar.gz > grin-wallet-${{ github.ref_name }}-macos-x86_64-sha256sum.txt
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
target/release/grin-wallet-${{ github.ref_name }}-macos-x86_64.tar.gz
|
||||
target/release/grin-wallet-${{ github.ref_name }}-macos-x86_64-sha256sum.txt
|
||||
|
||||
windows-release:
|
||||
name: Windows Release
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Build
|
||||
run: cargo build --release
|
||||
- name: Archive
|
||||
uses: vimtor/action-zip@v1
|
||||
with:
|
||||
files: target/release/grin-wallet.exe
|
||||
dest: target/release/grin-wallet-${{ github.ref_name }}-win-x86_64.zip
|
||||
- name: Create Checksum
|
||||
working-directory: target/release
|
||||
shell: pwsh
|
||||
run: get-filehash -algorithm sha256 grin-wallet-${{ github.ref_name }}-win-x86_64.zip | Format-List | Out-String | ForEach-Object { $_.Trim() } > grin-wallet-${{ github.ref_name }}-win-x86_64-sha256sum.txt
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
target/release/grin-wallet-${{ github.ref_name }}-win-x86_64.zip
|
||||
target/release/grin-wallet-${{ github.ref_name }}-win-x86_64-sha256sum.txt
|
||||
33
.github/workflows/ci.yaml
vendored
Normal file
33
.github/workflows/ci.yaml
vendored
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
name: Continuous Integration
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
linux-tests:
|
||||
name: Linux Tests
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
job_args: [api, config, controller, impls, libwallet, .]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Test ${{ matrix.job_args }}
|
||||
working-directory: ${{ matrix.job_args }}
|
||||
run: cargo test --release
|
||||
|
||||
macos-tests:
|
||||
name: macOS Tests
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Tests
|
||||
run: cargo test --release --all
|
||||
|
||||
windows-tests:
|
||||
name: Windows Tests
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Tests
|
||||
run: cargo test --release --all
|
||||
46
Cargo.lock
generated
46
Cargo.lock
generated
|
|
@ -1332,8 +1332,8 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
|||
|
||||
[[package]]
|
||||
name = "grin_api"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"bytes 0.5.6",
|
||||
"easy-jsonrpc-mw",
|
||||
|
|
@ -1364,8 +1364,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_chain"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"bit-vec",
|
||||
"bitflags 1.3.2",
|
||||
|
|
@ -1387,8 +1387,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_core"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"blake2-rfc",
|
||||
"byteorder",
|
||||
|
|
@ -1413,8 +1413,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_keychain"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"blake2-rfc",
|
||||
"byteorder",
|
||||
|
|
@ -1435,8 +1435,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_p2p"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bytes 0.5.6",
|
||||
|
|
@ -1457,8 +1457,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_pool"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"blake2-rfc",
|
||||
"chrono",
|
||||
|
|
@ -1490,8 +1490,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_store"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"croaring",
|
||||
|
|
@ -1509,8 +1509,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_util"
|
||||
version = "5.2.0-beta.2"
|
||||
source = "git+https://github.com/mimblewimble/grin?branch=master#399fb19c3014a4a5c3f0575dd222e7df6fda8c83"
|
||||
version = "5.2.0-beta.3"
|
||||
source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"base64 0.12.3",
|
||||
|
|
@ -1530,7 +1530,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"built",
|
||||
"clap",
|
||||
|
|
@ -1562,7 +1562,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_api"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"base64 0.12.3",
|
||||
"chrono",
|
||||
|
|
@ -1587,7 +1587,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_config"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"dirs 2.0.2",
|
||||
"grin_core",
|
||||
|
|
@ -1602,7 +1602,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_controller"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"easy-jsonrpc-mw",
|
||||
|
|
@ -1638,7 +1638,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_impls"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"base64 0.12.3",
|
||||
"blake2-rfc",
|
||||
|
|
@ -1677,7 +1677,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_libwallet"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"age",
|
||||
"base64 0.9.3",
|
||||
|
|
@ -1714,7 +1714,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "grin_wallet_util"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
dependencies = [
|
||||
"data-encoding",
|
||||
"ed25519-dalek",
|
||||
|
|
|
|||
32
Cargo.toml
32
Cargo.toml
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -30,12 +30,12 @@ semver = "0.10"
|
|||
rustyline = "6"
|
||||
lazy_static = "1"
|
||||
|
||||
grin_wallet_api = { path = "./api", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_impls = { path = "./impls", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_controller = { path = "./controller", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "./config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_api = { path = "./api", version = "5.2.0-beta.1" }
|
||||
grin_wallet_impls = { path = "./impls", version = "5.2.0-beta.1" }
|
||||
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-beta.1" }
|
||||
grin_wallet_controller = { path = "./controller", version = "5.2.0-beta.1" }
|
||||
grin_wallet_config = { path = "./config", version = "5.2.0-beta.1" }
|
||||
grin_wallet_util = { path = "./util", version = "5.2.0-beta.1" }
|
||||
|
||||
|
||||
##### Grin Imports
|
||||
|
|
@ -48,16 +48,16 @@ grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../grin/core"}
|
||||
|
|
@ -65,7 +65,7 @@ grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }
|
|||
# grin_util = { path = "../grin/util"}
|
||||
# grin_api = { path = "../grin/api"}
|
||||
|
||||
#####
|
||||
######
|
||||
|
||||
[build-dependencies]
|
||||
built = { version = "0.4", features = ["git2"]}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[](https://dev.azure.com/mimblewimble/grin-wallet/_build/latest?definitionId=3&branchName=master)
|
||||
[](https://github.com/mimblewimble/grin-wallet/actions/workflows/ci.yaml)
|
||||
[](https://codecov.io/gh/mimblewimble/grin-wallet)
|
||||
[](https://gitter.im/grin_community/Lobby)
|
||||
[](https://gitter.im/grin_community/support)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_api"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Grin Wallet API"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -22,10 +22,10 @@ ring = "0.16"
|
|||
base64 = "0.12"
|
||||
ed25519-dalek = "1.0.0-pre.4"
|
||||
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
|
@ -36,14 +36,14 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
# Copyright 2019 The Grin Developers
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
trigger:
|
||||
branches:
|
||||
include:
|
||||
- master
|
||||
tags:
|
||||
include: ['*']
|
||||
|
||||
pr:
|
||||
branches:
|
||||
include: ['*']
|
||||
|
||||
variables:
|
||||
RUST_BACKTRACE: '1'
|
||||
RUSTFLAGS: '-C debug-assertions'
|
||||
|
||||
jobs:
|
||||
- job: linux
|
||||
pool:
|
||||
vmImage: ubuntu-22.04
|
||||
strategy:
|
||||
matrix:
|
||||
config/libwallet/api:
|
||||
CI_JOB: test
|
||||
CI_JOB_ARGS: config libwallet api
|
||||
impls:
|
||||
CI_JOB: test
|
||||
CI_JOB_ARGS: impls
|
||||
controller/all:
|
||||
CI_JOB: test
|
||||
CI_JOB_ARGS: controller .
|
||||
release:
|
||||
CI_JOB: release
|
||||
PLATFORM: linux-amd64
|
||||
steps:
|
||||
- template: '.ci/test.yml'
|
||||
- template: '.ci/release.yml'
|
||||
- job: macos
|
||||
pool:
|
||||
vmImage: macos-latest
|
||||
strategy:
|
||||
matrix:
|
||||
test:
|
||||
CI_JOB: test-all
|
||||
release:
|
||||
CI_JOB: release
|
||||
PLATFORM: macos
|
||||
steps:
|
||||
- template: '.ci/test.yml'
|
||||
- template: '.ci/release.yml'
|
||||
- job: windows
|
||||
pool:
|
||||
vmImage: windows-latest
|
||||
strategy:
|
||||
matrix:
|
||||
test:
|
||||
CI_JOB: test-all
|
||||
release:
|
||||
CI_JOB: release
|
||||
PLATFORM: win-x64
|
||||
steps:
|
||||
- script: |
|
||||
choco install -y llvm
|
||||
displayName: Windows Install LLVM
|
||||
- template: '.ci/test.yml'
|
||||
- template: '.ci/windows-release.yml'
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_config"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -16,7 +16,7 @@ serde_derive = "1"
|
|||
toml = "0.5"
|
||||
dirs = "2.0"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
|
@ -26,12 +26,12 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_controller"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Controllers for grin wallet instantiation"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -30,11 +30,11 @@ lazy_static = "1"
|
|||
thiserror = "1"
|
||||
qr_code = "1.1.0"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_api = { path = "../api", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
|
||||
grin_wallet_api = { path = "../api", version = "5.2.0-beta.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.2.0-beta.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
|
@ -46,16 +46,16 @@ grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
|
|
@ -76,10 +76,10 @@ remove_dir_all = "0.7"
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_chain = { path = "../../grin/chain"}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_impls"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Concrete types derived from libwallet traits"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -36,9 +36,9 @@ sysinfo = "0.29"
|
|||
base64 = "0.12.0"
|
||||
url = "2.1"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
|
@ -52,20 +52,20 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_libwallet"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -37,8 +37,8 @@ bech32 = "0.7"
|
|||
byteorder = "1.3"
|
||||
num-bigint = "0.2"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
|
|
@ -49,16 +49,16 @@ grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_stire = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "grin_wallet_util"
|
||||
version = "5.2.0-alpha.1"
|
||||
version = "5.2.0-beta.1"
|
||||
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
|
||||
description = "Util, for generic utilities and to re-export grin crates"
|
||||
license = "Apache-2.0"
|
||||
|
|
@ -25,10 +25,10 @@ thiserror = "1"
|
|||
|
||||
# For beta release
|
||||
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue