Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Add check for parent's existence when checking delegate call #13013

Merged
merged 11 commits into from May 2, 2024
Merged

fix: Add check for parent's existence when checking delegate call #13013

merged 11 commits into from May 2, 2024

Conversation

lukelee-sl
Copy link
Member

@lukelee-sl lukelee-sl commented Apr 26, 2024 •
edited

Description:

Ensure that the parent frame exists when checking if the call to the parent was made as a delegate call.

  • Documented (Code comments, README, etc.)
  • Tested (unit, integration, etc.)

@lukelee-sl
fix: Check if current frame is a delegate call when calling hts syste…
ffa4394 
…m contract

Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl lukelee-sl self-assigned this Apr 26, 2024
@lukelee-sl lukelee-sl requested review from a team and tinker-michaelj as code owners April 26, 2024 03:51
@lukelee-sl lukelee-sl marked this pull request as draft April 26, 2024 03:52
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Restart) Results

2 tests   2 ✅  5m 32s ⏱️
2 suites  0 💤
2 files    0 ❌

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Node Death Reconnect) Results

1 tests   1 ✅  24s ⏱️
1 suites  0 💤
2 files    0 ❌
1 errors

For more details on these parsing errors, see this check.

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Token) Results

228 tests   227 ✅  18m 21s ⏱️
 16 suites    1 💤
 16 files      0 ❌

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Misc) Results

457 tests   447 ✅  36m 43s ⏱️
 76 suites   10 💤
 77 files      0 ❌
  1 errors

For more details on these parsing errors, see this check.

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@lukelee-sl
check to ensure that a parent exists
4d58551 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Crypto) Results

335 tests   335 ✅  33m 45s ⏱️
 25 suites    0 💤
 25 files      0 ❌

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Time Consuming) Results

21 tests   21 ✅  54m 17s ⏱️
 3 suites   0 💤
 3 files     0 ❌

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: Unit Test Results

  2 267 files  ±0    2 267 suites  ±0   3h 51m 30s ⏱️ + 34m 50s
112 333 tests ±0  112 266 ✅ +1  67 💤 ±0  0 ❌  - 1 
120 796 runs  ±0  120 729 ✅ +1  67 💤 ±0  0 ❌  - 1 

Results for commit 5334bdf. ± Comparison against base commit 890ca1c.

This pull request removes 4009 and adds 3772 tests. Note that renamed tests count towards both. 

  
             IssuerDN: CN=s-aaaa
            SubjectDN: CN=s-aaaa
           Final Date: Fri Jan 01 00:00:00 UTC 2100
           Public Key: RSA Public Key [2e:28:bc:1e:d3:83:25:92:8e:cb:98:b1:b6:84:06:9c:d5:d8:14:d5],[56:66:d1:a4]
           Start Date: Sat Jan 01 00:00:00 UTC 2000
         SerialNumber: 12482092706667292405
        modulus: c1a0ff5d2372b53d12d12bb87dd03f5e…
        modulus: c1a0ff5d2372b53d12d12bb87dd03f5…
…

com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [4] 

com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [6] 

com.hedera.node.app.grpc.impl.netty.GrpcServiceBuilderTest ‑ [7]   
  
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [10] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@a9da4af
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [11] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@adf34883
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [12] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@6ea5a746
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [13] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@a7c0ade2
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [14] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@b4d611e
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [15] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@de55fa29
com.hedera.node.app.service.mono.state.codec.VirtualKeySerdesAdapterTest ‑ [16] com.hedera.node.app.service.mono.state.codec.VirtualBlobKey@48544539
…

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 26, 2024 •
edited

Node: HAPI Test (Smart Contract) Results

587 tests   587 ✅  1h 4m 27s ⏱️
 63 suites    0 💤
 63 files      0 ❌

Results for commit 5334bdf.

♻️ This comment has been updated with latest results.

@lukelee-sl lukelee-sl changed the title fix: Check if current frame is a delegate call when calling hts system contract fix: Add check for parent's existence when checking delegate call Apr 26, 2024
@lukelee-sl
fix unit test
f6d6e48 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl
Merge branch 'develop' of https://github.com/hashgraph/hedera-services …
602931e 
…into fix-hts-delegate-call-check
@lukelee-sl
attempt to stabilize callHtsSystemContractTest spec
d1fb24d 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl
spotless
5d1f61c 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl
preserve another property
0a1b379 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl lukelee-sl marked this pull request as ready for review April 26, 2024 17:50
lukelee-sl added a commit that referenced this pull request Apr 26, 2024
@lukelee-sl
chore: cherry pick #13013
68dc3da 
Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
@lukelee-sl lukelee-sl mentioned this pull request Apr 26, 2024
Merged
2 tasks
iwsimon
iwsimon reviewed Apr 26, 2024
View reviewed changes
Copy link
Contributor

@iwsimon iwsimon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @lukelee-sl

david-bakin-sl
david-bakin-sl approved these changes May 2, 2024
View reviewed changes
Copy link
Member

@david-bakin-sl david-bakin-sl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

...com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/HtsCallAddressChecks.java Show resolved Hide resolved
...test-clients/src/main/java/com/hedera/services/bdd/suites/leaky/LeakyEthereumTestsSuite.java Show resolved Hide resolved
...test-clients/src/main/java/com/hedera/services/bdd/suites/leaky/LeakyEthereumTestsSuite.java Show resolved Hide resolved
@lukelee-sl lukelee-sl merged commit 161bb5d into develop May 2, 2024
42 of 45 checks passed
@lukelee-sl lukelee-sl deleted the fix-hts-delegate-call-check branch May 2, 2024 12:03
stoyanov-st pushed a commit that referenced this pull request May 15, 2024
@lukelee-sl @stoyanov-st
fix: Add check for parent's existence when checking delegate call (#1…
d86a071 
…3013)

Signed-off-by: lukelee-sl <luke.lee@swirldslabs.com>
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IvanKavaldzhiev IvanKavaldzhiev IvanKavaldzhiev left review comments

@david-bakin-sl david-bakin-sl david-bakin-sl approved these changes

@iwsimon iwsimon iwsimon approved these changes

@tinker-michaelj tinker-michaelj Awaiting requested review from tinker-michaelj tinker-michaelj is a code owner

@povolev15 povolev15 Awaiting requested review from povolev15 povolev15 is a code owner automatically assigned from hashgraph/hedera-services

Assignees

@lukelee-sl lukelee-sl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukelee-sl @IvanKavaldzhiev @david-bakin-sl @iwsimon