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

chore(protocol): fix genesis tests and add minor changes #15741

Merged
merged 13 commits into from
Feb 13, 2024
Merged

chore(protocol): fix genesis tests and add minor changes #15741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
35d001e
suggested changes
dantaik Feb 12, 2024
f0837cc
fix genesis test
dantaik Feb 12, 2024
3b3b537
Update DeployOnL1.s.sol
dantaik Feb 12, 2024
8673526
Update LibProposing.sol
dantaik Feb 12, 2024
c4bcfef
Update LibProving.sol
dantaik Feb 12, 2024
d115ca5
chore(protocol): Remove unnecessary nonReentrant (#15742)
dantaik Feb 12, 2024
19e15be
Revert "chore(protocol): Remove unnecessary nonReentrant (#15742)"
dantaik Feb 12, 2024
5c2dd8a
Update DeployOnL1.s.sol
dantaik Feb 12, 2024
3d663bc
Update DeployOnL1.s.sol
dantaik Feb 12, 2024
3ddf8b3
Merge branch 'brecht-review' into additional_changes
dantaik Feb 13, 2024
5e2773a
fix genesis test differently
dantaik Feb 13, 2024
67a186a
remove
dantaik Feb 13, 2024
2bb9638
Update ERC1155Vault.sol
dantaik Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/protocol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: protocol - Deploy L1 Contracts
working-directory: ./packages/protocol
run: |
anvil &
anvil --hardfork cancun &
while ! nc -z localhost 8545; do
sleep 1
done
Expand Down
6 changes: 2 additions & 4 deletions packages/protocol/contracts/L1/libs/LibProving.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,8 @@ library LibProving {
metaHash: blk.metaHash,
blobHash: meta.blobHash,
// TODO(Brecht): Quite limiting this is required to be the same address as
// msg.sender,
// less flexibility on the prover's side for proof generation/proof submission
// using
// multiple accounts.
// msg.sender, less flexibility on the prover's side for proof generation/proof
// submission using multiple accounts.
// Added msgSender to allow the prover to be any address in the future.
prover: msg.sender,
msgSender: msg.sender,
Expand Down
2 changes: 0 additions & 2 deletions packages/protocol/contracts/L1/provers/GuardianProver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import "./Guardians.sol";

/// @title GuardianProver
contract GuardianProver is Guardians {
error PROVING_FAILED();

/// @notice Initializes the contract with the provided address manager.
/// @param _addressManager The address of the address manager contract.
function init(address _addressManager) external initializer {
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/DeployOnL1.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ contract DeployOnL1 is DeployCapability {
});

address[] memory plonkVerifiers = new address[](1);
plonkVerifiers[0] = deployPseZkEvmVerifier("contracts/L1/verifiers/PlonkVerifier.yulp");
plonkVerifiers[0] = deployPseZkEvmVerifier("contracts/verifiers/PlonkVerifier.yulp");

for (uint16 i = 0; i < plonkVerifiers.length; ++i) {
register(
Expand Down
5 changes: 0 additions & 5 deletions packages/protocol/utils/generate_genesis/taikoL2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ async function generateContractConfigs(
_initialized: 1,
_initializing: false,
// ReentrancyGuardUpgradeable
_reentry: 1, // _FALSE
_paused: 1, // _FALSE
// Ownable2Upgradeable
_owner: ownerSecurityCouncil,
Expand Down Expand Up @@ -331,7 +330,6 @@ async function generateContractConfigs(
_initialized: 1,
_initializing: false,
// ReentrancyGuardUpgradeable
_reentry: 1, // _FALSE
_paused: 1, // _FALSE
// Ownable2Upgradeable
_owner: ownerSecurityCouncil,
Expand Down Expand Up @@ -366,7 +364,6 @@ async function generateContractConfigs(
_initialized: 1,
_initializing: false,
// ReentrancyGuardUpgradeable
_reentry: 1, // _FALSE
_paused: 1, // _FALSE
// Ownable2Upgradeable
_owner: ownerSecurityCouncil,
Expand Down Expand Up @@ -401,7 +398,6 @@ async function generateContractConfigs(
_initialized: 1,
_initializing: false,
// ReentrancyGuardUpgradeable
_reentry: 1, // _FALSE
_paused: 1, // _FALSE
// Ownable2Upgradeable
_owner: ownerSecurityCouncil,
Expand Down Expand Up @@ -460,7 +456,6 @@ async function generateContractConfigs(
_initialized: 1,
_initializing: false,
// ReentrancyGuardUpgradeable
_reentry: 1, // _FALSE
_paused: 1, // _FALSE
// Ownable2Upgradeable
_owner: ownerSecurityCouncil,
Expand Down
Loading