Skip to content

Commit e404213

Browse files
authored
Merge branch 'main' into feature/wallet-js-update
2 parents 9ac47b1 + 9083a86 commit e404213

File tree

128 files changed

+1588
-726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1588
-726
lines changed

.github/workflows/nix.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ concurrency:
2626
group: ${{ github.sha }}
2727
cancel-in-progress: true
2828

29+
env:
30+
ECR_REGISTRY: 432820653916.dkr.ecr.eu-central-1.amazonaws.com
31+
S3_CACHE: s3://iog-catalyst-nix-cache?region=eu-central-1
32+
2933
jobs:
3034
discover:
3135
outputs:
@@ -47,11 +51,13 @@ jobs:
4751
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
4852
runs-on: ubuntu-latest
4953
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"
54+
- name: Configure Registry
55+
run: |
56+
aws ecr get-login-password --region eu-central-1 | docker login --username AWS --password-stdin "${{ env.ECR_REGISTRY }}"
57+
env:
58+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
59+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
60+
AWS_DEFAULT_REGION: eu-central-1
5561
- uses: divnix/std-action/run@main
5662
with:
5763
extra_nix_config: |
@@ -60,7 +66,7 @@ jobs:
6066
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
6167
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
6268
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
63-
cache: s3://iog-catalyst-cache?region=eu-central-1
69+
cache: ${{ env.S3_CACHE }}
6470
build-packages:
6571
if: always()
6672
needs:
@@ -81,7 +87,7 @@ jobs:
8187
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
8288
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
8389
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
84-
cache: s3://iog-catalyst-cache?region=eu-central-1
90+
cache: ${{ env.S3_CACHE }}
8591
build-devshells:
8692
if: always()
8793
needs:
@@ -102,4 +108,4 @@ jobs:
102108
nix_key: ${{ secrets.NIX_SIGNING_KEY }}
103109
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
104110
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
105-
cache: s3://iog-catalyst-cache?region=eu-central-1
111+
cache: ${{ env.S3_CACHE }}

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/g77c5dnwa9idf7mx6lmgd3lvsz5jg3kh-prettierrc
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shell-profile-5-link
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/drkh2j6wkl3w4xbz9wwgi8n856zn1ijx-Catalyst-Core
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/702h0vcyxycwvv3kpkh724zvnnqs9kxi-Catalyst-Core
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/ivbw2wlzkhh0f3i8fjxclgdw7273w5jg-Catalyst-Core
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/drkh2j6wkl3w4xbz9wwgi8n856zn1ijx-Catalyst-Core
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/ivbw2wlzkhh0f3i8fjxclgdw7273w5jg-Catalyst-Core

Cargo.lock

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

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,

0 commit comments

Comments
 (0)