Skip to content

Commit d6c70ec

Browse files
joshmarinaccijoshmarinacci
authored
Merge branch 'main' into custom-fees-refactor-alt
2 parents 6fd326f + 063ba56 commit d6c70ec

File tree

22 files changed

+316
-318
lines changed

22 files changed

+316
-318
lines changed

‎.github/workflows/zxc-tck-regression.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ jobs:
139139
# Extract package versions from the parent package.json
140140
SDK_VERSION=$(node -e "console.log(require('../package.json').version)")
141141
LONG_VERSION=$(node -e "console.log(require('../package.json').dependencies.long)")
142-
PROTO_VERSION=$(node -e "console.log(require('../package.json').dependencies['@hashgraph/proto'])")
142+
PROTO_VERSION=$(node -e "console.log(require('../package.json').dependencies['@hiero-ledger/proto'])")
143143
144144
echo "Using SDK version: ${SDK_VERSION}"
145145
echo "Using long version: ${LONG_VERSION}"
146146
echo "Using proto version: ${PROTO_VERSION}"
147147
148148
# Install with the extracted versions
149-
pnpm add @hashgraph/sdk@^${SDK_VERSION} long@${LONG_VERSION} @hashgraph/proto@${PROTO_VERSION}
149+
pnpm add @hiero-ledger/sdk@^${SDK_VERSION} long@${LONG_VERSION} @hiero-ledger/proto@${PROTO_VERSION}
150150
pnpm install
151151
nohup pnpm start &
152152
server_pid=$!

