Skip to content

Commit 08f8f8d

Browse files
mablrmablr
authored
Merge branch 'master' into master
2 parents 53a2672 + 3de1235 commit 08f8f8d

74 files changed

Lines changed: 5883 additions & 525 deletions

Some content is hidden

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

‎.github/scripts/tempo-mpp.sh‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,28 @@ if ! command -v "$CHISEL" &>/dev/null; then
5353
exit 1
5454
fi
5555

56+
# When TEMPO_ROTATE_WALLET=1, generate a fresh wallet and use it instead of the
57+
# configured one. The faucet funds it below (TEMPO_AUTO_FUND).
58+
TEMPO_ROTATE_WALLET="${TEMPO_ROTATE_WALLET:-0}"
59+
if [ "$TEMPO_ROTATE_WALLET" = "1" ]; then
60+
echo "Rotating to a fresh ephemeral MPP wallet"
61+
if ! command -v jq &>/dev/null; then
62+
echo "ERROR: jq is required for TEMPO_ROTATE_WALLET=1"
63+
exit 1
64+
fi
65+
NEW_WALLET_JSON=$("$CAST" wallet new --json)
66+
TEMPO_PRIVATE_KEY=$(printf '%s' "$NEW_WALLET_JSON" | jq -r '(.data // .)[0].private_key')
67+
if [ -z "$TEMPO_PRIVATE_KEY" ] || [ "$TEMPO_PRIVATE_KEY" = "null" ]; then
68+
echo "ERROR: failed to parse private key from 'cast wallet new --json'"
69+
exit 1
70+
fi
71+
export TEMPO_PRIVATE_KEY
72+
# Drop any pre-seeded wallet/channel state so the fresh key is used as-is.
73+
unset TEMPO_KEYS_TOML_B64 2>/dev/null || true
74+
rm -f "${TEMPO_HOME:-$HOME/.tempo}/wallet/keys.toml" 2>/dev/null || true
75+
rm -f "${TEMPO_HOME:-$HOME/.tempo}/channels.db" 2>/dev/null || true
76+
fi
77+
5678
KEYS_FILE="${TEMPO_HOME:-$HOME/.tempo}/wallet/keys.toml"
5779
if [ -n "${TEMPO_PRIVATE_KEY:-}" ]; then
5880
WALLET=$("$CAST" wallet address --private-key "$TEMPO_PRIVATE_KEY")
@@ -79,7 +101,12 @@ if [ "$BEFORE_RAW" -lt "$MIN_BALANCE" ] && [ "$TEMPO_AUTO_FUND" = "1" ]; then
79101
while [ "$BEFORE_RAW" -lt "$MIN_BALANCE" ] && [ "$ATTEMPT" -lt "$TEMPO_AUTO_FUND_ATTEMPTS" ]; do
80102
ATTEMPT=$((ATTEMPT + 1))
81103
echo "Faucet attempt $ATTEMPT/$TEMPO_AUTO_FUND_ATTEMPTS"
82-
"$CAST" rpc tempo_fundAddress "$WALLET_LOWER" --rpc-url "$RPC" >/dev/null
104+
# Retry on a transient faucet error instead of aborting (set -e).
105+
if ! "$CAST" rpc tempo_fundAddress "$WALLET_LOWER" --rpc-url "$RPC" >/dev/null; then
106+
echo "Faucet RPC failed on attempt $ATTEMPT, retrying..."
107+
sleep 2
108+
continue
109+
fi
83110
sleep 2
84111
BEFORE=$("$CAST" erc20 balance "$TOKEN" "$WALLET" --rpc-url "$RPC")
85112
echo "$BEFORE"

‎.github/workflows/benchmarks-nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
has_regression: ${{ steps.compare.outputs.has_regression }}
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

‎.github/workflows/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
contents: read
6161
steps:
6262
- name: Checkout repository
63-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
63+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6464
with:
6565
persist-credentials: false
6666

@@ -190,7 +190,7 @@ jobs:
190190

191191
steps:
192192
- name: Checkout repository
193-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
193+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
194194
# persist-credentials defaults to true so we can push.
195195

196196
- name: Download benchmark results

‎.github/workflows/bump-forge-std.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818
pull-requests: write
1919
steps:
20-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2121
with:
2222
persist-credentials: false
2323
- name: Fetch and update forge-std tag

‎.github/workflows/bump-tempo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: write
1616
pull-requests: write
1717
steps:
18-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
18+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1919
with:
2020
fetch-depth: 0
2121

