Skip to content

Commit c952b75

Browse files
georgi-l95georgi-l95
authored
Bump Test Images version (#718)
- Bump network node image version to `0.32.0` - Bump mirror node image version to `0.69.0` - Fix health/readiness always `DOWN` - `setApproveForAll` action is not working with this image. - `updateTokenInfo` tests changed to update only token info, not token keys. Signed-off-by: georgi-l95 <[email protected]>
1 parent 25ae55f commit c952b75

File tree

5 files changed

+45
-32
lines changed

5 files changed

+45
-32
lines changed

‎packages/server/src/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ app.getKoaApp().use(async (ctx, next) => {
102102
if (ctx.url === '/health/readiness') {
103103
try {
104104
const result = relay.eth().chainId();
105-
if (result.indexOf('0x12') > 0) {
105+
if (result.indexOf('0x12') >= 0) {
106106
ctx.status = 200;
107107
ctx.body = 'OK';
108108
} else {

‎packages/server/tests/acceptance/htsPrecompile/tokenCreate.spec.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ describe('@tokencreate HTS Precompile Token Create Acceptance Tests', async func
258258
}
259259
});
260260

261-
it('should be able to execute setApprovalForAllPublic', async function() {
261+
//not working since 0.32.0-alpha.1.
262+
xit('should be able to execute setApprovalForAllPublic', async function() {
262263
const txBefore = (await mainContract.isApprovedForAllPublic(NftHTSTokenContractAddress, mainContractAddress, accounts[1].wallet.address));
263264
const txBeforeReceipt = await txBefore.wait();
264265
const beforeFlag = txBeforeReceipt.events.filter(e => e.event === 'Approved')[0].args.approved;
@@ -589,7 +590,8 @@ describe('@tokencreate HTS Precompile Token Create Acceptance Tests', async func
589590
expect((await txXfer.wait()).events.filter(e => e.event === 'ResponseCode')[0].args.responseCode).to.equal(TX_SUCCESS_CODE);
590591
});
591592

592-
it('should fail to swap approved fungible tokens', async function() {
593+
// this test is using setApprovalForAll, which is not working from 0.32.0-alpha.4 onwards
594+
xit('should fail to swap approved fungible tokens', async function() {
593595
const txApproval1 = await mainContract.setApprovalForAllPublic(NftHTSTokenContractAddress, accounts[1].wallet.address, true, { gasLimit: 1_000_000 });
594596
expect((await txApproval1.wait()).events.filter(e => e.event === 'ResponseCode')[0].args.responseCode).to.equal(TX_SUCCESS_CODE);
595597

@@ -629,7 +631,8 @@ describe('@tokencreate HTS Precompile Token Create Acceptance Tests', async func
629631
}
630632
});
631633

632-
it('should fail to swap approved non-fungible tokens', async function() {
634+
// this test is using setApprovalForAll, which is not working from 0.32.0-alpha.4 onwards
635+
xit('should fail to swap approved non-fungible tokens', async function() {
633636
const txApprove1 = await mainContract.setApprovalForAllPublic(NftHTSTokenContractAddress, accounts[1].wallet.address, true, { gasLimit: 1_000_000 });
634637
expect((await txApprove1.wait()).events.filter(e => e.event === 'ResponseCode')[0].args.responseCode).to.equal(TX_SUCCESS_CODE);
635638

‎packages/server/tests/acceptance/htsPrecompile/tokenManagement.spec.ts‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,30 @@ describe('@tokenmanagement HTS Precompile Token Management Acceptance Tests', as
302302
token.name = TOKEN_UPDATE_NAME;
303303
token.symbol = TOKEN_UPDATE_SYMBOL;
304304
token.memo = TOKEN_UPDATE_MEMO;
305-
token.treasury = mainContractAddress;
305+
token.treasury = accounts[0].wallet.address;
306306
}
307307

308-
function checkUpdatedTokenInfo(tokenInfo) {
308+
async function checkUpdatedTokenInfo(tokenInfo) {
309+
//token info return treasury as long zero address, we convert it to evm address to compare
310+
const treasury = await mirrorNodeAddressReq(tokenInfo.treasury);
309311
expect(tokenInfo.name).to.equal(TOKEN_UPDATE_NAME);
310312
expect(tokenInfo.symbol).to.equal(TOKEN_UPDATE_SYMBOL);
311-
expect(tokenInfo.treasury).to.equal(mainContractAddress);
313+
expect(treasury.toLowerCase()).to.equal(accounts[0].wallet.address.toLowerCase());
312314
expect(tokenInfo.memo).to.equal(TOKEN_UPDATE_MEMO);
313315
}
314316

317+
async function mirrorNodeAddressReq(address){
318+
const accountEvmAddress = await mirrorNode.get(`/accounts/${address}?transactiontype=cryptotransfer`, requestId);
319+
return accountEvmAddress.evm_address;
320+
}
321+
315322
it('should update fungible token properties', async function() {
316323
const txBeforeInfo = await mainContract.getTokenInfoPublic(HTSTokenContractAddress, { gasLimit: 1000000 });
317324
const tokenInfoBefore = ((await txBeforeInfo.wait()).events.filter(e => e.event === 'TokenInfo')[0].args.tokenInfo)[0];
318325

326+
//updating only token info, not token keys
319327
const token = {
320-
...tokenInfoBefore, tokenKeys: [{...tokenInfoBefore.tokenKeys[0]}]
328+
...tokenInfoBefore, tokenKeys: []
321329
};
322330

323331
setUpdatedValues(token);
@@ -328,15 +336,16 @@ describe('@tokenmanagement HTS Precompile Token Management Acceptance Tests', as
328336

329337
const txAfterInfo = await mainContract.getTokenInfoPublic(HTSTokenContractAddress, { gasLimit: 1000000 });
330338
const tokenInfoAfter = ((await txAfterInfo.wait()).events.filter(e => e.event === 'TokenInfo')[0].args.tokenInfo)[0];
331-
checkUpdatedTokenInfo(tokenInfoAfter);
339+
await checkUpdatedTokenInfo(tokenInfoAfter);
332340
});
333341

334342
it('should update non-fungible token properties', async function() {
335343
const txBeforeInfo = await mainContract.getTokenInfoPublic(NftHTSTokenContractAddress, { gasLimit: 1000000 });
336344
const tokenInfoBefore = ((await txBeforeInfo.wait()).events.filter(e => e.event === 'TokenInfo')[0].args.tokenInfo)[0];
337345

346+
//updating only token info, not token keys
338347
const token = {
339-
...tokenInfoBefore, tokenKeys: [{...tokenInfoBefore.tokenKeys[0]}]
348+
...tokenInfoBefore, tokenKeys: []
340349
};
341350

342351
setUpdatedValues(token);
@@ -346,7 +355,7 @@ describe('@tokenmanagement HTS Precompile Token Management Acceptance Tests', as
346355

347356
const txAfterInfo = await mainContract.getTokenInfoPublic(NftHTSTokenContractAddress, { gasLimit: 1000000 });
348357
const tokenInfoAfter = ((await txAfterInfo.wait()).events.filter(e => e.event === 'TokenInfo')[0].args.tokenInfo)[0];
349-
checkUpdatedTokenInfo(tokenInfoAfter);
358+
await checkUpdatedTokenInfo(tokenInfoAfter);
350359
});
351360
});
352361

@@ -614,21 +623,6 @@ describe('@tokenmanagement HTS Precompile Token Management Acceptance Tests', as
614623
});
615624

616625
describe('HTS Precompile Key management Tests', async function() {
617-
it('should be able to execute getTokenKey', async function() {
618-
const tx = await mainContract.getTokenKeyPublic(HTSTokenContractAddress, 2);
619-
const result = await tx.wait();
620-
const { responseCode } = result.events.filter(e => e.event === 'ResponseCode')[0].args;
621-
expect(responseCode).to.equal(TX_SUCCESS_CODE);
622-
const { key } = result.events.filter(e => e.event === 'TokenKey')[0].args;
623-
624-
expect(key).to.exist;
625-
expect(key.inheritAccountKey).to.eq(false);
626-
expect(key.contractId).to.eq('0x0000000000000000000000000000000000000000');
627-
expect(key.ed25519).to.eq('0x');
628-
expect(key.ECDSA_secp256k1).to.exist;
629-
expect(key.delegatableContractId).to.eq('0x0000000000000000000000000000000000000000');
630-
});
631-
632626
it('should be able to execute updateTokenKeys', async function() {
633627
// Get key value before update
634628
const getKeyTx = await mainContract.getTokenKeyPublic(HTSTokenContractAddress, 2);
@@ -661,5 +655,21 @@ describe('@tokenmanagement HTS Precompile Token Management Acceptance Tests', as
661655
expect(updatedKey.delegatableContractId).to.eq(updateKey[4]);
662656
expect(updatedKey.ECDSA_secp256k1).to.not.eq(originalKey.ECDSA_secp256k1);
663657
});
658+
659+
it('should be able to execute getTokenKey', async function() {
660+
const tx = await mainContract.getTokenKeyPublic(HTSTokenContractAddress, 2);
661+
const result = await tx.wait();
662+
const { responseCode } = result.events.filter(e => e.event === 'ResponseCode')[0].args;
663+
expect(responseCode).to.equal(TX_SUCCESS_CODE);
664+
const { key } = result.events.filter(e => e.event === 'TokenKey')[0].args;
665+
666+
expect(key).to.exist;
667+
expect(key.inheritAccountKey).to.eq(false);
668+
expect(key.contractId).to.eq('0x0000000000000000000000000000000000000000');
669+
expect(key.ed25519).to.eq('0x');
670+
expect(key.ECDSA_secp256k1).to.exist;
671+
expect(key.delegatableContractId).to.eq('0x0000000000000000000000000000000000000000');
672+
});
673+
664674
});
665675
});

‎packages/server/tests/acceptance/index.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ describe('RPC Server Acceptance Tests', function () {
125125

126126
function runLocalHederaNetwork() {
127127
// set env variables for docker images until local-node is updated
128-
process.env['NETWORK_NODE_IMAGE_TAG'] = '0.32.0-alpha.1';
129-
process.env['HAVEGED_IMAGE_TAG'] = '0.32.0-alpha.1';
130-
process.env['MIRROR_IMAGE_TAG'] = '0.67.3';
128+
process.env['NETWORK_NODE_IMAGE_TAG'] = '0.32.0';
129+
process.env['HAVEGED_IMAGE_TAG'] = '0.32.0';
130+
process.env['MIRROR_IMAGE_TAG'] = '0.69.0';
131131

132132
console.log(`Docker container versions, services: ${process.env['NETWORK_NODE_IMAGE_TAG']}, mirror: ${process.env['MIRROR_IMAGE_TAG']}`);
133133

‎packages/server/tests/helpers/prerequisite.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ const RELAY_URL = process.env.E2E_RELAY_HOST || LOCAL_RELAY_URL;
1111

1212
(function () {
1313
if (USE_LOCAL_NODE) {
14-
process.env['NETWORK_NODE_IMAGE_TAG'] = '0.32.0-alpha.1';
15-
process.env['HAVEGED_IMAGE_TAG'] = '0.32.0-alpha.1';
16-
process.env['MIRROR_IMAGE_TAG'] = '0.67.3';
14+
process.env['NETWORK_NODE_IMAGE_TAG'] = '0.32.0';
15+
process.env['HAVEGED_IMAGE_TAG'] = '0.32.0';
16+
process.env['MIRROR_IMAGE_TAG'] = '0.69.0';
1717

1818
console.log(`Docker container versions, services: ${process.env['NETWORK_NODE_IMAGE_TAG']}, mirror: ${process.env['MIRROR_IMAGE_TAG']}`);
1919

0 commit comments

Comments
 (0)