Skip to content

maint(ct): remove Helper_SimpleProxy contract #2522

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

Merged
mergify merged 2 commits into from
May 3, 2022
Merged

maint(ct): remove Helper_SimpleProxy contract #2522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6048b1
maint(ct): remove Helper_SimpleProxy contract
smartcontracts May 2, 2022
a178bd0
Merge branch 'develop' into sc/ct-rm-simple-proxy
mergify[bot] May 3, 2022
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
37 changes: 0 additions & 37 deletions packages/contracts/contracts/test-helpers/Helper_SimpleProxy.sol
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions packages/contracts/test/contracts/L1/messaging/L1CrossDomainMessenger.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('L1CrossDomainMessenger', () => {
let Fake__L2CrossDomainMessenger: FakeContract
let Fake__StateCommitmentChain: FakeContract
before(async () => {
Fake__TargetContract = await smock.fake<Contract>('Helper_SimpleProxy')
Fake__TargetContract = await smock.fake<Contract>('TestERC20')
Fake__L2CrossDomainMessenger = await smock.fake<Contract>(
'L2CrossDomainMessenger',
{
Expand Down Expand Up @@ -403,20 +403,18 @@ describe('L1CrossDomainMessenger', () => {
let calldata: string
before(async () => {
target = Fake__TargetContract.address
message = Fake__TargetContract.interface.encodeFunctionData('setTarget', [
message = Fake__TargetContract.interface.encodeFunctionData('mint', [
NON_ZERO_ADDRESS,
ethers.utils.parseEther('1'),
])

const mockProof = await generateMockRelayMessageProof(
;({ proof, calldata } = await generateMockRelayMessageProof(
target,
signer1.address,
message
)
proof = mockProof.proof
calldata = mockProof.calldata
))
})

beforeEach(async () => {
beforeEach(() => {
Fake__StateCommitmentChain.verifyStateCommitment.returns(true)
Fake__StateCommitmentChain.insideFraudProofWindow.returns(false)
})
Expand Down
87 changes: 31 additions & 56 deletions packages/contracts/test/contracts/L2/messaging/L2CrossDomainMessenger.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('L2CrossDomainMessenger', () => {
let Fake__L1CrossDomainMessenger: FakeContract
let Fake__OVM_L2ToL1MessagePasser: FakeContract
before(async () => {
Fake__TargetContract = await smock.fake<Contract>('Helper_SimpleProxy')
Fake__TargetContract = await smock.fake<Contract>('TestERC20')
Fake__L1CrossDomainMessenger = await smock.fake<Contract>(
'L1CrossDomainMessenger'
)
Expand All @@ -45,6 +45,7 @@ describe('L2CrossDomainMessenger', () => {
let L2CrossDomainMessenger: Contract
beforeEach(async () => {
L2CrossDomainMessenger = await deploy('L2CrossDomainMessenger', {
signer: impersonatedL1CrossDomainMessengerSender,
args: [Fake__L1CrossDomainMessenger.address],
})
})
Expand Down Expand Up @@ -72,7 +73,7 @@ describe('L2CrossDomainMessenger', () => {
describe('sendMessage', () => {
it('should be able to send a single message', async () => {
await expect(
L2CrossDomainMessenger.sendMessage(
L2CrossDomainMessenger.connect(signer).sendMessage(
NON_ZERO_ADDRESS,
NON_NULL_BYTES32,
100_000
Expand All @@ -84,22 +85,22 @@ describe('L2CrossDomainMessenger', () => {
).to.deep.equal(
encodeXDomainCalldata(
NON_ZERO_ADDRESS,
await signer.getAddress(),
signer.address,
NON_NULL_BYTES32,
0
)
)
})

it('should be able to send the same message twice', async () => {
await L2CrossDomainMessenger.sendMessage(
await L2CrossDomainMessenger.connect(signer).sendMessage(
NON_ZERO_ADDRESS,
NON_NULL_BYTES32,
100_000
)

await expect(
L2CrossDomainMessenger.sendMessage(
L2CrossDomainMessenger.connect(signer).sendMessage(
NON_ZERO_ADDRESS,
NON_NULL_BYTES32,
100_000
Expand All @@ -109,32 +110,36 @@ describe('L2CrossDomainMessenger', () => {
})

describe('relayMessage', () => {
let target: string
let message: string
before(() => {
target = Fake__TargetContract.address
message = Fake__TargetContract.interface.encodeFunctionData('mint', [
NON_ZERO_ADDRESS,
ethers.utils.parseEther('1'),
])
})

it('should revert if the L1 message sender is not the L1CrossDomainMessenger', async () => {
await expect(
L2CrossDomainMessenger.connect(signer).relayMessage(
Fake__TargetContract.address,
target,
signer.address,
Fake__TargetContract.interface.encodeFunctionData('setTarget', [
NON_ZERO_ADDRESS,
]),
message,
0
)
).to.be.revertedWith('Provided message could not be verified.')
})

it('should send a call to the target contract', async () => {
await L2CrossDomainMessenger.connect(
impersonatedL1CrossDomainMessengerSender
).relayMessage(
Fake__TargetContract.address,
await L2CrossDomainMessenger.relayMessage(
target,
signer.address,
Fake__TargetContract.interface.encodeFunctionData('setTarget', [
NON_ZERO_ADDRESS,
]),
message,
0
)

expect(Fake__TargetContract.setTarget.getCall(0).args[0]).to.deep.equal(
expect(Fake__TargetContract.mint.getCall(0).args[0]).to.deep.equal(
NON_ZERO_ADDRESS
)
})
Expand All @@ -144,14 +149,10 @@ describe('L2CrossDomainMessenger', () => {
L2CrossDomainMessenger.xDomainMessageSender()
).to.be.revertedWith('xDomainMessageSender is not set')

await L2CrossDomainMessenger.connect(
impersonatedL1CrossDomainMessengerSender
).relayMessage(
Fake__TargetContract.address,
await L2CrossDomainMessenger.relayMessage(
target,
signer.address,
Fake__TargetContract.interface.encodeFunctionData('setTarget', [
NON_ZERO_ADDRESS,
]),
message,
0
)

Expand All @@ -161,35 +162,20 @@ describe('L2CrossDomainMessenger', () => {
})

it('should revert if trying to send the same message twice', async () => {
await L2CrossDomainMessenger.connect(
impersonatedL1CrossDomainMessengerSender
).relayMessage(
Fake__TargetContract.address,
await L2CrossDomainMessenger.relayMessage(
target,
signer.address,
Fake__TargetContract.interface.encodeFunctionData('setTarget', [
NON_ZERO_ADDRESS,
]),
message,
0
)

await expect(
L2CrossDomainMessenger.connect(
impersonatedL1CrossDomainMessengerSender
).relayMessage(
Fake__TargetContract.address,
signer.address,
Fake__TargetContract.interface.encodeFunctionData('setTarget', [
NON_ZERO_ADDRESS,
]),
0
)
L2CrossDomainMessenger.relayMessage(target, signer.address, message, 0)
).to.be.revertedWith('Provided message has already been received.')
})

it('should not make a call if the target is the L2 MessagePasser', async () => {
const resProm = L2CrossDomainMessenger.connect(
impersonatedL1CrossDomainMessengerSender
).relayMessage(
const tx = await L2CrossDomainMessenger.relayMessage(
predeploys.OVM_L2ToL1MessagePasser,
signer.address,
Fake__OVM_L2ToL1MessagePasser.interface.encodeFunctionData(
Expand All @@ -199,21 +185,10 @@ describe('L2CrossDomainMessenger', () => {
0
)

// The call to relayMessage() should succeed.
await expect(resProm).to.not.be.reverted

// There should be no 'relayedMessage' event logged in the receipt.
expect(
(
await Fake__OVM_L2ToL1MessagePasser.provider.getTransactionReceipt(
(
await resProm
).hash
)
).logs
(await ethers.provider.getTransactionReceipt(tx.hash)).logs
).to.deep.equal([])

// The message should be registered as successful.
expect(
await L2CrossDomainMessenger.successfulMessages(
ethers.utils.solidityKeccak256(
Expand Down