Skip to content

Commit

Permalink
fix: try new ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@sakulstra
sakulstra committed Feb 7, 2025
1 parent 41aca3f commit ea471e5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
1 change: 0 additions & 1 deletion .github/workflows/comment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ permissions:
checks: read
statuses: read
pull-requests: write
content: write

jobs:
comment:
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:
uses: bgd-labs/github-workflows/.github/workflows/foundry-lint-prettier.yml@main
test:
uses: bgd-labs/github-workflows/.github/workflows/foundry-test.yml@main
# test-zk:
# uses: bgd-labs/github-workflows/.github/workflows/foundry-test-zk.yml@main
# merge:
# name: Merge artifacts
# runs-on: ubuntu-latest
# needs: [test, test-zk]
# if: always()
# steps:
# - uses: actions/upload-artifact/merge@v4
# with:
# # The name of the artifact that the artifacts will be merged into
# # Optional. Default is 'merged-artifacts'
# name: 'content'
test-zk:
uses: bgd-labs/github-workflows/.github/workflows/foundry-test-zk.yml@main
merge:
name: Merge artifacts
runs-on: ubuntu-latest
needs: [test, test-zk]
if: always()
steps:
- uses: actions/upload-artifact/merge@v4
with:
# The name of the artifact that the artifacts will be merged into
# Optional. Default is 'merged-artifacts'
name: 'content'

# # A glob pattern matching the artifacts that should be merged.
# # Optional. Default is '*'
# pattern: 'content*'
# A glob pattern matching the artifacts that should be merged.
# Optional. Default is '*'
pattern: 'content*'

# delete-merged: true
delete-merged: true

9 comments on commit ea471e5

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

No description provided.

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🌈 Test Results 
No files changed, compilation skipped

Ran 1 test for test/ChainHelperTest.t.sol:TestChainHelpers
[PASS] test_selectChain_shouldRevert() (gas: 3293)
Suite result: ok. 1 passed; 0 failed; 0 skipped; finished in 406.08µs (125.56µs CPU time)

Ran 6 tests for test/PermissionlessRescuable.t.sol:PermissionlessRescuableTest
[PASS] test_emergencyEtherTransfer() (gas: 59210)
[PASS] test_emergencyEtherTransferInsufficientBalance_shouldRevert() (gas: 45409)
[PASS] test_emergencyTokenTransfer() (gas: 80077)
[PASS] test_emergencyTokenTransferInsufficientBalance_shouldRevert() (gas: 20718)
[PASS] test_emergencyTokenTransfer_withTransferRestriction() (gas: 113870)
[PASS] test_whoShouldReceiveFunds() (gas: 12734)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 906.81µs (519.36µs CPU time)

Ran 5 tests for test/Rescuable.t.sol:RescueTest
[PASS] testEmergencyEtherTransfer() (gas: 57697)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17666)
[PASS] testEmergencyTokenTransfer() (gas: 230481)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203504)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 20.84ms (2.02ms CPU time)

Ran 3 tests for test/Rescuable721.t.sol:Rescue721Test
[PASS] testFuzzEmergencyTokenTransfer(address) (runs: 256, μ: 79081, ~: 79081)
[PASS] testFuzzEmergencyTokenTransferWhenNotOwner(address,address) (runs: 256, μ: 71859, ~: 71859)
[PASS] testToken() (gas: 2458)
Suite result: ok. 3 passed; 0 failed; 0 skipped; finished in 82.36ms (82.10ms CPU time)

Ran 5 tests for test/RescuableACL.t.sol:RescueACLTest
[PASS] testEmergencyEtherTransfer() (gas: 57699)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17659)
[PASS] testEmergencyTokenTransfer() (gas: 230500)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203516)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 2.39ms (2.02ms CPU time)

Ran 6 tests for test/UpgradeableOwnableWithGuardian.t.sol:TestOfUpgradableOwnableWithGuardian
[PASS] test_initializer() (gas: 18304)
[PASS] test_onlyGuardian() (gas: 11066)
[PASS] test_onlyOwnerOrGuardian() (gas: 13262)
[PASS] test_updateGuardian_eoa(address,address) (runs: 256, μ: 18703, ~: 18703)
[PASS] test_updateGuardian_guardian(address) (runs: 256, μ: 19684, ~: 19684)
[PASS] test_updateGuardian_owner(address) (runs: 256, μ: 19400, ~: 19400)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 65.64ms (65.44ms CPU time)

