Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@invocamanman
invocamanman committed Apr 7, 2024
1 parent 269b411 commit 400ae6f
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 42 deletions.
5 changes: 2 additions & 3 deletions contracts/v2/consensus/feijoa/validium/PolygonValidiumFeijoa.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,16 +333,15 @@ contract PolygonValidiumFeijoa is PolygonRollupBaseFeijoa, IPolygonValidium {
lastForceBlobSequenced = currentLastForceBlobSequenced;
}

uint256 totalZkGasSequenced = accZkGasSequenced + forcedZkGasLimit;
// Pay collateral for every non-forced blob submitted
pol.safeTransferFrom(
msg.sender,
address(rollupManager),
rollupManager.getZkGasPrice() * totalZkGasSequenced
rollupManager.getZkGasPrice() * accZkGasSequenced
);

uint64 currentBlobSequenced = rollupManager.onSequence(
uint128(totalZkGasSequenced),
uint128(accZkGasSequenced + forcedZkGasLimit),
uint64(blobsNum),
currentAccInputHash
);
Expand Down
6 changes: 2 additions & 4 deletions contracts/v2/lib/PolygonRollupBaseFeijoa.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -716,16 +716,15 @@ abstract contract PolygonRollupBaseFeijoa is
lastForceBlobSequenced = currentLastForceBlobSequenced;
}

uint256 totalZkGasSequenced = accZkGasSequenced + forcedZkGasLimit;
// Pay collateral for every non-forced blob submitted
pol.safeTransferFrom(
msg.sender,
address(rollupManager),
rollupManager.getZkGasPrice() * totalZkGasSequenced
rollupManager.getZkGasPrice() * accZkGasSequenced
);

