Skip to content

Commit 9c99488

Browse files
kukkok3kukkok3
authored
Merge branch 'main' into cardano_cli_mock
2 parents c59b11e + 3ec80d6 commit 9c99488

File tree

29 files changed

+227
-43
lines changed

29 files changed

+227
-43
lines changed

‎.github/workflows/nix.yml‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
name: Nix CI
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/workflows/nix.yml'
7+
- 'nix/**'
8+
- 'src/**'
9+
- 'Cargo.*'
10+
- 'flake.*'
11+
push:
12+
branches:
13+
- main
14+
paths:
15+
- '.github/workflows/nix.yml'
16+
- 'nix/**'
17+
- 'src/**'
18+
- 'Cargo.*'
19+
- 'flake.*'
20+
workflow_dispatch:
21+
22+
permissions:
23+
contents: read
24+
25+
concurrency:
26+
group: ${{ github.sha }}
27+
cancel-in-progress: true
28+
29+
jobs:
30+
discover:
31+
outputs:
32+
hits: ${{ steps.discovery.outputs.hits }}
33+
nix_conf: ${{ steps.discovery.outputs.nix_conf }}
34+
runs-on: ubuntu-latest
35+
concurrency:
36+
group: ${{ github.workflow }}
37+
steps:
38+
- name: Standard Discovery
39+
uses: divnix/std-action/discover@main
40+
id: discovery
41+
publish-containers:
42+
needs: discover
43+
strategy:
44+
fail-fast: false
45+
matrix:
46+
target: ${{ fromJSON(needs.discover.outputs.hits).containers.publish }}
47+
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
48+
runs-on: ubuntu-latest
49+
steps:
50+
- run: |
51+
config="$HOME/.docker/config.json"
52+
mkdir -p "${config%/*}"
53+
jq -n --arg token "${{ secrets.DOCKER_AUTH_TOKEN }}" '{ "auths": { "registry.ci.iog.io": { auth: $token } } }' > "$config"
54+
chmod 0600 "$config"
55+
- uses: divnix/std-action/run@main
56+
with:
57+
extra_nix_config: |
58+
${{ needs.discover.outputs.nix_conf }}
59+
json: ${{ toJSON(matrix.target) }}
60+
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
61+
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
62+
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
63+
cache: s3://iog-catalyst-cache?region=eu-central-1
64+
build-packages:
65+
if: always()
66+
needs:
67+
- discover
68+
- publish-containers
69+
strategy:
70+
fail-fast: false
71+
matrix:
72+
target: ${{ fromJSON(needs.discover.outputs.hits).packages.build }}
73+
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
74+
runs-on: ubuntu-latest
75+
steps:
76+
- uses: divnix/std-action/run@main
77+
with:
78+
extra_nix_config: |
79+
${{ needs.discover.outputs.nix_conf }}
80+
json: ${{ toJSON(matrix.target) }}
81+
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
82+
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
83+
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
84+
cache: s3://iog-catalyst-cache?region=eu-central-1
85+
build-devshells:
86+
if: always()
87+
needs:
88+
- discover
89+
- publish-containers
90+
strategy:
91+
fail-fast: false
92+
matrix:
93+
target: ${{ fromJSON(needs.discover.outputs.hits).devshells.build }}
94+
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
95+
runs-on: ubuntu-latest
96+
steps:
97+
- uses: divnix/std-action/run@main
98+
with:
99+
extra_nix_config: |
100+
${{ needs.discover.outputs.nix_conf }}
101+
json: ${{ toJSON(matrix.target) }}
102+
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
103+
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
104+
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
105+
cache: s3://iog-catalyst-cache?region=eu-central-1

‎Cargo.lock‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SECURITY.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Security
2+
3+
## Reporting a Vulnerability
4+
5+
Please report (suspected) security vulnerabilities to [email protected]. You will receive a
6+
response from us within 48 hours. If the issue is confirmed, we will release a patch as soon
7+
as possible.
8+
9+
Please provide a clear and concise description of the vulnerability, including:
10+
11+
* the affected version(s),
12+
* steps that can be followed to exercise the vulnerability,
13+
* any workarounds or mitigations.
14+
15+
If you have developed any code or utilities that can help demonstrate the suspected
16+
vulnerability, please mention them in your email but ***DO NOT*** attempt to include them as
17+
attachments as this may cause your Email to be blocked by spam filters.

‎book/src/core-ledger-doc/api/v0.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ paths:
102102
minimum: 0
103103
required:
104104
- value
105-
- counter
105+
- counters
106106
examples:
107107
with_delegation:
108108
value:
109109
{
110-
'counter': 1,
110+
'counters': [1,73,0,123,9999,0,0,987654],
111111
'delegation':
112112
{
113113
'pools':
@@ -125,7 +125,7 @@ paths:
125125
without_delegation:
126126
value:
127127
{
128-
'counter': 0,
128+
'counters': [1,73,0,123,9999,0,0,987654],
129129
'delegation': { 'pools': [] },
130130
'last_rewards': { 'epoch': 0, 'reward': 0 },
131131
'value': 1000,

‎flake.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
cellsFrom = ./nix;
3232

3333
cellBlocks = [
34-
(std.blockTypes.containers "containers")
35-
(std.blockTypes.devshells "devshells")
34+
(std.blockTypes.containers "containers" {ci.publish = true;})
35+
(std.blockTypes.devshells "devshells" {ci.build = true;})
3636
(std.blockTypes.functions "constants")
3737
(std.blockTypes.functions "lib")
3838
(std.blockTypes.functions "toolchains")
3939
(std.blockTypes.installables "artifacts")
4040
(std.blockTypes.installables "libraries")
41-
(std.blockTypes.installables "packages")
41+
(std.blockTypes.installables "packages" {ci.build = true;})
4242
(std.blockTypes.nixago "configs")
4343
(std.blockTypes.runnables "operables")
4444
];

‎src/chain-libs/chain-storage/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
//! __fig.1 - note that root does not actually exist, this is an ID referredby__
4242
//! __the first block in the chain__
4343
//!
44-
//! ```ignore
44+
//! ```text
4545
//! +---------+ +---------+
4646
//! | | | |
4747
//! | Block 4 | | Block 4'|
@@ -104,7 +104,7 @@
104104
//!
105105
//! __fig. 2 - permanent storage structure__
106106
//!
107-
//! ```ignore
107+
//! ```text
108108
//! store block no. index
109109
//!
110110
//! +--------------+ +-------------+
@@ -128,7 +128,7 @@
128128
//!
129129
//! # Storage directory layout
130130
//!
131-
//! ```ignore
131+
//! ```text
132132
//! store
133133
//! ├── permanent - permanent storage directory
134134
//! │   └── flatfile - storage file that can be transferred over the network

‎src/chain-libs/chain-time/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// #![warn(clippy::all)]
2+
// #![deny(missing_docs)]
13
pub mod era;
24
pub mod timeframe;
35
pub mod timeline;

‎src/chain-libs/chain-time/src/timeframe.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//! Timeframe
2+
//!
3+
14
use crate::timeline::Timeline;
25
use std::time::{Duration, SystemTime};
36

‎src/chain-wallet-libs/bindings/wallet-core/src/wallet.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl Wallet {
3535
/// Retrieve a wallet from a key used as utxo's
3636
///
3737
/// You can also use this function to recover a wallet even after you have
38-
/// transferred all the funds to the new format (see the [Self::convert] function).
38+
/// transferred all the funds to the new format
3939
///
4040
/// Parameters
4141
///

0 commit comments

Comments
 (0)