Ran 2 tests for test/create3Test.t.sol:Create3FactoryTest
[PASS] testCreate3WithValue(address,address,address) (runs: 256, μ: 249124, ~: 249124)
[PASS] testCreate3WithoutValue(address,address,bytes32) (runs: 256, μ: 251617, ~: 251617)
Suite result: ok. 2 passed; 0 failed; 0 skipped; finished in 73.68ms (121.45ms CPU time)

Ran 6 tests for test/OwnableWithGuardian.t.sol:TestOfOwnableWithGuardian
[PASS] testConstructorLogic() (gas: 18202)
[PASS] testGuardianUpdateNoAccess() (gas: 15325)
[PASS] testGuardianUpdateViaGuardian(address) (runs: 256, μ: 19420, ~: 19431)
[PASS] testGuardianUpdateViaOwner(address) (runs: 256, μ: 19245, ~: 19245)
[PASS] test_onlyGuardianGuard() (gas: 12577)
[PASS] test_onlyGuardianGuard_shouldRevert() (gas: 10965)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 159.03ms (38.10ms CPU time)

Ran 5 tests for test/TransparentProxyFactory.t.sol:TestTransparentProxyFactory
[PASS] testCreateDeterministicProxyAdmin(address,bytes32) (runs: 256, μ: 274120, ~: 274120)
[PASS] testCreateDeterministicWithDeterministicProxy(bytes32,bytes32) (runs: 256, μ: 660366, ~: 660366)
[PASS] testCreateProxyAdmin(address,bytes32) (runs: 256, μ: 268247, ~: 268247)
[PASS] test_createDeterministicProxy(address,bytes32) (runs: 256, μ: 661606, ~: 661606)
[PASS] test_createProxy() (gas: 1279005)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 172.60ms (303.63ms CPU time)

Ran 9 test suites in 177.96ms (577.86ms CPU time): 39 tests passed, 0 failed, 0 skipped (39 total tests)

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Forge Build Sizes

🔕 Unchanged
Contract Runtime Size (B) Initcode Size (B) Runtime Margin (B) Initcode Margin (B)
Address 44 94 24,532 49,058
ChainHelpers 44 94 24,532 49,058
ChainIds 44 94 24,532 49,058
Create2Utils 121 171 24,455 48,981
Create3 44 94 24,532 49,058
Create3Factory 1,053 1,081 23,523 48,071
ERC1967Proxy 122 973 24,454 48,179
ERC1967Utils 44 94 24,532 49,058
ERC20 2,290 2,979 22,286 46,173
Errors 44 94 24,532 49,058
ImplOwnableWithGuardian 1,428 1,456 23,148 47,696
MockContract 613 911 23,963 48,241
MockERC721 2,380 2,408 22,196 46,744
MockImpl 418 446 24,158 48,706
PermissionlessRescuable 1,341 1,514 23,235 47,638
ProxyAdmin 998 1,234 23,578 47,918
Rescuable 1,249 1,400 23,327 47,752
Rescuable721 1,485 1,643 23,091 47,509
RescuableACL 1,137 1,269 23,439 47,883
SafeERC20 44 94 24,532 49,058
StorageSlot 44 94 24,532 49,058
TestNetChainIds 44 94 24,532 49,058
TransparentProxyFactory 6,667 6,695 17,909 42,457
TransparentUpgradeableProxy 1,096 3,528 23,480 45,624

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

68

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🔮 Coverage report
File Line Coverage Function Coverage Branch Coverage
src/contracts/access-control/OwnableWithGuardian.sol ${\color{orange}89.47\%}$
$17 / 19$
19, 20 		${\color{orange}87.5\%}$
$7 / 8$
OwnableWithGuardian.onlyOwnerOrGuardian 		${\color{green}100\%}$
$2 / 2$
src/contracts/access-control/UpgradeableOwnableWithGuardian.sol ${\color{green}100\%}$
$26 / 26$
 ${\color{green}100\%}$
$10 / 10$
 ${\color{green}100\%}$
$2 / 2$
src/contracts/create3/Create3.sol ${\color{orange}89.47\%}$
$17 / 19$
62, 63 		${\color{red}80\%}$
$4 / 5$
Create3.create3 		${\color{red}33.33\%}$
$1 / 3$
src/contracts/create3/Create3Factory.sol ${\color{green}100\%}$
$6 / 6$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/transparent-proxy/TransparentProxyFactory.sol ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol ${\color{orange}86.67\%}$
$26 / 30$
38, 39, 41, 42 		${\color{orange}88.89\%}$
$8 / 9$
TransparentProxyFactoryBase.createProxyAdmin 		${\color{green}100\%}$
$0 / 0$
src/contracts/utils/PermissionlessRescuable.sol ${\color{green}100\%}$
$4 / 4$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/Rescuable.sol ${\color{green}100\%}$
$7 / 7$
 ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