uint64 currentBlobSequenced = rollupManager.onSequence(
uint128(totalZkGasSequenced),
uint128(accZkGasSequenced + forcedZkGasLimit),
uint64(blobsNum),
currentAccInputHash
);
Expand Down Expand Up @@ -869,7 +868,6 @@ abstract contract PolygonRollupBaseFeijoa is
for (uint256 i = 0; i < blobsNum; i++) {
// Load current sequence
BlobData memory currentBlob = blobs[i];
currentLastForceBlobSequenced++;

// Supported types: 0 calldata, 1 blob transaction, 2 forced
if (currentBlob.blobType != 2) {
Expand Down
101 changes: 66 additions & 35 deletions test/contractsv2/PolygonRollupManager.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,16 @@ function encodeCalldatBlobTypeParams(
);
}

function encodeCalldatForcedTypeParams(transactionsHash: any, forcedHashData: any) {
return ethers.AbiCoder.defaultAbiCoder().encode(["bytes32", "bytes32"], [transactionsHash, forcedHashData]);
}
const CALLDATA_BLOB_TYPE = 0;
const BLOBTX_BLOB_TYPE = 1;
const FORCED_BLOB_TYPE = 2;

const ZK_GAS_LIMIT_BATCH = 100_000_000;
const MAX_SEQUENCE_TIMESTAMP_FORCED = 18446744073709551615n; // max uint64

describe("Polygon Rollup Manager", () => {
let deployer: any;
let timelock: any;
Expand Down Expand Up @@ -98,8 +104,6 @@ describe("Polygon Rollup Manager", () => {
const SIGNATURE_BYTES = 32 + 32 + 1;
const EFFECTIVE_PERCENTAGE_BYTES = 1;

const ZK_GAS_LIMIT_BATCH = 100_000_000;

beforeEach("Deploy contract", async () => {
upgrades.silenceWarnings();

Expand Down Expand Up @@ -702,9 +706,9 @@ describe("Polygon Rollup Manager", () => {
.connect(trustedAggregator)
.verifySequencesTrustedAggregatorMultiProof([VerifyBlobData], beneficiary.address, zkProofFFlonk)
)
.to.emit(rollupManagerContract, "VerifyBlobsTrustedAggregator")
.to.emit(rollupManagerContract, "VerifySequencesTrustedAggregator")
.withArgs(newCreatedRollupID, newVerifiedBlob, newStateRoot, newLocalExitRoot, trustedAggregator.address)
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTree")
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTreeRecursive")
.withArgs(ethers.ZeroHash, rootRollups);

const finalAggregatorMatic = await polTokenContract.balanceOf(beneficiary.address);
Expand Down Expand Up @@ -860,15 +864,15 @@ describe("Polygon Rollup Manager", () => {
currentTimestampEmergency
);

await expect(newZkEVMContract.sequenceForceBlobs([sequence])).to.be.revertedWithCustomError(
await expect(newZkEVMContract.sequenceForceBlobs([blob])).to.be.revertedWithCustomError(
newZkEVMContract,
"HaltTimeoutNotExpiredAfterEmergencyState"
);

await snapshotEmergencyState.restore();

const l2txDataForceBlob = "0x123456";
const maticAmountForced = await rollupManagerContract.getForcedBlobFee();
const maticAmountForced = (await rollupManagerContract.getForcedZkGasPrice()) * BigInt(ZK_GAS_LIMIT_BATCH);
const lastGlobalExitRoot = await polygonZkEVMGlobalExitRoot.getLastGlobalExitRoot();

// Approve tokens
Expand All @@ -882,34 +886,41 @@ describe("Polygon Rollup Manager", () => {
// Force blob
await expect(newZkEVMContract.forceBlob(l2txDataForceBlob, maticAmountForced))
.to.emit(newZkEVMContract, "ForceBlob")
.withArgs(lastForcedBlob, lastGlobalExitRoot, deployer.address, "0x");
.withArgs(lastForcedBlob, lastGlobalExitRoot, deployer.address, ZK_GAS_LIMIT_BATCH, "0x");

const forcedBlock = await ethers.provider.getBlock("latest");
const currentTimestamp2 = forcedBlock?.timestamp;

const sequenceForced = {
transactions: l2txDataForceBlob,
forcedGlobalExitRoot: lastGlobalExitRoot,
forcedTimestamp: currentTimestamp2,
forcedBlockHashL1: forcedBlock?.parentHash,
const forcedHashDataForcedBlob = ethers.solidityPackedKeccak256(
["bytes32", "uint64", "bytes32"],
[lastGlobalExitRoot, currentTimestamp2, forcedBlock?.parentHash]
);

const blobForced = {
blobType: FORCED_BLOB_TYPE,
blobTypeParams: encodeCalldatForcedTypeParams(
ethers.keccak256(l2txDataForceBlob),
forcedHashDataForcedBlob
),
} as BlobDataStructFeijoa;

const expectedAccInputHash3 = await calculateAccInputHashFromCalldata(
[blobForced],
trustedSequencer.address,
expectedAccInputHash2,
polygonZkEVMGlobalExitRoot
);

const snapshot3 = await takeSnapshot();

// Sequence Blobs
let a = 0;
await expect(
newZkEVMContract
.connect(trustedSequencer)
.sequenceBlobs([sequenceForced], currentTime, currentLastBlobSequenced++, trustedSequencer.address)
.sequenceBlobs([blobForced], trustedSequencer.address, expectedAccInputHash3)
).to.emit(newZkEVMContract, "SequenceBlobs");

const expectedAccInputHash3 = calculateAccInputHashfeijoa(
expectedAccInputHash2,
ethers.keccak256(l2txDataForceBlob),
lastGlobalExitRoot,
currentTimestamp2,
trustedSequencer.address,
forcedBlock?.parentHash
);
// calcualte accINputHash
expect(await newZkEVMContract.lastAccInputHash()).to.be.equal(expectedAccInputHash3);

Expand All @@ -921,7 +932,7 @@ describe("Polygon Rollup Manager", () => {
await ethers.provider.send("evm_setNextBlockTimestamp", [timestampForceBlob + FORCE_BLOB_TIMEOUT]);

// sequence force blob
await expect(newZkEVMContract.sequenceForceBlobs([sequenceForced]))
await expect(newZkEVMContract.sequenceForceBlobs([blobForced]))
.to.emit(newZkEVMContract, "SequenceForceBlobs")
.withArgs(3);

Expand All @@ -943,17 +954,17 @@ describe("Polygon Rollup Manager", () => {
.to.emit(newZkEVMContract, "SetTrustedSequencerURL")
.withArgs("0x1253");

await expect(newZkEVMContract.setforceBlobTimeout(0)).to.be.revertedWithCustomError(
await expect(newZkEVMContract.setForceBlobTimeout(0)).to.be.revertedWithCustomError(
newZkEVMContract,
"OnlyAdmin"
);

await expect(
newZkEVMContract.connect(admin).setforceBlobTimeout(FORCE_BLOB_TIMEOUT)
).to.be.revertedWithCustomError(newZkEVMContract, "InvalidRangeforceBlobTimeout");
newZkEVMContract.connect(admin).setForceBlobTimeout(FORCE_BLOB_TIMEOUT)
).to.be.revertedWithCustomError(newZkEVMContract, "InvalidRangeForceBlobTimeout");

await expect(newZkEVMContract.connect(admin).setforceBlobTimeout(0))
.to.emit(newZkEVMContract, "SetforceBlobTimeout")
await expect(newZkEVMContract.connect(admin).setForceBlobTimeout(0))
.to.emit(newZkEVMContract, "SetForceBlobTimeout")
.withArgs(0);

await expect(newZkEVMContract.transferAdminRole(deployer.address)).to.be.revertedWithCustomError(
Expand Down Expand Up @@ -1395,9 +1406,9 @@ describe("Polygon Rollup Manager", () => {
.connect(trustedAggregator)
.verifySequencesTrustedAggregatorMultiProof([VerifyBlobData], beneficiary.address, zkProofFFlonk)
)
.to.emit(rollupManagerContract, "VerifyBlobsTrustedAggregator")
.to.emit(rollupManagerContract, "VerifySequencesTrustedAggregator")
.withArgs(newCreatedRollupID, newVerifiedBlob, newStateRoot, newLocalExitRoot, trustedAggregator.address)
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTree")
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTreeRecursive")
.withArgs(ethers.ZeroHash, rootRollups);

const finalAggregatorMatic = await polTokenContract.balanceOf(beneficiary.address);
Expand Down Expand Up @@ -1917,9 +1928,9 @@ describe("Polygon Rollup Manager", () => {
.connect(trustedAggregator)
.verifySequencesTrustedAggregatorMultiProof([VerifyBlobData], beneficiary.address, zkProofFFlonk)
)
.to.emit(rollupManagerContract, "VerifyBlobsTrustedAggregator")
.to.emit(rollupManagerContract, "VerifySequencesTrustedAggregator")
.withArgs(newCreatedRollupID, newVerifiedBlob, newStateRoot, newLocalExitRoot, trustedAggregator.address)
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTree")
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTreeRecursive")
.withArgs(ethers.ZeroHash, rootRollups);

const finalAggregatorMatic = await polTokenContract.balanceOf(beneficiary.address);
Expand Down Expand Up @@ -2465,9 +2476,9 @@ describe("Polygon Rollup Manager", () => {
.connect(trustedAggregator)
.verifySequencesTrustedAggregatorMultiProof([VerifyBlobData], beneficiary.address, zkProofFFlonk)
)
.to.emit(rollupManagerContract, "VerifyBlobsTrustedAggregator")
.to.emit(rollupManagerContract, "VerifySequencesTrustedAggregator")
.withArgs(newCreatedRollupID, newVerifiedBlob, newStateRoot, newLocalExitRoot, trustedAggregator.address)
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTree")
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTreeRecursive")
.withArgs(ethers.ZeroHash, rootRollups);

const finalAggregatorMatic = await polTokenContract.balanceOf(beneficiary.address);
Expand Down Expand Up @@ -2885,9 +2896,9 @@ describe("Polygon Rollup Manager", () => {
.connect(trustedAggregator)
.verifySequencesTrustedAggregatorMultiProof([VerifyBlobData], beneficiary.address, zkProofFFlonk)
)
.to.emit(rollupManagerContract, "VerifyBlobsTrustedAggregator")
.to.emit(rollupManagerContract, "VerifySequencesTrustedAggregator")
.withArgs(RollupID, newVerifiedBlob, newStateRoot, newLocalExitRoot, trustedAggregator.address)
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTree")
.to.emit(polygonZkEVMGlobalExitRoot, "UpdateL1InfoTreeRecursive")
.withArgs(ethers.ZeroHash, rootRollups);

const finalAggregatorMatic = await polTokenContract.balanceOf(beneficiary.address);
Expand Down Expand Up @@ -3158,6 +3169,26 @@ async function calculateAccInputHashFromCalldata(
ethers.keccak256(transactions),
ethers.ZeroHash
);
} else if (blobType == FORCED_BLOB_TYPE) {
const [transactionsHash, forcedHashData] = ethers.AbiCoder.defaultAbiCoder().decode(
["bytes32", "bytes32"],
blobTypeParams
);

// check l1INfoHash
currentAccInputHash = calculateAccInputHashfeijoa(
currentAccInputHash,
0,
ethers.ZeroHash,
MAX_SEQUENCE_TIMESTAMP_FORCED,
coinbase,
ZK_GAS_LIMIT_BATCH,
blobType,
ethers.ZeroHash,
ethers.ZeroHash,
transactionsHash,
forcedHashData
);
}
}

Expand Down

0 comments on commit 400ae6f

Please sign in to comment.