Skip to content

Commit 70a4910

Browse files
authored
Merge branch 'main' into TransactionId-bug
2 parents df83993 + 63988b3 commit 70a4910

File tree

69 files changed

+624
-262
lines changed

Some content is hidden

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

69 files changed

+624
-262
lines changed

.github/workflows/zxc-build-library.yaml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949

5050
steps:
5151
- name: Harden Runner
52-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
52+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
5353
with:
5454
egress-policy: audit
5555

5656
- name: Checkout Code
57-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
57+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5858

5959
- name: Run Clang-Format
60-
uses: jidicula/clang-format-action@4726374d1aa3c6aecf132e5197e498979588ebc8 # v4.15.0
60+
uses: jidicula/clang-format-action@6cd220de46c89139a0365edae93eee8eb30ca8fe # v4.16.0
6161
with:
6262
clang-format-version: "17"
6363
check-path: ${{ matrix.check-path }}
@@ -76,7 +76,7 @@ jobs:
7676

7777
steps:
7878
- name: Harden Runner
79-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
79+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
8080
with:
8181
egress-policy: audit
8282

@@ -122,12 +122,12 @@ jobs:
122122
echo "exec=${CG_EXEC}" >> "${GITHUB_OUTPUT}"
123123
124124
- name: Checkout Code
125-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
125+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
126126
with:
127127
submodules: true
128128

129129
- name: Use Node.js 22
130-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
130+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
131131
with:
132132
node-version: 22
133133

@@ -140,12 +140,12 @@ jobs:
140140
run: mkdir -p "${{ github.workspace }}/b/vcpkg_cache"
141141

142142
- name: Install CMake & Ninja
143-
uses: lukka/get-cmake@2ecc21724e5215b0e567bc399a2602d2ecb48541 # v4.02
143+
uses: step-security/get-cmake@84feda99b925eb830227d4cd02c07991a323306f # v4.1.2
144144
with:
145145
useCloudCache: true
146146

147147
- name: Setup VCPkg
148-
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
148+
uses: step-security/run-vcpkg@48490398616947b0df92dc1b24aab5339a66f9f0 # v11.5.2
149149
with:
150150
binaryCachePath: ${{ github.workspace }}/b/vcpkg_cache
151151

@@ -180,11 +180,10 @@ jobs:
180180
181181
- name: Prepare Hiero Solo
182182
id: solo
183-
uses: hiero-ledger/hiero-solo-action@be37932d21b1a1deaaca6ce8d7fc28a7251cfb56 # v0.13.0
183+
uses: hiero-ledger/hiero-solo-action@6a1a77601cf3e69661fb6880530a4edf656b40d5 # v0.14.0
184184
with:
185185
installMirrorNode: true
186186
hieroVersion: v0.65.0
187-
mirrorNodeVersion: v0.136.1
188187

189188

190189
- name: Start CTest suite (Debug)
@@ -200,7 +199,7 @@ jobs:
200199

201200
- name: Attach Artifact
202201
if: github.event.pull_request.merged == true
203-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
202+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
204203
with:
205204
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
206205
path: package/
@@ -216,12 +215,12 @@ jobs:
216215

217216
steps:
218217
- name: Harden Runner
219-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
218+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
220219
with:
221220
egress-policy: audit
222221

223222
- name: Checkout Code
224-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
223+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
225224
with:
226225
fetch-depth: 0
227226

@@ -231,7 +230,7 @@ jobs:
231230
msbuild-architecture: x64
232231

233232
- name: Setup-perl
234-
uses: shogo82148/actions-setup-perl@5796a908661aa68fc0a5b8f55c6791af2376d72e # v1.35.0
233+
uses: shogo82148/actions-setup-perl@f9f0bf89e0d19ddbabb2f40d43db2e944bce7d2f # v1.36.0
235234
with:
236235
perl-version: "5.32"
237236
distribution: strawberry
@@ -262,7 +261,7 @@ jobs:
262261
Add-Content -Path $env:GITHUB_OUTPUT -Value "short=$short"
263262
264263
- name: Attach Artifact
265-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
264+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
266265
with:
267266
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
268267
path: package/
@@ -277,12 +276,12 @@ jobs:
277276

278277
steps:
279278
- name: Harden Runner
280-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
279+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
281280
with:
282281
egress-policy: audit
283282

284283
- name: Checkout Code
285-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
284+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
286285
with:
287286
fetch-depth: 0
288287

@@ -305,7 +304,7 @@ jobs:
305304
run: echo "short=$(echo -n "${{ github.sha }}" | cut -c1-8)" >> $GITHUB_OUTPUT
306305