src/contracts/utils/Rescuable721.sol ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/RescuableACL.sol ${\color{green}100\%}$
$6 / 6$
 ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/RescuableBase.sol ${\color{green}100\%}$
$10 / 10$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$1 / 1$

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Forge Build Sizes

🔕 Unchanged
Contract Runtime Size (B) Initcode Size (B) Runtime Margin (B) Initcode Margin (B)
Address 44 94 24,532 49,058
ChainHelpers 44 94 24,532 49,058
ChainIds 44 94 24,532 49,058
Create2Utils 121 171 24,455 48,981
Create3 44 94 24,532 49,058
Create3Factory 1,053 1,081 23,523 48,071
ERC1967Proxy 122 973 24,454 48,179
ERC1967Utils 44 94 24,532 49,058
ERC20 2,290 2,979 22,286 46,173
Errors 44 94 24,532 49,058
ImplOwnableWithGuardian 1,428 1,456 23,148 47,696
MockContract 613 911 23,963 48,241
MockERC721 2,380 2,408 22,196 46,744
MockImpl 418 446 24,158 48,706
PermissionlessRescuable 1,341 1,514 23,235 47,638
ProxyAdmin 998 1,234 23,578 47,918
Rescuable 1,249 1,400 23,327 47,752
Rescuable721 1,485 1,643 23,091 47,509
RescuableACL 1,137 1,269 23,439 47,883
SafeERC20 44 94 24,532 49,058
StorageSlot 44 94 24,532 49,058
TestNetChainIds 44 94 24,532 49,058
TransparentProxyFactory 6,667 6,695 17,909 42,457
TransparentUpgradeableProxy 1,096 3,528 23,480 45,624

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🔮 Coverage report
File Line Coverage Function Coverage Branch Coverage
src/contracts/access-control/OwnableWithGuardian.sol ${\color{orange}89.47\%}$
$17 / 19$
19, 20 		${\color{orange}87.5\%}$
$7 / 8$
OwnableWithGuardian.onlyOwnerOrGuardian 		${\color{green}100\%}$
$2 / 2$
src/contracts/access-control/UpgradeableOwnableWithGuardian.sol ${\color{green}100\%}$
$26 / 26$
 ${\color{green}100\%}$
$10 / 10$
 ${\color{green}100\%}$
$2 / 2$
src/contracts/create3/Create3.sol ${\color{orange}89.47\%}$
$17 / 19$
62, 63 		${\color{red}80\%}$
$4 / 5$
Create3.create3 		${\color{red}33.33\%}$
$1 / 3$
src/contracts/create3/Create3Factory.sol ${\color{green}100\%}$
$6 / 6$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/transparent-proxy/TransparentProxyFactory.sol ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol ${\color{orange}86.67\%}$
$26 / 30$
38, 39, 41, 42 		${\color{orange}88.89\%}$
$8 / 9$
TransparentProxyFactoryBase.createProxyAdmin 		${\color{green}100\%}$
$0 / 0$
src/contracts/utils/PermissionlessRescuable.sol ${\color{green}100\%}$
$4 / 4$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/Rescuable.sol ${\color{green}100\%}$
$7 / 7$
 ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
src/contracts/utils/Rescuable721.sol ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$1 / 1$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/RescuableACL.sol ${\color{green}100\%}$
$6 / 6$
 ${\color{green}100\%}$
$3 / 3$
 ${\color{green}100\%}$
$0 / 0$
src/contracts/utils/RescuableBase.sol ${\color{green}100\%}$
$10 / 10$
 ${\color{green}100\%}$
$2 / 2$
 ${\color{green}100\%}$
$1 / 1$

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🌈 Test Results 
No files changed, compilation skipped

Ran 1 test for test/ChainHelperTest.t.sol:TestChainHelpers
[PASS] test_selectChain_shouldRevert() (gas: 3293)
Suite result: ok. 1 passed; 0 failed; 0 skipped; finished in 372.95µs (111.85µs CPU time)

