diff --git a/deployment/alpha/broadcast/Deploy.sol/53261/run-alpha.json b/deployment/alpha/broadcast/Deploy.sol/53261/run-alpha.json index c7710f7..60c6907 100644 --- a/deployment/alpha/broadcast/Deploy.sol/53261/run-alpha.json +++ b/deployment/alpha/broadcast/Deploy.sol/53261/run-alpha.json @@ -63,8 +63,8 @@ { "transactionHash": "0xf22813bd706f4d1ce9fe37fc23844d070b7a0a34c6676a320d0c348487d16801", "transactionIndex": "0x0", - "blockHash": "0xdb462dd13a8b46af5b23c84df1e61e96e9bba65f8b001b17b0c9acadf954be06", - "blockNumber": "0x9088872", + "blockHash": "0xc645087c7c0240a977d4de3ea924623f0a644eac03a33ca9e152e1409624960b", + "blockNumber": "0x9115421", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": "0x4e59b44847b379578588920cA78FbF26c0B4956C", "cumulativeGasUsed": "0x45afc0", @@ -79,8 +79,8 @@ { "transactionHash": "0xe53a4e54f6a63e12023d3ac357f745b67459d515b2f011ffdd86f910e44521bd", "transactionIndex": "0x1", - "blockHash": "0xdb462dd13a8b46af5b23c84df1e61e96e9bba65f8b001b17b0c9acadf954be06", - "blockNumber": "0x9088872", + "blockHash": "0xc645087c7c0240a977d4de3ea924623f0a644eac03a33ca9e152e1409624960b", + "blockNumber": "0x9115421", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": null, "cumulativeGasUsed": "0x562074", @@ -95,8 +95,8 @@ { "transactionHash": "0xb7718e88a0e42f45e2a544eaa1bc79c844fe2c6fda201d0566a7bae52c2561ce", "transactionIndex": "0x2", - "blockHash": "0xdb462dd13a8b46af5b23c84df1e61e96e9bba65f8b001b17b0c9acadf954be06", - "blockNumber": "0x9088872", + "blockHash": "0xc645087c7c0240a977d4de3ea924623f0a644eac03a33ca9e152e1409624960b", + "blockNumber": "0x9115421", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": null, "cumulativeGasUsed": "0x5eb11f", @@ -112,8 +112,8 @@ "libraries": [], "pending": [], "returns": {}, - "timestamp": 1700287805, + "timestamp": 1700442975, "chain": 53261, "multi": false, - "commit": "8b87194" + "commit": "29ba819" } \ No newline at end of file diff --git a/deployment/alpha/broadcast/DeployMock.sol/53261/run-alpha.json b/deployment/alpha/broadcast/DeployMock.sol/53261/run-alpha.json index 9ee68ba..820b6e3 100644 --- a/deployment/alpha/broadcast/DeployMock.sol/53261/run-alpha.json +++ b/deployment/alpha/broadcast/DeployMock.sol/53261/run-alpha.json @@ -78,8 +78,8 @@ { "transactionHash": "0x84c83d56dd4cd698ea0b2877691b5a70b999862d377026b8deb9f68b37ec0e84", "transactionIndex": "0x0", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": null, "cumulativeGasUsed": "0x3e265", @@ -94,8 +94,8 @@ { "transactionHash": "0xecda2e48a1c2b6e5830017af8c35720f0dc943b576095723637146e285c90aef", "transactionIndex": "0x1", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": null, "cumulativeGasUsed": "0x3305d3", @@ -110,8 +110,8 @@ { "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "to": "0x6053cA02DCd3D71B0987b4DC2a39b3dDA04647C7", "cumulativeGasUsed": "0x9e104c", @@ -127,11 +127,12 @@ "0x00000000000000000000000000000000000000000000000000000000000001f4" ], "data": "0x000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000ec9b8f69286aa5300a68c76678b236caecd107fb", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x0", + "logIndex": "0x1a", + "transactionLogIndex": "0x0", "removed": false }, { @@ -140,11 +141,12 @@ "0x98636036cb66a9c19a37435efc1e90142190214e8abeb821bdba3f2990dd4c95" ], "data": "0x0000000000000000000000000000000000000000000010c6f7a0b5ed8d36b4c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbc89b", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x1", + "logIndex": "0x1b", + "transactionLogIndex": "0x1", "removed": false }, { @@ -155,11 +157,12 @@ "0x0000000000000000000000006053ca02dcd3d71b0987b4dc2a39b3dda04647c7" ], "data": "0x0000000000000000000000000000000000000000000422ca8b0a00a425000000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x2", + "logIndex": "0x1c", + "transactionLogIndex": "0x2", "removed": false }, { @@ -170,11 +173,12 @@ "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe88" ], "data": "0x0000000000000000000000000000000000000000000422ca8b0a00a425000000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x3", + "logIndex": "0x1d", + "transactionLogIndex": "0x3", "removed": false }, { @@ -185,11 +189,12 @@ "0x0000000000000000000000006053ca02dcd3d71b0987b4dc2a39b3dda04647c7" ], "data": "0x0000000000000000000000000000000000000000000000000000048c27395000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x4", + "logIndex": "0x1e", + "transactionLogIndex": "0x4", "removed": false }, { @@ -200,11 +205,12 @@ "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe88" ], "data": "0x0000000000000000000000000000000000000000000000000000048c27395000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x5", + "logIndex": "0x1f", + "transactionLogIndex": "0x5", "removed": false }, { @@ -215,11 +221,12 @@ "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe88" ], "data": "0x00000000000000000000000000000000000000000000000000000000000f4204", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x6", + "logIndex": "0x20", + "transactionLogIndex": "0x6", "removed": false }, { @@ -230,11 +237,12 @@ "0x000000000000000000000000ec9b8f69286aa5300a68c76678b236caecd107fb" ], "data": "0x0000000000000000000000000000000000000000000422ca8b0a00a424f0bdfc", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x7", + "logIndex": "0x21", + "transactionLogIndex": "0x7", "removed": false }, { @@ -245,11 +253,12 @@ "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe88" ], "data": "0x0000000000000000000000000000000000000000000000000000000000000000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x8", + "logIndex": "0x22", + "transactionLogIndex": "0x8", "removed": false }, { @@ -260,11 +269,12 @@ "0x000000000000000000000000ec9b8f69286aa5300a68c76678b236caecd107fb" ], "data": "0x0000000000000000000000000000000000000000000000000000048c27395000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0x9", + "logIndex": "0x23", + "transactionLogIndex": "0x9", "removed": false }, { @@ -276,11 +286,12 @@ "0x00000000000000000000000000000000000000000000000000000000000d89e6" ], "data": "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe880000000000000000000000000000000000000000000000004563918244f3ffff0000000000000000000000000000000000000000000422ca8b0a00a424f0bdfc0000000000000000000000000000000000000000000000000000048c27395000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0xa", + "logIndex": "0x24", + "transactionLogIndex": "0xa", "removed": false }, { @@ -289,33 +300,35 @@ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266", - "0x00000000000000000000000000000000000000000000000000000000000eb567" + "0x00000000000000000000000000000000000000000000000000000000000ebe66" ], "data": "0x", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0xb", + "logIndex": "0x25", + "transactionLogIndex": "0xb", "removed": false }, { "address": "0xC36442b4a4522E871399CD717aBDD847Ab11FE88", "topics": [ "0x3067048beee31b25b2f1681f88dac838c8bba36af25bfb2b7cf7473a5847e35f", - "0x00000000000000000000000000000000000000000000000000000000000eb567" + "0x00000000000000000000000000000000000000000000000000000000000ebe66" ], "data": "0x0000000000000000000000000000000000000000000000004563918244f3ffff0000000000000000000000000000000000000000000422ca8b0a00a424f0bdfc0000000000000000000000000000000000000000000000000000048c27395000", - "blockHash": "0xe3cf9e6cad7337fcfb14ee0cb8cbc447183f4057510f699831f4d80f27f8a1cf", - "blockNumber": "0x90889b8", + "blockHash": "0x2fbda4a191eebbac1dcfef3b48812c4e927e551c84f3856a572df9cedc673f09", + "blockNumber": "0x911542e", "transactionHash": "0x1da1c66828cb99e744f9f5617daf8216389bbd77ba3140e22bd4bc0b9b642c4a", "transactionIndex": "0x2", - "logIndex": "0xc", + "logIndex": "0x26", + "transactionLogIndex": "0xc", "removed": false } ], "status": "0x1", - "logsBloom": "0x00800000000000000000108000104000000081000000000000002000000000000500000000000000000000000000080000014000000000000400000000210000000000000000800000000208000000011001000800000000000008800000020400000000023000000800000100000800000000080800000000000010000000000000000008800002090000000000000000000000000400020000004000000000020100000000020000100000008000000000000040200000040000000000080040000002000000200000080000000000200000002000000000000000000020000010200000000040040000000000000000000000000200000000000000000800", + "logsBloom": "0x00800000000000000000108000104000000081000000000000000000000000000500000000000000000000000000080000014000040000000400000000210000000000000000800000000208000000010001000800000000000008800000020400000000023000000800000100000800000000080800000000000010000000000000000048800002010000000000000000000000000400020000004000000000020100000000020000100000008000000000000040200000040000000000080040000002000000200000080000000000200000002000000000000000000020000010220000000040040000000000000000000000000200000000000000000800", "type": "0x2", "effectiveGasPrice": "0xb2d05e07" } @@ -325,8 +338,8 @@ ], "pending": [], "returns": {}, - "timestamp": 1700288458, + "timestamp": 1700443001, "chain": 53261, "multi": false, - "commit": "8b87194" + "commit": "29ba819" } \ No newline at end of file diff --git a/deployment/alpha/out/TestOrder.sol/TestOrder.json b/deployment/alpha/out/TestOrder.sol/TestOrder.json index 01c596a..3c4d2d9 100644 --- a/deployment/alpha/out/TestOrder.sol/TestOrder.json +++ b/deployment/alpha/out/TestOrder.sol/TestOrder.json @@ -2354,7 +2354,7 @@ }, "ast": { "absolutePath": "test/TestOrder.sol", - "id": 51615, + "id": 51706, "exportedSymbols": { "Constants": [ 46264 @@ -2486,7 +2486,7 @@ 2357 ], "TestOrder": [ - 51614 + 51705 ], "TickMath": [ 45059 @@ -2535,7 +2535,7 @@ "src": "65:7072:66", "nodes": [ { - "id": 50825, + "id": 50916, "nodeType": "PragmaDirective", "src": "65:24:66", "nodes": [], @@ -2547,7 +2547,7 @@ ] }, { - "id": 50826, + "id": 50917, "nodeType": "PragmaDirective", "src": "90:19:66", "nodes": [], @@ -2557,83 +2557,83 @@ ] }, { - "id": 50827, + "id": 50918, "nodeType": "ImportDirective", "src": "111:23:66", "nodes": [], "absolutePath": "test/MockEnv.sol", "file": "./MockEnv.sol", "nameLocation": "-1:-1:-1", - "scope": 51615, + "scope": 51706, "sourceUnit": 50070, "symbolAliases": [], "unitAlias": "" }, { - "id": 50828, + "id": 50919, "nodeType": "ImportDirective", "src": "135:28:66", "nodes": [], "absolutePath": "lib/forge-std/src/Test.sol", "file": "forge-std/Test.sol", "nameLocation": "-1:-1:-1", - "scope": 51615, + "scope": 51706, "sourceUnit": 11938, "symbolAliases": [], "unitAlias": "" }, { - "id": 50829, + "id": 50920, "nodeType": "ImportDirective", "src": "164:32:66", "nodes": [], "absolutePath": "lib/forge-std/src/console2.sol", "file": "forge-std/console2.sol", "nameLocation": "-1:-1:-1", - "scope": 51615, + "scope": 51706, "sourceUnit": 29654, "symbolAliases": [], "unitAlias": "" }, { - "id": 50830, + "id": 50921, "nodeType": "ImportDirective", "src": "197:28:66", "nodes": [], "absolutePath": "src/Factory.sol", "file": "../src/Factory.sol", "nameLocation": "-1:-1:-1", - "scope": 51615, + "scope": 51706, "sourceUnit": 46431, "symbolAliases": [], "unitAlias": "" }, { - "id": 50831, + "id": 50922, "nodeType": "ImportDirective", "src": "226:29:66", "nodes": [], "absolutePath": "src/OrderLib.sol", "file": "../src/OrderLib.sol", "nameLocation": "-1:-1:-1", - "scope": 51615, + "scope": 51706, "sourceUnit": 47923, "symbolAliases": [], "unitAlias": "" }, { - "id": 51614, + "id": 51705, "nodeType": "ContractDefinition", "src": "257:6879:66", "nodes": [ { - "id": 50839, + "id": 50930, "nodeType": "UsingForDirective", "src": "299:39:66", "nodes": [], "global": false, "libraryName": { - "id": 50836, + "id": 50927, "name": "OrderLib", "nameLocations": [ "305:8:66" @@ -2643,10 +2643,10 @@ "src": "305:8:66" }, "typeName": { - "id": 50838, + "id": 50929, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50837, + "id": 50928, "name": "OrderLib.OrdersInfo", "nameLocations": [ "318:8:66", @@ -2665,7 +2665,7 @@ } }, { - "id": 50842, + "id": 50933, "nodeType": "VariableDeclaration", "src": "344:22:66", "nodes": [], @@ -2674,7 +2674,7 @@ "mutability": "mutable", "name": "factory", "nameLocation": "359:7:66", - "scope": 51614, + "scope": 51705, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -2682,10 +2682,10 @@ "typeString": "contract Factory" }, "typeName": { - "id": 50841, + "id": 50932, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50840, + "id": 50931, "name": "Factory", "nameLocations": [ "344:7:66" @@ -2704,7 +2704,7 @@ "visibility": "public" }, { - "id": 50845, + "id": 50936, "nodeType": "VariableDeclaration", "src": "372:18:66", "nodes": [], @@ -2713,7 +2713,7 @@ "mutability": "mutable", "name": "vault", "nameLocation": "385:5:66", - "scope": 51614, + "scope": 51705, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -2721,10 +2721,10 @@ "typeString": "contract Vault" }, "typeName": { - "id": 50844, + "id": 50935, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50843, + "id": 50934, "name": "Vault", "nameLocations": [ "372:5:66" @@ -2743,12 +2743,12 @@ "visibility": "public" }, { - "id": 50911, + "id": 51002, "nodeType": "FunctionDefinition", "src": "444:353:66", "nodes": [], "body": { - "id": 50910, + "id": 51001, "nodeType": "Block", "src": "468:329:66", "nodes": [], @@ -2758,7 +2758,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 50848, + "id": 50939, "name": "init", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2769,7 +2769,7 @@ "typeString": "function ()" } }, - "id": 50849, + "id": 50940, "isConstant": false, "isLValue": false, "isPure": false, @@ -2785,23 +2785,23 @@ "typeString": "tuple()" } }, - "id": 50850, + "id": 50941, "nodeType": "ExpressionStatement", "src": "478:6:66" }, { "expression": { - "id": 50856, + "id": 50947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 50851, + "id": 50942, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50842, + "referencedDeclaration": 50933, "src": "494:7:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", @@ -2814,7 +2814,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 50854, + "id": 50945, "isConstant": false, "isLValue": false, "isPure": false, @@ -2826,10 +2826,10 @@ "typeString": "function () returns (contract Factory)" }, "typeName": { - "id": 50853, + "id": 50944, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50852, + "id": 50943, "name": "Factory", "nameLocations": [ "508:7:66" @@ -2846,7 +2846,7 @@ } } }, - "id": 50855, + "id": 50946, "isConstant": false, "isLValue": false, "isPure": false, @@ -2868,23 +2868,23 @@ "typeString": "contract Factory" } }, - "id": 50857, + "id": 50948, "nodeType": "ExpressionStatement", "src": "494:23:66" }, { "expression": { - "id": 50868, + "id": 50959, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 50858, + "id": 50949, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "527:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -2900,14 +2900,14 @@ { "arguments": [ { - "id": 50864, + "id": 50955, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": -28, "src": "569:4:66", "typeDescriptions": { - "typeIdentifier": "t_contract$_TestOrder_$51614", + "typeIdentifier": "t_contract$_TestOrder_$51705", "typeString": "contract TestOrder" } } @@ -2915,11 +2915,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_TestOrder_$51614", + "typeIdentifier": "t_contract$_TestOrder_$51705", "typeString": "contract TestOrder" } ], - "id": 50863, + "id": 50954, "isConstant": false, "isLValue": false, "isPure": true, @@ -2931,14 +2931,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 50862, + "id": 50953, "name": "address", "nodeType": "ElementaryTypeName", "src": "561:7:66", "typeDescriptions": {} } }, - "id": 50865, + "id": 50956, "isConstant": false, "isLValue": false, "isPure": false, @@ -2963,18 +2963,18 @@ } ], "expression": { - "id": 50860, + "id": 50951, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50842, + "referencedDeclaration": 50933, "src": "541:7:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", "typeString": "contract Factory" } }, - "id": 50861, + "id": 50952, "isConstant": false, "isLValue": false, "isPure": false, @@ -2989,7 +2989,7 @@ "typeString": "function (address) external returns (address payable)" } }, - "id": 50866, + "id": 50957, "isConstant": false, "isLValue": false, "isPure": false, @@ -3013,7 +3013,7 @@ "typeString": "address payable" } ], - "id": 50859, + "id": 50950, "name": "Vault", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3024,7 +3024,7 @@ "typeString": "type(contract Vault)" } }, - "id": 50867, + "id": 50958, "isConstant": false, "isLValue": false, "isPure": false, @@ -3046,23 +3046,23 @@ "typeString": "contract Vault" } }, - "id": 50869, + "id": 50960, "nodeType": "ExpressionStatement", "src": "527:49:66" }, { "assignments": [ - 50871 + 50962 ], "declarations": [ { "constant": false, - "id": 50871, + "id": 50962, "mutability": "mutable", "name": "coinAmount", "nameLocation": "594:10:66", "nodeType": "VariableDeclaration", - "scope": 50910, + "scope": 51001, "src": "586:18:66", "stateVariable": false, "storageLocation": "default", @@ -3071,7 +3071,7 @@ "typeString": "uint256" }, "typeName": { - "id": 50870, + "id": 50961, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "586:7:66", @@ -3083,20 +3083,20 @@ "visibility": "internal" } ], - "id": 50879, + "id": 50970, "initialValue": { "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 50878, + "id": 50969, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130305f303030", - "id": 50872, + "id": 50963, "isConstant": false, "isLValue": false, "isPure": true, @@ -3117,14 +3117,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 50877, + "id": 50968, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 50873, + "id": 50964, "isConstant": false, "isLValue": false, "isPure": true, @@ -3145,7 +3145,7 @@ "expression": { "argumentTypes": [], "expression": { - "id": 50874, + "id": 50965, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3156,7 +3156,7 @@ "typeString": "contract MockERC20" } }, - "id": 50875, + "id": 50966, "isConstant": false, "isLValue": false, "isPure": false, @@ -3171,7 +3171,7 @@ "typeString": "function () view external returns (uint8)" } }, - "id": 50876, + "id": 50967, "isConstant": false, "isLValue": false, "isPure": false, @@ -3208,11 +3208,11 @@ { "arguments": [ { - "id": 50885, + "id": 50976, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "666:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -3227,7 +3227,7 @@ "typeString": "contract Vault" } ], - "id": 50884, + "id": 50975, "isConstant": false, "isLValue": false, "isPure": true, @@ -3239,14 +3239,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 50883, + "id": 50974, "name": "address", "nodeType": "ElementaryTypeName", "src": "658:7:66", "typeDescriptions": {} } }, - "id": 50886, + "id": 50977, "isConstant": false, "isLValue": false, "isPure": false, @@ -3263,11 +3263,11 @@ } }, { - "id": 50887, + "id": 50978, "name": "coinAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50871, + "referencedDeclaration": 50962, "src": "674:10:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3287,7 +3287,7 @@ } ], "expression": { - "id": 50880, + "id": 50971, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3298,7 +3298,7 @@ "typeString": "contract MockERC20" } }, - "id": 50882, + "id": 50973, "isConstant": false, "isLValue": false, "isPure": false, @@ -3313,7 +3313,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 50888, + "id": 50979, "isConstant": false, "isLValue": false, "isPure": false, @@ -3329,23 +3329,23 @@ "typeString": "tuple()" } }, - "id": 50889, + "id": 50980, "nodeType": "ExpressionStatement", "src": "648:37:66" }, { "assignments": [ - 50891 + 50982 ], "declarations": [ { "constant": false, - "id": 50891, + "id": 50982, "mutability": "mutable", "name": "usdAmount", "nameLocation": "703:9:66", "nodeType": "VariableDeclaration", - "scope": 50910, + "scope": 51001, "src": "695:17:66", "stateVariable": false, "storageLocation": "default", @@ -3354,7 +3354,7 @@ "typeString": "uint256" }, "typeName": { - "id": 50890, + "id": 50981, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "695:7:66", @@ -3366,20 +3366,20 @@ "visibility": "internal" } ], - "id": 50899, + "id": 50990, "initialValue": { "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 50898, + "id": 50989, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130305f303030", - "id": 50892, + "id": 50983, "isConstant": false, "isLValue": false, "isPure": true, @@ -3400,14 +3400,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 50897, + "id": 50988, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 50893, + "id": 50984, "isConstant": false, "isLValue": false, "isPure": true, @@ -3428,7 +3428,7 @@ "expression": { "argumentTypes": [], "expression": { - "id": 50894, + "id": 50985, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3439,7 +3439,7 @@ "typeString": "contract MockERC20" } }, - "id": 50895, + "id": 50986, "isConstant": false, "isLValue": false, "isPure": false, @@ -3454,7 +3454,7 @@ "typeString": "function () view external returns (uint8)" } }, - "id": 50896, + "id": 50987, "isConstant": false, "isLValue": false, "isPure": false, @@ -3491,11 +3491,11 @@ { "arguments": [ { - "id": 50905, + "id": 50996, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "772:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -3510,7 +3510,7 @@ "typeString": "contract Vault" } ], - "id": 50904, + "id": 50995, "isConstant": false, "isLValue": false, "isPure": true, @@ -3522,14 +3522,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 50903, + "id": 50994, "name": "address", "nodeType": "ElementaryTypeName", "src": "764:7:66", "typeDescriptions": {} } }, - "id": 50906, + "id": 50997, "isConstant": false, "isLValue": false, "isPure": false, @@ -3546,11 +3546,11 @@ } }, { - "id": 50907, + "id": 50998, "name": "usdAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50891, + "referencedDeclaration": 50982, "src": "780:9:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3570,7 +3570,7 @@ } ], "expression": { - "id": 50900, + "id": 50991, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3581,7 +3581,7 @@ "typeString": "contract MockERC20" } }, - "id": 50902, + "id": 50993, "isConstant": false, "isLValue": false, "isPure": false, @@ -3596,7 +3596,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 50908, + "id": 50999, "isConstant": false, "isLValue": false, "isPure": false, @@ -3612,7 +3612,7 @@ "typeString": "tuple()" } }, - "id": 50909, + "id": 51000, "nodeType": "ExpressionStatement", "src": "755:35:66" } @@ -3625,46 +3625,46 @@ "name": "setUp", "nameLocation": "453:5:66", "parameters": { - "id": 50846, + "id": 50937, "nodeType": "ParameterList", "parameters": [], "src": "458:2:66" }, "returnParameters": { - "id": 50847, + "id": 50938, "nodeType": "ParameterList", "parameters": [], "src": "468:0:66" }, - "scope": 51614, + "scope": 51705, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51080, + "id": 51171, "nodeType": "FunctionDefinition", "src": "804:1973:66", "nodes": [], "body": { - "id": 51079, + "id": 51170, "nodeType": "Block", "src": "837:1940:66", "nodes": [], "statements": [ { "assignments": [ - 50919 + 51010 ], "declarations": [ { "constant": false, - "id": 50919, + "id": 51010, "mutability": "mutable", "name": "tranches", "nameLocation": "873:8:66", "nodeType": "VariableDeclaration", - "scope": 51079, + "scope": 51170, "src": "847:34:66", "stateVariable": false, "storageLocation": "memory", @@ -3674,10 +3674,10 @@ }, "typeName": { "baseType": { - "id": 50917, + "id": 51008, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50916, + "id": 51007, "name": "OrderLib.Tranche", "nameLocations": [ "847:8:66", @@ -3694,7 +3694,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 50918, + "id": 51009, "nodeType": "ArrayTypeName", "src": "847:18:66", "typeDescriptions": { @@ -3705,12 +3705,12 @@ "visibility": "internal" } ], - "id": 50926, + "id": 51017, "initialValue": { "arguments": [ { "hexValue": "33", - "id": 50924, + "id": 51015, "isConstant": false, "isLValue": false, "isPure": true, @@ -3732,7 +3732,7 @@ "typeString": "int_const 3" } ], - "id": 50923, + "id": 51014, "isConstant": false, "isLValue": false, "isPure": true, @@ -3745,10 +3745,10 @@ }, "typeName": { "baseType": { - "id": 50921, + "id": 51012, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50920, + "id": 51011, "name": "OrderLib.Tranche", "nameLocations": [ "888:8:66", @@ -3765,7 +3765,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 50922, + "id": 51013, "nodeType": "ArrayTypeName", "src": "888:18:66", "typeDescriptions": { @@ -3774,7 +3774,7 @@ } } }, - "id": 50925, + "id": 51016, "isConstant": false, "isLValue": false, "isPure": true, @@ -3795,17 +3795,17 @@ }, { "assignments": [ - 50932 + 51023 ], "declarations": [ { "constant": false, - "id": 50932, + "id": 51023, "mutability": "mutable", "name": "constraints1", "nameLocation": "948:12:66", "nodeType": "VariableDeclaration", - "scope": 51079, + "scope": 51170, "src": "919:41:66", "stateVariable": false, "storageLocation": "memory", @@ -3815,10 +3815,10 @@ }, "typeName": { "baseType": { - "id": 50930, + "id": 51021, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50929, + "id": 51020, "name": "OrderLib.Constraint", "nameLocations": [ "919:8:66", @@ -3835,7 +3835,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50931, + "id": 51022, "nodeType": "ArrayTypeName", "src": "919:21:66", "typeDescriptions": { @@ -3846,12 +3846,12 @@ "visibility": "internal" } ], - "id": 50939, + "id": 51030, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 50937, + "id": 51028, "isConstant": false, "isLValue": false, "isPure": true, @@ -3873,7 +3873,7 @@ "typeString": "int_const 1" } ], - "id": 50936, + "id": 51027, "isConstant": false, "isLValue": false, "isPure": true, @@ -3886,10 +3886,10 @@ }, "typeName": { "baseType": { - "id": 50934, + "id": 51025, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50933, + "id": 51024, "name": "OrderLib.Constraint", "nameLocations": [ "967:8:66", @@ -3906,7 +3906,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50935, + "id": 51026, "nodeType": "ArrayTypeName", "src": "967:21:66", "typeDescriptions": { @@ -3915,7 +3915,7 @@ } } }, - "id": 50938, + "id": 51029, "isConstant": false, "isLValue": false, "isPure": true, @@ -3936,28 +3936,28 @@ }, { "expression": { - "id": 50953, + "id": 51044, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 50940, + "id": 51031, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50932, + "referencedDeclaration": 51023, "src": "1001:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 50942, + "id": 51033, "indexExpression": { "hexValue": "30", - "id": 50941, + "id": 51032, "isConstant": false, "isLValue": false, "isPure": true, @@ -3989,7 +3989,7 @@ { "expression": { "expression": { - "id": 50945, + "id": 51036, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4000,7 +4000,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 50946, + "id": 51037, "isConstant": false, "isLValue": false, "isPure": false, @@ -4015,7 +4015,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 50947, + "id": 51038, "isConstant": false, "isLValue": false, "isPure": true, @@ -4034,7 +4034,7 @@ "arguments": [ { "hexValue": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500", - "id": 50950, + "id": 51041, "isConstant": false, "isLValue": false, "isPure": true, @@ -4056,7 +4056,7 @@ "typeString": "literal_string hex\"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500\"" } ], - "id": 50949, + "id": 51040, "isConstant": false, "isLValue": false, "isPure": true, @@ -4068,14 +4068,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 50948, + "id": 51039, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1069:5:66", "typeDescriptions": {} } }, - "id": 50951, + "id": 51042, "isConstant": false, "isLValue": false, "isPure": true, @@ -4104,7 +4104,7 @@ } ], "expression": { - "id": 50943, + "id": 51034, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4115,7 +4115,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 50944, + "id": 51035, "isConstant": false, "isLValue": false, "isPure": false, @@ -4130,7 +4130,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 50952, + "id": 51043, "isConstant": false, "isLValue": false, "isPure": true, @@ -4152,23 +4152,23 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 50954, + "id": 51045, "nodeType": "ExpressionStatement", "src": "1001:337:66" }, { "assignments": [ - 50960 + 51051 ], "declarations": [ { "constant": false, - "id": 50960, + "id": 51051, "mutability": "mutable", "name": "constraints2", "nameLocation": "1377:12:66", "nodeType": "VariableDeclaration", - "scope": 51079, + "scope": 51170, "src": "1348:41:66", "stateVariable": false, "storageLocation": "memory", @@ -4178,10 +4178,10 @@ }, "typeName": { "baseType": { - "id": 50958, + "id": 51049, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50957, + "id": 51048, "name": "OrderLib.Constraint", "nameLocations": [ "1348:8:66", @@ -4198,7 +4198,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50959, + "id": 51050, "nodeType": "ArrayTypeName", "src": "1348:21:66", "typeDescriptions": { @@ -4209,12 +4209,12 @@ "visibility": "internal" } ], - "id": 50967, + "id": 51058, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 50965, + "id": 51056, "isConstant": false, "isLValue": false, "isPure": true, @@ -4236,7 +4236,7 @@ "typeString": "int_const 1" } ], - "id": 50964, + "id": 51055, "isConstant": false, "isLValue": false, "isPure": true, @@ -4249,10 +4249,10 @@ }, "typeName": { "baseType": { - "id": 50962, + "id": 51053, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50961, + "id": 51052, "name": "OrderLib.Constraint", "nameLocations": [ "1396:8:66", @@ -4269,7 +4269,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50963, + "id": 51054, "nodeType": "ArrayTypeName", "src": "1396:21:66", "typeDescriptions": { @@ -4278,7 +4278,7 @@ } } }, - "id": 50966, + "id": 51057, "isConstant": false, "isLValue": false, "isPure": true, @@ -4299,28 +4299,28 @@ }, { "expression": { - "id": 50981, + "id": 51072, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 50968, + "id": 51059, "name": "constraints2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50960, + "referencedDeclaration": 51051, "src": "1430:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 50970, + "id": 51061, "indexExpression": { "hexValue": "30", - "id": 50969, + "id": 51060, "isConstant": false, "isLValue": false, "isPure": true, @@ -4352,7 +4352,7 @@ { "expression": { "expression": { - "id": 50973, + "id": 51064, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4363,7 +4363,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 50974, + "id": 51065, "isConstant": false, "isLValue": false, "isPure": false, @@ -4378,7 +4378,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 50975, + "id": 51066, "isConstant": false, "isLValue": false, "isPure": true, @@ -4397,7 +4397,7 @@ "arguments": [ { "hexValue": "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000464fb0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008c9fb", - "id": 50978, + "id": 51069, "isConstant": false, "isLValue": false, "isPure": true, @@ -4418,7 +4418,7 @@ "typeString": "literal_string hex\"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000464fb0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008c9fb\"" } ], - "id": 50977, + "id": 51068, "isConstant": false, "isLValue": false, "isPure": true, @@ -4430,14 +4430,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 50976, + "id": 51067, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1498:5:66", "typeDescriptions": {} } }, - "id": 50979, + "id": 51070, "isConstant": false, "isLValue": false, "isPure": true, @@ -4466,7 +4466,7 @@ } ], "expression": { - "id": 50971, + "id": 51062, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4477,7 +4477,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 50972, + "id": 51063, "isConstant": false, "isLValue": false, "isPure": false, @@ -4492,7 +4492,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 50980, + "id": 51071, "isConstant": false, "isLValue": false, "isPure": true, @@ -4514,23 +4514,23 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 50982, + "id": 51073, "nodeType": "ExpressionStatement", "src": "1430:337:66" }, { "assignments": [ - 50988 + 51079 ], "declarations": [ { "constant": false, - "id": 50988, + "id": 51079, "mutability": "mutable", "name": "constraints3", "nameLocation": "1806:12:66", "nodeType": "VariableDeclaration", - "scope": 51079, + "scope": 51170, "src": "1777:41:66", "stateVariable": false, "storageLocation": "memory", @@ -4540,10 +4540,10 @@ }, "typeName": { "baseType": { - "id": 50986, + "id": 51077, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50985, + "id": 51076, "name": "OrderLib.Constraint", "nameLocations": [ "1777:8:66", @@ -4560,7 +4560,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50987, + "id": 51078, "nodeType": "ArrayTypeName", "src": "1777:21:66", "typeDescriptions": { @@ -4571,12 +4571,12 @@ "visibility": "internal" } ], - "id": 50995, + "id": 51086, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 50993, + "id": 51084, "isConstant": false, "isLValue": false, "isPure": true, @@ -4598,7 +4598,7 @@ "typeString": "int_const 1" } ], - "id": 50992, + "id": 51083, "isConstant": false, "isLValue": false, "isPure": true, @@ -4611,10 +4611,10 @@ }, "typeName": { "baseType": { - "id": 50990, + "id": 51081, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 50989, + "id": 51080, "name": "OrderLib.Constraint", "nameLocations": [ "1825:8:66", @@ -4631,7 +4631,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 50991, + "id": 51082, "nodeType": "ArrayTypeName", "src": "1825:21:66", "typeDescriptions": { @@ -4640,7 +4640,7 @@ } } }, - "id": 50994, + "id": 51085, "isConstant": false, "isLValue": false, "isPure": true, @@ -4661,28 +4661,28 @@ }, { "expression": { - "id": 51009, + "id": 51100, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 50996, + "id": 51087, "name": "constraints3", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50988, + "referencedDeclaration": 51079, "src": "1859:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 50998, + "id": 51089, "indexExpression": { "hexValue": "30", - "id": 50997, + "id": 51088, "isConstant": false, "isLValue": false, "isPure": true, @@ -4714,7 +4714,7 @@ { "expression": { "expression": { - "id": 51001, + "id": 51092, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4725,7 +4725,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51002, + "id": 51093, "isConstant": false, "isLValue": false, "isPure": false, @@ -4740,7 +4740,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 51003, + "id": 51094, "isConstant": false, "isLValue": false, "isPure": true, @@ -4759,7 +4759,7 @@ "arguments": [ { "hexValue": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008c9f6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000d2ef6", - "id": 51006, + "id": 51097, "isConstant": false, "isLValue": false, "isPure": true, @@ -4780,7 +4780,7 @@ "typeString": "literal_string hex\"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000008c9f6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000d2ef6\"" } ], - "id": 51005, + "id": 51096, "isConstant": false, "isLValue": false, "isPure": true, @@ -4792,14 +4792,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 51004, + "id": 51095, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1927:5:66", "typeDescriptions": {} } }, - "id": 51007, + "id": 51098, "isConstant": false, "isLValue": false, "isPure": true, @@ -4828,7 +4828,7 @@ } ], "expression": { - "id": 50999, + "id": 51090, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4839,7 +4839,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51000, + "id": 51091, "isConstant": false, "isLValue": false, "isPure": false, @@ -4854,7 +4854,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 51008, + "id": 51099, "isConstant": false, "isLValue": false, "isPure": true, @@ -4876,34 +4876,34 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 51010, + "id": 51101, "nodeType": "ExpressionStatement", "src": "1859:337:66" }, { "expression": { - "id": 51019, + "id": 51110, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51011, + "id": 51102, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50919, + "referencedDeclaration": 51010, "src": "2206:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51013, + "id": 51104, "indexExpression": { "hexValue": "30", - "id": 51012, + "id": 51103, "isConstant": false, "isLValue": false, "isPure": true, @@ -4934,7 +4934,7 @@ "arguments": [ { "hexValue": "3231383435", - "id": 51016, + "id": 51107, "isConstant": false, "isLValue": false, "isPure": true, @@ -4949,11 +4949,11 @@ "value": "21845" }, { - "id": 51017, + "id": 51108, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50932, + "referencedDeclaration": 51023, "src": "2243:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -4973,7 +4973,7 @@ } ], "expression": { - "id": 51014, + "id": 51105, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4984,7 +4984,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51015, + "id": 51106, "isConstant": false, "isLValue": false, "isPure": false, @@ -4999,7 +4999,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51018, + "id": 51109, "isConstant": false, "isLValue": false, "isPure": false, @@ -5021,34 +5021,34 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51020, + "id": 51111, "nodeType": "ExpressionStatement", "src": "2206:50:66" }, { "expression": { - "id": 51029, + "id": 51120, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51021, + "id": 51112, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50919, + "referencedDeclaration": 51010, "src": "2266:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51023, + "id": 51114, "indexExpression": { "hexValue": "31", - "id": 51022, + "id": 51113, "isConstant": false, "isLValue": false, "isPure": true, @@ -5079,7 +5079,7 @@ "arguments": [ { "hexValue": "3231383435", - "id": 51026, + "id": 51117, "isConstant": false, "isLValue": false, "isPure": true, @@ -5094,11 +5094,11 @@ "value": "21845" }, { - "id": 51027, + "id": 51118, "name": "constraints2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50960, + "referencedDeclaration": 51051, "src": "2303:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -5118,7 +5118,7 @@ } ], "expression": { - "id": 51024, + "id": 51115, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5129,7 +5129,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51025, + "id": 51116, "isConstant": false, "isLValue": false, "isPure": false, @@ -5144,7 +5144,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51028, + "id": 51119, "isConstant": false, "isLValue": false, "isPure": false, @@ -5166,34 +5166,34 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51030, + "id": 51121, "nodeType": "ExpressionStatement", "src": "2266:50:66" }, { "expression": { - "id": 51039, + "id": 51130, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51031, + "id": 51122, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50919, + "referencedDeclaration": 51010, "src": "2326:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51033, + "id": 51124, "indexExpression": { "hexValue": "32", - "id": 51032, + "id": 51123, "isConstant": false, "isLValue": false, "isPure": true, @@ -5224,7 +5224,7 @@ "arguments": [ { "hexValue": "3231383435", - "id": 51036, + "id": 51127, "isConstant": false, "isLValue": false, "isPure": true, @@ -5239,11 +5239,11 @@ "value": "21845" }, { - "id": 51037, + "id": 51128, "name": "constraints3", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50988, + "referencedDeclaration": 51079, "src": "2363:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -5263,7 +5263,7 @@ } ], "expression": { - "id": 51034, + "id": 51125, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5274,7 +5274,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51035, + "id": 51126, "isConstant": false, "isLValue": false, "isPure": false, @@ -5289,7 +5289,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51038, + "id": 51129, "isConstant": false, "isLValue": false, "isPure": false, @@ -5311,23 +5311,23 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51040, + "id": 51131, "nodeType": "ExpressionStatement", "src": "2326:50:66" }, { "assignments": [ - 51045 + 51136 ], "declarations": [ { "constant": false, - "id": 51045, + "id": 51136, "mutability": "mutable", "name": "order", "nameLocation": "2412:5:66", "nodeType": "VariableDeclaration", - "scope": 51079, + "scope": 51170, "src": "2386:31:66", "stateVariable": false, "storageLocation": "memory", @@ -5336,10 +5336,10 @@ "typeString": "struct OrderLib.SwapOrder" }, "typeName": { - "id": 51044, + "id": 51135, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51043, + "id": 51134, "name": "OrderLib.SwapOrder", "nameLocations": [ "2386:8:66", @@ -5359,12 +5359,12 @@ "visibility": "internal" } ], - "id": 51063, + "id": 51154, "initialValue": { "arguments": [ { "hexValue": "307846643038366243374344354334383144434339433835656245343738413143306236394643626239", - "id": 51048, + "id": 51139, "isConstant": false, "isLValue": false, "isPure": true, @@ -5380,7 +5380,7 @@ }, { "hexValue": "307838326146343934343744386130376533626439354244306435366633353234313532336642616231", - "id": 51049, + "id": 51140, "isConstant": false, "isLValue": false, "isPure": true, @@ -5399,7 +5399,7 @@ { "expression": { "expression": { - "id": 51052, + "id": 51143, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5410,7 +5410,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51053, + "id": 51144, "isConstant": false, "isLValue": false, "isPure": false, @@ -5425,7 +5425,7 @@ "typeString": "type(enum OrderLib.Exchange)" } }, - "id": 51054, + "id": 51145, "isConstant": false, "isLValue": false, "isPure": true, @@ -5442,7 +5442,7 @@ }, { "hexValue": "353030", - "id": 51055, + "id": 51146, "isConstant": false, "isLValue": false, "isPure": true, @@ -5469,7 +5469,7 @@ } ], "expression": { - "id": 51050, + "id": 51141, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5480,7 +5480,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51051, + "id": 51142, "isConstant": false, "isLValue": false, "isPure": false, @@ -5495,7 +5495,7 @@ "typeString": "type(struct OrderLib.Route storage pointer)" } }, - "id": 51056, + "id": 51147, "isConstant": false, "isLValue": false, "isPure": true, @@ -5513,7 +5513,7 @@ }, { "hexValue": "313030303030303030303030303030303030303030", - "id": 51057, + "id": 51148, "isConstant": false, "isLValue": false, "isPure": true, @@ -5529,7 +5529,7 @@ }, { "hexValue": "74727565", - "id": 51058, + "id": 51149, "isConstant": false, "isLValue": false, "isPure": true, @@ -5545,7 +5545,7 @@ }, { "hexValue": "66616c7365", - "id": 51059, + "id": 51150, "isConstant": false, "isLValue": false, "isPure": true, @@ -5561,7 +5561,7 @@ }, { "hexValue": "3138343436373434303733373039353531363135", - "id": 51060, + "id": 51151, "isConstant": false, "isLValue": false, "isPure": true, @@ -5576,11 +5576,11 @@ "value": "18446744073709551615" }, { - "id": 51061, + "id": 51152, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50919, + "referencedDeclaration": 51010, "src": "2673:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", @@ -5624,7 +5624,7 @@ } ], "expression": { - "id": 51046, + "id": 51137, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5635,7 +5635,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51047, + "id": 51138, "isConstant": false, "isLValue": false, "isPure": false, @@ -5650,7 +5650,7 @@ "typeString": "type(struct OrderLib.SwapOrder storage pointer)" } }, - "id": 51062, + "id": 51153, "isConstant": false, "isLValue": false, "isPure": false, @@ -5675,11 +5675,11 @@ { "arguments": [ { - "id": 51069, + "id": 51160, "name": "order", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51045, + "referencedDeclaration": 51136, "src": "2730:5:66", "typeDescriptions": { "typeIdentifier": "t_struct$_SwapOrder_$46563_memory_ptr", @@ -5695,7 +5695,7 @@ } ], "expression": { - "id": 51067, + "id": 51158, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5706,7 +5706,7 @@ "typeString": "abi" } }, - "id": 51068, + "id": 51159, "isConstant": false, "isLValue": false, "isPure": true, @@ -5720,7 +5720,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 51070, + "id": 51161, "isConstant": false, "isLValue": false, "isPure": false, @@ -5745,7 +5745,7 @@ } ], "expression": { - "id": 51064, + "id": 51155, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5756,7 +5756,7 @@ "typeString": "type(library console2)" } }, - "id": 51066, + "id": 51157, "isConstant": false, "isLValue": false, "isPure": false, @@ -5771,7 +5771,7 @@ "typeString": "function (bytes memory) pure" } }, - "id": 51071, + "id": 51162, "isConstant": false, "isLValue": false, "isPure": false, @@ -5787,7 +5787,7 @@ "typeString": "tuple()" } }, - "id": 51072, + "id": 51163, "nodeType": "ExpressionStatement", "src": "2701:36:66" }, @@ -5795,11 +5795,11 @@ "expression": { "arguments": [ { - "id": 51076, + "id": 51167, "name": "order", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51045, + "referencedDeclaration": 51136, "src": "2764:5:66", "typeDescriptions": { "typeIdentifier": "t_struct$_SwapOrder_$46563_memory_ptr", @@ -5815,18 +5815,18 @@ } ], "expression": { - "id": 51073, + "id": 51164, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "2747:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51075, + "id": 51166, "isConstant": false, "isLValue": false, "isPure": false, @@ -5841,7 +5841,7 @@ "typeString": "function (struct OrderLib.SwapOrder memory) external" } }, - "id": 51077, + "id": 51168, "isConstant": false, "isLValue": false, "isPure": false, @@ -5857,7 +5857,7 @@ "typeString": "tuple()" } }, - "id": 51078, + "id": 51169, "nodeType": "ExpressionStatement", "src": "2747:23:66" } @@ -5870,46 +5870,46 @@ "name": "testPlaceOrder", "nameLocation": "813:14:66", "parameters": { - "id": 50912, + "id": 51003, "nodeType": "ParameterList", "parameters": [], "src": "827:2:66" }, "returnParameters": { - "id": 50913, + "id": 51004, "nodeType": "ParameterList", "parameters": [], "src": "837:0:66" }, - "scope": 51614, + "scope": 51705, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51235, + "id": 51326, "nodeType": "FunctionDefinition", "src": "2783:1272:66", "nodes": [], "body": { - "id": 51234, + "id": 51325, "nodeType": "Block", "src": "2829:1226:66", "nodes": [], "statements": [ { "assignments": [ - 51088 + 51179 ], "declarations": [ { "constant": false, - "id": 51088, + "id": 51179, "mutability": "mutable", "name": "tranches", "nameLocation": "2865:8:66", "nodeType": "VariableDeclaration", - "scope": 51234, + "scope": 51325, "src": "2839:34:66", "stateVariable": false, "storageLocation": "memory", @@ -5919,10 +5919,10 @@ }, "typeName": { "baseType": { - "id": 51086, + "id": 51177, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51085, + "id": 51176, "name": "OrderLib.Tranche", "nameLocations": [ "2839:8:66", @@ -5939,7 +5939,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51087, + "id": 51178, "nodeType": "ArrayTypeName", "src": "2839:18:66", "typeDescriptions": { @@ -5950,12 +5950,12 @@ "visibility": "internal" } ], - "id": 51095, + "id": 51186, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51093, + "id": 51184, "isConstant": false, "isLValue": false, "isPure": true, @@ -5977,7 +5977,7 @@ "typeString": "int_const 1" } ], - "id": 51092, + "id": 51183, "isConstant": false, "isLValue": false, "isPure": true, @@ -5990,10 +5990,10 @@ }, "typeName": { "baseType": { - "id": 51090, + "id": 51181, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51089, + "id": 51180, "name": "OrderLib.Tranche", "nameLocations": [ "2880:8:66", @@ -6010,7 +6010,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51091, + "id": 51182, "nodeType": "ArrayTypeName", "src": "2880:18:66", "typeDescriptions": { @@ -6019,7 +6019,7 @@ } } }, - "id": 51094, + "id": 51185, "isConstant": false, "isLValue": false, "isPure": true, @@ -6040,17 +6040,17 @@ }, { "assignments": [ - 51101 + 51192 ], "declarations": [ { "constant": false, - "id": 51101, + "id": 51192, "mutability": "mutable", "name": "constraints1", "nameLocation": "2940:12:66", "nodeType": "VariableDeclaration", - "scope": 51234, + "scope": 51325, "src": "2911:41:66", "stateVariable": false, "storageLocation": "memory", @@ -6060,10 +6060,10 @@ }, "typeName": { "baseType": { - "id": 51099, + "id": 51190, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51098, + "id": 51189, "name": "OrderLib.Constraint", "nameLocations": [ "2911:8:66", @@ -6080,7 +6080,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51100, + "id": 51191, "nodeType": "ArrayTypeName", "src": "2911:21:66", "typeDescriptions": { @@ -6091,12 +6091,12 @@ "visibility": "internal" } ], - "id": 51108, + "id": 51199, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51106, + "id": 51197, "isConstant": false, "isLValue": false, "isPure": true, @@ -6118,7 +6118,7 @@ "typeString": "int_const 1" } ], - "id": 51105, + "id": 51196, "isConstant": false, "isLValue": false, "isPure": true, @@ -6131,10 +6131,10 @@ }, "typeName": { "baseType": { - "id": 51103, + "id": 51194, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51102, + "id": 51193, "name": "OrderLib.Constraint", "nameLocations": [ "2959:8:66", @@ -6151,7 +6151,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51104, + "id": 51195, "nodeType": "ArrayTypeName", "src": "2959:21:66", "typeDescriptions": { @@ -6160,7 +6160,7 @@ } } }, - "id": 51107, + "id": 51198, "isConstant": false, "isLValue": false, "isPure": true, @@ -6181,28 +6181,28 @@ }, { "expression": { - "id": 51122, + "id": 51213, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51109, + "id": 51200, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51101, + "referencedDeclaration": 51192, "src": "2993:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 51111, + "id": 51202, "indexExpression": { "hexValue": "30", - "id": 51110, + "id": 51201, "isConstant": false, "isLValue": false, "isPure": true, @@ -6234,7 +6234,7 @@ { "expression": { "expression": { - "id": 51114, + "id": 51205, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6245,7 +6245,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51115, + "id": 51206, "isConstant": false, "isLValue": false, "isPure": false, @@ -6260,7 +6260,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 51116, + "id": 51207, "isConstant": false, "isLValue": false, "isPure": true, @@ -6279,7 +6279,7 @@ "arguments": [ { "hexValue": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500", - "id": 51119, + "id": 51210, "isConstant": false, "isLValue": false, "isPure": true, @@ -6301,7 +6301,7 @@ "typeString": "literal_string hex\"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500\"" } ], - "id": 51118, + "id": 51209, "isConstant": false, "isLValue": false, "isPure": true, @@ -6313,14 +6313,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 51117, + "id": 51208, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "3061:5:66", "typeDescriptions": {} } }, - "id": 51120, + "id": 51211, "isConstant": false, "isLValue": false, "isPure": true, @@ -6349,7 +6349,7 @@ } ], "expression": { - "id": 51112, + "id": 51203, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6360,7 +6360,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51113, + "id": 51204, "isConstant": false, "isLValue": false, "isPure": false, @@ -6375,7 +6375,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 51121, + "id": 51212, "isConstant": false, "isLValue": false, "isPure": true, @@ -6397,34 +6397,34 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 51123, + "id": 51214, "nodeType": "ExpressionStatement", "src": "2993:337:66" }, { "expression": { - "id": 51136, + "id": 51227, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51124, + "id": 51215, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51088, + "referencedDeclaration": 51179, "src": "3340:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51126, + "id": 51217, "indexExpression": { "hexValue": "30", - "id": 51125, + "id": 51216, "isConstant": false, "isLValue": false, "isPure": true, @@ -6457,7 +6457,7 @@ "expression": { "arguments": [ { - "id": 51131, + "id": 51222, "isConstant": false, "isLValue": false, "isPure": true, @@ -6469,7 +6469,7 @@ "typeString": "type(uint16)" }, "typeName": { - "id": 51130, + "id": 51221, "name": "uint16", "nodeType": "ElementaryTypeName", "src": "3376:6:66", @@ -6484,7 +6484,7 @@ "typeString": "type(uint16)" } ], - "id": 51129, + "id": 51220, "name": "type", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6495,7 +6495,7 @@ "typeString": "function () pure" } }, - "id": 51132, + "id": 51223, "isConstant": false, "isLValue": false, "isPure": true, @@ -6511,7 +6511,7 @@ "typeString": "type(uint16)" } }, - "id": 51133, + "id": 51224, "isConstant": false, "isLValue": false, "isPure": true, @@ -6526,11 +6526,11 @@ } }, { - "id": 51134, + "id": 51225, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51101, + "referencedDeclaration": 51192, "src": "3388:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -6550,7 +6550,7 @@ } ], "expression": { - "id": 51127, + "id": 51218, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6561,7 +6561,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51128, + "id": 51219, "isConstant": false, "isLValue": false, "isPure": false, @@ -6576,7 +6576,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51135, + "id": 51226, "isConstant": false, "isLValue": false, "isPure": false, @@ -6598,23 +6598,23 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51137, + "id": 51228, "nodeType": "ExpressionStatement", "src": "3340:61:66" }, { "assignments": [ - 51139 + 51230 ], "declarations": [ { "constant": false, - "id": 51139, + "id": 51230, "mutability": "mutable", "name": "amount", "nameLocation": "3419:6:66", "nodeType": "VariableDeclaration", - "scope": 51234, + "scope": 51325, "src": "3411:14:66", "stateVariable": false, "storageLocation": "default", @@ -6623,7 +6623,7 @@ "typeString": "uint256" }, "typeName": { - "id": 51138, + "id": 51229, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3411:7:66", @@ -6635,13 +6635,13 @@ "visibility": "internal" } ], - "id": 51149, + "id": 51240, "initialValue": { "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51148, + "id": 51239, "isConstant": false, "isLValue": false, "isPure": false, @@ -6651,14 +6651,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51146, + "id": 51237, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "33", - "id": 51140, + "id": 51231, "isConstant": false, "isLValue": false, "isPure": true, @@ -6679,14 +6679,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51145, + "id": 51236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 51141, + "id": 51232, "isConstant": false, "isLValue": false, "isPure": true, @@ -6707,7 +6707,7 @@ "expression": { "argumentTypes": [], "expression": { - "id": 51142, + "id": 51233, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6718,7 +6718,7 @@ "typeString": "contract MockERC20" } }, - "id": 51143, + "id": 51234, "isConstant": false, "isLValue": false, "isPure": false, @@ -6733,7 +6733,7 @@ "typeString": "function () view external returns (uint8)" } }, - "id": 51144, + "id": 51235, "isConstant": false, "isLValue": false, "isPure": false, @@ -6765,7 +6765,7 @@ "operator": "/", "rightExpression": { "hexValue": "3130", - "id": 51147, + "id": 51238, "isConstant": false, "isLValue": false, "isPure": true, @@ -6794,11 +6794,11 @@ { "arguments": [ { - "id": 51155, + "id": 51246, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "3492:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -6813,7 +6813,7 @@ "typeString": "contract Vault" } ], - "id": 51154, + "id": 51245, "isConstant": false, "isLValue": false, "isPure": true, @@ -6825,14 +6825,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51153, + "id": 51244, "name": "address", "nodeType": "ElementaryTypeName", "src": "3484:7:66", "typeDescriptions": {} } }, - "id": 51156, + "id": 51247, "isConstant": false, "isLValue": false, "isPure": false, @@ -6849,11 +6849,11 @@ } }, { - "id": 51157, + "id": 51248, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51139, + "referencedDeclaration": 51230, "src": "3500:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6873,7 +6873,7 @@ } ], "expression": { - "id": 51150, + "id": 51241, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6884,7 +6884,7 @@ "typeString": "contract MockERC20" } }, - "id": 51152, + "id": 51243, "isConstant": false, "isLValue": false, "isPure": false, @@ -6899,7 +6899,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 51158, + "id": 51249, "isConstant": false, "isLValue": false, "isPure": false, @@ -6915,23 +6915,23 @@ "typeString": "tuple()" } }, - "id": 51159, + "id": 51250, "nodeType": "ExpressionStatement", "src": "3474:33:66" }, { "assignments": [ - 51164 + 51255 ], "declarations": [ { "constant": false, - "id": 51164, + "id": 51255, "mutability": "mutable", "name": "order", "nameLocation": "3566:5:66", "nodeType": "VariableDeclaration", - "scope": 51234, + "scope": 51325, "src": "3540:31:66", "stateVariable": false, "storageLocation": "memory", @@ -6940,10 +6940,10 @@ "typeString": "struct OrderLib.SwapOrder" }, "typeName": { - "id": 51163, + "id": 51254, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51162, + "id": 51253, "name": "OrderLib.SwapOrder", "nameLocations": [ "3540:8:66", @@ -6963,13 +6963,13 @@ "visibility": "internal" } ], - "id": 51189, + "id": 51280, "initialValue": { "arguments": [ { "arguments": [ { - "id": 51169, + "id": 51260, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6988,7 +6988,7 @@ "typeString": "contract MockERC20" } ], - "id": 51168, + "id": 51259, "isConstant": false, "isLValue": false, "isPure": true, @@ -7000,14 +7000,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51167, + "id": 51258, "name": "address", "nodeType": "ElementaryTypeName", "src": "3607:7:66", "typeDescriptions": {} } }, - "id": 51170, + "id": 51261, "isConstant": false, "isLValue": false, "isPure": false, @@ -7026,7 +7026,7 @@ { "arguments": [ { - "id": 51173, + "id": 51264, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7045,7 +7045,7 @@ "typeString": "contract MockERC20" } ], - "id": 51172, + "id": 51263, "isConstant": false, "isLValue": false, "isPure": true, @@ -7057,14 +7057,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51171, + "id": 51262, "name": "address", "nodeType": "ElementaryTypeName", "src": "3622:7:66", "typeDescriptions": {} } }, - "id": 51174, + "id": 51265, "isConstant": false, "isLValue": false, "isPure": false, @@ -7085,7 +7085,7 @@ { "expression": { "expression": { - "id": 51177, + "id": 51268, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7096,7 +7096,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51178, + "id": 51269, "isConstant": false, "isLValue": false, "isPure": false, @@ -7111,7 +7111,7 @@ "typeString": "type(enum OrderLib.Exchange)" } }, - "id": 51179, + "id": 51270, "isConstant": false, "isLValue": false, "isPure": true, @@ -7128,7 +7128,7 @@ }, { "hexValue": "353030", - "id": 51180, + "id": 51271, "isConstant": false, "isLValue": false, "isPure": true, @@ -7155,7 +7155,7 @@ } ], "expression": { - "id": 51175, + "id": 51266, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7166,7 +7166,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51176, + "id": 51267, "isConstant": false, "isLValue": false, "isPure": false, @@ -7181,7 +7181,7 @@ "typeString": "type(struct OrderLib.Route storage pointer)" } }, - "id": 51181, + "id": 51272, "isConstant": false, "isLValue": false, "isPure": true, @@ -7198,11 +7198,11 @@ } }, { - "id": 51182, + "id": 51273, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51139, + "referencedDeclaration": 51230, "src": "3719:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7211,7 +7211,7 @@ }, { "hexValue": "66616c7365", - "id": 51183, + "id": 51274, "isConstant": false, "isLValue": false, "isPure": true, @@ -7227,7 +7227,7 @@ }, { "hexValue": "66616c7365", - "id": 51184, + "id": 51275, "isConstant": false, "isLValue": false, "isPure": true, @@ -7243,7 +7243,7 @@ }, { "expression": { - "id": 51185, + "id": 51276, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7254,7 +7254,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51186, + "id": 51277, "isConstant": false, "isLValue": false, "isPure": true, @@ -7270,11 +7270,11 @@ } }, { - "id": 51187, + "id": 51278, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51088, + "referencedDeclaration": 51179, "src": "3772:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", @@ -7318,7 +7318,7 @@ } ], "expression": { - "id": 51165, + "id": 51256, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7329,7 +7329,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51166, + "id": 51257, "isConstant": false, "isLValue": false, "isPure": false, @@ -7344,7 +7344,7 @@ "typeString": "type(struct OrderLib.SwapOrder storage pointer)" } }, - "id": 51188, + "id": 51279, "isConstant": false, "isLValue": false, "isPure": false, @@ -7365,17 +7365,17 @@ }, { "assignments": [ - 51191 + 51282 ], "declarations": [ { "constant": false, - "id": 51191, + "id": 51282, "mutability": "mutable", "name": "orderIndex", "nameLocation": "3807:10:66", "nodeType": "VariableDeclaration", - "scope": 51234, + "scope": 51325, "src": "3800:17:66", "stateVariable": false, "storageLocation": "default", @@ -7384,7 +7384,7 @@ "typeString": "uint64" }, "typeName": { - "id": 51190, + "id": 51281, "name": "uint64", "nodeType": "ElementaryTypeName", "src": "3800:6:66", @@ -7396,24 +7396,24 @@ "visibility": "internal" } ], - "id": 51195, + "id": 51286, "initialValue": { "arguments": [], "expression": { "argumentTypes": [], "expression": { - "id": 51192, + "id": 51283, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "3820:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51193, + "id": 51284, "isConstant": false, "isLValue": false, "isPure": false, @@ -7428,7 +7428,7 @@ "typeString": "function () view external returns (uint64)" } }, - "id": 51194, + "id": 51285, "isConstant": false, "isLValue": false, "isPure": false, @@ -7451,11 +7451,11 @@ "expression": { "arguments": [ { - "id": 51199, + "id": 51290, "name": "order", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51164, + "referencedDeclaration": 51255, "src": "3868:5:66", "typeDescriptions": { "typeIdentifier": "t_struct$_SwapOrder_$46563_memory_ptr", @@ -7471,18 +7471,18 @@ } ], "expression": { - "id": 51196, + "id": 51287, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "3851:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51198, + "id": 51289, "isConstant": false, "isLValue": false, "isPure": false, @@ -7497,7 +7497,7 @@ "typeString": "function (struct OrderLib.SwapOrder memory) external" } }, - "id": 51200, + "id": 51291, "isConstant": false, "isLValue": false, "isPure": false, @@ -7513,7 +7513,7 @@ "typeString": "tuple()" } }, - "id": 51201, + "id": 51292, "nodeType": "ExpressionStatement", "src": "3851:23:66" }, @@ -7522,7 +7522,7 @@ "arguments": [ { "hexValue": "706c61636564206f72646572", - "id": 51205, + "id": 51296, "isConstant": false, "isLValue": false, "isPure": true, @@ -7545,7 +7545,7 @@ } ], "expression": { - "id": 51202, + "id": 51293, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7556,7 +7556,7 @@ "typeString": "type(library console2)" } }, - "id": 51204, + "id": 51295, "isConstant": false, "isLValue": false, "isPure": false, @@ -7571,7 +7571,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51206, + "id": 51297, "isConstant": false, "isLValue": false, "isPure": false, @@ -7587,7 +7587,7 @@ "typeString": "tuple()" } }, - "id": 51207, + "id": 51298, "nodeType": "ExpressionStatement", "src": "3884:28:66" }, @@ -7597,11 +7597,11 @@ { "arguments": [ { - "id": 51213, + "id": 51304, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51191, + "referencedDeclaration": 51282, "src": "3940:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -7616,7 +7616,7 @@ "typeString": "uint64" } ], - "id": 51212, + "id": 51303, "isConstant": false, "isLValue": false, "isPure": true, @@ -7628,14 +7628,14 @@ "typeString": "type(uint256)" }, "typeName": { - "id": 51211, + "id": 51302, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3935:4:66", "typeDescriptions": {} } }, - "id": 51214, + "id": 51305, "isConstant": false, "isLValue": false, "isPure": false, @@ -7660,7 +7660,7 @@ } ], "expression": { - "id": 51208, + "id": 51299, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7671,7 +7671,7 @@ "typeString": "type(library console2)" } }, - "id": 51210, + "id": 51301, "isConstant": false, "isLValue": false, "isPure": false, @@ -7686,7 +7686,7 @@ "typeString": "function (uint256) pure" } }, - "id": 51215, + "id": 51306, "isConstant": false, "isLValue": false, "isPure": false, @@ -7702,7 +7702,7 @@ "typeString": "tuple()" } }, - "id": 51216, + "id": 51307, "nodeType": "ExpressionStatement", "src": "3922:30:66" }, @@ -7710,11 +7710,11 @@ "expression": { "arguments": [ { - "id": 51220, + "id": 51311, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51191, + "referencedDeclaration": 51282, "src": "3976:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -7723,7 +7723,7 @@ }, { "hexValue": "30", - "id": 51221, + "id": 51312, "isConstant": false, "isLValue": false, "isPure": true, @@ -7741,7 +7741,7 @@ "arguments": [ { "hexValue": "30", - "id": 51224, + "id": 51315, "isConstant": false, "isLValue": false, "isPure": true, @@ -7764,7 +7764,7 @@ } ], "expression": { - "id": 51222, + "id": 51313, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7775,7 +7775,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51223, + "id": 51314, "isConstant": false, "isLValue": false, "isPure": false, @@ -7790,7 +7790,7 @@ "typeString": "type(struct OrderLib.PriceProof storage pointer)" } }, - "id": 51225, + "id": 51316, "isConstant": false, "isLValue": false, "isPure": true, @@ -7823,18 +7823,18 @@ } ], "expression": { - "id": 51217, + "id": 51308, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "3962:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51219, + "id": 51310, "isConstant": false, "isLValue": false, "isPure": false, @@ -7849,7 +7849,7 @@ "typeString": "function (uint64,uint8,struct OrderLib.PriceProof memory) external" } }, - "id": 51226, + "id": 51317, "isConstant": false, "isLValue": false, "isPure": false, @@ -7865,7 +7865,7 @@ "typeString": "tuple()" } }, - "id": 51227, + "id": 51318, "nodeType": "ExpressionStatement", "src": "3962:52:66" }, @@ -7874,7 +7874,7 @@ "arguments": [ { "hexValue": "6578656375746564", - "id": 51231, + "id": 51322, "isConstant": false, "isLValue": false, "isPure": true, @@ -7897,7 +7897,7 @@ } ], "expression": { - "id": 51228, + "id": 51319, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -7908,7 +7908,7 @@ "typeString": "type(library console2)" } }, - "id": 51230, + "id": 51321, "isConstant": false, "isLValue": false, "isPure": false, @@ -7923,7 +7923,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51232, + "id": 51323, "isConstant": false, "isLValue": false, "isPure": false, @@ -7939,7 +7939,7 @@ "typeString": "tuple()" } }, - "id": 51233, + "id": 51324, "nodeType": "ExpressionStatement", "src": "4024:24:66" } @@ -7952,46 +7952,46 @@ "name": "testExecuteOrderExactOutput", "nameLocation": "2792:27:66", "parameters": { - "id": 51081, + "id": 51172, "nodeType": "ParameterList", "parameters": [], "src": "2819:2:66" }, "returnParameters": { - "id": 51082, + "id": 51173, "nodeType": "ParameterList", "parameters": [], "src": "2829:0:66" }, - "scope": 51614, + "scope": 51705, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51390, + "id": 51481, "nodeType": "FunctionDefinition", "src": "4062:1272:66", "nodes": [], "body": { - "id": 51389, + "id": 51480, "nodeType": "Block", "src": "4107:1227:66", "nodes": [], "statements": [ { "assignments": [ - 51243 + 51334 ], "declarations": [ { "constant": false, - "id": 51243, + "id": 51334, "mutability": "mutable", "name": "tranches", "nameLocation": "4143:8:66", "nodeType": "VariableDeclaration", - "scope": 51389, + "scope": 51480, "src": "4117:34:66", "stateVariable": false, "storageLocation": "memory", @@ -8001,10 +8001,10 @@ }, "typeName": { "baseType": { - "id": 51241, + "id": 51332, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51240, + "id": 51331, "name": "OrderLib.Tranche", "nameLocations": [ "4117:8:66", @@ -8021,7 +8021,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51242, + "id": 51333, "nodeType": "ArrayTypeName", "src": "4117:18:66", "typeDescriptions": { @@ -8032,12 +8032,12 @@ "visibility": "internal" } ], - "id": 51250, + "id": 51341, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51248, + "id": 51339, "isConstant": false, "isLValue": false, "isPure": true, @@ -8059,7 +8059,7 @@ "typeString": "int_const 1" } ], - "id": 51247, + "id": 51338, "isConstant": false, "isLValue": false, "isPure": true, @@ -8072,10 +8072,10 @@ }, "typeName": { "baseType": { - "id": 51245, + "id": 51336, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51244, + "id": 51335, "name": "OrderLib.Tranche", "nameLocations": [ "4158:8:66", @@ -8092,7 +8092,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51246, + "id": 51337, "nodeType": "ArrayTypeName", "src": "4158:18:66", "typeDescriptions": { @@ -8101,7 +8101,7 @@ } } }, - "id": 51249, + "id": 51340, "isConstant": false, "isLValue": false, "isPure": true, @@ -8122,17 +8122,17 @@ }, { "assignments": [ - 51256 + 51347 ], "declarations": [ { "constant": false, - "id": 51256, + "id": 51347, "mutability": "mutable", "name": "constraints1", "nameLocation": "4218:12:66", "nodeType": "VariableDeclaration", - "scope": 51389, + "scope": 51480, "src": "4189:41:66", "stateVariable": false, "storageLocation": "memory", @@ -8142,10 +8142,10 @@ }, "typeName": { "baseType": { - "id": 51254, + "id": 51345, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51253, + "id": 51344, "name": "OrderLib.Constraint", "nameLocations": [ "4189:8:66", @@ -8162,7 +8162,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51255, + "id": 51346, "nodeType": "ArrayTypeName", "src": "4189:21:66", "typeDescriptions": { @@ -8173,12 +8173,12 @@ "visibility": "internal" } ], - "id": 51263, + "id": 51354, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51261, + "id": 51352, "isConstant": false, "isLValue": false, "isPure": true, @@ -8200,7 +8200,7 @@ "typeString": "int_const 1" } ], - "id": 51260, + "id": 51351, "isConstant": false, "isLValue": false, "isPure": true, @@ -8213,10 +8213,10 @@ }, "typeName": { "baseType": { - "id": 51258, + "id": 51349, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51257, + "id": 51348, "name": "OrderLib.Constraint", "nameLocations": [ "4237:8:66", @@ -8233,7 +8233,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51259, + "id": 51350, "nodeType": "ArrayTypeName", "src": "4237:21:66", "typeDescriptions": { @@ -8242,7 +8242,7 @@ } } }, - "id": 51262, + "id": 51353, "isConstant": false, "isLValue": false, "isPure": true, @@ -8263,28 +8263,28 @@ }, { "expression": { - "id": 51277, + "id": 51368, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51264, + "id": 51355, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51256, + "referencedDeclaration": 51347, "src": "4271:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 51266, + "id": 51357, "indexExpression": { "hexValue": "30", - "id": 51265, + "id": 51356, "isConstant": false, "isLValue": false, "isPure": true, @@ -8316,7 +8316,7 @@ { "expression": { "expression": { - "id": 51269, + "id": 51360, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8327,7 +8327,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51270, + "id": 51361, "isConstant": false, "isLValue": false, "isPure": false, @@ -8342,7 +8342,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 51271, + "id": 51362, "isConstant": false, "isLValue": false, "isPure": true, @@ -8361,7 +8361,7 @@ "arguments": [ { "hexValue": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500", - "id": 51274, + "id": 51365, "isConstant": false, "isLValue": false, "isPure": true, @@ -8383,7 +8383,7 @@ "typeString": "literal_string hex\"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000046500\"" } ], - "id": 51273, + "id": 51364, "isConstant": false, "isLValue": false, "isPure": true, @@ -8395,14 +8395,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 51272, + "id": 51363, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4339:5:66", "typeDescriptions": {} } }, - "id": 51275, + "id": 51366, "isConstant": false, "isLValue": false, "isPure": true, @@ -8431,7 +8431,7 @@ } ], "expression": { - "id": 51267, + "id": 51358, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8442,7 +8442,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51268, + "id": 51359, "isConstant": false, "isLValue": false, "isPure": false, @@ -8457,7 +8457,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 51276, + "id": 51367, "isConstant": false, "isLValue": false, "isPure": true, @@ -8479,34 +8479,34 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 51278, + "id": 51369, "nodeType": "ExpressionStatement", "src": "4271:337:66" }, { "expression": { - "id": 51291, + "id": 51382, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51279, + "id": 51370, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51243, + "referencedDeclaration": 51334, "src": "4618:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51281, + "id": 51372, "indexExpression": { "hexValue": "30", - "id": 51280, + "id": 51371, "isConstant": false, "isLValue": false, "isPure": true, @@ -8539,7 +8539,7 @@ "expression": { "arguments": [ { - "id": 51286, + "id": 51377, "isConstant": false, "isLValue": false, "isPure": true, @@ -8551,7 +8551,7 @@ "typeString": "type(uint16)" }, "typeName": { - "id": 51285, + "id": 51376, "name": "uint16", "nodeType": "ElementaryTypeName", "src": "4654:6:66", @@ -8566,7 +8566,7 @@ "typeString": "type(uint16)" } ], - "id": 51284, + "id": 51375, "name": "type", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8577,7 +8577,7 @@ "typeString": "function () pure" } }, - "id": 51287, + "id": 51378, "isConstant": false, "isLValue": false, "isPure": true, @@ -8593,7 +8593,7 @@ "typeString": "type(uint16)" } }, - "id": 51288, + "id": 51379, "isConstant": false, "isLValue": false, "isPure": true, @@ -8608,11 +8608,11 @@ } }, { - "id": 51289, + "id": 51380, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51256, + "referencedDeclaration": 51347, "src": "4666:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -8632,7 +8632,7 @@ } ], "expression": { - "id": 51282, + "id": 51373, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8643,7 +8643,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51283, + "id": 51374, "isConstant": false, "isLValue": false, "isPure": false, @@ -8658,7 +8658,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51290, + "id": 51381, "isConstant": false, "isLValue": false, "isPure": false, @@ -8680,23 +8680,23 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51292, + "id": 51383, "nodeType": "ExpressionStatement", "src": "4618:61:66" }, { "assignments": [ - 51294 + 51385 ], "declarations": [ { "constant": false, - "id": 51294, + "id": 51385, "mutability": "mutable", "name": "amount", "nameLocation": "4697:6:66", "nodeType": "VariableDeclaration", - "scope": 51389, + "scope": 51480, "src": "4689:14:66", "stateVariable": false, "storageLocation": "default", @@ -8705,7 +8705,7 @@ "typeString": "uint256" }, "typeName": { - "id": 51293, + "id": 51384, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4689:7:66", @@ -8717,13 +8717,13 @@ "visibility": "internal" } ], - "id": 51304, + "id": 51395, "initialValue": { "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51303, + "id": 51394, "isConstant": false, "isLValue": false, "isPure": false, @@ -8733,14 +8733,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51301, + "id": 51392, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "33", - "id": 51295, + "id": 51386, "isConstant": false, "isLValue": false, "isPure": true, @@ -8761,14 +8761,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51300, + "id": 51391, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 51296, + "id": 51387, "isConstant": false, "isLValue": false, "isPure": true, @@ -8789,7 +8789,7 @@ "expression": { "argumentTypes": [], "expression": { - "id": 51297, + "id": 51388, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8800,7 +8800,7 @@ "typeString": "contract MockERC20" } }, - "id": 51298, + "id": 51389, "isConstant": false, "isLValue": false, "isPure": false, @@ -8815,7 +8815,7 @@ "typeString": "function () view external returns (uint8)" } }, - "id": 51299, + "id": 51390, "isConstant": false, "isLValue": false, "isPure": false, @@ -8847,7 +8847,7 @@ "operator": "/", "rightExpression": { "hexValue": "3130", - "id": 51302, + "id": 51393, "isConstant": false, "isLValue": false, "isPure": true, @@ -8876,11 +8876,11 @@ { "arguments": [ { - "id": 51310, + "id": 51401, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "4772:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -8895,7 +8895,7 @@ "typeString": "contract Vault" } ], - "id": 51309, + "id": 51400, "isConstant": false, "isLValue": false, "isPure": true, @@ -8907,14 +8907,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51308, + "id": 51399, "name": "address", "nodeType": "ElementaryTypeName", "src": "4764:7:66", "typeDescriptions": {} } }, - "id": 51311, + "id": 51402, "isConstant": false, "isLValue": false, "isPure": false, @@ -8931,11 +8931,11 @@ } }, { - "id": 51312, + "id": 51403, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51294, + "referencedDeclaration": 51385, "src": "4780:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8955,7 +8955,7 @@ } ], "expression": { - "id": 51305, + "id": 51396, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8966,7 +8966,7 @@ "typeString": "contract MockERC20" } }, - "id": 51307, + "id": 51398, "isConstant": false, "isLValue": false, "isPure": false, @@ -8981,7 +8981,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 51313, + "id": 51404, "isConstant": false, "isLValue": false, "isPure": false, @@ -8997,23 +8997,23 @@ "typeString": "tuple()" } }, - "id": 51314, + "id": 51405, "nodeType": "ExpressionStatement", "src": "4754:33:66" }, { "assignments": [ - 51319 + 51410 ], "declarations": [ { "constant": false, - "id": 51319, + "id": 51410, "mutability": "mutable", "name": "order", "nameLocation": "4846:5:66", "nodeType": "VariableDeclaration", - "scope": 51389, + "scope": 51480, "src": "4820:31:66", "stateVariable": false, "storageLocation": "memory", @@ -9022,10 +9022,10 @@ "typeString": "struct OrderLib.SwapOrder" }, "typeName": { - "id": 51318, + "id": 51409, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51317, + "id": 51408, "name": "OrderLib.SwapOrder", "nameLocations": [ "4820:8:66", @@ -9045,13 +9045,13 @@ "visibility": "internal" } ], - "id": 51344, + "id": 51435, "initialValue": { "arguments": [ { "arguments": [ { - "id": 51324, + "id": 51415, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9070,7 +9070,7 @@ "typeString": "contract MockERC20" } ], - "id": 51323, + "id": 51414, "isConstant": false, "isLValue": false, "isPure": true, @@ -9082,14 +9082,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51322, + "id": 51413, "name": "address", "nodeType": "ElementaryTypeName", "src": "4887:7:66", "typeDescriptions": {} } }, - "id": 51325, + "id": 51416, "isConstant": false, "isLValue": false, "isPure": false, @@ -9108,7 +9108,7 @@ { "arguments": [ { - "id": 51328, + "id": 51419, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9127,7 +9127,7 @@ "typeString": "contract MockERC20" } ], - "id": 51327, + "id": 51418, "isConstant": false, "isLValue": false, "isPure": true, @@ -9139,14 +9139,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51326, + "id": 51417, "name": "address", "nodeType": "ElementaryTypeName", "src": "4902:7:66", "typeDescriptions": {} } }, - "id": 51329, + "id": 51420, "isConstant": false, "isLValue": false, "isPure": false, @@ -9167,7 +9167,7 @@ { "expression": { "expression": { - "id": 51332, + "id": 51423, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9178,7 +9178,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51333, + "id": 51424, "isConstant": false, "isLValue": false, "isPure": false, @@ -9193,7 +9193,7 @@ "typeString": "type(enum OrderLib.Exchange)" } }, - "id": 51334, + "id": 51425, "isConstant": false, "isLValue": false, "isPure": true, @@ -9209,7 +9209,7 @@ } }, { - "id": 51335, + "id": 51426, "name": "fee", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9233,7 +9233,7 @@ } ], "expression": { - "id": 51330, + "id": 51421, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9244,7 +9244,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51331, + "id": 51422, "isConstant": false, "isLValue": false, "isPure": false, @@ -9259,7 +9259,7 @@ "typeString": "type(struct OrderLib.Route storage pointer)" } }, - "id": 51336, + "id": 51427, "isConstant": false, "isLValue": false, "isPure": false, @@ -9276,11 +9276,11 @@ } }, { - "id": 51337, + "id": 51428, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51294, + "referencedDeclaration": 51385, "src": "4999:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9289,7 +9289,7 @@ }, { "hexValue": "74727565", - "id": 51338, + "id": 51429, "isConstant": false, "isLValue": false, "isPure": true, @@ -9305,7 +9305,7 @@ }, { "hexValue": "66616c7365", - "id": 51339, + "id": 51430, "isConstant": false, "isLValue": false, "isPure": true, @@ -9321,7 +9321,7 @@ }, { "expression": { - "id": 51340, + "id": 51431, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9332,7 +9332,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51341, + "id": 51432, "isConstant": false, "isLValue": false, "isPure": true, @@ -9348,11 +9348,11 @@ } }, { - "id": 51342, + "id": 51433, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51243, + "referencedDeclaration": 51334, "src": "5051:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", @@ -9396,7 +9396,7 @@ } ], "expression": { - "id": 51320, + "id": 51411, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9407,7 +9407,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51321, + "id": 51412, "isConstant": false, "isLValue": false, "isPure": false, @@ -9422,7 +9422,7 @@ "typeString": "type(struct OrderLib.SwapOrder storage pointer)" } }, - "id": 51343, + "id": 51434, "isConstant": false, "isLValue": false, "isPure": false, @@ -9443,17 +9443,17 @@ }, { "assignments": [ - 51346 + 51437 ], "declarations": [ { "constant": false, - "id": 51346, + "id": 51437, "mutability": "mutable", "name": "orderIndex", "nameLocation": "5086:10:66", "nodeType": "VariableDeclaration", - "scope": 51389, + "scope": 51480, "src": "5079:17:66", "stateVariable": false, "storageLocation": "default", @@ -9462,7 +9462,7 @@ "typeString": "uint64" }, "typeName": { - "id": 51345, + "id": 51436, "name": "uint64", "nodeType": "ElementaryTypeName", "src": "5079:6:66", @@ -9474,24 +9474,24 @@ "visibility": "internal" } ], - "id": 51350, + "id": 51441, "initialValue": { "arguments": [], "expression": { "argumentTypes": [], "expression": { - "id": 51347, + "id": 51438, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "5099:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51348, + "id": 51439, "isConstant": false, "isLValue": false, "isPure": false, @@ -9506,7 +9506,7 @@ "typeString": "function () view external returns (uint64)" } }, - "id": 51349, + "id": 51440, "isConstant": false, "isLValue": false, "isPure": false, @@ -9529,11 +9529,11 @@ "expression": { "arguments": [ { - "id": 51354, + "id": 51445, "name": "order", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51319, + "referencedDeclaration": 51410, "src": "5147:5:66", "typeDescriptions": { "typeIdentifier": "t_struct$_SwapOrder_$46563_memory_ptr", @@ -9549,18 +9549,18 @@ } ], "expression": { - "id": 51351, + "id": 51442, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "5130:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51353, + "id": 51444, "isConstant": false, "isLValue": false, "isPure": false, @@ -9575,7 +9575,7 @@ "typeString": "function (struct OrderLib.SwapOrder memory) external" } }, - "id": 51355, + "id": 51446, "isConstant": false, "isLValue": false, "isPure": false, @@ -9591,7 +9591,7 @@ "typeString": "tuple()" } }, - "id": 51356, + "id": 51447, "nodeType": "ExpressionStatement", "src": "5130:23:66" }, @@ -9600,7 +9600,7 @@ "arguments": [ { "hexValue": "706c61636564206f72646572", - "id": 51360, + "id": 51451, "isConstant": false, "isLValue": false, "isPure": true, @@ -9623,7 +9623,7 @@ } ], "expression": { - "id": 51357, + "id": 51448, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9634,7 +9634,7 @@ "typeString": "type(library console2)" } }, - "id": 51359, + "id": 51450, "isConstant": false, "isLValue": false, "isPure": false, @@ -9649,7 +9649,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51361, + "id": 51452, "isConstant": false, "isLValue": false, "isPure": false, @@ -9665,7 +9665,7 @@ "typeString": "tuple()" } }, - "id": 51362, + "id": 51453, "nodeType": "ExpressionStatement", "src": "5163:28:66" }, @@ -9675,11 +9675,11 @@ { "arguments": [ { - "id": 51368, + "id": 51459, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51346, + "referencedDeclaration": 51437, "src": "5219:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -9694,7 +9694,7 @@ "typeString": "uint64" } ], - "id": 51367, + "id": 51458, "isConstant": false, "isLValue": false, "isPure": true, @@ -9706,14 +9706,14 @@ "typeString": "type(uint256)" }, "typeName": { - "id": 51366, + "id": 51457, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5214:4:66", "typeDescriptions": {} } }, - "id": 51369, + "id": 51460, "isConstant": false, "isLValue": false, "isPure": false, @@ -9738,7 +9738,7 @@ } ], "expression": { - "id": 51363, + "id": 51454, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9749,7 +9749,7 @@ "typeString": "type(library console2)" } }, - "id": 51365, + "id": 51456, "isConstant": false, "isLValue": false, "isPure": false, @@ -9764,7 +9764,7 @@ "typeString": "function (uint256) pure" } }, - "id": 51370, + "id": 51461, "isConstant": false, "isLValue": false, "isPure": false, @@ -9780,7 +9780,7 @@ "typeString": "tuple()" } }, - "id": 51371, + "id": 51462, "nodeType": "ExpressionStatement", "src": "5201:30:66" }, @@ -9788,11 +9788,11 @@ "expression": { "arguments": [ { - "id": 51375, + "id": 51466, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51346, + "referencedDeclaration": 51437, "src": "5255:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -9801,7 +9801,7 @@ }, { "hexValue": "30", - "id": 51376, + "id": 51467, "isConstant": false, "isLValue": false, "isPure": true, @@ -9819,7 +9819,7 @@ "arguments": [ { "hexValue": "30", - "id": 51379, + "id": 51470, "isConstant": false, "isLValue": false, "isPure": true, @@ -9842,7 +9842,7 @@ } ], "expression": { - "id": 51377, + "id": 51468, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9853,7 +9853,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51378, + "id": 51469, "isConstant": false, "isLValue": false, "isPure": false, @@ -9868,7 +9868,7 @@ "typeString": "type(struct OrderLib.PriceProof storage pointer)" } }, - "id": 51380, + "id": 51471, "isConstant": false, "isLValue": false, "isPure": true, @@ -9901,18 +9901,18 @@ } ], "expression": { - "id": 51372, + "id": 51463, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "5241:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51374, + "id": 51465, "isConstant": false, "isLValue": false, "isPure": false, @@ -9927,7 +9927,7 @@ "typeString": "function (uint64,uint8,struct OrderLib.PriceProof memory) external" } }, - "id": 51381, + "id": 51472, "isConstant": false, "isLValue": false, "isPure": false, @@ -9943,7 +9943,7 @@ "typeString": "tuple()" } }, - "id": 51382, + "id": 51473, "nodeType": "ExpressionStatement", "src": "5241:52:66" }, @@ -9952,7 +9952,7 @@ "arguments": [ { "hexValue": "6578656375746564", - "id": 51386, + "id": 51477, "isConstant": false, "isLValue": false, "isPure": true, @@ -9975,7 +9975,7 @@ } ], "expression": { - "id": 51383, + "id": 51474, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9986,7 +9986,7 @@ "typeString": "type(library console2)" } }, - "id": 51385, + "id": 51476, "isConstant": false, "isLValue": false, "isPure": false, @@ -10001,7 +10001,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51387, + "id": 51478, "isConstant": false, "isLValue": false, "isPure": false, @@ -10017,7 +10017,7 @@ "typeString": "tuple()" } }, - "id": 51388, + "id": 51479, "nodeType": "ExpressionStatement", "src": "5303:24:66" } @@ -10030,46 +10030,46 @@ "name": "testExecuteOrderExactInput", "nameLocation": "4071:26:66", "parameters": { - "id": 51236, + "id": 51327, "nodeType": "ParameterList", "parameters": [], "src": "4097:2:66" }, "returnParameters": { - "id": 51237, + "id": 51328, "nodeType": "ParameterList", "parameters": [], "src": "4107:0:66" }, - "scope": 51614, + "scope": 51705, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51613, + "id": 51704, "nodeType": "FunctionDefinition", "src": "5341:1792:66", "nodes": [], "body": { - "id": 51612, + "id": 51703, "nodeType": "Block", "src": "5381:1752:66", "nodes": [], "statements": [ { "assignments": [ - 51398 + 51489 ], "declarations": [ { "constant": false, - "id": 51398, + "id": 51489, "mutability": "mutable", "name": "tranches", "nameLocation": "5470:8:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5444:34:66", "stateVariable": false, "storageLocation": "memory", @@ -10079,10 +10079,10 @@ }, "typeName": { "baseType": { - "id": 51396, + "id": 51487, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51395, + "id": 51486, "name": "OrderLib.Tranche", "nameLocations": [ "5444:8:66", @@ -10099,7 +10099,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51397, + "id": 51488, "nodeType": "ArrayTypeName", "src": "5444:18:66", "typeDescriptions": { @@ -10110,12 +10110,12 @@ "visibility": "internal" } ], - "id": 51405, + "id": 51496, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51403, + "id": 51494, "isConstant": false, "isLValue": false, "isPure": true, @@ -10137,7 +10137,7 @@ "typeString": "int_const 1" } ], - "id": 51402, + "id": 51493, "isConstant": false, "isLValue": false, "isPure": true, @@ -10150,10 +10150,10 @@ }, "typeName": { "baseType": { - "id": 51400, + "id": 51491, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51399, + "id": 51490, "name": "OrderLib.Tranche", "nameLocations": [ "5485:8:66", @@ -10170,7 +10170,7 @@ "typeString": "struct OrderLib.Tranche" } }, - "id": 51401, + "id": 51492, "nodeType": "ArrayTypeName", "src": "5485:18:66", "typeDescriptions": { @@ -10179,7 +10179,7 @@ } } }, - "id": 51404, + "id": 51495, "isConstant": false, "isLValue": false, "isPure": true, @@ -10200,17 +10200,17 @@ }, { "assignments": [ - 51411 + 51502 ], "declarations": [ { "constant": false, - "id": 51411, + "id": 51502, "mutability": "mutable", "name": "constraints1", "nameLocation": "5545:12:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5516:41:66", "stateVariable": false, "storageLocation": "memory", @@ -10220,10 +10220,10 @@ }, "typeName": { "baseType": { - "id": 51409, + "id": 51500, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51408, + "id": 51499, "name": "OrderLib.Constraint", "nameLocations": [ "5516:8:66", @@ -10240,7 +10240,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51410, + "id": 51501, "nodeType": "ArrayTypeName", "src": "5516:21:66", "typeDescriptions": { @@ -10251,12 +10251,12 @@ "visibility": "internal" } ], - "id": 51418, + "id": 51509, "initialValue": { "arguments": [ { "hexValue": "31", - "id": 51416, + "id": 51507, "isConstant": false, "isLValue": false, "isPure": true, @@ -10278,7 +10278,7 @@ "typeString": "int_const 1" } ], - "id": 51415, + "id": 51506, "isConstant": false, "isLValue": false, "isPure": true, @@ -10291,10 +10291,10 @@ }, "typeName": { "baseType": { - "id": 51413, + "id": 51504, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51412, + "id": 51503, "name": "OrderLib.Constraint", "nameLocations": [ "5564:8:66", @@ -10311,7 +10311,7 @@ "typeString": "struct OrderLib.Constraint" } }, - "id": 51414, + "id": 51505, "nodeType": "ArrayTypeName", "src": "5564:21:66", "typeDescriptions": { @@ -10320,7 +10320,7 @@ } } }, - "id": 51417, + "id": 51508, "isConstant": false, "isLValue": false, "isPure": true, @@ -10341,17 +10341,17 @@ }, { "assignments": [ - 51420 + 51511 ], "declarations": [ { "constant": false, - "id": 51420, + "id": 51511, "mutability": "mutable", "name": "limit", "nameLocation": "5606:5:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5598:13:66", "stateVariable": false, "storageLocation": "default", @@ -10360,7 +10360,7 @@ "typeString": "uint160" }, "typeName": { - "id": 51419, + "id": 51510, "name": "uint160", "nodeType": "ElementaryTypeName", "src": "5598:7:66", @@ -10372,13 +10372,13 @@ "visibility": "internal" } ], - "id": 51427, + "id": 51518, "initialValue": { "commonType": { "typeIdentifier": "t_uint160", "typeString": "uint160" }, - "id": 51426, + "id": 51517, "isConstant": false, "isLValue": false, "isPure": false, @@ -10388,7 +10388,7 @@ "typeIdentifier": "t_uint160", "typeString": "uint160" }, - "id": 51424, + "id": 51515, "isConstant": false, "isLValue": false, "isPure": false, @@ -10397,7 +10397,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 51421, + "id": 51512, "name": "price", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10408,7 +10408,7 @@ "typeString": "function () view returns (uint160)" } }, - "id": 51422, + "id": 51513, "isConstant": false, "isLValue": false, "isPure": false, @@ -10428,7 +10428,7 @@ "operator": "*", "rightExpression": { "hexValue": "3130303031", - "id": 51423, + "id": 51514, "isConstant": false, "isLValue": false, "isPure": true, @@ -10452,7 +10452,7 @@ "operator": "/", "rightExpression": { "hexValue": "3130303030", - "id": 51425, + "id": 51516, "isConstant": false, "isLValue": false, "isPure": true, @@ -10477,17 +10477,17 @@ }, { "assignments": [ - 51429 + 51520 ], "declarations": [ { "constant": false, - "id": 51429, + "id": 51520, "mutability": "mutable", "name": "serialized", "nameLocation": "5691:10:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5678:23:66", "stateVariable": false, "storageLocation": "memory", @@ -10496,7 +10496,7 @@ "typeString": "bytes" }, "typeName": { - "id": 51428, + "id": 51519, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "5678:5:66", @@ -10508,14 +10508,14 @@ "visibility": "internal" } ], - "id": 51441, + "id": 51532, "initialValue": { "arguments": [ { "arguments": [ { "hexValue": "74727565", - "id": 51434, + "id": 51525, "isConstant": false, "isLValue": false, "isPure": true, @@ -10531,7 +10531,7 @@ }, { "hexValue": "66616c7365", - "id": 51435, + "id": 51526, "isConstant": false, "isLValue": false, "isPure": true, @@ -10547,7 +10547,7 @@ }, { "hexValue": "30", - "id": 51436, + "id": 51527, "isConstant": false, "isLValue": false, "isPure": true, @@ -10562,11 +10562,11 @@ "value": "0" }, { - "id": 51437, + "id": 51528, "name": "limit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51420, + "referencedDeclaration": 51511, "src": "5756:5:66", "typeDescriptions": { "typeIdentifier": "t_uint160", @@ -10575,7 +10575,7 @@ }, { "hexValue": "30", - "id": 51438, + "id": 51529, "isConstant": false, "isLValue": false, "isPure": true, @@ -10614,7 +10614,7 @@ } ], "expression": { - "id": 51432, + "id": 51523, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10625,7 +10625,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51433, + "id": 51524, "isConstant": false, "isLValue": false, "isPure": false, @@ -10640,7 +10640,7 @@ "typeString": "type(struct OrderLib.LineConstraint storage pointer)" } }, - "id": 51439, + "id": 51530, "isConstant": false, "isLValue": false, "isPure": false, @@ -10665,7 +10665,7 @@ } ], "expression": { - "id": 51430, + "id": 51521, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10676,7 +10676,7 @@ "typeString": "abi" } }, - "id": 51431, + "id": 51522, "isConstant": false, "isLValue": false, "isPure": true, @@ -10690,7 +10690,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 51440, + "id": 51531, "isConstant": false, "isLValue": false, "isPure": false, @@ -10711,28 +10711,28 @@ }, { "expression": { - "id": 51452, + "id": 51543, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51442, + "id": 51533, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51411, + "referencedDeclaration": 51502, "src": "5777:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Constraint memory[] memory" } }, - "id": 51444, + "id": 51535, "indexExpression": { "hexValue": "30", - "id": 51443, + "id": 51534, "isConstant": false, "isLValue": false, "isPure": true, @@ -10764,7 +10764,7 @@ { "expression": { "expression": { - "id": 51447, + "id": 51538, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10775,7 +10775,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51448, + "id": 51539, "isConstant": false, "isLValue": false, "isPure": false, @@ -10790,7 +10790,7 @@ "typeString": "type(enum OrderLib.ConstraintMode)" } }, - "id": 51449, + "id": 51540, "isConstant": false, "isLValue": false, "isPure": true, @@ -10806,11 +10806,11 @@ } }, { - "id": 51450, + "id": 51541, "name": "serialized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51429, + "referencedDeclaration": 51520, "src": "5845:10:66", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -10830,7 +10830,7 @@ } ], "expression": { - "id": 51445, + "id": 51536, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10841,7 +10841,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51446, + "id": 51537, "isConstant": false, "isLValue": false, "isPure": false, @@ -10856,7 +10856,7 @@ "typeString": "type(struct OrderLib.Constraint storage pointer)" } }, - "id": 51451, + "id": 51542, "isConstant": false, "isLValue": false, "isPure": false, @@ -10878,34 +10878,34 @@ "typeString": "struct OrderLib.Constraint memory" } }, - "id": 51453, + "id": 51544, "nodeType": "ExpressionStatement", "src": "5777:79:66" }, { "expression": { - "id": 51466, + "id": 51557, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "baseExpression": { - "id": 51454, + "id": 51545, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51398, + "referencedDeclaration": 51489, "src": "5866:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", "typeString": "struct OrderLib.Tranche memory[] memory" } }, - "id": 51456, + "id": 51547, "indexExpression": { "hexValue": "30", - "id": 51455, + "id": 51546, "isConstant": false, "isLValue": false, "isPure": true, @@ -10938,7 +10938,7 @@ "expression": { "arguments": [ { - "id": 51461, + "id": 51552, "isConstant": false, "isLValue": false, "isPure": true, @@ -10950,7 +10950,7 @@ "typeString": "type(uint16)" }, "typeName": { - "id": 51460, + "id": 51551, "name": "uint16", "nodeType": "ElementaryTypeName", "src": "5902:6:66", @@ -10965,7 +10965,7 @@ "typeString": "type(uint16)" } ], - "id": 51459, + "id": 51550, "name": "type", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -10976,7 +10976,7 @@ "typeString": "function () pure" } }, - "id": 51462, + "id": 51553, "isConstant": false, "isLValue": false, "isPure": true, @@ -10992,7 +10992,7 @@ "typeString": "type(uint16)" } }, - "id": 51463, + "id": 51554, "isConstant": false, "isLValue": false, "isPure": true, @@ -11007,11 +11007,11 @@ } }, { - "id": 51464, + "id": 51555, "name": "constraints1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51411, + "referencedDeclaration": 51502, "src": "5914:12:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Constraint_$46594_memory_ptr_$dyn_memory_ptr", @@ -11031,7 +11031,7 @@ } ], "expression": { - "id": 51457, + "id": 51548, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11042,7 +11042,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51458, + "id": 51549, "isConstant": false, "isLValue": false, "isPure": false, @@ -11057,7 +11057,7 @@ "typeString": "type(struct OrderLib.Tranche storage pointer)" } }, - "id": 51465, + "id": 51556, "isConstant": false, "isLValue": false, "isPure": false, @@ -11079,23 +11079,23 @@ "typeString": "struct OrderLib.Tranche memory" } }, - "id": 51467, + "id": 51558, "nodeType": "ExpressionStatement", "src": "5866:61:66" }, { "assignments": [ - 51470 + 51561 ], "declarations": [ { "constant": false, - "id": 51470, + "id": 51561, "mutability": "mutable", "name": "token", "nameLocation": "5947:5:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5937:15:66", "stateVariable": false, "storageLocation": "default", @@ -11104,10 +11104,10 @@ "typeString": "contract MockERC20" }, "typeName": { - "id": 51469, + "id": 51560, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51468, + "id": 51559, "name": "MockERC20", "nameLocations": [ "5937:9:66" @@ -11126,11 +11126,11 @@ "visibility": "internal" } ], - "id": 51474, + "id": 51565, "initialValue": { "arguments": [ { - "id": 51472, + "id": 51563, "name": "token0", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11149,7 +11149,7 @@ "typeString": "address" } ], - "id": 51471, + "id": 51562, "name": "MockERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11160,7 +11160,7 @@ "typeString": "type(contract MockERC20)" } }, - "id": 51473, + "id": 51564, "isConstant": false, "isLValue": false, "isPure": false, @@ -11181,17 +11181,17 @@ }, { "assignments": [ - 51476 + 51567 ], "declarations": [ { "constant": false, - "id": 51476, + "id": 51567, "mutability": "mutable", "name": "amount", "nameLocation": "5990:6:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "5982:14:66", "stateVariable": false, "storageLocation": "default", @@ -11200,7 +11200,7 @@ "typeString": "uint256" }, "typeName": { - "id": 51475, + "id": 51566, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5982:7:66", @@ -11212,13 +11212,13 @@ "visibility": "internal" } ], - "id": 51486, + "id": 51577, "initialValue": { "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51485, + "id": 51576, "isConstant": false, "isLValue": false, "isPure": false, @@ -11228,14 +11228,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51483, + "id": 51574, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "33", - "id": 51477, + "id": 51568, "isConstant": false, "isLValue": false, "isPure": true, @@ -11256,14 +11256,14 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 51482, + "id": 51573, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 51478, + "id": 51569, "isConstant": false, "isLValue": false, "isPure": true, @@ -11284,18 +11284,18 @@ "expression": { "argumentTypes": [], "expression": { - "id": 51479, + "id": 51570, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51470, + "referencedDeclaration": 51561, "src": "6005:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_MockERC20_$46478", "typeString": "contract MockERC20" } }, - "id": 51480, + "id": 51571, "isConstant": false, "isLValue": false, "isPure": false, @@ -11310,7 +11310,7 @@ "typeString": "function () view external returns (uint8)" } }, - "id": 51481, + "id": 51572, "isConstant": false, "isLValue": false, "isPure": false, @@ -11342,7 +11342,7 @@ "operator": "/", "rightExpression": { "hexValue": "3130", - "id": 51484, + "id": 51575, "isConstant": false, "isLValue": false, "isPure": true, @@ -11371,11 +11371,11 @@ { "arguments": [ { - "id": 51492, + "id": 51583, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "6077:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -11390,7 +11390,7 @@ "typeString": "contract Vault" } ], - "id": 51491, + "id": 51582, "isConstant": false, "isLValue": false, "isPure": true, @@ -11402,14 +11402,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51490, + "id": 51581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6069:7:66", "typeDescriptions": {} } }, - "id": 51493, + "id": 51584, "isConstant": false, "isLValue": false, "isPure": false, @@ -11426,11 +11426,11 @@ } }, { - "id": 51494, + "id": 51585, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51476, + "referencedDeclaration": 51567, "src": "6085:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11450,18 +11450,18 @@ } ], "expression": { - "id": 51487, + "id": 51578, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51470, + "referencedDeclaration": 51561, "src": "6058:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_MockERC20_$46478", "typeString": "contract MockERC20" } }, - "id": 51489, + "id": 51580, "isConstant": false, "isLValue": false, "isPure": false, @@ -11476,7 +11476,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 51495, + "id": 51586, "isConstant": false, "isLValue": false, "isPure": false, @@ -11492,23 +11492,23 @@ "typeString": "tuple()" } }, - "id": 51496, + "id": 51587, "nodeType": "ExpressionStatement", "src": "6058:34:66" }, { "assignments": [ - 51501 + 51592 ], "declarations": [ { "constant": false, - "id": 51501, + "id": 51592, "mutability": "mutable", "name": "order", "nameLocation": "6128:5:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "6102:31:66", "stateVariable": false, "storageLocation": "memory", @@ -11517,10 +11517,10 @@ "typeString": "struct OrderLib.SwapOrder" }, "typeName": { - "id": 51500, + "id": 51591, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51499, + "id": 51590, "name": "OrderLib.SwapOrder", "nameLocations": [ "6102:8:66", @@ -11540,11 +11540,11 @@ "visibility": "internal" } ], - "id": 51520, + "id": 51611, "initialValue": { "arguments": [ { - "id": 51504, + "id": 51595, "name": "token0", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11556,7 +11556,7 @@ } }, { - "id": 51505, + "id": 51596, "name": "token1", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11572,7 +11572,7 @@ { "expression": { "expression": { - "id": 51508, + "id": 51599, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11583,7 +11583,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51509, + "id": 51600, "isConstant": false, "isLValue": false, "isPure": false, @@ -11598,7 +11598,7 @@ "typeString": "type(enum OrderLib.Exchange)" } }, - "id": 51510, + "id": 51601, "isConstant": false, "isLValue": false, "isPure": true, @@ -11614,7 +11614,7 @@ } }, { - "id": 51511, + "id": 51602, "name": "fee", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11638,7 +11638,7 @@ } ], "expression": { - "id": 51506, + "id": 51597, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11649,7 +11649,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51507, + "id": 51598, "isConstant": false, "isLValue": false, "isPure": false, @@ -11664,7 +11664,7 @@ "typeString": "type(struct OrderLib.Route storage pointer)" } }, - "id": 51512, + "id": 51603, "isConstant": false, "isLValue": false, "isPure": false, @@ -11681,11 +11681,11 @@ } }, { - "id": 51513, + "id": 51604, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51476, + "referencedDeclaration": 51567, "src": "6255:6:66", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11694,7 +11694,7 @@ }, { "hexValue": "74727565", - "id": 51514, + "id": 51605, "isConstant": false, "isLValue": false, "isPure": true, @@ -11710,7 +11710,7 @@ }, { "hexValue": "66616c7365", - "id": 51515, + "id": 51606, "isConstant": false, "isLValue": false, "isPure": true, @@ -11726,7 +11726,7 @@ }, { "expression": { - "id": 51516, + "id": 51607, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11737,7 +11737,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51517, + "id": 51608, "isConstant": false, "isLValue": false, "isPure": true, @@ -11753,11 +11753,11 @@ } }, { - "id": 51518, + "id": 51609, "name": "tranches", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51398, + "referencedDeclaration": 51489, "src": "6307:8:66", "typeDescriptions": { "typeIdentifier": "t_array$_t_struct$_Tranche_$46638_memory_ptr_$dyn_memory_ptr", @@ -11801,7 +11801,7 @@ } ], "expression": { - "id": 51502, + "id": 51593, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -11812,7 +11812,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51503, + "id": 51594, "isConstant": false, "isLValue": false, "isPure": false, @@ -11827,7 +11827,7 @@ "typeString": "type(struct OrderLib.SwapOrder storage pointer)" } }, - "id": 51519, + "id": 51610, "isConstant": false, "isLValue": false, "isPure": false, @@ -11848,17 +11848,17 @@ }, { "assignments": [ - 51522 + 51613 ], "declarations": [ { "constant": false, - "id": 51522, + "id": 51613, "mutability": "mutable", "name": "orderIndex", "nameLocation": "6342:10:66", "nodeType": "VariableDeclaration", - "scope": 51612, + "scope": 51703, "src": "6335:17:66", "stateVariable": false, "storageLocation": "default", @@ -11867,7 +11867,7 @@ "typeString": "uint64" }, "typeName": { - "id": 51521, + "id": 51612, "name": "uint64", "nodeType": "ElementaryTypeName", "src": "6335:6:66", @@ -11879,24 +11879,24 @@ "visibility": "internal" } ], - "id": 51526, + "id": 51617, "initialValue": { "arguments": [], "expression": { "argumentTypes": [], "expression": { - "id": 51523, + "id": 51614, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "6355:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51524, + "id": 51615, "isConstant": false, "isLValue": false, "isPure": false, @@ -11911,7 +11911,7 @@ "typeString": "function () view external returns (uint64)" } }, - "id": 51525, + "id": 51616, "isConstant": false, "isLValue": false, "isPure": false, @@ -11934,11 +11934,11 @@ "expression": { "arguments": [ { - "id": 51530, + "id": 51621, "name": "order", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51501, + "referencedDeclaration": 51592, "src": "6403:5:66", "typeDescriptions": { "typeIdentifier": "t_struct$_SwapOrder_$46563_memory_ptr", @@ -11954,18 +11954,18 @@ } ], "expression": { - "id": 51527, + "id": 51618, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "6386:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51529, + "id": 51620, "isConstant": false, "isLValue": false, "isPure": false, @@ -11980,7 +11980,7 @@ "typeString": "function (struct OrderLib.SwapOrder memory) external" } }, - "id": 51531, + "id": 51622, "isConstant": false, "isLValue": false, "isPure": false, @@ -11996,7 +11996,7 @@ "typeString": "tuple()" } }, - "id": 51532, + "id": 51623, "nodeType": "ExpressionStatement", "src": "6386:23:66" }, @@ -12005,7 +12005,7 @@ "arguments": [ { "hexValue": "706c61636564206f72646572", - "id": 51536, + "id": 51627, "isConstant": false, "isLValue": false, "isPure": true, @@ -12028,7 +12028,7 @@ } ], "expression": { - "id": 51533, + "id": 51624, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12039,7 +12039,7 @@ "typeString": "type(library console2)" } }, - "id": 51535, + "id": 51626, "isConstant": false, "isLValue": false, "isPure": false, @@ -12054,7 +12054,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51537, + "id": 51628, "isConstant": false, "isLValue": false, "isPure": false, @@ -12070,7 +12070,7 @@ "typeString": "tuple()" } }, - "id": 51538, + "id": 51629, "nodeType": "ExpressionStatement", "src": "6419:28:66" }, @@ -12080,11 +12080,11 @@ { "arguments": [ { - "id": 51544, + "id": 51635, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51522, + "referencedDeclaration": 51613, "src": "6475:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -12099,7 +12099,7 @@ "typeString": "uint64" } ], - "id": 51543, + "id": 51634, "isConstant": false, "isLValue": false, "isPure": true, @@ -12111,14 +12111,14 @@ "typeString": "type(uint256)" }, "typeName": { - "id": 51542, + "id": 51633, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6470:4:66", "typeDescriptions": {} } }, - "id": 51545, + "id": 51636, "isConstant": false, "isLValue": false, "isPure": false, @@ -12143,7 +12143,7 @@ } ], "expression": { - "id": 51539, + "id": 51630, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12154,7 +12154,7 @@ "typeString": "type(library console2)" } }, - "id": 51541, + "id": 51632, "isConstant": false, "isLValue": false, "isPure": false, @@ -12169,7 +12169,7 @@ "typeString": "function (uint256) pure" } }, - "id": 51546, + "id": 51637, "isConstant": false, "isLValue": false, "isPure": false, @@ -12185,7 +12185,7 @@ "typeString": "tuple()" } }, - "id": 51547, + "id": 51638, "nodeType": "ExpressionStatement", "src": "6457:30:66" }, @@ -12196,7 +12196,7 @@ "arguments": [ { "hexValue": "4c", - "id": 51553, + "id": 51644, "isConstant": false, "isLValue": false, "isPure": true, @@ -12218,7 +12218,7 @@ "typeString": "literal_string \"L\"" } ], - "id": 51552, + "id": 51643, "isConstant": false, "isLValue": false, "isPure": true, @@ -12230,14 +12230,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 51551, + "id": 51642, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "6514:5:66", "typeDescriptions": {} } }, - "id": 51554, + "id": 51645, "isConstant": false, "isLValue": false, "isPure": true, @@ -12262,7 +12262,7 @@ } ], "expression": { - "id": 51548, + "id": 51639, "name": "vm", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12273,7 +12273,7 @@ "typeString": "contract Vm" } }, - "id": 51550, + "id": 51641, "isConstant": false, "isLValue": false, "isPure": false, @@ -12288,7 +12288,7 @@ "typeString": "function (bytes memory) external" } }, - "id": 51555, + "id": 51646, "isConstant": false, "isLValue": false, "isPure": false, @@ -12304,7 +12304,7 @@ "typeString": "tuple()" } }, - "id": 51556, + "id": 51647, "nodeType": "ExpressionStatement", "src": "6498:27:66" }, @@ -12312,11 +12312,11 @@ "expression": { "arguments": [ { - "id": 51560, + "id": 51651, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51522, + "referencedDeclaration": 51613, "src": "6549:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -12325,7 +12325,7 @@ }, { "hexValue": "30", - "id": 51561, + "id": 51652, "isConstant": false, "isLValue": false, "isPure": true, @@ -12343,7 +12343,7 @@ "arguments": [ { "hexValue": "30", - "id": 51564, + "id": 51655, "isConstant": false, "isLValue": false, "isPure": true, @@ -12366,7 +12366,7 @@ } ], "expression": { - "id": 51562, + "id": 51653, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12377,7 +12377,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51563, + "id": 51654, "isConstant": false, "isLValue": false, "isPure": false, @@ -12392,7 +12392,7 @@ "typeString": "type(struct OrderLib.PriceProof storage pointer)" } }, - "id": 51565, + "id": 51656, "isConstant": false, "isLValue": false, "isPure": true, @@ -12425,18 +12425,18 @@ } ], "expression": { - "id": 51557, + "id": 51648, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "6535:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51559, + "id": 51650, "isConstant": false, "isLValue": false, "isPure": false, @@ -12451,7 +12451,7 @@ "typeString": "function (uint64,uint8,struct OrderLib.PriceProof memory) external" } }, - "id": 51566, + "id": 51657, "isConstant": false, "isLValue": false, "isPure": false, @@ -12467,7 +12467,7 @@ "typeString": "tuple()" } }, - "id": 51567, + "id": 51658, "nodeType": "ExpressionStatement", "src": "6535:52:66" }, @@ -12476,7 +12476,7 @@ "arguments": [ { "hexValue": "7375636365737366756c6c79206661696c656420746f20657865637574652062656c6f77206c696d6974207072696365", - "id": 51571, + "id": 51662, "isConstant": false, "isLValue": false, "isPure": true, @@ -12499,7 +12499,7 @@ } ], "expression": { - "id": 51568, + "id": 51659, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12510,7 +12510,7 @@ "typeString": "type(library console2)" } }, - "id": 51570, + "id": 51661, "isConstant": false, "isLValue": false, "isPure": false, @@ -12525,7 +12525,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51572, + "id": 51663, "isConstant": false, "isLValue": false, "isPure": false, @@ -12541,7 +12541,7 @@ "typeString": "tuple()" } }, - "id": 51573, + "id": 51664, "nodeType": "ExpressionStatement", "src": "6628:64:66" }, @@ -12549,11 +12549,11 @@ "expression": { "arguments": [ { - "id": 51575, + "id": 51666, "name": "limit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51420, + "referencedDeclaration": 51511, "src": "6715:5:66", "typeDescriptions": { "typeIdentifier": "t_uint160", @@ -12568,7 +12568,7 @@ "typeString": "uint160" } ], - "id": 51574, + "id": 51665, "name": "swapToPrice", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12579,7 +12579,7 @@ "typeString": "function (uint160)" } }, - "id": 51576, + "id": 51667, "isConstant": false, "isLValue": false, "isPure": false, @@ -12595,7 +12595,7 @@ "typeString": "tuple()" } }, - "id": 51577, + "id": 51668, "nodeType": "ExpressionStatement", "src": "6703:18:66" }, @@ -12606,7 +12606,7 @@ "arguments": [ { "hexValue": "4c", - "id": 51583, + "id": 51674, "isConstant": false, "isLValue": false, "isPure": true, @@ -12628,7 +12628,7 @@ "typeString": "literal_string \"L\"" } ], - "id": 51582, + "id": 51673, "isConstant": false, "isLValue": false, "isPure": true, @@ -12640,14 +12640,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 51581, + "id": 51672, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "6782:5:66", "typeDescriptions": {} } }, - "id": 51584, + "id": 51675, "isConstant": false, "isLValue": false, "isPure": true, @@ -12672,7 +12672,7 @@ } ], "expression": { - "id": 51578, + "id": 51669, "name": "vm", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12683,7 +12683,7 @@ "typeString": "contract Vm" } }, - "id": 51580, + "id": 51671, "isConstant": false, "isLValue": false, "isPure": false, @@ -12698,7 +12698,7 @@ "typeString": "function (bytes memory) external" } }, - "id": 51585, + "id": 51676, "isConstant": false, "isLValue": false, "isPure": false, @@ -12714,7 +12714,7 @@ "typeString": "tuple()" } }, - "id": 51586, + "id": 51677, "nodeType": "ExpressionStatement", "src": "6766:27:66" }, @@ -12722,11 +12722,11 @@ "expression": { "arguments": [ { - "id": 51590, + "id": 51681, "name": "orderIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51522, + "referencedDeclaration": 51613, "src": "6895:10:66", "typeDescriptions": { "typeIdentifier": "t_uint64", @@ -12735,7 +12735,7 @@ }, { "hexValue": "30", - "id": 51591, + "id": 51682, "isConstant": false, "isLValue": false, "isPure": true, @@ -12753,7 +12753,7 @@ "arguments": [ { "hexValue": "30", - "id": 51594, + "id": 51685, "isConstant": false, "isLValue": false, "isPure": true, @@ -12776,7 +12776,7 @@ } ], "expression": { - "id": 51592, + "id": 51683, "name": "OrderLib", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12787,7 +12787,7 @@ "typeString": "type(library OrderLib)" } }, - "id": 51593, + "id": 51684, "isConstant": false, "isLValue": false, "isPure": false, @@ -12802,7 +12802,7 @@ "typeString": "type(struct OrderLib.PriceProof storage pointer)" } }, - "id": 51595, + "id": 51686, "isConstant": false, "isLValue": false, "isPure": true, @@ -12835,18 +12835,18 @@ } ], "expression": { - "id": 51587, + "id": 51678, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 50845, + "referencedDeclaration": 50936, "src": "6881:5:66", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", "typeString": "contract Vault" } }, - "id": 51589, + "id": 51680, "isConstant": false, "isLValue": false, "isPure": false, @@ -12861,7 +12861,7 @@ "typeString": "function (uint64,uint8,struct OrderLib.PriceProof memory) external" } }, - "id": 51596, + "id": 51687, "isConstant": false, "isLValue": false, "isPure": false, @@ -12877,7 +12877,7 @@ "typeString": "tuple()" } }, - "id": 51597, + "id": 51688, "nodeType": "ExpressionStatement", "src": "6881:52:66" }, @@ -12889,7 +12889,7 @@ "typeIdentifier": "t_uint160", "typeString": "uint160" }, - "id": 51603, + "id": 51694, "isConstant": false, "isLValue": false, "isPure": false, @@ -12899,17 +12899,17 @@ "typeIdentifier": "t_uint160", "typeString": "uint160" }, - "id": 51601, + "id": 51692, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { - "id": 51599, + "id": 51690, "name": "limit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51420, + "referencedDeclaration": 51511, "src": "7005:5:66", "typeDescriptions": { "typeIdentifier": "t_uint160", @@ -12920,7 +12920,7 @@ "operator": "*", "rightExpression": { "hexValue": "3130303031", - "id": 51600, + "id": 51691, "isConstant": false, "isLValue": false, "isPure": true, @@ -12944,7 +12944,7 @@ "operator": "/", "rightExpression": { "hexValue": "3130303030", - "id": 51602, + "id": 51693, "isConstant": false, "isLValue": false, "isPure": true, @@ -12972,7 +12972,7 @@ "typeString": "uint160" } ], - "id": 51598, + "id": 51689, "name": "swapToPrice", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -12983,7 +12983,7 @@ "typeString": "function (uint160)" } }, - "id": 51604, + "id": 51695, "isConstant": false, "isLValue": false, "isPure": false, @@ -12999,7 +12999,7 @@ "typeString": "tuple()" } }, - "id": 51605, + "id": 51696, "nodeType": "ExpressionStatement", "src": "6993:30:66" }, @@ -13008,7 +13008,7 @@ "arguments": [ { "hexValue": "7375636365737366756c6c79206578656375746564206174206c696d6974207072696365", - "id": 51609, + "id": 51700, "isConstant": false, "isLValue": false, "isPure": true, @@ -13031,7 +13031,7 @@ } ], "expression": { - "id": 51606, + "id": 51697, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -13042,7 +13042,7 @@ "typeString": "type(library console2)" } }, - "id": 51608, + "id": 51699, "isConstant": false, "isLValue": false, "isPure": false, @@ -13057,7 +13057,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51610, + "id": 51701, "isConstant": false, "isLValue": false, "isPure": false, @@ -13073,7 +13073,7 @@ "typeString": "tuple()" } }, - "id": 51611, + "id": 51702, "nodeType": "ExpressionStatement", "src": "7074:52:66" } @@ -13086,18 +13086,18 @@ "name": "testExecuteLimitOrder", "nameLocation": "5350:21:66", "parameters": { - "id": 51391, + "id": 51482, "nodeType": "ParameterList", "parameters": [], "src": "5371:2:66" }, "returnParameters": { - "id": 51392, + "id": 51483, "nodeType": "ParameterList", "parameters": [], "src": "5381:0:66" }, - "scope": 51614, + "scope": 51705, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" @@ -13107,7 +13107,7 @@ "baseContracts": [ { "baseName": { - "id": 50832, + "id": 50923, "name": "MockEnv", "nameLocations": [ "279:7:66" @@ -13116,13 +13116,13 @@ "referencedDeclaration": 50069, "src": "279:7:66" }, - "id": 50833, + "id": 50924, "nodeType": "InheritanceSpecifier", "src": "279:7:66" }, { "baseName": { - "id": 50834, + "id": 50925, "name": "Test", "nameLocations": [ "288:4:66" @@ -13131,7 +13131,7 @@ "referencedDeclaration": 11937, "src": "288:4:66" }, - "id": 50835, + "id": 50926, "nodeType": "InheritanceSpecifier", "src": "288:4:66" } @@ -13147,7 +13147,7 @@ "21582": 1 }, "linearizedBaseContracts": [ - 51614, + 51705, 11937, 2357, 2354, @@ -13162,7 +13162,7 @@ ], "name": "TestOrder", "nameLocation": "266:9:66", - "scope": 51615, + "scope": 51706, "usedErrors": [], "usedEvents": [ 5, diff --git a/deployment/alpha/out/TestSinglePool.sol/TestSinglePool.json b/deployment/alpha/out/TestSinglePool.sol/TestSinglePool.json index 77b05d0..e0e8cb3 100644 --- a/deployment/alpha/out/TestSinglePool.sol/TestSinglePool.json +++ b/deployment/alpha/out/TestSinglePool.sol/TestSinglePool.json @@ -2202,7 +2202,7 @@ }, "ast": { "absolutePath": "test/TestSinglePool.sol", - "id": 51669, + "id": 51760, "exportedSymbols": { "Constants": [ 46264 @@ -2325,7 +2325,7 @@ 2357 ], "TestSinglePool": [ - 51668 + 51759 ], "TickMath": [ 45059 @@ -2362,7 +2362,7 @@ "src": "65:396:67", "nodes": [ { - "id": 51616, + "id": 51707, "nodeType": "PragmaDirective", "src": "65:24:67", "nodes": [], @@ -2374,7 +2374,7 @@ ] }, { - "id": 51617, + "id": 51708, "nodeType": "PragmaDirective", "src": "90:19:67", "nodes": [], @@ -2384,56 +2384,56 @@ ] }, { - "id": 51618, + "id": 51709, "nodeType": "ImportDirective", "src": "111:32:67", "nodes": [], "absolutePath": "lib/forge-std/src/console2.sol", "file": "forge-std/console2.sol", "nameLocation": "-1:-1:-1", - "scope": 51669, + "scope": 51760, "sourceUnit": 29654, "symbolAliases": [], "unitAlias": "" }, { - "id": 51619, + "id": 51710, "nodeType": "ImportDirective", "src": "144:28:67", "nodes": [], "absolutePath": "lib/forge-std/src/Test.sol", "file": "forge-std/Test.sol", "nameLocation": "-1:-1:-1", - "scope": 51669, + "scope": 51760, "sourceUnit": 11938, "symbolAliases": [], "unitAlias": "" }, { - "id": 51620, + "id": 51711, "nodeType": "ImportDirective", "src": "173:23:67", "nodes": [], "absolutePath": "test/MockEnv.sol", "file": "./MockEnv.sol", "nameLocation": "-1:-1:-1", - "scope": 51669, + "scope": 51760, "sourceUnit": 50070, "symbolAliases": [], "unitAlias": "" }, { - "id": 51668, + "id": 51759, "nodeType": "ContractDefinition", "src": "199:261:67", "nodes": [ { - "id": 51631, + "id": 51722, "nodeType": "FunctionDefinition", "src": "246:47:67", "nodes": [], "body": { - "id": 51630, + "id": 51721, "nodeType": "Block", "src": "270:23:67", "nodes": [], @@ -2443,7 +2443,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 51627, + "id": 51718, "name": "init", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2454,7 +2454,7 @@ "typeString": "function ()" } }, - "id": 51628, + "id": 51719, "isConstant": false, "isLValue": false, "isPure": false, @@ -2470,7 +2470,7 @@ "typeString": "tuple()" } }, - "id": 51629, + "id": 51720, "nodeType": "ExpressionStatement", "src": "280:6:67" } @@ -2483,29 +2483,29 @@ "name": "setUp", "nameLocation": "255:5:67", "parameters": { - "id": 51625, + "id": 51716, "nodeType": "ParameterList", "parameters": [], "src": "260:2:67" }, "returnParameters": { - "id": 51626, + "id": 51717, "nodeType": "ParameterList", "parameters": [], "src": "270:0:67" }, - "scope": 51668, + "scope": 51759, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51667, + "id": 51758, "nodeType": "FunctionDefinition", "src": "300:158:67", "nodes": [], "body": { - "id": 51666, + "id": 51757, "nodeType": "Block", "src": "327:131:67", "nodes": [], @@ -2516,14 +2516,14 @@ { "arguments": [ { - "id": 51639, + "id": 51730, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": -28, "src": "355:4:67", "typeDescriptions": { - "typeIdentifier": "t_contract$_TestSinglePool_$51668", + "typeIdentifier": "t_contract$_TestSinglePool_$51759", "typeString": "contract TestSinglePool" } } @@ -2531,11 +2531,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_TestSinglePool_$51668", + "typeIdentifier": "t_contract$_TestSinglePool_$51759", "typeString": "contract TestSinglePool" } ], - "id": 51638, + "id": 51729, "isConstant": false, "isLValue": false, "isPure": true, @@ -2547,14 +2547,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51637, + "id": 51728, "name": "address", "nodeType": "ElementaryTypeName", "src": "347:7:67", "typeDescriptions": {} } }, - "id": 51640, + "id": 51731, "isConstant": false, "isLValue": false, "isPure": false, @@ -2575,14 +2575,14 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 51645, + "id": 51736, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "hexValue": "31", - "id": 51641, + "id": 51732, "isConstant": false, "isLValue": false, "isPure": true, @@ -2603,14 +2603,14 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 51644, + "id": 51735, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 51642, + "id": 51733, "isConstant": false, "isLValue": false, "isPure": true, @@ -2628,7 +2628,7 @@ "operator": "**", "rightExpression": { "hexValue": "3138", - "id": 51643, + "id": 51734, "isConstant": false, "isLValue": false, "isPure": true, @@ -2667,7 +2667,7 @@ } ], "expression": { - "id": 51634, + "id": 51725, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2678,7 +2678,7 @@ "typeString": "contract MockERC20" } }, - "id": 51636, + "id": 51727, "isConstant": false, "isLValue": false, "isPure": false, @@ -2693,7 +2693,7 @@ "typeString": "function (address,uint256) external" } }, - "id": 51646, + "id": 51737, "isConstant": false, "isLValue": false, "isPure": false, @@ -2709,23 +2709,23 @@ "typeString": "tuple()" } }, - "id": 51647, + "id": 51738, "nodeType": "ExpressionStatement", "src": "337:36:67" }, { "assignments": [ - 51649 + 51740 ], "declarations": [ { "constant": false, - "id": 51649, + "id": 51740, "mutability": "mutable", "name": "usd", "nameLocation": "391:3:67", "nodeType": "VariableDeclaration", - "scope": 51666, + "scope": 51757, "src": "383:11:67", "stateVariable": false, "storageLocation": "default", @@ -2734,7 +2734,7 @@ "typeString": "uint256" }, "typeName": { - "id": 51648, + "id": 51739, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "383:7:67", @@ -2746,11 +2746,11 @@ "visibility": "internal" } ], - "id": 51659, + "id": 51750, "initialValue": { "arguments": [ { - "id": 51651, + "id": 51742, "name": "COIN", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2762,7 +2762,7 @@ } }, { - "id": 51652, + "id": 51743, "name": "USD", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2778,14 +2778,14 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 51657, + "id": 51748, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "hexValue": "31", - "id": 51653, + "id": 51744, "isConstant": false, "isLValue": false, "isPure": true, @@ -2806,14 +2806,14 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 51656, + "id": 51747, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "hexValue": "3130", - "id": 51654, + "id": 51745, "isConstant": false, "isLValue": false, "isPure": true, @@ -2831,7 +2831,7 @@ "operator": "**", "rightExpression": { "hexValue": "3138", - "id": 51655, + "id": 51746, "isConstant": false, "isLValue": false, "isPure": true, @@ -2873,7 +2873,7 @@ "typeString": "int_const 1000000000000000000" } ], - "id": 51650, + "id": 51741, "name": "swap", "nodeType": "Identifier", "overloadedDeclarations": [ @@ -2887,7 +2887,7 @@ "typeString": "function (contract MockERC20,contract MockERC20,uint256) returns (uint256)" } }, - "id": 51658, + "id": 51749, "isConstant": false, "isLValue": false, "isPure": false, @@ -2910,11 +2910,11 @@ "expression": { "arguments": [ { - "id": 51663, + "id": 51754, "name": "usd", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51649, + "referencedDeclaration": 51740, "src": "447:3:67", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2930,7 +2930,7 @@ } ], "expression": { - "id": 51660, + "id": 51751, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2941,7 +2941,7 @@ "typeString": "type(library console2)" } }, - "id": 51662, + "id": 51753, "isConstant": false, "isLValue": false, "isPure": false, @@ -2956,7 +2956,7 @@ "typeString": "function (uint256) pure" } }, - "id": 51664, + "id": 51755, "isConstant": false, "isLValue": false, "isPure": false, @@ -2972,7 +2972,7 @@ "typeString": "tuple()" } }, - "id": 51665, + "id": 51756, "nodeType": "ExpressionStatement", "src": "434:17:67" } @@ -2985,18 +2985,18 @@ "name": "testSwap", "nameLocation": "309:8:67", "parameters": { - "id": 51632, + "id": 51723, "nodeType": "ParameterList", "parameters": [], "src": "317:2:67" }, "returnParameters": { - "id": 51633, + "id": 51724, "nodeType": "ParameterList", "parameters": [], "src": "327:0:67" }, - "scope": 51668, + "scope": 51759, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" @@ -3006,7 +3006,7 @@ "baseContracts": [ { "baseName": { - "id": 51621, + "id": 51712, "name": "MockEnv", "nameLocations": [ "226:7:67" @@ -3015,13 +3015,13 @@ "referencedDeclaration": 50069, "src": "226:7:67" }, - "id": 51622, + "id": 51713, "nodeType": "InheritanceSpecifier", "src": "226:7:67" }, { "baseName": { - "id": 51623, + "id": 51714, "name": "Test", "nameLocations": [ "235:4:67" @@ -3030,7 +3030,7 @@ "referencedDeclaration": 11937, "src": "235:4:67" }, - "id": 51624, + "id": 51715, "nodeType": "InheritanceSpecifier", "src": "235:4:67" } @@ -3045,7 +3045,7 @@ "21582": 1 }, "linearizedBaseContracts": [ - 51668, + 51759, 11937, 2357, 2354, @@ -3060,7 +3060,7 @@ ], "name": "TestSinglePool", "nameLocation": "208:14:67", - "scope": 51669, + "scope": 51760, "usedErrors": [], "usedEvents": [ 5, diff --git a/deployment/alpha/out/TestVault.sol/TestVault.json b/deployment/alpha/out/TestVault.sol/TestVault.json index d157956..50d3eba 100644 --- a/deployment/alpha/out/TestVault.sol/TestVault.json +++ b/deployment/alpha/out/TestVault.sol/TestVault.json @@ -1595,7 +1595,7 @@ }, "ast": { "absolutePath": "test/TestVault.sol", - "id": 51780, + "id": 51871, "exportedSymbols": { "Constants": [ 46264 @@ -1703,7 +1703,7 @@ 2357 ], "TestVault": [ - 51779 + 51870 ], "TransferHelper": [ 46063 @@ -1749,7 +1749,7 @@ "src": "39:796:68", "nodes": [ { - "id": 51670, + "id": 51761, "nodeType": "PragmaDirective", "src": "39:24:68", "nodes": [], @@ -1761,59 +1761,59 @@ ] }, { - "id": 51671, + "id": 51762, "nodeType": "ImportDirective", "src": "91:32:68", "nodes": [], "absolutePath": "lib/forge-std/src/console2.sol", "file": "forge-std/console2.sol", "nameLocation": "-1:-1:-1", - "scope": 51780, + "scope": 51871, "sourceUnit": 29654, "symbolAliases": [], "unitAlias": "" }, { - "id": 51672, + "id": 51763, "nodeType": "ImportDirective", "src": "124:28:68", "nodes": [], "absolutePath": "src/Factory.sol", "file": "../src/Factory.sol", "nameLocation": "-1:-1:-1", - "scope": 51780, + "scope": 51871, "sourceUnit": 46431, "symbolAliases": [], "unitAlias": "" }, { - "id": 51673, + "id": 51764, "nodeType": "ImportDirective", "src": "153:33:68", "nodes": [], "absolutePath": "src/VaultAddress.sol", "file": "../src/VaultAddress.sol", "nameLocation": "-1:-1:-1", - "scope": 51780, + "scope": 51871, "sourceUnit": 49318, "symbolAliases": [], "unitAlias": "" }, { - "id": 51674, + "id": 51765, "nodeType": "ImportDirective", "src": "187:28:68", "nodes": [], "absolutePath": "lib/forge-std/src/Test.sol", "file": "forge-std/Test.sol", "nameLocation": "-1:-1:-1", - "scope": 51780, + "scope": 51871, "sourceUnit": 11938, "symbolAliases": [], "unitAlias": "" }, { - "id": 51675, + "id": 51766, "nodeType": "PragmaDirective", "src": "216:19:68", "nodes": [], @@ -1823,12 +1823,12 @@ ] }, { - "id": 51779, + "id": 51870, "nodeType": "ContractDefinition", "src": "237:597:68", "nodes": [ { - "id": 51680, + "id": 51771, "nodeType": "VariableDeclaration", "src": "271:22:68", "nodes": [], @@ -1837,7 +1837,7 @@ "mutability": "mutable", "name": "factory", "nameLocation": "286:7:68", - "scope": 51779, + "scope": 51870, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1845,10 +1845,10 @@ "typeString": "contract Factory" }, "typeName": { - "id": 51679, + "id": 51770, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51678, + "id": 51769, "name": "Factory", "nameLocations": [ "271:7:68" @@ -1867,7 +1867,7 @@ "visibility": "public" }, { - "id": 51683, + "id": 51774, "nodeType": "VariableDeclaration", "src": "299:18:68", "nodes": [], @@ -1876,7 +1876,7 @@ "mutability": "mutable", "name": "vault", "nameLocation": "312:5:68", - "scope": 51779, + "scope": 51870, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1884,10 +1884,10 @@ "typeString": "contract Vault" }, "typeName": { - "id": 51682, + "id": 51773, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51681, + "id": 51772, "name": "Vault", "nameLocations": [ "299:5:68" @@ -1906,29 +1906,29 @@ "visibility": "public" }, { - "id": 51736, + "id": 51827, "nodeType": "FunctionDefinition", "src": "324:265:68", "nodes": [], "body": { - "id": 51735, + "id": 51826, "nodeType": "Block", "src": "348:241:68", "nodes": [], "statements": [ { "expression": { - "id": 51691, + "id": 51782, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 51686, + "id": 51777, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51680, + "referencedDeclaration": 51771, "src": "358:7:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", @@ -1941,7 +1941,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 51689, + "id": 51780, "isConstant": false, "isLValue": false, "isPure": false, @@ -1953,10 +1953,10 @@ "typeString": "function () returns (contract Factory)" }, "typeName": { - "id": 51688, + "id": 51779, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 51687, + "id": 51778, "name": "Factory", "nameLocations": [ "372:7:68" @@ -1973,7 +1973,7 @@ } } }, - "id": 51690, + "id": 51781, "isConstant": false, "isLValue": false, "isPure": false, @@ -1995,7 +1995,7 @@ "typeString": "contract Factory" } }, - "id": 51692, + "id": 51783, "nodeType": "ExpressionStatement", "src": "358:23:68" }, @@ -2004,7 +2004,7 @@ "arguments": [ { "hexValue": "666163746f7279", - "id": 51696, + "id": 51787, "isConstant": false, "isLValue": false, "isPure": true, @@ -2027,7 +2027,7 @@ } ], "expression": { - "id": 51693, + "id": 51784, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2038,7 +2038,7 @@ "typeString": "type(library console2)" } }, - "id": 51695, + "id": 51786, "isConstant": false, "isLValue": false, "isPure": false, @@ -2053,7 +2053,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51697, + "id": 51788, "isConstant": false, "isLValue": false, "isPure": false, @@ -2069,7 +2069,7 @@ "typeString": "tuple()" } }, - "id": 51698, + "id": 51789, "nodeType": "ExpressionStatement", "src": "391:23:68" }, @@ -2079,11 +2079,11 @@ { "arguments": [ { - "id": 51704, + "id": 51795, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51680, + "referencedDeclaration": 51771, "src": "445:7:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", @@ -2098,7 +2098,7 @@ "typeString": "contract Factory" } ], - "id": 51703, + "id": 51794, "isConstant": false, "isLValue": false, "isPure": true, @@ -2110,14 +2110,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51702, + "id": 51793, "name": "address", "nodeType": "ElementaryTypeName", "src": "437:7:68", "typeDescriptions": {} } }, - "id": 51705, + "id": 51796, "isConstant": false, "isLValue": false, "isPure": false, @@ -2142,7 +2142,7 @@ } ], "expression": { - "id": 51699, + "id": 51790, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2153,7 +2153,7 @@ "typeString": "type(library console2)" } }, - "id": 51701, + "id": 51792, "isConstant": false, "isLValue": false, "isPure": false, @@ -2168,7 +2168,7 @@ "typeString": "function (address) pure" } }, - "id": 51706, + "id": 51797, "isConstant": false, "isLValue": false, "isPure": false, @@ -2184,23 +2184,23 @@ "typeString": "tuple()" } }, - "id": 51707, + "id": 51798, "nodeType": "ExpressionStatement", "src": "424:30:68" }, { "expression": { - "id": 51718, + "id": 51809, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 51708, + "id": 51799, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51683, + "referencedDeclaration": 51774, "src": "464:5:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -2216,14 +2216,14 @@ { "arguments": [ { - "id": 51714, + "id": 51805, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": -28, "src": "506:4:68", "typeDescriptions": { - "typeIdentifier": "t_contract$_TestVault_$51779", + "typeIdentifier": "t_contract$_TestVault_$51870", "typeString": "contract TestVault" } } @@ -2231,11 +2231,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_TestVault_$51779", + "typeIdentifier": "t_contract$_TestVault_$51870", "typeString": "contract TestVault" } ], - "id": 51713, + "id": 51804, "isConstant": false, "isLValue": false, "isPure": true, @@ -2247,14 +2247,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51712, + "id": 51803, "name": "address", "nodeType": "ElementaryTypeName", "src": "498:7:68", "typeDescriptions": {} } }, - "id": 51715, + "id": 51806, "isConstant": false, "isLValue": false, "isPure": false, @@ -2279,18 +2279,18 @@ } ], "expression": { - "id": 51710, + "id": 51801, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51680, + "referencedDeclaration": 51771, "src": "478:7:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", "typeString": "contract Factory" } }, - "id": 51711, + "id": 51802, "isConstant": false, "isLValue": false, "isPure": false, @@ -2305,7 +2305,7 @@ "typeString": "function (address) external returns (address payable)" } }, - "id": 51716, + "id": 51807, "isConstant": false, "isLValue": false, "isPure": false, @@ -2329,7 +2329,7 @@ "typeString": "address payable" } ], - "id": 51709, + "id": 51800, "name": "Vault", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2340,7 +2340,7 @@ "typeString": "type(contract Vault)" } }, - "id": 51717, + "id": 51808, "isConstant": false, "isLValue": false, "isPure": false, @@ -2362,7 +2362,7 @@ "typeString": "contract Vault" } }, - "id": 51719, + "id": 51810, "nodeType": "ExpressionStatement", "src": "464:49:68" }, @@ -2371,7 +2371,7 @@ "arguments": [ { "hexValue": "7661756c74", - "id": 51723, + "id": 51814, "isConstant": false, "isLValue": false, "isPure": true, @@ -2394,7 +2394,7 @@ } ], "expression": { - "id": 51720, + "id": 51811, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2405,7 +2405,7 @@ "typeString": "type(library console2)" } }, - "id": 51722, + "id": 51813, "isConstant": false, "isLValue": false, "isPure": false, @@ -2420,7 +2420,7 @@ "typeString": "function (string memory) pure" } }, - "id": 51724, + "id": 51815, "isConstant": false, "isLValue": false, "isPure": false, @@ -2436,7 +2436,7 @@ "typeString": "tuple()" } }, - "id": 51725, + "id": 51816, "nodeType": "ExpressionStatement", "src": "523:21:68" }, @@ -2446,11 +2446,11 @@ { "arguments": [ { - "id": 51731, + "id": 51822, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51683, + "referencedDeclaration": 51774, "src": "575:5:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -2465,7 +2465,7 @@ "typeString": "contract Vault" } ], - "id": 51730, + "id": 51821, "isConstant": false, "isLValue": false, "isPure": true, @@ -2477,14 +2477,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51729, + "id": 51820, "name": "address", "nodeType": "ElementaryTypeName", "src": "567:7:68", "typeDescriptions": {} } }, - "id": 51732, + "id": 51823, "isConstant": false, "isLValue": false, "isPure": false, @@ -2509,7 +2509,7 @@ } ], "expression": { - "id": 51726, + "id": 51817, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2520,7 +2520,7 @@ "typeString": "type(library console2)" } }, - "id": 51728, + "id": 51819, "isConstant": false, "isLValue": false, "isPure": false, @@ -2535,7 +2535,7 @@ "typeString": "function (address) pure" } }, - "id": 51733, + "id": 51824, "isConstant": false, "isLValue": false, "isPure": false, @@ -2551,7 +2551,7 @@ "typeString": "tuple()" } }, - "id": 51734, + "id": 51825, "nodeType": "ExpressionStatement", "src": "554:28:68" } @@ -2564,29 +2564,29 @@ "name": "setUp", "nameLocation": "333:5:68", "parameters": { - "id": 51684, + "id": 51775, "nodeType": "ParameterList", "parameters": [], "src": "338:2:68" }, "returnParameters": { - "id": 51685, + "id": 51776, "nodeType": "ParameterList", "parameters": [], "src": "348:0:68" }, - "scope": 51779, + "scope": 51870, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 51778, + "id": 51869, "nodeType": "FunctionDefinition", "src": "595:237:68", "nodes": [], "body": { - "id": 51777, + "id": 51868, "nodeType": "Block", "src": "643:189:68", "nodes": [], @@ -2597,11 +2597,11 @@ { "arguments": [ { - "id": 51744, + "id": 51835, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51683, + "referencedDeclaration": 51774, "src": "674:5:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -2616,7 +2616,7 @@ "typeString": "contract Vault" } ], - "id": 51743, + "id": 51834, "isConstant": false, "isLValue": false, "isPure": true, @@ -2628,14 +2628,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51742, + "id": 51833, "name": "address", "nodeType": "ElementaryTypeName", "src": "666:7:68", "typeDescriptions": {} } }, - "id": 51745, + "id": 51836, "isConstant": false, "isLValue": false, "isPure": false, @@ -2660,7 +2660,7 @@ } ], "expression": { - "id": 51739, + "id": 51830, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2671,7 +2671,7 @@ "typeString": "type(library console2)" } }, - "id": 51741, + "id": 51832, "isConstant": false, "isLValue": false, "isPure": false, @@ -2686,7 +2686,7 @@ "typeString": "function (address) pure" } }, - "id": 51746, + "id": 51837, "isConstant": false, "isLValue": false, "isPure": false, @@ -2702,23 +2702,23 @@ "typeString": "tuple()" } }, - "id": 51747, + "id": 51838, "nodeType": "ExpressionStatement", "src": "653:28:68" }, { "assignments": [ - 51749 + 51840 ], "declarations": [ { "constant": false, - "id": 51749, + "id": 51840, "mutability": "mutable", "name": "d", "nameLocation": "699:1:68", "nodeType": "VariableDeclaration", - "scope": 51777, + "scope": 51868, "src": "691:9:68", "stateVariable": false, "storageLocation": "default", @@ -2727,7 +2727,7 @@ "typeString": "address" }, "typeName": { - "id": 51748, + "id": 51839, "name": "address", "nodeType": "ElementaryTypeName", "src": "691:7:68", @@ -2740,17 +2740,17 @@ "visibility": "internal" } ], - "id": 51761, + "id": 51852, "initialValue": { "arguments": [ { "arguments": [ { - "id": 51754, + "id": 51845, "name": "factory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51680, + "referencedDeclaration": 51771, "src": "739:7:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Factory_$46430", @@ -2765,7 +2765,7 @@ "typeString": "contract Factory" } ], - "id": 51753, + "id": 51844, "isConstant": false, "isLValue": false, "isPure": true, @@ -2777,14 +2777,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51752, + "id": 51843, "name": "address", "nodeType": "ElementaryTypeName", "src": "731:7:68", "typeDescriptions": {} } }, - "id": 51755, + "id": 51846, "isConstant": false, "isLValue": false, "isPure": false, @@ -2803,14 +2803,14 @@ { "arguments": [ { - "id": 51758, + "id": 51849, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": -28, "src": "757:4:68", "typeDescriptions": { - "typeIdentifier": "t_contract$_TestVault_$51779", + "typeIdentifier": "t_contract$_TestVault_$51870", "typeString": "contract TestVault" } } @@ -2818,11 +2818,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_TestVault_$51779", + "typeIdentifier": "t_contract$_TestVault_$51870", "typeString": "contract TestVault" } ], - "id": 51757, + "id": 51848, "isConstant": false, "isLValue": false, "isPure": true, @@ -2834,14 +2834,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51756, + "id": 51847, "name": "address", "nodeType": "ElementaryTypeName", "src": "749:7:68", "typeDescriptions": {} } }, - "id": 51759, + "id": 51850, "isConstant": false, "isLValue": false, "isPure": false, @@ -2870,7 +2870,7 @@ } ], "expression": { - "id": 51750, + "id": 51841, "name": "VaultAddress", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2881,7 +2881,7 @@ "typeString": "type(library VaultAddress)" } }, - "id": 51751, + "id": 51842, "isConstant": false, "isLValue": false, "isPure": false, @@ -2896,7 +2896,7 @@ "typeString": "function (address,address) pure returns (address)" } }, - "id": 51760, + "id": 51851, "isConstant": false, "isLValue": false, "isPure": false, @@ -2919,11 +2919,11 @@ "expression": { "arguments": [ { - "id": 51765, + "id": 51856, "name": "d", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51749, + "referencedDeclaration": 51840, "src": "786:1:68", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2939,7 +2939,7 @@ } ], "expression": { - "id": 51762, + "id": 51853, "name": "console2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2950,7 +2950,7 @@ "typeString": "type(library console2)" } }, - "id": 51764, + "id": 51855, "isConstant": false, "isLValue": false, "isPure": false, @@ -2965,7 +2965,7 @@ "typeString": "function (address) pure" } }, - "id": 51766, + "id": 51857, "isConstant": false, "isLValue": false, "isPure": false, @@ -2981,7 +2981,7 @@ "typeString": "tuple()" } }, - "id": 51767, + "id": 51858, "nodeType": "ExpressionStatement", "src": "773:15:68" }, @@ -2993,7 +2993,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 51774, + "id": 51865, "isConstant": false, "isLValue": false, "isPure": false, @@ -3001,11 +3001,11 @@ "leftExpression": { "arguments": [ { - "id": 51771, + "id": 51862, "name": "vault", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51683, + "referencedDeclaration": 51774, "src": "813:5:68", "typeDescriptions": { "typeIdentifier": "t_contract$_Vault_$49181", @@ -3020,7 +3020,7 @@ "typeString": "contract Vault" } ], - "id": 51770, + "id": 51861, "isConstant": false, "isLValue": false, "isPure": true, @@ -3032,14 +3032,14 @@ "typeString": "type(address)" }, "typeName": { - "id": 51769, + "id": 51860, "name": "address", "nodeType": "ElementaryTypeName", "src": "805:7:68", "typeDescriptions": {} } }, - "id": 51772, + "id": 51863, "isConstant": false, "isLValue": false, "isPure": false, @@ -3058,11 +3058,11 @@ "nodeType": "BinaryOperation", "operator": "==", "rightExpression": { - "id": 51773, + "id": 51864, "name": "d", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 51749, + "referencedDeclaration": 51840, "src": "823:1:68", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3083,7 +3083,7 @@ "typeString": "bool" } ], - "id": 51768, + "id": 51859, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -3094,7 +3094,7 @@ "typeString": "function (bool) pure" } }, - "id": 51775, + "id": 51866, "isConstant": false, "isLValue": false, "isPure": false, @@ -3110,7 +3110,7 @@ "typeString": "tuple()" } }, - "id": 51776, + "id": 51867, "nodeType": "ExpressionStatement", "src": "798:27:68" } @@ -3123,18 +3123,18 @@ "name": "testDeterministicAddress", "nameLocation": "604:24:68", "parameters": { - "id": 51737, + "id": 51828, "nodeType": "ParameterList", "parameters": [], "src": "628:2:68" }, "returnParameters": { - "id": 51738, + "id": 51829, "nodeType": "ParameterList", "parameters": [], "src": "643:0:68" }, - "scope": 51779, + "scope": 51870, "stateMutability": "view", "virtual": false, "visibility": "public" @@ -3144,7 +3144,7 @@ "baseContracts": [ { "baseName": { - "id": 51676, + "id": 51767, "name": "Test", "nameLocations": [ "259:4:68" @@ -3153,7 +3153,7 @@ "referencedDeclaration": 11937, "src": "259:4:68" }, - "id": 51677, + "id": 51768, "nodeType": "InheritanceSpecifier", "src": "259:4:68" } @@ -3168,7 +3168,7 @@ "21582": 1 }, "linearizedBaseContracts": [ - 51779, + 51870, 11937, 2357, 2354, @@ -3182,7 +3182,7 @@ ], "name": "TestVault", "nameLocation": "246:9:68", - "scope": 51780, + "scope": 51871, "usedErrors": [], "usedEvents": [ 5,