Skip to content
This repository has been archived by the owner on Dec 5, 2021. It is now read-only.

Move wallet repo and development to monorepo #35

Merged
merged 33 commits into from
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
aea9661
Merge omgx_contracts into /optimism monorepo; integrate message-relay…
CAPtheorem Jun 1, 2021
bf35bbb
further cleanup
CAPtheorem Jun 1, 2021
c9892f9
get address from addressManager; add tests for the message-relayer-fast
CAPtheorem Jun 2, 2021
7f6fc0d
testing contract deployments to the new stack
CAPtheorem Jun 2, 2021
19ae3ac
Deployment working....
CAPtheorem Jun 2, 2021
8843ca9
Add fast and slow message contracts (#38)
boyuan-chen Jun 2, 2021
a3147ce
wip - simplify system - remove message-relayer-fast
CAPtheorem Jun 3, 2021
978efd4
Update L1LiquidityPool.sol
CAPtheorem Jun 3, 2021
a2820c8
message relay working
CAPtheorem Jun 3, 2021
8117c5f
almost there
CAPtheorem Jun 3, 2021
e2d84ea
major wallet functions confirmed working - ready
CAPtheorem Jun 3, 2021
72987da
Merge branch 'develop' into integrate-message-relayer-fast
CAPtheorem Jun 3, 2021
887fd9a
fix integration tests
CAPtheorem Jun 3, 2021
1cf7ee7
minor tweaks to get everything to run on rebased develop branch
CAPtheorem Jun 3, 2021
2c9bf82
Integrate https://github.com/omgnetwork/optimism/pull/37, confirm com…
CAPtheorem Jun 3, 2021
8eea151
update .env.example for stable rinkeby endpoint
CAPtheorem Jun 4, 2021
9a3efd5
adds the message-relayer-fast - goal is to end up with self contained…
CAPtheorem Jun 4, 2021
06a23d0
Added whitelist (#44)
boyuan-chen Jun 4, 2021
8aabcc2
wip - disable npm publish until that's set up
CAPtheorem Jun 4, 2021
b0ddc91
Update publish-develop.yml
CAPtheorem Jun 4, 2021
7bdb98f
fix formatting via yarn run lint:fix
CAPtheorem Jun 4, 2021
86e211d
more lint cleanup
CAPtheorem Jun 4, 2021
3a2c253
assorted and sundry linting issues
CAPtheorem Jun 4, 2021
6e6cb6a
final lint/GH/yarn actions fixes
CAPtheorem Jun 4, 2021
10762b2
remove unneeded spreadsheet code
CAPtheorem Jun 4, 2021
e739ee5
Merge branch 'develop' into integrate-message-relayer-fast
CAPtheorem Jun 5, 2021
531ee02
fix truffle networkID and more linting
CAPtheorem Jun 5, 2021
6757064
Updated addresses (#45)
boyuan-chen Jun 7, 2021
0b929ff
update fraud-prover .env and accomodate L2 fee = enabled
CAPtheorem Jun 8, 2021
cd5f05a
Update addresses.json
boyuan-chen Jun 8, 2021
b77a61c
fixes tslint<>prettier clash which breaks the GH actions
CAPtheorem Jun 8, 2021
1d33a94
delete deployment files
CAPtheorem Jun 8, 2021
ed95c04
Merge branch 'develop' into integrate-message-relayer-fast
CAPtheorem Jun 8, 2021
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
1 change: 1 addition & 0 deletions examples/hardhat/deployments/optimism/.chainId
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
28
446 changes: 446 additions & 0 deletions examples/hardhat/deployments/optimism/ERC20.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"language": "Solidity",
"sources": {
"contracts/ERC20.sol": {
"content": "// SPDX-License-Identifier: MIT\npragma solidity >0.6.0 <0.8.0;\n\n/**\n * @title ERC20\n * @dev A super simple ERC20 implementation!\n */\ncontract ERC20 {\n\n /**********\n * Events *\n **********/\n\n event Transfer(\n address indexed _from,\n address indexed _to,\n uint256 _value\n );\n\n event Approval(\n address indexed _owner,\n address indexed _spender,\n uint256 _value\n );\n\n\n /*************\n * Variables *\n *************/\n\n mapping (address => uint256) public balances;\n mapping (address => mapping (address => uint256)) public allowances;\n\n // Some optional extra goodies.\n uint256 public totalSupply;\n string public name;\n\n\n /***************\n * Constructor *\n ***************/\n\n /**\n * @param _initialSupply Initial maximum token supply.\n * @param _name A name for our ERC20 (technically optional, but it's fun ok jeez).\n */\n constructor(\n uint256 _initialSupply,\n string memory _name\n )\n public\n {\n balances[msg.sender] = _initialSupply;\n totalSupply = _initialSupply;\n name = _name;\n }\n\n\n /********************\n * Public Functions *\n ********************/\n\n /**\n * Checks the balance of an address.\n * @param _owner Address to check a balance for.\n * @return Balance of the address.\n */\n function balanceOf(\n address _owner\n )\n external\n view\n returns (\n uint256\n )\n {\n return balances[_owner];\n }\n\n /**\n * Transfers a balance from your account to someone else's account!\n * @param _to Address to transfer a balance to.\n * @param _amount Amount to transfer to the other account.\n * @return true if the transfer was successful.\n */\n function transfer(\n address _to,\n uint256 _amount\n )\n external\n returns (\n bool\n )\n {\n require(\n balances[msg.sender] >= _amount,\n \"You don't have enough balance to make this transfer!\"\n );\n\n balances[msg.sender] -= _amount;\n balances[_to] += _amount;\n\n emit Transfer(\n msg.sender,\n _to,\n _amount\n );\n\n return true;\n }\n\n /**\n * Transfers a balance from someone else's account to another account. You need an allowance\n * from the sending account for this to work!\n * @param _from Account to transfer a balance from.\n * @param _to Account to transfer a balance to.\n * @param _amount Amount to transfer to the other account.\n * @return true if the transfer was successful.\n */\n function transferFrom(\n address _from,\n address _to,\n uint256 _amount\n )\n external\n returns (\n bool\n )\n {\n require(\n balances[_from] >= _amount,\n \"Can't transfer from the desired account because it doesn't have enough balance.\"\n );\n\n require(\n allowances[_from][msg.sender] >= _amount,\n \"Can't transfer from the desired account because you don't have enough of an allowance.\"\n );\n\n balances[_to] += _amount;\n balances[_from] -= _amount;\n\n emit Transfer(\n _from,\n _to,\n _amount\n );\n\n return true;\n }\n\n /**\n * Approves an account to spend some amount from your account.\n * @param _spender Account to approve a balance for.\n * @param _amount Amount to allow the account to spend from your account.\n * @return true if the allowance was successful.\n */\n function approve(\n address _spender,\n uint256 _amount\n )\n external\n returns (\n bool\n )\n {\n allowances[msg.sender][_spender] = _amount;\n\n emit Approval(\n msg.sender,\n _spender,\n _amount\n );\n\n return true;\n }\n\n /**\n * Checks how much a given account is allowed to spend from another given account.\n * @param _owner Address of the account to check an allowance from.\n * @param _spender Address of the account trying to spend from the owner.\n * @return Allowance for the spender from the owner.\n */\n function allowance(\n address _owner,\n address _spender\n )\n external\n view\n returns (\n uint256\n )\n {\n return allowances[_owner][_spender];\n }\n}\n"
}
},
"settings": {
"optimizer": {
"enabled": false,
"runs": 200
},
"outputSelection": {
"*": {
"*": [
"abi",
"evm.bytecode",
"evm.deployedBytecode",
"evm.methodIdentifiers",
"metadata",
"devdoc",
"userdoc",
"storageLayout",
"evm.gasEstimates"
],
"": [
"ast"
]
}
},
"metadata": {
"useLiteralContent": true
}
}
}
Loading