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

Jump to bottom

Fix typo in event name and update OracleV2 contract address #101

Merged
merged 4 commits into from
Jan 12, 2024
Merged

Fix typo in event name and update OracleV2 contract address #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6816fa
redeploy
hujw77 Jan 12, 2024
c28a20d
Fix typo in event name and update OracleV2 contract address
hujw77 Jan 12, 2024
338d1a9
redeploy o2
hujw77 Jan 12, 2024
2786611
verify
hujw77 Jan 12, 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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Oracle and Relayer based Message Protocol.
|------------|--------------------------------------------|
| ORMP | 0x00000000001523057a05d6293C1e5171eE33eE0A |
| Oracle | 0x00000000046bc530804d66B6b64f7aF69B4E4E81 |
| OracleV2 | 0x00000000023D0348fD049690E97b2E76DB051Cc9 |
| OracleV2 | 0x000000000Baa51C73AB72f66C0fD4f1a52170A5E |
| Relayer | 0x0000000000808fE9bDCc1d180EfbF5C53552a6b1 |
| MsgDAO | 0x000000000879926D12aF396788C0785B7e581e53 |

Expand Down
3 changes: 2 additions & 1 deletion bin/verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ verify() {
$path > script/output/$chain_id/$name.v.json)
}

verify $oracle 44 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/OracleV2.sol:OracleV2
# verify $oracle 44 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/OracleV2.sol:OracleV2
verify $oracle 11155111 $(cast abi-encode "constructor(address,address)" $deployer $ormp) src/eco/OracleV2.sol:OracleV2

# verify $ormp 42161 $(cast abi-encode "constructor(address)" $deployer) src/ORMP.sol:ORMP
# verify $ormp 46 $(cast abi-encode "constructor(address)" $deployer) src/ORMP.sol:ORMP
Expand Down
4 changes: 2 additions & 2 deletions script/input/c3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"SUBAPIDAO_ADDR": "0x000000000a0D8ac9cc6CbD817fA77090322FF29d",
"ORMP_ADDR": "0x00000000001523057a05d6293C1e5171eE33eE0A",
"ORMP_SALT": "0x4d629bbdb40d29206f12a51aa81faf14553b218f96845742a89e02e55ecfcef6",
"ORACLEV2_ADDR": "0x0000000000B3A9Ae50c8e29df878FB3aDCcB85c0",
"ORACLEV2_SALT": "0x416f3523b7c6125ff83051476e7ceda2919a440a7036b07ad37b9b5cf84277d7",
"ORACLEV2_ADDR": "0x0000000004452056780Ff88Beb91d8FDf6381fc5",
"ORACLEV2_SALT": "0x17d97172b76b9959d83665cb2f3d73f1f8a7e4eae6954c8d84ee307840928c02",
"RELAYER_ADDR": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1",
"RELAYER_SALT": "0x9d38bcb32422a45bc9c08605d4457bcd3dadddfee1573a352ace5f1defa45621"
}
1 change: 1 addition & 0 deletions script/output/11155111/OracleV2.v.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion script/output/11155111/deploy.a-latest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
"ORACLE": "0x0000000000B3A9Ae50c8e29df878FB3aDCcB85c0",
"ORACLE": "0x0000000004452056780Ff88Beb91d8FDf6381fc5",
"ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
"RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
}
2 changes: 1 addition & 1 deletion script/output/44/OracleV2.v.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion script/output/44/deploy.a-latest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"DAO": "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
"ORACLE": "0x0000000000B3A9Ae50c8e29df878FB3aDCcB85c0",
"ORACLE": "0x0000000004452056780Ff88Beb91d8FDf6381fc5",
"ORMP": "0x00000000001523057a05d6293C1e5171eE33eE0A",
"RELAYER": "0x0000000000808fE9bDCc1d180EfbF5C53552a6b1"
}
4 changes: 2 additions & 2 deletions src/eco/OracleV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ contract OracleV2 is Verifier {
event Assigned(bytes32 indexed msgHash, uint256 fee);
event SetFee(uint256 indexed chainId, uint256 fee);
event SetApproved(address operator, bool approve);
event ImporedMessageRoot(uint256 indexed chaindId, uint256 indexed blockNumber, bytes32 messageRoot);
event ImportedMessageRoot(uint256 indexed chainId, uint256 indexed blockNumber, bytes32 messageRoot);

address public immutable PROTOCOL;

Expand Down Expand Up @@ -55,7 +55,7 @@ contract OracleV2 is Verifier {

function importMessageRoot(uint256 chainId, uint256 blockNumber, bytes32 messageRoot) external onlyOwner {
rootOf[chainId][blockNumber] = messageRoot;
emit ImporedMessageRoot(chainId, blockNumber, messageRoot);
emit ImportedMessageRoot(chainId, blockNumber, messageRoot);
}

function withdraw(address to, uint256 amount) external onlyApproved {
Expand Down
Loading