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

Merge branch 'hotfix-1.0.0' into dev

Browse Source
This commit is contained in:
PedroCailleret committed 2022-12-15 17:11:11 -03:00
2 parents 94cb0b97b8 f38145f8e4
commit 7b05a3199e
17 files changed
+49 -49
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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
}
artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/10314198dd1b1c93bdb3afe5190d4fa3.json"
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
}
artifacts/contracts/Reputation.sol/Reputation.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.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/246d885849ebe73a8f97a386ac3822ea.json"
"buildInfo": "../../../../build-info/a5fa4780a59b1f26cae53eb04fc69734.json"
}
artifacts/contracts/p2pix.sol/P2PIX.dbg.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/b5ad8a50c0f19b8c5c9b41ffb9fb771a.json"
"buildInfo": "../../build-info/6ebe7657303cd8d4b91c2ac52d990bb5.json"
}
artifacts/contracts/p2pix.sol/P2PIX.json
+4 -4
View File
@@ -652,9 +652,9 @@
"type": "address"
},
{
"internalType": "uint256",
"internalType": "bytes32",
"name": "pixTimestamp",
"type": "uint256"
"type": "bytes32"
},
{
"internalType": "bytes32",
@@ -897,8 +897,8 @@
"type": "receive"
}
],
"bytecode": "0x608060405260018055604051620027f8380380620027f88339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121c880620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80638642b5c3116100bb5780638642b5c3146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f857806377cd38a4146104185780637f94f65d1461044557600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b61100060Line truncated
"deployedBytecode": "0x60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80638642b5c3116100bb5780638642b5c3146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f857806377cd38a4146104185780637f94f65d1461044557600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b611000600160ac1b031690565b34801561039f57600080fd5b506102066103ae366004611ac4565b610a11565b3480156103bf57600080fd5b50610206610a8f565b3480156103d457600080fd5b506103586103e3366004611c0e565b600b6020526000908152604090205460ff1681565b34801561040457600080fd5b50610206610413366004611ac4565b610b19565b34801561042457600080fd5b506101d3610433366004611ac4565b600a6020526000908152604090205481565b34801561045157600080fd5b50610206610460366004611d54565b610ba1565b34801561047157600080fd5b50610206610480366004611d80565b610c34565b34801561049157600080fd5b506101d36104a0366004611de4565b61100a565b3480156104b157600080fd5b506000546104c5906001600160a01b031681565b6040516001600160a01b0390911681526020016101dd565b3480156104e957600080fd5b506102066104f8366004611e98565b6111b9565b34801561050957600080fd5b5061051d610518366004611ac4565b611311565b6040516101dd959493929190611eda565b34801561053a57600080fd5b506101d360045481565b34801561055057600080fd5b5061035861055f366004611ac4565b60066020526000908152604090205460ff1681565b34801561058057600080fd5b506002546104c5906001600160a01b031681565b3480156105a057600080fd5b506102066105af366004611f67565b6113db565b3480156105c057600080fd5b506102066105cf366004611c0e565b6114b3565b6000546001600160a01b031633146106225760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561068957600061066284848151811061064757610647612031565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff19166001908117909155929092019150610628565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106ba9190612047565b60405180910390a150565b6000546001600160a01b0316331461070e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610619565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107a157604051630abc194760e11b815260040160405180910390fd5b6107a961153a565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061081e61154a565b831561082e5761082e3385610ba1565b600083815260076020908152604090912082518155818301518051849361085c926001850192910190611a2b565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108e69080546001019055565b6108f28233308a611575565b6108fb60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61095961154a565b6109628361160c565b61096c82826111b9565b60008381526007602052604090206003810154600160a01b900460ff1615156001141561099c5761099c84610b19565b600381015481546000835560028301546001600160a01b039283Line truncated
"bytecode": "0x608060405260018055604051620027f8380380620027f88339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121c880620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b61100060Line truncated
"deployedBytecode": "0x60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b611000600160ac1b031690565b34801561039f57600080fd5b506102066103ae366004611ac4565b610a11565b3480156103bf57600080fd5b50610206610a8f565b3480156103d457600080fd5b506103586103e3366004611c0e565b600b6020526000908152604090205460ff1681565b34801561040457600080fd5b50610206610413366004611ac4565b610b19565b34801561042457600080fd5b50610206610433366004611d54565b610ba1565b34801561044457600080fd5b506101d3610453366004611ac4565b600a6020526000908152604090205481565b34801561047157600080fd5b50610206610480366004611db8565b610f77565b34801561049157600080fd5b506101d36104a0366004611de4565b61100a565b3480156104b157600080fd5b506000546104c5906001600160a01b031681565b6040516001600160a01b0390911681526020016101dd565b3480156104e957600080fd5b506102066104f8366004611e98565b6111b9565b34801561050957600080fd5b5061051d610518366004611ac4565b611311565b6040516101dd959493929190611eda565b34801561053a57600080fd5b506101d360045481565b34801561055057600080fd5b5061035861055f366004611ac4565b60066020526000908152604090205460ff1681565b34801561058057600080fd5b506002546104c5906001600160a01b031681565b3480156105a057600080fd5b506102066105af366004611f67565b6113db565b3480156105c057600080fd5b506102066105cf366004611c0e565b6114b3565b6000546001600160a01b031633146106225760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561068957600061066284848151811061064757610647612031565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff19166001908117909155929092019150610628565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106ba9190612047565b60405180910390a150565b6000546001600160a01b0316331461070e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610619565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107a157604051630abc194760e11b815260040160405180910390fd5b6107a961153a565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061081e61154a565b831561082e5761082e3385610f77565b600083815260076020908152604090912082518155818301518051849361085c926001850192910190611a2b565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108e69080546001019055565b6108f28233308a611575565b6108fb60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61095961154a565b6109628361160c565b61096c82826111b9565b60008381526007602052604090206003810154600160a01b900460ff1615156001141561099c5761099c84610b19565b600381015481546000835560028301546001600160a01b039283Line truncated
"linkReferences": {},
"deployedLinkReferences": {}
}
contracts/p2pix.sol
+1 -1
View File
@@ -236,7 +236,7 @@ contract P2PIX is
function release(
bytes32 lockID,
address _relayerTarget,
uint256 pixTimestamp,
bytes32 pixTimestamp,
bytes32 r,
bytes32 s,
uint8 v
src/types/factories/p2pix.sol/P2PIX__factory.ts
+3 -3
View File
@@ -663,9 +663,9 @@ const _abi = [
type: "address",
},
{
internalType: "uint256",
internalType: "bytes32",
name: "pixTimestamp",
type: "uint256",
type: "bytes32",
},
{
internalType: "bytes32",
@@ -910,7 +910,7 @@ const _abi = [
];
const _bytecode =
"0x608060405260018055604051620027f8380380620027f88339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121c880620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80638642b5c3116100bb5780638642b5c3146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f857806377cd38a4146104185780637f94f65d1461044557600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b611000600160ac1b0316Line truncated
"0x608060405260018055604051620027f8380380620027f88339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121c880620006306000396000f3fe60806040526004361061019a5760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a2687114610544578063c52164c614610574578063d6e8b97314610594578063f7d0e04b146105b457600080fd5b80638e2749d6146104dd5780638e2a3d36146104fd5780639872dbfe1461052e57600080fd5b80637f94f65d116100bb5780637f94f65d146104655780638652b37e146104855780638da5cb5b146104a557600080fd5b806372fada5c146103f8578063758d77d41461041857806377cd38a41461043857600080fd5b80633631797211610143578063574983c81161011d578063574983c8146103935780635fd8c710146103b357806369cc6af4146103c857600080fd5b80633631797214610308578063461f3120146103285780634b2ae9801461036857600080fd5b806316d722401161017457806316d722401461022857806329cc7d10146102d15780632dfdf0b5146102f157600080fd5b806304937320146101a65780630d2a2d44146101e657806313af40351461020857600080fd5b366101a157005b600080fd5b3480156101b257600080fd5b506101d36101c1366004611ac4565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101f257600080fd5b50610206610201366004611bd1565b6105d4565b005b34801561021457600080fd5b50610206610223366004611c0e565b6106c5565b34801561023457600080fd5b5061028d610243366004611ac4565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101dd565b3480156102dd57600080fd5b506101d36102ec366004611c2b565b610766565b3480156102fd57600080fd5b506003546101d39081565b34801561031457600080fd5b50610206610323366004611d08565b610951565b34801561033457600080fd5b50610358610343366004611ac4565b60096020526000908152604090205460ff1681565b60405190151581526020016101dd565b34801561037457600080fd5b506101d3610383366004611c0e565b600c1b611000600160ac1b0316Line truncated
type P2PIXConstructorParams =
| [signer?: Signer]
src/types/p2pix.sol/P2PIX.ts
+7 -7
View File
@@ -39,7 +39,7 @@ export interface P2PIXInterface extends utils.Interface {
"mapDeposits(uint256)": FunctionFragment;
"mapLocks(bytes32)": FunctionFragment;
"owner()": FunctionFragment;
"release(bytes32,address,uint256,bytes32,bytes32,uint8)": FunctionFragment;
"release(bytes32,address,bytes32,bytes32,bytes32,uint8)": FunctionFragment;
"reputation()": FunctionFragment;
"sellerAllowList(uint256)": FunctionFragment;
"setDefaultLockBlocks(uint256)": FunctionFragment;
@@ -140,7 +140,7 @@ export interface P2PIXInterface extends utils.Interface {
values: [
PromiseOrValue<BytesLike>,
PromiseOrValue<string>,
PromiseOrValue<BigNumberish>,
PromiseOrValue<BytesLike>,
PromiseOrValue<BytesLike>,
PromiseOrValue<BytesLike>,
PromiseOrValue<BigNumberish>
@@ -555,7 +555,7 @@ export interface P2PIX extends BaseContract {
release(
lockID: PromiseOrValue<BytesLike>,
_relayerTarget: PromiseOrValue<string>,
pixTimestamp: PromiseOrValue<BigNumberish>,
pixTimestamp: PromiseOrValue<BytesLike>,
r: PromiseOrValue<BytesLike>,
s: PromiseOrValue<BytesLike>,
v: PromiseOrValue<BigNumberish>,
@@ -703,7 +703,7 @@ export interface P2PIX extends BaseContract {
release(
lockID: PromiseOrValue<BytesLike>,
_relayerTarget: PromiseOrValue<string>,
pixTimestamp: PromiseOrValue<BigNumberish>,
pixTimestamp: PromiseOrValue<BytesLike>,
r: PromiseOrValue<BytesLike>,
s: PromiseOrValue<BytesLike>,
v: PromiseOrValue<BigNumberish>,
@@ -851,7 +851,7 @@ export interface P2PIX extends BaseContract {
release(
lockID: PromiseOrValue<BytesLike>,
_relayerTarget: PromiseOrValue<string>,
pixTimestamp: PromiseOrValue<BigNumberish>,
pixTimestamp: PromiseOrValue<BytesLike>,
r: PromiseOrValue<BytesLike>,
s: PromiseOrValue<BytesLike>,
v: PromiseOrValue<BigNumberish>,
@@ -1089,7 +1089,7 @@ export interface P2PIX extends BaseContract {
release(
lockID: PromiseOrValue<BytesLike>,
_relayerTarget: PromiseOrValue<string>,
pixTimestamp: PromiseOrValue<BigNumberish>,
pixTimestamp: PromiseOrValue<BytesLike>,
r: PromiseOrValue<BytesLike>,
s: PromiseOrValue<BytesLike>,
v: PromiseOrValue<BigNumberish>,
@@ -1220,7 +1220,7 @@ export interface P2PIX extends BaseContract {
release(
lockID: PromiseOrValue<BytesLike>,
_relayerTarget: PromiseOrValue<string>,
pixTimestamp: PromiseOrValue<BigNumberish>,
pixTimestamp: PromiseOrValue<BytesLike>,
r: PromiseOrValue<BytesLike>,
s: PromiseOrValue<BytesLike>,
v: PromiseOrValue<BigNumberish>,
test/p2pix.test.ts
+22 -22
View File
@@ -947,8 +947,8 @@ describe("P2PIX", () => {
describe("Release", async () => {
it("should revert if lock has expired", async () => {
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["pixTarget", 100, "1337"],
["string", "uint256", "bytes32"],
["pixTarget", 100, ethers.constants.HashZero],
);
const flatSig = await acc01.signMessage(
ethers.utils.arrayify(messageToSign),
@@ -980,7 +980,7 @@ describe("P2PIX", () => {
const fail = p2pix.release(
lockID,
acc03.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -993,8 +993,8 @@ describe("P2PIX", () => {
});
it("should revert if lock has already been released", async () => {
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["pixTarget", 100, "1337"],
["string", "uint256", "bytes32"],
["pixTarget", 100, ethers.constants.HashZero],
);
const flatSig = await acc01.signMessage(
ethers.utils.arrayify(messageToSign),
@@ -1025,7 +1025,7 @@ describe("P2PIX", () => {
await p2pix.release(
lockID,
acc03.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -1033,7 +1033,7 @@ describe("P2PIX", () => {
const fail = p2pix.release(
lockID,
acc03.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -1046,8 +1046,8 @@ describe("P2PIX", () => {
});
it("should revert if signed message has already been used", async () => {
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["pixTarget", 100, "1337"],
["string", "uint256", "bytes32"],
["pixTarget", 100, ethers.constants.HashZero],
);
const flatSig = await owner.signMessage(
ethers.utils.arrayify(messageToSign),
@@ -1080,7 +1080,7 @@ describe("P2PIX", () => {
.release(
lockID,
acc02.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -1105,7 +1105,7 @@ describe("P2PIX", () => {
.release(
lockID2,
acc02.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -1118,8 +1118,8 @@ describe("P2PIX", () => {
});
it("should revert if ecrecovered signer is invalid", async () => {
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["pixTarget", 100, "1337"],
["string", "uint256", "bytes32"],
["pixTarget", 100, ethers.constants.HashZero],
);
const flatSig = await acc03.signMessage(
ethers.utils.arrayify(messageToSign),
@@ -1153,7 +1153,7 @@ describe("P2PIX", () => {
.release(
lockID,
acc02.address,
"1337",
ethers.constants.HashZero,
sig.r,
sig.s,
sig.v,
@@ -1165,10 +1165,10 @@ describe("P2PIX", () => {
);
});
it("should release lock, update storage and emit events", async () => {
const endtoendID = "124";
const endtoendID = ethers.constants.HashZero;
const pixTarget = "pixTarget";
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["string", "uint256", "bytes32"],
[pixTarget, 100, endtoendID],
);
// Note: messageToSign is a string, that is 66-bytes long, to sign the
@@ -1277,7 +1277,7 @@ describe("P2PIX", () => {
});
// edge case test
it("should release multiple locks", async () => {
const endtoendID = "124";
const endtoendID = ethers.constants.HashZero;
const pixTarget = "pixTarget";
const root = ethers.constants.HashZero;
const acc01Key =
@@ -1289,19 +1289,19 @@ describe("P2PIX", () => {
const acc03Record1 =
await p2pix.callStatic.userRecord(acc03Key);
const messageToSign1 = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["string", "uint256", "bytes32"],
[pixTarget, 100, endtoendID]);
const flatSig1 = await owner.signMessage(
ethers.utils.arrayify(messageToSign1));
const sig1 = ethers.utils.splitSignature(flatSig1);
const messageToSign2 = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["string", "uint256", "bytes32"],
[pixTarget, 50, endtoendID]);
const flatSig2 = await owner.signMessage(
ethers.utils.arrayify(messageToSign2));
const sig2 = ethers.utils.splitSignature(flatSig2);
const messageToSign3 = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["string", "uint256", "bytes32"],
[pixTarget, 25, endtoendID]);
const flatSig3 = await owner.signMessage(
ethers.utils.arrayify(messageToSign3));
@@ -1496,10 +1496,10 @@ describe("P2PIX", () => {
);
});
it("should revert if lock has already been released", async () => {
const endtoendID = "124";
const endtoendID = ethers.constants.HashZero;
const pixTarget = "pixTarget";
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
["string", "uint256", "bytes32"],
[pixTarget, 1, endtoendID],
);
const messageHashBytes =