Skip to content

Backwards compatibility for Authenticated Addresses #325

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
K-Ho merged 5 commits into from
Oct 8, 2020
Merged

Backwards compatibility for Authenticated Addresses #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7016f3
allow unauthenticated addresses
K-Ho Oct 8, 2020
5659336
fix authentication bug
K-Ho Oct 8, 2020
71f084d
use official merkle-patricia-tree package
K-Ho Oct 8, 2020
6a61440
update yarn.lock
K-Ho Oct 8, 2020
aadd3c7
publish new versions of packages
K-Ho Oct 8, 2020
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
7 changes: 1 addition & 6 deletions packages/contracts/contracts/optimistic-ethereum/bridge/L2CrossDomainMessenger.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,7 @@ contract L2CrossDomainMessenger is BaseCrossDomainMessenger {
bool
)
{
if (authenticatedAddress == address(0)) {
IL1MessageSender l1MessageSenderPrecompile = IL1MessageSender(l1MessageSenderPrecompileAddress);
address l1MessageSenderAddress = l1MessageSenderPrecompile.getL1MessageSender();
return l1MessageSenderAddress == targetMessengerAddress;
}
return msg.sender == authenticatedAddress;
return (authenticatedAddress == address(0) || msg.sender == authenticatedAddress);
}

function tempInit(address _authenticatedAddress) public {
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@eth-optimism/rollup-contracts",
"private": true,
"version": "0.0.1-alpha.35",
"version": "0.0.1-alpha.36",
"main": "build/index.js",
"files": [
"build/**/*.js",
Expand Down Expand Up @@ -60,7 +60,7 @@
"ethereumjs-abi": "^0.6.8",
"ethers": "5.0.0",
"lodash": "^4.17.15",
"merkle-patricia-tree": "git+https://github.com/kfichter/merkle-patricia-tree",
"merkle-patricia-tree": "^4.0.0",
"random-bytes-seed": "^1.0.3",
"rlp": "^2.2.5",
"seedrandom": "^3.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/contracts/bridge/L2CrossDomainMessenger.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ describe('L2CrossDomainMessenger', () => {
).to.be.rejectedWith('Provided message has already been received.')
})

it('should fail if the sender is not the L1 messenger', async () => {
it.skip('should fail if the sender is not the L1 messenger', async () => {
const expectedKey = ethers.utils.keccak256('0x1234')
const expectedVal = ethers.utils.keccak256('0x5678')

Expand Down
4 changes: 2 additions & 2 deletions packages/ovm-toolchain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eth-optimism/ovm-toolchain",
"version": "0.0.1-alpha.8",
"version": "0.0.1-alpha.9",
"description": "Wrappers for Ethereum dev tools",
"private": true,
"main": "build/index.js",
Expand Down Expand Up @@ -69,7 +69,7 @@
},
"dependencies": {
"@eth-optimism/core-utils": "^0.0.1-alpha.30",
"@eth-optimism/rollup-contracts": "^0.0.1-alpha.33",
"@eth-optimism/rollup-contracts": "^0.0.1-alpha.36",
"@nomiclabs/buidler": "^1.4.4",
"bn.js": "^5.1.3",
"child_process": "^1.0.2",
Expand Down
25 changes: 23 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@
"@truffle/interface-adapter" "^0.3.0"
web3 "1.2.1"

"@types/abstract-leveldown@^5.0.1":
"@types/abstract-leveldown@*", "@types/abstract-leveldown@^5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-5.0.1.tgz#3c7750d0186b954c7f2d2f6acc8c3c7ba0c3412e"
integrity sha512-wYxU3kp5zItbxKmeRYCEplS2MW7DzyBnxPGj+GJVHZEUZiK/nn5Ei1sUFgURDh+X051+zsGe28iud3oHjrYWQQ==
Expand Down Expand Up @@ -1775,6 +1775,14 @@
"@types/minimatch" "*"
"@types/node" "*"

"@types/levelup@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@types/levelup/-/levelup-3.1.1.tgz#f7cc08f248f14cb6c92914e91bceb8761020e8f0"
integrity sha512-LjvlfctJYj23Xuqq3jCT8ZPSUSSgDcRJg8+XFDBasoYzefFbB4cHzlDmBVjc2rBOYvklpYHJRayD0jBsbJLD9w==
dependencies:
"@types/abstract-leveldown" "*"
"@types/node" "*"

"@types/lodash@^4.14.157":
version "4.14.161"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.161.tgz#a21ca0777dabc6e4f44f3d07f37b765f54188b18"
Expand Down Expand Up @@ -8862,7 +8870,7 @@ merkle-patricia-tree@2.3.2, merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2
rlp "^2.0.0"
semaphore ">=1.0.1"

merkle-patricia-tree@^3.0.0, "merkle-patricia-tree@git+https://github.com/kfichter/merkle-patricia-tree":
merkle-patricia-tree@^3.0.0:
version "3.0.0"
resolved "git+https://github.com/kfichter/merkle-patricia-tree#ebd10c405be8ae909f1f82dea275a0e9ec1c8e46"
dependencies:
Expand All @@ -8873,6 +8881,19 @@ merkle-patricia-tree@^3.0.0, "merkle-patricia-tree@git+https://github.com/kficht
rlp "^2.2.4"
semaphore-async-await "^1.5.1"

merkle-patricia-tree@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-4.0.0.tgz#b95500a2a188a813eae18b175b34d9f439b92a62"
integrity sha512-OnI0iUvc5G66ZJgSB7PnuU6Pnk9QADMcBgua7YhNm8gbQJq5Hbiv9U9hQRe3mEM1KEfbqrdTC+x33bTewF+oCA==
dependencies:
"@types/levelup" "^3.1.1"
ethereumjs-util "^7.0.2"
level-mem "^5.0.1"
level-ws "^2.0.0"
readable-stream "^3.6.0"
rlp "^2.2.4"
semaphore-async-await "^1.5.1"

methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
Expand Down