‎.github/workflows/ci-mpp.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
contents: read
2929
steps:
3030
# Checkout the repository
31-
- uses: actions/checkout@v6
31+
- uses: actions/checkout@v7.0.0
3232
with:
3333
persist-credentials: false
3434
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -50,8 +50,15 @@ jobs:
5050
MPP_API_KEY: ${{ secrets.MPP_API_KEY }}
5151
MPP_DEPOSIT: "1000000"
5252
TEMPO_AUTO_FUND: "1"
53+
# Use a fresh, faucet-funded wallet each run.
54+
TEMPO_ROTATE_WALLET: "1"
5355
run: |
54-
if [ -n "${TEMPO_PRIVATE_KEY:-}" ]; then
56+
if [ -z "${MPP_API_KEY:-}" ]; then
57+
echo "::warning::MPP_API_KEY secret not set, skipping MPP e2e"
58+
exit 0
59+
elif [ "${TEMPO_ROTATE_WALLET:-0}" = "1" ]; then
60+
echo "::notice::Rotating to a fresh ephemeral wallet for MPP e2e"
61+
elif [ -n "${TEMPO_PRIVATE_KEY:-}" ]; then
5562
echo "::notice::Using TEMPO_PRIVATE_KEY for MPP e2e"
5663
elif [ -n "${TEMPO_KEYS_TOML_B64:-}" ]; then
5764
mkdir -p ~/.tempo/wallet

‎.github/workflows/ci-tempo.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
contents: read
5050
steps:
5151
# Checkout the repository
52-
- uses: actions/checkout@v6
52+
- uses: actions/checkout@v7.0.0
5353
with:
5454
persist-credentials: false
5555
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -145,7 +145,7 @@ jobs:
145145
contents: read
146146
issues: write
147147
steps:
148-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
148+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
149149
with:
150150
persist-credentials: false
151151
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
permissions:
4242
contents: read
4343
steps:
44-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
44+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4545
with:
4646
persist-credentials: false
4747
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -58,7 +58,7 @@ jobs:
5858
permissions:
5959
contents: read
6060
steps:
61-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
61+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6262
with:
6363
persist-credentials: false
6464
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -74,7 +74,7 @@ jobs:
7474
permissions:
7575
contents: read
7676
steps:
77-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
77+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7878
with:
7979
persist-credentials: false
8080
- uses: crate-ci/typos@37bb98842b0d8c4ffebdb75301a13db0267cef89 # v1.47.2
@@ -85,7 +85,7 @@ jobs:
8585
permissions:
8686
contents: read
8787
steps:
88-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
88+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8989
with:
9090
persist-credentials: false
9191
- name: Shellcheck
@@ -101,7 +101,7 @@ jobs:
101101
permissions:
102102
contents: read
103103
steps:
104-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
104+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
105105
with:
106106
persist-credentials: false
107107
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -121,7 +121,7 @@ jobs:
121121
permissions:
122122
contents: read
123123
steps:
124-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
124+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
125125
with:
126126
persist-credentials: false
127127
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -136,7 +136,7 @@ jobs:
136136
permissions:
137137
contents: read
138138
steps:
139-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
139+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
140140
with:
141141
persist-credentials: false
142142
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
@@ -169,7 +169,7 @@ jobs:
169169
build-mode: none
170170
steps:
171171
- name: Checkout repository
172-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
172+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
173173
with:
174174
persist-credentials: false
175175
- name: Initialize CodeQL

‎.github/workflows/crate-checks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
permissions:
2323
contents: read
2424
steps:
25-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
25+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2626
with:
2727
persist-credentials: false
2828
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
2929
with:
3030
toolchain: stable
3131
- uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
32-
- uses: taiki-e/install-action@59012be0884e296ca2da49b530610e72c49039ad # v2.81.6
32+
- uses: taiki-e/install-action@9e1e5806d4a4822de933115878265be9aaa786d9 # v2.82.2
3333
with:
3434
tool: cargo-hack
3535
- uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
@@ -45,7 +45,7 @@ jobs:
4545
contents: read
4646
issues: write
4747
steps:
48-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
48+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4949
with:
5050
persist-credentials: false
5151
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

‎.github/workflows/docker-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
packages: write
4040
timeout-minutes: 60
4141
steps:
42-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4343
with:
4444
persist-credentials: false
4545

0 commit comments

Comments
 (0)