Ran 6 tests for test/OwnableWithGuardian.t.sol:TestOfOwnableWithGuardian
[PASS] testConstructorLogic() (gas: 18202)
[PASS] testGuardianUpdateNoAccess() (gas: 15325)
[PASS] testGuardianUpdateViaGuardian(address) (runs: 256, μ: 19431, ~: 19431)
[PASS] testGuardianUpdateViaOwner(address) (runs: 256, μ: 19245, ~: 19245)
[PASS] test_onlyGuardianGuard() (gas: 12577)
[PASS] test_onlyGuardianGuard_shouldRevert() (gas: 10965)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 55.59ms (55.02ms CPU time)

Ran 6 tests for test/PermissionlessRescuable.t.sol:PermissionlessRescuableTest
[PASS] test_emergencyEtherTransfer() (gas: 59210)
[PASS] test_emergencyEtherTransferInsufficientBalance_shouldRevert() (gas: 45409)
[PASS] test_emergencyTokenTransfer() (gas: 80077)
[PASS] test_emergencyTokenTransferInsufficientBalance_shouldRevert() (gas: 20718)
[PASS] test_emergencyTokenTransfer_withTransferRestriction() (gas: 113870)
[PASS] test_whoShouldReceiveFunds() (gas: 12734)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 3.82ms (3.49ms CPU time)

Ran 5 tests for test/Rescuable.t.sol:RescueTest
[PASS] testEmergencyEtherTransfer() (gas: 57697)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17666)
[PASS] testEmergencyTokenTransfer() (gas: 230481)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203504)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 2.35ms (2.01ms CPU time)

Ran 3 tests for test/Rescuable721.t.sol:Rescue721Test
[PASS] testFuzzEmergencyTokenTransfer(address) (runs: 256, μ: 79081, ~: 79081)
[PASS] testFuzzEmergencyTokenTransferWhenNotOwner(address,address) (runs: 256, μ: 71859, ~: 71859)
[PASS] testToken() (gas: 2458)
Suite result: ok. 3 passed; 0 failed; 0 skipped; finished in 65.80ms (65.42ms CPU time)

Ran 5 tests for test/RescuableACL.t.sol:RescueACLTest
[PASS] testEmergencyEtherTransfer() (gas: 57699)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17659)
[PASS] testEmergencyTokenTransfer() (gas: 230500)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203516)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 2.35ms (2.00ms CPU time)

Ran 6 tests for test/UpgradeableOwnableWithGuardian.t.sol:TestOfUpgradableOwnableWithGuardian
[PASS] test_initializer() (gas: 18304)
[PASS] test_onlyGuardian() (gas: 11066)
[PASS] test_onlyOwnerOrGuardian() (gas: 13262)
[PASS] test_updateGuardian_eoa(address,address) (runs: 256, μ: 18703, ~: 18703)
[PASS] test_updateGuardian_guardian(address) (runs: 256, μ: 19684, ~: 19684)
[PASS] test_updateGuardian_owner(address) (runs: 256, μ: 19400, ~: 19400)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 65.45ms (65.20ms CPU time)

Ran 2 tests for test/create3Test.t.sol:Create3FactoryTest
[PASS] testCreate3WithValue(address,address,address) (runs: 256, μ: 249124, ~: 249124)
[PASS] testCreate3WithoutValue(address,address,bytes32) (runs: 256, μ: 251617, ~: 251617)
Suite result: ok. 2 passed; 0 failed; 0 skipped; finished in 77.31ms (125.47ms CPU time)

Ran 5 tests for test/TransparentProxyFactory.t.sol:TestTransparentProxyFactory
[PASS] testCreateDeterministicProxyAdmin(address,bytes32) (runs: 256, μ: 274120, ~: 274120)
[PASS] testCreateDeterministicWithDeterministicProxy(bytes32,bytes32) (runs: 256, μ: 660366, ~: 660366)
[PASS] testCreateProxyAdmin(address,bytes32) (runs: 256, μ: 268247, ~: 268247)
[PASS] test_createDeterministicProxy(address,bytes32) (runs: 256, μ: 661606, ~: 661606)
[PASS] test_createProxy() (gas: 1279005)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 167.04ms (259.97ms CPU time)

Ran 9 test suites in 172.81ms (440.06ms CPU time): 39 tests passed, 0 failed, 0 skipped (39 total tests)

@sakulstra
Copy link
Contributor Author

Choose a reason for hiding this comment

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

No description provided.

Please sign in to comment.