307306
- name: Attach Artifact
308-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
307+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
309308
with:
310309
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
311310
path: package/
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "AccountInfo.h"
55
#include "AccountInfoQuery.h"
66
#include "Client.h"
7-
#include "ED25519PrivateKey.h"
7+
#include "ECDSAsecp256k1PrivateKey.h"
88
#include "PublicKey.h"
99
#include "Status.h"
1010
#include "TransactionReceipt.h"
@@ -20,7 +20,8 @@ int main(int argc, char** argv)
2020
{
2121
dotenv::init();
2222
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
23-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
23+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
24+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2425

2526
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
2627
// will be paid for by this account and be signed by this key.
@@ -50,7 +51,7 @@ int main(int argc, char** argv)
5051
*/
5152

5253
// Generate a ED25519 private, public key pair
53-
const std::shared_ptr<PrivateKey> privateKey = ED25519PrivateKey::generatePrivateKey();
54+
const std::shared_ptr<PrivateKey> privateKey = ECDSAsecp256k1PrivateKey::generatePrivateKey();
5455
const std::shared_ptr<PublicKey> publicKey = privateKey->getPublicKey();
5556

5657
std::cout << "Generated private key: " << privateKey->toStringDer() << std::endl;

src/sdk/examples/AccountAllowanceExample.cc renamed to src/sdk/examples/AccountAllowanceExample.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "AccountDeleteTransaction.h"
77
#include "Client.h"
88
#include "ECDSAsecp256k1PrivateKey.h"
9-
#include "ED25519PrivateKey.h"
109
#include "PublicKey.h"
1110
#include "TransactionReceipt.h"
1211
#include "TransactionResponse.h"
@@ -22,7 +21,8 @@ int main(int argc, char** argv)
2221
{
2322
dotenv::init();
2423
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
25-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
24+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
25+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2626

2727
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
2828
// will be paid for by this account and be signed by this key.

src/sdk/examples/AccountAllowanceSerializedExample.cc renamed to src/sdk/examples/AccountAllowanceSerializedExample.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "AccountDeleteTransaction.h"
77
#include "Client.h"
88
#include "ECDSAsecp256k1PrivateKey.h"
9-
#include "ED25519PrivateKey.h"
109
#include "PublicKey.h"
1110
#include "TransactionReceipt.h"
1211
#include "TransactionResponse.h"
@@ -24,7 +23,8 @@ int main(int argc, char** argv)
2423
{
2524
dotenv::init();
2625
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
27-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
26+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
27+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2828

2929
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
3030
// will be paid for by this account and be signed by this key.

src/sdk/examples/AccountCreateWithHtsExample.cc renamed to src/sdk/examples/AccountCreateWithHtsExample.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "AccountInfoQuery.h"
44
#include "Client.h"
55
#include "ECDSAsecp256k1PrivateKey.h"
6-
#include "ED25519PrivateKey.h"
76
#include "TokenCreateTransaction.h"
87
#include "TokenId.h"
98
#include "TokenMintTransaction.h"
@@ -24,7 +23,8 @@ int main(int argc, char** argv)
2423
{
2524
dotenv::init();
2625
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
27-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
26+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
27+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2828

2929
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
3030
// will be paid for by this account and be signed by this key.
File renamed without changes.

src/sdk/examples/AutoCreateAccountTransferTransactionExample.cc renamed to src/sdk/examples/AutoCreateAccountTransferTransactionExample.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "Client.h"
44
#include "ECDSAsecp256k1PrivateKey.h"
55
#include "ECDSAsecp256k1PublicKey.h"
6-
#include "ED25519PrivateKey.h"
76
#include "EvmAddress.h"
87
#include "Hbar.h"
98
#include "TransactionReceipt.h"
@@ -23,7 +22,8 @@ int main(int argc, char** argv)
2322
{
2423
dotenv::init();
2524
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
26-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
25+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
26+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2727

2828
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
2929
// will be paid for by this account and be signed by this key.

src/sdk/examples/BatchTransactionExample.cc renamed to src/sdk/examples/BatchTransactionExample.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "AccountCreateTransaction.h"
55
#include "Client.h"
66
#include "ECDSAsecp256k1PrivateKey.h"
7-
#include "ED25519PrivateKey.h"
87
#include "PublicKey.h"
98
#include "Status.h"
109
#include "TransactionReceipt.h"
@@ -21,7 +20,8 @@ int main(int argc, char** argv)
2120
{
2221
dotenv::init();
2322
const AccountId operatorAccountId = AccountId::fromString(std::getenv("OPERATOR_ID"));
24-
const std::shared_ptr<PrivateKey> operatorPrivateKey = ED25519PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
23+
const std::shared_ptr<PrivateKey> operatorPrivateKey =
24+
ECDSAsecp256k1PrivateKey::fromString(std::getenv("OPERATOR_KEY"));
2525

2626
// Get a client for the Hiero testnet, and set the operator account ID and key such that all generated transactions
2727
// will be paid for by this account and be signed by this key.

0 commit comments

Comments
 (0)