‎hedera-node/hedera-app-spi/src/test/java/com/hedera/node/app/spi/key/KeyUtilsTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void checksEmptyKeys() {
2727
assertTrue(KeyUtils.isEmpty(Key.DEFAULT));
2828
assertTrue(KeyUtils.isEmpty(Key.newBuilder().keyList(KeyList.DEFAULT).build()));
2929
assertTrue(KeyUtils.isEmpty(
30-
Key.newBuilder().keyList(KeyList.newBuilder().keys().build()).build()));
30+
Key.newBuilder().keyList(KeyList.newBuilder().build()).build()));
3131
assertTrue(KeyUtils.isEmpty(
3232
Key.newBuilder().thresholdKey(ThresholdKey.DEFAULT).build()));
3333
assertTrue(KeyUtils.isEmpty(Key.newBuilder()
@@ -36,7 +36,7 @@ void checksEmptyKeys() {
3636
.build()));
3737
assertTrue(KeyUtils.isEmpty(Key.newBuilder()
3838
.thresholdKey(ThresholdKey.newBuilder().threshold(1))
39-
.keyList(KeyList.newBuilder().keys().build())
39+
.keyList(KeyList.newBuilder().build())
4040
.build()));
4141
assertTrue(KeyUtils.isEmpty(Key.newBuilder().ed25519(Bytes.EMPTY).build()));
4242
assertTrue(KeyUtils.isEmpty(Key.newBuilder().ecdsaSecp256k1(Bytes.EMPTY).build()));
@@ -55,7 +55,7 @@ void returnInvalidIfEmpty() {
5555
assertFalse(KeyUtils.isValid(Key.DEFAULT));
5656
assertFalse(KeyUtils.isValid(Key.newBuilder().keyList(KeyList.DEFAULT).build()));
5757
assertFalse(KeyUtils.isValid(
58-
Key.newBuilder().keyList(KeyList.newBuilder().keys().build()).build()));
58+
Key.newBuilder().keyList(KeyList.newBuilder().build()).build()));
5959
assertFalse(KeyUtils.isValid(
6060
Key.newBuilder().thresholdKey(ThresholdKey.DEFAULT).build()));
6161
assertFalse(KeyUtils.isValid(Key.newBuilder()
@@ -64,7 +64,7 @@ void returnInvalidIfEmpty() {
6464
.build()));
6565
assertFalse(KeyUtils.isValid(Key.newBuilder()
6666
.thresholdKey(ThresholdKey.newBuilder().threshold(1))
67-
.keyList(KeyList.newBuilder().keys().build())
67+
.keyList(KeyList.newBuilder().build())
6868
.build()));
6969
assertFalse(KeyUtils.isValid(Key.newBuilder().ed25519(Bytes.EMPTY).build()));
7070
assertFalse(

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoTransferHandlerPureChecksTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,6 @@ void pureChecksTokenTransfersDoesNotHaveFungibleOrNonFungibleAmount() {
323323
final var txn = newCryptoTransfer(TokenTransferList.newBuilder()
324324
.token(TOKEN_2468)
325325
// transfers and nftTransfers are intentionally empty (will result in a count of zero transfers)
326-
.transfers()
327-
.nftTransfers()
328326
.build());
329327
given(pureChecksContext.body()).willReturn(txn);
330328

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenAirdropHandlerTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ void pureChecksTokenTransfersDoesNotHaveFungibleOrNonFungibleAmount() {
279279
final var txn = newTokenAirdrop(TokenTransferList.newBuilder()
280280
.token(TOKEN_2468)
281281
// transfers and nftTransfers are intentionally empty (will result in a count of zero transfers)
282-
.transfers()
283-
.nftTransfers()
284282
.build());
285283
given(pureChecksContext.body()).willReturn(txn);
286284

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/AdjustHbarChangesStepTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ void allowanceWithGreaterThanAllowedAllowanceFails() {
180180
.transfers(TransferList.newBuilder()
181181
.accountAmounts(aaWithAllowance(ownerId, -1_0000), aaWith(unknownAliasedId, +1_000))
182182
.build())
183-
.tokenTransfers()
184183
.build();
185184
givenTxn(body, spenderId);
186185
ensureAliasesStep = new EnsureAliasesStep(body);
@@ -212,7 +211,6 @@ void transferGreaterThanBalanceFails() {
212211
.transfers(TransferList.newBuilder()
213212
.accountAmounts(aaWith(ownerId, -1_0001), aaWith(unknownAliasedId, +1_000))
214213
.build())
215-
.tokenTransfers()
216214
.build();
217215
givenTxn(body, spenderId);
218216
ensureAliasesStep = new EnsureAliasesStep(body);

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/EnsureAliasesStepTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ void failsOnRepeatedAliasesInHbarTransferList() {
282282
aaWith(ownerId, -1_000),
283283
aaWith(unknownAliasedId, +1_000))
284284
.build())
285-
.tokenTransfers()
286285
.build();
287286
txn = asTxn(body, payerId);
288287
given(handleContext.body()).willReturn(txn);

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/transfer/ReplaceAliasesWithIDsInOpTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ void failsOnRepeatedAliasesInHbarTransferList() {
274274
AccountAmountUtils.aaWith(ownerId, -1_000),
275275
AccountAmountUtils.aaWith(unknownAliasedId, +1_000))
276276
.build())
277-
.tokenTransfers()
278277
.build();
279278
txn = asTxn(body, payerId);
280279
given(handleContext.body()).willReturn(txn);

‎hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/containers/BlockNodeContainer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* A test container for running a block node server instance.
1313
*/
1414
public class BlockNodeContainer extends GenericContainer<BlockNodeContainer> {
15-
private static final String BLOCK_NODE_VERSION = "0.21.1";
15+
private static final String BLOCK_NODE_VERSION = "0.23.1";
1616
private static final DockerImageName DEFAULT_IMAGE_NAME =
1717
DockerImageName.parse("ghcr.io/hiero-ledger/hiero-block-node:" + BLOCK_NODE_VERSION);
1818
private static final int GRPC_PORT = 40840;

‎hiero-dependency-versions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ val dagger = "2.56.2"
1515
val eclipseCollections = "13.0.0"
1616
val grpc = "1.72.0"
1717
val hederaCryptography = "2.0.2"
18-
val helidon = "4.2.7"
18+
val helidon = "4.3.2"
1919
val jackson = "2.19.0"
2020
val junit5 = "5.10.3!!" // no updates beyond 5.10.3 until #17125 is resolved
2121
val log4j = "2.25.0"

‎platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/shadowgraph/AbstractShadowgraphSynchronizer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ protected List<PlatformEvent> createSendList(
190190
sendSet.addAll(unknownTips);
191191

192192
final List<PlatformEvent> eventsTheyMayNeed =
193-
sendSet.stream().map(ShadowEvent::getEvent).collect(Collectors.toCollection(ArrayList::new));
193+
sendSet.stream().map(ShadowEvent::getPlatformEvent).collect(Collectors.toCollection(ArrayList::new));
194194

195195
SyncUtils.sort(eventsTheyMayNeed);
196196

0 commit comments

Comments
 (0)