hueso/p2pix-smart-contracts
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed WAD Math

Browse Source
This commit is contained in:
PedroCailleret committed 2022-12-17 00:55:43 -03:00
1 parent 122044a1e5
commit 5416bbdd72
18 files changed
+67 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

artifacts/contracts/DataTypes.sol/DataTypes.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/Reputation.sol/Reputation.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../build-info/916d546d680bb337e1c490eb628d93df.json"
}
artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
"buildInfo": "../../../../build-info/0043b38db58c3ff291cf622f3b61e1a3.json"
}
artifacts/contracts/p2pix.sol/P2PIX.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/afbde6718590f5775bc92171f5c6c7f4.json"
"buildInfo": "../../build-info/948b888bf726ea051449ea823f31e46a.json"
}
artifacts/contracts/p2pix.sol/P2PIX.json
+15 -2
View File
@@ -378,6 +378,19 @@
"name": "ValidSignersUpdated",
"type": "event"
},
{
"inputs": [],
"name": "WAD",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
@@ -897,8 +910,8 @@
"type": "receive"
}
],
"bytecode": "0x60806040526001805560405162002800380380620028008339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121d080620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611acc565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd9565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c16565b6106c5565b34801561023457600080fd5b5061028d610243366004611acc565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c33565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d10565b610951565b34801561033457600080fd5b50610358610343366004611acc565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c16565b600c1b61100060Line truncated
"deployedBytecode": "0x60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611acc565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd9565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c16565b6106c5565b34801561023457600080fd5b5061028d610243366004611acc565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c33565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d10565b610951565b34801561033457600080fd5b50610358610343366004611acc565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c16565b600c1b611000600160ac1b031690565b34801561039f57600080fd5b506102066103ae366004611acc565b610a11565b3480156103bf57600080fd5b50610206610a8f565b3480156103d457600080fd5b506103586103e3366004611c16565b600b6020526000908152604090205460ff1681565b34801561040457600080fd5b50610206610413366004611acc565b610b19565b34801561042457600080fd5b50610206610433366004611d5c565b610ba1565b34801561044457600080fd5b506101d3610453366004611acc565b600a6020526000908152604090205481565b34801561047157600080fd5b50610206610480366004611dc0565b610f77565b34801561049157600080fd5b506101d36104a0366004611dec565b61100a565b3480156104b157600080fd5b506000546104c5906001600160a01b031681565b6040516001600160a01b0390911681526020016101dd565b3480156104e957600080fd5b506102066104f8366004611ea0565b6111c1565b34801561050957600080fd5b5061051d610518366004611acc565b611319565b6040516101dd959493929190611ee2565b34801561053a57600080fd5b506101d360045481565b34801561055057600080fd5b5061035861055f366004611acc565b60066020526000908152604090205460ff1681565b34801561058057600080fd5b506002546104c5906001600160a01b031681565b3480156105a057600080fd5b506102066105af366004611f6f565b6113e3565b3480156105c057600080fd5b506102066105cf366004611c16565b6114bb565b6000546001600160a01b031633146106225760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561068957600061066284848151811061064757610647612039565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff19166001908117909155929092019150610628565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106ba919061204f565b60405180910390a150565b6000546001600160a01b0316331461070e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610619565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107a157604051630abc194760e11b815260040160405180910390fd5b6107a9611542565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061081e611552565b831561082e5761082e3385610f77565b600083815260076020908152604090912082518155818301518051849361085c926001850192910190611a33565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108e69080546001019055565b6108f28233308a61157d565b6108fb60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b610959611552565b61096283611614565b61096c82826111c1565b60008381526007602052604090206003810154600160a01b900460ff1615156001141561099c5761099c84610b19565b600381015481546000835560028301546001600160a01b039283Line truncated
"bytecode": "0x608060405260018055604051620028a1380380620028a18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61227180620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e36600461Line truncated
"deployedBytecode": "0x6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c76565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b2c565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c76565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b2c565b610b40565b34801561044b57600080fd5b5061021161045a366004611dbc565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b2c565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e20565b610f9e565b3480156104b857600080fd5b506101de6104c7366004611e4c565b611031565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f00565b611211565b34801561053057600080fd5b5061054461053f366004611b2c565b611379565b6040516101e8959493929190611f42565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b2c565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fcf565b611443565b3480156105e757600080fd5b506102116105f6366004611c76565b61151b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612099565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120af565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115b2565b8315610855576108553385610f9e565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611a93565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115dd565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115b2565b61098983611674565b6109938282611211565b60008381526007602052604090206003810154600160a01b900460ff16151560011415Line truncated
"linkReferences": {},
"deployedLinkReferences": {}
}
contracts/p2pix.sol
+8 -5
View File
@@ -34,8 +34,11 @@ contract P2PIX is
IReputation public reputation;
Counters.Counter public depositCount;
/// @dev Default blocks that lock will hold tokens.
uint256 public defaultLockBlocks;
/// @dev The scalar of BRZ token.
uint256 constant public WAD = 1e18;
/// @dev Stores an relayer's last computed credit.
mapping(uint256 => uint256) public userRecord;
@@ -199,7 +202,7 @@ contract P2PIX is
// Halt execution and output `lockID`.
return lockID;
} else {
if (l.amount <= 100 ether) {
if (l.amount <= 1e2 ether) {
_addLock(lockID, l, d);
// Halt execution and output `lockID`.
return lockID;
@@ -208,9 +211,9 @@ contract P2PIX is
_castAddrToKey(msg.sender)
];
uint256 spendLimit;
(spendLimit) = _limiter(userCredit);
(spendLimit) = _limiter(userCredit / WAD);
if (l.amount > spendLimit || l.amount > 1e6)
if (l.amount > (spendLimit * WAD) || l.amount > 1e6 ether)
revert AmountNotAllowed();
_addLock(lockID, l, d);
@@ -350,8 +353,8 @@ contract P2PIX is
uint256 _newUserRecord = (userRecord[userKey] >>
1);
if (_newUserRecord <= 1e2) {
userRecord[userKey] = 1e2;
if (_newUserRecord <= 1e2 ether) {
userRecord[userKey] = 1e2 ether;
} else {
userRecord[userKey] = _newUserRecord;
}
src/types/factories/p2pix.sol/P2PIX__factory.ts
+14 -1
View File
@@ -389,6 +389,19 @@ const _abi = [
name: "ValidSignersUpdated",
type: "event",
},
{
inputs: [],
name: "WAD",
outputs: [
{
internalType: "uint256",
name: "",
type: "uint256",
},
],
stateMutability: "view",
type: "function",
},
{
inputs: [
{
@@ -910,7 +923,7 @@ const _abi = [
];
const _bytecode =
"0x60806040526001805560405162002800380380620028008339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121d080620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611acc565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd9565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c16565b6106c5565b34801561023457600080fd5b5061028d610243366004611acc565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c33565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d10565b610951565b34801561033457600080fd5b50610358610343366004611acc565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c16565b600c1b611000600160ac1b0316Line truncated
"0x608060405260018055604051620028a1380380620028a18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61227180620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c76565b600cLine truncated
type P2PIXConstructorParams =
| [signer?: Signer]
src/types/p2pix.sol/P2PIX.ts
+14
View File
@@ -29,6 +29,7 @@ import type {
export interface P2PIXInterface extends utils.Interface {
functions: {
"WAD()": FunctionFragment;
"_castAddrToKey(address)": FunctionFragment;
"allowedERC20s(address)": FunctionFragment;
"cancelDeposit(uint256)": FunctionFragment;
@@ -58,6 +59,7 @@ export interface P2PIXInterface extends utils.Interface {
getFunction(
nameOrSignatureOrTopic:
| "WAD"
| "_castAddrToKey"
| "allowedERC20s"
| "cancelDeposit"
@@ -85,6 +87,7 @@ export interface P2PIXInterface extends utils.Interface {
| "withdrawBalance"
): FunctionFragment;
encodeFunctionData(functionFragment: "WAD", values?: undefined): string;
encodeFunctionData(
functionFragment: "_castAddrToKey",
values: [PromiseOrValue<string>]
@@ -203,6 +206,7 @@ export interface P2PIXInterface extends utils.Interface {
values?: undefined
): string;
decodeFunctionResult(functionFragment: "WAD", data: BytesLike): Result;
decodeFunctionResult(
functionFragment: "_castAddrToKey",
data: BytesLike
@@ -482,6 +486,8 @@ export interface P2PIX extends BaseContract {
removeListener: OnEvent<this>;
functions: {
WAD(overrides?: CallOverrides): Promise<[BigNumber]>;
_castAddrToKey(
_addr: PromiseOrValue<string>,
overrides?: CallOverrides
@@ -632,6 +638,8 @@ export interface P2PIX extends BaseContract {
): Promise<ContractTransaction>;
};
WAD(overrides?: CallOverrides): Promise<BigNumber>;
_castAddrToKey(
_addr: PromiseOrValue<string>,
overrides?: CallOverrides
@@ -780,6 +788,8 @@ export interface P2PIX extends BaseContract {
): Promise<ContractTransaction>;
callStatic: {
WAD(overrides?: CallOverrides): Promise<BigNumber>;
_castAddrToKey(
_addr: PromiseOrValue<string>,
overrides?: CallOverrides
@@ -1036,6 +1046,8 @@ export interface P2PIX extends BaseContract {
};
estimateGas: {
WAD(overrides?: CallOverrides): Promise<BigNumber>;
_castAddrToKey(
_addr: PromiseOrValue<string>,
overrides?: CallOverrides
@@ -1167,6 +1179,8 @@ export interface P2PIX extends BaseContract {
};
populateTransaction: {
WAD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
_castAddrToKey(
_addr: PromiseOrValue<string>,
overrides?: CallOverrides
test/Reputation.test.ts
+2
View File
@@ -36,6 +36,8 @@ describe("Reputation", () => {
expect(tx2).to.eq(curve(500));
expect(tx3).to.eq(curve(444444));
expect(tx4).to.eq(curve(988700));
});
});
});
test/p2pix.test.ts
+2 -2
View File
@@ -14,7 +14,7 @@ import {
import {
ethers,
network,
/* , tracer */
/* tracer */
} from "hardhat";
// import keccak256 from "keccak256";
@@ -1578,7 +1578,7 @@ describe("P2PIX", () => {
expect(storage.amount).to.eq(ethers.constants.One);
expect(storage2.amount).to.eq(ethers.constants.Zero);
expect(record1).to.eq(0);
expect(record2).to.eq(100);
expect(record2).to.eq(price);
});
it("should unlock expired through lock function", async () => {
// test method through lock fx