diff --git a/.env.example b/.env.example
index d776dbd..d972d67 100644
--- a/.env.example
+++ b/.env.example
@@ -9,4 +9,4 @@ POLYGONSCAN_API_KEY="{INSERT_API_KEY}"
 GASPRICE_API_ENDPOINT="https://api.etherscan.io/api?module=proxy&action=eth_gasPrice"
 COINMARKETCAP_API_KEY="{INSERT_API_KEY}"
 
-REPORT_GAS="true"
+REPORT_GAS="true"
\ No newline at end of file
diff --git a/README.md b/README.md
index 13ba6cb..087ca5b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@
 │   ├── tokens
 │   │   └── ERC20.sol
 │   └── utils
-│       ├── Counters.sol
 │       ├── MerkleProofLib.sol
 │       ├── ReentrancyGuard.sol
 │       └── SafeTransferLib.sol
@@ -32,6 +31,7 @@
 
 ## Current Deployment addresses
 
+### V1
 | Testnet 	| Token Address                              	| P2pix Address                              	|
 |---------	|--------------------------------------------	|--------------------------------------------	|
 | Goerli  	| 0x294003F602c321627152c6b7DED3EAb5bEa853Ee 	| 0x5f3EFA9A90532914545CEf527C530658af87e196 	|
@@ -47,6 +47,21 @@
 
 <!-- https://mumbai.polygonscan.com/address/0x5f3EFA9A90532914545CEf527C530658af87e196#code -->
 
+### V2
+| Testnet 	| Token Address                              	| P2pix Address                              	| Reputation Address                          |
+|---------	|--------------------------------------------	|--------------------------------------------	|--------------------------------------------	|
+| Goerli  	| 0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00 	| 0xefa5cE4351cda51192509cf8De7d8881ADAE95DD 	| 0x939d3c357dc7017cDbDE681BF8e552b54595318A 	|
+| Mumbai  	| 0xC86042E9F2977C62Da8c9dDF7F9c40fde4796A29  | 0xA9258eBb157E4cf5e756b77FDD0DF09C2F73240b	| 0x1fd30b94f20d2f73e9630261342ba68f244da92b	|
+
+<!-- All contracts deployed by 0x8dC06F985C131166570825F52447E8c88d64aE20 -->
+<!-- https://goerli.etherscan.io/address/0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00#code -->
+<!-- https://goerli.etherscan.io/address/0xefa5cE4351cda51192509cf8De7d8881ADAE95DD#code -->
+<!-- https://goerli.etherscan.io/address/0x939d3c357dc7017cDbDE681BF8e552b54595318A#code -->
+
+<!-- https://mumbai.polygonscan.com/address/0xC86042E9F2977C62Da8c9dDF7F9c40fde4796A29#code -->
+<!-- https://mumbai.polygonscan.com/address/0xA9258eBb157E4cf5e756b77FDD0DF09C2F73240b#code -->
+<!-- https://mumbai.polygonscan.com/address/0x1fd30b94f20d2f73e9630261342ba68f244da92b#code -->
+
 ## Usage
 
 ### Pre Requisites
@@ -136,4 +151,4 @@ Deploy to Polygon's Mumbai testnet:
 ```sh
 yarn deploy1:mumbai
 yarn deploy2:mumbai
-```
+```
\ No newline at end of file
diff --git a/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json b/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json
index fb158ce..0202b49 100644
--- a/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json
+++ b/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json
index fb158ce..0202b49 100644
--- a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json
+++ b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json
index 2c1adb5..4451430 100644
--- a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json
+++ b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json
@@ -18,11 +18,21 @@
       "name": "AmountNotAllowed",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "DecOverflow",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "DepositAlreadyExists",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "EmptyPixTarget",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidDeposit",
@@ -48,6 +58,11 @@
       "name": "LoopOverflow",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MaxBalExceeded",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "NoTokens",
@@ -63,6 +78,11 @@
       "name": "NotExpired",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "NotInitialized",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "OnlySeller",
@@ -111,12 +131,6 @@
           "name": "seller",
           "type": "address"
         },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -144,29 +158,10 @@
         },
         {
           "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositClosed",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
           "internalType": "address",
-          "name": "seller",
+          "name": "token",
           "type": "address"
         },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
         {
           "indexed": false,
           "internalType": "uint256",
@@ -207,14 +202,14 @@
         },
         {
           "indexed": true,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockID",
-          "type": "bytes32"
+          "type": "uint256"
         },
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "depositID",
+          "name": "seller",
           "type": "uint256"
         },
         {
@@ -251,9 +246,9 @@
         },
         {
           "indexed": false,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockId",
-          "type": "bytes32"
+          "type": "uint256"
         },
         {
           "indexed": false,
@@ -276,9 +271,9 @@
         },
         {
           "indexed": false,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockId",
-          "type": "bytes32"
+          "type": "uint256"
         }
       ],
       "name": "LockReturned",
@@ -316,6 +311,31 @@
       "name": "RootUpdated",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "state",
+          "type": "bool"
+        }
+      ],
+      "name": "ValidSet",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
diff --git a/artifacts/contracts/Reputation.sol/Reputation.dbg.json b/artifacts/contracts/Reputation.sol/Reputation.dbg.json
index fb158ce..0202b49 100644
--- a/artifacts/contracts/Reputation.sol/Reputation.dbg.json
+++ b/artifacts/contracts/Reputation.sol/Reputation.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json b/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json
+++ b/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json b/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json
+++ b/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json
+++ b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.json b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.json
index 02d3603..8b17455 100644
--- a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.json
+++ b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.json
@@ -330,8 +330,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e06040523480156200001157600080fd5b50604051620010bf380380620010bf833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610cf4620003cb60003960006104630152600061042e015260006101540152610cf46000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906108fc565b60405180910390f35b61011561011036600461096d565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610997565b610338565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e61042a565b61012e61019e3660046109d3565b60036020526000908152604090205481565b61012e6101be3660046109d3565b60056020526000908152604090205481565b6100ec610485565b6101156101e636600461096d565b610492565b6101fe6101f93660046109f5565b61050a565b005b61012e61020e366004610a68565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610ab1565b6107b1565b6000805461024b90610b7c565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610b7c565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103279086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103945761036f8382610bcd565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b038516600090815260036020526040812080548592906103bc908490610bcd565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104179087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104605761045b6107f7565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610b7c565b336000908152600360205260408120805483919083906104b3908490610bcd565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103279086815260200190565b42841015610579576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161058561042a565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f19010000000000000000000000000000000000000000000000000000000000006101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa1580156106ac573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116158015906106e25750876001600160a01b0316816001600160a01b0316145b610748576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610570565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156107f1576107e18482815181106107d3576107d3610be4565b602002602001015184610891565b6107ea81610bfa565b90506107b6565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516108299190610c15565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546108a39190610ccf565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b818110156109295785810183015185820160400152820161090d565b8181111561093b576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461096857600080fd5b919050565b6000806040838503121561098057600080fd5b61098983610951565b946020939093013593505050565b6000806000606084860312156109ac57600080fd5b6109b584610951565b92506109c360208501610951565b9150604084013590509250925092565b6000602082840312156109e557600080fd5b6109ee82610951565b9392505050565b600080600080600080600060e0888a031215610a1057600080fd5b610a1988610951565b9650610a2760208901610951565b95506040880135945060608801359350608088013560ff81168114610a4b57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610a7b57600080fd5b610a8483610951565b9150610a9260208401610951565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610ac457600080fd5b823567ffffffffffffffff80821115610adc57600080fd5b818501915085601f830112610af057600080fd5b8135602082821115610b0457610b04610a9b565b8160051b604051601f19603f83011681018181108682111715610b2957610b29610a9b565b604052928352818301935084810182019289841115610b4757600080fd5b948201945b83861015610b6c57610b5d86610951565b85529482019493820193610b4c565b9997909101359750505050505050565b600181811c90821680610b9057607f821691505b60208210811415610bb157634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082821015610bdf57610bdf610bb7565b500390565b634e487b7160e01b600052603260045260246000fd5b6000600019821415610c0e57610c0e610bb7565b5060010190565b600080835481600182811c915080831680610c3157607f831692505b6020808410821415610c5157634e487b7160e01b86526022600452602486fd5b818015610c655760018114610c9457610cc1565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610cc1565b60008a81526020902060005b86811015610cb95781548b820152908501908301610ca0565b505084890196505b509498975050505050505050565b60008219821115610ce257610ce2610bb7565b50019056fea164736f6c6343000809000a",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906108fc565b60405180910390f35b61011561011036600461096d565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610997565b610338565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e61042a565b61012e61019e3660046109d3565b60036020526000908152604090205481565b61012e6101be3660046109d3565b60056020526000908152604090205481565b6100ec610485565b6101156101e636600461096d565b610492565b6101fe6101f93660046109f5565b61050a565b005b61012e61020e366004610a68565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610ab1565b6107b1565b6000805461024b90610b7c565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610b7c565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103279086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103945761036f8382610bcd565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b038516600090815260036020526040812080548592906103bc908490610bcd565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104179087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104605761045b6107f7565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610b7c565b336000908152600360205260408120805483919083906104b3908490610bcd565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103279086815260200190565b42841015610579576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161058561042a565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f19010000000000000000000000000000000000000000000000000000000000006101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa1580156106ac573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116158015906106e25750876001600160a01b0316816001600160a01b0316145b610748576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610570565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156107f1576107e18482815181106107d3576107d3610be4565b602002602001015184610891565b6107ea81610bfa565b90506107b6565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516108299190610c15565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546108a39190610ccf565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b818110156109295785810183015185820160400152820161090d565b8181111561093b576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461096857600080fd5b919050565b6000806040838503121561098057600080fd5b61098983610951565b946020939093013593505050565b6000806000606084860312156109ac57600080fd5b6109b584610951565b92506109c360208501610951565b9150604084013590509250925092565b6000602082840312156109e557600080fd5b6109ee82610951565b9392505050565b600080600080600080600060e0888a031215610a1057600080fd5b610a1988610951565b9650610a2760208901610951565b95506040880135945060608801359350608088013560ff81168114610a4b57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610a7b57600080fd5b610a8483610951565b9150610a9260208401610951565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610ac457600080fd5b823567ffffffffffffffff80821115610adc57600080fd5b818501915085601f830112610af057600080fd5b8135602082821115610b0457610b04610a9b565b8160051b604051601f19603f83011681018181108682111715610b2957610b29610a9b565b604052928352818301935084810182019289841115610b4757600080fd5b948201945b83861015610b6c57610b5d86610951565b85529482019493820193610b4c565b9997909101359750505050505050565b600181811c90821680610b9057607f821691505b60208210811415610bb157634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082821015610bdf57610bdf610bb7565b500390565b634e487b7160e01b600052603260045260246000fd5b6000600019821415610c0e57610c0e610bb7565b5060010190565b600080835481600182811c915080831680610c3157607f831692505b6020808410821415610c5157634e487b7160e01b86526022600452602486fd5b818015610c655760018114610c9457610cc1565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610cc1565b60008a81526020902060005b86811015610cb95781548b820152908501908301610ca0565b505084890196505b509498975050505050505050565b60008219821115610ce257610ce2610bb7565b50019056fea164736f6c6343000809000a",
+  "bytecode": "0x60e06040523480156200001157600080fd5b506040516200129938038062001299833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610ece620003cb60003960006104c20152600061048d015260006101540152610ece6000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906109f2565b60405180910390f35b610115610110366004610a8e565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610ab8565b610345565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e610489565b61012e61019e366004610af4565b60036020526000908152604090205481565b61012e6101be366004610af4565b60056020526000908152604090205481565b6100ec6104e4565b6101156101e6366004610a8e565b6104f1565b6101fe6101f9366004610b16565b610576565b005b61012e61020e366004610b89565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610beb565b61089a565b6000805461024b90610cd4565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610cd4565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103349086815260200190565b60405180910390a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff831660009081526004602090815260408083203384529091528120547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146103d9576103a78382610d57565b73ffffffffffffffffffffffffffffffffffffffff861660009081526004602090815260408083203384529091529020555b73ffffffffffffffffffffffffffffffffffffffff85166000908152600360205260408120805485929061040e908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104769087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104bf576104ba6108e0565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610cd4565b33600090815260036020526040812080548391908390610512908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff8316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103349086815260200190565b428410156105e5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b600060016105f1610489565b73ffffffffffffffffffffffffffffffffffffffff8a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f190100000000000000000000000000000000000000000000000000000000000061010083015261010282019290925261012281019190915261014201604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610743573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015191505073ffffffffffffffffffffffffffffffffffffffff8116158015906107be57508773ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16145b610824576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e455200000000000000000000000000000000000060448201526064016105dc565b73ffffffffffffffffffffffffffffffffffffffff90811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156108da576108ca8482815181106108bc576108bc610d6e565b60200260200101518461097a565b6108d381610d9d565b905061089f565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516109129190610dd6565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b806002600082825461098c9190610ea9565b909155505073ffffffffffffffffffffffffffffffffffffffff82166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b81811015610a1f57858101830151858201604001528201610a03565b81811115610a31576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b803573ffffffffffffffffffffffffffffffffffffffff81168114610a8957600080fd5b919050565b60008060408385031215610aa157600080fd5b610aaa83610a65565b946020939093013593505050565b600080600060608486031215610acd57600080fd5b610ad684610a65565b9250610ae460208501610a65565b9150604084013590509250925092565b600060208284031215610b0657600080fd5b610b0f82610a65565b9392505050565b600080600080600080600060e0888a031215610b3157600080fd5b610b3a88610a65565b9650610b4860208901610a65565b95506040880135945060608801359350608088013560ff81168114610b6c57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610b9c57600080fd5b610ba583610a65565b9150610bb360208401610a65565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060408385031215610bfe57600080fd5b823567ffffffffffffffff80821115610c1657600080fd5b818501915085601f830112610c2a57600080fd5b8135602082821115610c3e57610c3e610bbc565b8160051b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f83011681018181108682111715610c8157610c81610bbc565b604052928352818301935084810182019289841115610c9f57600080fd5b948201945b83861015610cc457610cb586610a65565b85529482019493820193610ca4565b9997909101359750505050505050565b600181811c90821680610ce857607f821691505b60208210811415610d22577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015610d6957610d69610d28565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610dcf57610dcf610d28565b5060010190565b600080835481600182811c915080831680610df257607f831692505b6020808410821415610e2b577f4e487b710000000000000000000000000000000000000000000000000000000086526022600452602486fd5b818015610e3f5760018114610e6e57610e9b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610e9b565b60008a81526020902060005b86811015610e935781548b820152908501908301610e7a565b505084890196505b509498975050505050505050565b60008219821115610ebc57610ebc610d28565b50019056fea164736f6c6343000809000a",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906109f2565b60405180910390f35b610115610110366004610a8e565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610ab8565b610345565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e610489565b61012e61019e366004610af4565b60036020526000908152604090205481565b61012e6101be366004610af4565b60056020526000908152604090205481565b6100ec6104e4565b6101156101e6366004610a8e565b6104f1565b6101fe6101f9366004610b16565b610576565b005b61012e61020e366004610b89565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610beb565b61089a565b6000805461024b90610cd4565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610cd4565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103349086815260200190565b60405180910390a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff831660009081526004602090815260408083203384529091528120547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146103d9576103a78382610d57565b73ffffffffffffffffffffffffffffffffffffffff861660009081526004602090815260408083203384529091529020555b73ffffffffffffffffffffffffffffffffffffffff85166000908152600360205260408120805485929061040e908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104769087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104bf576104ba6108e0565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610cd4565b33600090815260036020526040812080548391908390610512908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff8316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103349086815260200190565b428410156105e5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b600060016105f1610489565b73ffffffffffffffffffffffffffffffffffffffff8a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f190100000000000000000000000000000000000000000000000000000000000061010083015261010282019290925261012281019190915261014201604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610743573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015191505073ffffffffffffffffffffffffffffffffffffffff8116158015906107be57508773ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16145b610824576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e455200000000000000000000000000000000000060448201526064016105dc565b73ffffffffffffffffffffffffffffffffffffffff90811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156108da576108ca8482815181106108bc576108bc610d6e565b60200260200101518461097a565b6108d381610d9d565b905061089f565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516109129190610dd6565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b806002600082825461098c9190610ea9565b909155505073ffffffffffffffffffffffffffffffffffffffff82166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b81811015610a1f57858101830151858201604001528201610a03565b81811115610a31576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b803573ffffffffffffffffffffffffffffffffffffffff81168114610a8957600080fd5b919050565b60008060408385031215610aa157600080fd5b610aaa83610a65565b946020939093013593505050565b600080600060608486031215610acd57600080fd5b610ad684610a65565b9250610ae460208501610a65565b9150604084013590509250925092565b600060208284031215610b0657600080fd5b610b0f82610a65565b9392505050565b600080600080600080600060e0888a031215610b3157600080fd5b610b3a88610a65565b9650610b4860208901610a65565b95506040880135945060608801359350608088013560ff81168114610b6c57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610b9c57600080fd5b610ba583610a65565b9150610bb360208401610a65565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060408385031215610bfe57600080fd5b823567ffffffffffffffff80821115610c1657600080fd5b818501915085601f830112610c2a57600080fd5b8135602082821115610c3e57610c3e610bbc565b8160051b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f83011681018181108682111715610c8157610c81610bbc565b604052928352818301935084810182019289841115610c9f57600080fd5b948201945b83861015610cc457610cb586610a65565b85529482019493820193610ca4565b9997909101359750505050505050565b600181811c90821680610ce857607f821691505b60208210811415610d22577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015610d6957610d69610d28565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610dcf57610dcf610d28565b5060010190565b600080835481600182811c915080831680610df257607f831692505b6020808410821415610e2b577f4e487b710000000000000000000000000000000000000000000000000000000086526022600452602486fd5b818015610e3f5760018114610e6e57610e9b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610e9b565b60008a81526020902060005b86811015610e935781548b820152908501908301610e7a565b505084890196505b509498975050505050505050565b60008219821115610ebc57610ebc610d28565b50019056fea164736f6c6343000809000a",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json b/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json
+++ b/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json b/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json
deleted file mode 100644
index 62d29f3..0000000
--- a/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
-}
diff --git a/artifacts/contracts/lib/utils/Counters.sol/Counters.json b/artifacts/contracts/lib/utils/Counters.sol/Counters.json
deleted file mode 100644
index 586b482..0000000
--- a/artifacts/contracts/lib/utils/Counters.sol/Counters.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "Counters",
-  "sourceName": "contracts/lib/utils/Counters.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "DecOverflow",
-      "type": "error"
-    }
-  ],
-  "bytecode": "0x602d6037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c6343000809000a",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c6343000809000a",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}
diff --git a/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json b/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json
+++ b/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json b/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json
+++ b/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json b/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json
index 62d29f3..b9559f1 100644
--- a/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json
+++ b/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/p2pix.sol/P2PIX.dbg.json b/artifacts/contracts/p2pix.sol/P2PIX.dbg.json
index fb158ce..0202b49 100644
--- a/artifacts/contracts/p2pix.sol/P2PIX.dbg.json
+++ b/artifacts/contracts/p2pix.sol/P2PIX.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/7e875699b08052f41af96a3837e5d6fb.json"
+  "buildInfo": "../../build-info/6e32e8b8339868a5a7b642cfedb2d144.json"
 }
diff --git a/artifacts/contracts/p2pix.sol/P2PIX.json b/artifacts/contracts/p2pix.sol/P2PIX.json
index c4fd9f8..a7dbe7e 100644
--- a/artifacts/contracts/p2pix.sol/P2PIX.json
+++ b/artifacts/contracts/p2pix.sol/P2PIX.json
@@ -49,11 +49,21 @@
       "name": "AmountNotAllowed",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "DecOverflow",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "DepositAlreadyExists",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "EmptyPixTarget",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidDeposit",
@@ -79,6 +89,11 @@
       "name": "LoopOverflow",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MaxBalExceeded",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "NoTokens",
@@ -94,6 +109,11 @@
       "name": "NotExpired",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "NotInitialized",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "OnlySeller",
@@ -147,12 +167,6 @@
           "name": "seller",
           "type": "address"
         },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
         {
           "indexed": false,
           "internalType": "address",
@@ -180,29 +194,10 @@
         },
         {
           "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositClosed",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
           "internalType": "address",
-          "name": "seller",
+          "name": "token",
           "type": "address"
         },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        },
         {
           "indexed": false,
           "internalType": "uint256",
@@ -243,14 +238,14 @@
         },
         {
           "indexed": true,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockID",
-          "type": "bytes32"
+          "type": "uint256"
         },
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "depositID",
+          "name": "seller",
           "type": "uint256"
         },
         {
@@ -287,9 +282,9 @@
         },
         {
           "indexed": false,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockId",
-          "type": "bytes32"
+          "type": "uint256"
         },
         {
           "indexed": false,
@@ -312,9 +307,9 @@
         },
         {
           "indexed": false,
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockId",
-          "type": "bytes32"
+          "type": "uint256"
         }
       ],
       "name": "LockReturned",
@@ -371,6 +366,31 @@
       "name": "RootUpdated",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "state",
+          "type": "bool"
+        }
+      ],
+      "name": "ValidSet",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -416,6 +436,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "_key",
+          "type": "uint256"
+        }
+      ],
+      "name": "_castKeyToAddr",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "_addr",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -435,19 +474,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        }
-      ],
-      "name": "cancelDeposit",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "defaultLockBlocks",
@@ -469,14 +495,19 @@
           "type": "address"
         },
         {
-          "internalType": "uint256",
+          "internalType": "uint96",
           "name": "_amount",
-          "type": "uint256"
+          "type": "uint96"
         },
         {
-          "internalType": "string",
+          "internalType": "uint160",
           "name": "_pixTarget",
-          "type": "string"
+          "type": "uint160"
+        },
+        {
+          "internalType": "bool",
+          "name": "_valid",
+          "type": "bool"
         },
         {
           "internalType": "bytes32",
@@ -485,23 +516,28 @@
         }
       ],
       "name": "deposit",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "depositID",
-          "type": "uint256"
-        }
-      ],
+      "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
     {
-      "inputs": [],
-      "name": "depositCount",
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "getBalance",
       "outputs": [
         {
           "internalType": "uint256",
-          "name": "_val",
+          "name": "bal",
           "type": "uint256"
         }
       ],
@@ -511,9 +547,86 @@
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "_depositID",
-          "type": "uint256"
+          "internalType": "address[]",
+          "name": "sellers",
+          "type": "address[]"
+        },
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "getBalances",
+      "outputs": [
+        {
+          "internalType": "uint256[]",
+          "name": "",
+          "type": "uint256[]"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "getPixTarget",
+      "outputs": [
+        {
+          "internalType": "uint160",
+          "name": "pixTarget",
+          "type": "uint160"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "seller",
+          "type": "address"
+        },
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "getValid",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "valid",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_seller",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_token",
+          "type": "address"
         },
         {
           "internalType": "address",
@@ -541,56 +654,30 @@
           "type": "bytes32[]"
         },
         {
-          "internalType": "bytes32[]",
+          "internalType": "uint256[]",
           "name": "expiredLocks",
-          "type": "bytes32[]"
+          "type": "uint256[]"
         }
       ],
       "name": "lock",
       "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "lockID",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
         {
           "internalType": "uint256",
           "name": "",
           "type": "uint256"
         }
       ],
-      "name": "mapDeposits",
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "lockCounter",
       "outputs": [
         {
           "internalType": "uint256",
-          "name": "remaining",
+          "name": "",
           "type": "uint256"
-        },
-        {
-          "internalType": "string",
-          "name": "pixTarget",
-          "type": "string"
-        },
-        {
-          "internalType": "address",
-          "name": "seller",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "internalType": "bool",
-          "name": "valid",
-          "type": "bool"
         }
       ],
       "stateMutability": "view",
@@ -599,16 +686,21 @@
     {
       "inputs": [
         {
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "",
-          "type": "bytes32"
+          "type": "uint256"
         }
       ],
       "name": "mapLocks",
       "outputs": [
         {
           "internalType": "uint256",
-          "name": "depositID",
+          "name": "sellerKey",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "counter",
           "type": "uint256"
         },
         {
@@ -626,6 +718,11 @@
           "name": "expirationBlock",
           "type": "uint256"
         },
+        {
+          "internalType": "uint160",
+          "name": "pixTarget",
+          "type": "uint160"
+        },
         {
           "internalType": "address",
           "name": "buyerAddress",
@@ -640,6 +737,11 @@
           "internalType": "address",
           "name": "relayerAddress",
           "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -661,9 +763,9 @@
     {
       "inputs": [
         {
-          "internalType": "bytes32",
+          "internalType": "uint256",
           "name": "lockID",
-          "type": "bytes32"
+          "type": "uint256"
         },
         {
           "internalType": "address",
@@ -728,6 +830,30 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        },
+        {
+          "internalType": "contract ERC20",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "sellerBalance",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -798,6 +924,24 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "state",
+          "type": "bool"
+        }
+      ],
+      "name": "setValidState",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -819,9 +963,9 @@
     {
       "inputs": [
         {
-          "internalType": "bytes32[]",
+          "internalType": "uint256[]",
           "name": "lockIDs",
-          "type": "bytes32[]"
+          "type": "uint256[]"
         }
       ],
       "name": "unlockExpired",
@@ -888,15 +1032,20 @@
     },
     {
       "inputs": [
+        {
+          "internalType": "contract ERC20",
+          "name": "token",
+          "type": "address"
+        },
         {
           "internalType": "uint256",
-          "name": "depositID",
+          "name": "amount",
           "type": "uint256"
         },
         {
-          "internalType": "bytes32[]",
+          "internalType": "uint256[]",
           "name": "expiredLocks",
-          "type": "bytes32[]"
+          "type": "uint256[]"
         }
       ],
       "name": "withdraw",
@@ -916,8 +1065,8 @@
       "type": "receive"
     }
   ],
-  "bytecode": "0x60806040526001805560405162002a9a38038062002a9a8339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61246a80620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611d07565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611e14565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611e51565b6106ec565b34801561023f57600080fd5b5061029861024e366004611d07565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611e6e565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611f4b565b610991565b34801561033f57600080fd5b5061036361034e366004611d07565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611e51565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611d07565b610a51565b3480156103ca57600080fd5b50610211610acf565b3480156103df57600080fd5b506103636103ee366004611e51565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611d07565b610b59565b34801561044b57600080fd5b5061021161045a366004611f97565b610be1565b34801561046b57600080fd5b506101de61047a366004611d07565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611ffb565b61103a565b3480156104b857600080fd5b506101de6104c7366004612027565b6110e6565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f3660046120db565b611311565b34801561053057600080fd5b5061054461053f366004611d07565b611479565b6040516101e895949392919061211d565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611d07565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d63660046121aa565b611543565b3480156105e757600080fd5b506102116105f6366004611e51565b61161b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612274565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e1919061228a565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107e1576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107e96116a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061085e6116b2565b831561086e5761086e338561103a565b600083815260076020908152604090912082518155818301518051849361089c926001850192910190611c6e565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556109269080546001019055565b6109328233308a6116f6565b61093b60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109996116b2565b6109a2836117a6565b6109ac8282611311565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109dc576109dc84610b59565b600381015481546000835560028301546001600160a01b0392831692610a0591849116836117fc565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a4c60018055565b505050565b6000546001600160a01b03163314610a9a5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610b185760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b2333826118a1565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b62816117a6565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610be96116b2565b60008681526008602052604090206002810154610c32576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b4381600301541015610c70576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610ca092600186019290918b9101612312565b604051602081830303815290604052805190602001209050600081604051602001610cf791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d5e576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610dd29060019060a0016020604051602081039080840390855afa158015610db6573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610e1d576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610e4590836123cf565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610ef6576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb69084906123e6565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610eeb9084906123e6565b90915550610f389050565b818860010154610f0691906123e6565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610f329084906123e6565b90915550505b6004880154610f529084906001600160a01b0316836117fc565b600188015415610fbe5760058801546001600160a01b038e8116911614610faf5760058801546001808a0154610f979286926001600160a01b0390911691901c6117fc565b610faa838e60018b60010154901c6117fc565b610fbe565b610fbe838e8a600101546117fc565b8760040160009054906101000a90046001600160a01b03166001600160a01b03167f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece38f84604051611019929190918252602082015260400190565b60405180910390a2505050505050505061103260018055565b505050505050565b6001600160a01b0382163314156110b457611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006110f06116b2565b6110fa8383611311565b60008a81526007602052604090206003810154600160a01b900460ff1661114d576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054871115611188576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6111938b888c6118fc565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436111c291906123e6565b81526001600160a01b03808e1660208301528c166040820152336060909101529050851561122b576002820154600c1b611000600160ac1b03166000908152600a60205260409020546112199088908890336119ac565b6112248382846119f7565b50506112fb565b68056bc75e2d6310000081604001511161124a576112248382846119f7565b611000600160ac1b0333600c1b166000908152600560205260408120549061128261127d670de0b6b3a7640000846123fe565b611af5565b9050611296670de0b6b3a764000082612420565b836040015111806112b4575069d3c21bcecceda10000008360400151115b156112eb576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6112f68584866119f7565b505050505b61130460018055565b9998505050505050505050565b6000815b8082101561145d5760006008600086868681811061133557611335612274565b905060200201358152602001908152602001600020905061135581611bb1565b600281015481546000908152600760205260408120805490919061137a9084906123e6565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116113de57600082815260056020526040902068056bc75e2d6310000090556113f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061143157611431612274565b9050602002013560405161144791815260200190565b60405180910390a2846001019450505050611315565b808210156114735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161149b906122d7565b80601f01602080910402602001604051908101604052809291908181526020018280546114c7906122d7565b80156115145780601f106114e957610100808354040283529160200191611514565b820191906000526020600020905b8154815290600101906020018083116114f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461158c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806115a15763df9578836000526004601cfd5b815181146115b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314611032578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506115c6565b6000546001600160a01b031633146116645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006116ad60035490565b905090565b600154600214156116ef576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061179f5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146117f9576040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806114735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a4c5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106119a5576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9392505050565b6119c18484846001600160a01b038516611c2a565b611473576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611a9d9084906123cf565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b83604051602401611b1391815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611ba85763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611bef576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60028101546117f9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008315611c66578360051b8501855b803580851160051b94855260209485185260406000209301818110611c5e57611c63565b611c3a565b50505b501492915050565b828054611c7a906122d7565b90600052602060002090601f016020900481019282611c9c5760008555611ce2565b82601f10611cb557805160ff1916838001178555611ce2565b82800160010185558215611ce2579182015b82811115611ce2578251825591602001919060010190611cc7565b50611cee929150611cf2565b5090565b5b80821115611cee5760008155600101611cf3565b600060208284031215611d1957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611d5f57611d5f611d20565b604052919050565b600067ffffffffffffffff821115611d8157611d81611d20565b5060051b60200190565b6001600160a01b03811681146117f957600080fd5b600082601f830112611db157600080fd5b81356020611dc6611dc183611d67565b611d36565b82815260059290921b84018101918181019086841115611de557600080fd5b8286015b84811015611e09578035611dfc81611d8b565b8352918301918301611de9565b509695505050505050565b600060208284031215611e2657600080fd5b813567ffffffffffffffff811115611e3d57600080fd5b611e4984828501611da0565b949350505050565b600060208284031215611e6357600080fd5b81356119a581611d8b565b600080600080600060808688031215611e8657600080fd5b8535611e9181611d8b565b945060208601359350604086013567ffffffffffffffff80821115611eb557600080fd5b818801915088601f830112611ec957600080fd5b813581811115611ed857600080fd5b896020828501011115611eea57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611f1157600080fd5b50813567ffffffffffffffff811115611f2957600080fd5b6020830191508360208260051b8501011115611f4457600080fd5b9250929050565b600080600060408486031215611f6057600080fd5b83359250602084013567ffffffffffffffff811115611f7e57600080fd5b611f8a86828701611eff565b9497909650939450505050565b60008060008060008060c08789031215611fb057600080fd5b863595506020870135611fc281611d8b565b945060408701359350606087013592506080870135915060a087013560ff81168114611fed57600080fd5b809150509295509295509295565b6000806040838503121561200e57600080fd5b823561201981611d8b565b946020939093013593505050565b600080600080600080600080600060e08a8c03121561204557600080fd5b8935985060208a013561205781611d8b565b975060408a013561206781611d8b565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff8082111561209257600080fd5b61209e8d838e01611eff565b909650945060c08c01359150808211156120b757600080fd5b506120c48c828d01611eff565b915080935050809150509295985092959850929598565b600080602083850312156120ee57600080fd5b823567ffffffffffffffff81111561210557600080fd5b61211185828601611eff565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156121515788810183015185820160c001528201612135565b8181111561216357600060c083870101525b50601f01601f1916830160c0019150612189905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b600080604083850312156121bd57600080fd5b823567ffffffffffffffff808211156121d557600080fd5b6121e186838701611da0565b93506020915081850135818111156121f857600080fd5b85019050601f8101861361220b57600080fd5b8035612219611dc182611d67565b81815260059190911b8201830190838101908883111561223857600080fd5b928401925b8284101561226557833580151581146122565760008081fd5b8252928401929084019061223d565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156122cb5783516001600160a01b0316835292840192918401916001016122a6565b50909695505050505050565b600181811c908216806122eb57607f821691505b6020821081141561230c57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061232e57607f831692505b602080841082141561234e57634e487b7160e01b86526022600452602486fd5b8180156123625760018114612373576123a0565b60ff198616895284890196506123a0565b60008c81526020902060005b868110156123985781548b82015290850190830161237f565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156123e1576123e16123b9565b500390565b600082198211156123f9576123f96123b9565b500190565b60008261241b57634e487b7160e01b600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612458576124586123b9565b50029056fea164736f6c6343000809000a",
-  "deployedBytecode": "0x6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611d07565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611e14565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611e51565b6106ec565b34801561023f57600080fd5b5061029861024e366004611d07565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611e6e565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611f4b565b610991565b34801561033f57600080fd5b5061036361034e366004611d07565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611e51565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611d07565b610a51565b3480156103ca57600080fd5b50610211610acf565b3480156103df57600080fd5b506103636103ee366004611e51565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611d07565b610b59565b34801561044b57600080fd5b5061021161045a366004611f97565b610be1565b34801561046b57600080fd5b506101de61047a366004611d07565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611ffb565b61103a565b3480156104b857600080fd5b506101de6104c7366004612027565b6110e6565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f3660046120db565b611311565b34801561053057600080fd5b5061054461053f366004611d07565b611479565b6040516101e895949392919061211d565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611d07565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d63660046121aa565b611543565b3480156105e757600080fd5b506102116105f6366004611e51565b61161b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612274565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e1919061228a565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107e1576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107e96116a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061085e6116b2565b831561086e5761086e338561103a565b600083815260076020908152604090912082518155818301518051849361089c926001850192910190611c6e565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556109269080546001019055565b6109328233308a6116f6565b61093b60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109996116b2565b6109a2836117a6565b6109ac8282611311565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109dc576109dc84610b59565b600381015481546000835560028301546001600160a01b0392831692610a0591849116836117fc565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a4c60018055565b505050565b6000546001600160a01b03163314610a9a5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610b185760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b2333826118a1565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b62816117a6565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610be96116b2565b60008681526008602052604090206002810154610c32576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b4381600301541015610c70576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610ca092600186019290918b9101612312565b604051602081830303815290604052805190602001209050600081604051602001610cf791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d5e576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610dd29060019060a0016020604051602081039080840390855afa158015610db6573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610e1d576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610e4590836123cf565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610ef6576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb69084906123e6565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610eeb9084906123e6565b90915550610f389050565b818860010154610f0691906123e6565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610f329084906123e6565b90915550505b6004880154610f529084906001600160a01b0316836117fc565b600188015415610fbe5760058801546001600160a01b038e8116911614610faf5760058801546001808a0154610f979286926001600160a01b0390911691901c6117fc565b610faa838e60018b60010154901c6117fc565b610fbe565b610fbe838e8a600101546117fc565b8760040160009054906101000a90046001600160a01b03166001600160a01b03167f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece38f84604051611019929190918252602082015260400190565b60405180910390a2505050505050505061103260018055565b505050505050565b6001600160a01b0382163314156110b457611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006110f06116b2565b6110fa8383611311565b60008a81526007602052604090206003810154600160a01b900460ff1661114d576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054871115611188576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6111938b888c6118fc565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436111c291906123e6565b81526001600160a01b03808e1660208301528c166040820152336060909101529050851561122b576002820154600c1b611000600160ac1b03166000908152600a60205260409020546112199088908890336119ac565b6112248382846119f7565b50506112fb565b68056bc75e2d6310000081604001511161124a576112248382846119f7565b611000600160ac1b0333600c1b166000908152600560205260408120549061128261127d670de0b6b3a7640000846123fe565b611af5565b9050611296670de0b6b3a764000082612420565b836040015111806112b4575069d3c21bcecceda10000008360400151115b156112eb576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6112f68584866119f7565b505050505b61130460018055565b9998505050505050505050565b6000815b8082101561145d5760006008600086868681811061133557611335612274565b905060200201358152602001908152602001600020905061135581611bb1565b600281015481546000908152600760205260408120805490919061137a9084906123e6565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116113de57600082815260056020526040902068056bc75e2d6310000090556113f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061143157611431612274565b9050602002013560405161144791815260200190565b60405180910390a2846001019450505050611315565b808210156114735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161149b906122d7565b80601f01602080910402602001604051908101604052809291908181526020018280546114c7906122d7565b80156115145780601f106114e957610100808354040283529160200191611514565b820191906000526020600020905b8154815290600101906020018083116114f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461158c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806115a15763df9578836000526004601cfd5b815181146115b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314611032578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506115c6565b6000546001600160a01b031633146116645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006116ad60035490565b905090565b600154600214156116ef576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061179f5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146117f9576040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806114735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a4c5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106119a5576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9392505050565b6119c18484846001600160a01b038516611c2a565b611473576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611a9d9084906123cf565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b83604051602401611b1391815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611ba85763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611bef576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60028101546117f9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008315611c66578360051b8501855b803580851160051b94855260209485185260406000209301818110611c5e57611c63565b611c3a565b50505b501492915050565b828054611c7a906122d7565b90600052602060002090601f016020900481019282611c9c5760008555611ce2565b82601f10611cb557805160ff1916838001178555611ce2565b82800160010185558215611ce2579182015b82811115611ce2578251825591602001919060010190611cc7565b50611cee929150611cf2565b5090565b5b80821115611cee5760008155600101611cf3565b600060208284031215611d1957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611d5f57611d5f611d20565b604052919050565b600067ffffffffffffffff821115611d8157611d81611d20565b5060051b60200190565b6001600160a01b03811681146117f957600080fd5b600082601f830112611db157600080fd5b81356020611dc6611dc183611d67565b611d36565b82815260059290921b84018101918181019086841115611de557600080fd5b8286015b84811015611e09578035611dfc81611d8b565b8352918301918301611de9565b509695505050505050565b600060208284031215611e2657600080fd5b813567ffffffffffffffff811115611e3d57600080fd5b611e4984828501611da0565b949350505050565b600060208284031215611e6357600080fd5b81356119a581611d8b565b600080600080600060808688031215611e8657600080fd5b8535611e9181611d8b565b945060208601359350604086013567ffffffffffffffff80821115611eb557600080fd5b818801915088601f830112611ec957600080fd5b813581811115611ed857600080fd5b896020828501011115611eea57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611f1157600080fd5b50813567ffffffffffffffff811115611f2957600080fd5b6020830191508360208260051b8501011115611f4457600080fd5b9250929050565b600080600060408486031215611f6057600080fd5b83359250602084013567ffffffffffffffff811115611f7e57600080fd5b611f8a86828701611eff565b9497909650939450505050565b60008060008060008060c08789031215611fb057600080fd5b863595506020870135611fc281611d8b565b945060408701359350606087013592506080870135915060a087013560ff81168114611fed57600080fd5b809150509295509295509295565b6000806040838503121561200e57600080fd5b823561201981611d8b565b946020939093013593505050565b600080600080600080600080600060e08a8c03121561204557600080fd5b8935985060208a013561205781611d8b565b975060408a013561206781611d8b565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff8082111561209257600080fd5b61209e8d838e01611eff565b909650945060c08c01359150808211156120b757600080fd5b506120c48c828d01611eff565b915080935050809150509295985092959850929598565b600080602083850312156120ee57600080fd5b823567ffffffffffffffff81111561210557600080fd5b61211185828601611eff565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156121515788810183015185820160c001528201612135565b8181111561216357600060c083870101525b50601f01601f1916830160c0019150612189905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b600080604083850312156121bd57600080fd5b823567ffffffffffffffff808211156121d557600080fd5b6121e186838701611da0565b93506020915081850135818111156121f857600080fd5b85019050601f8101861361220b57600080fd5b8035612219611dc182611d67565b81815260059190911b8201830190838101908883111561223857600080fd5b928401925b8284101561226557833580151581146122565760008081fd5b8252928401929084019061223d565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156122cb5783516001600160a01b0316835292840192918401916001016122a6565b50909695505050505050565b600181811c908216806122eb57607f821691505b6020821081141561230c57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061232e57607f831692505b602080841082141561234e57634e487b7160e01b86526022600452602486fd5b8180156123625760018114612373576123a0565b60ff198616895284890196506123a0565b60008c81526020902060005b868110156123985781548b82015290850190830161237f565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156123e1576123e16123b9565b500390565b600082198211156123f9576123f96123b9565b500190565b60008261241b57634e487b7160e01b600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612458576124586123b9565b50029056fea164736f6c6343000809000a",
+  "bytecode": "0x608060405260018055604051620031f9380380620031f98339810160408190526200002a9162000493565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000616565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005b1565b60200260200101516200038760201b60201c565b6000908152600860205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005c7565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083018260051b82015b8083146200037f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b90565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003ce57620003ce6200038d565b604052919050565b60006001600160401b03821115620003f257620003f26200038d565b5060051b60200190565b6001600160a01b03811681146200041257600080fd5b50565b600082601f8301126200042757600080fd5b81516020620004406200043a83620003d6565b620003a3565b82815260059290921b840181019181810190868411156200046057600080fd5b8286015b84811015620004885780516200047a81620003fc565b835291830191830162000464565b509695505050505050565b600080600080600060a08688031215620004ac57600080fd5b8551602080880151919650906001600160401b0380821115620004ce57600080fd5b620004dc8a838b0162000415565b965060408901519150620004f082620003fc565b6060890151919550808211156200050657600080fd5b620005148a838b0162000415565b945060808901519150808211156200052b57600080fd5b508701601f810189136200053e57600080fd5b80516200054f6200043a82620003d6565b81815260059190911b8201830190838101908b8311156200056f57600080fd5b928401925b828410156200059f57835180151581146200058f5760008081fd5b8252928401929084019062000574565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156200060a5783516001600160a01b031683529284019291840191600101620005e3565b50909695505050505050565b612bd380620006266000396000f3fe6080604052600436106101dc5760003560e01c80637f94f65d11610102578063ad8f2eed11610095578063d4fac45d11610064578063d4fac45d14610713578063d6e8b9731461075e578063f7d0e04b1461077e578063fb8c5ef01461079e57600080fd5b8063ad8f2eed14610659578063b0983d3914610699578063c52164c6146106b9578063d1c07028146106e657600080fd5b80638db564c2116100d15780638db564c2146105c55780639872dbfe146105db57806398a26871146105f15780639eee8d4b1461062157600080fd5b80637f94f65d146104f257806380e1d3021461051257806384ab1d28146105525780638da5cb5b1461059857600080fd5b80634b2ae9801161017a5780636a146024116101495780636a146024146104695780636d82d9e01461048557806374ba03a0146104a557806377cd38a4146104c557600080fd5b80634b2ae980146103e3578063574983c8146104045780635fd8c7101461042457806369cc6af41461043957600080fd5b806313af4035116101b657806313af40351461026a578063328a71811461028a578063367821f0146102aa578063461f3120146103a357600080fd5b806304937320146101e85780630a98b9bd146102285780630d2a2d441461024857600080fd5b366101e357005b600080fd5b3480156101f457600080fd5b506102156102033660046123d5565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561023457600080fd5b5061021561024336600461245c565b6107be565b34801561025457600080fd5b50610268610263366004612643565b610b6d565b005b34801561027657600080fd5b50610268610285366004612680565b610ca7565b34801561029657600080fd5b506102686102a53660046126b9565b610d98565b3480156102b657600080fd5b506103376102c53660046123d5565b6005602081905260009182526040909120805460018201546002830154600384015460048501549585015460068601546007870154600888015460099098015496989597949693959473ffffffffffffffffffffffffffffffffffffffff93841694928416939182169290821691168a565b604080519a8b5260208b0199909952978901969096526060880194909452608087019290925273ffffffffffffffffffffffffffffffffffffffff90811660a087015290811660c086015290811660e0850152908116610100840152166101208201526101400161021f565b3480156103af57600080fd5b506103d36103be3660046123d5565b60096020526000908152604090205460ff1681565b604051901515815260200161021f565b3480156103ef57600080fd5b506102156103fe366004612680565b600c1b90565b34801561041057600080fd5b5061026861041f3660046123d5565b610fd9565b34801561043057600080fd5b5061026861108f565b34801561044557600080fd5b506103d3610454366004612680565b600a6020526000908152604090205460ff1681565b34801561047557600080fd5b50610215670de0b6b3a764000081565b34801561049157600080fd5b506102686104a036600461272c565b611151565b3480156104b157600080fd5b506102686104c0366004612761565b611268565b3480156104d157600080fd5b506102156104e03660046123d5565b60066020526000908152604090205481565b3480156104fe57600080fd5b5061026861050d3660046127c5565b611747565b34801561051e57600080fd5b506103d361052d3660046127f1565b600c9190911b6000908152600b60209081526040808320938352929052205460ff1c90565b34801561055e57600080fd5b5061057361056d3660046123d5565b600c1c90565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161021f565b3480156105a457600080fd5b506000546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156105d157600080fd5b5061021560045481565b3480156105e757600080fd5b5061021560035481565b3480156105fd57600080fd5b506103d361060c3660046123d5565b60086020526000908152604090205460ff1681565b34801561062d57600080fd5b5061021561063c36600461282a565b600b60209081526000928352604080842090915290825290205481565b34801561066557600080fd5b506105736106743660046127f1565b600c9190911b6000908152600b602090815260408083209383529290522054605f1c90565b3480156106a557600080fd5b506102686106b436600461284f565b61180d565b3480156106c557600080fd5b506002546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156106f257600080fd5b50610706610701366004612891565b611a50565b60405161021f91906128d8565b34801561071f57600080fd5b5061021561072e3660046127f1565b600c9190911b6000908152600b6020908152604080832093835292905220546b3fffffffffffffffffffffff1690565b34801561076a57600080fd5b5061026861077936600461291c565b611b2a565b34801561078a57600080fd5b50610268610799366004612680565b611c3a565b3480156107aa57600080fd5b506102686107b93660046129de565b611d06565b60006107c8611e02565b6107d2838361180d565b600c8b901b6000908152600b602090815260408083208d84529091529020548a9060ff1c61082c576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c8c901b6000908152600b602090815260408083208484529091529020546b3fffffffffffffffffffffff1687811015610893576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061089f8e600c1b90565b9050600060045460016108b29190612a69565b60008181526005602052604090206004015490915043116108ff576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c8152602001600354436109339190612a69565b8152602001605f600b600087815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054901c73ffffffffffffffffffffffffffffffffffffffff1681526020018f73ffffffffffffffffffffffffffffffffffffffff1681526020018e73ffffffffffffffffffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff16815250905089899050600014610a7057600083815260066020526040902054610a40908b908b9033611e46565b610a4e848c84848988611e9e565b60048054906000610a5e83612a81565b91905055508195505050505050610b56565b68056bc75e2d63100000816060015111610a9257610a4e848c84848988611e9e565b33600c1b60009081526007602052604081205490610ac0610abb670de0b6b3a764000084612aba565b611ff9565b9050610ad4670de0b6b3a764000082612af5565b83606001511180610af2575069d3c21bcecceda10000008360600151115b15610b29576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610b37868e86868b8a611e9e565b60048054906000610b4783612a81565b90915550939750505050505050505b610b5f60018055565b9a9950505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610bf3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a4544000000000000000000000000000000000000000060448201526064015b60405180910390fd5b80516000905b80821015610c6b576000610c26848481518110610c1857610c18612b32565b6020026020010151600c1b90565b600090815260086020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001908117909155929092019150610bf9565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051610c9c9190612b61565b60405180910390a150565b60005473ffffffffffffffffffffffffffffffffffffffff163314610d28576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b8433600c1b73ffffffffffffffffffffffffffffffffffffffff8516610dea576040517f6a3bc53e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff82166000908152600a602052604090205460ff16610e49576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610eac6bffffffffffffffffffffffff8a1683612a69565b1115610ee4576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610eec611e02565b8415610efc57610efc3386611747565b87878760ff81901b605f83901b610f138587612a69565b6000898152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8e16845290915290209117919091179055610f648733306bffffffffffffffffffffffff8f166120b5565b610f6d60018055565b6040805173ffffffffffffffffffffffffffffffffffffffff8e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff16331461105a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b851181604051610c9c91815260200190565b60005473ffffffffffffffffffffffffffffffffffffffff163314611110576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b4761111b338261217f565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610c9c565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684529091529020548015611230576000828152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a250611262565b6040517f87138d5c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50505050565b611270611e02565b600086815260056020526040902060038101546112b9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b43816004015410156112f7576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6005810154600382015460405160609290921b7fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161139a91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561141f576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526114879060019060a0016020604051602081039080840390855afa158015611477573d6000803e3d6000fd5b50505060206040510351600c1b90565b60008181526008602052604090205490915060ff166114d2576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60098401546003850154600286015473ffffffffffffffffffffffffffffffffffffffff909216916000906115079083612baf565b6000600389018190556004890181905587815260096020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905560088801549091503373ffffffffffffffffffffffffffffffffffffffff909116146115f357600287015433600c1b60009081526007602052604081208054909190611599908490612a69565b9091555050600887015482906007906000906115cb9073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b815260200190815260200160002060008282546115e89190612a69565b9091555061162b9050565b8187600201546116039190612a69565b33600c1b60009081526007602052604081208054909190611625908490612a69565b90915550505b600687015461165290849073ffffffffffffffffffffffffffffffffffffffff16836121f9565b6002870154156116d857600787015473ffffffffffffffffffffffffffffffffffffffff8d81169116146116c957600787015460028801546116b191859173ffffffffffffffffffffffffffffffffffffffff9091169060011c6121f9565b6116c4838d60018a60020154901c6121f9565b6116d8565b6116d8838d89600201546121f9565b6006870154604080518f81526020810185905273ffffffffffffffffffffffffffffffffffffffff909216917f364537f14276f2a0ce9905588413f96454cbb8fb2e4f5308389307c1098bede8910160405180910390a25050505050505061173f60018055565b505050505050565b73ffffffffffffffffffffffffffffffffffffffff82163314156117db57806006600061177485600c1b90565b8152602080820192909252604090810160002092909255815173ffffffffffffffffffffffffffffffffffffffff851681529081018390527f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632910160405180910390a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000815b80821015611a3a5760006005600086868681811061183157611831612b32565b9050602002013581526020019081526020016000209050611851816122b8565b80546000908152600b60209081526040808320600985015473ffffffffffffffffffffffffffffffffffffffff16845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e4000000906118b49083612a69565b11156118ec576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600382015482546000908152600b60209081526040808320600987015473ffffffffffffffffffffffffffffffffffffffff16845290915281208054909190611936908490612a69565b909155505060006003830181905560088301546119699073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b60008181526007602052604090205490915060011c68056bc75e2d6310000081116119ad57600082815260076020526040902068056bc75e2d6310000090556119bf565b60008281526007602052604090208190555b600684015473ffffffffffffffffffffffffffffffffffffffff167f830501e61b8b075e170b22a430e39454bdb12ed3e9620e586430b6ac00079da5898989818110611a0d57611a0d612b32565b90506020020135604051611a2391815260200190565b60405180910390a285600101955050505050611811565b808210156112625763dfb035c96000526004601cfd5b8151606090600090818167ffffffffffffffff811115611a7257611a7261252d565b604051908082528060200260200182016040528015611a9b578160200160208202803683370190505b5090505b81831015611b21576000611af4878581518110611abe57611abe612b32565b602090810291909101810151600c1b6000908152600b825260408082208a835290925220546b3fffffffffffffffffffffff1690565b905080828581518110611b0957611b09612b32565b60200260200101818152505083600101935050611a9f565b95945050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314611bab576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b815180611bc05763df9578836000526004601cfd5b81518114611bd65763ff633a386000526004601cfd5b60208301602083018260051b82015b80831461173f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611be5565b60005473ffffffffffffffffffffffffffffffffffffffff163314611cbb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600281905560405173ffffffffffffffffffffffffffffffffffffffff821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610c9c565b611d0e611e02565b611d18828261180d565b33600c1b6000908152600b6020908152604080832087845290915290205460ff1c151560011415611d4e57611d4e846000611151565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff89168452909152902054611d9c906b3fffffffffffffffffffffff16858784612334565b611da78533866121f9565b6040805173ffffffffffffffffffffffffffffffffffffffff871681526020810186905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a25061126260018055565b60015460021415611e3f576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b611e6884848473ffffffffffffffffffffffffffffffffffffffff8516612391565b611262576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a085015190820180547fffffffffffffffffffffffff000000000000000000000000000000000000000090811673ffffffffffffffffffffffffffffffffffffffff9384161790915560c0860151600684018054831691841691909117905560e0860151600784018054831691841691909117905561010086015160088401805483169184169190911790556101208601516009909301805490911692909116919091179055611f8d86868484612334565b60c083015183516060850151604051879373ffffffffffffffffffffffffffffffffffffffff16927f8fb3989f70bd172a37d15b41b015e48ea09d59329638377304a4198cd0c4ea6592611fe992918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b8360405160240161201791815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826120ac5763e10bf1cc6000526004601cfd5b50505050919050565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080612178576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610bea565b5050505050565b600080600080600085875af19050806121f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610bea565b505050565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080611262576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610bea565b43816004015411156122f6576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003810154612331576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b836123475763ce3a3d376000526004601cfd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8616845290915281208054859290612386908490612baf565b909155505050505050565b600083156123cd578360051b8501855b803580851160051b948552602094851852604060002093018181106123c5576123ca565b6123a1565b50505b501492915050565b6000602082840312156123e757600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461233157600080fd5b60008083601f84011261242257600080fd5b50813567ffffffffffffffff81111561243a57600080fd5b6020830191508360208260051b850101111561245557600080fd5b9250929050565b6000806000806000806000806000806101008b8d03121561247c57600080fd5b8a35612487816123ee565b995060208b0135612497816123ee565b985060408b01356124a7816123ee565b975060608b01356124b7816123ee565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff808211156124e257600080fd5b6124ee8e838f01612410565b909650945060e08d013591508082111561250757600080fd5b506125148d828e01612410565b915080935050809150509295989b9194979a5092959850565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156125a3576125a361252d565b604052919050565b600067ffffffffffffffff8211156125c5576125c561252d565b5060051b60200190565b600082601f8301126125e057600080fd5b813560206125f56125f0836125ab565b61255c565b82815260059290921b8401810191818101908684111561261457600080fd5b8286015b8481101561263857803561262b816123ee565b8352918301918301612618565b509695505050505050565b60006020828403121561265557600080fd5b813567ffffffffffffffff81111561266c57600080fd5b612678848285016125cf565b949350505050565b60006020828403121561269257600080fd5b813561269d816123ee565b9392505050565b803580151581146126b457600080fd5b919050565b600080600080600060a086880312156126d157600080fd5b85356126dc816123ee565b945060208601356bffffffffffffffffffffffff811681146126fd57600080fd5b9350604086013561270d816123ee565b925061271b606087016126a4565b949793965091946080013592915050565b6000806040838503121561273f57600080fd5b823561274a816123ee565b9150612758602084016126a4565b90509250929050565b60008060008060008060c0878903121561277a57600080fd5b86359550602087013561278c816123ee565b945060408701359350606087013592506080870135915060a087013560ff811681146127b757600080fd5b809150509295509295509295565b600080604083850312156127d857600080fd5b82356127e3816123ee565b946020939093013593505050565b6000806040838503121561280457600080fd5b823561280f816123ee565b9150602083013561281f816123ee565b809150509250929050565b6000806040838503121561283d57600080fd5b82359150602083013561281f816123ee565b6000806020838503121561286257600080fd5b823567ffffffffffffffff81111561287957600080fd5b61288585828601612410565b90969095509350505050565b600080604083850312156128a457600080fd5b823567ffffffffffffffff8111156128bb57600080fd5b6128c7858286016125cf565b925050602083013561281f816123ee565b6020808252825182820181905260009190848201906040850190845b81811015612910578351835292840192918401916001016128f4565b50909695505050505050565b6000806040838503121561292f57600080fd5b823567ffffffffffffffff8082111561294757600080fd5b612953868387016125cf565b935060209150818501358181111561296a57600080fd5b85019050601f8101861361297d57600080fd5b803561298b6125f0826125ab565b81815260059190911b820183019083810190888311156129aa57600080fd5b928401925b828410156129cf576129c0846126a4565b825292840192908401906129af565b80955050505050509250929050565b600080600080606085870312156129f457600080fd5b84356129ff816123ee565b935060208501359250604085013567ffffffffffffffff811115612a2257600080fd5b612a2e87828801612410565b95989497509550505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115612a7c57612a7c612a3a565b500190565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415612ab357612ab3612a3a565b5060010190565b600082612af0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612b2d57612b2d612a3a565b500290565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b8181101561291057835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101612b7d565b600082821015612bc157612bc1612a3a565b50039056fea164736f6c6343000809000a",
+  "deployedBytecode": "0x6080604052600436106101dc5760003560e01c80637f94f65d11610102578063ad8f2eed11610095578063d4fac45d11610064578063d4fac45d14610713578063d6e8b9731461075e578063f7d0e04b1461077e578063fb8c5ef01461079e57600080fd5b8063ad8f2eed14610659578063b0983d3914610699578063c52164c6146106b9578063d1c07028146106e657600080fd5b80638db564c2116100d15780638db564c2146105c55780639872dbfe146105db57806398a26871146105f15780639eee8d4b1461062157600080fd5b80637f94f65d146104f257806380e1d3021461051257806384ab1d28146105525780638da5cb5b1461059857600080fd5b80634b2ae9801161017a5780636a146024116101495780636a146024146104695780636d82d9e01461048557806374ba03a0146104a557806377cd38a4146104c557600080fd5b80634b2ae980146103e3578063574983c8146104045780635fd8c7101461042457806369cc6af41461043957600080fd5b806313af4035116101b657806313af40351461026a578063328a71811461028a578063367821f0146102aa578063461f3120146103a357600080fd5b806304937320146101e85780630a98b9bd146102285780630d2a2d441461024857600080fd5b366101e357005b600080fd5b3480156101f457600080fd5b506102156102033660046123d5565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561023457600080fd5b5061021561024336600461245c565b6107be565b34801561025457600080fd5b50610268610263366004612643565b610b6d565b005b34801561027657600080fd5b50610268610285366004612680565b610ca7565b34801561029657600080fd5b506102686102a53660046126b9565b610d98565b3480156102b657600080fd5b506103376102c53660046123d5565b6005602081905260009182526040909120805460018201546002830154600384015460048501549585015460068601546007870154600888015460099098015496989597949693959473ffffffffffffffffffffffffffffffffffffffff93841694928416939182169290821691168a565b604080519a8b5260208b0199909952978901969096526060880194909452608087019290925273ffffffffffffffffffffffffffffffffffffffff90811660a087015290811660c086015290811660e0850152908116610100840152166101208201526101400161021f565b3480156103af57600080fd5b506103d36103be3660046123d5565b60096020526000908152604090205460ff1681565b604051901515815260200161021f565b3480156103ef57600080fd5b506102156103fe366004612680565b600c1b90565b34801561041057600080fd5b5061026861041f3660046123d5565b610fd9565b34801561043057600080fd5b5061026861108f565b34801561044557600080fd5b506103d3610454366004612680565b600a6020526000908152604090205460ff1681565b34801561047557600080fd5b50610215670de0b6b3a764000081565b34801561049157600080fd5b506102686104a036600461272c565b611151565b3480156104b157600080fd5b506102686104c0366004612761565b611268565b3480156104d157600080fd5b506102156104e03660046123d5565b60066020526000908152604090205481565b3480156104fe57600080fd5b5061026861050d3660046127c5565b611747565b34801561051e57600080fd5b506103d361052d3660046127f1565b600c9190911b6000908152600b60209081526040808320938352929052205460ff1c90565b34801561055e57600080fd5b5061057361056d3660046123d5565b600c1c90565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161021f565b3480156105a457600080fd5b506000546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156105d157600080fd5b5061021560045481565b3480156105e757600080fd5b5061021560035481565b3480156105fd57600080fd5b506103d361060c3660046123d5565b60086020526000908152604090205460ff1681565b34801561062d57600080fd5b5061021561063c36600461282a565b600b60209081526000928352604080842090915290825290205481565b34801561066557600080fd5b506105736106743660046127f1565b600c9190911b6000908152600b602090815260408083209383529290522054605f1c90565b3480156106a557600080fd5b506102686106b436600461284f565b61180d565b3480156106c557600080fd5b506002546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156106f257600080fd5b50610706610701366004612891565b611a50565b60405161021f91906128d8565b34801561071f57600080fd5b5061021561072e3660046127f1565b600c9190911b6000908152600b6020908152604080832093835292905220546b3fffffffffffffffffffffff1690565b34801561076a57600080fd5b5061026861077936600461291c565b611b2a565b34801561078a57600080fd5b50610268610799366004612680565b611c3a565b3480156107aa57600080fd5b506102686107b93660046129de565b611d06565b60006107c8611e02565b6107d2838361180d565b600c8b901b6000908152600b602090815260408083208d84529091529020548a9060ff1c61082c576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c8c901b6000908152600b602090815260408083208484529091529020546b3fffffffffffffffffffffff1687811015610893576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061089f8e600c1b90565b9050600060045460016108b29190612a69565b60008181526005602052604090206004015490915043116108ff576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c8152602001600354436109339190612a69565b8152602001605f600b600087815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054901c73ffffffffffffffffffffffffffffffffffffffff1681526020018f73ffffffffffffffffffffffffffffffffffffffff1681526020018e73ffffffffffffffffffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff16815250905089899050600014610a7057600083815260066020526040902054610a40908b908b9033611e46565b610a4e848c84848988611e9e565b60048054906000610a5e83612a81565b91905055508195505050505050610b56565b68056bc75e2d63100000816060015111610a9257610a4e848c84848988611e9e565b33600c1b60009081526007602052604081205490610ac0610abb670de0b6b3a764000084612aba565b611ff9565b9050610ad4670de0b6b3a764000082612af5565b83606001511180610af2575069d3c21bcecceda10000008360600151115b15610b29576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610b37868e86868b8a611e9e565b60048054906000610b4783612a81565b90915550939750505050505050505b610b5f60018055565b9a9950505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610bf3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a4544000000000000000000000000000000000000000060448201526064015b60405180910390fd5b80516000905b80821015610c6b576000610c26848481518110610c1857610c18612b32565b6020026020010151600c1b90565b600090815260086020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001908117909155929092019150610bf9565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051610c9c9190612b61565b60405180910390a150565b60005473ffffffffffffffffffffffffffffffffffffffff163314610d28576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b8433600c1b73ffffffffffffffffffffffffffffffffffffffff8516610dea576040517f6a3bc53e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff82166000908152600a602052604090205460ff16610e49576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610eac6bffffffffffffffffffffffff8a1683612a69565b1115610ee4576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610eec611e02565b8415610efc57610efc3386611747565b87878760ff81901b605f83901b610f138587612a69565b6000898152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8e16845290915290209117919091179055610f648733306bffffffffffffffffffffffff8f166120b5565b610f6d60018055565b6040805173ffffffffffffffffffffffffffffffffffffffff8e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff16331461105a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b851181604051610c9c91815260200190565b60005473ffffffffffffffffffffffffffffffffffffffff163314611110576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b4761111b338261217f565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610c9c565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684529091529020548015611230576000828152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a250611262565b6040517f87138d5c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50505050565b611270611e02565b600086815260056020526040902060038101546112b9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b43816004015410156112f7576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6005810154600382015460405160609290921b7fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161139a91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561141f576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526114879060019060a0016020604051602081039080840390855afa158015611477573d6000803e3d6000fd5b50505060206040510351600c1b90565b60008181526008602052604090205490915060ff166114d2576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60098401546003850154600286015473ffffffffffffffffffffffffffffffffffffffff909216916000906115079083612baf565b6000600389018190556004890181905587815260096020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905560088801549091503373ffffffffffffffffffffffffffffffffffffffff909116146115f357600287015433600c1b60009081526007602052604081208054909190611599908490612a69565b9091555050600887015482906007906000906115cb9073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b815260200190815260200160002060008282546115e89190612a69565b9091555061162b9050565b8187600201546116039190612a69565b33600c1b60009081526007602052604081208054909190611625908490612a69565b90915550505b600687015461165290849073ffffffffffffffffffffffffffffffffffffffff16836121f9565b6002870154156116d857600787015473ffffffffffffffffffffffffffffffffffffffff8d81169116146116c957600787015460028801546116b191859173ffffffffffffffffffffffffffffffffffffffff9091169060011c6121f9565b6116c4838d60018a60020154901c6121f9565b6116d8565b6116d8838d89600201546121f9565b6006870154604080518f81526020810185905273ffffffffffffffffffffffffffffffffffffffff909216917f364537f14276f2a0ce9905588413f96454cbb8fb2e4f5308389307c1098bede8910160405180910390a25050505050505061173f60018055565b505050505050565b73ffffffffffffffffffffffffffffffffffffffff82163314156117db57806006600061177485600c1b90565b8152602080820192909252604090810160002092909255815173ffffffffffffffffffffffffffffffffffffffff851681529081018390527f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632910160405180910390a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000815b80821015611a3a5760006005600086868681811061183157611831612b32565b9050602002013581526020019081526020016000209050611851816122b8565b80546000908152600b60209081526040808320600985015473ffffffffffffffffffffffffffffffffffffffff16845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e4000000906118b49083612a69565b11156118ec576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600382015482546000908152600b60209081526040808320600987015473ffffffffffffffffffffffffffffffffffffffff16845290915281208054909190611936908490612a69565b909155505060006003830181905560088301546119699073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b60008181526007602052604090205490915060011c68056bc75e2d6310000081116119ad57600082815260076020526040902068056bc75e2d6310000090556119bf565b60008281526007602052604090208190555b600684015473ffffffffffffffffffffffffffffffffffffffff167f830501e61b8b075e170b22a430e39454bdb12ed3e9620e586430b6ac00079da5898989818110611a0d57611a0d612b32565b90506020020135604051611a2391815260200190565b60405180910390a285600101955050505050611811565b808210156112625763dfb035c96000526004601cfd5b8151606090600090818167ffffffffffffffff811115611a7257611a7261252d565b604051908082528060200260200182016040528015611a9b578160200160208202803683370190505b5090505b81831015611b21576000611af4878581518110611abe57611abe612b32565b602090810291909101810151600c1b6000908152600b825260408082208a835290925220546b3fffffffffffffffffffffff1690565b905080828581518110611b0957611b09612b32565b60200260200101818152505083600101935050611a9f565b95945050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314611bab576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b815180611bc05763df9578836000526004601cfd5b81518114611bd65763ff633a386000526004601cfd5b60208301602083018260051b82015b80831461173f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611be5565b60005473ffffffffffffffffffffffffffffffffffffffff163314611cbb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600281905560405173ffffffffffffffffffffffffffffffffffffffff821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610c9c565b611d0e611e02565b611d18828261180d565b33600c1b6000908152600b6020908152604080832087845290915290205460ff1c151560011415611d4e57611d4e846000611151565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff89168452909152902054611d9c906b3fffffffffffffffffffffff16858784612334565b611da78533866121f9565b6040805173ffffffffffffffffffffffffffffffffffffffff871681526020810186905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a25061126260018055565b60015460021415611e3f576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b611e6884848473ffffffffffffffffffffffffffffffffffffffff8516612391565b611262576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a085015190820180547fffffffffffffffffffffffff000000000000000000000000000000000000000090811673ffffffffffffffffffffffffffffffffffffffff9384161790915560c0860151600684018054831691841691909117905560e0860151600784018054831691841691909117905561010086015160088401805483169184169190911790556101208601516009909301805490911692909116919091179055611f8d86868484612334565b60c083015183516060850151604051879373ffffffffffffffffffffffffffffffffffffffff16927f8fb3989f70bd172a37d15b41b015e48ea09d59329638377304a4198cd0c4ea6592611fe992918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b8360405160240161201791815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826120ac5763e10bf1cc6000526004601cfd5b50505050919050565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080612178576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610bea565b5050505050565b600080600080600085875af19050806121f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610bea565b505050565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080611262576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610bea565b43816004015411156122f6576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003810154612331576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b836123475763ce3a3d376000526004601cfd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8616845290915281208054859290612386908490612baf565b909155505050505050565b600083156123cd578360051b8501855b803580851160051b948552602094851852604060002093018181106123c5576123ca565b6123a1565b50505b501492915050565b6000602082840312156123e757600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461233157600080fd5b60008083601f84011261242257600080fd5b50813567ffffffffffffffff81111561243a57600080fd5b6020830191508360208260051b850101111561245557600080fd5b9250929050565b6000806000806000806000806000806101008b8d03121561247c57600080fd5b8a35612487816123ee565b995060208b0135612497816123ee565b985060408b01356124a7816123ee565b975060608b01356124b7816123ee565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff808211156124e257600080fd5b6124ee8e838f01612410565b909650945060e08d013591508082111561250757600080fd5b506125148d828e01612410565b915080935050809150509295989b9194979a5092959850565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156125a3576125a361252d565b604052919050565b600067ffffffffffffffff8211156125c5576125c561252d565b5060051b60200190565b600082601f8301126125e057600080fd5b813560206125f56125f0836125ab565b61255c565b82815260059290921b8401810191818101908684111561261457600080fd5b8286015b8481101561263857803561262b816123ee565b8352918301918301612618565b509695505050505050565b60006020828403121561265557600080fd5b813567ffffffffffffffff81111561266c57600080fd5b612678848285016125cf565b949350505050565b60006020828403121561269257600080fd5b813561269d816123ee565b9392505050565b803580151581146126b457600080fd5b919050565b600080600080600060a086880312156126d157600080fd5b85356126dc816123ee565b945060208601356bffffffffffffffffffffffff811681146126fd57600080fd5b9350604086013561270d816123ee565b925061271b606087016126a4565b949793965091946080013592915050565b6000806040838503121561273f57600080fd5b823561274a816123ee565b9150612758602084016126a4565b90509250929050565b60008060008060008060c0878903121561277a57600080fd5b86359550602087013561278c816123ee565b945060408701359350606087013592506080870135915060a087013560ff811681146127b757600080fd5b809150509295509295509295565b600080604083850312156127d857600080fd5b82356127e3816123ee565b946020939093013593505050565b6000806040838503121561280457600080fd5b823561280f816123ee565b9150602083013561281f816123ee565b809150509250929050565b6000806040838503121561283d57600080fd5b82359150602083013561281f816123ee565b6000806020838503121561286257600080fd5b823567ffffffffffffffff81111561287957600080fd5b61288585828601612410565b90969095509350505050565b600080604083850312156128a457600080fd5b823567ffffffffffffffff8111156128bb57600080fd5b6128c7858286016125cf565b925050602083013561281f816123ee565b6020808252825182820181905260009190848201906040850190845b81811015612910578351835292840192918401916001016128f4565b50909695505050505050565b6000806040838503121561292f57600080fd5b823567ffffffffffffffff8082111561294757600080fd5b612953868387016125cf565b935060209150818501358181111561296a57600080fd5b85019050601f8101861361297d57600080fd5b803561298b6125f0826125ab565b81815260059190911b820183019083810190888311156129aa57600080fd5b928401925b828410156129cf576129c0846126a4565b825292840192908401906129af565b80955050505050509250929050565b600080600080606085870312156129f457600080fd5b84356129ff816123ee565b935060208501359250604085013567ffffffffffffffff811115612a2257600080fd5b612a2e87828801612410565b95989497509550505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115612a7c57612a7c612a3a565b500190565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415612ab357612ab3612a3a565b5060010190565b600082612af0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612b2d57612b2d612a3a565b500290565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b8181101561291057835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101612b7d565b600082821015612bc157612bc1612a3a565b50039056fea164736f6c6343000809000a",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/contracts/DataTypes.sol b/contracts/DataTypes.sol
index 345301f..4d7a4bd 100644
--- a/contracts/DataTypes.sol
+++ b/contracts/DataTypes.sol
@@ -2,26 +2,28 @@
 pragma solidity 0.8.9;
 
 library DataTypes {
-    struct Deposit {
-        /// @dev Remaining tokens available.
-        uint256 remaining;
-        /// @dev The PIX account for the seller receive transactions.
-        string pixTarget;
-        address seller;
-        /// @dev ERC20 stable token address.
-        address token;
-        /// @dev Could be invalidated by the seller.
-        bool valid;
-    }
+    // struct Deposit {
+    //     /// @dev Remaining tokens available.
+    //     uint256 remaining;
+    //     /// @dev The PIX account for the seller receive transactions.
+    //     string pixTarget;
+    //     address seller;
+    //     /// @dev ERC20 stable token address.
+    //     address token;
+    //     /// @dev Could be invalidated by the seller.
+    //     bool valid;
+    // }
 
     struct Lock {
-        uint256 depositID;
+        uint256 sellerKey;
+        uint256 counter;
         /// @dev Amount to be paid for relayer.
         uint256 relayerPremium;
         /// @dev Amount to be tranfered via PIX.
         uint256 amount;
         /// @dev If not paid at this block will be expired.
         uint256 expirationBlock;
+        uint160 pixTarget;
         /// @dev Where the tokens are sent the when order gets validated.
         address buyerAddress;
         /// @dev Relayer's target address that receives `relayerPremium` funds.
@@ -29,5 +31,6 @@ library DataTypes {
         /// @dev Relayer address (msg.sender) that facilitated this transaction.
         /// @dev Reputation points accruer.
         address relayerAddress;
+        address token;
     }
 }
diff --git a/contracts/EventAndErrors.sol b/contracts/EventAndErrors.sol
index dab413a..a59062d 100644
--- a/contracts/EventAndErrors.sol
+++ b/contracts/EventAndErrors.sol
@@ -7,33 +7,34 @@ interface EventAndErrors {
 
     event DepositAdded(
         address indexed seller,
-        uint256 depositID,
+        // uint256 depositID,
         address token,
         uint256 amount
     );
-    event DepositClosed(
+    event ValidSet(
         address indexed seller,
-        uint256 depositID
+        address token,
+        bool state
     );
     event DepositWithdrawn(
         address indexed seller,
-        uint256 depositID,
+        address token,
         uint256 amount
     );
     event LockAdded(
         address indexed buyer,
-        bytes32 indexed lockID,
-        uint256 depositID,
+        uint256 indexed lockID,
+        uint256 seller,
         uint256 amount
     );
     event LockReleased(
         address indexed buyer, 
-        bytes32 lockId,
+        uint256 lockId,
         uint256 amount
     );
     event LockReturned(
         address indexed buyer, 
-        bytes32 lockId
+        uint256 lockId
     );
     event FundsWithdrawn(
         address owner, 
@@ -104,4 +105,13 @@ interface EventAndErrors {
     /// @dev Reverts on an expired lock.
     /// @dev 0xf6fafba0
     error LockExpired();
+    
+    /// @dev 0xce3a3d37
+    error DecOverflow();
+    /// @dev 0xf3fb0eb9
+    error MaxBalExceeded();
+    /// @dev 0x6a3bc53e
+    error EmptyPixTarget();
+    /// @dev 0x87138d5c
+    error NotInitialized();
 }
diff --git a/contracts/lib/utils/Counters.sol b/contracts/lib/utils/Counters.sol
deleted file mode 100644
index 8039093..0000000
--- a/contracts/lib/utils/Counters.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.8.4;
-
-/// @title Counters
-/// @author buf0t9
-/// @author Modified from OpenZeppelin Contracts
-/// (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/Counters.sol)
-/// @notice Provides counters that can only be incremented, decrementedor reset.
-/// @dev Include with `using Counters for Counters.Counter;`
-library Counters {
-    // solhint-disable no-inline-assembly
-    struct Counter {
-        /// @dev Interactions must be restricted to the library's function.
-        uint256 _val; // := 0
-    }
-
-    /// @dev 0xce3a3d37
-    error DecOverflow();
-
-    function current(
-        Counter storage counter
-    ) internal view returns (uint256 _val) {
-        assembly {
-            _val := sload(counter.slot)
-        }
-    }
-
-    function increment(Counter storage counter) internal {
-        assembly {
-            let _val := sload(counter.slot)
-            sstore(counter.slot, add(_val, 0x01))
-        }
-    }
-
-    function decrement(Counter storage counter) internal {
-        assembly {
-            let _val := sload(counter.slot)
-            if or(iszero(_val), lt(_val, 0x00)) {
-                mstore(0x00, 0xce3a3d37)
-                revert(0x1c, 0x04)
-            }
-            sstore(counter.slot, sub(_val, 0x01))
-        }
-    }
-
-    function reset(Counter storage counter) internal {
-        assembly {
-            sstore(counter.slot, 0)
-        }
-    }
-}
diff --git a/contracts/p2pix.sol b/contracts/p2pix.sol
index 7f38a92..cff8475 100644
--- a/contracts/p2pix.sol
+++ b/contracts/p2pix.sol
@@ -9,7 +9,6 @@ pragma solidity 0.8.9;
 ///
 
 import { Owned } from "./lib/auth/Owned.sol";
-import { Counters } from "./lib/utils/Counters.sol";
 import { ERC20, SafeTransferLib } from "./lib/utils/SafeTransferLib.sol";
 import { IReputation } from "./lib/interfaces/IReputation.sol";
 import { MerkleProofLib as Merkle } from "./lib/utils/MerkleProofLib.sol";
@@ -24,36 +23,55 @@ contract P2PIX is
 {
     // solhint-disable use-forbidden-name
     // solhint-disable no-inline-assembly
+    // solhint-disable no-empty-blocks
 
-    using Counters for Counters.Counter;
-    using DT for DT.Deposit;
     using DT for DT.Lock;
 
+    /// ███ Constants ██████████████████████████████████████████████████████████
+
+    /// @dev The bitmask of `sellerBalance` entry.
+    uint256 private constant BITMASK_SB_ENTRY = (1 << 94) - 1;
+    /// @dev The bit position of `pixTarget` in `sellerBalance`.
+    uint256 private constant BITPOS_PIXTARGET = 95;
+    /// @dev The bit position of `valid` in `sellerBalance`.
+    uint256 private constant BITPOS_VALID = 255;
+    /// @dev The bitmask of all 256 bits of `sellerBalance` except for the last one.
+    uint256 private constant BITMASK_VALID = (1 << 255) - 1;
+    /// @dev The scalar of BRZ token.
+    uint256 public constant WAD = 1e18;
+
     /// ███ Storage ████████████████████████████████████████████████████████████
 
     IReputation public reputation;
-    Counters.Counter public depositCount;
+    // Counters.Counter public depositCount;
 
     /// @dev Default blocks that lock will hold tokens.
     uint256 public defaultLockBlocks;
-    /// @dev The scalar of BRZ token.
-    uint256 public constant WAD = 1e18;
+    uint256 public lockCounter;
 
+    /// @dev List of Locks.
+    mapping(uint256 => DT.Lock) public mapLocks;
+    /// @dev Seller casted to key => Seller's allowlist merkleroot.
+    mapping(uint256 => bytes32) public sellerAllowList;
     /// @dev Stores an relayer's last computed credit.
     mapping(uint256 => uint256) public userRecord;
     /// @dev List of valid Bacen signature addresses
     mapping(uint256 => bool) public validBacenSigners;
-    /// @dev Seller list of deposits
-    mapping(uint256 => DT.Deposit) public mapDeposits;
-    /// @dev List of Locks.
-    mapping(bytes32 => DT.Lock) public mapLocks;
     /// @dev List of Pix transactions already signed.
     mapping(bytes32 => bool) public usedTransactions;
-    /// @dev Seller casted to key => Seller's allowlist merkleroot.
-    mapping(uint256 => bytes32) public sellerAllowList;
     /// @dev Tokens allowed to serve as the underlying amount of a deposit.
     mapping(ERC20 => bool) public allowedERC20s;
 
+    // BITS LAYOUT
+    // `uint96`  [0...94]   := balance
+    // `uint160` [95...254] := pixTarget
+    // `bool`    [255]       := valid
+
+    /// @dev `balance` max. value = 10**26.
+    /// @dev `pixTarget` keys are restricted to 160 bits.
+    mapping(uint256 => mapping(ERC20 => uint256))
+        public sellerBalance;
+
     /// ███ Constructor ████████████████████████████████████████████████████████
 
     constructor(
@@ -76,27 +94,29 @@ contract P2PIX is
     /// @dev Seller needs to send his tokens to the P2PIX smart contract.
     /// @param _pixTarget Pix key destination provided by the offer's seller.
     /// @param allowlistRoot Optional allow list merkleRoot update `bytes32` value.
-    /// @return depositID The `uint256` return value provided
     /// as the deposit identifier.
     /// @dev Function sighash: 0xbfe07da6.
     function deposit(
         address _token,
-        uint256 _amount,
-        string calldata _pixTarget,
+        uint96 _amount,
+        uint160 _pixTarget,
+        bool _valid,
         bytes32 allowlistRoot
-    ) public returns (uint256 depositID) {
+    ) public {
         ERC20 t = ERC20(_token);
-        if (!allowedERC20s[t]) revert TokenDenied();
+        uint256 k = _castAddrToKey(msg.sender);
 
-        (depositID) = _encodeDepositID();
+        if (_pixTarget == 0) 
+            revert EmptyPixTarget();
+        if (!allowedERC20s[t]) 
+            revert TokenDenied();
+        uint256 _sellerBalance = 
+            sellerBalance[k][t];
 
-        DT.Deposit memory d = DT.Deposit({
-            remaining: _amount,
-            pixTarget: _pixTarget,
-            seller: msg.sender,
-            token: _token,
-            valid: true
-        });
+        uint256 currBal = 
+            _sellerBalance & BITMASK_SB_ENTRY;
+        if ((currBal + _amount) > 1e8 ether)
+            revert MaxBalExceeded();
 
         setReentrancyGuard();
 
@@ -104,8 +124,23 @@ contract P2PIX is
             setRoot(msg.sender, allowlistRoot);
         }
 
-        mapDeposits[depositID] = d;
-        depositCount.increment();
+        uint256 amountCasted;
+        uint256 pixTargetCasted;
+        uint256 validCasted;
+        (
+            amountCasted,
+            pixTargetCasted,
+            validCasted
+        ) = _castToUint(
+            _amount, 
+            _pixTarget, 
+            _valid
+        );
+        
+        sellerBalance[k][t] =
+            (currBal + amountCasted) |
+            (pixTargetCasted << BITPOS_PIXTARGET) |
+            (validCasted << BITPOS_VALID);
 
         SafeTransferLib.safeTransferFrom(
             t,
@@ -117,9 +152,8 @@ contract P2PIX is
         clearReentrancyGuard();
 
         emit DepositAdded(
-            msg.sender,
-            depositID,
-            _token,
+            msg.sender, 
+            _token, 
             _amount
         );
     }
@@ -128,14 +162,30 @@ contract P2PIX is
     /// locks made to his/her token offering order.
     /// @dev This function does not affect any ongoing active locks.
     /// @dev Function sighash: 0x72fada5c.
+    function setValidState(ERC20 token, bool state) public {
+        uint256 key = 
+            _castAddrToKey(msg.sender);
+        uint256 _sellerBalance = 
+            sellerBalance[key][token];
+        
+        if (_sellerBalance != 0) {
+            uint256 _valid;
+            assembly { _valid := state }
+        
+            _sellerBalance =
+                (_sellerBalance & BITMASK_VALID) |
+                (_valid << BITPOS_VALID);
+            
+            sellerBalance[key][token] = 
+                _sellerBalance;
 
-    function cancelDeposit(uint256 depositID) public {
-        _onlySeller(depositID);
-        mapDeposits[depositID].valid = false;
-        emit DepositClosed(
-            mapDeposits[depositID].seller,
-            depositID
-        );
+            emit ValidSet(
+                msg.sender, 
+                address(token), 
+                state
+            );
+        } else 
+            revert NotInitialized();
     }
 
     /// @notice Public method designed to lock an remaining amount of
@@ -158,68 +208,115 @@ contract P2PIX is
     /// @return lockID The `bytes32` value returned as the lock identifier.
     /// @dev Function sighash: 0x03aaf306.
     function lock(
-        uint256 _depositID,
+        address _seller,
+        address _token,
         address _buyerAddress,
         address _relayerTarget,
         uint256 _relayerPremium,
         uint256 _amount,
         bytes32[] calldata merkleProof,
-        bytes32[] calldata expiredLocks
-    ) public nonReentrant returns (bytes32 lockID) {
+        uint256[] calldata expiredLocks
+    ) public nonReentrant returns (uint256) {
         unlockExpired(expiredLocks);
-        DT.Deposit storage d = mapDeposits[_depositID];
 
-        if (!d.valid) revert InvalidDeposit();
-        if (d.remaining < _amount) revert NotEnoughTokens();
+        ERC20 t = ERC20(_token);
+        if (!getValid(_seller, t)) 
+            revert InvalidDeposit();
 
-        (lockID) = _encodeLockID(
-            _depositID,
+        uint256 bal = 
+            getBalance(_seller, t);
+        if (bal < _amount) 
+            revert NotEnoughTokens();
+
+        uint256 k = 
+            _castAddrToKey(_seller);
+
+        uint256 cCounter = 
+            lockCounter + 1;
+
+        if (mapLocks[cCounter].expirationBlock 
+            >= block.number)
+                revert NotExpired();
+
+        DT.Lock memory l = DT.Lock(
+            k,
+            cCounter,
+            _relayerPremium,
             _amount,
-            _buyerAddress
-        );
-
-        DT.Lock memory l = DT.Lock({
-            depositID: _depositID,
-            relayerPremium: _relayerPremium,
-            amount: _amount,
-            expirationBlock: (block.number +
+            (block.number + 
                 defaultLockBlocks),
-            buyerAddress: _buyerAddress,
-            relayerTarget: _relayerTarget,
-            relayerAddress: msg.sender
-        });
+            uint160(sellerBalance[k][t] 
+                >> BITPOS_PIXTARGET),
+            _buyerAddress,
+            _relayerTarget,
+            msg.sender,
+            address(t)
+        );
 
         if (merkleProof.length != 0) {
             merkleVerify(
                 merkleProof,
-                sellerAllowList[_castAddrToKey(d.seller)],
+                sellerAllowList[k],
                 msg.sender
             );
 
-            _addLock(lockID, l, d);
+            _addLock(
+                bal, 
+                _amount, 
+                cCounter, 
+                l, 
+                t, 
+                k
+            );
+
+            lockCounter++;
 
             // Halt execution and output `lockID`.
-            return lockID;
+            return cCounter;
+
         } else {
             if (l.amount <= 1e2 ether) {
-                _addLock(lockID, l, d);
+                _addLock(
+                    bal, 
+                    _amount, 
+                    cCounter, 
+                    l, 
+                    t, 
+                    k
+                );
+
+                lockCounter++;
+
                 // Halt execution and output `lockID`.
-                return lockID;
+                return cCounter;
+
             } else {
                 uint256 userCredit = userRecord[
                     _castAddrToKey(msg.sender)
                 ];
+
                 uint256 spendLimit;
-                (spendLimit) = _limiter(userCredit / WAD);
+                (spendLimit) = 
+                    _limiter(userCredit / WAD);
 
                 if (
                     l.amount > (spendLimit * WAD) ||
                     l.amount > 1e6 ether
                 ) revert AmountNotAllowed();
 
-                _addLock(lockID, l, d);
+                _addLock(
+                    bal, 
+                    _amount, 
+                    cCounter, 
+                    l, 
+                    t, 
+                    k
+                );
+
+                lockCounter++;
+
                 // Halt execution and output `lockID`.
-                return lockID;
+                return cCounter;
             }
         }
     }
@@ -235,10 +332,10 @@ contract P2PIX is
     ///  In case of they differing:
     /// - `lock` caller gets accrued with `l.amount` as userRecord credit;
     /// - `release` caller gets accrued with `l.relayerPremium` as userRecord credit;
-    /// @param _relayerTarget Target address entitled to the `relayerPremim`.
+    /// @param _relayerTarget Target address entitled to the `relayerPremium`.
     /// @dev Function sighash: 0x4e1389ed.
     function release(
-        bytes32 lockID,
+        uint256 lockID,
         address _relayerTarget,
         bytes32 pixTimestamp,
         bytes32 r,
@@ -251,10 +348,9 @@ contract P2PIX is
         if (l.expirationBlock < block.number)
             revert LockExpired();
 
-        DT.Deposit storage d = mapDeposits[l.depositID];
         bytes32 message = keccak256(
             abi.encodePacked(
-                d.pixTarget,
+                l.pixTarget,
                 l.amount,
                 pixTimestamp
             )
@@ -276,25 +372,28 @@ contract P2PIX is
         if (!validBacenSigners[signer])
             revert InvalidSigner();
 
-        ERC20 t = ERC20(d.token);
+        ERC20 t = ERC20(l.token);
 
         // We cache values before zeroing them out.
-        uint256 lockAmount = l.amount;
-        uint256 totalAmount = (lockAmount - l.relayerPremium);
+        uint256 lockAmount = 
+            l.amount;
+        uint256 totalAmount = 
+            (lockAmount - l.relayerPremium);
 
         l.amount = 0;
         l.expirationBlock = 0;
         usedTransactions[message] = true;
 
         if (msg.sender != l.relayerAddress) {
-            userRecord[_castAddrToKey(msg.sender)] += l
-                .relayerPremium;
+            userRecord[
+                _castAddrToKey(msg.sender)
+            ] += l.relayerPremium;
             userRecord[
                 _castAddrToKey(l.relayerAddress)
             ] += lockAmount;
         } else {
-            userRecord[_castAddrToKey(msg.sender)] += (l
-                .relayerPremium + lockAmount);
+            userRecord[_castAddrToKey(msg.sender)] 
+            += (l.relayerPremium + lockAmount);
         }
 
         SafeTransferLib.safeTransfer(
@@ -325,7 +424,11 @@ contract P2PIX is
             }
         }
 
-        emit LockReleased(l.buyerAddress, lockID, lockAmount);
+        emit LockReleased(
+            l.buyerAddress, 
+            lockID, 
+            lockAmount
+        );
     }
 
     /// @notice Unlocks expired locks.
@@ -334,32 +437,49 @@ contract P2PIX is
     /// @dev For each successfull unexpired lock recovered,
     /// `userRecord[_castAddrToKey(l.relayerAddress)]` is decreased by half of its value.
     /// @dev Function sighash: 0x8e2749d6.
-    function unlockExpired(bytes32[] calldata lockIDs)
+    function unlockExpired(uint256[] calldata lockIDs)
         public
     {
         uint256 i;
         uint256 locksSize = lockIDs.length;
 
         for (i; i < locksSize; ) {
-            DT.Lock storage l = mapLocks[lockIDs[i]];
+            DT.Lock storage l = 
+                mapLocks[lockIDs[i]];
 
             _notExpired(l);
 
-            mapDeposits[l.depositID].remaining += l.amount;
+            uint256 _sellerBalance = 
+                sellerBalance[
+                    l.sellerKey][ERC20(l.token)
+                ] & BITMASK_SB_ENTRY;
+            
+            if (
+                (_sellerBalance + l.amount) 
+                > 1e8 ether
+            )
+                revert MaxBalExceeded();
+
+            sellerBalance[
+                l.sellerKey][ERC20(l.token)
+            ] += l.amount;
+
             l.amount = 0;
 
-            uint256 userKey = _castAddrToKey(
-                l.relayerAddress
-            );
-            uint256 _newUserRecord = (userRecord[userKey] >>
-                1);
+            uint256 userKey = 
+            _castAddrToKey(l.relayerAddress);
+            uint256 _newUserRecord = 
+                (userRecord[userKey] >> 1);
 
             if (_newUserRecord <= 1e2 ether) {
                 userRecord[userKey] = 1e2 ether;
             } else {
                 userRecord[userKey] = _newUserRecord;
             }
-            emit LockReturned(l.buyerAddress, lockIDs[i]);
+            emit LockReturned(
+                l.buyerAddress, 
+                lockIDs[i]
+            );
 
             unchecked {
                 ++i;
@@ -380,28 +500,43 @@ contract P2PIX is
     /// tokens from expired deposits.
     /// @dev Function sighash: 0x36317972.
     function withdraw(
-        uint256 depositID,
-        bytes32[] calldata expiredLocks
-    ) public nonReentrant {
-        _onlySeller(depositID);
+        ERC20 token,
+        uint256 amount,
+        uint256[] calldata expiredLocks
+    )
+        public
+        nonReentrant
+    {
         unlockExpired(expiredLocks);
 
-        DT.Deposit storage d = mapDeposits[depositID];
-
-        if (d.valid == true) {
-            cancelDeposit(depositID);
+        if (getValid(msg.sender, token) 
+            == true
+        ) {
+            setValidState(token, false);
         }
 
-        ERC20 token = ERC20(d.token);
-
-        // Withdraw remaining tokens from mapDeposit[depositID]
-        uint256 amount = d.remaining;
-        d.remaining = 0;
+        uint256 key = 
+            _castAddrToKey(msg.sender);
+        _decBal(
+            (sellerBalance[key][token] 
+                & BITMASK_SB_ENTRY),
+            amount,
+            token,
+            key
+        );
 
         // safeTransfer tokens to seller
-        SafeTransferLib.safeTransfer(token, d.seller, amount);
+        SafeTransferLib.safeTransfer(
+            token,
+            msg.sender,
+            amount
+        );
 
-        emit DepositWithdrawn(msg.sender, depositID, amount);
+        emit DepositWithdrawn(
+            msg.sender,
+            address(token),
+            amount
+        );
     }
 
     function setRoot(address addr, bytes32 merkleroot)
@@ -484,7 +619,7 @@ contract P2PIX is
             let tLoc := add(_tokens, 0x20)
             let sLoc := add(_states, 0x20)
             for {
-                let end := add(tLoc, mul(tLen, 0x20))
+                let end := add(tLoc, shl(5, tLen))
             } iszero(eq(tLoc, end)) {
                 tLoc := add(tLoc, 0x20)
                 sLoc := add(sLoc, 0x20)
@@ -511,14 +646,6 @@ contract P2PIX is
     // solhint-disable-next-line no-empty-blocks
     receive() external payable {}
 
-    /// @notice Access control private view method that
-    /// performs auth check on an deposit's seller.
-    /// @dev Function sighash: 0x4125a4d9.
-    function _onlySeller(uint256 _depositID) private view {
-        if (mapDeposits[_depositID].seller != msg.sender)
-            revert OnlySeller();
-    }
-
     /// @notice Private view auxiliar logic that reverts
     /// on a not expired lock passed as argument of the function.
     /// @dev Called exclusively by the `unlockExpired` method.
@@ -529,55 +656,26 @@ contract P2PIX is
         if (_l.amount == 0) revert AlreadyReleased();
     }
 
-    /// @notice Internal view auxiliar logic that returns a new valid `_depositID`.
-    /// @dev It reverts on an already valid counter (`uint256`) value.
-    /// @dev Function sighash: 0xdb51d697.
-    function _encodeDepositID()
-        internal
-        view
-        returns (uint256 _depositID)
-    {
-        (_depositID) = depositCount.current();
-    }
-
     function _addLock(
-        bytes32 _lockID,
+        uint256 _bal,
+        uint256 _amount,
+        uint256 _lockID,
         DT.Lock memory _l,
-        DT.Deposit storage _d
+        ERC20 _t,
+        uint256 _k
     ) internal {
         mapLocks[_lockID] = _l;
-        _d.remaining -= _l.amount;
+
+        _decBal(_bal, _amount, _t, _k);
 
         emit LockAdded(
             _l.buyerAddress,
             _lockID,
-            _l.depositID,
+            _l.sellerKey,
             _l.amount
         );
     }
 
-    /// @notice Private view auxiliar logic that encodes/returns
-    /// the `bytes32` identifier of an lock.
-    /// @dev reverts on a not expired lock with the same ID passed
-    /// as argument of the function.
-    /// @dev Called exclusively by the `lock` method.
-    /// @dev Function sighash: 0x3fc5fb52.
-    function _encodeLockID(
-        uint256 _depositID,
-        uint256 _amount,
-        address _buyerAddress
-    ) private view returns (bytes32 _lockID) {
-        _lockID = keccak256(
-            abi.encodePacked(
-                _depositID,
-                _amount,
-                _buyerAddress
-            )
-        );
-        if (mapLocks[_lockID].expirationBlock >= block.number)
-            revert NotExpired();
-    }
-
     function merkleVerify(
         bytes32[] calldata _merkleProof,
         bytes32 root,
@@ -633,6 +731,147 @@ contract P2PIX is
         }
     }
 
+    function _castToUint(
+        uint96 _amount,
+        uint160 _pixTarget,
+        bool _valid
+    )
+        private
+        pure
+        returns (
+            uint256 _amountCasted,
+            uint256 _pixTargetCasted,
+            uint256 _validCasted
+        )
+    {
+        assembly {
+            _amountCasted := _amount
+            _pixTargetCasted := _pixTarget
+            _validCasted := _valid
+        }
+    }
+
+    function _decBal(
+        uint256 _bal,
+        uint256 _amount,
+        ERC20 _t,
+        uint256 _k
+    ) private {
+        assembly {
+            if iszero(
+                iszero(
+                    or(
+                        iszero(_bal),
+                        lt(sub(_bal, _amount), 0x0)
+                    )
+                )
+            ) {
+                // DecOverflow()
+                mstore(0x00, 0xce3a3d37)
+                revert(0x1c, 0x04)
+            }
+        }
+
+        // we can directly dec from packed uint entry value
+        sellerBalance[_k][_t] -= _amount;
+    }
+
+    function getBalance(address seller, ERC20 token)
+        public
+        view
+        returns (uint256 bal)
+    {
+        // bal =
+        // sellerBalance[_castAddrToKey(seller)][token] &
+        // BITMASK_SB_ENTRY;
+        assembly {
+            for {/*  */} iszero(0x0) {/*  */} {
+            mstore(0x00, shl(0xC,seller))
+            mstore(0x20, sellerBalance.slot)
+            let sbkslot := keccak256(0x00, 0x40)
+            mstore(0x00, token)
+            mstore(0x20, sbkslot)
+            bal := and(
+                BITMASK_SB_ENTRY,
+                sload(keccak256(0x00,0x40)
+                )) break
+            }}
+    }
+
+    function getValid(address seller, ERC20 token)
+        public
+        view
+        returns (bool valid)
+    {
+        // uint256 b = sellerBalance[
+        // _castAddrToKey(seller)
+        // ][token];
+        // ] >> BITPOS_VALID) & BITMASK_SB_ENTRY;
+        assembly {
+            for {/*  */} iszero(0x0) {/*  */} {
+            mstore(0x00, shl(0xC,seller))
+            mstore(0x20, sellerBalance.slot)
+            let sbkslot := keccak256(0x00, 0x40)
+            mstore(0x00, token)
+            mstore(0x20, sbkslot)
+            valid := and(
+                BITMASK_SB_ENTRY, 
+                shr(
+                    BITPOS_VALID,
+                    sload(keccak256(0x00,0x40)
+                ))) break
+            }}
+    }
+
+    function getPixTarget(address seller, ERC20 token)
+        public
+        view
+        returns (uint160 pixTarget)
+    {
+        // pixTarget = uint160(
+        // sellerBalance[_castAddrToKey(seller)][token] >>
+        // BITPOS_PIXTARGET
+        // );
+        assembly {
+            for {/*  */} iszero(0) {/*  */} {
+            mstore(0,shl(12,seller))
+            mstore(32,sellerBalance.slot)
+            let sbkslot := keccak256(0,64)
+            mstore(0,token)
+            mstore(32,sbkslot)
+            pixTarget := shr(
+                BITPOS_PIXTARGET,
+                sload(keccak256(0,64)
+                )) break
+            }}
+    }
+
+    function getBalances(
+        address[] memory sellers, 
+        ERC20 token
+    ) 
+        external 
+        view 
+        returns(uint256[] memory) 
+    {
+        uint256 j;
+        uint256 len = 
+            sellers.length;
+        uint256[] memory balances = 
+            new uint256[](len);
+        while (j < len) {
+            uint256 bal = 
+                getBalance(
+                    sellers[j], 
+                    token
+                );
+            balances[j] = bal;
+            unchecked { ++j; }
+        }
+
+        return balances;
+    }
+
     /// @notice Public method that handles `address`
     /// to `uint256` safe type casting.
     /// @dev Function sighash: 0x4b2ae980.
@@ -641,6 +880,20 @@ contract P2PIX is
         pure
         returns (uint256 _key)
     {
-        _key = uint256(uint160(address(_addr))) << 12;
+        // _key = uint256(uint160(address(_addr))) << 12;
+        assembly {
+            _key := shl(12,_addr)
+        }
+    }
+
+    function _castKeyToAddr(uint256 _key)
+        public
+        pure
+        returns (address _addr)
+    {
+        // _addr = address(uint160(uint256(_key >> 12)));
+        assembly {
+            _addr := shr(12,_key)
+        }
     }
 }
diff --git a/deploys/goerli.json b/deploys/goerli.json
index 53cafaa..3857f9e 100644
--- a/deploys/goerli.json
+++ b/deploys/goerli.json
@@ -3,6 +3,6 @@
     "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
   ],
-  "p2pix": "0x5f3EFA9A90532914545CEf527C530658af87e196",
-  "token": "0x294003F602c321627152c6b7DED3EAb5bEa853Ee"
+  "p2pix": "0xefa5cE4351cda51192509cf8De7d8881ADAE95DD",
+  "token": "0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00"
 }
\ No newline at end of file
diff --git a/deploys/localhost.json b/deploys/localhost.json
index ad0c84f..9cd9d57 100644
--- a/deploys/localhost.json
+++ b/deploys/localhost.json
@@ -3,6 +3,6 @@
     "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
   ],
-  "p2pix": "0x37c856F4d5bC2597da60f607b1335738468453F3",
-  "token": "0x294003F602c321627152c6b7DED3EAb5bEa853Ee"
-}
+  "p2pix": "0xC86042E9F2977C62Da8c9dDF7F9c40fde4796A29",
+  "token": "0xD38D6367f452D097ccBfDe4490b7de570B6A72Db"
+}
\ No newline at end of file
diff --git a/deploys/polygon-mumbai.json b/deploys/polygon-mumbai.json
index 53cafaa..6ea7d2a 100644
--- a/deploys/polygon-mumbai.json
+++ b/deploys/polygon-mumbai.json
@@ -3,6 +3,6 @@
     "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
   ],
-  "p2pix": "0x5f3EFA9A90532914545CEf527C530658af87e196",
-  "token": "0x294003F602c321627152c6b7DED3EAb5bEa853Ee"
+  "p2pix": "0xA9258eBb157E4cf5e756b77FDD0DF09C2F73240b",
+  "token": "0xC86042E9F2977C62Da8c9dDF7F9c40fde4796A29"
 }
\ No newline at end of file
diff --git a/docs/callgraph.svg b/docs/callgraph.svg
index c79b893..281b7c0 100644
--- a/docs/callgraph.svg
+++ b/docs/callgraph.svg
@@ -1,776 +1,957 @@
 <?xml version="1.0" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="805pt" height="1835pt" viewBox="0.00 0.00 804.77 1835.00">
-<g id="graph0" class="graph" transform="translate(15.089466784527986,1733.566952255226) scale(0.9291606742509133)" data-name="G">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="841pt" height="1998pt" viewBox="0.00 0.00 841.22 1998.00">
+<g id="graph0" class="graph" transform="translate(4,1994) scale(1)" data-name="G">
 
-<polygon fill="#2e3e56" stroke="none" points="-4,4 -4,-1831 800.77,-1831 800.77,4 -4,4" style=""/>
+<polygon fill="#2e3e56" stroke="none" points="-4,4 -4,-1994 837.22,-1994 837.22,4 -4,4" style=""/>
 <g id="clust1" class="cluster" data-name="clusterP2PIX">
 
-<path fill="#445773" stroke="#445773" d="M20,-425C20,-425 776.77,-425 776.77,-425 782.77,-425 788.77,-431 788.77,-437 788.77,-437 788.77,-1670 788.77,-1670 788.77,-1676 782.77,-1682 776.77,-1682 776.77,-1682 20,-1682 20,-1682 14,-1682 8,-1676 8,-1670 8,-1670 8,-437 8,-437 8,-431 14,-425 20,-425" style=""/>
-<text text-anchor="middle" x="398.38" y="-1665.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">P2PIX</text>
+<path fill="#445773" stroke="#445773" d="M20,-286C20,-286 813.22,-286 813.22,-286 819.22,-286 825.22,-292 825.22,-298 825.22,-298 825.22,-1833 825.22,-1833 825.22,-1839 819.22,-1845 813.22,-1845 813.22,-1845 20,-1845 20,-1845 14,-1845 8,-1839 8,-1833 8,-1833 8,-298 8,-298 8,-292 14,-286 20,-286" style=""/>
+<text text-anchor="middle" x="416.61" y="-1828.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">P2PIX</text>
 </g>
-<g id="clust2" class="cluster" data-name="clusterDT">
+<g id="clust2" class="cluster" data-name="clusterSafeTransferLib">
 
-<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M270.03,-142C270.03,-142 344.19,-142 344.19,-142 350.19,-142 356.19,-148 356.19,-154 356.19,-154 356.19,-261 356.19,-261 356.19,-267 350.19,-273 344.19,-273 344.19,-273 270.03,-273 270.03,-273 264.03,-273 258.03,-267 258.03,-261 258.03,-261 258.03,-154 258.03,-154 258.03,-148 264.03,-142 270.03,-142" style=""/>
-<text text-anchor="middle" x="307.11" y="-256.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">DT</text>
+<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M456.84,-8C456.84,-8 609.27,-8 609.27,-8 615.27,-8 621.27,-14 621.27,-20 621.27,-20 621.27,-181 621.27,-181 621.27,-187 615.27,-193 609.27,-193 609.27,-193 456.84,-193 456.84,-193 450.84,-193 444.84,-187 444.84,-181 444.84,-181 444.84,-20 444.84,-20 444.84,-14 450.84,-8 456.84,-8" style=""/>
+<text text-anchor="middle" x="533.05" y="-176.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">SafeTransferLib</text>
 </g>
-<g id="clust3" class="cluster" data-name="clusterCounters.Counter">
+<g id="clust3" class="cluster" data-name="clusterDT">
 
-<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M491.15,-8C491.15,-8 582.44,-8 582.44,-8 588.44,-8 594.44,-14 594.44,-20 594.44,-20 594.44,-127 594.44,-127 594.44,-133 588.44,-139 582.44,-139 582.44,-139 491.15,-139 491.15,-139 485.15,-139 479.15,-133 479.15,-127 479.15,-127 479.15,-20 479.15,-20 479.15,-14 485.15,-8 491.15,-8" style=""/>
-<text text-anchor="middle" x="536.8" y="-122.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">Counters.Counter</text>
+<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M278.1,-171C278.1,-171 331.86,-171 331.86,-171 337.86,-171 343.86,-177 343.86,-183 343.86,-183 343.86,-236 343.86,-236 343.86,-242 337.86,-248 331.86,-248 331.86,-248 278.1,-248 278.1,-248 272.1,-248 266.1,-242 266.1,-236 266.1,-236 266.1,-183 266.1,-183 266.1,-177 272.1,-171 278.1,-171" style=""/>
+<text text-anchor="middle" x="304.98" y="-231.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">DT</text>
 </g>
-<g id="clust4" class="cluster" data-name="clusterSafeTransferLib">
+<g id="clust4" class="cluster" data-name="clusterMerkle">
 
-<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M460.58,-147C460.58,-147 613.01,-147 613.01,-147 619.01,-147 625.01,-153 625.01,-159 625.01,-159 625.01,-320 625.01,-320 625.01,-326 619.01,-332 613.01,-332 613.01,-332 460.58,-332 460.58,-332 454.58,-332 448.58,-326 448.58,-320 448.58,-320 448.58,-159 448.58,-159 448.58,-153 454.58,-147 460.58,-147" style=""/>
-<text text-anchor="middle" x="536.8" y="-315.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">SafeTransferLib</text>
+<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M502.96,-201C502.96,-201 563.15,-201 563.15,-201 569.15,-201 575.15,-207 575.15,-213 575.15,-213 575.15,-266 575.15,-266 575.15,-272 569.15,-278 563.15,-278 563.15,-278 502.96,-278 502.96,-278 496.96,-278 490.96,-272 490.96,-266 490.96,-266 490.96,-213 490.96,-213 490.96,-207 496.96,-201 502.96,-201" style=""/>
+<text text-anchor="middle" x="533.05" y="-261.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">Merkle</text>
 </g>
-<g id="clust5" class="cluster" data-name="clusterMerkle">
+<g id="clust5" class="cluster" data-name="cluster_01">
 
-<path fill="#3b4b63" stroke="#e8726d" stroke-dasharray="5,2" d="M506.7,-340C506.7,-340 566.89,-340 566.89,-340 572.89,-340 578.89,-346 578.89,-352 578.89,-352 578.89,-405 578.89,-405 578.89,-411 572.89,-417 566.89,-417 566.89,-417 506.7,-417 506.7,-417 500.7,-417 494.7,-411 494.7,-405 494.7,-405 494.7,-352 494.7,-352 494.7,-346 500.7,-340 506.7,-340" style=""/>
-<text text-anchor="middle" x="536.8" y="-400.4" font-family="Times,serif" font-size="14.00" fill="#f0f0f0" style="">Merkle</text>
-</g>
-<g id="clust6" class="cluster" data-name="cluster_01">
-
-<polygon fill="#2e3e56" stroke="black" points="21.61,-1690 21.61,-1819 342.11,-1819 342.11,-1690 21.61,-1690" style=""/>
-<text text-anchor="middle" x="181.86" y="-1802.4" font-family="Times,serif" font-size="14.00" style="">Legend</text>
+<polygon fill="#2e3e56" stroke="black" points="20.54,-1853 20.54,-1982 339.98,-1982 339.98,-1853 20.54,-1853" style=""/>
+<text text-anchor="middle" x="180.26" y="-1965.4" font-family="Times,serif" font-size="14.00" style="">Legend</text>
 </g>
 <!-- P2PIX.&lt;Constructor&gt; -->
 <g id="node1" class="node" pointer-events="visible" data-name="P2PIX.&lt;Constructor&gt;">
 
-<ellipse fill="#ff9797" stroke="brown" stroke-width="3" cx="94.61" cy="-1550" rx="67.55" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-1545.8" font-family="Times,serif" font-size="14.00" style="">&lt;Constructor&gt;</text>
+<ellipse fill="#ff9797" stroke="brown" stroke-width="3" cx="93.54" cy="-1713" rx="67.55" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-1708.8" font-family="Times,serif" font-size="14.00" style="">&lt;Constructor&gt;</text>
 </g>
 <!-- P2PIX.setReputation -->
 <g id="node10" class="node" pointer-events="visible" data-name="P2PIX.setReputation">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1577" rx="64.28" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1572.8" font-family="Times,serif" font-size="14.00" style="">setReputation</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1578" rx="64.28" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1573.8" font-family="Times,serif" font-size="14.00" style="">setReputation</text>
 </g>
 <!-- P2PIX.&lt;Constructor&gt;&#45;&gt;P2PIX.setReputation -->
 <g id="edge2" class="edge" data-name="P2PIX.&lt;Constructor&gt;-&gt;P2PIX.setReputation">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M157.63,-1557.95C181.59,-1561.03 209.16,-1564.57 234,-1567.75" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="233.34,-1571.19 243.7,-1569 234.23,-1564.25 233.34,-1571.19" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M109.19,-1694.04C128.87,-1669.85 166.15,-1628.34 207.08,-1605 216.35,-1599.71 226.71,-1595.41 237.12,-1591.93" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="237.86,-1595.36 246.4,-1589.09 235.81,-1588.67 237.86,-1595.36" style=""/>
 </g>
 <!-- P2PIX.setDefaultLockBlocks -->
 <g id="node11" class="node" pointer-events="visible" data-name="P2PIX.setDefaultLockBlocks">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1631" rx="97.28" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1626.8" font-family="Times,serif" font-size="14.00" style="">setDefaultLockBlocks</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1740" rx="97.28" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1735.8" font-family="Times,serif" font-size="14.00" style="">setDefaultLockBlocks</text>
 </g>
 <!-- P2PIX.&lt;Constructor&gt;&#45;&gt;P2PIX.setDefaultLockBlocks -->
 <g id="edge1" class="edge" data-name="P2PIX.&lt;Constructor&gt;-&gt;P2PIX.setDefaultLockBlocks">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M127.29,-1566.87C149.73,-1578.36 180.78,-1593.37 209.21,-1604 216.87,-1606.86 224.97,-1609.58 233.09,-1612.11" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="231.89,-1615.41 242.48,-1614.93 233.91,-1608.7 231.89,-1615.41" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M156.25,-1720.95C172.93,-1723.11 191.38,-1725.48 209.42,-1727.81" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="208.77,-1731.25 219.13,-1729.06 209.66,-1724.31 208.77,-1731.25" style=""/>
 </g>
 <!-- P2PIX.setValidSigners -->
 <g id="node12" class="node" pointer-events="visible" data-name="P2PIX.setValidSigners">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1469" rx="72.38" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1464.8" font-family="Times,serif" font-size="14.00" style="">setValidSigners</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1686" rx="72.38" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1681.8" font-family="Times,serif" font-size="14.00" style="">setValidSigners</text>
 </g>
 <!-- P2PIX.&lt;Constructor&gt;&#45;&gt;P2PIX.setValidSigners -->
 <g id="edge3" class="edge" data-name="P2PIX.&lt;Constructor&gt;-&gt;P2PIX.setValidSigners">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M127.29,-1533.13C149.73,-1521.64 180.78,-1506.63 209.21,-1496 219.21,-1492.26 229.95,-1488.77 240.51,-1485.62" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="241.23,-1489.06 249.87,-1482.93 239.29,-1482.33 241.23,-1489.06" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M156.25,-1705.05C178.03,-1702.24 202.83,-1699.04 225.8,-1696.08" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="226.24,-1699.55 235.71,-1694.8 225.34,-1692.61 226.24,-1699.55" style=""/>
 </g>
 <!-- P2PIX.tokenSettings -->
 <g id="node13" class="node" pointer-events="visible" data-name="P2PIX.tokenSettings">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1523" rx="63.72" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1518.8" font-family="Times,serif" font-size="14.00" style="">tokenSettings</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1794" rx="63.72" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1789.8" font-family="Times,serif" font-size="14.00" style="">tokenSettings</text>
 </g>
 <!-- P2PIX.&lt;Constructor&gt;&#45;&gt;P2PIX.tokenSettings -->
 <g id="edge4" class="edge" data-name="P2PIX.&lt;Constructor&gt;-&gt;P2PIX.tokenSettings">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M157.63,-1542.05C181.69,-1538.96 209.4,-1535.4 234.32,-1532.21" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="234.59,-1535.7 244.06,-1530.96 233.7,-1528.76 234.59,-1535.7" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M126.39,-1730.14C148.57,-1741.61 179.09,-1756.48 207.08,-1767 218.13,-1771.15 230.09,-1774.99 241.72,-1778.4" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="240.66,-1781.73 251.23,-1781.09 242.57,-1775 240.66,-1781.73" style=""/>
 </g>
 <!-- P2PIX.deposit -->
 <g id="node2" class="node" pointer-events="visible" data-name="P2PIX.deposit">
 
-<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="94.61" cy="-613" rx="38.86" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-608.8" font-family="Times,serif" font-size="14.00" style="">deposit</text>
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="93.54" cy="-1315" rx="38.86" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-1310.8" font-family="Times,serif" font-size="14.00" style="">deposit</text>
 </g>
 <!-- P2PIX.setRoot -->
 <g id="node8" class="node" pointer-events="visible" data-name="P2PIX.setRoot">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-869" rx="40.59" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-864.8" font-family="Times,serif" font-size="14.00" style="">setRoot</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1632" rx="40.59" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1627.8" font-family="Times,serif" font-size="14.00" style="">setRoot</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.setRoot -->
-<g id="edge10" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.setRoot">
+<g id="edge11" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.setRoot">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M101.45,-631.93C114.63,-671.86 150.22,-765.67 209.21,-822 223.54,-835.68 242.6,-846.08 260.02,-853.58" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="258.65,-856.8 269.23,-857.29 261.26,-850.31 258.65,-856.8" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M96.19,-1334.18C101.68,-1385.96 124.04,-1529.75 207.08,-1605 219.23,-1616.01 235.51,-1622.58 251.24,-1626.48" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="250.19,-1629.83 260.7,-1628.45 251.62,-1622.98 250.19,-1629.83" style=""/>
 </g>
-<!-- P2PIX._encodeDepositID -->
-<g id="node17" class="node" pointer-events="visible" data-name="P2PIX._encodeDepositID">
+<!-- P2PIX._castToUint -->
+<g id="node19" class="node" pointer-events="visible" data-name="P2PIX._castToUint">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-505" rx="83.38" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-500.8" font-family="Times,serif" font-size="14.00" style="">_encodeDepositID</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1524" rx="58.55" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1519.8" font-family="Times,serif" font-size="14.00" style="">_castToUint</text>
 </g>
-<!-- P2PIX.deposit&#45;&gt;P2PIX._encodeDepositID -->
-<g id="edge7" class="edge" data-name="P2PIX.deposit-&gt;P2PIX._encodeDepositID">
+<!-- P2PIX.deposit&#45;&gt;P2PIX._castToUint -->
+<g id="edge12" class="edge" data-name="P2PIX.deposit-&gt;P2PIX._castToUint">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M114.4,-596.43C135.93,-578.24 172.93,-549.33 209.21,-532 216.84,-528.36 225.04,-525.13 233.33,-522.29" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="234.14,-525.7 242.6,-519.32 232.01,-519.04 234.14,-525.7" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M100.9,-1333.95C114.36,-1371.09 149.31,-1453.6 207.08,-1497 216.11,-1503.78 226.76,-1508.86 237.64,-1512.67" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="236.46,-1515.96 247.04,-1515.55 238.51,-1509.27 236.46,-1515.96" style=""/>
+</g>
+<!-- P2PIX._castAddrToKey -->
+<g id="node25" class="node" pointer-events="visible" data-name="P2PIX._castAddrToKey">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-980" rx="77.58" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-975.8" font-family="Times,serif" font-size="14.00" style="">_castAddrToKey</text>
+</g>
+<!-- P2PIX.deposit&#45;&gt;P2PIX._castAddrToKey -->
+<g id="edge6" class="edge" data-name="P2PIX.deposit-&gt;P2PIX._castAddrToKey">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M104.52,-1296.43C121.42,-1266.95 158.6,-1209.94 207.08,-1182 283.68,-1137.87 338.08,-1207.13 402.88,-1147 449.97,-1103.3 394.14,-1053.11 438.88,-1007 443.38,-1002.36 448.63,-998.5 454.29,-995.3" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="455.36,-998.67 462.89,-991.21 452.36,-992.35 455.36,-998.67" style=""/>
 </g>
 <!-- P2PIX.ERC20 -->
-<g id="node22" class="node" pointer-events="visible" data-name="P2PIX.ERC20">
+<g id="node27" class="node" pointer-events="visible" data-name="P2PIX.ERC20">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-748" rx="39.45" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-743.8" font-family="Times,serif" font-size="14.00" style="">ERC20</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1142" rx="39.45" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1137.8" font-family="Times,serif" font-size="14.00" style="">ERC20</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.ERC20 -->
 <g id="edge5" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.ERC20">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M113.15,-630.04C134.11,-649.24 171.14,-679.64 209.21,-694 291.06,-724.86 318.92,-698.51 405.01,-714 433.52,-719.13 464.95,-727.22 489.86,-734.22" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="488.75,-737.55 499.33,-736.93 490.68,-730.82 488.75,-737.55" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M107.41,-1296.82C126.17,-1271.88 163.59,-1227.79 207.08,-1207 286.23,-1169.17 317.6,-1202.58 402.88,-1182 419.41,-1178.01 422.7,-1174.26 438.88,-1169 453.74,-1164.17 470.08,-1159.29 484.86,-1155.04" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="485.8,-1158.41 494.47,-1152.3 483.89,-1151.67 485.8,-1158.41" style=""/>
+</g>
+<!-- P2PIX.EmptyPixTarget -->
+<g id="node28" class="node" pointer-events="visible" data-name="P2PIX.EmptyPixTarget">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1234" rx="74.74" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1229.8" font-family="Times,serif" font-size="14.00" style="">EmptyPixTarget</text>
+</g>
+<!-- P2PIX.deposit&#45;&gt;P2PIX.EmptyPixTarget -->
+<g id="edge7" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.EmptyPixTarget">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M120.8,-1300.78C143.25,-1289.01 176.65,-1272.44 207.08,-1261 216.73,-1257.37 227.08,-1253.99 237.29,-1250.92" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="238.09,-1254.33 246.72,-1248.18 236.14,-1247.61 238.09,-1254.33" style=""/>
 </g>
 <!-- P2PIX.TokenDenied -->
-<g id="node23" class="node" pointer-events="visible" data-name="P2PIX.TokenDenied">
+<g id="node29" class="node" pointer-events="visible" data-name="P2PIX.TokenDenied">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-559" rx="63.69" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-554.8" font-family="Times,serif" font-size="14.00" style="">TokenDenied</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1288" rx="63.69" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1283.8" font-family="Times,serif" font-size="14.00" style="">TokenDenied</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.TokenDenied -->
-<g id="edge6" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.TokenDenied">
+<g id="edge8" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.TokenDenied">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M130.37,-604.08C161.53,-596.09 207.94,-584.18 245.25,-574.61" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="245.77,-578.09 254.58,-572.22 244.03,-571.31 245.77,-578.09" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M132.47,-1310.11C160.27,-1306.53 198.86,-1301.55 232.39,-1297.23" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="232.49,-1300.75 241.96,-1296 231.59,-1293.8 232.49,-1300.75" style=""/>
+</g>
+<!-- P2PIX.MaxBalExceeded -->
+<g id="node30" class="node" pointer-events="visible" data-name="P2PIX.MaxBalExceeded">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1352" rx="79.85" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1347.8" font-family="Times,serif" font-size="14.00" style="">MaxBalExceeded</text>
+</g>
+<!-- P2PIX.deposit&#45;&gt;P2PIX.MaxBalExceeded -->
+<g id="edge9" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.MaxBalExceeded">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M118.4,-1330.36C140.42,-1343.56 174.54,-1361.6 207.08,-1369 292.04,-1388.33 392.57,-1378.2 459.08,-1367.09" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="459.68,-1370.54 468.93,-1365.38 458.48,-1363.64 459.68,-1370.54" style=""/>
 </g>
 <!-- P2PIX.setReentrancyGuard -->
-<g id="node24" class="node" pointer-events="visible" data-name="P2PIX.setReentrancyGuard">
+<g id="node31" class="node" pointer-events="visible" data-name="P2PIX.setReentrancyGuard">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-667" rx="89.73" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-662.8" font-family="Times,serif" font-size="14.00" style="">setReentrancyGuard</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1342" rx="89.73" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1337.8" font-family="Times,serif" font-size="14.00" style="">setReentrancyGuard</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.setReentrancyGuard -->
-<g id="edge9" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.setReentrancyGuard">
+<g id="edge10" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.setReentrancyGuard">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M130.37,-621.92C158.99,-629.26 200.48,-639.9 235.96,-649.01" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="234.74,-652.31 245.3,-651.4 236.48,-645.53 234.74,-652.31" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M132.47,-1319.89C155.37,-1322.84 185.58,-1326.74 214.26,-1330.43" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="213.49,-1333.86 223.86,-1331.67 214.39,-1326.92 213.49,-1333.86" style=""/>
+</g>
+<!-- P2PIX.address -->
+<g id="node32" class="node" pointer-events="visible" data-name="P2PIX.address">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-582" rx="40" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-577.8" font-family="Times,serif" font-size="14.00" style="">address</text>
+</g>
+<!-- P2PIX.deposit&#45;&gt;P2PIX.address -->
+<g id="edge14" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M99.36,-1295.76C112.4,-1243.12 148.93,-1092.15 171.08,-965 181.7,-904.07 165.28,-734.59 207.08,-689 267.3,-623.34 325.02,-689.31 402.88,-646 422.93,-634.85 419.2,-620.81 438.88,-609 451.83,-601.22 467.15,-595.58 481.59,-591.53" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="482.21,-594.99 491.03,-589.12 480.47,-588.21 482.21,-594.99" style=""/>
 </g>
 <!-- P2PIX.clearReentrancyGuard -->
-<g id="node25" class="node" pointer-events="visible" data-name="P2PIX.clearReentrancyGuard">
+<g id="node33" class="node" pointer-events="visible" data-name="P2PIX.clearReentrancyGuard">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-741" rx="97.79" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-736.8" font-family="Times,serif" font-size="14.00" style="">clearReentrancyGuard</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1416" rx="97.79" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1411.8" font-family="Times,serif" font-size="14.00" style="">clearReentrancyGuard</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.clearReentrancyGuard -->
-<g id="edge13" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.clearReentrancyGuard">
+<g id="edge15" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.clearReentrancyGuard">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M111.76,-630.22C132.5,-651.43 170.46,-687.31 209.21,-709 217.29,-713.52 226.11,-717.53 235.03,-721.05" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="233.76,-724.31 244.35,-724.49 236.18,-717.74 233.76,-724.31" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M116.53,-1330.61C138.62,-1345.76 174.03,-1368.66 207.08,-1384 216.34,-1388.29 226.33,-1392.28 236.26,-1395.87" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="234.84,-1399.08 245.43,-1399.06 237.14,-1392.47 234.84,-1399.08" style=""/>
 </g>
 <!-- P2PIX.DepositAdded -->
-<g id="node26" class="node" pointer-events="visible" data-name="P2PIX.DepositAdded">
+<g id="node34" class="node" pointer-events="visible" data-name="P2PIX.DepositAdded">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-795" rx="66.65" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-790.8" font-family="Times,serif" font-size="14.00" style="">DepositAdded</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1470" rx="66.65" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1465.8" font-family="Times,serif" font-size="14.00" style="">DepositAdded</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;P2PIX.DepositAdded -->
-<g id="edge14" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.DepositAdded">
+<g id="edge16" class="edge" data-name="P2PIX.deposit-&gt;P2PIX.DepositAdded">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M104.22,-631.92C120.14,-664.74 157.35,-732.13 209.21,-768 217.15,-773.49 226.18,-777.87 235.46,-781.36" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="234.26,-784.65 244.86,-784.5 236.48,-778.01 234.26,-784.65" style=""/>
-</g>
-<!-- DT.Deposit -->
-<g id="node46" class="node" pointer-events="visible" data-name="DT.Deposit">
-
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-168" rx="41.16" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-163.8" font-family="Times,serif" font-size="14.00" style="">Deposit</text>
-</g>
-<!-- P2PIX.deposit&#45;&gt;DT.Deposit -->
-<g id="edge8" class="edge" data-name="P2PIX.deposit-&gt;DT.Deposit">
-
-<path fill="none" stroke="white" stroke-width="2" d="M117.45,-597.05C135.71,-582.37 160.73,-558.84 173.21,-532 204.97,-463.71 160.54,-252.47 209.21,-195 219.9,-182.38 235.94,-175.4 251.91,-171.62" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="252.44,-175.08 261.62,-169.79 251.14,-168.2 252.44,-175.08" style=""/>
-</g>
-<!-- Counters.Counter.increment -->
-<g id="node48" class="node" pointer-events="visible" data-name="Counters.Counter.increment">
-
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-34" rx="49.79" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-29.8" font-family="Times,serif" font-size="14.00" style="">increment</text>
-</g>
-<!-- P2PIX.deposit&#45;&gt;Counters.Counter.increment -->
-<g id="edge11" class="edge" data-name="P2PIX.deposit-&gt;Counters.Counter.increment">
-
-<path fill="none" stroke="white" stroke-width="2" d="M116.91,-596.78C134.83,-581.93 159.65,-558.31 173.21,-532 212.41,-456 153.03,-407.46 209.21,-343 269.55,-273.78 345.47,-346.91 405.01,-277 468.11,-202.9 376.16,-133.57 441.01,-61 449.73,-51.24 461.7,-44.9 474.21,-40.81" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="475.11,-44.19 483.86,-38.21 473.3,-37.43 475.11,-44.19" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M105.59,-1333.26C123.42,-1361.17 161.22,-1414.21 207.08,-1443 215.51,-1448.29 224.98,-1452.56 234.61,-1456.01" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="233.37,-1459.28 243.96,-1459.02 235.51,-1452.62 233.37,-1459.28" style=""/>
 </g>
 <!-- SafeTransferLib.safeTransferFrom -->
-<g id="node50" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransferFrom">
+<g id="node58" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransferFrom">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-227" rx="80.43" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-222.8" font-family="Times,serif" font-size="14.00" style="">safeTransferFrom</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-34" rx="80.43" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-29.8" font-family="Times,serif" font-size="14.00" style="">safeTransferFrom</text>
 </g>
 <!-- P2PIX.deposit&#45;&gt;SafeTransferLib.safeTransferFrom -->
-<g id="edge12" class="edge" data-name="P2PIX.deposit-&gt;SafeTransferLib.safeTransferFrom">
+<g id="edge13" class="edge" data-name="P2PIX.deposit-&gt;SafeTransferLib.safeTransferFrom">
 
-<path fill="none" stroke="white" stroke-width="2" d="M116.16,-596.86C133.85,-581.89 158.75,-558.05 173.21,-532 204.62,-475.46 163.26,-436.51 209.21,-391 272.87,-327.95 337.26,-401.63 405.01,-343 437.27,-315.08 409.27,-282.52 441.01,-254 445.82,-249.68 451.27,-246.05 457.08,-242.99" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="458.15,-246.34 465.83,-239.04 455.28,-239.96 458.15,-246.34" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M99.88,-1295.85C114.26,-1243.41 153.83,-1092.91 171.08,-965 181.2,-890.02 156.72,-341.46 207.08,-285 265.82,-219.14 339.88,-313.79 402.88,-252 464.55,-191.51 380.79,-124.94 438.88,-61 442.81,-56.68 447.38,-53.03 452.35,-49.95" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="453.79,-53.15 461.09,-45.47 450.59,-46.92 453.79,-53.15" style=""/>
 </g>
-<!-- P2PIX.cancelDeposit -->
-<g id="node3" class="node" pointer-events="visible" data-name="P2PIX.cancelDeposit">
+<!-- P2PIX.setValidState -->
+<g id="node3" class="node" pointer-events="visible" data-name="P2PIX.setValidState">
 
-<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="307.11" cy="-1017" rx="65.97" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1012.8" font-family="Times,serif" font-size="14.00" style="">cancelDeposit</text>
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="304.98" cy="-420" rx="62.56" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-415.8" font-family="Times,serif" font-size="14.00" style="">setValidState</text>
 </g>
-<!-- P2PIX._onlySeller -->
-<g id="node15" class="node" pointer-events="visible" data-name="P2PIX._onlySeller">
+<!-- P2PIX.setValidState&#45;&gt;P2PIX._castAddrToKey -->
+<g id="edge17" class="edge" data-name="P2PIX.setValidState-&gt;P2PIX._castAddrToKey">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-963" rx="55.62" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-958.8" font-family="Times,serif" font-size="14.00" style="">_onlySeller</text>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M366.61,-425.02C380.46,-429.07 393.76,-435.84 402.88,-447 474.2,-534.3 368,-865.34 438.88,-953 442.61,-957.62 447.08,-961.48 452.02,-964.7" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="450.32,-967.76 460.8,-969.36 453.6,-961.57 450.32,-967.76" style=""/>
 </g>
-<!-- P2PIX.cancelDeposit&#45;&gt;P2PIX._onlySeller -->
-<g id="edge15" class="edge" data-name="P2PIX.cancelDeposit-&gt;P2PIX._onlySeller">
+<!-- P2PIX.setValidState&#45;&gt;P2PIX.address -->
+<g id="edge19" class="edge" data-name="P2PIX.setValidState-&gt;P2PIX.address">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M359.49,-1004.81C394.46,-996.52 440.8,-985.53 477.2,-976.9" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="477.76,-980.36 486.68,-974.65 476.15,-973.55 477.76,-980.36" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M364.79,-426.71C378.66,-430.74 392.44,-437.07 402.88,-447 439.54,-481.87 402.4,-519.94 438.88,-555 450.07,-565.76 465.29,-572.27 480.17,-576.2" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="479.03,-579.53 489.55,-578.27 480.54,-572.7 479.03,-579.53" style=""/>
 </g>
-<!-- P2PIX.DepositClosed -->
-<g id="node27" class="node" pointer-events="visible" data-name="P2PIX.DepositClosed">
+<!-- P2PIX.ValidSet -->
+<g id="node35" class="node" pointer-events="visible" data-name="P2PIX.ValidSet">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1017" rx="67.81" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1012.8" font-family="Times,serif" font-size="14.00" style="">DepositClosed</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-528" rx="44.66" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-523.8" font-family="Times,serif" font-size="14.00" style="">ValidSet</text>
 </g>
-<!-- P2PIX.cancelDeposit&#45;&gt;P2PIX.DepositClosed -->
-<g id="edge16" class="edge" data-name="P2PIX.cancelDeposit-&gt;P2PIX.DepositClosed">
+<!-- P2PIX.setValidState&#45;&gt;P2PIX.ValidSet -->
+<g id="edge18" class="edge" data-name="P2PIX.setValidState-&gt;P2PIX.ValidSet">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M374.58,-1017C399.73,-1017 428.64,-1017 454.97,-1017" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="454.64,-1020.5 464.64,-1017 454.64,-1013.5 454.64,-1020.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M362.34,-428.53C376.48,-432.52 391,-438.39 402.88,-447 426.23,-463.93 415.61,-483.95 438.88,-501 449.99,-509.15 463.53,-514.85 476.79,-518.83" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="475.86,-522.2 486.42,-521.37 477.64,-515.43 475.86,-522.2" style=""/>
+</g>
+<!-- P2PIX.NotInitialized -->
+<g id="node36" class="node" pointer-events="visible" data-name="P2PIX.NotInitialized">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-474" rx="64.84" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-469.8" font-family="Times,serif" font-size="14.00" style="">NotInitialized</text>
+</g>
+<!-- P2PIX.setValidState&#45;&gt;P2PIX.NotInitialized -->
+<g id="edge20" class="edge" data-name="P2PIX.setValidState-&gt;P2PIX.NotInitialized">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M355.59,-431.85C388.96,-439.82 433.23,-450.4 469.08,-458.96" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="467.9,-462.27 478.44,-461.19 469.53,-455.47 467.9,-462.27" style=""/>
 </g>
 <!-- P2PIX.lock -->
 <g id="node4" class="node" pointer-events="visible" data-name="P2PIX.lock">
 
-<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="94.61" cy="-1206" rx="27.83" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-1201.8" font-family="Times,serif" font-size="14.00" style="">lock</text>
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="93.54" cy="-938" rx="27.83" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-933.8" font-family="Times,serif" font-size="14.00" style="">lock</text>
 </g>
 <!-- P2PIX.unlockExpired -->
 <g id="node6" class="node" pointer-events="visible" data-name="P2PIX.unlockExpired">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1071" rx="67.78" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1066.8" font-family="Times,serif" font-size="14.00" style="">unlockExpired</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-790" rx="67.78" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-785.8" font-family="Times,serif" font-size="14.00" style="">unlockExpired</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX.unlockExpired -->
-<g id="edge17" class="edge" data-name="P2PIX.lock-&gt;P2PIX.unlockExpired">
+<g id="edge21" class="edge" data-name="P2PIX.lock-&gt;P2PIX.unlockExpired">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M108.76,-1189.09C128.18,-1165.26 166.84,-1122.03 209.21,-1098 217.92,-1093.06 227.58,-1088.98 237.34,-1085.62" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="238.3,-1088.99 246.79,-1082.65 236.2,-1082.31 238.3,-1088.99" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M106.78,-920.91C125.61,-895.79 164.05,-848.97 207.08,-822 216.95,-815.82 228.14,-810.7 239.32,-806.51" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="240.22,-809.9 248.52,-803.31 237.93,-803.29 240.22,-809.9" style=""/>
 </g>
-<!-- P2PIX._encodeLockID -->
-<g id="node18" class="node" pointer-events="visible" data-name="P2PIX._encodeLockID">
+<!-- P2PIX._addLock -->
+<g id="node16" class="node" pointer-events="visible" data-name="P2PIX._addLock">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1324" rx="73.48" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1319.8" font-family="Times,serif" font-size="14.00" style="">_encodeLockID</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1120" rx="49.8" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1115.8" font-family="Times,serif" font-size="14.00" style="">_addLock</text>
 </g>
-<!-- P2PIX.lock&#45;&gt;P2PIX._encodeLockID -->
-<g id="edge20" class="edge" data-name="P2PIX.lock-&gt;P2PIX._encodeLockID">
+<!-- P2PIX.lock&#45;&gt;P2PIX._addLock -->
+<g id="edge32" class="edge" data-name="P2PIX.lock-&gt;P2PIX._addLock">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M98.92,-1225.2C107.71,-1269.39 136.13,-1377.86 209.21,-1422 246.46,-1444.49 363.73,-1435.75 405.01,-1422 446.6,-1408.15 485.62,-1375.32 510.03,-1351.47" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="512.24,-1354.21 516.82,-1344.66 507.28,-1349.27 512.24,-1354.21" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M108.23,-954.81C126.06,-984.63 160.52,-1042.65 207.08,-1075 224.64,-1087.2 247.58,-1093.91 266.72,-1099.56" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="265.48,-1102.84 276.07,-1102.38 267.51,-1096.14 265.48,-1102.84" style=""/>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX._addLock -->
+<g id="edge33" class="edge" data-name="P2PIX.lock-&gt;P2PIX._addLock">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M102.78,-956.41C118.34,-989.03 155.19,-1056.95 207.08,-1093 218.17,-1100.7 231.39,-1106.22 244.45,-1110.16" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="243.36,-1113.49 253.93,-1112.7 245.17,-1106.73 243.36,-1113.49" style=""/>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX._addLock -->
+<g id="edge37" class="edge" data-name="P2PIX.lock-&gt;P2PIX._addLock">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M99.12,-957.03C111.86,-994.62 150.55,-1071.72 207.08,-1111 219.84,-1119.86 235.43,-1125.83 250.34,-1129.08" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="249.76,-1132.53 260.2,-1130.74 250.92,-1125.63 249.76,-1132.53" style=""/>
 </g>
 <!-- P2PIX.merkleVerify -->
-<g id="node19" class="node" pointer-events="visible" data-name="P2PIX.merkleVerify">
+<g id="node17" class="node" pointer-events="visible" data-name="P2PIX.merkleVerify">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1125" rx="63.1" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1120.8" font-family="Times,serif" font-size="14.00" style="">merkleVerify</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-602" rx="63.1" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-597.8" font-family="Times,serif" font-size="14.00" style="">merkleVerify</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX.merkleVerify -->
-<g id="edge22" class="edge" data-name="P2PIX.lock-&gt;P2PIX.merkleVerify">
+<g id="edge31" class="edge" data-name="P2PIX.lock-&gt;P2PIX.merkleVerify">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M117.75,-1194.08C140.29,-1182.27 176.48,-1164.23 209.21,-1152 220.5,-1147.78 232.75,-1143.87 244.62,-1140.42" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="245.2,-1143.89 253.87,-1137.8 243.3,-1137.15 245.2,-1143.89" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M96.01,-918.9C101.1,-865.89 122.65,-715.48 207.08,-634 215.28,-626.09 225.47,-620.13 236.14,-615.65" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="237.28,-618.96 245.46,-612.23 234.87,-612.39 237.28,-618.96" style=""/>
 </g>
 <!-- P2PIX._limiter -->
-<g id="node20" class="node" pointer-events="visible" data-name="P2PIX._limiter">
+<g id="node18" class="node" pointer-events="visible" data-name="P2PIX._limiter">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1179" rx="41.72" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1174.8" font-family="Times,serif" font-size="14.00" style="">_limiter</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-1066" rx="41.72" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-1061.8" font-family="Times,serif" font-size="14.00" style="">_limiter</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX._limiter -->
-<g id="edge26" class="edge" data-name="P2PIX.lock-&gt;P2PIX._limiter">
+<g id="edge35" class="edge" data-name="P2PIX.lock-&gt;P2PIX._limiter">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M123.13,-1202.47C155.91,-1198.27 211.42,-1191.14 252.73,-1185.85" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="253.12,-1189.33 262.59,-1184.58 252.23,-1182.38 253.12,-1189.33" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M109.45,-954.13C129.71,-975.19 167.92,-1011.96 207.08,-1034 221.7,-1042.23 238.76,-1048.75 254.46,-1053.7" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="253.2,-1056.97 263.78,-1056.47 255.19,-1050.26 253.2,-1056.97" style=""/>
 </g>
-<!-- P2PIX._castAddrToKey -->
-<g id="node21" class="node" pointer-events="visible" data-name="P2PIX._castAddrToKey">
+<!-- P2PIX.getBalance -->
+<g id="node21" class="node" pointer-events="visible" data-name="P2PIX.getBalance">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-906" rx="77.58" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-901.8" font-family="Times,serif" font-size="14.00" style="">_castAddrToKey</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-690" rx="53.86" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-685.8" font-family="Times,serif" font-size="14.00" style="">getBalance</text>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX.getBalance -->
+<g id="edge25" class="edge" data-name="P2PIX.lock-&gt;P2PIX.getBalance">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M96.39,-918.93C102.25,-870.31 125.17,-741.87 207.08,-689 289.97,-635.5 411.25,-655.56 479.8,-673.64" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="478.47,-676.91 489.04,-676.18 480.32,-670.16 478.47,-676.91" style=""/>
+</g>
+<!-- P2PIX.getValid -->
+<g id="node22" class="node" pointer-events="visible" data-name="P2PIX.getValid">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-548" rx="44.08" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-543.8" font-family="Times,serif" font-size="14.00" style="">getValid</text>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX.getValid -->
+<g id="edge23" class="edge" data-name="P2PIX.lock-&gt;P2PIX.getValid">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M94.47,-918.58C95.36,-858.32 106.52,-672.7 207.08,-575 218.14,-564.26 233.09,-557.71 247.94,-553.75" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="248.35,-557.24 257.35,-551.65 246.83,-550.41 248.35,-557.24" style=""/>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge23" class="edge" data-name="P2PIX.lock-&gt;P2PIX._castAddrToKey">
+<g id="edge27" class="edge" data-name="P2PIX.lock-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M98.79,-1186.84C108.09,-1142.39 139.08,-1033.66 209.21,-981 280.24,-927.67 319.8,-966.07 405.01,-941 421.48,-936.15 424.82,-932.7 441.01,-927 446.96,-924.9 453.15,-922.79 459.38,-920.74" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="460.03,-924.21 468.48,-917.82 457.89,-917.54 460.03,-924.21" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M114.29,-951.51C135.19,-969.13 170.2,-998.11 207.08,-1010 289.9,-1036.71 316.98,-1023.94 402.88,-1010 419.52,-1007.3 422.77,-1003.01 438.88,-998 443.58,-996.53 448.43,-995.05 453.32,-993.59" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="454.02,-997.03 462.63,-990.86 452.05,-990.31 454.02,-997.03" style=""/>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge25" class="edge" data-name="P2PIX.lock-&gt;P2PIX._castAddrToKey">
+<g id="edge34" class="edge" data-name="P2PIX.lock-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M100.98,-1187.26C112.46,-1145.94 143.82,-1048.1 209.21,-999 280.24,-945.67 319.8,-984.07 405.01,-959 421.48,-954.15 424.82,-950.7 441.01,-945 457.32,-939.25 475.39,-933.41 491.34,-927.88" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="492.49,-931.19 500.74,-924.54 490.15,-924.59 492.49,-931.19" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M105.62,-955.32C124.37,-977.73 164.47,-1014.26 207.08,-1028 289.9,-1054.71 316.98,-1041.94 402.88,-1028 419.52,-1025.3 422.77,-1021.01 438.88,-1016 454.2,-1011.23 471.03,-1006.27 486.12,-1001.45" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="487.03,-1004.84 495.44,-998.4 484.85,-998.19 487.03,-1004.84" style=""/>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX.ERC20 -->
+<g id="edge22" class="edge" data-name="P2PIX.lock-&gt;P2PIX.ERC20">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M109.86,-922.01C129.99,-902.28 167.45,-869.78 207.08,-857 289.9,-830.29 337.23,-799.88 402.88,-857 490.22,-933 363.09,-1027.48 438.88,-1115 449.21,-1126.94 464.47,-1133.75 479.67,-1137.59" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="478.84,-1141 489.34,-1139.57 480.24,-1134.14 478.84,-1141" style=""/>
+</g>
+<!-- P2PIX.lock&#45;&gt;P2PIX.address -->
+<g id="edge30" class="edge" data-name="P2PIX.lock-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M95.74,-918.93C100.11,-866.86 119.95,-721.66 207.08,-654 276.37,-600.2 319.52,-656.35 402.88,-629 420.27,-623.29 421.98,-616.04 438.88,-609 453.07,-603.09 468.98,-597.96 483.59,-593.81" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="484.37,-597.23 493.09,-591.22 482.52,-590.47 484.37,-597.23" style=""/>
 </g>
 <!-- P2PIX.InvalidDeposit -->
-<g id="node28" class="node" pointer-events="visible" data-name="P2PIX.InvalidDeposit">
+<g id="node37" class="node" pointer-events="visible" data-name="P2PIX.InvalidDeposit">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1233" rx="68.36" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1228.8" font-family="Times,serif" font-size="14.00" style="">InvalidDeposit</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-884" rx="68.36" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-879.8" font-family="Times,serif" font-size="14.00" style="">InvalidDeposit</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX.InvalidDeposit -->
-<g id="edge18" class="edge" data-name="P2PIX.lock-&gt;P2PIX.InvalidDeposit">
+<g id="edge24" class="edge" data-name="P2PIX.lock-&gt;P2PIX.InvalidDeposit">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M123.13,-1209.53C150.46,-1213.04 193.6,-1218.57 231.13,-1223.38" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="230.24,-1226.8 240.6,-1224.6 231.13,-1219.85 230.24,-1226.8" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M120.64,-931.27C150.59,-923.55 200.75,-910.62 241.04,-900.23" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="241.73,-903.67 250.53,-897.78 239.98,-896.89 241.73,-903.67" style=""/>
 </g>
 <!-- P2PIX.NotEnoughTokens -->
-<g id="node29" class="node" pointer-events="visible" data-name="P2PIX.NotEnoughTokens">
+<g id="node38" class="node" pointer-events="visible" data-name="P2PIX.NotEnoughTokens">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1287" rx="83.98" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1282.8" font-family="Times,serif" font-size="14.00" style="">NotEnoughTokens</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-938" rx="83.98" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-933.8" font-family="Times,serif" font-size="14.00" style="">NotEnoughTokens</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX.NotEnoughTokens -->
-<g id="edge19" class="edge" data-name="P2PIX.lock-&gt;P2PIX.NotEnoughTokens">
+<g id="edge26" class="edge" data-name="P2PIX.lock-&gt;P2PIX.NotEnoughTokens">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M117.75,-1217.92C140.29,-1229.73 176.48,-1247.77 209.21,-1260 217.87,-1263.24 227.09,-1266.29 236.28,-1269.1" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="235.23,-1272.44 245.81,-1271.91 237.21,-1265.72 235.23,-1272.44" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M122.79,-938C144.67,-938 176.35,-938 207.12,-938" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="206.73,-941.5 216.73,-938 206.73,-934.5 206.73,-941.5" style=""/>
 </g>
-<!-- P2PIX.LockAdded -->
-<g id="node30" class="node" pointer-events="visible" data-name="P2PIX.LockAdded">
+<!-- P2PIX.NotExpired -->
+<g id="node39" class="node" pointer-events="visible" data-name="P2PIX.NotExpired">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1341" rx="56.75" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1336.8" font-family="Times,serif" font-size="14.00" style="">LockAdded</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="740.22" cy="-1187" rx="56.18" ry="18" style=""/>
+<text text-anchor="middle" x="740.22" y="-1182.8" font-family="Times,serif" font-size="14.00" style="">NotExpired</text>
 </g>
-<!-- P2PIX.lock&#45;&gt;P2PIX.LockAdded -->
-<g id="edge24" class="edge" data-name="P2PIX.lock-&gt;P2PIX.LockAdded">
+<!-- P2PIX.lock&#45;&gt;P2PIX.NotExpired -->
+<g id="edge28" class="edge" data-name="P2PIX.lock-&gt;P2PIX.NotExpired">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M112.55,-1221.06C132.95,-1242.98 169.45,-1282.45 209.21,-1305 223.36,-1313.02 240.03,-1318.78 255.52,-1323.29" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="254.13,-1326.54 264.71,-1325.85 256.01,-1319.8 254.13,-1326.54" style=""/>
-</g>
-<!-- P2PIX.lock&#45;&gt;P2PIX.LockAdded -->
-<g id="edge28" class="edge" data-name="P2PIX.lock-&gt;P2PIX.LockAdded">
-
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M105.4,-1224.07C123.44,-1250.36 164.24,-1297.49 209.21,-1323 217.86,-1327.91 227.46,-1331.97 237.16,-1335.21" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="235.94,-1338.5 246.53,-1338.03 237.95,-1331.8 235.94,-1338.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M99.45,-957.04C111.01,-998.03 143.84,-1095.11 207.08,-1147 277.44,-1204.73 333.06,-1148.61 402.88,-1207 429.71,-1229.45 409.01,-1258.78 438.88,-1277 510.34,-1320.61 548.27,-1304.8 627.23,-1277 662.12,-1264.72 694.17,-1236.47 714.96,-1214.87" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="717.37,-1217.41 721.63,-1207.71 712.25,-1212.64 717.37,-1217.41" style=""/>
 </g>
 <!-- P2PIX.AmountNotAllowed -->
-<g id="node31" class="node" pointer-events="visible" data-name="P2PIX.AmountNotAllowed">
+<g id="node40" class="node" pointer-events="visible" data-name="P2PIX.AmountNotAllowed">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-1395" rx="90.37" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-1390.8" font-family="Times,serif" font-size="14.00" style="">AmountNotAllowed</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-992" rx="90.37" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-987.8" font-family="Times,serif" font-size="14.00" style="">AmountNotAllowed</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;P2PIX.AmountNotAllowed -->
-<g id="edge27" class="edge" data-name="P2PIX.lock-&gt;P2PIX.AmountNotAllowed">
+<g id="edge36" class="edge" data-name="P2PIX.lock-&gt;P2PIX.AmountNotAllowed">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M103.38,-1224.44C118.58,-1258.21 155.5,-1330.02 209.21,-1368 214.25,-1371.56 219.74,-1374.65 225.47,-1377.34" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="224.1,-1380.56 234.68,-1381.15 226.77,-1374.09 224.1,-1380.56" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M120.64,-944.73C148.78,-951.99 194.77,-963.84 233.64,-973.87" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="232.76,-977.25 243.32,-976.36 234.51,-970.47 232.76,-977.25" style=""/>
 </g>
 <!-- DT.Lock -->
-<g id="node47" class="node" pointer-events="visible" data-name="DT.Lock">
+<g id="node61" class="node" pointer-events="visible" data-name="DT.Lock">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-222" rx="30.76" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-217.8" font-family="Times,serif" font-size="14.00" style="">Lock</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-197" rx="30.76" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-192.8" font-family="Times,serif" font-size="14.00" style="">Lock</text>
 </g>
 <!-- P2PIX.lock&#45;&gt;DT.Lock -->
-<g id="edge21" class="edge" data-name="P2PIX.lock-&gt;DT.Lock">
+<g id="edge29" class="edge" data-name="P2PIX.lock-&gt;DT.Lock">
 
-<path fill="none" stroke="white" stroke-width="2" d="M103.77,-1187.63C120.24,-1149.59 157.24,-1059.05 173.21,-979 221.84,-735.29 145.62,-661.24 209.21,-421 226.25,-356.64 264.61,-288.25 287.62,-250.76" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="290.59,-252.63 292.91,-242.29 284.65,-248.92 290.59,-252.63" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M98.9,-919.02C111.55,-863.46 148.76,-696.27 171.08,-556 181.77,-488.82 169.45,-308.67 207.08,-252 220.44,-231.89 243.8,-218.31 264.24,-209.68" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="265.28,-213.03 273.33,-206.15 262.74,-206.51 265.28,-213.03" style=""/>
 </g>
 <!-- P2PIX.release -->
 <g id="node5" class="node" pointer-events="visible" data-name="P2PIX.release">
 
-<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="307.11" cy="-613" rx="37.68" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-608.8" font-family="Times,serif" font-size="14.00" style="">release</text>
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="304.98" cy="-716" rx="37.68" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-711.8" font-family="Times,serif" font-size="14.00" style="">release</text>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge31" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
+<g id="edge41" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M322.82,-595.2C343.98,-586.38 382.91,-590.65 405.01,-613 448.67,-657.15 414.36,-691.91 441.01,-748 463.42,-795.18 503.33,-842.98 523.46,-875.94" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="520.23,-877.34 528.2,-884.32 526.32,-873.89 520.23,-877.34" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M321.74,-698.53C343.46,-690.99 382.25,-697.14 402.88,-721 463.37,-790.98 377.1,-857.15 438.88,-926 454.8,-943.75 481.62,-950.13 502.41,-956.85" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="500.98,-960.05 511.57,-960.16 503.35,-953.47 500.98,-960.05" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge34" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
+<g id="edge44" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.82,-606.63C364.31,-608.15 389.04,-614.86 405.01,-631 448.67,-675.15 414.36,-709.91 441.01,-766 460.79,-807.64 494.19,-849.76 515.6,-876.98" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="512.66,-878.9 521.57,-884.62 518.17,-874.58 512.66,-878.9" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M342.83,-711.2C363.44,-713.72 387.93,-721.71 402.88,-739 463.37,-808.98 377.1,-875.15 438.88,-944 446.07,-952.02 455.49,-957.72 465.57,-961.89" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="464.16,-965.11 474.76,-965.14 466.49,-958.51 464.16,-965.11" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge35" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
+<g id="edge45" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M341.48,-621.84C362.39,-625.65 388.43,-632.24 405.01,-649 448.67,-693.15 414.36,-727.91 441.01,-784 457.66,-819.06 483.97,-854.45 504.65,-878.18" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="501.81,-880.26 511.1,-885.35 507.02,-875.58 501.81,-880.26" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M338.57,-725.93C359.98,-730.65 386.89,-738.5 402.88,-757 463.37,-826.98 377.1,-893.15 438.88,-962 440.96,-964.33 443.24,-966.46 445.66,-968.41" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="443.55,-971.21 453.84,-973.76 447.39,-965.35 443.55,-971.21" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge36" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
+<g id="edge46" class="edge" data-name="P2PIX.release-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M323.17,-630.6C344.41,-640.43 383.03,-644.77 405.01,-667 448.67,-711.15 414.36,-745.91 441.01,-802 454.36,-830.11 473.93,-858.44 491.82,-879.34" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="489.14,-881.59 498.41,-886.71 494.35,-876.92 489.14,-881.59" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M320.66,-733.84C342.15,-744.79 381.91,-750.74 402.88,-775 463.37,-844.98 377.1,-911.15 438.88,-980 454.75,-997.69 481.43,-1004.08 502.18,-1001.73" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="502.82,-1005.18 511.83,-999.61 501.31,-998.34 502.82,-1005.18" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX.ERC20 -->
-<g id="edge33" class="edge" data-name="P2PIX.release-&gt;P2PIX.ERC20">
+<g id="edge43" class="edge" data-name="P2PIX.release-&gt;P2PIX.ERC20">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M345.76,-615.85C365.37,-619.07 388.62,-625.85 405.01,-640 434.83,-665.74 411.26,-695.17 441.01,-721 453.02,-731.43 468.81,-737.85 484.05,-741.79" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="483.15,-745.17 493.67,-743.9 484.65,-738.34 483.15,-745.17" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M340.76,-723.71C362.25,-730.38 388.41,-742.32 402.88,-763 493.04,-891.85 338.13,-994.25 438.88,-1115 449.08,-1127.22 464.45,-1134.1 479.78,-1137.92" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="479.08,-1141.34 489.57,-1139.86 480.44,-1134.48 479.08,-1141.34" style=""/>
 </g>
 <!-- P2PIX.AlreadyReleased -->
-<g id="node32" class="node" pointer-events="visible" data-name="P2PIX.AlreadyReleased">
+<g id="node41" class="node" pointer-events="visible" data-name="P2PIX.AlreadyReleased">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-694" rx="76.99" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-689.8" font-family="Times,serif" font-size="14.00" style="">AlreadyReleased</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="740.22" cy="-880" rx="76.99" ry="18" style=""/>
+<text text-anchor="middle" x="740.22" y="-875.8" font-family="Times,serif" font-size="14.00" style="">AlreadyReleased</text>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX.AlreadyReleased -->
-<g id="edge29" class="edge" data-name="P2PIX.release-&gt;P2PIX.AlreadyReleased">
+<g id="edge38" class="edge" data-name="P2PIX.release-&gt;P2PIX.AlreadyReleased">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.79,-619.61C362.62,-623.91 385.74,-630.51 405.01,-640 422.95,-648.84 423.09,-658.11 441.01,-667 448.73,-670.83 457.09,-674.2 465.53,-677.14" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="464.42,-680.46 475.01,-680.21 466.58,-673.8 464.42,-680.46" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.91,-716.75C423.52,-718.57 602.73,-724.06 627.23,-737 673.8,-761.59 707.27,-814.95 724.91,-849.08" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="721.75,-850.59 729.34,-857.98 728.02,-847.47 721.75,-850.59" style=""/>
+</g>
+<!-- P2PIX.LockExpired -->
+<g id="node42" class="node" pointer-events="visible" data-name="P2PIX.LockExpired">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-926" rx="61.4" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-921.8" font-family="Times,serif" font-size="14.00" style="">LockExpired</text>
+</g>
+<!-- P2PIX.release&#45;&gt;P2PIX.LockExpired -->
+<g id="edge39" class="edge" data-name="P2PIX.release-&gt;P2PIX.LockExpired">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.4,-719.56C363.69,-723.42 387.66,-731.43 402.88,-748 449.55,-798.81 391.28,-849.06 438.88,-899 445.35,-905.79 453.41,-910.9 462.07,-914.75" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="460.72,-917.98 471.32,-918.19 463.16,-911.42 460.72,-917.98" style=""/>
 </g>
 <!-- P2PIX.TxAlreadyUsed -->
-<g id="node33" class="node" pointer-events="visible" data-name="P2PIX.TxAlreadyUsed">
+<g id="node43" class="node" pointer-events="visible" data-name="P2PIX.TxAlreadyUsed">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-532" rx="72.93" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-527.8" font-family="Times,serif" font-size="14.00" style="">TxAlreadyUsed</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-764" rx="72.93" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-759.8" font-family="Times,serif" font-size="14.00" style="">TxAlreadyUsed</text>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX.TxAlreadyUsed -->
-<g id="edge30" class="edge" data-name="P2PIX.release-&gt;P2PIX.TxAlreadyUsed">
+<g id="edge40" class="edge" data-name="P2PIX.release-&gt;P2PIX.TxAlreadyUsed">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.79,-606.39C362.62,-602.09 385.74,-595.49 405.01,-586 422.95,-577.16 423.09,-567.89 441.01,-559 449.23,-554.92 458.16,-551.37 467.15,-548.3" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="468.03,-551.69 476.5,-545.32 465.91,-545.02 468.03,-551.69" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M340.81,-723.39C373.18,-730.27 422.33,-740.7 462.7,-749.27" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="461.72,-752.64 472.23,-751.3 463.17,-745.8 461.72,-752.64" style=""/>
 </g>
 <!-- P2PIX.InvalidSigner -->
-<g id="node34" class="node" pointer-events="visible" data-name="P2PIX.InvalidSigner">
+<g id="node44" class="node" pointer-events="visible" data-name="P2PIX.InvalidSigner">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-586" rx="63.71" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-581.8" font-family="Times,serif" font-size="14.00" style="">InvalidSigner</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-818" rx="63.71" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-813.8" font-family="Times,serif" font-size="14.00" style="">InvalidSigner</text>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX.InvalidSigner -->
-<g id="edge32" class="edge" data-name="P2PIX.release-&gt;P2PIX.InvalidSigner">
+<g id="edge42" class="edge" data-name="P2PIX.release-&gt;P2PIX.InvalidSigner">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M345.2,-608.6C377.19,-604.81 424.33,-599.22 463.72,-594.55" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="463.96,-598.04 473.47,-593.39 463.13,-591.09 463.96,-598.04" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M341.28,-722.68C360.65,-727.51 384.41,-735.46 402.88,-748 423.5,-762 418,-777.38 438.88,-791 446.92,-796.25 456,-800.49 465.26,-803.93" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="464,-807.2 474.59,-807.04 466.21,-800.56 464,-807.2" style=""/>
 </g>
 <!-- P2PIX.LockReleased -->
-<g id="node35" class="node" pointer-events="visible" data-name="P2PIX.LockReleased">
+<g id="node45" class="node" pointer-events="visible" data-name="P2PIX.LockReleased">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-640" rx="65.97" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-635.8" font-family="Times,serif" font-size="14.00" style="">LockReleased</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-872" rx="65.97" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-867.8" font-family="Times,serif" font-size="14.00" style="">LockReleased</text>
 </g>
 <!-- P2PIX.release&#45;&gt;P2PIX.LockReleased -->
-<g id="edge41" class="edge" data-name="P2PIX.release-&gt;P2PIX.LockReleased">
+<g id="edge51" class="edge" data-name="P2PIX.release-&gt;P2PIX.LockReleased">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M345.2,-617.4C376.56,-621.12 422.46,-626.56 461.37,-631.17" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="460.91,-634.64 471.25,-632.35 461.73,-627.69 460.91,-634.64" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.13,-720.39C363.08,-724.51 386.81,-732.51 402.88,-748 435.98,-779.92 405.19,-813.7 438.88,-845 445.18,-850.85 452.67,-855.45 460.63,-859.05" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="459.13,-862.22 469.72,-862.56 461.65,-855.69 459.13,-862.22" style=""/>
 </g>
 <!-- SafeTransferLib.safeTransfer -->
-<g id="node51" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransfer">
+<g id="node59" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransfer">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-281" rx="59.08" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-276.8" font-family="Times,serif" font-size="14.00" style="">safeTransfer</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-142" rx="59.08" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-137.8" font-family="Times,serif" font-size="14.00" style="">safeTransfer</text>
 </g>
 <!-- P2PIX.release&#45;&gt;SafeTransferLib.safeTransfer -->
-<g id="edge37" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
+<g id="edge47" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
 
-<path fill="none" stroke="white" stroke-width="2" d="M323.9,-595.59C345.66,-586.28 384.49,-582.35 405.01,-559 479.12,-474.68 378.18,-402.03 441.01,-309 447.51,-299.38 456.29,-291.22 465.91,-284.73" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="467.62,-287.79 474.44,-279.68 464.05,-281.77 467.62,-287.79" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M314.68,-697.38C334.45,-673.12 382.66,-642.7 402.88,-602 445.74,-515.73 387.68,-251.6 438.88,-170 444.83,-160.51 453.07,-152.45 462.21,-146.02" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="463.99,-149.03 470.68,-140.82 460.33,-143.07 463.99,-149.03" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;SafeTransferLib.safeTransfer -->
-<g id="edge38" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
+<g id="edge48" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
 
-<path fill="none" stroke="white" stroke-width="2" d="M342.16,-604.79C363.35,-601.25 389.44,-594.71 405.01,-577 479.12,-492.68 378.18,-420.03 441.01,-327 449.33,-314.68 461.39,-304.76 474.15,-297.18" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="475.63,-300.35 482.79,-292.54 472.32,-294.18 475.63,-300.35" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M324.44,-699.32C347.34,-682.44 385.47,-655.03 402.88,-620 445.74,-533.73 387.68,-269.6 438.88,-188 446.52,-175.82 457.93,-166 470.16,-158.47" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="471.83,-161.55 478.89,-153.65 468.45,-155.42 471.83,-161.55" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;SafeTransferLib.safeTransfer -->
-<g id="edge39" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
+<g id="edge49" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
 
-<path fill="none" stroke="white" stroke-width="2" d="M343.58,-620.09C364.5,-618.95 389.79,-612.31 405.01,-595 479.12,-510.68 378.18,-438.03 441.01,-345 453.71,-326.2 475.14,-312.98 494.42,-303.31" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="495.82,-306.52 503.32,-299.04 492.79,-300.21 495.82,-306.52" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M336.61,-705.04C359.14,-691.37 388.29,-667.36 402.88,-638 445.74,-551.73 387.68,-287.6 438.88,-206 450.78,-187.03 471.81,-173.79 490.89,-164.16" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="492.19,-167.42 499.68,-159.93 489.15,-161.11 492.19,-167.42" style=""/>
 </g>
 <!-- P2PIX.release&#45;&gt;SafeTransferLib.safeTransfer -->
-<g id="edge40" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
+<g id="edge50" class="edge" data-name="P2PIX.release-&gt;SafeTransferLib.safeTransfer">
 
-<path fill="none" stroke="white" stroke-width="2" d="M322.46,-630.82C343.9,-640.45 384.03,-636.87 405.01,-613 479.12,-528.68 378.18,-456.03 441.01,-363 458.24,-337.49 491.55,-322.26 513.74,-307.68" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="515.71,-310.57 521.73,-301.85 511.59,-304.92 515.71,-310.57" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M343.79,-716.11C365.02,-704.34 389.8,-682.32 402.88,-656 445.74,-569.73 387.68,-305.6 438.88,-224 455.03,-198.26 487.98,-183.08 510.05,-168.59" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="511.98,-171.51 518,-162.8 507.86,-165.85 511.98,-171.51" style=""/>
 </g>
 <!-- P2PIX._notExpired -->
-<g id="node16" class="node" pointer-events="visible" data-name="P2PIX._notExpired">
+<g id="node15" class="node" pointer-events="visible" data-name="P2PIX._notExpired">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1071" rx="58.55" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1066.8" font-family="Times,serif" font-size="14.00" style="">_notExpired</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1088" rx="58.55" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1083.8" font-family="Times,serif" font-size="14.00" style="">_notExpired</text>
 </g>
 <!-- P2PIX.unlockExpired&#45;&gt;P2PIX._notExpired -->
-<g id="edge42" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX._notExpired">
+<g id="edge52" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX._notExpired">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M376.12,-1071C403.83,-1071 435.9,-1071 463.99,-1071" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="463.98,-1074.5 473.98,-1071 463.98,-1067.5 463.98,-1074.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M366.44,-798.86C380.2,-803.62 393.51,-810.9 402.88,-822 472.13,-904.11 368.12,-980.18 438.88,-1061 445.59,-1068.66 454.32,-1074.21 463.76,-1078.22" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="462.53,-1081.5 473.12,-1081.51 464.85,-1074.89 462.53,-1081.5" style=""/>
 </g>
 <!-- P2PIX.unlockExpired&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge43" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX._castAddrToKey">
+<g id="edge56" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M370.45,-1063.21C383.11,-1059.16 395.45,-1053.09 405.01,-1044 441.67,-1009.13 404.96,-971.5 441.01,-936 446.59,-930.5 453.17,-926.01 460.23,-922.34" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="461.56,-925.58 469.26,-918.31 458.71,-919.19 461.56,-925.58" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M365.3,-799.57C379.16,-804.32 392.81,-811.41 402.88,-822 444.47,-865.77 396.48,-910.01 438.88,-953 443.42,-957.6 448.69,-961.43 454.38,-964.62" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="452.46,-967.58 463,-968.69 455.45,-961.25 452.46,-967.58" style=""/>
+</g>
+<!-- P2PIX.unlockExpired&#45;&gt;P2PIX.ERC20 -->
+<g id="edge53" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX.ERC20">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M373.64,-792.53C384.82,-797.06 395.24,-803.69 402.88,-813 486.09,-914.44 353.8,-1006.12 438.88,-1106 450.19,-1119.28 467.6,-1126.24 484.33,-1130.4" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="483.4,-1133.79 493.92,-1132.47 484.88,-1126.94 483.4,-1133.79" style=""/>
+</g>
+<!-- P2PIX.unlockExpired&#45;&gt;P2PIX.ERC20 -->
+<g id="edge55" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX.ERC20">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M354.53,-803.49C372.31,-808.5 390.97,-816.48 402.88,-831 486.09,-932.44 353.8,-1024.12 438.88,-1124 449.65,-1136.65 465.95,-1143.56 481.92,-1146.76" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="481.16,-1150.18 491.55,-1148.14 482.15,-1143.25 481.16,-1150.18" style=""/>
+</g>
+<!-- P2PIX.unlockExpired&#45;&gt;P2PIX.MaxBalExceeded -->
+<g id="edge54" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX.MaxBalExceeded">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M343.6,-806C364.76,-817.08 389.54,-834 402.88,-857 496.89,-1019.06 350.82,-1111.63 438.88,-1277 449.92,-1297.74 469.41,-1314.8 487.71,-1327.38" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="485.75,-1330.28 496.04,-1332.79 489.56,-1324.41 485.75,-1330.28" style=""/>
 </g>
 <!-- P2PIX.LockReturned -->
-<g id="node36" class="node" pointer-events="visible" data-name="P2PIX.LockReturned">
+<g id="node46" class="node" pointer-events="visible" data-name="P2PIX.LockReturned">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1125" rx="66.05" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1120.8" font-family="Times,serif" font-size="14.00" style="">LockReturned</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1034" rx="66.05" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1029.8" font-family="Times,serif" font-size="14.00" style="">LockReturned</text>
 </g>
 <!-- P2PIX.unlockExpired&#45;&gt;P2PIX.LockReturned -->
-<g id="edge44" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX.LockReturned">
+<g id="edge57" class="edge" data-name="P2PIX.unlockExpired-&gt;P2PIX.LockReturned">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M360.35,-1083.39C393.56,-1091.26 436.77,-1101.51 472,-1109.87" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="471.11,-1113.25 481.64,-1112.16 472.72,-1106.44 471.11,-1113.25" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M366.11,-799.14C379.88,-803.9 393.28,-811.1 402.88,-822 458.24,-884.86 382.37,-945.17 438.88,-1007 444.54,-1013.19 451.52,-1018 459.1,-1021.72" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="457.58,-1024.88 468.16,-1025.43 460.23,-1018.4 457.58,-1024.88" style=""/>
 </g>
 <!-- P2PIX.withdraw -->
 <g id="node7" class="node" pointer-events="visible" data-name="P2PIX.withdraw">
 
-<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="94.61" cy="-952" rx="47.52" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-947.8" font-family="Times,serif" font-size="14.00" style="">withdraw</text>
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="93.54" cy="-529" rx="47.52" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-524.8" font-family="Times,serif" font-size="14.00" style="">withdraw</text>
 </g>
-<!-- P2PIX.withdraw&#45;&gt;P2PIX.cancelDeposit -->
-<g id="edge47" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.cancelDeposit">
+<!-- P2PIX.withdraw&#45;&gt;P2PIX.setValidState -->
+<g id="edge60" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.setValidState">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M133.24,-963.62C165.33,-973.53 211.95,-987.93 248.7,-999.27" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="247.27,-1002.49 257.85,-1002.1 249.33,-995.8 247.27,-1002.49" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M133,-517.66C145.94,-512.67 159.92,-505.87 171.08,-497 192.52,-479.97 184.63,-462.67 207.08,-447 215.69,-441 225.59,-436.32 235.7,-432.69" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="236.73,-436.04 245.19,-429.67 234.6,-429.37 236.73,-436.04" style=""/>
 </g>
 <!-- P2PIX.withdraw&#45;&gt;P2PIX.unlockExpired -->
-<g id="edge46" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.unlockExpired">
+<g id="edge58" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.unlockExpired">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M112.84,-969.84C133.79,-990.54 171.09,-1024.34 209.21,-1044 218.37,-1048.72 228.46,-1052.7 238.55,-1056.03" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="237.33,-1059.32 247.92,-1058.89 239.38,-1052.63 237.33,-1059.32" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M98.6,-548.07C108.85,-591.7 139.94,-699.52 207.08,-758 215.2,-765.07 224.91,-770.58 235.02,-774.88" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="233.56,-778.07 244.15,-778.33 236.03,-771.52 233.56,-778.07" style=""/>
 </g>
-<!-- P2PIX.withdraw&#45;&gt;P2PIX._onlySeller -->
-<g id="edge45" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX._onlySeller">
+<!-- P2PIX._decBal -->
+<g id="node20" class="node" pointer-events="visible" data-name="P2PIX._decBal">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M143.13,-953.19C221.21,-955.14 376.95,-959.03 467.06,-961.28" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="466.75,-964.78 476.83,-961.53 466.92,-957.78 466.75,-964.78" style=""/>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1196" rx="42.85" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1191.8" font-family="Times,serif" font-size="14.00" style="">_decBal</text>
 </g>
-<!-- P2PIX.withdraw&#45;&gt;P2PIX.ERC20 -->
-<g id="edge48" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.ERC20">
+<!-- P2PIX.withdraw&#45;&gt;P2PIX._decBal -->
+<g id="edge62" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX._decBal">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M108.48,-933.33C127.29,-907.74 164.91,-862.62 209.21,-842 288.52,-805.1 321.66,-848.55 405.01,-822 440.95,-810.55 478.02,-788.43 503.47,-771.34" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="505.21,-774.39 511.47,-765.85 501.25,-768.62 505.21,-774.39" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M95.95,-548.37C100.86,-600.6 121.88,-745.25 207.08,-817 275.02,-874.21 342.85,-791.54 402.88,-857 497.21,-959.88 348.76,-1062.4 438.88,-1169 448.46,-1180.34 462.5,-1187.07 476.78,-1191.02" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="475.82,-1194.39 486.34,-1193.17 477.35,-1187.56 475.82,-1194.39" style=""/>
+</g>
+<!-- P2PIX.withdraw&#45;&gt;P2PIX.getValid -->
+<g id="edge59" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.getValid">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M141.28,-533.24C172.79,-536.1 214.51,-539.88 247.82,-542.91" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="247.31,-546.37 257.58,-543.79 247.94,-539.4 247.31,-546.37" style=""/>
+</g>
+<!-- P2PIX.withdraw&#45;&gt;P2PIX._castAddrToKey -->
+<g id="edge61" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX._castAddrToKey">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M98.28,-548.17C107.81,-591.3 137.35,-695.88 207.08,-743 243.32,-767.49 370.66,-733.42 402.88,-763 466.19,-821.12 381.05,-889.42 438.88,-953 443.05,-957.59 447.95,-961.41 453.28,-964.6" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="451.51,-967.63 462.02,-968.95 454.62,-961.36 451.51,-967.63" style=""/>
+</g>
+<!-- P2PIX.withdraw&#45;&gt;P2PIX.address -->
+<g id="edge65" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M140.42,-523.44C214.42,-515.2 356.54,-502.58 402.88,-521 423.33,-529.13 419.77,-544.08 438.88,-555 451.99,-562.5 467.36,-568.06 481.79,-572.12" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="480.66,-575.44 491.22,-574.55 482.41,-568.66 480.66,-575.44" style=""/>
 </g>
 <!-- P2PIX.DepositWithdrawn -->
-<g id="node37" class="node" pointer-events="visible" data-name="P2PIX.DepositWithdrawn">
+<g id="node47" class="node" pointer-events="visible" data-name="P2PIX.DepositWithdrawn">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-923" rx="84.54" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-918.8" font-family="Times,serif" font-size="14.00" style="">DepositWithdrawn</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="304.98" cy="-474" rx="84.54" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-469.8" font-family="Times,serif" font-size="14.00" style="">DepositWithdrawn</text>
 </g>
 <!-- P2PIX.withdraw&#45;&gt;P2PIX.DepositWithdrawn -->
-<g id="edge50" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.DepositWithdrawn">
+<g id="edge64" class="edge" data-name="P2PIX.withdraw-&gt;P2PIX.DepositWithdrawn">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M141.02,-945.74C164.29,-942.54 193.4,-938.53 220.67,-934.77" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="221.03,-938.25 230.46,-933.42 220.07,-931.32 221.03,-938.25" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M134.43,-518.53C163.05,-511.01 202.33,-500.69 235.88,-491.88" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="236.71,-495.28 245.49,-489.36 234.93,-488.51 236.71,-495.28" style=""/>
 </g>
 <!-- P2PIX.withdraw&#45;&gt;SafeTransferLib.safeTransfer -->
-<g id="edge49" class="edge" data-name="P2PIX.withdraw-&gt;SafeTransferLib.safeTransfer">
+<g id="edge63" class="edge" data-name="P2PIX.withdraw-&gt;SafeTransferLib.safeTransfer">
 
-<path fill="none" stroke="white" stroke-width="2" d="M100.95,-932.77C114.37,-884.06 150.04,-751.77 173.21,-640 183.09,-592.35 175.69,-459.28 209.21,-424 270.58,-359.41 329.34,-428.03 405.01,-381 426.76,-367.48 421.6,-352.71 441.01,-336 455.88,-323.19 474.17,-311.77 490.7,-302.7" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="491.93,-306.01 499.12,-298.23 488.65,-299.83 491.93,-306.01" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M136.76,-520.25C149.71,-515.5 162.72,-508.19 171.08,-497 215.24,-437.91 154.1,-218.32 207.08,-167 277.54,-98.76 401.57,-111.47 474.33,-126.79" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="473.38,-130.17 483.9,-128.91 474.89,-123.33 473.38,-130.17" style=""/>
 </g>
 <!-- P2PIX.setRoot&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge51" class="edge" data-name="P2PIX.setRoot-&gt;P2PIX._castAddrToKey">
+<g id="edge66" class="edge" data-name="P2PIX.setRoot-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M346.73,-875.28C377.17,-880.22 420.59,-887.28 458.14,-893.38" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="457.21,-896.77 467.64,-894.92 458.33,-889.86 457.21,-896.77" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M346.83,-1631.17C366.85,-1628.48 389.49,-1621.57 402.88,-1605 486.54,-1501.45 355.74,-1110.98 438.88,-1007 442.59,-1002.36 447.04,-998.49 451.97,-995.26" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="453.55,-998.38 460.72,-990.59 450.25,-992.21 453.55,-998.38" style=""/>
+</g>
+<!-- P2PIX.RootUpdated -->
+<g id="node48" class="node" pointer-events="visible" data-name="P2PIX.RootUpdated">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1578" rx="62.56" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1573.8" font-family="Times,serif" font-size="14.00" style="">RootUpdated</text>
+</g>
+<!-- P2PIX.setRoot&#45;&gt;P2PIX.RootUpdated -->
+<g id="edge67" class="edge" data-name="P2PIX.setRoot-&gt;P2PIX.RootUpdated">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M342.55,-1623.26C376.91,-1615.06 429,-1602.61 469.88,-1592.85" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="470.59,-1596.28 479.5,-1590.55 468.97,-1589.47 470.59,-1596.28" style=""/>
 </g>
 <!-- P2PIX.OnlySeller -->
-<g id="node38" class="node" pointer-events="visible" data-name="P2PIX.OnlySeller">
+<g id="node49" class="node" pointer-events="visible" data-name="P2PIX.OnlySeller">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="724.68" cy="-916" rx="52.75" ry="18" style=""/>
-<text text-anchor="middle" x="724.68" y="-911.8" font-family="Times,serif" font-size="14.00" style="">OnlySeller</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1632" rx="52.75" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1627.8" font-family="Times,serif" font-size="14.00" style="">OnlySeller</text>
 </g>
 <!-- P2PIX.setRoot&#45;&gt;P2PIX.OnlySeller -->
-<g id="edge52" class="edge" data-name="P2PIX.setRoot-&gt;P2PIX.OnlySeller">
+<g id="edge68" class="edge" data-name="P2PIX.setRoot-&gt;P2PIX.OnlySeller">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M348.36,-865.72C410.23,-861.69 532.09,-857.76 632.59,-879 649.06,-882.48 666.36,-888.77 681.41,-895.19" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="679.6,-898.22 690.16,-899.09 682.45,-891.83 679.6,-898.22" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M346.92,-1632C380.11,-1632 427.55,-1632 466.09,-1632" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="466.02,-1635.5 476.02,-1632 466.02,-1628.5 466.02,-1635.5" style=""/>
 </g>
 <!-- P2PIX.withdrawBalance -->
 <g id="node9" class="node" pointer-events="visible" data-name="P2PIX.withdrawBalance">
 
-<ellipse fill="#ffbdb9" stroke="#ffbdb9" stroke-width="3" cx="94.61" cy="-505" rx="78.71" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-500.8" font-family="Times,serif" font-size="14.00" style="">withdrawBalance</text>
+<ellipse fill="#ffbdb9" stroke="#ffbdb9" stroke-width="3" cx="304.98" cy="-312" rx="78.71" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-307.8" font-family="Times,serif" font-size="14.00" style="">withdrawBalance</text>
+</g>
+<!-- P2PIX.withdrawBalance&#45;&gt;P2PIX.address -->
+<g id="edge69" class="edge" data-name="P2PIX.withdrawBalance-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M375.62,-320.95C385.92,-325.03 395.52,-330.82 402.88,-339 467.93,-411.39 374.2,-482.28 438.88,-555 449.28,-566.7 464.42,-573.46 479.48,-577.33" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="478.54,-580.71 489.04,-579.33 479.97,-573.86 478.54,-580.71" style=""/>
 </g>
 <!-- P2PIX.FundsWithdrawn -->
-<g id="node39" class="node" pointer-events="visible" data-name="P2PIX.FundsWithdrawn">
+<g id="node50" class="node" pointer-events="visible" data-name="P2PIX.FundsWithdrawn">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="307.11" cy="-451" rx="78.19" ry="18" style=""/>
-<text text-anchor="middle" x="307.11" y="-446.8" font-family="Times,serif" font-size="14.00" style="">FundsWithdrawn</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-312" rx="78.19" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-307.8" font-family="Times,serif" font-size="14.00" style="">FundsWithdrawn</text>
 </g>
 <!-- P2PIX.withdrawBalance&#45;&gt;P2PIX.FundsWithdrawn -->
-<g id="edge54" class="edge" data-name="P2PIX.withdrawBalance-&gt;P2PIX.FundsWithdrawn">
+<g id="edge71" class="edge" data-name="P2PIX.withdrawBalance-&gt;P2PIX.FundsWithdrawn">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M150.09,-491.02C177.36,-484.03 210.61,-475.5 239.4,-468.11" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="240.11,-471.55 248.92,-465.67 238.37,-464.76 240.11,-471.55" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M385.05,-312C402.96,-312 422.13,-312 440.52,-312" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="440.38,-315.5 450.38,-312 440.38,-308.5 440.38,-315.5" style=""/>
 </g>
 <!-- SafeTransferLib.safeTransferETH -->
-<g id="node52" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransferETH">
+<g id="node60" class="node" pointer-events="visible" data-name="SafeTransferLib.safeTransferETH">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-173" rx="78.12" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-168.8" font-family="Times,serif" font-size="14.00" style="">safeTransferETH</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-88" rx="78.12" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-83.8" font-family="Times,serif" font-size="14.00" style="">safeTransferETH</text>
 </g>
 <!-- P2PIX.withdrawBalance&#45;&gt;SafeTransferLib.safeTransferETH -->
-<g id="edge53" class="edge" data-name="P2PIX.withdrawBalance-&gt;SafeTransferLib.safeTransferETH">
+<g id="edge70" class="edge" data-name="P2PIX.withdrawBalance-&gt;SafeTransferLib.safeTransferETH">
 
-<path fill="none" stroke="white" stroke-width="2" d="M153.64,-491.93C160.92,-488.36 167.72,-483.8 173.21,-478 212.97,-436.02 170.21,-395.68 209.21,-353 272.19,-284.1 336.83,-340.75 405.01,-277 432.6,-251.2 412.25,-224.49 441.01,-200 446.3,-195.49 452.3,-191.74 458.65,-188.61" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="459.76,-191.94 467.59,-184.8 457.02,-185.49 459.76,-191.94" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M370.46,-301.05C382.62,-296.34 394.22,-289.61 402.88,-280 453.12,-224.23 387.62,-169.83 438.88,-115 443.11,-110.47 448.05,-106.69 453.41,-103.53" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="454.76,-106.76 462.19,-99.21 451.68,-100.48 454.76,-106.76" style=""/>
+</g>
+<!-- P2PIX.setReputation&#45;&gt;P2PIX.address -->
+<g id="edge73" class="edge" data-name="P2PIX.setReputation-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M368.12,-1572.81C381.51,-1568.71 394.22,-1561.96 402.88,-1551 467.81,-1468.81 374.37,-691.52 438.88,-609 448.78,-596.33 464.26,-589.36 479.77,-585.59" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="479.99,-589.11 489.15,-583.78 478.66,-582.24 479.99,-589.11" style=""/>
 </g>
 <!-- P2PIX.ReputationUpdated -->
-<g id="node40" class="node" pointer-events="visible" data-name="P2PIX.ReputationUpdated">
+<g id="node51" class="node" pointer-events="visible" data-name="P2PIX.ReputationUpdated">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1577" rx="86.26" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1572.8" font-family="Times,serif" font-size="14.00" style="">ReputationUpdated</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1524" rx="86.26" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1519.8" font-family="Times,serif" font-size="14.00" style="">ReputationUpdated</text>
 </g>
 <!-- P2PIX.setReputation&#45;&gt;P2PIX.ReputationUpdated -->
-<g id="edge55" class="edge" data-name="P2PIX.setReputation-&gt;P2PIX.ReputationUpdated">
+<g id="edge72" class="edge" data-name="P2PIX.setReputation-&gt;P2PIX.ReputationUpdated">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M372.75,-1577C392.55,-1577 414.81,-1577 436.36,-1577" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="436.28,-1580.5 446.28,-1577 436.28,-1573.5 436.28,-1580.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M356.43,-1565.95C387.01,-1558.64 426.51,-1549.21 460.31,-1541.14" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="461.09,-1544.55 470.01,-1538.82 459.47,-1537.74 461.09,-1544.55" style=""/>
 </g>
 <!-- P2PIX.LockBlocksUpdated -->
-<g id="node41" class="node" pointer-events="visible" data-name="P2PIX.LockBlocksUpdated">
+<g id="node52" class="node" pointer-events="visible" data-name="P2PIX.LockBlocksUpdated">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1631" rx="90.34" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1626.8" font-family="Times,serif" font-size="14.00" style="">LockBlocksUpdated</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1740" rx="90.34" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1735.8" font-family="Times,serif" font-size="14.00" style="">LockBlocksUpdated</text>
 </g>
 <!-- P2PIX.setDefaultLockBlocks&#45;&gt;P2PIX.LockBlocksUpdated -->
-<g id="edge56" class="edge" data-name="P2PIX.setDefaultLockBlocks-&gt;P2PIX.LockBlocksUpdated">
+<g id="edge74" class="edge" data-name="P2PIX.setDefaultLockBlocks-&gt;P2PIX.LockBlocksUpdated">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M405.66,-1631C414.5,-1631 423.47,-1631 432.36,-1631" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="432.27,-1634.5 442.27,-1631 432.27,-1627.5 432.27,-1634.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M403.5,-1740C411.73,-1740 420.08,-1740 428.36,-1740" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="428.26,-1743.5 438.26,-1740 428.26,-1736.5 428.26,-1743.5" style=""/>
 </g>
 <!-- P2PIX.setValidSigners&#45;&gt;P2PIX._castAddrToKey -->
-<g id="edge57" class="edge" data-name="P2PIX.setValidSigners-&gt;P2PIX._castAddrToKey">
+<g id="edge75" class="edge" data-name="P2PIX.setValidSigners-&gt;P2PIX._castAddrToKey">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M359.74,-1455.46C376.91,-1448.34 394.35,-1437.7 405.01,-1422 465.85,-1332.41 373.83,-1020.94 441.01,-936 445.67,-930.1 451.49,-925.34 457.94,-921.51" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="459.18,-924.8 466.59,-917.22 456.07,-918.53 459.18,-924.8" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M373.47,-1678.86C384.81,-1674.68 395.33,-1668.39 402.88,-1659 493.79,-1545.9 348.54,-1120.56 438.88,-1007 442.57,-1002.35 447.02,-998.47 451.94,-995.24" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="453.52,-998.36 460.69,-990.56 450.22,-992.19 453.52,-998.36" style=""/>
 </g>
 <!-- P2PIX.ValidSignersUpdated -->
-<g id="node42" class="node" pointer-events="visible" data-name="P2PIX.ValidSignersUpdated">
+<g id="node53" class="node" pointer-events="visible" data-name="P2PIX.ValidSignersUpdated">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1469" rx="94.35" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1464.8" font-family="Times,serif" font-size="14.00" style="">ValidSignersUpdated</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1686" rx="94.35" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1681.8" font-family="Times,serif" font-size="14.00" style="">ValidSignersUpdated</text>
 </g>
 <!-- P2PIX.setValidSigners&#45;&gt;P2PIX.ValidSignersUpdated -->
-<g id="edge58" class="edge" data-name="P2PIX.setValidSigners-&gt;P2PIX.ValidSignersUpdated">
+<g id="edge76" class="edge" data-name="P2PIX.setValidSigners-&gt;P2PIX.ValidSignersUpdated">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M380.78,-1469C395.87,-1469 412.09,-1469 428.13,-1469" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="427.92,-1472.5 437.92,-1469 427.92,-1465.5 427.92,-1472.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M378.76,-1686C393.38,-1686 409.03,-1686 424.55,-1686" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="424.5,-1689.5 434.5,-1686 424.5,-1682.5 424.5,-1689.5" style=""/>
 </g>
 <!-- P2PIX.&lt;Receive Ether&gt; -->
 <g id="node14" class="node" pointer-events="visible" data-name="P2PIX.&lt;Receive Ether&gt;">
 
-<ellipse fill="#ffbdb9" stroke="brown" stroke-width="3" cx="94.61" cy="-451" rx="76.21" ry="18" style=""/>
-<text text-anchor="middle" x="94.61" y="-446.8" font-family="Times,serif" font-size="14.00" style="">&lt;Receive Ether&gt;</text>
-</g>
-<!-- P2PIX._onlySeller&#45;&gt;P2PIX.OnlySeller -->
-<g id="edge59" class="edge" data-name="P2PIX._onlySeller-&gt;P2PIX.OnlySeller">
-
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M582.79,-951.62C608.3,-945.17 640.44,-937.05 667.58,-930.18" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="668.29,-933.62 677.12,-927.77 666.57,-926.83 668.29,-933.62" style=""/>
-</g>
-<!-- P2PIX.NotExpired -->
-<g id="node43" class="node" pointer-events="visible" data-name="P2PIX.NotExpired">
-
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="724.68" cy="-1197" rx="56.18" ry="18" style=""/>
-<text text-anchor="middle" x="724.68" y="-1192.8" font-family="Times,serif" font-size="14.00" style="">NotExpired</text>
+<ellipse fill="#ffbdb9" stroke="brown" stroke-width="3" cx="93.54" cy="-470" rx="76.21" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-465.8" font-family="Times,serif" font-size="14.00" style="">&lt;Receive Ether&gt;</text>
 </g>
 <!-- P2PIX._notExpired&#45;&gt;P2PIX.NotExpired -->
-<g id="edge60" class="edge" data-name="P2PIX._notExpired-&gt;P2PIX.NotExpired">
+<g id="edge77" class="edge" data-name="P2PIX._notExpired-&gt;P2PIX.NotExpired">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M589.14,-1080.14C603.87,-1084.19 619.48,-1089.92 632.59,-1098 661.5,-1115.82 686.96,-1145.34 703.56,-1167.52" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="700.71,-1169.55 709.41,-1175.59 706.38,-1165.44 700.71,-1169.55" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M581.93,-1099.01C596.78,-1103.18 612.97,-1108.52 627.23,-1115 655.18,-1127.71 684.28,-1146.62 705.81,-1161.87" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="703.72,-1164.67 713.88,-1167.68 707.82,-1159 703.72,-1164.67" style=""/>
 </g>
-<!-- P2PIX.DepositAlreadyExists -->
-<g id="node44" class="node" pointer-events="visible" data-name="P2PIX.DepositAlreadyExists">
+<!-- P2PIX._notExpired&#45;&gt;P2PIX.AlreadyReleased -->
+<g id="edge78" class="edge" data-name="P2PIX._notExpired-&gt;P2PIX.AlreadyReleased">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-478" rx="95.58" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-473.8" font-family="Times,serif" font-size="14.00" style="">DepositAlreadyExists</text>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M587,-1079.82C601.06,-1075.82 615.56,-1069.86 627.23,-1061 678.62,-1021.99 712.01,-951.99 728.04,-911.43" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="731.27,-912.79 731.56,-902.19 724.73,-910.29 731.27,-912.79" style=""/>
 </g>
-<!-- P2PIX._encodeDepositID&#45;&gt;P2PIX.DepositAlreadyExists -->
-<g id="edge62" class="edge" data-name="P2PIX._encodeDepositID-&gt;P2PIX.DepositAlreadyExists">
+<!-- P2PIX._addLock&#45;&gt;P2PIX._decBal -->
+<g id="edge79" class="edge" data-name="P2PIX._addLock-&gt;P2PIX._decBal">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M382.66,-496.16C401.09,-493.97 421.08,-491.6 440.34,-489.32" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="440.68,-492.8 450.2,-488.15 439.86,-485.85 440.68,-492.8" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M345.5,-1131.85C363.23,-1137.47 384.29,-1144.57 402.88,-1152 419.31,-1158.56 422.33,-1162.74 438.88,-1169 452.63,-1174.2 467.83,-1178.99 481.9,-1183.05" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="480.94,-1186.42 491.51,-1185.75 482.83,-1179.68 480.94,-1186.42" style=""/>
 </g>
-<!-- Counters.Counter.current -->
-<g id="node49" class="node" pointer-events="visible" data-name="Counters.Counter.current">
+<!-- P2PIX.LockAdded -->
+<g id="node54" class="node" pointer-events="visible" data-name="P2PIX.LockAdded">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-88" rx="38.26" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-83.8" font-family="Times,serif" font-size="14.00" style="">current</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-1250" rx="56.75" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-1245.8" font-family="Times,serif" font-size="14.00" style="">LockAdded</text>
 </g>
-<!-- P2PIX._encodeDepositID&#45;&gt;Counters.Counter.current -->
-<g id="edge61" class="edge" data-name="P2PIX._encodeDepositID-&gt;Counters.Counter.current">
+<!-- P2PIX._addLock&#45;&gt;P2PIX.LockAdded -->
+<g id="edge80" class="edge" data-name="P2PIX._addLock-&gt;P2PIX.LockAdded">
 
-<path fill="none" stroke="white" stroke-width="2" d="M380.59,-495.4C389.9,-491.34 398.46,-485.73 405.01,-478 501.83,-363.76 359.44,-268.58 441.01,-143 452.74,-124.94 472.63,-112.09 491.17,-103.39" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="492.49,-106.63 500.28,-99.45 489.71,-100.2 492.49,-106.63" style=""/>
-</g>
-<!-- P2PIX._encodeLockID&#45;&gt;P2PIX.NotExpired -->
-<g id="edge63" class="edge" data-name="P2PIX._encodeLockID-&gt;P2PIX.NotExpired">
-
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M564.04,-1306.07C596.41,-1283.95 651.62,-1246.24 687.87,-1221.47" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="689.68,-1224.46 695.97,-1215.93 685.74,-1218.68 689.68,-1224.46" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M352.13,-1127.47C369.58,-1132.16 388.64,-1139.76 402.88,-1152 429.7,-1175.07 411.63,-1200.43 438.88,-1223 447.17,-1229.87 457.14,-1235 467.43,-1238.82" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="466.1,-1242.06 476.69,-1241.8 468.24,-1235.4 466.1,-1242.06" style=""/>
 </g>
 <!-- P2PIX.AddressDenied -->
-<g id="node45" class="node" pointer-events="visible" data-name="P2PIX.AddressDenied">
+<g id="node55" class="node" pointer-events="visible" data-name="P2PIX.AddressDenied">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-1179" rx="70.64" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-1174.8" font-family="Times,serif" font-size="14.00" style="">AddressDenied</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-636" rx="70.64" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-631.8" font-family="Times,serif" font-size="14.00" style="">AddressDenied</text>
 </g>
 <!-- P2PIX.merkleVerify&#45;&gt;P2PIX.AddressDenied -->
-<g id="edge65" class="edge" data-name="P2PIX.merkleVerify-&gt;P2PIX.AddressDenied">
+<g id="edge82" class="edge" data-name="P2PIX.merkleVerify-&gt;P2PIX.AddressDenied">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M358.08,-1136.85C390.98,-1144.65 434.41,-1154.95 470.1,-1163.42" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="468.89,-1166.73 479.43,-1165.63 470.51,-1159.92 468.89,-1166.73" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M362.74,-610.54C391.47,-614.86 426.73,-620.16 457.62,-624.81" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="456.7,-628.21 467.11,-626.23 457.74,-621.28 456.7,-628.21" style=""/>
 </g>
 <!-- Merkle.verify -->
-<g id="node53" class="node" pointer-events="visible" data-name="Merkle.verify">
+<g id="node62" class="node" pointer-events="visible" data-name="Merkle.verify">
 
-<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="536.8" cy="-366" rx="34.19" ry="18" style=""/>
-<text text-anchor="middle" x="536.8" y="-361.8" font-family="Times,serif" font-size="14.00" style="">verify</text>
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-227" rx="34.19" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-222.8" font-family="Times,serif" font-size="14.00" style="">verify</text>
 </g>
 <!-- P2PIX.merkleVerify&#45;&gt;Merkle.verify -->
-<g id="edge64" class="edge" data-name="P2PIX.merkleVerify-&gt;Merkle.verify">
+<g id="edge81" class="edge" data-name="P2PIX.merkleVerify-&gt;Merkle.verify">
 
-<path fill="none" stroke="white" stroke-width="2" d="M369.38,-1119.94C383.05,-1115.87 396.1,-1109.1 405.01,-1098 499.28,-980.48 362.38,-549.51 441.01,-421 452.79,-401.74 474.03,-388.51 493.41,-379.87" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="494.72,-383.12 502.65,-376.1 492.07,-376.64 494.72,-383.12" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M366.73,-596.5C380.4,-592.44 393.59,-585.79 402.88,-575 488.46,-475.56 366.99,-391.75 438.88,-282 450.95,-263.57 471.52,-250.48 490.27,-241.71" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="491.64,-244.93 499.44,-237.75 488.87,-238.5 491.64,-244.93" style=""/>
+</g>
+<!-- P2PIX.getPixTarget -->
+<g id="node23" class="node" pointer-events="visible" data-name="P2PIX.getPixTarget">
+
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="93.54" cy="-407" rx="60.83" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-402.8" font-family="Times,serif" font-size="14.00" style="">getPixTarget</text>
+</g>
+<!-- P2PIX.getBalances -->
+<g id="node24" class="node" pointer-events="visible" data-name="P2PIX.getBalances">
+
+<ellipse fill="#ffbdb9" stroke="#ffbdb9" stroke-width="3" cx="304.98" cy="-366" rx="57.88" ry="18" style=""/>
+<text text-anchor="middle" x="304.98" y="-361.8" font-family="Times,serif" font-size="14.00" style="">getBalances</text>
+</g>
+<!-- P2PIX.getBalances&#45;&gt;P2PIX.getBalance -->
+<g id="edge87" class="edge" data-name="P2PIX.getBalances-&gt;P2PIX.getBalance">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M362.61,-370.44C377.69,-374.36 392.62,-381.21 402.88,-393 482.32,-484.35 359.9,-571.24 438.88,-663 446.3,-671.63 456.3,-677.58 466.99,-681.67" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="465.78,-684.96 476.37,-684.63 467.89,-678.28 465.78,-684.96" style=""/>
+</g>
+<!-- P2PIX.getBalances&#45;&gt;P2PIX.address -->
+<g id="edge83" class="edge" data-name="P2PIX.getBalances-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M363.49,-362.77C378.05,-366.4 392.48,-373.04 402.88,-384 453.63,-437.52 388.4,-492.22 438.88,-546 450.72,-558.62 468.08,-565.46 484.61,-569.71" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="483.51,-573.05 494.04,-571.84 485.05,-566.22 483.51,-573.05" style=""/>
+</g>
+<!-- P2PIX.getBalances&#45;&gt;P2PIX.address -->
+<g id="edge84" class="edge" data-name="P2PIX.getBalances-&gt;P2PIX.address">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M353.18,-377.36C370.98,-381.5 390.02,-388.44 402.88,-402 453.63,-455.52 388.4,-510.22 438.88,-564 449.86,-575.7 465.58,-582.44 480.99,-585.81" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="480.33,-589.25 490.76,-587.4 481.46,-582.34 480.33,-589.25" style=""/>
+</g>
+<!-- P2PIX.NoTokens -->
+<g id="node56" class="node" pointer-events="visible" data-name="P2PIX.NoTokens">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-366" rx="51.04" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-361.8" font-family="Times,serif" font-size="14.00" style="">NoTokens</text>
+</g>
+<!-- P2PIX.getBalances&#45;&gt;P2PIX.NoTokens -->
+<g id="edge85" class="edge" data-name="P2PIX.getBalances-&gt;P2PIX.NoTokens">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M364.2,-366C395.96,-366 435.34,-366 467.97,-366" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="467.55,-369.5 477.55,-366 467.55,-362.5 467.55,-369.5" style=""/>
+</g>
+<!-- P2PIX.LengthMismatch -->
+<g id="node57" class="node" pointer-events="visible" data-name="P2PIX.LengthMismatch">
+
+<ellipse fill="#edad56" stroke="#edad56" stroke-width="3" cx="533.05" cy="-420" rx="77.03" ry="18" style=""/>
+<text text-anchor="middle" x="533.05" y="-415.8" font-family="Times,serif" font-size="14.00" style="">LengthMismatch</text>
+</g>
+<!-- P2PIX.getBalances&#45;&gt;P2PIX.LengthMismatch -->
+<g id="edge86" class="edge" data-name="P2PIX.getBalances-&gt;P2PIX.LengthMismatch">
+
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M353.1,-377.25C385.16,-384.91 428.1,-395.17 463.89,-403.72" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="462.73,-407.04 473.27,-405.96 464.36,-400.23 462.73,-407.04" style=""/>
+</g>
+<!-- P2PIX._castKeyToAddr -->
+<g id="node26" class="node" pointer-events="visible" data-name="P2PIX._castKeyToAddr">
+
+<ellipse fill="#ff9797" stroke="#ff9797" stroke-width="3" cx="93.54" cy="-335" rx="77.58" ry="18" style=""/>
+<text text-anchor="middle" x="93.54" y="-330.8" font-family="Times,serif" font-size="14.00" style="">_castKeyToAddr</text>
 </g>
 <!-- key -->
-<g id="node54" class="node" pointer-events="visible" data-name="key">
+<g id="node63" class="node" pointer-events="visible" data-name="key">
 
-<polygon fill="#edad56" stroke="none" stroke-width="3" points="159.61,-1786 29.61,-1786 29.61,-1698 159.61,-1698 159.61,-1786" style=""/>
-<text text-anchor="start" x="79.24" y="-1767.4" font-family="Times,serif" font-size="14.00" style="">Internal Call</text>
-<text text-anchor="start" x="75.35" y="-1747.4" font-family="Times,serif" font-size="14.00" style="">External Call</text>
-<text text-anchor="start" x="52.81" y="-1727.4" font-family="Times,serif" font-size="14.00" style="">Defined Contract</text>
-<text text-anchor="start" x="39.21" y="-1707.4" font-family="Times,serif" font-size="14.00" style="">Undefined Contract</text>
+<polygon fill="#edad56" stroke="none" stroke-width="3" points="158.54,-1949 28.54,-1949 28.54,-1861 158.54,-1861 158.54,-1949" style=""/>
+<text text-anchor="start" x="78.18" y="-1930.4" font-family="Times,serif" font-size="14.00" style="">Internal Call</text>
+<text text-anchor="start" x="74.29" y="-1910.4" font-family="Times,serif" font-size="14.00" style="">External Call</text>
+<text text-anchor="start" x="51.74" y="-1890.4" font-family="Times,serif" font-size="14.00" style="">Defined Contract</text>
+<text text-anchor="start" x="38.14" y="-1870.4" font-family="Times,serif" font-size="14.00" style="">Undefined Contract</text>
 </g>
 <!-- key2 -->
-<g id="node55" class="node" pointer-events="visible" data-name="key2">
+<g id="node64" class="node" pointer-events="visible" data-name="key2">
 
-<polygon fill="#edad56" stroke="none" stroke-width="3" points="334.11,-1786 280.11,-1786 280.11,-1698 334.11,-1698 334.11,-1786" style=""/>
-<text text-anchor="start" x="297.11" y="-1767.4" font-family="Times,serif" font-size="14.00" style="">   </text>
-<text text-anchor="start" x="297.11" y="-1747.4" font-family="Times,serif" font-size="14.00" style="">   </text>
-<polygon fill="#445773" stroke="none" points="295.11,-1722 295.11,-1742 320.11,-1742 320.11,-1722 295.11,-1722" style=""/>
-<text text-anchor="start" x="297.11" y="-1727.4" font-family="Times,serif" font-size="14.00" style="">   </text>
-<polygon fill="none" stroke="#e8726d" points="297.11,-1704 297.11,-1720 318.11,-1720 318.11,-1704 297.11,-1704" style=""/>
+<polygon fill="#edad56" stroke="none" stroke-width="3" points="331.98,-1949 277.98,-1949 277.98,-1861 331.98,-1861 331.98,-1949" style=""/>
+<text text-anchor="start" x="294.98" y="-1930.4" font-family="Times,serif" font-size="14.00" style="">   </text>
+<text text-anchor="start" x="294.98" y="-1910.4" font-family="Times,serif" font-size="14.00" style="">   </text>
+<polygon fill="#445773" stroke="none" points="292.98,-1885 292.98,-1905 317.98,-1905 317.98,-1885 292.98,-1885" style=""/>
+<text text-anchor="start" x="294.98" y="-1890.4" font-family="Times,serif" font-size="14.00" style="">   </text>
+<polygon fill="none" stroke="#e8726d" points="294.98,-1867 294.98,-1883 315.98,-1883 315.98,-1867 294.98,-1867" style=""/>
 </g>
 <!-- key&#45;&gt;key2 -->
-<g id="edge66" class="edge" data-name="key-&gt;key2">
+<g id="edge88" class="edge" data-name="key-&gt;key2">
 
-<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M152.61,-1772C210.95,-1772 228.7,-1772 281.18,-1772" style=""/>
-<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="281.08,-1775.5 291.08,-1772 281.08,-1768.5 281.08,-1775.5" style=""/>
+<path fill="none" stroke="#1bc6a6" stroke-width="2" d="M151.54,-1935C209.45,-1935 227.06,-1935 279.15,-1935" style=""/>
+<polygon fill="#1bc6a6" stroke="#1bc6a6" stroke-width="2" points="278.95,-1938.5 288.95,-1935 278.95,-1931.5 278.95,-1938.5" style=""/>
 </g>
 <!-- key&#45;&gt;key2 -->
-<g id="edge67" class="edge" data-name="key-&gt;key2">
+<g id="edge89" class="edge" data-name="key-&gt;key2">
 
-<path fill="none" stroke="white" stroke-width="2" d="M152.61,-1752C210.95,-1752 228.7,-1752 281.18,-1752" style=""/>
-<polygon fill="white" stroke="white" stroke-width="2" points="281.08,-1755.5 291.08,-1752 281.08,-1748.5 281.08,-1755.5" style=""/>
+<path fill="none" stroke="white" stroke-width="2" d="M151.54,-1915C209.45,-1915 227.06,-1915 279.15,-1915" style=""/>
+<polygon fill="white" stroke="white" stroke-width="2" points="278.95,-1918.5 288.95,-1915 278.95,-1911.5 278.95,-1918.5" style=""/>
 </g>
 </g>
 </svg>
\ No newline at end of file
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 034426f..0c2b4b0 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -121,12 +121,14 @@ const config: HardhatUserConfig = {
   solidity: {
     version: "0.8.9",
     settings: {
+      // viaIR: true,
       metadata: {
         bytecodeHash: "none",
       },
       optimizer: {
         enabled: true,
-        runs: 2000,
+        // max val = 4_294_967_295
+        runs: 20_000,
       },
     },
   },
@@ -136,4 +138,4 @@ const config: HardhatUserConfig = {
   },
 };
 
-export default config;
+export default config;
\ No newline at end of file
diff --git a/package.json b/package.json
index 8ba5460..8c68673 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p2pix-smart-contracts",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Repository for P2Pix EVM contracts to be imported by the project.",
   "homepage": "https://github.com/doiim/p2pix-smart-contracts#readme",
   "author": "Filipe Soccol (doiim)",
diff --git a/scripts/1-deploy-mockToken.ts b/scripts/1-deploy-mockToken.ts
index 7c299e7..7ddfb6d 100644
--- a/scripts/1-deploy-mockToken.ts
+++ b/scripts/1-deploy-mockToken.ts
@@ -54,4 +54,4 @@ main()
   .catch(error => {
     console.log(error);
     process.exit(1);
-  });
+  });
\ No newline at end of file
diff --git a/scripts/2-deploy-p2pix.ts b/scripts/2-deploy-p2pix.ts
index cbcc6aa..0a070f9 100644
--- a/scripts/2-deploy-p2pix.ts
+++ b/scripts/2-deploy-p2pix.ts
@@ -62,6 +62,10 @@ const main = async () => {
       [true],
     ],
   });
+  await hre.run("verify:verify", {
+    address: reputation.address,
+    constructorArguments: [],
+  });
 };
 
 main()
@@ -69,4 +73,4 @@ main()
   .catch(error => {
     console.log(error);
     process.exit(1);
-  });
+  });
\ No newline at end of file
diff --git a/src/types/EventAndErrors.ts b/src/types/EventAndErrors.ts
index 473a415..10dc788 100644
--- a/src/types/EventAndErrors.ts
+++ b/src/types/EventAndErrors.ts
@@ -1,7 +1,13 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type { BaseContract, BigNumber, BytesLike, Signer, utils } from "ethers";
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  Signer,
+  utils,
+} from "ethers";
 import type { EventFragment } from "@ethersproject/abi";
 import type { Listener, Provider } from "@ethersproject/providers";
 import type {
@@ -17,22 +23,21 @@ export interface EventAndErrorsInterface extends utils.Interface {
 
   events: {
     "AllowedERC20Updated(address,bool)": EventFragment;
-    "DepositAdded(address,uint256,address,uint256)": EventFragment;
-    "DepositClosed(address,uint256)": EventFragment;
-    "DepositWithdrawn(address,uint256,uint256)": EventFragment;
+    "DepositAdded(address,address,uint256)": EventFragment;
+    "DepositWithdrawn(address,address,uint256)": EventFragment;
     "FundsWithdrawn(address,uint256)": EventFragment;
-    "LockAdded(address,bytes32,uint256,uint256)": EventFragment;
+    "LockAdded(address,uint256,uint256,uint256)": EventFragment;
     "LockBlocksUpdated(uint256)": EventFragment;
-    "LockReleased(address,bytes32,uint256)": EventFragment;
-    "LockReturned(address,bytes32)": EventFragment;
+    "LockReleased(address,uint256,uint256)": EventFragment;
+    "LockReturned(address,uint256)": EventFragment;
     "ReputationUpdated(address)": EventFragment;
     "RootUpdated(address,bytes32)": EventFragment;
+    "ValidSet(address,address,bool)": EventFragment;
     "ValidSignersUpdated(address[])": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "AllowedERC20Updated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DepositClosed"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositWithdrawn"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "FundsWithdrawn"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "LockAdded"): EventFragment;
@@ -41,6 +46,7 @@ export interface EventAndErrorsInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "LockReturned"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ReputationUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RootUpdated"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "ValidSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ValidSignersUpdated"): EventFragment;
 }
 
@@ -58,35 +64,23 @@ export type AllowedERC20UpdatedEventFilter =
 
 export interface DepositAddedEventObject {
   seller: string;
-  depositID: BigNumber;
   token: string;
   amount: BigNumber;
 }
 export type DepositAddedEvent = TypedEvent<
-  [string, BigNumber, string, BigNumber],
+  [string, string, BigNumber],
   DepositAddedEventObject
 >;
 
 export type DepositAddedEventFilter = TypedEventFilter<DepositAddedEvent>;
 
-export interface DepositClosedEventObject {
-  seller: string;
-  depositID: BigNumber;
-}
-export type DepositClosedEvent = TypedEvent<
-  [string, BigNumber],
-  DepositClosedEventObject
->;
-
-export type DepositClosedEventFilter = TypedEventFilter<DepositClosedEvent>;
-
 export interface DepositWithdrawnEventObject {
   seller: string;
-  depositID: BigNumber;
+  token: string;
   amount: BigNumber;
 }
 export type DepositWithdrawnEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
+  [string, string, BigNumber],
   DepositWithdrawnEventObject
 >;
 
@@ -106,12 +100,12 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
 
 export interface LockAddedEventObject {
   buyer: string;
-  lockID: string;
-  depositID: BigNumber;
+  lockID: BigNumber;
+  seller: BigNumber;
   amount: BigNumber;
 }
 export type LockAddedEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
+  [string, BigNumber, BigNumber, BigNumber],
   LockAddedEventObject
 >;
 
@@ -130,11 +124,11 @@ export type LockBlocksUpdatedEventFilter =
 
 export interface LockReleasedEventObject {
   buyer: string;
-  lockId: string;
+  lockId: BigNumber;
   amount: BigNumber;
 }
 export type LockReleasedEvent = TypedEvent<
-  [string, string, BigNumber],
+  [string, BigNumber, BigNumber],
   LockReleasedEventObject
 >;
 
@@ -142,10 +136,10 @@ export type LockReleasedEventFilter = TypedEventFilter<LockReleasedEvent>;
 
 export interface LockReturnedEventObject {
   buyer: string;
-  lockId: string;
+  lockId: BigNumber;
 }
 export type LockReturnedEvent = TypedEvent<
-  [string, string],
+  [string, BigNumber],
   LockReturnedEventObject
 >;
 
@@ -173,6 +167,18 @@ export type RootUpdatedEvent = TypedEvent<
 
 export type RootUpdatedEventFilter = TypedEventFilter<RootUpdatedEvent>;
 
+export interface ValidSetEventObject {
+  seller: string;
+  token: string;
+  state: boolean;
+}
+export type ValidSetEvent = TypedEvent<
+  [string, string, boolean],
+  ValidSetEventObject
+>;
+
+export type ValidSetEventFilter = TypedEventFilter<ValidSetEvent>;
+
 export interface ValidSignersUpdatedEventObject {
   signers: string[];
 }
@@ -224,36 +230,25 @@ export interface EventAndErrors extends BaseContract {
       state?: PromiseOrValue<boolean> | null
     ): AllowedERC20UpdatedEventFilter;
 
-    "DepositAdded(address,uint256,address,uint256)"(
+    "DepositAdded(address,address,uint256)"(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
       token?: null,
       amount?: null
     ): DepositAddedEventFilter;
     DepositAdded(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
       token?: null,
       amount?: null
     ): DepositAddedEventFilter;
 
-    "DepositClosed(address,uint256)"(
+    "DepositWithdrawn(address,address,uint256)"(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null
-    ): DepositClosedEventFilter;
-    DepositClosed(
-      seller?: PromiseOrValue<string> | null,
-      depositID?: null
-    ): DepositClosedEventFilter;
-
-    "DepositWithdrawn(address,uint256,uint256)"(
-      seller?: PromiseOrValue<string> | null,
-      depositID?: null,
+      token?: null,
       amount?: null
     ): DepositWithdrawnEventFilter;
     DepositWithdrawn(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
+      token?: null,
       amount?: null
     ): DepositWithdrawnEventFilter;
 
@@ -263,23 +258,23 @@ export interface EventAndErrors extends BaseContract {
     ): FundsWithdrawnEventFilter;
     FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
 
-    "LockAdded(address,bytes32,uint256,uint256)"(
+    "LockAdded(address,uint256,uint256,uint256)"(
       buyer?: PromiseOrValue<string> | null,
-      lockID?: PromiseOrValue<BytesLike> | null,
-      depositID?: null,
+      lockID?: PromiseOrValue<BigNumberish> | null,
+      seller?: null,
       amount?: null
     ): LockAddedEventFilter;
     LockAdded(
       buyer?: PromiseOrValue<string> | null,
-      lockID?: PromiseOrValue<BytesLike> | null,
-      depositID?: null,
+      lockID?: PromiseOrValue<BigNumberish> | null,
+      seller?: null,
       amount?: null
     ): LockAddedEventFilter;
 
     "LockBlocksUpdated(uint256)"(blocks?: null): LockBlocksUpdatedEventFilter;
     LockBlocksUpdated(blocks?: null): LockBlocksUpdatedEventFilter;
 
-    "LockReleased(address,bytes32,uint256)"(
+    "LockReleased(address,uint256,uint256)"(
       buyer?: PromiseOrValue<string> | null,
       lockId?: null,
       amount?: null
@@ -290,7 +285,7 @@ export interface EventAndErrors extends BaseContract {
       amount?: null
     ): LockReleasedEventFilter;
 
-    "LockReturned(address,bytes32)"(
+    "LockReturned(address,uint256)"(
       buyer?: PromiseOrValue<string> | null,
       lockId?: null
     ): LockReturnedEventFilter;
@@ -310,6 +305,17 @@ export interface EventAndErrors extends BaseContract {
     ): RootUpdatedEventFilter;
     RootUpdated(seller?: null, merkleRoot?: null): RootUpdatedEventFilter;
 
+    "ValidSet(address,address,bool)"(
+      seller?: PromiseOrValue<string> | null,
+      token?: null,
+      state?: null
+    ): ValidSetEventFilter;
+    ValidSet(
+      seller?: PromiseOrValue<string> | null,
+      token?: null,
+      state?: null
+    ): ValidSetEventFilter;
+
     "ValidSignersUpdated(address[])"(
       signers?: null
     ): ValidSignersUpdatedEventFilter;
diff --git a/src/types/factories/EventAndErrors__factory.ts b/src/types/factories/EventAndErrors__factory.ts
index 719e1fe..5c59807 100644
--- a/src/types/factories/EventAndErrors__factory.ts
+++ b/src/types/factories/EventAndErrors__factory.ts
@@ -25,11 +25,21 @@ const _abi = [
     name: "AmountNotAllowed",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "DecOverflow",
+    type: "error",
+  },
   {
     inputs: [],
     name: "DepositAlreadyExists",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "EmptyPixTarget",
+    type: "error",
+  },
   {
     inputs: [],
     name: "InvalidDeposit",
@@ -55,6 +65,11 @@ const _abi = [
     name: "LoopOverflow",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "MaxBalExceeded",
+    type: "error",
+  },
   {
     inputs: [],
     name: "NoTokens",
@@ -70,6 +85,11 @@ const _abi = [
     name: "NotExpired",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "NotInitialized",
+    type: "error",
+  },
   {
     inputs: [],
     name: "OnlySeller",
@@ -118,12 +138,6 @@ const _abi = [
         name: "seller",
         type: "address",
       },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
       {
         indexed: false,
         internalType: "address",
@@ -151,29 +165,10 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
-    ],
-    name: "DepositClosed",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
         internalType: "address",
-        name: "seller",
+        name: "token",
         type: "address",
       },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
       {
         indexed: false,
         internalType: "uint256",
@@ -214,14 +209,14 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockID",
-        type: "bytes32",
+        type: "uint256",
       },
       {
         indexed: false,
         internalType: "uint256",
-        name: "depositID",
+        name: "seller",
         type: "uint256",
       },
       {
@@ -258,9 +253,15 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockId",
-        type: "bytes32",
+        type: "uint256",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
       },
       {
         indexed: false,
@@ -283,9 +284,9 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockId",
-        type: "bytes32",
+        type: "uint256",
       },
     ],
     name: "LockReturned",
@@ -323,6 +324,31 @@ const _abi = [
     name: "RootUpdated",
     type: "event",
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "seller",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "bool",
+        name: "state",
+        type: "bool",
+      },
+    ],
+    name: "ValidSet",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [
diff --git a/src/types/factories/lib/mock/mockToken.sol/MockToken__factory.ts b/src/types/factories/lib/mock/mockToken.sol/MockToken__factory.ts
index 97aed4d..1cdd955 100644
--- a/src/types/factories/lib/mock/mockToken.sol/MockToken__factory.ts
+++ b/src/types/factories/lib/mock/mockToken.sol/MockToken__factory.ts
@@ -346,7 +346,7 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60e06040523480156200001157600080fd5b50604051620010bf380380620010bf833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610cf4620003cb60003960006104630152600061042e015260006101540152610cf46000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906108fc565b60405180910390f35b61011561011036600461096d565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610997565b610338565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e61042a565b61012e61019e3660046109d3565b60036020526000908152604090205481565b61012e6101be3660046109d3565b60056020526000908152604090205481565b6100ec610485565b6101156101e636600461096d565b610492565b6101fe6101f93660046109f5565b61050a565b005b61012e61020e366004610a68565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610ab1565b6107b1565b6000805461024b90610b7c565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610b7c565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103279086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103945761036f8382610bcd565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b038516600090815260036020526040812080548592906103bc908490610bcd565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104179087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104605761045b6107f7565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610b7c565b336000908152600360205260408120805483919083906104b3908490610bcd565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103279086815260200190565b42841015610579576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161058561042a565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f19010000000000000000000000000000000000000000000000000000000000006101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa1580156106ac573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116158015906106e25750876001600160a01b0316816001600160a01b0316145b610748576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610570565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156107f1576107e18482815181106107d3576107d3610be4565b602002602001015184610891565b6107ea81610bfa565b90506107b6565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516108299190610c15565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546108a39190610ccf565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b818110156109295785810183015185820160400152820161090d565b8181111561093b576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461096857600080fd5b919050565b6000806040838503121561098057600080fd5b61098983610951565b946020939093013593505050565b6000806000606084860312156109ac57600080fd5b6109b584610951565b92506109c360208501610951565b9150604084013590509250925092565b6000602082840312156109e557600080fd5b6109ee82610951565b9392505050565b600080600080600080600060e0888a031215610a1057600080fd5b610a1988610951565b9650610a2760208901610951565b95506040880135945060608801359350608088013560ff81168114610a4b57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610a7b57600080fd5b610a8483610951565b9150610a9260208401610951565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610ac457600080fd5b823567ffffffffffffffff80821115610adc57600080fd5b818501915085601f830112610af057600080fd5b8135602082821115610b0457610b04610a9b565b8160051b604051601f19603f83011681018181108682111715610b2957610b29610a9b565b604052928352818301935084810182019289841115610b4757600080fd5b948201945b83861015610b6c57610b5d86610951565b85529482019493820193610b4c565b9997909101359750505050505050565b600181811c90821680610b9057607f821691505b60208210811415610bb157634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082821015610bdf57610bdf610bb7565b500390565b634e487b7160e01b600052603260045260246000fd5b6000600019821415610c0e57610c0e610bb7565b5060010190565b600080835481600182811c915080831680610c3157607f831692505b6020808410821415610c5157634e487b7160e01b86526022600452602486fd5b818015610c655760018114610c9457610cc1565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610cc1565b60008a81526020902060005b86811015610cb95781548b820152908501908301610ca0565b505084890196505b509498975050505050505050565b60008219821115610ce257610ce2610bb7565b50019056fea164736f6c6343000809000a";
+  "0x60e06040523480156200001157600080fd5b506040516200129938038062001299833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610ece620003cb60003960006104c20152600061048d015260006101540152610ece6000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906109f2565b60405180910390f35b610115610110366004610a8e565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610ab8565b610345565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e610489565b61012e61019e366004610af4565b60036020526000908152604090205481565b61012e6101be366004610af4565b60056020526000908152604090205481565b6100ec6104e4565b6101156101e6366004610a8e565b6104f1565b6101fe6101f9366004610b16565b610576565b005b61012e61020e366004610b89565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610beb565b61089a565b6000805461024b90610cd4565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610cd4565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103349086815260200190565b60405180910390a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff831660009081526004602090815260408083203384529091528120547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146103d9576103a78382610d57565b73ffffffffffffffffffffffffffffffffffffffff861660009081526004602090815260408083203384529091529020555b73ffffffffffffffffffffffffffffffffffffffff85166000908152600360205260408120805485929061040e908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104769087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104bf576104ba6108e0565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610cd4565b33600090815260036020526040812080548391908390610512908490610d57565b909155505073ffffffffffffffffffffffffffffffffffffffff8316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103349086815260200190565b428410156105e5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b600060016105f1610489565b73ffffffffffffffffffffffffffffffffffffffff8a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e0830190915280519201919091207f190100000000000000000000000000000000000000000000000000000000000061010083015261010282019290925261012281019190915261014201604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610743573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015191505073ffffffffffffffffffffffffffffffffffffffff8116158015906107be57508773ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16145b610824576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f494e56414c49445f5349474e455200000000000000000000000000000000000060448201526064016105dc565b73ffffffffffffffffffffffffffffffffffffffff90811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156108da576108ca8482815181106108bc576108bc610d6e565b60200260200101518461097a565b6108d381610d9d565b905061089f565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516109129190610dd6565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b806002600082825461098c9190610ea9565b909155505073ffffffffffffffffffffffffffffffffffffffff82166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b81811015610a1f57858101830151858201604001528201610a03565b81811115610a31576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b803573ffffffffffffffffffffffffffffffffffffffff81168114610a8957600080fd5b919050565b60008060408385031215610aa157600080fd5b610aaa83610a65565b946020939093013593505050565b600080600060608486031215610acd57600080fd5b610ad684610a65565b9250610ae460208501610a65565b9150604084013590509250925092565b600060208284031215610b0657600080fd5b610b0f82610a65565b9392505050565b600080600080600080600060e0888a031215610b3157600080fd5b610b3a88610a65565b9650610b4860208901610a65565b95506040880135945060608801359350608088013560ff81168114610b6c57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610b9c57600080fd5b610ba583610a65565b9150610bb360208401610a65565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060408385031215610bfe57600080fd5b823567ffffffffffffffff80821115610c1657600080fd5b818501915085601f830112610c2a57600080fd5b8135602082821115610c3e57610c3e610bbc565b8160051b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f83011681018181108682111715610c8157610c81610bbc565b604052928352818301935084810182019289841115610c9f57600080fd5b948201945b83861015610cc457610cb586610a65565b85529482019493820193610ca4565b9997909101359750505050505050565b600181811c90821680610ce857607f821691505b60208210811415610d22577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015610d6957610d69610d28565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610dcf57610dcf610d28565b5060010190565b600080835481600182811c915080831680610df257607f831692505b6020808410821415610e2b577f4e487b710000000000000000000000000000000000000000000000000000000086526022600452602486fd5b818015610e3f5760018114610e6e57610e9b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00861689528489019650610e9b565b60008a81526020902060005b86811015610e935781548b820152908501908301610e7a565b505084890196505b509498975050505050505050565b60008219821115610ebc57610ebc610d28565b50019056fea164736f6c6343000809000a";
 
 type MockTokenConstructorParams =
   | [signer?: Signer]
diff --git a/src/types/factories/lib/utils/Counters__factory.ts b/src/types/factories/lib/utils/Counters__factory.ts
deleted file mode 100644
index 462a466..0000000
--- a/src/types/factories/lib/utils/Counters__factory.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
-import type { Provider, TransactionRequest } from "@ethersproject/providers";
-import type { PromiseOrValue } from "../../../common";
-import type { Counters, CountersInterface } from "../../../lib/utils/Counters";
-
-const _abi = [
-  {
-    inputs: [],
-    name: "DecOverflow",
-    type: "error",
-  },
-];
-
-const _bytecode =
-  "0x602d6037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c6343000809000a";
-
-type CountersConstructorParams =
-  | [signer?: Signer]
-  | ConstructorParameters<typeof ContractFactory>;
-
-const isSuperArgs = (
-  xs: CountersConstructorParams
-): xs is ConstructorParameters<typeof ContractFactory> => xs.length > 1;
-
-export class Counters__factory extends ContractFactory {
-  constructor(...args: CountersConstructorParams) {
-    if (isSuperArgs(args)) {
-      super(...args);
-    } else {
-      super(_abi, _bytecode, args[0]);
-    }
-  }
-
-  override deploy(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<Counters> {
-    return super.deploy(overrides || {}) as Promise<Counters>;
-  }
-  override getDeployTransaction(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): TransactionRequest {
-    return super.getDeployTransaction(overrides || {});
-  }
-  override attach(address: string): Counters {
-    return super.attach(address) as Counters;
-  }
-  override connect(signer: Signer): Counters__factory {
-    return super.connect(signer) as Counters__factory;
-  }
-
-  static readonly bytecode = _bytecode;
-  static readonly abi = _abi;
-  static createInterface(): CountersInterface {
-    return new utils.Interface(_abi) as CountersInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Counters {
-    return new Contract(address, _abi, signerOrProvider) as Counters;
-  }
-}
diff --git a/src/types/factories/lib/utils/index.ts b/src/types/factories/lib/utils/index.ts
index 457edaa..6d82c4c 100644
--- a/src/types/factories/lib/utils/index.ts
+++ b/src/types/factories/lib/utils/index.ts
@@ -1,5 +1,4 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-export { Counters__factory } from "./Counters__factory";
 export { ReentrancyGuard__factory } from "./ReentrancyGuard__factory";
diff --git a/src/types/factories/p2pix.sol/P2PIX__factory.ts b/src/types/factories/p2pix.sol/P2PIX__factory.ts
index 985a949..03dd610 100644
--- a/src/types/factories/p2pix.sol/P2PIX__factory.ts
+++ b/src/types/factories/p2pix.sol/P2PIX__factory.ts
@@ -60,11 +60,21 @@ const _abi = [
     name: "AmountNotAllowed",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "DecOverflow",
+    type: "error",
+  },
   {
     inputs: [],
     name: "DepositAlreadyExists",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "EmptyPixTarget",
+    type: "error",
+  },
   {
     inputs: [],
     name: "InvalidDeposit",
@@ -90,6 +100,11 @@ const _abi = [
     name: "LoopOverflow",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "MaxBalExceeded",
+    type: "error",
+  },
   {
     inputs: [],
     name: "NoTokens",
@@ -105,6 +120,11 @@ const _abi = [
     name: "NotExpired",
     type: "error",
   },
+  {
+    inputs: [],
+    name: "NotInitialized",
+    type: "error",
+  },
   {
     inputs: [],
     name: "OnlySeller",
@@ -158,12 +178,6 @@ const _abi = [
         name: "seller",
         type: "address",
       },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
       {
         indexed: false,
         internalType: "address",
@@ -191,29 +205,10 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
-    ],
-    name: "DepositClosed",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
         internalType: "address",
-        name: "seller",
+        name: "token",
         type: "address",
       },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
       {
         indexed: false,
         internalType: "uint256",
@@ -254,14 +249,14 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockID",
-        type: "bytes32",
+        type: "uint256",
       },
       {
         indexed: false,
         internalType: "uint256",
-        name: "depositID",
+        name: "seller",
         type: "uint256",
       },
       {
@@ -298,9 +293,15 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockId",
-        type: "bytes32",
+        type: "uint256",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
       },
       {
         indexed: false,
@@ -323,9 +324,9 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockId",
-        type: "bytes32",
+        type: "uint256",
       },
     ],
     name: "LockReturned",
@@ -382,6 +383,31 @@ const _abi = [
     name: "RootUpdated",
     type: "event",
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "seller",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "bool",
+        name: "state",
+        type: "bool",
+      },
+    ],
+    name: "ValidSet",
+    type: "event",
+  },
   {
     anonymous: false,
     inputs: [
@@ -427,6 +453,25 @@ const _abi = [
     stateMutability: "pure",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "_key",
+        type: "uint256",
+      },
+    ],
+    name: "_castKeyToAddr",
+    outputs: [
+      {
+        internalType: "address",
+        name: "_addr",
+        type: "address",
+      },
+    ],
+    stateMutability: "pure",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -446,19 +491,6 @@ const _abi = [
     stateMutability: "view",
     type: "function",
   },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
-    ],
-    name: "cancelDeposit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
   {
     inputs: [],
     name: "defaultLockBlocks",
@@ -480,14 +512,19 @@ const _abi = [
         type: "address",
       },
       {
-        internalType: "uint256",
+        internalType: "uint96",
         name: "_amount",
-        type: "uint256",
+        type: "uint96",
       },
       {
-        internalType: "string",
+        internalType: "uint160",
         name: "_pixTarget",
-        type: "string",
+        type: "uint160",
+      },
+      {
+        internalType: "bool",
+        name: "_valid",
+        type: "bool",
       },
       {
         internalType: "bytes32",
@@ -496,23 +533,28 @@ const _abi = [
       },
     ],
     name: "deposit",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "depositID",
-        type: "uint256",
-      },
-    ],
+    outputs: [],
     stateMutability: "nonpayable",
     type: "function",
   },
   {
-    inputs: [],
-    name: "depositCount",
+    inputs: [
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address",
+      },
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
+    ],
+    name: "getBalance",
     outputs: [
       {
         internalType: "uint256",
-        name: "_val",
+        name: "bal",
         type: "uint256",
       },
     ],
@@ -522,9 +564,86 @@ const _abi = [
   {
     inputs: [
       {
-        internalType: "uint256",
-        name: "_depositID",
-        type: "uint256",
+        internalType: "address[]",
+        name: "sellers",
+        type: "address[]",
+      },
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
+    ],
+    name: "getBalances",
+    outputs: [
+      {
+        internalType: "uint256[]",
+        name: "",
+        type: "uint256[]",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address",
+      },
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
+    ],
+    name: "getPixTarget",
+    outputs: [
+      {
+        internalType: "uint160",
+        name: "pixTarget",
+        type: "uint160",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address",
+      },
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
+    ],
+    name: "getValid",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "valid",
+        type: "bool",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "_seller",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "_token",
+        type: "address",
       },
       {
         internalType: "address",
@@ -552,57 +671,31 @@ const _abi = [
         type: "bytes32[]",
       },
       {
-        internalType: "bytes32[]",
+        internalType: "uint256[]",
         name: "expiredLocks",
-        type: "bytes32[]",
+        type: "uint256[]",
       },
     ],
     name: "lock",
     outputs: [
-      {
-        internalType: "bytes32",
-        name: "lockID",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
       {
         internalType: "uint256",
         name: "",
         type: "uint256",
       },
     ],
-    name: "mapDeposits",
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "lockCounter",
     outputs: [
       {
         internalType: "uint256",
-        name: "remaining",
+        name: "",
         type: "uint256",
       },
-      {
-        internalType: "string",
-        name: "pixTarget",
-        type: "string",
-      },
-      {
-        internalType: "address",
-        name: "seller",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "token",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "valid",
-        type: "bool",
-      },
     ],
     stateMutability: "view",
     type: "function",
@@ -610,16 +703,21 @@ const _abi = [
   {
     inputs: [
       {
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "",
-        type: "bytes32",
+        type: "uint256",
       },
     ],
     name: "mapLocks",
     outputs: [
       {
         internalType: "uint256",
-        name: "depositID",
+        name: "sellerKey",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "counter",
         type: "uint256",
       },
       {
@@ -637,6 +735,11 @@ const _abi = [
         name: "expirationBlock",
         type: "uint256",
       },
+      {
+        internalType: "uint160",
+        name: "pixTarget",
+        type: "uint160",
+      },
       {
         internalType: "address",
         name: "buyerAddress",
@@ -652,6 +755,11 @@ const _abi = [
         name: "relayerAddress",
         type: "address",
       },
+      {
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
     ],
     stateMutability: "view",
     type: "function",
@@ -672,9 +780,9 @@ const _abi = [
   {
     inputs: [
       {
-        internalType: "bytes32",
+        internalType: "uint256",
         name: "lockID",
-        type: "bytes32",
+        type: "uint256",
       },
       {
         internalType: "address",
@@ -739,6 +847,30 @@ const _abi = [
     stateMutability: "view",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+      {
+        internalType: "contract ERC20",
+        name: "",
+        type: "address",
+      },
+    ],
+    name: "sellerBalance",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -809,6 +941,24 @@ const _abi = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
+      {
+        internalType: "bool",
+        name: "state",
+        type: "bool",
+      },
+    ],
+    name: "setValidState",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -830,9 +980,9 @@ const _abi = [
   {
     inputs: [
       {
-        internalType: "bytes32[]",
+        internalType: "uint256[]",
         name: "lockIDs",
-        type: "bytes32[]",
+        type: "uint256[]",
       },
     ],
     name: "unlockExpired",
@@ -899,15 +1049,20 @@ const _abi = [
   },
   {
     inputs: [
+      {
+        internalType: "contract ERC20",
+        name: "token",
+        type: "address",
+      },
       {
         internalType: "uint256",
-        name: "depositID",
+        name: "amount",
         type: "uint256",
       },
       {
-        internalType: "bytes32[]",
+        internalType: "uint256[]",
         name: "expiredLocks",
-        type: "bytes32[]",
+        type: "uint256[]",
       },
     ],
     name: "withdraw",
@@ -929,7 +1084,7 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60806040526001805560405162002a9a38038062002a9a8339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61246a80620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611d07565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611e14565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611e51565b6106ec565b34801561023f57600080fd5b5061029861024e366004611d07565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611e6e565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611f4b565b610991565b34801561033f57600080fd5b5061036361034e366004611d07565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611e51565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611d07565b610a51565b3480156103ca57600080fd5b50610211610acf565b3480156103df57600080fd5b506103636103ee366004611e51565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611d07565b610b59565b34801561044b57600080fd5b5061021161045a366004611f97565b610be1565b34801561046b57600080fd5b506101de61047a366004611d07565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611ffb565b61103a565b3480156104b857600080fd5b506101de6104c7366004612027565b6110e6565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f3660046120db565b611311565b34801561053057600080fd5b5061054461053f366004611d07565b611479565b6040516101e895949392919061211d565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611d07565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d63660046121aa565b611543565b3480156105e757600080fd5b506102116105f6366004611e51565b61161b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612274565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e1919061228a565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107e1576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107e96116a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a1660408201526001606090910152905061085e6116b2565b831561086e5761086e338561103a565b600083815260076020908152604090912082518155818301518051849361089c926001850192910190611c6e565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556109269080546001019055565b6109328233308a6116f6565b61093b60018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109996116b2565b6109a2836117a6565b6109ac8282611311565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109dc576109dc84610b59565b600381015481546000835560028301546001600160a01b0392831692610a0591849116836117fc565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a4c60018055565b505050565b6000546001600160a01b03163314610a9a5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610b185760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b2333826118a1565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b62816117a6565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610be96116b2565b60008681526008602052604090206002810154610c32576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b4381600301541015610c70576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610ca092600186019290918b9101612312565b604051602081830303815290604052805190602001209050600081604051602001610cf791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d5e576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610dd29060019060a0016020604051602081039080840390855afa158015610db6573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610e1d576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610e4590836123cf565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610ef6576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb69084906123e6565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610eeb9084906123e6565b90915550610f389050565b818860010154610f0691906123e6565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610f329084906123e6565b90915550505b6004880154610f529084906001600160a01b0316836117fc565b600188015415610fbe5760058801546001600160a01b038e8116911614610faf5760058801546001808a0154610f979286926001600160a01b0390911691901c6117fc565b610faa838e60018b60010154901c6117fc565b610fbe565b610fbe838e8a600101546117fc565b8760040160009054906101000a90046001600160a01b03166001600160a01b03167f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece38f84604051611019929190918252602082015260400190565b60405180910390a2505050505050505061103260018055565b505050505050565b6001600160a01b0382163314156110b457611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006110f06116b2565b6110fa8383611311565b60008a81526007602052604090206003810154600160a01b900460ff1661114d576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8054871115611188576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6111938b888c6118fc565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436111c291906123e6565b81526001600160a01b03808e1660208301528c166040820152336060909101529050851561122b576002820154600c1b611000600160ac1b03166000908152600a60205260409020546112199088908890336119ac565b6112248382846119f7565b50506112fb565b68056bc75e2d6310000081604001511161124a576112248382846119f7565b611000600160ac1b0333600c1b166000908152600560205260408120549061128261127d670de0b6b3a7640000846123fe565b611af5565b9050611296670de0b6b3a764000082612420565b836040015111806112b4575069d3c21bcecceda10000008360400151115b156112eb576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6112f68584866119f7565b505050505b61130460018055565b9998505050505050505050565b6000815b8082101561145d5760006008600086868681811061133557611335612274565b905060200201358152602001908152602001600020905061135581611bb1565b600281015481546000908152600760205260408120805490919061137a9084906123e6565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116113de57600082815260056020526040902068056bc75e2d6310000090556113f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061143157611431612274565b9050602002013560405161144791815260200190565b60405180910390a2846001019450505050611315565b808210156114735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161149b906122d7565b80601f01602080910402602001604051908101604052809291908181526020018280546114c7906122d7565b80156115145780601f106114e957610100808354040283529160200191611514565b820191906000526020600020905b8154815290600101906020018083116114f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461158c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806115a15763df9578836000526004601cfd5b815181146115b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314611032578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506115c6565b6000546001600160a01b031633146116645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006116ad60035490565b905090565b600154600214156116ef576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061179f5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146117f9576040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806114735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a4c5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106119a5576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9392505050565b6119c18484846001600160a01b038516611c2a565b611473576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611a9d9084906123cf565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b83604051602401611b1391815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611ba85763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611bef576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60028101546117f9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008315611c66578360051b8501855b803580851160051b94855260209485185260406000209301818110611c5e57611c63565b611c3a565b50505b501492915050565b828054611c7a906122d7565b90600052602060002090601f016020900481019282611c9c5760008555611ce2565b82601f10611cb557805160ff1916838001178555611ce2565b82800160010185558215611ce2579182015b82811115611ce2578251825591602001919060010190611cc7565b50611cee929150611cf2565b5090565b5b80821115611cee5760008155600101611cf3565b600060208284031215611d1957600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611d5f57611d5f611d20565b604052919050565b600067ffffffffffffffff821115611d8157611d81611d20565b5060051b60200190565b6001600160a01b03811681146117f957600080fd5b600082601f830112611db157600080fd5b81356020611dc6611dc183611d67565b611d36565b82815260059290921b84018101918181019086841115611de557600080fd5b8286015b84811015611e09578035611dfc81611d8b565b8352918301918301611de9565b509695505050505050565b600060208284031215611e2657600080fd5b813567ffffffffffffffff811115611e3d57600080fd5b611e4984828501611da0565b949350505050565b600060208284031215611e6357600080fd5b81356119a581611d8b565b600080600080600060808688031215611e8657600080fd5b8535611e9181611d8b565b945060208601359350604086013567ffffffffffffffff80821115611eb557600080fd5b818801915088601f830112611ec957600080fd5b813581811115611ed857600080fd5b896020828501011115611eea57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611f1157600080fd5b50813567ffffffffffffffff811115611f2957600080fd5b6020830191508360208260051b8501011115611f4457600080fd5b9250929050565b600080600060408486031215611f6057600080fd5b83359250602084013567ffffffffffffffff811115611f7e57600080fd5b611f8a86828701611eff565b9497909650939450505050565b60008060008060008060c08789031215611fb057600080fd5b863595506020870135611fc281611d8b565b945060408701359350606087013592506080870135915060a087013560ff81168114611fed57600080fd5b809150509295509295509295565b6000806040838503121561200e57600080fd5b823561201981611d8b565b946020939093013593505050565b600080600080600080600080600060e08a8c03121561204557600080fd5b8935985060208a013561205781611d8b565b975060408a013561206781611d8b565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff8082111561209257600080fd5b61209e8d838e01611eff565b909650945060c08c01359150808211156120b757600080fd5b506120c48c828d01611eff565b915080935050809150509295985092959850929598565b600080602083850312156120ee57600080fd5b823567ffffffffffffffff81111561210557600080fd5b61211185828601611eff565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156121515788810183015185820160c001528201612135565b8181111561216357600060c083870101525b50601f01601f1916830160c0019150612189905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b600080604083850312156121bd57600080fd5b823567ffffffffffffffff808211156121d557600080fd5b6121e186838701611da0565b93506020915081850135818111156121f857600080fd5b85019050601f8101861361220b57600080fd5b8035612219611dc182611d67565b81815260059190911b8201830190838101908883111561223857600080fd5b928401925b8284101561226557833580151581146122565760008081fd5b8252928401929084019061223d565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156122cb5783516001600160a01b0316835292840192918401916001016122a6565b50909695505050505050565b600181811c908216806122eb57607f821691505b6020821081141561230c57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061232e57607f831692505b602080841082141561234e57634e487b7160e01b86526022600452602486fd5b8180156123625760018114612373576123a0565b60ff198616895284890196506123a0565b60008c81526020902060005b868110156123985781548b82015290850190830161237f565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156123e1576123e16123b9565b500390565b600082198211156123f9576123f96123b9565b500190565b60008261241b57634e487b7160e01b600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612458576124586123b9565b50029056fea164736f6c6343000809000a";
+  "0x608060405260018055604051620031f9380380620031f98339810160408190526200002a9162000493565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000616565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005b1565b60200260200101516200038760201b60201c565b6000908152600860205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005c7565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083018260051b82015b8083146200037f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b90565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003ce57620003ce6200038d565b604052919050565b60006001600160401b03821115620003f257620003f26200038d565b5060051b60200190565b6001600160a01b03811681146200041257600080fd5b50565b600082601f8301126200042757600080fd5b81516020620004406200043a83620003d6565b620003a3565b82815260059290921b840181019181810190868411156200046057600080fd5b8286015b84811015620004885780516200047a81620003fc565b835291830191830162000464565b509695505050505050565b600080600080600060a08688031215620004ac57600080fd5b8551602080880151919650906001600160401b0380821115620004ce57600080fd5b620004dc8a838b0162000415565b965060408901519150620004f082620003fc565b6060890151919550808211156200050657600080fd5b620005148a838b0162000415565b945060808901519150808211156200052b57600080fd5b508701601f810189136200053e57600080fd5b80516200054f6200043a82620003d6565b81815260059190911b8201830190838101908b8311156200056f57600080fd5b928401925b828410156200059f57835180151581146200058f5760008081fd5b8252928401929084019062000574565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156200060a5783516001600160a01b031683529284019291840191600101620005e3565b50909695505050505050565b612bd380620006266000396000f3fe6080604052600436106101dc5760003560e01c80637f94f65d11610102578063ad8f2eed11610095578063d4fac45d11610064578063d4fac45d14610713578063d6e8b9731461075e578063f7d0e04b1461077e578063fb8c5ef01461079e57600080fd5b8063ad8f2eed14610659578063b0983d3914610699578063c52164c6146106b9578063d1c07028146106e657600080fd5b80638db564c2116100d15780638db564c2146105c55780639872dbfe146105db57806398a26871146105f15780639eee8d4b1461062157600080fd5b80637f94f65d146104f257806380e1d3021461051257806384ab1d28146105525780638da5cb5b1461059857600080fd5b80634b2ae9801161017a5780636a146024116101495780636a146024146104695780636d82d9e01461048557806374ba03a0146104a557806377cd38a4146104c557600080fd5b80634b2ae980146103e3578063574983c8146104045780635fd8c7101461042457806369cc6af41461043957600080fd5b806313af4035116101b657806313af40351461026a578063328a71811461028a578063367821f0146102aa578063461f3120146103a357600080fd5b806304937320146101e85780630a98b9bd146102285780630d2a2d441461024857600080fd5b366101e357005b600080fd5b3480156101f457600080fd5b506102156102033660046123d5565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561023457600080fd5b5061021561024336600461245c565b6107be565b34801561025457600080fd5b50610268610263366004612643565b610b6d565b005b34801561027657600080fd5b50610268610285366004612680565b610ca7565b34801561029657600080fd5b506102686102a53660046126b9565b610d98565b3480156102b657600080fd5b506103376102c53660046123d5565b6005602081905260009182526040909120805460018201546002830154600384015460048501549585015460068601546007870154600888015460099098015496989597949693959473ffffffffffffffffffffffffffffffffffffffff93841694928416939182169290821691168a565b604080519a8b5260208b0199909952978901969096526060880194909452608087019290925273ffffffffffffffffffffffffffffffffffffffff90811660a087015290811660c086015290811660e0850152908116610100840152166101208201526101400161021f565b3480156103af57600080fd5b506103d36103be3660046123d5565b60096020526000908152604090205460ff1681565b604051901515815260200161021f565b3480156103ef57600080fd5b506102156103fe366004612680565b600c1b90565b34801561041057600080fd5b5061026861041f3660046123d5565b610fd9565b34801561043057600080fd5b5061026861108f565b34801561044557600080fd5b506103d3610454366004612680565b600a6020526000908152604090205460ff1681565b34801561047557600080fd5b50610215670de0b6b3a764000081565b34801561049157600080fd5b506102686104a036600461272c565b611151565b3480156104b157600080fd5b506102686104c0366004612761565b611268565b3480156104d157600080fd5b506102156104e03660046123d5565b60066020526000908152604090205481565b3480156104fe57600080fd5b5061026861050d3660046127c5565b611747565b34801561051e57600080fd5b506103d361052d3660046127f1565b600c9190911b6000908152600b60209081526040808320938352929052205460ff1c90565b34801561055e57600080fd5b5061057361056d3660046123d5565b600c1c90565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161021f565b3480156105a457600080fd5b506000546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156105d157600080fd5b5061021560045481565b3480156105e757600080fd5b5061021560035481565b3480156105fd57600080fd5b506103d361060c3660046123d5565b60086020526000908152604090205460ff1681565b34801561062d57600080fd5b5061021561063c36600461282a565b600b60209081526000928352604080842090915290825290205481565b34801561066557600080fd5b506105736106743660046127f1565b600c9190911b6000908152600b602090815260408083209383529290522054605f1c90565b3480156106a557600080fd5b506102686106b436600461284f565b61180d565b3480156106c557600080fd5b506002546105739073ffffffffffffffffffffffffffffffffffffffff1681565b3480156106f257600080fd5b50610706610701366004612891565b611a50565b60405161021f91906128d8565b34801561071f57600080fd5b5061021561072e3660046127f1565b600c9190911b6000908152600b6020908152604080832093835292905220546b3fffffffffffffffffffffff1690565b34801561076a57600080fd5b5061026861077936600461291c565b611b2a565b34801561078a57600080fd5b50610268610799366004612680565b611c3a565b3480156107aa57600080fd5b506102686107b93660046129de565b611d06565b60006107c8611e02565b6107d2838361180d565b600c8b901b6000908152600b602090815260408083208d84529091529020548a9060ff1c61082c576040517fb2e532de00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c8c901b6000908152600b602090815260408083208484529091529020546b3fffffffffffffffffffffff1687811015610893576040517f22bbb43c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061089f8e600c1b90565b9050600060045460016108b29190612a69565b60008181526005602052604090206004015490915043116108ff576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c8152602001600354436109339190612a69565b8152602001605f600b600087815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054901c73ffffffffffffffffffffffffffffffffffffffff1681526020018f73ffffffffffffffffffffffffffffffffffffffff1681526020018e73ffffffffffffffffffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff16815250905089899050600014610a7057600083815260066020526040902054610a40908b908b9033611e46565b610a4e848c84848988611e9e565b60048054906000610a5e83612a81565b91905055508195505050505050610b56565b68056bc75e2d63100000816060015111610a9257610a4e848c84848988611e9e565b33600c1b60009081526007602052604081205490610ac0610abb670de0b6b3a764000084612aba565b611ff9565b9050610ad4670de0b6b3a764000082612af5565b83606001511180610af2575069d3c21bcecceda10000008360600151115b15610b29576040517f1c18f84600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610b37868e86868b8a611e9e565b60048054906000610b4783612a81565b90915550939750505050505050505b610b5f60018055565b9a9950505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610bf3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a4544000000000000000000000000000000000000000060448201526064015b60405180910390fd5b80516000905b80821015610c6b576000610c26848481518110610c1857610c18612b32565b6020026020010151600c1b90565b600090815260086020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001908117909155929092019150610bf9565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051610c9c9190612b61565b60405180910390a150565b60005473ffffffffffffffffffffffffffffffffffffffff163314610d28576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b8433600c1b73ffffffffffffffffffffffffffffffffffffffff8516610dea576040517f6a3bc53e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff82166000908152600a602052604090205460ff16610e49576040517f1578328e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610eac6bffffffffffffffffffffffff8a1683612a69565b1115610ee4576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610eec611e02565b8415610efc57610efc3386611747565b87878760ff81901b605f83901b610f138587612a69565b6000898152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8e16845290915290209117919091179055610f648733306bffffffffffffffffffffffff8f166120b5565b610f6d60018055565b6040805173ffffffffffffffffffffffffffffffffffffffff8e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b60005473ffffffffffffffffffffffffffffffffffffffff16331461105a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b851181604051610c9c91815260200190565b60005473ffffffffffffffffffffffffffffffffffffffff163314611110576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b4761111b338261217f565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610c9c565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff871684529091529020548015611230576000828152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a250611262565b6040517f87138d5c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50505050565b611270611e02565b600086815260056020526040902060038101546112b9576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b43816004015410156112f7576040517ff6fafba000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6005810154600382015460405160609290921b7fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161139a91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561141f576040517ff490a6ea00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526114879060019060a0016020604051602081039080840390855afa158015611477573d6000803e3d6000fd5b50505060206040510351600c1b90565b60008181526008602052604090205490915060ff166114d2576040517f815e1d6400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60098401546003850154600286015473ffffffffffffffffffffffffffffffffffffffff909216916000906115079083612baf565b6000600389018190556004890181905587815260096020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905560088801549091503373ffffffffffffffffffffffffffffffffffffffff909116146115f357600287015433600c1b60009081526007602052604081208054909190611599908490612a69565b9091555050600887015482906007906000906115cb9073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b815260200190815260200160002060008282546115e89190612a69565b9091555061162b9050565b8187600201546116039190612a69565b33600c1b60009081526007602052604081208054909190611625908490612a69565b90915550505b600687015461165290849073ffffffffffffffffffffffffffffffffffffffff16836121f9565b6002870154156116d857600787015473ffffffffffffffffffffffffffffffffffffffff8d81169116146116c957600787015460028801546116b191859173ffffffffffffffffffffffffffffffffffffffff9091169060011c6121f9565b6116c4838d60018a60020154901c6121f9565b6116d8565b6116d8838d89600201546121f9565b6006870154604080518f81526020810185905273ffffffffffffffffffffffffffffffffffffffff909216917f364537f14276f2a0ce9905588413f96454cbb8fb2e4f5308389307c1098bede8910160405180910390a25050505050505061173f60018055565b505050505050565b73ffffffffffffffffffffffffffffffffffffffff82163314156117db57806006600061177485600c1b90565b8152602080820192909252604090810160002092909255815173ffffffffffffffffffffffffffffffffffffffff851681529081018390527f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632910160405180910390a15050565b6040517f85d1f72600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000815b80821015611a3a5760006005600086868681811061183157611831612b32565b9050602002013581526020019081526020016000209050611851816122b8565b80546000908152600b60209081526040808320600985015473ffffffffffffffffffffffffffffffffffffffff16845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e4000000906118b49083612a69565b11156118ec576040517ff3fb0eb900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600382015482546000908152600b60209081526040808320600987015473ffffffffffffffffffffffffffffffffffffffff16845290915281208054909190611936908490612a69565b909155505060006003830181905560088301546119699073ffffffffffffffffffffffffffffffffffffffff16600c1b90565b60008181526007602052604090205490915060011c68056bc75e2d6310000081116119ad57600082815260076020526040902068056bc75e2d6310000090556119bf565b60008281526007602052604090208190555b600684015473ffffffffffffffffffffffffffffffffffffffff167f830501e61b8b075e170b22a430e39454bdb12ed3e9620e586430b6ac00079da5898989818110611a0d57611a0d612b32565b90506020020135604051611a2391815260200190565b60405180910390a285600101955050505050611811565b808210156112625763dfb035c96000526004601cfd5b8151606090600090818167ffffffffffffffff811115611a7257611a7261252d565b604051908082528060200260200182016040528015611a9b578160200160208202803683370190505b5090505b81831015611b21576000611af4878581518110611abe57611abe612b32565b602090810291909101810151600c1b6000908152600b825260408082208a835290925220546b3fffffffffffffffffffffff1690565b905080828581518110611b0957611b09612b32565b60200260200101818152505083600101935050611a9f565b95945050505050565b60005473ffffffffffffffffffffffffffffffffffffffff163314611bab576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b815180611bc05763df9578836000526004601cfd5b81518114611bd65763ff633a386000526004601cfd5b60208301602083018260051b82015b80831461173f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611be5565b60005473ffffffffffffffffffffffffffffffffffffffff163314611cbb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f554e415554484f52495a454400000000000000000000000000000000000000006044820152606401610bea565b600281905560405173ffffffffffffffffffffffffffffffffffffffff821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610c9c565b611d0e611e02565b611d18828261180d565b33600c1b6000908152600b6020908152604080832087845290915290205460ff1c151560011415611d4e57611d4e846000611151565b33600c1b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff89168452909152902054611d9c906b3fffffffffffffffffffffff16858784612334565b611da78533866121f9565b6040805173ffffffffffffffffffffffffffffffffffffffff871681526020810186905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a25061126260018055565b60015460021415611e3f576040517fab143c0600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6002600155565b611e6884848473ffffffffffffffffffffffffffffffffffffffff8516612391565b611262576040517f3b8474be00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a085015190820180547fffffffffffffffffffffffff000000000000000000000000000000000000000090811673ffffffffffffffffffffffffffffffffffffffff9384161790915560c0860151600684018054831691841691909117905560e0860151600784018054831691841691909117905561010086015160088401805483169184169190911790556101208601516009909301805490911692909116919091179055611f8d86868484612334565b60c083015183516060850151604051879373ffffffffffffffffffffffffffffffffffffffff16927f8fb3989f70bd172a37d15b41b015e48ea09d59329638377304a4198cd0c4ea6592611fe992918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b8360405160240161201791815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826120ac5763e10bf1cc6000526004601cfd5b50505050919050565b60006040517f23b872dd000000000000000000000000000000000000000000000000000000006000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080612178576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610bea565b5050505050565b600080600080600085875af19050806121f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610bea565b505050565b60006040517fa9059cbb000000000000000000000000000000000000000000000000000000006000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080611262576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610bea565b43816004015411156122f6576040517fd0404f8500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6003810154612331576040517f63b4904e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50565b836123475763ce3a3d376000526004601cfd5b6000818152600b6020908152604080832073ffffffffffffffffffffffffffffffffffffffff8616845290915281208054859290612386908490612baf565b909155505050505050565b600083156123cd578360051b8501855b803580851160051b948552602094851852604060002093018181106123c5576123ca565b6123a1565b50505b501492915050565b6000602082840312156123e757600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461233157600080fd5b60008083601f84011261242257600080fd5b50813567ffffffffffffffff81111561243a57600080fd5b6020830191508360208260051b850101111561245557600080fd5b9250929050565b6000806000806000806000806000806101008b8d03121561247c57600080fd5b8a35612487816123ee565b995060208b0135612497816123ee565b985060408b01356124a7816123ee565b975060608b01356124b7816123ee565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff808211156124e257600080fd5b6124ee8e838f01612410565b909650945060e08d013591508082111561250757600080fd5b506125148d828e01612410565b915080935050809150509295989b9194979a5092959850565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156125a3576125a361252d565b604052919050565b600067ffffffffffffffff8211156125c5576125c561252d565b5060051b60200190565b600082601f8301126125e057600080fd5b813560206125f56125f0836125ab565b61255c565b82815260059290921b8401810191818101908684111561261457600080fd5b8286015b8481101561263857803561262b816123ee565b8352918301918301612618565b509695505050505050565b60006020828403121561265557600080fd5b813567ffffffffffffffff81111561266c57600080fd5b612678848285016125cf565b949350505050565b60006020828403121561269257600080fd5b813561269d816123ee565b9392505050565b803580151581146126b457600080fd5b919050565b600080600080600060a086880312156126d157600080fd5b85356126dc816123ee565b945060208601356bffffffffffffffffffffffff811681146126fd57600080fd5b9350604086013561270d816123ee565b925061271b606087016126a4565b949793965091946080013592915050565b6000806040838503121561273f57600080fd5b823561274a816123ee565b9150612758602084016126a4565b90509250929050565b60008060008060008060c0878903121561277a57600080fd5b86359550602087013561278c816123ee565b945060408701359350606087013592506080870135915060a087013560ff811681146127b757600080fd5b809150509295509295509295565b600080604083850312156127d857600080fd5b82356127e3816123ee565b946020939093013593505050565b6000806040838503121561280457600080fd5b823561280f816123ee565b9150602083013561281f816123ee565b809150509250929050565b6000806040838503121561283d57600080fd5b82359150602083013561281f816123ee565b6000806020838503121561286257600080fd5b823567ffffffffffffffff81111561287957600080fd5b61288585828601612410565b90969095509350505050565b600080604083850312156128a457600080fd5b823567ffffffffffffffff8111156128bb57600080fd5b6128c7858286016125cf565b925050602083013561281f816123ee565b6020808252825182820181905260009190848201906040850190845b81811015612910578351835292840192918401916001016128f4565b50909695505050505050565b6000806040838503121561292f57600080fd5b823567ffffffffffffffff8082111561294757600080fd5b612953868387016125cf565b935060209150818501358181111561296a57600080fd5b85019050601f8101861361297d57600080fd5b803561298b6125f0826125ab565b81815260059190911b820183019083810190888311156129aa57600080fd5b928401925b828410156129cf576129c0846126a4565b825292840192908401906129af565b80955050505050509250929050565b600080600080606085870312156129f457600080fd5b84356129ff816123ee565b935060208501359250604085013567ffffffffffffffff811115612a2257600080fd5b612a2e87828801612410565b95989497509550505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115612a7c57612a7c612a3a565b500190565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415612ab357612ab3612a3a565b5060010190565b600082612af0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615612b2d57612b2d612a3a565b500290565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b8181101561291057835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101612b7d565b600082821015612bc157612bc1612a3a565b50039056fea164736f6c6343000809000a";
 
 type P2PIXConstructorParams =
   | [signer?: Signer]
diff --git a/src/types/hardhat.d.ts b/src/types/hardhat.d.ts
index 502849e..d3747a0 100644
--- a/src/types/hardhat.d.ts
+++ b/src/types/hardhat.d.ts
@@ -32,10 +32,6 @@ declare module "hardhat/types/runtime" {
       name: "ERC20",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.ERC20__factory>;
-    getContractFactory(
-      name: "Counters",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.Counters__factory>;
     getContractFactory(
       name: "ReentrancyGuard",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -74,11 +70,6 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.ERC20>;
-    getContractAt(
-      name: "Counters",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.Counters>;
     getContractAt(
       name: "ReentrancyGuard",
       address: string,
diff --git a/src/types/index.ts b/src/types/index.ts
index 86d64ba..60e8d58 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -17,8 +17,6 @@ export type { MockToken } from "./lib/mock/mockToken.sol/MockToken";
 export { MockToken__factory } from "./factories/lib/mock/mockToken.sol/MockToken__factory";
 export type { ERC20 } from "./lib/tokens/ERC20";
 export { ERC20__factory } from "./factories/lib/tokens/ERC20__factory";
-export type { Counters } from "./lib/utils/Counters";
-export { Counters__factory } from "./factories/lib/utils/Counters__factory";
 export type { ReentrancyGuard } from "./lib/utils/ReentrancyGuard";
 export { ReentrancyGuard__factory } from "./factories/lib/utils/ReentrancyGuard__factory";
 export type { P2PIX } from "./p2pix.sol/P2PIX";
diff --git a/src/types/lib/utils/Counters.ts b/src/types/lib/utils/Counters.ts
deleted file mode 100644
index 5179af4..0000000
--- a/src/types/lib/utils/Counters.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type { BaseContract, Signer, utils } from "ethers";
-
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "../../common";
-
-export interface CountersInterface extends utils.Interface {
-  functions: {};
-
-  events: {};
-}
-
-export interface Counters extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: CountersInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {};
-
-  callStatic: {};
-
-  filters: {};
-
-  estimateGas: {};
-
-  populateTransaction: {};
-}
diff --git a/src/types/lib/utils/index.ts b/src/types/lib/utils/index.ts
index 3d0c435..447e059 100644
--- a/src/types/lib/utils/index.ts
+++ b/src/types/lib/utils/index.ts
@@ -1,5 +1,4 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-export type { Counters } from "./Counters";
 export type { ReentrancyGuard } from "./ReentrancyGuard";
diff --git a/src/types/p2pix.sol/P2PIX.ts b/src/types/p2pix.sol/P2PIX.ts
index 28f411d..29276a1 100644
--- a/src/types/p2pix.sol/P2PIX.ts
+++ b/src/types/p2pix.sol/P2PIX.ts
@@ -31,29 +31,34 @@ export interface P2PIXInterface extends utils.Interface {
   functions: {
     "WAD()": FunctionFragment;
     "_castAddrToKey(address)": FunctionFragment;
+    "_castKeyToAddr(uint256)": FunctionFragment;
     "allowedERC20s(address)": FunctionFragment;
-    "cancelDeposit(uint256)": FunctionFragment;
     "defaultLockBlocks()": FunctionFragment;
-    "deposit(address,uint256,string,bytes32)": FunctionFragment;
-    "depositCount()": FunctionFragment;
-    "lock(uint256,address,address,uint256,uint256,bytes32[],bytes32[])": FunctionFragment;
-    "mapDeposits(uint256)": FunctionFragment;
-    "mapLocks(bytes32)": FunctionFragment;
+    "deposit(address,uint96,uint160,bool,bytes32)": FunctionFragment;
+    "getBalance(address,address)": FunctionFragment;
+    "getBalances(address[],address)": FunctionFragment;
+    "getPixTarget(address,address)": FunctionFragment;
+    "getValid(address,address)": FunctionFragment;
+    "lock(address,address,address,address,uint256,uint256,bytes32[],uint256[])": FunctionFragment;
+    "lockCounter()": FunctionFragment;
+    "mapLocks(uint256)": FunctionFragment;
     "owner()": FunctionFragment;
-    "release(bytes32,address,bytes32,bytes32,bytes32,uint8)": FunctionFragment;
+    "release(uint256,address,bytes32,bytes32,bytes32,uint8)": FunctionFragment;
     "reputation()": FunctionFragment;
     "sellerAllowList(uint256)": FunctionFragment;
+    "sellerBalance(uint256,address)": FunctionFragment;
     "setDefaultLockBlocks(uint256)": FunctionFragment;
     "setOwner(address)": FunctionFragment;
     "setReputation(address)": FunctionFragment;
     "setRoot(address,bytes32)": FunctionFragment;
     "setValidSigners(address[])": FunctionFragment;
+    "setValidState(address,bool)": FunctionFragment;
     "tokenSettings(address[],bool[])": FunctionFragment;
-    "unlockExpired(bytes32[])": FunctionFragment;
+    "unlockExpired(uint256[])": FunctionFragment;
     "usedTransactions(bytes32)": FunctionFragment;
     "userRecord(uint256)": FunctionFragment;
     "validBacenSigners(uint256)": FunctionFragment;
-    "withdraw(uint256,bytes32[])": FunctionFragment;
+    "withdraw(address,uint256,uint256[])": FunctionFragment;
     "withdrawBalance()": FunctionFragment;
   };
 
@@ -61,23 +66,28 @@ export interface P2PIXInterface extends utils.Interface {
     nameOrSignatureOrTopic:
       | "WAD"
       | "_castAddrToKey"
+      | "_castKeyToAddr"
       | "allowedERC20s"
-      | "cancelDeposit"
       | "defaultLockBlocks"
       | "deposit"
-      | "depositCount"
+      | "getBalance"
+      | "getBalances"
+      | "getPixTarget"
+      | "getValid"
       | "lock"
-      | "mapDeposits"
+      | "lockCounter"
       | "mapLocks"
       | "owner"
       | "release"
       | "reputation"
       | "sellerAllowList"
+      | "sellerBalance"
       | "setDefaultLockBlocks"
       | "setOwner"
       | "setReputation"
       | "setRoot"
       | "setValidSigners"
+      | "setValidState"
       | "tokenSettings"
       | "unlockExpired"
       | "usedTransactions"
@@ -93,12 +103,12 @@ export interface P2PIXInterface extends utils.Interface {
     values: [PromiseOrValue<string>]
   ): string;
   encodeFunctionData(
-    functionFragment: "allowedERC20s",
-    values: [PromiseOrValue<string>]
+    functionFragment: "_castKeyToAddr",
+    values: [PromiseOrValue<BigNumberish>]
   ): string;
   encodeFunctionData(
-    functionFragment: "cancelDeposit",
-    values: [PromiseOrValue<BigNumberish>]
+    functionFragment: "allowedERC20s",
+    values: [PromiseOrValue<string>]
   ): string;
   encodeFunctionData(
     functionFragment: "defaultLockBlocks",
@@ -109,39 +119,53 @@ export interface P2PIXInterface extends utils.Interface {
     values: [
       PromiseOrValue<string>,
       PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<boolean>,
       PromiseOrValue<BytesLike>
     ]
   ): string;
   encodeFunctionData(
-    functionFragment: "depositCount",
-    values?: undefined
+    functionFragment: "getBalance",
+    values: [PromiseOrValue<string>, PromiseOrValue<string>]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getBalances",
+    values: [PromiseOrValue<string>[], PromiseOrValue<string>]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getPixTarget",
+    values: [PromiseOrValue<string>, PromiseOrValue<string>]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "getValid",
+    values: [PromiseOrValue<string>, PromiseOrValue<string>]
   ): string;
   encodeFunctionData(
     functionFragment: "lock",
     values: [
-      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<string>,
+      PromiseOrValue<string>,
       PromiseOrValue<string>,
       PromiseOrValue<string>,
       PromiseOrValue<BigNumberish>,
       PromiseOrValue<BigNumberish>,
       PromiseOrValue<BytesLike>[],
-      PromiseOrValue<BytesLike>[]
+      PromiseOrValue<BigNumberish>[]
     ]
   ): string;
   encodeFunctionData(
-    functionFragment: "mapDeposits",
-    values: [PromiseOrValue<BigNumberish>]
+    functionFragment: "lockCounter",
+    values?: undefined
   ): string;
   encodeFunctionData(
     functionFragment: "mapLocks",
-    values: [PromiseOrValue<BytesLike>]
+    values: [PromiseOrValue<BigNumberish>]
   ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "release",
     values: [
-      PromiseOrValue<BytesLike>,
+      PromiseOrValue<BigNumberish>,
       PromiseOrValue<string>,
       PromiseOrValue<BytesLike>,
       PromiseOrValue<BytesLike>,
@@ -157,6 +181,10 @@ export interface P2PIXInterface extends utils.Interface {
     functionFragment: "sellerAllowList",
     values: [PromiseOrValue<BigNumberish>]
   ): string;
+  encodeFunctionData(
+    functionFragment: "sellerBalance",
+    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(
     functionFragment: "setDefaultLockBlocks",
     values: [PromiseOrValue<BigNumberish>]
@@ -177,13 +205,17 @@ export interface P2PIXInterface extends utils.Interface {
     functionFragment: "setValidSigners",
     values: [PromiseOrValue<string>[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "setValidState",
+    values: [PromiseOrValue<string>, PromiseOrValue<boolean>]
+  ): string;
   encodeFunctionData(
     functionFragment: "tokenSettings",
     values: [PromiseOrValue<string>[], PromiseOrValue<boolean>[]]
   ): string;
   encodeFunctionData(
     functionFragment: "unlockExpired",
-    values: [PromiseOrValue<BytesLike>[]]
+    values: [PromiseOrValue<BigNumberish>[]]
   ): string;
   encodeFunctionData(
     functionFragment: "usedTransactions",
@@ -199,7 +231,11 @@ export interface P2PIXInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "withdraw",
-    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>[]]
+    values: [
+      PromiseOrValue<string>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BigNumberish>[]
+    ]
   ): string;
   encodeFunctionData(
     functionFragment: "withdrawBalance",
@@ -212,11 +248,11 @@ export interface P2PIXInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "allowedERC20s",
+    functionFragment: "_castKeyToAddr",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "cancelDeposit",
+    functionFragment: "allowedERC20s",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -224,13 +260,19 @@ export interface P2PIXInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "getBalance", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "depositCount",
+    functionFragment: "getBalances",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getPixTarget",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "getValid", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "lock", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "mapDeposits",
+    functionFragment: "lockCounter",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "mapLocks", data: BytesLike): Result;
@@ -241,6 +283,10 @@ export interface P2PIXInterface extends utils.Interface {
     functionFragment: "sellerAllowList",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "sellerBalance",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "setDefaultLockBlocks",
     data: BytesLike
@@ -255,6 +301,10 @@ export interface P2PIXInterface extends utils.Interface {
     functionFragment: "setValidSigners",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "setValidState",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "tokenSettings",
     data: BytesLike
@@ -280,23 +330,22 @@ export interface P2PIXInterface extends utils.Interface {
 
   events: {
     "AllowedERC20Updated(address,bool)": EventFragment;
-    "DepositAdded(address,uint256,address,uint256)": EventFragment;
-    "DepositClosed(address,uint256)": EventFragment;
-    "DepositWithdrawn(address,uint256,uint256)": EventFragment;
+    "DepositAdded(address,address,uint256)": EventFragment;
+    "DepositWithdrawn(address,address,uint256)": EventFragment;
     "FundsWithdrawn(address,uint256)": EventFragment;
-    "LockAdded(address,bytes32,uint256,uint256)": EventFragment;
+    "LockAdded(address,uint256,uint256,uint256)": EventFragment;
     "LockBlocksUpdated(uint256)": EventFragment;
-    "LockReleased(address,bytes32,uint256)": EventFragment;
-    "LockReturned(address,bytes32)": EventFragment;
+    "LockReleased(address,uint256,uint256)": EventFragment;
+    "LockReturned(address,uint256)": EventFragment;
     "OwnerUpdated(address,address)": EventFragment;
     "ReputationUpdated(address)": EventFragment;
     "RootUpdated(address,bytes32)": EventFragment;
+    "ValidSet(address,address,bool)": EventFragment;
     "ValidSignersUpdated(address[])": EventFragment;
   };
 
   getEvent(nameOrSignatureOrTopic: "AllowedERC20Updated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DepositClosed"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "DepositWithdrawn"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "FundsWithdrawn"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "LockAdded"): EventFragment;
@@ -306,6 +355,7 @@ export interface P2PIXInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "OwnerUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ReputationUpdated"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RootUpdated"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "ValidSet"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "ValidSignersUpdated"): EventFragment;
 }
 
@@ -323,35 +373,23 @@ export type AllowedERC20UpdatedEventFilter =
 
 export interface DepositAddedEventObject {
   seller: string;
-  depositID: BigNumber;
   token: string;
   amount: BigNumber;
 }
 export type DepositAddedEvent = TypedEvent<
-  [string, BigNumber, string, BigNumber],
+  [string, string, BigNumber],
   DepositAddedEventObject
 >;
 
 export type DepositAddedEventFilter = TypedEventFilter<DepositAddedEvent>;
 
-export interface DepositClosedEventObject {
-  seller: string;
-  depositID: BigNumber;
-}
-export type DepositClosedEvent = TypedEvent<
-  [string, BigNumber],
-  DepositClosedEventObject
->;
-
-export type DepositClosedEventFilter = TypedEventFilter<DepositClosedEvent>;
-
 export interface DepositWithdrawnEventObject {
   seller: string;
-  depositID: BigNumber;
+  token: string;
   amount: BigNumber;
 }
 export type DepositWithdrawnEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
+  [string, string, BigNumber],
   DepositWithdrawnEventObject
 >;
 
@@ -371,12 +409,12 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
 
 export interface LockAddedEventObject {
   buyer: string;
-  lockID: string;
-  depositID: BigNumber;
+  lockID: BigNumber;
+  seller: BigNumber;
   amount: BigNumber;
 }
 export type LockAddedEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
+  [string, BigNumber, BigNumber, BigNumber],
   LockAddedEventObject
 >;
 
@@ -395,11 +433,11 @@ export type LockBlocksUpdatedEventFilter =
 
 export interface LockReleasedEventObject {
   buyer: string;
-  lockId: string;
+  lockId: BigNumber;
   amount: BigNumber;
 }
 export type LockReleasedEvent = TypedEvent<
-  [string, string, BigNumber],
+  [string, BigNumber, BigNumber],
   LockReleasedEventObject
 >;
 
@@ -407,10 +445,10 @@ export type LockReleasedEventFilter = TypedEventFilter<LockReleasedEvent>;
 
 export interface LockReturnedEventObject {
   buyer: string;
-  lockId: string;
+  lockId: BigNumber;
 }
 export type LockReturnedEvent = TypedEvent<
-  [string, string],
+  [string, BigNumber],
   LockReturnedEventObject
 >;
 
@@ -449,6 +487,18 @@ export type RootUpdatedEvent = TypedEvent<
 
 export type RootUpdatedEventFilter = TypedEventFilter<RootUpdatedEvent>;
 
+export interface ValidSetEventObject {
+  seller: string;
+  token: string;
+  state: boolean;
+}
+export type ValidSetEvent = TypedEvent<
+  [string, string, boolean],
+  ValidSetEventObject
+>;
+
+export type ValidSetEventFilter = TypedEventFilter<ValidSetEvent>;
+
 export interface ValidSignersUpdatedEventObject {
   signers: string[];
 }
@@ -494,73 +544,98 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[BigNumber] & { _key: BigNumber }>;
 
+    _castKeyToAddr(
+      _key: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[string] & { _addr: string }>;
+
     allowedERC20s(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
-    cancelDeposit(
-      depositID: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
     defaultLockBlocks(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     deposit(
       _token: PromiseOrValue<string>,
       _amount: PromiseOrValue<BigNumberish>,
-      _pixTarget: PromiseOrValue<string>,
+      _pixTarget: PromiseOrValue<BigNumberish>,
+      _valid: PromiseOrValue<boolean>,
       allowlistRoot: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    depositCount(
+    getBalance(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
       overrides?: CallOverrides
-    ): Promise<[BigNumber] & { _val: BigNumber }>;
+    ): Promise<[BigNumber] & { bal: BigNumber }>;
+
+    getBalances(
+      sellers: PromiseOrValue<string>[],
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber[]]>;
+
+    getPixTarget(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { pixTarget: BigNumber }>;
+
+    getValid(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean] & { valid: boolean }>;
 
     lock(
-      _depositID: PromiseOrValue<BigNumberish>,
+      _seller: PromiseOrValue<string>,
+      _token: PromiseOrValue<string>,
       _buyerAddress: PromiseOrValue<string>,
       _relayerTarget: PromiseOrValue<string>,
       _relayerPremium: PromiseOrValue<BigNumberish>,
       _amount: PromiseOrValue<BigNumberish>,
       merkleProof: PromiseOrValue<BytesLike>[],
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    mapDeposits(
+    lockCounter(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    mapLocks(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, string, string, string, boolean] & {
-        remaining: BigNumber;
-        pixTarget: string;
-        seller: string;
-        token: string;
-        valid: boolean;
-      }
-    >;
-
-    mapLocks(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & {
-        depositID: BigNumber;
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        string,
+        string,
+        string,
+        string
+      ] & {
+        sellerKey: BigNumber;
+        counter: BigNumber;
         relayerPremium: BigNumber;
         amount: BigNumber;
         expirationBlock: BigNumber;
+        pixTarget: BigNumber;
         buyerAddress: string;
         relayerTarget: string;
         relayerAddress: string;
+        token: string;
       }
     >;
 
     owner(overrides?: CallOverrides): Promise<[string]>;
 
     release(
-      lockID: PromiseOrValue<BytesLike>,
+      lockID: PromiseOrValue<BigNumberish>,
       _relayerTarget: PromiseOrValue<string>,
       pixTimestamp: PromiseOrValue<BytesLike>,
       r: PromiseOrValue<BytesLike>,
@@ -576,6 +651,12 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[string]>;
 
+    sellerBalance(
+      arg0: PromiseOrValue<BigNumberish>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     setDefaultLockBlocks(
       _blocks: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -602,6 +683,12 @@ export interface P2PIX extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
+    setValidState(
+      token: PromiseOrValue<string>,
+      state: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     tokenSettings(
       _tokens: PromiseOrValue<string>[],
       _states: PromiseOrValue<boolean>[],
@@ -609,7 +696,7 @@ export interface P2PIX extends BaseContract {
     ): Promise<ContractTransaction>;
 
     unlockExpired(
-      lockIDs: PromiseOrValue<BytesLike>[],
+      lockIDs: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -629,8 +716,9 @@ export interface P2PIX extends BaseContract {
     ): Promise<[boolean]>;
 
     withdraw(
-      depositID: PromiseOrValue<BigNumberish>,
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      token: PromiseOrValue<string>,
+      amount: PromiseOrValue<BigNumberish>,
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -646,71 +734,98 @@ export interface P2PIX extends BaseContract {
     overrides?: CallOverrides
   ): Promise<BigNumber>;
 
+  _castKeyToAddr(
+    _key: PromiseOrValue<BigNumberish>,
+    overrides?: CallOverrides
+  ): Promise<string>;
+
   allowedERC20s(
     arg0: PromiseOrValue<string>,
     overrides?: CallOverrides
   ): Promise<boolean>;
 
-  cancelDeposit(
-    depositID: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
   defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
 
   deposit(
     _token: PromiseOrValue<string>,
     _amount: PromiseOrValue<BigNumberish>,
-    _pixTarget: PromiseOrValue<string>,
+    _pixTarget: PromiseOrValue<BigNumberish>,
+    _valid: PromiseOrValue<boolean>,
     allowlistRoot: PromiseOrValue<BytesLike>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  depositCount(overrides?: CallOverrides): Promise<BigNumber>;
+  getBalance(
+    seller: PromiseOrValue<string>,
+    token: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  getBalances(
+    sellers: PromiseOrValue<string>[],
+    token: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber[]>;
+
+  getPixTarget(
+    seller: PromiseOrValue<string>,
+    token: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  getValid(
+    seller: PromiseOrValue<string>,
+    token: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
 
   lock(
-    _depositID: PromiseOrValue<BigNumberish>,
+    _seller: PromiseOrValue<string>,
+    _token: PromiseOrValue<string>,
     _buyerAddress: PromiseOrValue<string>,
     _relayerTarget: PromiseOrValue<string>,
     _relayerPremium: PromiseOrValue<BigNumberish>,
     _amount: PromiseOrValue<BigNumberish>,
     merkleProof: PromiseOrValue<BytesLike>[],
-    expiredLocks: PromiseOrValue<BytesLike>[],
+    expiredLocks: PromiseOrValue<BigNumberish>[],
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  mapDeposits(
+  lockCounter(overrides?: CallOverrides): Promise<BigNumber>;
+
+  mapLocks(
     arg0: PromiseOrValue<BigNumberish>,
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, string, string, string, boolean] & {
-      remaining: BigNumber;
-      pixTarget: string;
-      seller: string;
-      token: string;
-      valid: boolean;
-    }
-  >;
-
-  mapLocks(
-    arg0: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & {
-      depositID: BigNumber;
+    [
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      string,
+      string,
+      string,
+      string
+    ] & {
+      sellerKey: BigNumber;
+      counter: BigNumber;
       relayerPremium: BigNumber;
       amount: BigNumber;
       expirationBlock: BigNumber;
+      pixTarget: BigNumber;
       buyerAddress: string;
       relayerTarget: string;
       relayerAddress: string;
+      token: string;
     }
   >;
 
   owner(overrides?: CallOverrides): Promise<string>;
 
   release(
-    lockID: PromiseOrValue<BytesLike>,
+    lockID: PromiseOrValue<BigNumberish>,
     _relayerTarget: PromiseOrValue<string>,
     pixTimestamp: PromiseOrValue<BytesLike>,
     r: PromiseOrValue<BytesLike>,
@@ -726,6 +841,12 @@ export interface P2PIX extends BaseContract {
     overrides?: CallOverrides
   ): Promise<string>;
 
+  sellerBalance(
+    arg0: PromiseOrValue<BigNumberish>,
+    arg1: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
   setDefaultLockBlocks(
     _blocks: PromiseOrValue<BigNumberish>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -752,6 +873,12 @@ export interface P2PIX extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
+  setValidState(
+    token: PromiseOrValue<string>,
+    state: PromiseOrValue<boolean>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   tokenSettings(
     _tokens: PromiseOrValue<string>[],
     _states: PromiseOrValue<boolean>[],
@@ -759,7 +886,7 @@ export interface P2PIX extends BaseContract {
   ): Promise<ContractTransaction>;
 
   unlockExpired(
-    lockIDs: PromiseOrValue<BytesLike>[],
+    lockIDs: PromiseOrValue<BigNumberish>[],
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -779,8 +906,9 @@ export interface P2PIX extends BaseContract {
   ): Promise<boolean>;
 
   withdraw(
-    depositID: PromiseOrValue<BigNumberish>,
-    expiredLocks: PromiseOrValue<BytesLike>[],
+    token: PromiseOrValue<string>,
+    amount: PromiseOrValue<BigNumberish>,
+    expiredLocks: PromiseOrValue<BigNumberish>[],
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -796,71 +924,98 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    _castKeyToAddr(
+      _key: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     allowedERC20s(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<boolean>;
 
-    cancelDeposit(
-      depositID: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
 
     deposit(
       _token: PromiseOrValue<string>,
       _amount: PromiseOrValue<BigNumberish>,
-      _pixTarget: PromiseOrValue<string>,
+      _pixTarget: PromiseOrValue<BigNumberish>,
+      _valid: PromiseOrValue<boolean>,
       allowlistRoot: PromiseOrValue<BytesLike>,
       overrides?: CallOverrides
+    ): Promise<void>;
+
+    getBalance(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    depositCount(overrides?: CallOverrides): Promise<BigNumber>;
+    getBalances(
+      sellers: PromiseOrValue<string>[],
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber[]>;
+
+    getPixTarget(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getValid(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
 
     lock(
-      _depositID: PromiseOrValue<BigNumberish>,
+      _seller: PromiseOrValue<string>,
+      _token: PromiseOrValue<string>,
       _buyerAddress: PromiseOrValue<string>,
       _relayerTarget: PromiseOrValue<string>,
       _relayerPremium: PromiseOrValue<BigNumberish>,
       _amount: PromiseOrValue<BigNumberish>,
       merkleProof: PromiseOrValue<BytesLike>[],
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: CallOverrides
-    ): Promise<string>;
+    ): Promise<BigNumber>;
 
-    mapDeposits(
+    lockCounter(overrides?: CallOverrides): Promise<BigNumber>;
+
+    mapLocks(
       arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, string, string, string, boolean] & {
-        remaining: BigNumber;
-        pixTarget: string;
-        seller: string;
-        token: string;
-        valid: boolean;
-      }
-    >;
-
-    mapLocks(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & {
-        depositID: BigNumber;
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        string,
+        string,
+        string,
+        string
+      ] & {
+        sellerKey: BigNumber;
+        counter: BigNumber;
         relayerPremium: BigNumber;
         amount: BigNumber;
         expirationBlock: BigNumber;
+        pixTarget: BigNumber;
         buyerAddress: string;
         relayerTarget: string;
         relayerAddress: string;
+        token: string;
       }
     >;
 
     owner(overrides?: CallOverrides): Promise<string>;
 
     release(
-      lockID: PromiseOrValue<BytesLike>,
+      lockID: PromiseOrValue<BigNumberish>,
       _relayerTarget: PromiseOrValue<string>,
       pixTimestamp: PromiseOrValue<BytesLike>,
       r: PromiseOrValue<BytesLike>,
@@ -876,6 +1031,12 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<string>;
 
+    sellerBalance(
+      arg0: PromiseOrValue<BigNumberish>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     setDefaultLockBlocks(
       _blocks: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
@@ -902,6 +1063,12 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
+    setValidState(
+      token: PromiseOrValue<string>,
+      state: PromiseOrValue<boolean>,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     tokenSettings(
       _tokens: PromiseOrValue<string>[],
       _states: PromiseOrValue<boolean>[],
@@ -909,7 +1076,7 @@ export interface P2PIX extends BaseContract {
     ): Promise<void>;
 
     unlockExpired(
-      lockIDs: PromiseOrValue<BytesLike>[],
+      lockIDs: PromiseOrValue<BigNumberish>[],
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -929,8 +1096,9 @@ export interface P2PIX extends BaseContract {
     ): Promise<boolean>;
 
     withdraw(
-      depositID: PromiseOrValue<BigNumberish>,
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      token: PromiseOrValue<string>,
+      amount: PromiseOrValue<BigNumberish>,
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -947,36 +1115,25 @@ export interface P2PIX extends BaseContract {
       state?: PromiseOrValue<boolean> | null
     ): AllowedERC20UpdatedEventFilter;
 
-    "DepositAdded(address,uint256,address,uint256)"(
+    "DepositAdded(address,address,uint256)"(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
       token?: null,
       amount?: null
     ): DepositAddedEventFilter;
     DepositAdded(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
       token?: null,
       amount?: null
     ): DepositAddedEventFilter;
 
-    "DepositClosed(address,uint256)"(
+    "DepositWithdrawn(address,address,uint256)"(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null
-    ): DepositClosedEventFilter;
-    DepositClosed(
-      seller?: PromiseOrValue<string> | null,
-      depositID?: null
-    ): DepositClosedEventFilter;
-
-    "DepositWithdrawn(address,uint256,uint256)"(
-      seller?: PromiseOrValue<string> | null,
-      depositID?: null,
+      token?: null,
       amount?: null
     ): DepositWithdrawnEventFilter;
     DepositWithdrawn(
       seller?: PromiseOrValue<string> | null,
-      depositID?: null,
+      token?: null,
       amount?: null
     ): DepositWithdrawnEventFilter;
 
@@ -986,23 +1143,23 @@ export interface P2PIX extends BaseContract {
     ): FundsWithdrawnEventFilter;
     FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
 
-    "LockAdded(address,bytes32,uint256,uint256)"(
+    "LockAdded(address,uint256,uint256,uint256)"(
       buyer?: PromiseOrValue<string> | null,
-      lockID?: PromiseOrValue<BytesLike> | null,
-      depositID?: null,
+      lockID?: PromiseOrValue<BigNumberish> | null,
+      seller?: null,
       amount?: null
     ): LockAddedEventFilter;
     LockAdded(
       buyer?: PromiseOrValue<string> | null,
-      lockID?: PromiseOrValue<BytesLike> | null,
-      depositID?: null,
+      lockID?: PromiseOrValue<BigNumberish> | null,
+      seller?: null,
       amount?: null
     ): LockAddedEventFilter;
 
     "LockBlocksUpdated(uint256)"(blocks?: null): LockBlocksUpdatedEventFilter;
     LockBlocksUpdated(blocks?: null): LockBlocksUpdatedEventFilter;
 
-    "LockReleased(address,bytes32,uint256)"(
+    "LockReleased(address,uint256,uint256)"(
       buyer?: PromiseOrValue<string> | null,
       lockId?: null,
       amount?: null
@@ -1013,7 +1170,7 @@ export interface P2PIX extends BaseContract {
       amount?: null
     ): LockReleasedEventFilter;
 
-    "LockReturned(address,bytes32)"(
+    "LockReturned(address,uint256)"(
       buyer?: PromiseOrValue<string> | null,
       lockId?: null
     ): LockReturnedEventFilter;
@@ -1042,6 +1199,17 @@ export interface P2PIX extends BaseContract {
     ): RootUpdatedEventFilter;
     RootUpdated(seller?: null, merkleRoot?: null): RootUpdatedEventFilter;
 
+    "ValidSet(address,address,bool)"(
+      seller?: PromiseOrValue<string> | null,
+      token?: null,
+      state?: null
+    ): ValidSetEventFilter;
+    ValidSet(
+      seller?: PromiseOrValue<string> | null,
+      token?: null,
+      state?: null
+    ): ValidSetEventFilter;
+
     "ValidSignersUpdated(address[])"(
       signers?: null
     ): ValidSignersUpdatedEventFilter;
@@ -1056,14 +1224,14 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    allowedERC20s(
-      arg0: PromiseOrValue<string>,
+    _castKeyToAddr(
+      _key: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
-    cancelDeposit(
-      depositID: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    allowedERC20s(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1071,38 +1239,59 @@ export interface P2PIX extends BaseContract {
     deposit(
       _token: PromiseOrValue<string>,
       _amount: PromiseOrValue<BigNumberish>,
-      _pixTarget: PromiseOrValue<string>,
+      _pixTarget: PromiseOrValue<BigNumberish>,
+      _valid: PromiseOrValue<boolean>,
       allowlistRoot: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    depositCount(overrides?: CallOverrides): Promise<BigNumber>;
+    getBalance(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getBalances(
+      sellers: PromiseOrValue<string>[],
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getPixTarget(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    getValid(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
 
     lock(
-      _depositID: PromiseOrValue<BigNumberish>,
+      _seller: PromiseOrValue<string>,
+      _token: PromiseOrValue<string>,
       _buyerAddress: PromiseOrValue<string>,
       _relayerTarget: PromiseOrValue<string>,
       _relayerPremium: PromiseOrValue<BigNumberish>,
       _amount: PromiseOrValue<BigNumberish>,
       merkleProof: PromiseOrValue<BytesLike>[],
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    mapDeposits(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    lockCounter(overrides?: CallOverrides): Promise<BigNumber>;
 
     mapLocks(
-      arg0: PromiseOrValue<BytesLike>,
+      arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
     owner(overrides?: CallOverrides): Promise<BigNumber>;
 
     release(
-      lockID: PromiseOrValue<BytesLike>,
+      lockID: PromiseOrValue<BigNumberish>,
       _relayerTarget: PromiseOrValue<string>,
       pixTimestamp: PromiseOrValue<BytesLike>,
       r: PromiseOrValue<BytesLike>,
@@ -1118,6 +1307,12 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    sellerBalance(
+      arg0: PromiseOrValue<BigNumberish>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     setDefaultLockBlocks(
       _blocks: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1144,6 +1339,12 @@ export interface P2PIX extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
+    setValidState(
+      token: PromiseOrValue<string>,
+      state: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     tokenSettings(
       _tokens: PromiseOrValue<string>[],
       _states: PromiseOrValue<boolean>[],
@@ -1151,7 +1352,7 @@ export interface P2PIX extends BaseContract {
     ): Promise<BigNumber>;
 
     unlockExpired(
-      lockIDs: PromiseOrValue<BytesLike>[],
+      lockIDs: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -1171,8 +1372,9 @@ export interface P2PIX extends BaseContract {
     ): Promise<BigNumber>;
 
     withdraw(
-      depositID: PromiseOrValue<BigNumberish>,
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      token: PromiseOrValue<string>,
+      amount: PromiseOrValue<BigNumberish>,
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -1189,14 +1391,14 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    allowedERC20s(
-      arg0: PromiseOrValue<string>,
+    _castKeyToAddr(
+      _key: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    cancelDeposit(
-      depositID: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    allowedERC20s(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     defaultLockBlocks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1204,38 +1406,59 @@ export interface P2PIX extends BaseContract {
     deposit(
       _token: PromiseOrValue<string>,
       _amount: PromiseOrValue<BigNumberish>,
-      _pixTarget: PromiseOrValue<string>,
+      _pixTarget: PromiseOrValue<BigNumberish>,
+      _valid: PromiseOrValue<boolean>,
       allowlistRoot: PromiseOrValue<BytesLike>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    depositCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    getBalance(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getBalances(
+      sellers: PromiseOrValue<string>[],
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getPixTarget(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    getValid(
+      seller: PromiseOrValue<string>,
+      token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
 
     lock(
-      _depositID: PromiseOrValue<BigNumberish>,
+      _seller: PromiseOrValue<string>,
+      _token: PromiseOrValue<string>,
       _buyerAddress: PromiseOrValue<string>,
       _relayerTarget: PromiseOrValue<string>,
       _relayerPremium: PromiseOrValue<BigNumberish>,
       _amount: PromiseOrValue<BigNumberish>,
       merkleProof: PromiseOrValue<BytesLike>[],
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    mapDeposits(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
+    lockCounter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     mapLocks(
-      arg0: PromiseOrValue<BytesLike>,
+      arg0: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     release(
-      lockID: PromiseOrValue<BytesLike>,
+      lockID: PromiseOrValue<BigNumberish>,
       _relayerTarget: PromiseOrValue<string>,
       pixTimestamp: PromiseOrValue<BytesLike>,
       r: PromiseOrValue<BytesLike>,
@@ -1251,6 +1474,12 @@ export interface P2PIX extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    sellerBalance(
+      arg0: PromiseOrValue<BigNumberish>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     setDefaultLockBlocks(
       _blocks: PromiseOrValue<BigNumberish>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
@@ -1277,6 +1506,12 @@ export interface P2PIX extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
+    setValidState(
+      token: PromiseOrValue<string>,
+      state: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     tokenSettings(
       _tokens: PromiseOrValue<string>[],
       _states: PromiseOrValue<boolean>[],
@@ -1284,7 +1519,7 @@ export interface P2PIX extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     unlockExpired(
-      lockIDs: PromiseOrValue<BytesLike>[],
+      lockIDs: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1304,8 +1539,9 @@ export interface P2PIX extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     withdraw(
-      depositID: PromiseOrValue<BigNumberish>,
-      expiredLocks: PromiseOrValue<BytesLike>[],
+      token: PromiseOrValue<string>,
+      amount: PromiseOrValue<BigNumberish>,
+      expiredLocks: PromiseOrValue<BigNumberish>[],
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
diff --git a/test/Reputation.test.ts b/test/Reputation.test.ts
index 338120b..395ca5c 100644
--- a/test/Reputation.test.ts
+++ b/test/Reputation.test.ts
@@ -36,8 +36,6 @@ describe("Reputation", () => {
       expect(tx2).to.eq(curve(500));
       expect(tx3).to.eq(curve(444444));
       expect(tx4).to.eq(curve(988700));
-
-
     });
   });
 });
diff --git a/test/p2pix.test.ts b/test/p2pix.test.ts
index a9f3e49..53c95c8 100644
--- a/test/p2pix.test.ts
+++ b/test/p2pix.test.ts
@@ -21,7 +21,7 @@ import {
 import { MockToken, P2PIX, Reputation } from "../src/types";
 import { P2PixErrors } from "./utils/errors";
 import {
-  Deposit,
+  // Deposit,
   Lock,
   getSignerAddrs,
   p2pixFixture,
@@ -90,7 +90,7 @@ describe("P2PIX", () => {
       expect(await p2pix.callStatic.reputation()).to.eq(
         reputation.address,
       );
-      expect(await p2pix.callStatic.depositCount()).to.eq(0);
+      expect(await p2pix.callStatic.lockCounter()).to.eq(0);
       expect(
         await p2pix.callStatic.validBacenSigners(ownerKey),
       ).to.eq(true);
@@ -266,9 +266,7 @@ describe("P2PIX", () => {
   });
   describe("Deposit", async () => {
     it("should revert if ERC20 is not allowed", async () => {
-      const pTarget = ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes("_pixTarget"),
-      );
+      const pTarget = ethers.BigNumber.from(7331);
       const root = ethers.utils.keccak256(
         ethers.utils.toUtf8Bytes("root"),
       );
@@ -276,6 +274,7 @@ describe("P2PIX", () => {
         owner.address,
         1,
         pTarget,
+        true,
         root,
       );
 
@@ -284,10 +283,43 @@ describe("P2PIX", () => {
         P2PixErrors.TokenDenied,
       );
     });
-    it("should create deposit, update storage and emit event", async () => {
-      const pTarget = ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes("_pixTarget"),
+    it("should revert if pixTarget is empty", async () => {
+      const root = ethers.utils.keccak256(
+        ethers.utils.toUtf8Bytes("root"),
       );
+      const tx = p2pix.deposit(
+        erc20.address,
+        1,
+        0,
+        true,
+        root,
+      );
+
+      await expect(tx).to.be.revertedWithCustomError(
+        p2pix,
+        P2PixErrors.EmptyPixTarget,
+      );
+    });
+    it("should revert if amount exceeds the balance limit", async () => {
+      const pTarget = ethers.BigNumber.from(7331);
+      const root = ethers.utils.keccak256(
+        ethers.utils.toUtf8Bytes("root"),
+      );
+      const tx = p2pix.deposit(
+        erc20.address,
+        ethers.utils.parseEther("100000001"),
+        pTarget,
+        true,
+        root,
+      );
+
+      await expect(tx).to.be.revertedWithCustomError(
+        p2pix,
+        P2PixErrors.MaxBalExceeded,
+      );
+    });
+    it("should create deposit, update storage and emit event", async () => {
+      const pTarget = ethers.BigNumber.from(7331);
       // we use `hashZero` to avoid updating seller's allowlist settings
       const root = ethers.constants.HashZero;
       await erc20.approve(p2pix.address, price);
@@ -295,29 +327,36 @@ describe("P2PIX", () => {
         erc20.address,
         price,
         pTarget,
+        true,
         root,
       );
-      const storage: Deposit = await p2pix.mapDeposits(0);
+      const storage = await p2pix.callStatic.getBalance(owner.address, erc20.address);
+      const pixTarget = await p2pix.callStatic.getPixTarget(owner.address,erc20.address);
+      const valid = await p2pix.callStatic.getValid(owner.address,erc20.address);
       const ownerKey = await p2pix.callStatic._castAddrToKey(
         owner.address,
       );
       const allowList = await p2pix.sellerAllowList(ownerKey);
+      const balances = await p2pix.callStatic.getBalances(
+        [owner.address, acc01.address],
+        erc20.address,
+        );
 
       expect(tx).to.be.ok;
       await expect(tx)
         .to.emit(p2pix, "DepositAdded")
-        .withArgs(owner.address, 0, erc20.address, price);
+        .withArgs(owner.address, erc20.address, price);
       await expect(tx).to.changeTokenBalances(
         erc20,
         [owner.address, p2pix.address],
         ["-100000000000000000000", price],
       );
-      expect(storage.remaining).to.eq(price);
-      expect(storage.pixTarget).to.eq(pTarget);
-      expect(storage.seller).to.eq(owner.address);
-      expect(storage.token).to.eq(erc20.address);
-      expect(storage.valid).to.eq(true);
+      expect(storage).to.eq(price);
+      expect(pixTarget).to.eq(pTarget);
+      expect(valid).to.eq(true);
       expect(allowList).to.eq(root);
+      expect(balances[0]).to.eq(price);
+      expect(balances[1]).to.eq(zero);
     });
     // edge case test
     it("should create multiple deposits", async () => {
@@ -334,15 +373,9 @@ describe("P2PIX", () => {
         acc03.address,
       );
 
-      const pTarget = ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes("_pixTarget"),
-      );
-      const pTarget2 = ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes("_pixTarget2"),
-      );
-      const pTarget3 = ethers.utils.keccak256(
-        ethers.utils.toUtf8Bytes("_pixTarget3"),
-      );
+      const pTarget = ethers.BigNumber.from(7331);
+      const pTarget2 = ethers.BigNumber.from(1337);
+      const pTarget3 = ethers.BigNumber.from(3731);
       // we mock the allowlist root here only to test storage update. In depth
       // allowlist test coverage in both "Lock" and "Allowlist Settings" unit tests.
       const root = ethers.utils.keccak256(
@@ -352,6 +385,7 @@ describe("P2PIX", () => {
       const price2 = price.mul(ethers.BigNumber.from(2));
       const price3 = price.mul(ethers.BigNumber.from(3));
       const price4 = price.mul(ethers.BigNumber.from(4));
+      const prices:BigNumber[] = [price, price2, price3, price4];
       await erc20.mint(
         getSignerAddrs(4, await ethers.getSigners()),
         price4,
@@ -371,21 +405,34 @@ describe("P2PIX", () => {
 
       const tx = await p2pix
         .connect(owner)
-        .deposit(erc20.address, price, pTarget, root);
+        .deposit(erc20.address, price, pTarget, true, root);
       const tx2 = await p2pix
         .connect(acc01)
-        .deposit(erc20.address, price2, pTarget2, nullRoot);
+        .deposit(erc20.address, price2, pTarget2, false, nullRoot);
       const tx3 = await p2pix
         .connect(acc02)
-        .deposit(erc20.address, price3, pTarget3, root);
+        .deposit(erc20.address, price3, pTarget3, true, root);
       const tx4 = await p2pix
         .connect(acc03)
-        .deposit(erc20.address, price4, pTarget, nullRoot);
+        .deposit(erc20.address, price4, pTarget, false, nullRoot);
 
-      const storage1: Deposit = await p2pix.mapDeposits(0);
-      const storage2: Deposit = await p2pix.mapDeposits(1);
-      const storage3: Deposit = await p2pix.mapDeposits(2);
-      const storage4: Deposit = await p2pix.mapDeposits(3);
+      const balances = await p2pix.callStatic.getBalances(
+        [owner.address, acc01.address, acc02.address, acc03.address], erc20.address);
+
+      const storage1 = await p2pix.callStatic.getBalance(owner.address, erc20.address);
+      const storage2 = await p2pix.callStatic.getBalance(acc01.address, erc20.address);
+      const storage3 = await p2pix.callStatic.getBalance(acc02.address, erc20.address);
+      const storage4 = await p2pix.callStatic.getBalance(acc03.address, erc20.address);
+
+      const pixTarget1 = await p2pix.callStatic.getPixTarget(owner.address, erc20.address);
+      const pixTarget2 = await p2pix.callStatic.getPixTarget(acc01.address, erc20.address);
+      const pixTarget3 = await p2pix.callStatic.getPixTarget(acc02.address, erc20.address);
+      const pixTarget4 = await p2pix.callStatic.getPixTarget(acc03.address, erc20.address);
+
+      const valid1 = await p2pix.callStatic.getValid(owner.address, erc20.address);
+      const valid2 = await p2pix.callStatic.getValid(acc01.address, erc20.address);
+      const valid3 = await p2pix.callStatic.getValid(acc02.address, erc20.address);
+      const valid4 = await p2pix.callStatic.getValid(acc03.address, erc20.address);
 
       const allowList1 = await p2pix.sellerAllowList(
         ownerKey,
@@ -407,7 +454,7 @@ describe("P2PIX", () => {
 
       await expect(tx)
         .to.emit(p2pix, "DepositAdded")
-        .withArgs(owner.address, 0, erc20.address, price);
+        .withArgs(owner.address, erc20.address, price);
       await expect(tx).to.changeTokenBalances(
         erc20,
         [owner.address, p2pix.address],
@@ -416,7 +463,7 @@ describe("P2PIX", () => {
 
       await expect(tx2)
         .to.emit(p2pix, "DepositAdded")
-        .withArgs(acc01.address, 1, erc20.address, price2);
+        .withArgs(acc01.address, erc20.address, price2);
       await expect(tx2).to.changeTokenBalances(
         erc20,
         [acc01.address, p2pix.address],
@@ -425,7 +472,7 @@ describe("P2PIX", () => {
 
       await expect(tx3)
         .to.emit(p2pix, "DepositAdded")
-        .withArgs(acc02.address, 2, erc20.address, price3);
+        .withArgs(acc02.address, erc20.address, price3);
       await expect(tx3).to.changeTokenBalances(
         erc20,
         [acc02.address, p2pix.address],
@@ -434,56 +481,56 @@ describe("P2PIX", () => {
 
       await expect(tx4)
         .to.emit(p2pix, "DepositAdded")
-        .withArgs(acc03.address, 3, erc20.address, price4);
+        .withArgs(acc03.address, erc20.address, price4);
       await expect(tx4).to.changeTokenBalances(
         erc20,
         [acc03.address, p2pix.address],
         ["-400000000000000000000", price4],
       );
+      
+      expect(prices[0]).to.eq(balances[0]);
+      expect(prices[1]).to.eq(balances[1]);
+      expect(prices[2]).to.eq(balances[2]);
+      expect(prices[3]).to.eq(balances[3]);
 
-      expect(storage1.remaining).to.eq(price);
-      expect(storage1.pixTarget).to.eq(pTarget);
-      expect(storage1.seller).to.eq(owner.address);
-      expect(storage1.token).to.eq(erc20.address);
-      expect(storage1.valid).to.eq(true);
+      expect(storage1).to.eq(price);
+      expect(pixTarget1).to.eq(pTarget);
+      expect(valid1).to.eq(true);
       expect(allowList1).to.eq(root);
 
-      expect(storage2.remaining).to.eq(price2);
-      expect(storage2.pixTarget).to.eq(pTarget2);
-      expect(storage2.seller).to.eq(acc01.address);
-      expect(storage2.token).to.eq(erc20.address);
-      expect(storage2.valid).to.eq(true);
+      expect(storage2).to.eq(price2);
+      expect(pixTarget2).to.eq(pTarget2);
+      expect(valid2).to.eq(false);
       expect(allowList2).to.eq(nullRoot);
 
-      expect(storage3.remaining).to.eq(price3);
-      expect(storage3.pixTarget).to.eq(pTarget3);
-      expect(storage3.seller).to.eq(acc02.address);
-      expect(storage3.token).to.eq(erc20.address);
-      expect(storage3.valid).to.eq(true);
+      expect(storage3).to.eq(price3);
+      expect(pixTarget3).to.eq(pTarget3);
+      expect(valid3).to.eq(true);
       expect(allowList3).to.eq(root);
 
-      expect(storage4.remaining).to.eq(price4);
-      expect(storage4.pixTarget).to.eq(pTarget);
-      expect(storage4.seller).to.eq(acc03.address);
-      expect(storage4.token).to.eq(erc20.address);
-      expect(storage4.valid).to.eq(true);
+      expect(storage4).to.eq(price4);
+      expect(pixTarget4).to.eq(pTarget);
+      expect(valid4).to.eq(false);
       expect(allowList4).to.eq(nullRoot);
     });
   });
   describe("Lock", async () => {
     it("should revert if deposit is invalid", async () => {
+      const pTarget = ethers.BigNumber.from(7331);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        pTarget,
+        true,
         ethers.constants.HashZero,
       );
-      await p2pix.cancelDeposit(0);
+      await p2pix.setValidState(erc20.address,false);
       const fail = p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -492,7 +539,8 @@ describe("P2PIX", () => {
           [],
         );
       const fail2 = p2pix.lock(
-        2,
+        zero,
+        zero,
         zero,
         zero,
         0,
@@ -510,18 +558,21 @@ describe("P2PIX", () => {
         P2PixErrors.InvalidDeposit,
       );
     });
-    it("should revert if wished amount is greater than deposit's remaining amount", async () => {
+    it("should revert if wished amount is greater than balance's remaining amount", async () => {
       await erc20.approve(p2pix.address, price);
+      const pTarget = ethers.BigNumber.from(1337);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        pTarget,
+        true,
         ethers.constants.HashZero,
       );
       const fail = p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -535,38 +586,50 @@ describe("P2PIX", () => {
         P2PixErrors.NotEnoughTokens,
       );
     });
-    it("should revert if a non expired lock has the same ID encoded", async () => {
-      await erc20.approve(p2pix.address, price);
-      await p2pix.deposit(
-        erc20.address,
-        price,
-        "pixTarget",
-        ethers.constants.HashZero,
-      );
-      await p2pix
-        .connect(acc03)
-        .lock(0, acc02.address, acc03.address, 0, 1, [], []);
-      const fail = p2pix
-        .connect(acc03)
-        .lock(0, acc02.address, acc03.address, 0, 1, [], []);
+    // test invalid since lockID has been replaced by a counter. 
+    // it.only("should revert if a non expired lock has the same ID encoded", async () => {
+    //   const pTarget = ethers.BigNumber.from(1337);
+    //   await erc20.approve(p2pix.address, price);
+    //   await p2pix.deposit(
+    //     erc20.address,
+    //     price,
+    //     pTarget,
+    //     true,
+    //     ethers.constants.HashZero,
+    //   );
+    //   await p2pix
+    //     .connect(acc03)
+    //     .lock(
+    //       owner.address, 
+    //       erc20.address,
+    //       acc02.address, 
+    //       acc03.address, 
+    //       0, 1, [], []);
 
-      await expect(fail).to.be.revertedWithCustomError(
-        p2pix,
-        P2PixErrors.NotExpired,
-      );
-    });
+        // console.log(await p2pix.callStatic.getValid(owner.address,erc20.address))
+      // const fail = p2pix
+      //   .connect(acc03)
+      //   .lock(owner.address, erc20.address, acc02.address, acc03.address, 0, 1, [], []);
+
+      // await expect(fail).to.be.revertedWithCustomError(
+      //   p2pix,
+      //   P2PixErrors.NotExpired,
+      // );
+    // });
     it("should revert if an invalid allowlist merkleproof is provided", async () => {
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        ethers.BigNumber.from("1337"),
+        true,
         merkleRoot,
       );
       const fail = p2pix
         .connect(acc02)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -585,21 +648,26 @@ describe("P2PIX", () => {
       );
     });
     it("should revert if msg.sender does not have enough credit in his spend limit", async () => {
-      await erc20.approve(p2pix.address, price.mul(BigNumber.from('3')));
+      await erc20.approve(
+        p2pix.address,
+        price.mul(BigNumber.from("3")),
+      );
       await p2pix.deposit(
         erc20.address,
-        price.mul(BigNumber.from('3')),
-        "pixTarget",
+        price.mul(BigNumber.from("3")),
+        ethers.BigNumber.from("1"),
+        true,
         merkleRoot,
       );
       const fail = p2pix
         .connect(acc02)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
-          price.mul(BigNumber.from('2')),
+          price.mul(BigNumber.from("2")),
           [],
           [],
         );
@@ -610,17 +678,20 @@ describe("P2PIX", () => {
       );
     });
     it("should create a lock, update storage and emit events via the allowlist path", async () => {
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       const tx = await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -628,49 +699,50 @@ describe("P2PIX", () => {
           proof,
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, price, acc02.address],
-      );
-      const storage: Lock = await p2pix.callStatic.mapLocks(
-        lockID,
-      );
+      const storage: Lock = await p2pix.callStatic.mapLocks(1);
 
       const rc: ContractReceipt = await tx.wait();
       const expiration = rc.blockNumber + 10;
-
+      const key = await p2pix.callStatic._castAddrToKey(owner.address);
+      
+      await expect(tx)
+        .to.emit(p2pix, "LockAdded")
+        .withArgs(
+          acc02.address,
+          ethers.constants.One,
+          key,
+          price,
+        );
       expect(tx).to.be.ok;
-      expect(storage.depositID).to.eq(0);
+      expect(storage.sellerKey).to.eq(key);
+      expect(storage.counter).to.eq(1);
       expect(storage.relayerPremium).to.eq(
         ethers.constants.Zero,
       );
       expect(storage.amount).to.eq(price);
       expect(storage.expirationBlock).to.eq(expiration);
+      expect(storage.pixTarget).to.eq(target);
       expect(storage.buyerAddress).to.eq(acc02.address);
       expect(storage.relayerTarget).to.eq(acc03.address);
       expect(storage.relayerAddress).to.eq(acc01.address);
-      await expect(tx)
-        .to.emit(p2pix, "LockAdded")
-        .withArgs(
-          acc02.address,
-          lockID,
-          storage.depositID,
-          storage.amount,
-        );
+      expect(storage.token).to.eq(erc20.address);
     });
-    it("should create a lock, update storage and emit events via the reputation path", async () => {
+    it("should create a lock, update storage and emit events via the reputation path 1", async () => {
       const root = ethers.constants.HashZero;
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         root,
       );
       const tx = await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -678,52 +750,142 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, price, acc02.address],
-      );
-      const storage: Lock = await p2pix.callStatic.mapLocks(
-        lockID,
-      );
+      const storage: Lock = await p2pix.callStatic.mapLocks(1);
 
       const rc: ContractReceipt = await tx.wait();
       const expiration = rc.blockNumber + 10;
+      const key = await p2pix.callStatic._castAddrToKey(owner.address);
+      const castBack = await p2pix.callStatic._castKeyToAddr(key);
 
       expect(tx).to.be.ok;
-      expect(storage.depositID).to.eq(0);
+      expect(castBack).to.eq(owner.address);
+      expect(storage.sellerKey).to.eq(key);
+      expect(storage.counter).to.eq(1);
       expect(storage.relayerPremium).to.eq(
         ethers.constants.Zero,
       );
-      expect(storage.amount).to.eq(
-        price
-      );
+      expect(storage.amount).to.eq(price);
       expect(storage.expirationBlock).to.eq(expiration);
+      expect(storage.pixTarget).to.eq(target);
       expect(storage.buyerAddress).to.eq(acc02.address);
       expect(storage.relayerTarget).to.eq(acc03.address);
       expect(storage.relayerAddress).to.eq(acc01.address);
+      expect(storage.token).to.eq(erc20.address);
+      
       await expect(tx)
         .to.emit(p2pix, "LockAdded")
         .withArgs(
           acc02.address,
-          lockID,
-          storage.depositID,
+          1,
+          key,
+          storage.amount,
+        );
+    });
+    it("should create a lock, update storage and emit events via the reputation path 2", async () => {
+      const root = ethers.constants.HashZero;
+      const newPrice = price.mul(ethers.constants.Two).add(ethers.constants.One);
+      const endtoendID = ethers.constants.HashZero;
+      const target = ethers.BigNumber.from(101);
+      const messageToSign = ethers.utils.solidityKeccak256(
+        ["uint160", "uint256", "bytes32"],
+        [target, price, endtoendID],
+      );
+      const messageHashBytes =
+        ethers.utils.arrayify(messageToSign);
+      const flatSig = await acc01.signMessage(
+        messageHashBytes,
+      );
+      const sig = ethers.utils.splitSignature(flatSig);
+      await erc20.approve(p2pix.address, newPrice);
+      await p2pix.deposit(
+        erc20.address,
+        newPrice,
+        target,
+        true,
+        root,
+      );
+      await p2pix
+        .connect(acc01)
+        .lock(
+          owner.address,
+          erc20.address,
+          acc02.address,
+          acc03.address,
+          price,
+          price,
+          [],
+          [],
+        );
+    await p2pix
+      .connect(acc01)
+      .release(
+        1,
+        acc02.address,
+        endtoendID,
+        sig.r,
+        sig.s,
+        sig.v,
+      );
+      const tx = await p2pix
+      .connect(acc01)
+      .lock(
+        owner.address,
+        erc20.address,
+        acc02.address,
+        acc03.address,
+        0,
+        price.add(ethers.constants.One),
+        [],
+        [],
+      );
+      const storage: Lock = await p2pix.callStatic.mapLocks(2);
+
+      const rc: ContractReceipt = await tx.wait();
+      const expiration = rc.blockNumber + 10;
+      const key = await p2pix.callStatic._castAddrToKey(owner.address);
+      const castBack = await p2pix.callStatic._castKeyToAddr(key);
+
+      expect(tx).to.be.ok;
+      expect(castBack).to.eq(owner.address);
+      expect(storage.sellerKey).to.eq(key);
+      expect(storage.counter).to.eq(2);
+      expect(storage.relayerPremium).to.eq(
+        ethers.constants.Zero,
+      );
+      expect(storage.amount).to.eq(price.add(ethers.constants.One));
+      expect(storage.expirationBlock).to.eq(expiration);
+      expect(storage.pixTarget).to.eq(target);
+      expect(storage.buyerAddress).to.eq(acc02.address);
+      expect(storage.relayerTarget).to.eq(acc03.address);
+      expect(storage.relayerAddress).to.eq(acc01.address);
+      expect(storage.token).to.eq(erc20.address);
+      
+      await expect(tx)
+        .to.emit(p2pix, "LockAdded")
+        .withArgs(
+          acc02.address,
+          2,
+          key,
           storage.amount,
         );
     });
     // edge case test
     it("should create multiple locks", async () => {
       const newPrice = price.div(ethers.BigNumber.from(2));
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       const tx1 = await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -731,12 +893,8 @@ describe("P2PIX", () => {
           proof,
           [],
         );
-      const lockID1 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, newPrice, acc02.address],
-      );
       const storage1: Lock = await p2pix.callStatic.mapLocks(
-        lockID1,
+        1,
       );
 
       const rc1: ContractReceipt = await tx1.wait();
@@ -745,7 +903,8 @@ describe("P2PIX", () => {
       const tx2 = await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -753,13 +912,7 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID2 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
-      const storage2: Lock = await p2pix.callStatic.mapLocks(
-        lockID2,
-      );
+      const storage2: Lock = await p2pix.callStatic.mapLocks(2);
 
       const rc2: ContractReceipt = await tx2.wait();
       const expiration2 = rc2.blockNumber + 10;
@@ -767,7 +920,8 @@ describe("P2PIX", () => {
       const tx3 = await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc03.address,
           acc03.address,
           0,
@@ -775,25 +929,25 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID3 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc03.address],
-      );
-      const storage3: Lock = await p2pix.callStatic.mapLocks(
-        lockID3,
-      );
+      const storage3: Lock = await p2pix.callStatic.mapLocks(3);
 
       const rc3: ContractReceipt = await tx3.wait();
       const expiration3 = rc3.blockNumber + 10;
 
+      const key = await p2pix.callStatic._castAddrToKey(owner.address);
+
       expect(tx1).to.be.ok;
       expect(tx2).to.be.ok;
       expect(tx3).to.be.ok;
 
-      expect(0)
-        .to.eq(storage1.depositID)
-        .and.to.eq(storage2.depositID)
-        .and.to.eq(storage3.depositID);
+      expect(key)
+        .to.eq(storage1.sellerKey)
+        .and.to.eq(storage2.sellerKey)
+        .and.to.eq(storage3.sellerKey);
+
+      expect(storage1.counter).to.eq(1);
+      expect(storage2.counter).to.eq(2);
+      expect(storage3.counter).to.eq(3);
 
       expect(ethers.constants.Zero)
         .to.eq(storage1.relayerPremium)
@@ -809,6 +963,11 @@ describe("P2PIX", () => {
       expect(storage2.expirationBlock).to.eq(expiration2);
       expect(storage3.expirationBlock).to.eq(expiration3);
 
+      expect(target)
+      .to.eq(storage1.pixTarget)
+      .and.to.eq(storage2.pixTarget)
+      .and.to.eq(storage3.pixTarget);
+
       expect(acc02.address)
         .to.eq(storage1.buyerAddress)
         .and.to.eq(storage2.buyerAddress);
@@ -824,131 +983,138 @@ describe("P2PIX", () => {
         .and.to.eq(storage2.relayerAddress);
       expect(storage3.relayerAddress).to.eq(acc03.address);
 
+      expect(erc20.address)
+          .to.eq(storage1.token)
+          .and.to.eq(storage2.token)
+          .and.to.eq(storage3.token);
+
       await expect(tx1)
         .to.emit(p2pix, "LockAdded")
         .withArgs(
           acc02.address,
-          lockID1,
-          storage1.depositID,
+          1,
+          key,
           storage1.amount,
         );
       await expect(tx2)
         .to.emit(p2pix, "LockAdded")
         .withArgs(
           acc02.address,
-          lockID2,
-          storage2.depositID,
+          2,
+          key,
           storage2.amount,
         );
       await expect(tx3)
         .to.emit(p2pix, "LockAdded")
         .withArgs(
           acc03.address,
-          lockID3,
-          storage3.depositID,
+          3,
+          key,
           storage3.amount,
         );
     });
   });
-  describe("Cancel Deposit", async () => {
-    it("should revert if the msg.sender isn't the deposit's seller", async () => {
-      await erc20.approve(p2pix.address, price);
-      await p2pix.deposit(
-        erc20.address,
-        price,
-        "pixTarget",
-        merkleRoot,
-      );
-      const fail = p2pix.connect(acc01).cancelDeposit(0);
+  describe("Set sellerBalance Valid State", async () => {
+    it("should revert if sellerBalance hasn't been initialized", async () => {
+      const fail = p2pix.setValidState(erc20.address,false);
+      
       await expect(fail).to.be.revertedWithCustomError(
         p2pix,
-        P2PixErrors.OnlySeller,
+        P2PixErrors.NotInitialized,
       );
     });
-    it("should cancel deposit, update storage and emit events", async () => {
+    it("should setValidState, update storage and emit events", async () => {
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        ethers.BigNumber.from(10101),
+        true,
         merkleRoot,
       );
-      const state1: Deposit =
-        await p2pix.callStatic.mapDeposits(0);
-      const tx = await p2pix.cancelDeposit(0);
-      const state2: Deposit =
-        await p2pix.callStatic.mapDeposits(0);
+      const state1 =
+        await p2pix.callStatic.getValid(owner.address,erc20.address);
+      const tx = await p2pix.setValidState(erc20.address,false);
+      const state2 =
+        await p2pix.callStatic.getValid(owner.address,erc20.address);
 
       expect(tx).to.be.ok;
       await expect(tx)
-        .to.emit(p2pix, "DepositClosed")
-        .withArgs(owner.address, 0);
-      expect(state1.valid).to.be.true;
-      expect(state2.valid).to.be.false;
+        .to.emit(p2pix, "ValidSet")
+        .withArgs(owner.address, erc20.address, false);
+      expect(state1).to.be.true;
+      expect(state2).to.be.false;
     });
-    it("should cancel multiple deposits", async () => {
+    it("should cancel multiple balances", async () => {
+      const hashZero = ethers.constants.HashZero;
+      await erc20.mint([acc01.address,acc02.address],price);
+      const target = ethers.BigNumber.from("1");
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
-        ethers.constants.HashZero,
+        target,
+        true,
+        hashZero,
       );
-      await erc20.approve(p2pix.address, price);
-      await p2pix.deposit(
+      await erc20.connect(acc01).approve(p2pix.address, price);
+      await p2pix.connect(acc01).deposit(
         erc20.address,
         price,
-        "pixTarget",
-        ethers.constants.HashZero,
+        target,
+        false,
+        hashZero,
       );
-      await erc20.approve(p2pix.address, price);
-      await p2pix.deposit(
+      await erc20.connect(acc02).approve(p2pix.address, price);
+      await p2pix.connect(acc02).deposit(
         erc20.address,
         price,
-        "pixTarget",
-        ethers.constants.HashZero,
+        target,
+        true,
+        hashZero,
       );
-      const oldState1: Deposit =
-        await p2pix.callStatic.mapDeposits(0);
-      const oldState2: Deposit =
-        await p2pix.callStatic.mapDeposits(1);
-      const oldState3: Deposit =
-        await p2pix.callStatic.mapDeposits(2);
-      const tx1 = await p2pix.cancelDeposit(0);
-      const tx2 = await p2pix.cancelDeposit(1);
-      const tx3 = await p2pix.cancelDeposit(2);
-      const newState1: Deposit =
-        await p2pix.callStatic.mapDeposits(0);
-      const newState2: Deposit =
-        await p2pix.callStatic.mapDeposits(1);
-      const newState3: Deposit =
-        await p2pix.callStatic.mapDeposits(2);
+      const oldState1 = 
+        await p2pix.callStatic.getValid(owner.address,erc20.address);
+      const oldState2 =
+        await p2pix.callStatic.getValid(acc01.address,erc20.address);
+      const oldState3 =
+        await p2pix.callStatic.getValid(acc02.address,erc20.address);
+      const tx1 = await p2pix.setValidState(erc20.address,false);
+      const tx2 = await p2pix.connect(acc01).setValidState(erc20.address,true);
+      const tx3 = await p2pix.connect(acc02).setValidState(erc20.address,true);
+      const newState1 =
+        await p2pix.callStatic.getValid(owner.address,erc20.address);
+      const newState2 =
+      await p2pix.callStatic.getValid(acc01.address,erc20.address);
+      const newState3 =
+      await p2pix.callStatic.getValid(acc02.address,erc20.address);
 
       expect(tx1).to.be.ok;
       expect(tx2).to.be.ok;
       expect(tx3).to.be.ok;
       await expect(tx1)
-        .to.emit(p2pix, "DepositClosed")
-        .withArgs(owner.address, 0);
+        .to.emit(p2pix, "ValidSet")
+        .withArgs(owner.address, erc20.address,false);
       await expect(tx2)
-        .to.emit(p2pix, "DepositClosed")
-        .withArgs(owner.address, 1);
+        .to.emit(p2pix, "ValidSet")
+        .withArgs(acc01.address, erc20.address,true);
       await expect(tx3)
-        .to.emit(p2pix, "DepositClosed")
-        .withArgs(owner.address, 2);
-      expect(oldState1.valid).to.be.true;
-      expect(oldState2.valid).to.be.true;
-      expect(oldState3.valid).to.be.true;
-      expect(newState1.valid).to.be.false;
-      expect(newState2.valid).to.be.false;
-      expect(newState3.valid).to.be.false;
+        .to.emit(p2pix, "ValidSet")
+        .withArgs(acc02.address, erc20.address,true);
+      expect(oldState1).to.be.true;
+      expect(oldState2).to.be.false;
+      expect(oldState3).to.be.true;
+      expect(newState1).to.be.false;
+      expect(newState2).to.be.true;
+      expect(newState3).to.be.true;
     });
   });
   describe("Release", async () => {
     it("should revert if lock has expired", async () => {
+      const target = ethers.BigNumber.from(101);
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        ["pixTarget", 100, ethers.constants.HashZero],
+        ["uint160", "uint256", "bytes32"],
+        [target, 100, ethers.constants.HashZero],
       );
       const flatSig = await acc01.signMessage(
         ethers.utils.arrayify(messageToSign),
@@ -958,13 +1124,15 @@ describe("P2PIX", () => {
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -972,10 +1140,7 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
+      const lockID = ethers.constants.One;
       await mine(13);
       const fail = p2pix.release(
         lockID,
@@ -992,9 +1157,11 @@ describe("P2PIX", () => {
       );
     });
     it("should revert if lock has already been released", async () => {
+      const target = ethers.BigNumber.from("1");
+      const hashZero = ethers.constants.HashZero;
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        ["pixTarget", 100, ethers.constants.HashZero],
+        ["uint160", "uint256", "bytes32"],
+        [target, 100, hashZero],
       );
       const flatSig = await acc01.signMessage(
         ethers.utils.arrayify(messageToSign),
@@ -1004,13 +1171,15 @@ describe("P2PIX", () => {
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -1018,10 +1187,7 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
+      const lockID = ethers.constants.One;
       await p2pix.release(
         lockID,
         acc03.address,
@@ -1045,9 +1211,10 @@ describe("P2PIX", () => {
       );
     });
     it("should revert if signed message has already been used", async () => {
+      const target = ethers.BigNumber.from(101);
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        ["pixTarget", 100, ethers.constants.HashZero],
+        ["uint160", "uint256", "bytes32"],
+        [target, 100, ethers.constants.HashZero],
       );
       const flatSig = await owner.signMessage(
         ethers.utils.arrayify(messageToSign),
@@ -1057,13 +1224,15 @@ describe("P2PIX", () => {
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         ethers.constants.HashZero,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -1071,14 +1240,11 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
+      
       await p2pix
         .connect(acc01)
         .release(
-          lockID,
+          1,
           acc02.address,
           ethers.constants.HashZero,
           sig.r,
@@ -1088,7 +1254,8 @@ describe("P2PIX", () => {
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -1096,14 +1263,10 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID2 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
       const fail = p2pix
         .connect(acc01)
         .release(
-          lockID2,
+          2,
           acc02.address,
           ethers.constants.HashZero,
           sig.r,
@@ -1117,9 +1280,10 @@ describe("P2PIX", () => {
       );
     });
     it("should revert if ecrecovered signer is invalid", async () => {
+      const target = ethers.BigNumber.from(101);
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        ["pixTarget", 100, ethers.constants.HashZero],
+        ["uint160", "uint256", "bytes32"],
+        [target, 100, ethers.constants.HashZero],
       );
       const flatSig = await acc03.signMessage(
         ethers.utils.arrayify(messageToSign),
@@ -1130,13 +1294,15 @@ describe("P2PIX", () => {
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         ethers.constants.HashZero,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -1144,14 +1310,10 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
       const fail = p2pix
         .connect(acc01)
         .release(
-          lockID,
+          1,
           acc02.address,
           ethers.constants.HashZero,
           sig.r,
@@ -1165,10 +1327,11 @@ describe("P2PIX", () => {
       );
     });
     it("should release lock, update storage and emit events", async () => {
+      const zero = ethers.constants.Zero;
       const endtoendID = ethers.constants.HashZero;
-      const pixTarget = "pixTarget";
+      const pixTarget = ethers.BigNumber.from(101);
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
+        ["uint160", "uint256", "bytes32"],
         [pixTarget, 100, endtoendID],
       );
       // Note: messageToSign is a string, that is 66-bytes long, to sign the
@@ -1194,12 +1357,14 @@ describe("P2PIX", () => {
         erc20.address,
         price,
         pixTarget,
+        true,
         root,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           6,
@@ -1207,10 +1372,6 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
       const acc01Key = await p2pix.callStatic._castAddrToKey(
         acc01.address,
       );
@@ -1223,22 +1384,18 @@ describe("P2PIX", () => {
       const userRecord1 = await p2pix.callStatic.userRecord(
         acc03Key,
       );
-      const storage1: Lock = await p2pix.callStatic.mapLocks(
-        lockID,
-      );
+      const storage1: Lock = await p2pix.callStatic.mapLocks(1);
       const tx = await p2pix
         .connect(acc01)
         .release(
-          lockID,
+          1,
           acc02.address,
           endtoendID,
           sig.r,
           sig.s,
           sig.v,
         );
-      const storage2: Lock = await p2pix.callStatic.mapLocks(
-        lockID,
-      );
+      const storage2: Lock = await p2pix.callStatic.mapLocks(1);
       const userRecordB = await p2pix.callStatic.userRecord(
         acc01Key,
       );
@@ -1251,20 +1408,18 @@ describe("P2PIX", () => {
       expect(tx).to.be.ok;
       await expect(tx)
         .to.emit(p2pix, "LockReleased")
-        .withArgs(acc02.address, lockID, storage1.amount);
+        .withArgs(acc02.address, ethers.constants.One, storage1.amount);
       expect(storage1.expirationBlock).to.eq(
         ethers.BigNumber.from(16),
       );
       expect(storage1.amount).to.eq(
         ethers.BigNumber.from(100),
       );
-      expect(storage2.expirationBlock).to.eq(
-        ethers.BigNumber.from(0),
-      );
-      expect(storage2.amount).to.eq(ethers.BigNumber.from(0));
+      expect(storage2.expirationBlock).to.eq(zero);
+      expect(storage2.amount).to.eq(zero);
       expect(used).to.eq(true);
-      expect(userRecordA).to.eq(ethers.constants.Zero);
-      expect(userRecord1).to.eq(ethers.constants.Zero);
+      expect(userRecordA).to.eq(zero);
+      expect(userRecord1).to.eq(zero);
       expect(userRecordB).to.eq(ethers.BigNumber.from(6));
       expect(userRecord2).to.eq(ethers.BigNumber.from(100));
       await expect(tx).to.changeTokenBalances(
@@ -1278,45 +1433,57 @@ describe("P2PIX", () => {
     // edge case test
     it("should release multiple locks", async () => {
       const endtoendID = ethers.constants.HashZero;
-      const pixTarget = "pixTarget";
+      const pixTarget = ethers.BigNumber.from(101);
       const root = ethers.constants.HashZero;
-      const acc01Key = 
-        await p2pix.callStatic._castAddrToKey(acc01.address);
-      const acc03Key = 
-        await p2pix.callStatic._castAddrToKey(acc03.address);
-      const acc01Record1 = 
-        await p2pix.callStatic.userRecord(acc01Key);
-      const acc03Record1 = 
-        await p2pix.callStatic.userRecord(acc03Key);
+      const acc01Key = await p2pix.callStatic._castAddrToKey(
+        acc01.address,
+      );
+      const acc03Key = await p2pix.callStatic._castAddrToKey(
+        acc03.address,
+      );
+      const acc01Record1 = await p2pix.callStatic.userRecord(
+        acc01Key,
+      );
+      const acc03Record1 = await p2pix.callStatic.userRecord(
+        acc03Key,
+      );
       const messageToSign1 = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        [pixTarget, 100, endtoendID]);
+        ["uint160", "uint256", "bytes32"],
+        [pixTarget, 100, endtoendID],
+      );
       const flatSig1 = await owner.signMessage(
-        ethers.utils.arrayify(messageToSign1));
+        ethers.utils.arrayify(messageToSign1),
+      );
       const sig1 = ethers.utils.splitSignature(flatSig1);
       const messageToSign2 = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        [pixTarget, 50, endtoendID]);
+        ["uint160", "uint256", "bytes32"],
+        [pixTarget, 50, endtoendID],
+      );
       const flatSig2 = await owner.signMessage(
-        ethers.utils.arrayify(messageToSign2));
+        ethers.utils.arrayify(messageToSign2),
+      );
       const sig2 = ethers.utils.splitSignature(flatSig2);
       const messageToSign3 = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
-        [pixTarget, 25, endtoendID]);
+        ["uint160", "uint256", "bytes32"],
+        [pixTarget, 25, endtoendID],
+      );
       const flatSig3 = await owner.signMessage(
-        ethers.utils.arrayify(messageToSign3));
+        ethers.utils.arrayify(messageToSign3),
+      );
       const sig3 = ethers.utils.splitSignature(flatSig3);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
         pixTarget,
+        true,
         root,
       );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -1327,18 +1494,20 @@ describe("P2PIX", () => {
       await p2pix
         .connect(acc03)
         .lock(
-          0,
-          acc02.address,
-          acc03.address,
-          6,
-          50,
-          [],
-          [],
-        );
+          owner.address,
+          erc20.address,
+          acc02.address, 
+          acc03.address, 
+          6, 
+          50, 
+          [], 
+          []
+      );
       await p2pix
         .connect(acc03)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           10,
@@ -1346,23 +1515,12 @@ describe("P2PIX", () => {
           [],
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 100, acc02.address],
-      );
-      const lockID2 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 50, acc02.address],
-      );
-      const lockID3 = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 25, acc02.address],
-      );
-
+      const lockID = ethers.constants.One;
+      const lockID2 = ethers.constants.Two;
+      const lockID3 = ethers.BigNumber.from(3);
       const storage1: Lock = await p2pix.callStatic.mapLocks(lockID);
       const storage2: Lock = await p2pix.callStatic.mapLocks(lockID2);
       const storage3: Lock = await p2pix.callStatic.mapLocks(lockID3);
-
       // relayerPremium == 0
       const tx = await p2pix
         .connect(acc01)
@@ -1374,7 +1532,7 @@ describe("P2PIX", () => {
           sig1.s,
           sig1.v,
         );
-      // relayerPremium != 0 && 
+      // relayerPremium != 0 &&
       // lock's msg.sender != release's msg.sender
       const tx1 = await p2pix
         .connect(acc01)
@@ -1386,7 +1544,7 @@ describe("P2PIX", () => {
           sig2.s,
           sig2.v,
         );
-      // relayerPremium != 0 && 
+      // relayerPremium != 0 &&
       // lock's msg.sender == release's msg.sender
       const tx2 = await p2pix
         .connect(acc03)
@@ -1398,101 +1556,96 @@ describe("P2PIX", () => {
           sig3.s,
           sig3.v,
         );
-        const used1 = await p2pix.callStatic.usedTransactions(
-          ethers.utils.arrayify(messageToSign1),
-        );
-        const used2 = await p2pix.callStatic.usedTransactions(
-          ethers.utils.arrayify(messageToSign2),
-        );
-        const used3 = await p2pix.callStatic.usedTransactions(
-          ethers.utils.arrayify(messageToSign3),
-        );
-        const acc01Record2 = 
-          await p2pix.callStatic.userRecord(acc01Key);
-        const acc03Record2 = 
-          await p2pix.callStatic.userRecord(acc03Key);
+      const used1 = await p2pix.callStatic.usedTransactions(
+        ethers.utils.arrayify(messageToSign1),
+      );
+      const used2 = await p2pix.callStatic.usedTransactions(
+        ethers.utils.arrayify(messageToSign2),
+      );
+      const used3 = await p2pix.callStatic.usedTransactions(
+        ethers.utils.arrayify(messageToSign3),
+      );
+      const acc01Record2 = await p2pix.callStatic.userRecord(
+        acc01Key,
+      );
+      const acc03Record2 = await p2pix.callStatic.userRecord(
+        acc03Key,
+      );
 
-        expect(tx).to.be.ok;
-        expect(tx1).to.be.ok;
-        expect(tx2).to.be.ok;
-        await expect(tx)
-          .to.emit(p2pix, "LockReleased")
-          .withArgs(acc02.address, lockID, storage1.amount);
-        await expect(tx1)
-          .to.emit(p2pix, "LockReleased")
-          .withArgs(acc02.address, lockID2, storage2.amount);
-        await expect(tx2)
-          .to.emit(p2pix, "LockReleased")
-          .withArgs(acc02.address, lockID3, storage3.amount);
-        expect(used1).to.eq(true);
-        expect(used2).to.eq(true);
-        expect(used3).to.eq(true);
-        expect(0).to.eq(acc01Record1).and.to.eq(acc03Record1);
-        expect(acc01Record2).to.eq(6); // 0 + 6
-        expect(acc03Record2).to.eq(185); // 100 + 50 + 25 + 10
-        await expect(tx).to.changeTokenBalances(
-          erc20, 
-          [
-            acc01.address, 
-            acc02.address, 
-            acc03.address, 
-            p2pix.address
-          ], 
-          [
-            0,
-            100, 
-            0,   
-            "-100"
-          ],
-        );
-        await expect(tx1).to.changeTokenBalances(
-          erc20, 
-          [
-            acc01.address, 
-            acc02.address, 
-            acc03.address, 
-            p2pix.address
-          ], 
-          [
-            0,
-            47, 
-            3,  
-            "-50"
-          ],
-        );
-        await expect(tx2).to.changeTokenBalances(
-          erc20, 
-          [
-            acc01.address, 
-            acc02.address, 
-            acc03.address, 
-            p2pix.address
-          ], 
-          [
-            0,
-            20, 
-            5,   
-            "-25"
-          ],
-        );
+      expect(tx).to.be.ok;
+      expect(tx1).to.be.ok;
+      expect(tx2).to.be.ok;
+      await expect(tx)
+        .to.emit(p2pix, "LockReleased")
+        .withArgs(acc02.address, lockID, storage1.amount);
+      await expect(tx1)
+        .to.emit(p2pix, "LockReleased")
+        .withArgs(acc02.address, lockID2, storage2.amount);
+      await expect(tx2)
+        .to.emit(p2pix, "LockReleased")
+        .withArgs(acc02.address, lockID3, storage3.amount);
+      expect(used1).to.eq(true);
+      expect(used2).to.eq(true);
+      expect(used3).to.eq(true);
+      expect(0).to.eq(acc01Record1).and.to.eq(acc03Record1);
+      expect(acc01Record2).to.eq(6); // 0 + 6
+      expect(acc03Record2).to.eq(185); // 100 + 50 + 25 + 10
+      await expect(tx).to.changeTokenBalances(
+        erc20,
+        [
+          acc01.address,
+          acc02.address,
+          acc03.address,
+          p2pix.address,
+        ],
+        [0, 100, 0, "-100"],
+      );
+      await expect(tx1).to.changeTokenBalances(
+        erc20,
+        [
+          acc01.address,
+          acc02.address,
+          acc03.address,
+          p2pix.address,
+        ],
+        [0, 47, 3, "-50"],
+      );
+      await expect(tx2).to.changeTokenBalances(
+        erc20,
+        [
+          acc01.address,
+          acc02.address,
+          acc03.address,
+          p2pix.address,
+        ],
+        [0, 20, 5, "-25"],
+      );
     });
   });
   describe("Unexpire Locks", async () => {
     it("should revert if lock isn't expired", async () => {
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc02)
-        .lock(0, acc02.address, acc03.address, 0, 1, [], []);
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 1, acc02.address],
-      );
+        .lock(
+          owner.address,
+          erc20.address,
+          acc02.address, 
+          acc03.address, 
+          0, 
+          1, 
+          [], 
+          []
+        );
+      const lockID = ethers.constants.One;
       const fail = p2pix.unlockExpired([lockID]);
 
       await expect(fail).to.be.revertedWithCustomError(
@@ -1502,9 +1655,9 @@ describe("P2PIX", () => {
     });
     it("should revert if lock has already been released", async () => {
       const endtoendID = ethers.constants.HashZero;
-      const pixTarget = "pixTarget";
+      const pixTarget = ethers.BigNumber.from(101);
       const messageToSign = ethers.utils.solidityKeccak256(
-        ["string", "uint256", "bytes32"],
+        ["uint160", "uint256", "bytes32"],
         [pixTarget, 1, endtoendID],
       );
       const messageHashBytes =
@@ -1518,15 +1671,22 @@ describe("P2PIX", () => {
         erc20.address,
         price,
         pixTarget,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc02)
-        .lock(0, acc02.address, acc03.address, 0, 1, [], []);
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 1, acc02.address],
-      );
+        .lock(
+          owner.address,
+          erc20.address, 
+          acc02.address, 
+          acc03.address, 
+          0, 
+          1, 
+          [], 
+          []
+        );
+      const lockID = ethers.constants.One;
       // await mine(10);
       await p2pix.release(
         lockID,
@@ -1544,20 +1704,28 @@ describe("P2PIX", () => {
       );
     });
     it("should unlock expired locks, update storage and emit events", async () => {
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc02)
-        .lock(0, acc02.address, acc03.address, 0, 1, [], []);
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, 1, acc02.address],
-      );
+        .lock(
+          owner.address, 
+          erc20.address, 
+          acc02.address, 
+          acc03.address, 
+          0, 
+          1, 
+          [], 
+          []
+        );
+      const lockID = ethers.constants.One;
       await mine(11);
       const storage: Lock = await p2pix.callStatic.mapLocks(
         lockID,
@@ -1586,18 +1754,21 @@ describe("P2PIX", () => {
       expect(record2).to.eq(price);
     });
     it("should unlock expired through lock function", async () => {
+      const target = ethers.BigNumber.from(101);
       // test method through lock fx
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       const lock1: ContractTransaction = await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -1613,10 +1784,7 @@ describe("P2PIX", () => {
       );
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const emittedLockID = event?.args!["lockID"];
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, price, acc02.address],
-      );
+      const lockID = ethers.constants.One;
 
       // mine blocks to expire lock
       await mine(12);
@@ -1641,7 +1809,8 @@ describe("P2PIX", () => {
       // create another lock by freeing the price value
       // back to `l.remamining` and lock 100 again.
       const tx1 = await p2pix.lock(
-        0,
+        owner.address,
+        erc20.address,
         acc02.address,
         acc03.address,
         0,
@@ -1649,31 +1818,32 @@ describe("P2PIX", () => {
         [],
         [lockID],
       );
-      const dep: Deposit = await p2pix.callStatic.mapDeposits(
-        0,
-      );
+      const remaining = await p2pix.callStatic.getBalance(owner.address,erc20.address);
 
       expect(tx1).to.be.ok;
       await expect(tx1)
         .to.emit(p2pix, "LockReturned")
         .withArgs(acc02.address, lockID);
-      expect(dep.remaining).to.eq(
+      expect(remaining).to.eq(
         price.sub(ethers.BigNumber.from(100)),
       );
     });
     it("should unlock expired through withdraw function", async () => {
+      const target = ethers.constants.One;
       // test method through withdraw fx
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
       await p2pix
         .connect(acc01)
         .lock(
-          0,
+          owner.address,
+          erc20.address,
           acc02.address,
           acc03.address,
           0,
@@ -1681,49 +1851,54 @@ describe("P2PIX", () => {
           proof,
           [],
         );
-      const lockID = ethers.utils.solidityKeccak256(
-        ["uint256", "uint256", "address"],
-        [0, price, acc02.address],
-      );
+      const lockID = ethers.constants.One;
       // mine blocks to expire lock
       await mine(11);
-      const tx = await p2pix.withdraw(0, [lockID]);
-      const dep: Deposit = await p2pix.callStatic.mapDeposits(
-        0,
-      );
+      const tx = await p2pix.withdraw(erc20.address, price, [lockID]);
+      const remaining = await p2pix.callStatic.getBalance(owner.address, erc20.address);
 
       expect(tx).to.be.ok;
       await expect(tx)
         .to.emit(p2pix, "LockReturned")
         .withArgs(acc02.address, lockID);
-      expect(dep.remaining).to.eq(0);
+      expect(remaining).to.eq(0);
     });
   });
+
   describe("Seller Withdraw", async () => {
-    it("should revert if the msg.sender isn't the deposit's seller", async () => {
+    it("should revert if the wished amount is invalid", async () => {
+      const target = ethers.BigNumber.from(101);
       await erc20.approve(p2pix.address, price);
       await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        target,
+        true,
         merkleRoot,
       );
-      const fail = p2pix.connect(acc02).withdraw(0, []);
+      const fail = p2pix.connect(acc02).withdraw(erc20.address, price.mul(ethers.constants.Two),[]);
 
       await expect(fail).to.be.revertedWithCustomError(
         p2pix,
-        P2PixErrors.OnlySeller,
+        P2PixErrors.DecOverflow,
       );
+
     });
     it("should withdraw remaining funds from deposit, update storage and emit event", async () => {
+      const newPrice = price.div(ethers.constants.Two);
       await erc20.approve(p2pix.address, price);
       const dep = await p2pix.deposit(
         erc20.address,
         price,
-        "pixTarget",
+        ethers.BigNumber.from(101),
+        true,
         merkleRoot,
       );
-      const tx = await p2pix.withdraw(0, []);
+      const tx = await p2pix.withdraw(
+        erc20.address, 
+        price.div(ethers.constants.Two), 
+        []
+      );
 
       expect(tx).to.be.ok;
       await expect(dep)
@@ -1738,16 +1913,16 @@ describe("P2PIX", () => {
           price,
         );
       await expect(tx)
-        .to.changeTokenBalance(erc20, owner.address, price)
+        .to.changeTokenBalance(erc20, owner.address, newPrice)
         .and.to.changeTokenBalance(
           erc20,
           p2pix.address,
-          "-100000000000000000000",
+          "-50000000000000000000",
         );
 
       await expect(tx)
         .to.emit(p2pix, "DepositWithdrawn")
-        .withArgs(owner.address, 0, price);
+        .withArgs(owner.address, erc20.address, newPrice);
     });
   });
   describe("Allowlist Settings", async () => {
diff --git a/test/utils/errors.ts b/test/utils/errors.ts
index 111ff6f..5bf5595 100644
--- a/test/utils/errors.ts
+++ b/test/utils/errors.ts
@@ -15,4 +15,8 @@ export enum P2PixErrors {
   AddressDenied = "AddressDenied",
   AmountNotAllowed = "AmountNotAllowed",
   LockExpired = "LockExpired",
+  EmptyPixTarget = "EmptyPixTarget",
+  MaxBalExceeded = "MaxBalExceeded",
+  NotInitialized = "NotInitialized",
+  DecOverflow = "DecOverflow",
 }
diff --git a/test/utils/fixtures.ts b/test/utils/fixtures.ts
index ab9d9ed..fd9baca 100644
--- a/test/utils/fixtures.ts
+++ b/test/utils/fixtures.ts
@@ -17,22 +17,25 @@ export interface Deploys {
   token: string;
 }
 
-export interface Deposit {
-  remaining: BigNumber;
-  pixTarget: string;
-  seller: string;
-  token: string;
-  valid: boolean;
-}
+// export interface Deposit {
+//   remaining: BigNumber;
+//   pixTarget: string;
+//   seller: string;
+//   token: string;
+//   valid: boolean;
+// }
 
 export interface Lock {
-  depositID: BigNumber;
+  sellerKey: BigNumber;
+  counter: BigNumber;
   relayerPremium: BigNumber;
   amount: BigNumber;
   expirationBlock: BigNumber;
+  pixTarget: BigNumber;
   buyerAddress: string;
   relayerTarget: string;
   relayerAddress: string;
+  token: string;
 }
 
 export interface P2pixFixture {