diff --git a/crates/test_fixtures/abis/RaindexV6SubParser.json b/crates/test_fixtures/abis/RaindexV6SubParser.json index 7763b2e760..7202fc3a8d 100644 --- a/crates/test_fixtures/abis/RaindexV6SubParser.json +++ b/crates/test_fixtures/abis/RaindexV6SubParser.json @@ -258,7 +258,7 @@ } ], "bytecode": { - "object": "0x6080604052348015600e575f80fd5b506125d38061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122ad565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612309565b6100ce6100c936600461232f565b610bc5565b60405161009d939291906123d9565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461232f565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612436565b6101f1906002612436565b6101fc906001612436565b610207906001612436565b6001600160401b0381111561021e5761021e61231b565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122a381526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a38152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612455565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a38152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a381526020019060019003908161045c579050509050611745815f8151811061048957610489612455565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612455565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612455565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612455565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610591579050509050611793815f815181106105be576105be612455565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612455565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612455565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612455565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612455565b602002602001018190525085886001815181106107a0576107a0612455565b602002602001018190525084886002815181106107bf576107bf612455565b602002602001018190525083886003815181106107de576107de612455565b602002602001018190525082886004815181106107fd576107fd612455565b6020026020010181905250818860058151811061081c5761081c612455565b6020026020010181905250808860068151811061083b5761083b612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a381526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612455565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612455565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612455565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612455565b6001600160401b039092166020928302919091019091015280896109be60066001612436565b815181106109ce576109ce612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a38152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612455565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612455565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612455565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612455565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612455565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612455565b6001600160401b0390921660209283029190910190910152808a610b8860066002612436565b81518110610b9857610b98612455565b602090810291909101015289610bb5610bb082611855565b6118b7565b9b50505050505050505050505090565b5f6060805f805f610be587610bd8611946565b610be0611966565b611986565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612436565b90505f610c2e83836f07fffffe0000000003ff200000000000611a77565b80925081945050505f80610c4786610240015184611b13565b915091508115610cdc575f610c5c8783611bea565b90506122a35f610c6a611c19565b90505f60028251610c7b919061247d565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612436565b610d5b906002612436565b610d66906001612436565b610d71906001612436565b6001600160401b03811115610d8857610d8861231b565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122a3815260200190600190039081610dd7579050509050611c39815f81518110610e0457610e04612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610e3a57610e3a612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a3815260200190600190039081610e6a579050509050611c39815f81518110610e9757610e97612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610ecd57610ecd612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600281518110610f0357610f03612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a3815260200190600190039081610f33579050509050611c39815f81518110610f6057610f60612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610f9657610f96612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610fc6579050509050611c39815f81518110610ff357610ff3612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061102957611029612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061105f5761105f612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061109557611095612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106110cb576110cb612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a38152602001906001900390816110fb579050509050611c39815f8151811061112857611128612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061115e5761115e612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061119457611194612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816003815181106111ca576111ca612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061120057611200612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161122f579050509050611c62815f8151811061125c5761125c612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161128b579050509050611cfe815f815181106112b8576112b8612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612455565b6020026020010181905250858860018151811061130a5761130a612455565b6020026020010181905250848860028151811061132957611329612455565b6020026020010181905250838860038151811061134857611348612455565b6020026020010181905250828860048151811061136757611367612455565b6020026020010181905250818860058151811061138657611386612455565b602002602001018190525080886006815181106113a5576113a5612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a38152602001906001900390816113c7579050509050611c39815f815181106113f4576113f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061142a5761142a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061146057611460612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061149657611496612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106114cc576114cc612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061150257611502612455565b6001600160401b0390921660209283029190910190910152808961152860066001612436565b8151811061153857611538612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a381526020019060019003908161155b579050509050611c39815f8151811061158857611588612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816001815181106115be576115be612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816002815181106115f4576115f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061162a5761162a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061166057611660612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061169657611696612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600681518110610b6257610b62612455565b5f6060806116da5f80611db6565b92509250925093509350939050565b5f6060806116da5f6001611db6565b5f6060806116da60015f611db6565b5f6060806116da600180611db6565b5f6060806116da60016002611db6565b5f6060806116da60025f611db6565b5f6060806116da60026001611db6565b5f6060806116da60035f611db6565b5f6060806116da60036001611db6565b5f6060806116da60036002611db6565b5f6060806116da600380611db6565b5f6060806116da60036004611db6565b5f6060806116da60045f611db6565b5f6060806116da60046001611db6565b5f6060806116da60046002611db6565b5f6060806116da60046003611db6565b5f6060806116da600480611db6565b5f6060806116da600585611db6565b5f60608060ff80851690600886901c1661181461180e836006612436565b82611db6565b945094509450505093509350939050565b5f6060806116da60016003611db6565b5f6060806116da60016004611db6565b5f6060806116da60016005611db6565b60605f61186183611e38565b9050606060405190506020820260200181016040528181526020840160208551028101602083015b818310156118ac57602083515102806020855101835e6020939093019201611889565b509195945050505050565b60605f82516002026001600160401b038111156118d6576118d661231b565b6040519080825280601f01601f191660200182016040528015611900576020820181803683370190505b50905061ffff80196020850160208651028101600285015b8183101561193a57805183518616908516178152602090920191600201611918565b50939695505050505050565b60606040518060e0016040528060a281526020016124f160a29139905090565b606060405180606001604052806040815260200161259360409139905090565b5f80611a156040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a6187878760405180602001604052805f815250611e66565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a8e5780611a91565b60205b915050875192505b8519600184841a1b16158183101615611ab757600182019150611a99565b9681019660208290036008810293841c90931b92611b025760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612309565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611bd85760018301516021909301805190935f90819060ff168180611b5d838e612017565b915091508186165f03611b7f575f809b509b5050505050505050505050611be3565b5f87611b8f600185038916612042565b016004028b015195505062ffffff9081169350841683039150611bc39050575060019750601c1a9550611be3945050505050565b611bcc83612042565b84019350505050611b34565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611c109083565b95945050505050565b60606040518060600160405280604081526020016124b160409139905090565b5f81515f14611c5b576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611cbf575060208101516001600160e01b038116601b0b60e082901d5f611c908383836120fb565b905061ffff811115611cb557604051631e4e01d760e21b815260040160405180910390fd5b9250611cf9915050565b81515f03611ce057604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d9357602082015160408301516001600160e01b038216601b0b60e083901d5f611d308383836120fb565b6001600160e01b038516601b0b935060e085901d925090505f611d548484836120fb565b905060ff821180611d65575060ff81115b15611d8357604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cf99350505050565b600282511015611ce057604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611dc9575060ff84115b15611df157604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b5f60208201602083510281015b80821015611e5f5781515183019250602082019150611e45565b5050919050565b611ef36040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f7857611f7861231b565b604051908082528060200260200182016040528015611fa1578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611c10565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611be3575060019250929050565b5f5f1982036120545750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f61210986868661213d565b91509150806121345760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f805f85121561216a57604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f0361217c57505f90506001611b0b565b8460ff84168501858112156121ae5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f8312156121fa57604c198312156121d1575f809550955050505050611b0b565b825f03600a0a91508184816121e8576121e8612469565b0495505084029091149150611b0b9050565b5f83131561229357604d8313156122375760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f198161224d5761224d612469565b048411156122815760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611b0b9050565b8360019550955050505050611b0b565b6122ab61249c565b565b5f602082840312156122bd575f80fd5b81356001600160e01b0319811681146122d4575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6122d460208301846122db565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561233f575f80fd5b81356001600160401b0380821115612355575f80fd5b818401915084601f830112612368575f80fd5b81358181111561237a5761237a61231b565b604051601f8201601f19908116603f011681019083821181831017156123a2576123a261231b565b816040528281528760208487010111156123ba575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526123f560608401866122db565b8381036040850152845180825260208087019201905f5b818110156124285783518352928401929184019160010161240c565b509098975050505050505050565b808201808211156101d157634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f8261249757634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52605160045260245ffdfe16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f147185655891c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c621cfe1c391c391c391c391c391c391c391c391c391c391c391c391c39", + "object": "0x6080604052348015600e575f80fd5b5061262e8061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122e9565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612345565b6100ce6100c936600461236b565b610bc5565b60405161009d93929190612415565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461236b565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612486565b6101f1906002612486565b6101fc906001612486565b610207906001612486565b6001600160401b0381111561021e5761021e612357565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122df81526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df8152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612499565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df8152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df81526020019060019003908161045c579050509050611745815f8151811061048957610489612499565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612499565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612499565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612499565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610591579050509050611793815f815181106105be576105be612499565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612499565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612499565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612499565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612499565b602002602001018190525085886001815181106107a0576107a0612499565b602002602001018190525084886002815181106107bf576107bf612499565b602002602001018190525083886003815181106107de576107de612499565b602002602001018190525082886004815181106107fd576107fd612499565b6020026020010181905250818860058151811061081c5761081c612499565b6020026020010181905250808860068151811061083b5761083b612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df81526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612499565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612499565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612499565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612499565b6001600160401b039092166020928302919091019091015280896109be60066001612486565b815181106109ce576109ce612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df8152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612499565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612499565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612499565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612499565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612499565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612499565b6001600160401b0390921660209283029190910190910152808a610b8860066002612486565b81518110610b9857610b98612499565b602090810291909101015289610bb5610bb082611855565b61186a565b9b50505050505050505050505090565b5f6060805f805f610be587610bd86118f9565b610be0611919565b611939565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612486565b90505f610c2e83836f07fffffe0000000003ff200000000000611a2a565b80925081945050505f80610c4786610240015184611ac6565b915091508115610cdc575f610c5c8783611b9d565b90506122df5f610c6a611bcc565b90505f60028251610c7b91906124c1565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612486565b610d5b906002612486565b610d66906001612486565b610d71906001612486565b6001600160401b03811115610d8857610d88612357565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122df815260200190600190039081610dd7579050509050611bec815f81518110610e0457610e04612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610e3a57610e3a612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df815260200190600190039081610e6a579050509050611bec815f81518110610e9757610e97612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610ecd57610ecd612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600281518110610f0357610f03612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df815260200190600190039081610f33579050509050611bec815f81518110610f6057610f60612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610f9657610f96612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610fc6579050509050611bec815f81518110610ff357610ff3612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061102957611029612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061105f5761105f612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061109557611095612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106110cb576110cb612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df8152602001906001900390816110fb579050509050611bec815f8151811061112857611128612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061115e5761115e612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061119457611194612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816003815181106111ca576111ca612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061120057611200612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161122f579050509050611c15815f8151811061125c5761125c612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161128b579050509050611cb1815f815181106112b8576112b8612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612499565b6020026020010181905250858860018151811061130a5761130a612499565b6020026020010181905250848860028151811061132957611329612499565b6020026020010181905250838860038151811061134857611348612499565b6020026020010181905250828860048151811061136757611367612499565b6020026020010181905250818860058151811061138657611386612499565b602002602001018190525080886006815181106113a5576113a5612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df8152602001906001900390816113c7579050509050611bec815f815181106113f4576113f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061142a5761142a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061146057611460612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061149657611496612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106114cc576114cc612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061150257611502612499565b6001600160401b0390921660209283029190910190910152808961152860066001612486565b8151811061153857611538612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df81526020019060019003908161155b579050509050611bec815f8151811061158857611588612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816001815181106115be576115be612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816002815181106115f4576115f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061162a5761162a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061166057611660612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061169657611696612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600681518110610b6257610b62612499565b5f6060806116da5f80611d69565b92509250925093509350939050565b5f6060806116da5f6001611d69565b5f6060806116da60015f611d69565b5f6060806116da600180611d69565b5f6060806116da60016002611d69565b5f6060806116da60025f611d69565b5f6060806116da60026001611d69565b5f6060806116da60035f611d69565b5f6060806116da60036001611d69565b5f6060806116da60036002611d69565b5f6060806116da600380611d69565b5f6060806116da60036004611d69565b5f6060806116da60045f611d69565b5f6060806116da60046001611d69565b5f6060806116da60046002611d69565b5f6060806116da60046003611d69565b5f6060806116da600480611d69565b5f6060806116da600585611d69565b5f60608060ff80851690600886901c1661181461180e836006612486565b82611d69565b945094509450505093509350939050565b5f6060806116da60016003611d69565b5f6060806116da60016004611d69565b5f6060806116da60016005611d69565b6060815f61186282611deb565b949350505050565b60605f82516002026001600160401b0381111561188957611889612357565b6040519080825280601f01601f1916602001820160405280156118b3576020820181803683370190505b50905061ffff80196020850160208651028101600285015b818310156118ed578051835186169085161781526020909201916002016118cb565b50939695505050505050565b60606040518060e0016040528060a2815260200161258c60a29139905090565b606060405180606001604052806040815260200161250c60409139905090565b5f806119c86040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a1487878760405180602001604052805f815250611e59565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a415780611a44565b60205b915050875192505b8519600184841a1b16158183101615611a6a57600182019150611a4c565b9681019660208290036008810293841c90931b92611ab55760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612345565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611b8b5760018301516021909301805190935f90819060ff168180611b10838e61200a565b915091508186165f03611b32575f809b509b5050505050505050505050611b96565b5f87611b42600185038916612035565b016004028b015195505062ffffff9081169350841683039150611b769050575060019750601c1a9550611b96945050505050565b611b7f83612035565b84019350505050611ae7565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611bc39083565b95945050505050565b606060405180606001604052806040815260200161254c60409139905090565b5f81515f14611c0e576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611c72575060208101516001600160e01b038116601b0b60e082901d5f611c438383836120ee565b905061ffff811115611c6857604051631e4e01d760e21b815260040160405180910390fd5b9250611cac915050565b81515f03611c9357604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d4657602082015160408301516001600160e01b038216601b0b60e083901d5f611ce38383836120ee565b6001600160e01b038516601b0b935060e085901d925090505f611d078484836120ee565b905060ff821180611d18575060ff81115b15611d3657604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cac9350505050565b600282511015611c9357604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611d7c575060ff84115b15611da457604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b60605f611df783612130565b90505f611e058260206124e0565b9050606060405190508160200181016040528281526020850160208651028101602083015b81831015611e4d57602083515102806020855101835e6020939093019201611e2a565b50919695505050505050565b611ee66040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f6b57611f6b612357565b604051908082528060200260200182016040528015611f94578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611bc3565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611b96575060019250929050565b5f5f1982036120475750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f6120fc868686612179565b91509150806121275760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f60208201602083510281015b8082101561217257815151928301928084101561216657634e487b715f5260116020526024601cfd5b5060208201915061213d565b5050919050565b5f805f8512156121a657604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f036121b857505f90506001611abe565b8460ff84168501858112156121ea5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f83121561223657604c1983121561220d575f809550955050505050611abe565b825f03600a0a9150818481612224576122246124ad565b0495505084029091149150611abe9050565b5f8313156122cf57604d8313156122735760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f1981612289576122896124ad565b048411156122bd5760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611abe9050565b8360019550955050505050611abe565b6122e76124f7565b565b5f602082840312156122f9575f80fd5b81356001600160e01b031981168114612310575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6123106020830184612317565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561237b575f80fd5b81356001600160401b0380821115612391575f80fd5b818401915084601f8301126123a4575f80fd5b8135818111156123b6576123b6612357565b604051601f8201601f19908116603f011681019083821181831017156123de576123de612357565b816040528281528760208487010111156123f6575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526124316060840186612317565b8381036040850152845180825260208087019201905f5b8181101561246457835183529284019291840191600101612448565b509098975050505050505050565b634e487b7160e01b5f52601160045260245ffd5b808201808211156101d1576101d1612472565b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f826124db57634e487b7160e01b5f52601260045260245ffd5b500490565b80820281158282048414176101d1576101d1612472565b634e487b7160e01b5f52605160045260245ffdfe1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1c151cb11bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f14718565589", "linkReferences": {} } } diff --git a/flake.lock b/flake.lock index c8e3743aa6..d2fd1788ff 100644 --- a/flake.lock +++ b/flake.lock @@ -791,11 +791,11 @@ "rainix": "rainix" }, "locked": { - "lastModified": 1780132487, - "narHash": "sha256-hA/nbXGJTq96r25DupipA/qfBV6xEuEPFDjIEwHir/o=", + "lastModified": 1780414163, + "narHash": "sha256-b2INClNtYE2lupIGVFP2M3UEXMrk0GZk1rA6sZqMlrI=", "owner": "rainlanguage", "repo": "rain.cli", - "rev": "207d8f6b5be688ba91980e0d3bc36691a31e7982", + "rev": "24814702413a577987850634f55fde1f7788777c", "type": "github" }, "original": { @@ -814,11 +814,11 @@ "solc": "solc" }, "locked": { - "lastModified": 1780117808, - "narHash": "sha256-/4VDWb2VbD1ztmg8yJDnNklcP6YPMOXaNnVzWHczj4g=", + "lastModified": 1780287289, + "narHash": "sha256-eZ74zj6VwotSmT1kXImwA2yX0el0pZthcgNjg7j/AyQ=", "owner": "rainlanguage", "repo": "rainix", - "rev": "ae2b77d271cb0a99f60249ce91bb495bb948192b", + "rev": "f22d4dcaca61717e33eac65e7b09b9a82f604c1f", "type": "github" }, "original": { diff --git a/foundry.toml b/foundry.toml index bfa7b06b3b..b0b132f3c9 100644 --- a/foundry.toml +++ b/foundry.toml @@ -59,38 +59,6 @@ fs_permissions = [ remappings = [ # Custom remap so @openzeppelin packages' own internal imports resolve. "@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.6.1/", - # `rain-deploy` 0.1.8, and the `rain-sol-codegen` 0.1.36 it is built on, - # spell forge-std as `forge-std-1.16.2/`; `rainlang` 0.1.5 and - # `rain-interpreter-interface` 0.1.0 still spell it `forge-std-1.16.1/`. - # Soldeer installs ONE version per package name, so the older prefix is - # aliased onto the installed one. Not cosmetic: two forge-std copies in one - # compilation are two DISTINCT `Vm` types, and a `vm` handed from one library - # to another would not type check. - # - # These live here rather than in `remappings.txt` because `forge soldeer - # install` owns that file and regenerates it from the installed set. - "forge-std-1.16.1/=dependencies/forge-std-1.16.2/", - # Same, for `rain-sol-codegen`. `rain-deploy` 0.1.8 needs 0.1.36, while - # `rainlang` 0.1.5 and `rain-interpreter-interface` 0.1.0 import the - # `IParserToolingV1` / `ISubParserToolingV1` / `IOpcodeToolingV1` / - # `IIntegrityToolingV1` interfaces under the `rain-sol-codegen-0.1.0/` - # prefix. Those four interfaces are byte-identical between the two versions - # bar `pure` widening to `view` on three functions, which an implementation - # is free to narrow again, so nothing here moves any contract's bytecode. - "rain-sol-codegen-0.1.0/=dependencies/rain-sol-codegen-0.1.36/", - # Same, for `rain-deploy`. `rainlang` 0.1.5's committed test abstracts - # (`RainlangExpressionDeployerDeploymentTest`, reached from this repo's - # tests) import `rain-deploy-0.1.2/src/lib/LibRainDeploy.sol` for - # `etchZoltuFactory`/`deployZoltu`, which are unchanged in 0.1.8. Test-only: - # nothing under `src/` reaches rain-deploy, so no contract bytecode moves. - "rain-deploy-0.1.2/=dependencies/rain-deploy-0.1.8/", - # Same, for `rain-metadata`. `rainlang` 0.1.5's `BaseRainlangSubParser` - # imports `IDescribedByMetaV1` under the `rain-metadata-0.1.0/` prefix, and - # that interface file is byte-identical in 0.1.0 and 0.1.7, so the older - # prefix is aliased onto the installed one rather than installing a second - # copy — two copies would be two distinct `IDescribedByMetaV1` types and the - # subparser would not satisfy this repo's own interface checks. - "rain-metadata-0.1.0/=dependencies/rain-metadata-0.1.7/", ] [dependencies] @@ -98,26 +66,31 @@ forge-std = "1.16.2" "@openzeppelin-contracts" = "5.6.1" # rainlanguage/rain.interpreter was renamed to rainlanguage/rainlang; # its Soldeer registry name follows. -rainlang = "0.1.5" -rain-interpreter-interface = "0.1.0" +rainlang = "0.2.5" +# rainlanguage/rain.interpreter.interface was renamed to +# rainlanguage/rainlang.interface; its Soldeer registry name moved from +# `rain-interpreter-interface` (0.1.x) to `rainlang-interface` (0.2.x). +rainlang-interface = "0.2.8" # rainlanguage/rain.raindex.interface was renamed to # rainlanguage/raindex.interface; Soldeer registry name follows. -raindex-interface = "0.1.3" +raindex-interface = "0.1.6" rain-metadata = "0.1.7" # The MetaBoard split out of `rain.metadata` into its own deploy repo. The # deploy pin lives there now; `rain-metadata` keeps the interfaces and libs. rain-metadata-deploy = "0.1.1" rain-intorastring = "0.1.0" rain-sol-codegen = "0.1.36" -rain-solmem = "0.1.3" -rain-math-float = "0.1.1" +rain-solmem = "0.1.28" +rain-math-float = "0.2.1" +rain-math-float-deploy = "0.1.2" rain-tofu-erc20-decimals = "0.1.1" rain-deploy = "0.1.8" -rain-lib-typecast = "0.1.0" +rain-lib-typecast = "0.1.4" rain-lib-hash = "0.1.0" -rain-math-binary = "0.1.1" +rain-math-binary = "0.1.4" rain-string = "0.2.0" rain-lib-memkv = "0.1.0" +rain-extrospection = "0.1.14" [soldeer] recursive_deps = false diff --git a/remappings.txt b/remappings.txt index ef0e3397cf..99f0585ae6 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,18 +1,20 @@ @openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.6.1/ forge-std-1.16.2/=dependencies/forge-std-1.16.2/ rain-deploy-0.1.8/=dependencies/rain-deploy-0.1.8/ -rain-interpreter-interface-0.1.0/=dependencies/rain-interpreter-interface-0.1.0/ +rain-extrospection-0.1.14/=dependencies/rain-extrospection-0.1.14/ rain-intorastring-0.1.0/=dependencies/rain-intorastring-0.1.0/ rain-lib-hash-0.1.0/=dependencies/rain-lib-hash-0.1.0/ rain-lib-memkv-0.1.0/=dependencies/rain-lib-memkv-0.1.0/ -rain-lib-typecast-0.1.0/=dependencies/rain-lib-typecast-0.1.0/ -rain-math-binary-0.1.1/=dependencies/rain-math-binary-0.1.1/ -rain-math-float-0.1.1/=dependencies/rain-math-float-0.1.1/ +rain-lib-typecast-0.1.4/=dependencies/rain-lib-typecast-0.1.4/ +rain-math-binary-0.1.4/=dependencies/rain-math-binary-0.1.4/ +rain-math-float-0.2.1/=dependencies/rain-math-float-0.2.1/ +rain-math-float-deploy-0.1.2/=dependencies/rain-math-float-deploy-0.1.2/ rain-metadata-0.1.7/=dependencies/rain-metadata-0.1.7/ rain-metadata-deploy-0.1.1/=dependencies/rain-metadata-deploy-0.1.1/ rain-sol-codegen-0.1.36/=dependencies/rain-sol-codegen-0.1.36/ -rain-solmem-0.1.3/=dependencies/rain-solmem-0.1.3/ +rain-solmem-0.1.28/=dependencies/rain-solmem-0.1.28/ rain-string-0.2.0/=dependencies/rain-string-0.2.0/ rain-tofu-erc20-decimals-0.1.1/=dependencies/rain-tofu-erc20-decimals-0.1.1/ -raindex-interface-0.1.3/=dependencies/raindex-interface-0.1.3/ -rainlang-0.1.5/=dependencies/rainlang-0.1.5/ +raindex-interface-0.1.6/=dependencies/raindex-interface-0.1.6/ +rainlang-0.2.5/=dependencies/rainlang-0.2.5/ +rainlang-interface-0.2.8/=dependencies/rainlang-interface-0.2.8/ diff --git a/script/Build.sol b/script/Build.sol index 636d742de3..76672ec4d1 100644 --- a/script/Build.sol +++ b/script/Build.sol @@ -7,7 +7,7 @@ import {LibRainDeploySnapshot} from "rain-deploy-0.1.8/src/lib/LibRainDeploySnap import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibCodeGen} from "rain-sol-codegen-0.1.36/src/lib/LibCodeGen.sol"; import {LibFs} from "rain-sol-codegen-0.1.36/src/lib/LibFs.sol"; -import {LibGenParseMeta} from "rain-interpreter-interface-0.1.0/src/lib/codegen/LibGenParseMeta.sol"; +import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; import {DeployCandidate} from "../src/abstract/RainDeploySuitesBase.sol"; import {RaindexDeploySuites} from "../src/abstract/RaindexDeploySuites.sol"; import {RaindexV6SubParser} from "../src/concrete/parser/RaindexV6SubParser.sol"; diff --git a/script/SubgraphAbi.sol b/script/SubgraphAbi.sol index c667550261..b2757e87ac 100644 --- a/script/SubgraphAbi.sol +++ b/script/SubgraphAbi.sol @@ -6,4 +6,4 @@ pragma solidity =0.8.25; // only imports LibDecimalFloat (not the concrete contract), so forge would not // otherwise emit that ABI. Importing the concrete contract here forces forge to // compile it. -import {DecimalFloat} from "rain-math-float-0.1.1/src/concrete/DecimalFloat.sol"; +import {DecimalFloat} from "rain-math-float-deploy-0.1.2/src/concrete/DecimalFloat.sol"; diff --git a/soldeer.lock b/soldeer.lock index b2e2c22444..6d95cf79f1 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -20,11 +20,11 @@ checksum = "506d4b9acea5a06bd6d49442caa17075fd40a70c9662d26fbc6e79339e6e1dc4" integrity = "44375e425fed5e640711e47c9256aff7643566454870d940f9e831b502d940e5" [[dependencies]] -name = "rain-interpreter-interface" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-interpreter-interface/0_1_0_12-05-2026_18:43:02_rain.interpreter.zip" -checksum = "887c4d5f1a87713c49f015b3fcdb295defbb495b126d15f9850c0ce72ef79639" -integrity = "c1b89f8a7ad02507ceb051b6c0f2750f6abe1ba99ffdfe1c9ac93905db90e75d" +name = "rain-extrospection" +version = "0.1.14" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-extrospection/0_1_14_06-09-2026_09:00:43_rain.zip" +checksum = "a9f34937f66c48c8cd15a700ccebc56c25b6a8af32f0b8757fcfa92be8bbfb56" +integrity = "4fda4ce47b006de0619aba0591a00cece86454a5867643d99412bc57790cdce0" [[dependencies]] name = "rain-intorastring" @@ -49,24 +49,31 @@ integrity = "f2a63c0466c50cbfb3b3545094890c74dd1116b55fcb738bb631471252cee5b8" [[dependencies]] name = "rain-lib-typecast" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-lib-typecast/0_1_0_12-05-2026_16:31:39_rain.lib.zip" -checksum = "5c0419501e4c763ef161a3489934af192219f994cb2c9187699bc4dee0b4e2bb" -integrity = "092781f87fd9227c4c95aafde59300c503d6a9a355beaeb5c5732fe6e36676d6" +version = "0.1.4" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-lib-typecast/0_1_4_21-08-2026_15:46:41_rain.lib.zip" +checksum = "ce1339c0a06de699508247dc882c5aaf715ab4ae67d53336ae72ae88810f5540" +integrity = "eeb92ffe224186151d210137324a69e6154947bf987c18ea8b3233174291ce5c" [[dependencies]] name = "rain-math-binary" -version = "0.1.1" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-binary/0_1_1_09-05-2026_19:49:57_rain.math.zip" -checksum = "6f966e4f5f59103b62de2004005db508824622495b893a646d0e2a35511f0093" -integrity = "4cfaa11c0e48ac46824a10fec2184863d114f09c171544b721d782386708dca7" +version = "0.1.4" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-binary/0_1_4_17-08-2026_05:22:01_rain.math.zip" +checksum = "1787eb0bc883c4922deb5e547ecaf0bd0f9a31e99c51f3b11744c3324eb592f6" +integrity = "857d22060d058ec173e88448c2d44f0cb884b2381669d0dbe1d3bebb168715ea" [[dependencies]] name = "rain-math-float" -version = "0.1.1" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-float/0_1_1_13-05-2026_13:48:34_rain.math.zip" -checksum = "322956f272ae3073ee02b0e7301b8834f08f2de62bcd6c309c44e946d7cd7056" -integrity = "dccdd4406a37db6af690872b805084a7dbe5211c57961a61ef083a7912ddbdc9" +version = "0.2.1" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-float/0_2_1_08-09-2026_07:26:32_rain.math.zip" +checksum = "d9433a80d1a546b73e80ba3ccda6e2a88e2986222522a6526173a1a0d5d13bef" +integrity = "c24a336446be885b680026d4e7d937e6d4559997a2cb0ee385f4c9be95990d77" + +[[dependencies]] +name = "rain-math-float-deploy" +version = "0.1.2" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-float-deploy/0_1_2_09-09-2026_04:42:49_rain.math.float.zip" +checksum = "8aa5a1fd54d85cbaf51e23aad123b7ed85b3ae5df02d0785124cf27f5f4473df" +integrity = "0b67be7c1454da7b0560262fdd1aee7b41f2077c7ebbb8c4e96abc6920376363" [[dependencies]] name = "rain-metadata" @@ -91,10 +98,10 @@ integrity = "164e2655ac8b66bcf52c799421706d3dfaab987addaaeadd74574e70fd2eb6ed" [[dependencies]] name = "rain-solmem" -version = "0.1.3" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_3_09-05-2026_19:49:33_rain.zip" -checksum = "1d405bb81f7c9e56d1717de0d60da918d2fc2fa4db083efd2abe9906378d019f" -integrity = "e879d2743f9d884f647b9dd489889a83f2cea5f76eb69409a113e1baa69d3643" +version = "0.1.28" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_28_03-09-2026_07:34:16_rain.zip" +checksum = "3dafbef001edb181683a43c3c295e3f88e2ffcedd751e986562e71e29560c9f0" +integrity = "e7508cd81a998a67118a0fca314d504dc62850d6b535d29c824f696f214e4b23" [[dependencies]] name = "rain-string" @@ -112,14 +119,21 @@ integrity = "9e1fccf893dd0d90aeb445c78f9eee3904bc50287ff1da30b954508f18412cd2" [[dependencies]] name = "raindex-interface" -version = "0.1.3" -url = "https://soldeer-revisions.s3.amazonaws.com/raindex-interface/0_1_3_03-07-2026_11:20:58_raindex.zip" -checksum = "5c4149dc0898b5db4036f5cac04614b98f204c062c694477fecc0f870a96907c" -integrity = "5f69dc4e1234d15f27d74be29e287c8619c08cb354de9d8a3d30f42df13a0269" +version = "0.1.6" +url = "https://soldeer-revisions.s3.amazonaws.com/raindex-interface/0_1_6_13-09-2026_18:35:20_raindex.zip" +checksum = "85984a3c294d9900d6408e311a791124ae7b493ecb97ab3e64608a8de5cecb63" +integrity = "953366b6a668634c2e1255e3535d09e5aac36139c40fd03d0f539ca4b0d22d36" [[dependencies]] name = "rainlang" -version = "0.1.5" -url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_1_5_12-06-2026_16:58:07_rainlang.zip" -checksum = "44e723785db68393a7b5121484a0db7c2ebb7a6721977fd105f3bfff6e082516" -integrity = "413cab7b22e9513e9550ba54ddb2f30cfe35f0de704e1260649ed223ee1b3b67" +version = "0.2.5" +url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_5_13-09-2026_18:37:11_rainlang.zip" +checksum = "9fca74c3924a285f79fc705aaa6f554d1678d759019d650015bb7f2511d4c515" +integrity = "adb9ee16bd9a9061b682b358df6ae98c0003535b0b38ed8f0d4aad6d23126cad" + +[[dependencies]] +name = "rainlang-interface" +version = "0.2.8" +url = "https://soldeer-revisions.s3.amazonaws.com/rainlang-interface/0_2_8_06-09-2026_08:58:04_rainlang.zip" +checksum = "aae7d5721cdd21240f5dca7b1d6a861101431ead94db6def6a134932b54e7947" +integrity = "508259e321ecc0ad9b0ff1a8b0ac1e66a8858e599ce7328e06b6a4e7d3ae8889" diff --git a/src/abstract/RaindexDeploySuites.sol b/src/abstract/RaindexDeploySuites.sol index 52362c29b0..cc25f6d1f6 100644 --- a/src/abstract/RaindexDeploySuites.sol +++ b/src/abstract/RaindexDeploySuites.sol @@ -11,7 +11,7 @@ import {GenericPoolRaindexV6FlashBorrower} from "../concrete/arb/GenericPoolRain import {ROUTE_PROCESSOR_4_CREATION_CODE} from "../lib/deploy/LibRouteProcessor4CreationCode.sol"; import {LibRaindexDeploy} from "../lib/deploy/LibRaindexDeploy.sol"; import {LibReleasedSuites} from "../lib/LibReleasedSuites.sol"; -import {LibDecimalFloatDeploy} from "rain-math-float-0.1.1/src/lib/deploy/LibDecimalFloatDeploy.sol"; +import {LibDecimalFloatDeploy} from "rain-math-float-deploy-0.1.2/src/lib/deploy/LibDecimalFloatDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibMetaBoardDeploy} from "rain-metadata-deploy-0.1.1/src/lib/LibMetaBoardDeploy.sol"; import { diff --git a/src/abstract/RaindexV6ArbCommon.sol b/src/abstract/RaindexV6ArbCommon.sol index f1850bacef..1d03eca38c 100644 --- a/src/abstract/RaindexV6ArbCommon.sol +++ b/src/abstract/RaindexV6ArbCommon.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @param task The task to run as post for each arb. struct RaindexV6ArbConfig { diff --git a/src/abstract/RaindexV6ArbOrderTaker.sol b/src/abstract/RaindexV6ArbOrderTaker.sol index b84a2a923b..955d7137d0 100644 --- a/src/abstract/RaindexV6ArbOrderTaker.sol +++ b/src/abstract/RaindexV6ArbOrderTaker.sol @@ -5,13 +5,13 @@ pragma solidity ^0.8.19; import {ERC165, IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/ERC165.sol"; import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol"; import {IERC20, SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; -import {IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IRaindexV6ArbOrderTaker, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6ArbOrderTaker.sol"; -import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IRaindexV6ArbOrderTaker, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6ArbOrderTaker.sol"; +import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {RaindexV6ArbCommon} from "./RaindexV6ArbCommon.sol"; import {LibRaindexArb} from "../lib/LibRaindexArb.sol"; import {LibRaindexDeploy} from "../lib/deploy/LibRaindexDeploy.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; /// Thrown when `arb5` is called with a `raindex` that is not the trusted diff --git a/src/abstract/RaindexV6ArbTaskGated.sol b/src/abstract/RaindexV6ArbTaskGated.sol index 5d404fb1d1..73f1450d36 100644 --- a/src/abstract/RaindexV6ArbTaskGated.sol +++ b/src/abstract/RaindexV6ArbTaskGated.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.19; import {RaindexV6ArbCommon, RaindexV6ArbConfig, WrongTask} from "./RaindexV6ArbCommon.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @title RaindexV6ArbTaskGated /// @notice Mixin that adds task-hash gating to arb contracts. Stores a task diff --git a/src/abstract/RaindexV6FlashBorrower.sol b/src/abstract/RaindexV6FlashBorrower.sol index 7039772953..28b49e6837 100644 --- a/src/abstract/RaindexV6FlashBorrower.sol +++ b/src/abstract/RaindexV6FlashBorrower.sol @@ -6,14 +6,14 @@ import {ERC165, IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol"; -import {ON_FLASH_LOAN_CALLBACK_SUCCESS} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; -import {IRaindexV6, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +import {ON_FLASH_LOAN_CALLBACK_SUCCESS} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +import {IRaindexV6, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {RaindexV6ArbCommon} from "./RaindexV6ArbCommon.sol"; import {LibRaindexArb} from "../lib/LibRaindexArb.sol"; import {LibRaindexDeploy} from "../lib/deploy/LibRaindexDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// Thrown when the flash loan initiator is not this contract. /// @param badInitiator The untrusted initiator of the flash loan. diff --git a/src/abstract/RaindexV6FlashLender.sol b/src/abstract/RaindexV6FlashLender.sol index d31ad6992d..f6181f4d6c 100644 --- a/src/abstract/RaindexV6FlashLender.sol +++ b/src/abstract/RaindexV6FlashLender.sol @@ -9,8 +9,8 @@ import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; -import {IERC3156FlashLender} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashLender.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +import {IERC3156FlashLender} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashLender.sol"; /// Thrown when the `onFlashLoan` callback returns anything other than /// ON_FLASH_LOAN_CALLBACK_SUCCESS. diff --git a/src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol b/src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol index e3499c76fd..8206463ee3 100644 --- a/src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol +++ b/src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol @@ -7,7 +7,7 @@ import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; import {RaindexV6ArbOrderTaker, Float} from "../../abstract/RaindexV6ArbOrderTaker.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../lib/deploy/LibRaindexDeploy.sol"; diff --git a/src/concrete/parser/RaindexV6SubParser.sol b/src/concrete/parser/RaindexV6SubParser.sol index 49935d3a83..1e0f5e2300 100644 --- a/src/concrete/parser/RaindexV6SubParser.sol +++ b/src/concrete/parser/RaindexV6SubParser.sol @@ -7,9 +7,9 @@ import { BaseRainlangSubParser, OperandV2, IParserToolingV1 -} from "rainlang-0.1.5/src/abstract/BaseRainlangSubParser.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; -import {LibUint256Matrix} from "rain-solmem-0.1.3/src/lib/LibUint256Matrix.sol"; +} from "rainlang-0.2.5/src/abstract/BaseRainlangSubParser.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; +import {LibUint256Matrix} from "rain-solmem-0.1.28/src/lib/LibUint256Matrix.sol"; import { LibRaindexSubParser, @@ -35,7 +35,7 @@ import { CONTEXT_BASE_ROW_SENDER, CONTEXT_BASE_ROW_CALLING_CONTRACT, CONTEXT_BASE_ROWS -} from "rain-interpreter-interface-0.1.0/src/lib/caller/LibContext.sol"; +} from "rainlang-interface-0.2.8/src/lib/caller/LibContext.sol"; import { CONTEXT_COLUMNS_EXTENDED, CONTEXT_VAULT_OUTPUTS_COLUMN, @@ -69,7 +69,7 @@ import { OPERAND_HANDLER_FUNCTION_POINTERS as SUB_PARSER_OPERAND_HANDLERS } from "../../generated/RaindexV6SubParserPointers.sol"; import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; -import {ISubParserToolingV1} from "rain-sol-codegen-0.1.0/src/interface/ISubParserToolingV1.sol"; +import {ISubParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/ISubParserToolingV1.sol"; /// @title RaindexV6SubParser /// @notice Sub-parser that provides raindex-specific context words (sender, diff --git a/src/concrete/raindex/RaindexV6.sol b/src/concrete/raindex/RaindexV6.sol index 17bdf06fdc..2247fe59c4 100644 --- a/src/concrete/raindex/RaindexV6.sol +++ b/src/concrete/raindex/RaindexV6.sol @@ -9,24 +9,24 @@ import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibContext} from "rain-interpreter-interface-0.1.0/src/lib/caller/LibContext.sol"; -import {LibBytecode} from "rain-interpreter-interface-0.1.0/src/lib/bytecode/LibBytecode.sol"; -import {LibInterpreterStateDataContract} from "rainlang-0.1.5/src/lib/state/LibInterpreterStateDataContract.sol"; +import {LibContext} from "rainlang-interface-0.2.8/src/lib/caller/LibContext.sol"; +import {LibBytecode} from "rainlang-interface-0.2.8/src/lib/bytecode/LibBytecode.sol"; +import {LibInterpreterStateDataContract} from "rainlang-0.2.5/src/lib/state/LibInterpreterStateDataContract.sol"; import { SourceIndexV2, StateNamespace, IInterpreterV4, StackItem, EvalV4 -} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {LibUint256Array} from "rain-solmem-0.1.3/src/lib/LibUint256Array.sol"; -import {LibUint256Matrix} from "rain-solmem-0.1.3/src/lib/LibUint256Matrix.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibNamespace} from "rain-interpreter-interface-0.1.0/src/lib/ns/LibNamespace.sol"; +} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {LibUint256Array} from "rain-solmem-0.1.28/src/lib/LibUint256Array.sol"; +import {LibUint256Matrix} from "rain-solmem-0.1.28/src/lib/LibUint256Matrix.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibNamespace} from "rainlang-interface-0.2.8/src/lib/ns/LibNamespace.sol"; import {LibMeta} from "rain-metadata-0.1.7/src/lib/LibMeta.sol"; import {IMetaV1_2} from "rain-metadata-0.1.7/src/interface/unstable/IMetaV1_2.sol"; import {LibRaindex} from "../../lib/LibRaindex.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibTOFUTokenDecimals, TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {ITOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol"; @@ -46,8 +46,8 @@ import { QuoteV2, Float, IOV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; import {LibOrder} from "../../lib/LibOrder.sol"; import { CALLING_CONTEXT_COLUMNS, @@ -61,10 +61,10 @@ import { CONTEXT_VAULT_IO_VAULT_ID } from "../../lib/LibRaindex.sol"; import {RaindexV6FlashLender} from "../../abstract/RaindexV6FlashLender.sol"; -import {LibBytes32Array} from "rain-solmem-0.1.3/src/lib/LibBytes32Array.sol"; -import {LibBytes32Matrix} from "rain-solmem-0.1.3/src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Array} from "rain-solmem-0.1.28/src/lib/LibBytes32Array.sol"; +import {LibBytes32Matrix} from "rain-solmem-0.1.28/src/lib/LibBytes32Matrix.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; /// This will exist in a future version of Open Zeppelin if their main branch is /// to be believed. diff --git a/src/generated/RaindexV6SubParserPointers.sol b/src/generated/RaindexV6SubParserPointers.sol index e643fa1d97..2315bdd717 100644 --- a/src/generated/RaindexV6SubParserPointers.sol +++ b/src/generated/RaindexV6SubParserPointers.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.25; // THIS FILE IS AUTOGENERATED BY THE BUILD SCRIPT. DO NOT EDIT BY HAND. /// @dev Hash of the known bytecode. -bytes32 constant BYTECODE_HASH = bytes32(0x704aadc1ed56f63ff918ab219e6681a5d2851d774e2ee136bbe7904ea3b2fdcd); +bytes32 constant BYTECODE_HASH = bytes32(0xdd4c380fd24207e1e0eb7ae3b706f13fa312636548e29d018ff2c6629a88c2b2); /// @dev The hash of the meta that describes the contract. bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0xf2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b); @@ -45,7 +45,7 @@ bytes constant SUB_PARSER_WORD_PARSERS = /// These positional indexes all map to the same indexes looked up in the parse /// meta. bytes constant OPERAND_HANDLER_FUNCTION_POINTERS = - hex"1c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c621cfe1c391c391c391c391c391c391c391c391c391c391c391c391c39"; + hex"1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1c151cb11bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec"; /// @dev Every two bytes is a function pointer for a literal parser. /// Literal dispatches are determined by the first byte(s) of the literal diff --git a/src/generated/candidate/RaindexV6SubParser.sol b/src/generated/candidate/RaindexV6SubParser.sol index 9a63348bce..02a89a2a78 100644 --- a/src/generated/candidate/RaindexV6SubParser.sol +++ b/src/generated/candidate/RaindexV6SubParser.sol @@ -5,19 +5,19 @@ pragma solidity ^0.8.25; // THIS FILE IS AUTOGENERATED BY THE BUILD SCRIPT. DO NOT EDIT BY HAND. /// @dev Hash of the known bytecode. -bytes32 constant BYTECODE_HASH = bytes32(0x704aadc1ed56f63ff918ab219e6681a5d2851d774e2ee136bbe7904ea3b2fdcd); +bytes32 constant BYTECODE_HASH = bytes32(0xdd4c380fd24207e1e0eb7ae3b706f13fa312636548e29d018ff2c6629a88c2b2); /// @dev The deterministic deploy address of the contract when deployed via /// the Zoltu factory. -address constant DEPLOYED_ADDRESS = address(0x09Bc7AF266012F44fb41D8Bd682da931666605e1); +address constant DEPLOYED_ADDRESS = address(0xE14F3A7bC20116E47A5C302cD7236479fcb4F5E6); /// @dev The creation bytecode of the contract. bytes constant CREATION_CODE = - hex"6080604052348015600e575f80fd5b506125d38061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122ad565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612309565b6100ce6100c936600461232f565b610bc5565b60405161009d939291906123d9565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461232f565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612436565b6101f1906002612436565b6101fc906001612436565b610207906001612436565b6001600160401b0381111561021e5761021e61231b565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122a381526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a38152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612455565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a38152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a381526020019060019003908161045c579050509050611745815f8151811061048957610489612455565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612455565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612455565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612455565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610591579050509050611793815f815181106105be576105be612455565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612455565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612455565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612455565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612455565b602002602001018190525085886001815181106107a0576107a0612455565b602002602001018190525084886002815181106107bf576107bf612455565b602002602001018190525083886003815181106107de576107de612455565b602002602001018190525082886004815181106107fd576107fd612455565b6020026020010181905250818860058151811061081c5761081c612455565b6020026020010181905250808860068151811061083b5761083b612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a381526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612455565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612455565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612455565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612455565b6001600160401b039092166020928302919091019091015280896109be60066001612436565b815181106109ce576109ce612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a38152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612455565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612455565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612455565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612455565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612455565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612455565b6001600160401b0390921660209283029190910190910152808a610b8860066002612436565b81518110610b9857610b98612455565b602090810291909101015289610bb5610bb082611855565b6118b7565b9b50505050505050505050505090565b5f6060805f805f610be587610bd8611946565b610be0611966565b611986565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612436565b90505f610c2e83836f07fffffe0000000003ff200000000000611a77565b80925081945050505f80610c4786610240015184611b13565b915091508115610cdc575f610c5c8783611bea565b90506122a35f610c6a611c19565b90505f60028251610c7b919061247d565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612436565b610d5b906002612436565b610d66906001612436565b610d71906001612436565b6001600160401b03811115610d8857610d8861231b565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122a3815260200190600190039081610dd7579050509050611c39815f81518110610e0457610e04612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610e3a57610e3a612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a3815260200190600190039081610e6a579050509050611c39815f81518110610e9757610e97612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610ecd57610ecd612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600281518110610f0357610f03612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a3815260200190600190039081610f33579050509050611c39815f81518110610f6057610f60612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610f9657610f96612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610fc6579050509050611c39815f81518110610ff357610ff3612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061102957611029612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061105f5761105f612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061109557611095612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106110cb576110cb612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a38152602001906001900390816110fb579050509050611c39815f8151811061112857611128612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061115e5761115e612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061119457611194612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816003815181106111ca576111ca612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061120057611200612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161122f579050509050611c62815f8151811061125c5761125c612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161128b579050509050611cfe815f815181106112b8576112b8612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612455565b6020026020010181905250858860018151811061130a5761130a612455565b6020026020010181905250848860028151811061132957611329612455565b6020026020010181905250838860038151811061134857611348612455565b6020026020010181905250828860048151811061136757611367612455565b6020026020010181905250818860058151811061138657611386612455565b602002602001018190525080886006815181106113a5576113a5612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a38152602001906001900390816113c7579050509050611c39815f815181106113f4576113f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061142a5761142a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061146057611460612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061149657611496612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106114cc576114cc612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061150257611502612455565b6001600160401b0390921660209283029190910190910152808961152860066001612436565b8151811061153857611538612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a381526020019060019003908161155b579050509050611c39815f8151811061158857611588612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816001815181106115be576115be612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816002815181106115f4576115f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061162a5761162a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061166057611660612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061169657611696612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600681518110610b6257610b62612455565b5f6060806116da5f80611db6565b92509250925093509350939050565b5f6060806116da5f6001611db6565b5f6060806116da60015f611db6565b5f6060806116da600180611db6565b5f6060806116da60016002611db6565b5f6060806116da60025f611db6565b5f6060806116da60026001611db6565b5f6060806116da60035f611db6565b5f6060806116da60036001611db6565b5f6060806116da60036002611db6565b5f6060806116da600380611db6565b5f6060806116da60036004611db6565b5f6060806116da60045f611db6565b5f6060806116da60046001611db6565b5f6060806116da60046002611db6565b5f6060806116da60046003611db6565b5f6060806116da600480611db6565b5f6060806116da600585611db6565b5f60608060ff80851690600886901c1661181461180e836006612436565b82611db6565b945094509450505093509350939050565b5f6060806116da60016003611db6565b5f6060806116da60016004611db6565b5f6060806116da60016005611db6565b60605f61186183611e38565b9050606060405190506020820260200181016040528181526020840160208551028101602083015b818310156118ac57602083515102806020855101835e6020939093019201611889565b509195945050505050565b60605f82516002026001600160401b038111156118d6576118d661231b565b6040519080825280601f01601f191660200182016040528015611900576020820181803683370190505b50905061ffff80196020850160208651028101600285015b8183101561193a57805183518616908516178152602090920191600201611918565b50939695505050505050565b60606040518060e0016040528060a281526020016124f160a29139905090565b606060405180606001604052806040815260200161259360409139905090565b5f80611a156040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a6187878760405180602001604052805f815250611e66565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a8e5780611a91565b60205b915050875192505b8519600184841a1b16158183101615611ab757600182019150611a99565b9681019660208290036008810293841c90931b92611b025760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612309565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611bd85760018301516021909301805190935f90819060ff168180611b5d838e612017565b915091508186165f03611b7f575f809b509b5050505050505050505050611be3565b5f87611b8f600185038916612042565b016004028b015195505062ffffff9081169350841683039150611bc39050575060019750601c1a9550611be3945050505050565b611bcc83612042565b84019350505050611b34565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611c109083565b95945050505050565b60606040518060600160405280604081526020016124b160409139905090565b5f81515f14611c5b576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611cbf575060208101516001600160e01b038116601b0b60e082901d5f611c908383836120fb565b905061ffff811115611cb557604051631e4e01d760e21b815260040160405180910390fd5b9250611cf9915050565b81515f03611ce057604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d9357602082015160408301516001600160e01b038216601b0b60e083901d5f611d308383836120fb565b6001600160e01b038516601b0b935060e085901d925090505f611d548484836120fb565b905060ff821180611d65575060ff81115b15611d8357604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cf99350505050565b600282511015611ce057604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611dc9575060ff84115b15611df157604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b5f60208201602083510281015b80821015611e5f5781515183019250602082019150611e45565b5050919050565b611ef36040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f7857611f7861231b565b604051908082528060200260200182016040528015611fa1578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611c10565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611be3575060019250929050565b5f5f1982036120545750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f61210986868661213d565b91509150806121345760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f805f85121561216a57604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f0361217c57505f90506001611b0b565b8460ff84168501858112156121ae5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f8312156121fa57604c198312156121d1575f809550955050505050611b0b565b825f03600a0a91508184816121e8576121e8612469565b0495505084029091149150611b0b9050565b5f83131561229357604d8313156122375760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f198161224d5761224d612469565b048411156122815760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611b0b9050565b8360019550955050505050611b0b565b6122ab61249c565b565b5f602082840312156122bd575f80fd5b81356001600160e01b0319811681146122d4575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6122d460208301846122db565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561233f575f80fd5b81356001600160401b0380821115612355575f80fd5b818401915084601f830112612368575f80fd5b81358181111561237a5761237a61231b565b604051601f8201601f19908116603f011681019083821181831017156123a2576123a261231b565b816040528281528760208487010111156123ba575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526123f560608401866122db565b8381036040850152845180825260208087019201905f5b818110156124285783518352928401929184019160010161240c565b509098975050505050505050565b808201808211156101d157634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f8261249757634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52605160045260245ffdfe16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f147185655891c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c621cfe1c391c391c391c391c391c391c391c391c391c391c391c391c39"; + hex"6080604052348015600e575f80fd5b5061262e8061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122e9565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612345565b6100ce6100c936600461236b565b610bc5565b60405161009d93929190612415565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461236b565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612486565b6101f1906002612486565b6101fc906001612486565b610207906001612486565b6001600160401b0381111561021e5761021e612357565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122df81526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df8152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612499565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df8152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df81526020019060019003908161045c579050509050611745815f8151811061048957610489612499565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612499565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612499565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612499565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610591579050509050611793815f815181106105be576105be612499565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612499565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612499565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612499565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612499565b602002602001018190525085886001815181106107a0576107a0612499565b602002602001018190525084886002815181106107bf576107bf612499565b602002602001018190525083886003815181106107de576107de612499565b602002602001018190525082886004815181106107fd576107fd612499565b6020026020010181905250818860058151811061081c5761081c612499565b6020026020010181905250808860068151811061083b5761083b612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df81526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612499565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612499565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612499565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612499565b6001600160401b039092166020928302919091019091015280896109be60066001612486565b815181106109ce576109ce612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df8152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612499565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612499565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612499565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612499565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612499565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612499565b6001600160401b0390921660209283029190910190910152808a610b8860066002612486565b81518110610b9857610b98612499565b602090810291909101015289610bb5610bb082611855565b61186a565b9b50505050505050505050505090565b5f6060805f805f610be587610bd86118f9565b610be0611919565b611939565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612486565b90505f610c2e83836f07fffffe0000000003ff200000000000611a2a565b80925081945050505f80610c4786610240015184611ac6565b915091508115610cdc575f610c5c8783611b9d565b90506122df5f610c6a611bcc565b90505f60028251610c7b91906124c1565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612486565b610d5b906002612486565b610d66906001612486565b610d71906001612486565b6001600160401b03811115610d8857610d88612357565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122df815260200190600190039081610dd7579050509050611bec815f81518110610e0457610e04612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610e3a57610e3a612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df815260200190600190039081610e6a579050509050611bec815f81518110610e9757610e97612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610ecd57610ecd612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600281518110610f0357610f03612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df815260200190600190039081610f33579050509050611bec815f81518110610f6057610f60612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610f9657610f96612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610fc6579050509050611bec815f81518110610ff357610ff3612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061102957611029612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061105f5761105f612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061109557611095612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106110cb576110cb612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df8152602001906001900390816110fb579050509050611bec815f8151811061112857611128612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061115e5761115e612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061119457611194612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816003815181106111ca576111ca612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061120057611200612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161122f579050509050611c15815f8151811061125c5761125c612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161128b579050509050611cb1815f815181106112b8576112b8612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612499565b6020026020010181905250858860018151811061130a5761130a612499565b6020026020010181905250848860028151811061132957611329612499565b6020026020010181905250838860038151811061134857611348612499565b6020026020010181905250828860048151811061136757611367612499565b6020026020010181905250818860058151811061138657611386612499565b602002602001018190525080886006815181106113a5576113a5612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df8152602001906001900390816113c7579050509050611bec815f815181106113f4576113f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061142a5761142a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061146057611460612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061149657611496612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106114cc576114cc612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061150257611502612499565b6001600160401b0390921660209283029190910190910152808961152860066001612486565b8151811061153857611538612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df81526020019060019003908161155b579050509050611bec815f8151811061158857611588612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816001815181106115be576115be612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816002815181106115f4576115f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061162a5761162a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061166057611660612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061169657611696612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600681518110610b6257610b62612499565b5f6060806116da5f80611d69565b92509250925093509350939050565b5f6060806116da5f6001611d69565b5f6060806116da60015f611d69565b5f6060806116da600180611d69565b5f6060806116da60016002611d69565b5f6060806116da60025f611d69565b5f6060806116da60026001611d69565b5f6060806116da60035f611d69565b5f6060806116da60036001611d69565b5f6060806116da60036002611d69565b5f6060806116da600380611d69565b5f6060806116da60036004611d69565b5f6060806116da60045f611d69565b5f6060806116da60046001611d69565b5f6060806116da60046002611d69565b5f6060806116da60046003611d69565b5f6060806116da600480611d69565b5f6060806116da600585611d69565b5f60608060ff80851690600886901c1661181461180e836006612486565b82611d69565b945094509450505093509350939050565b5f6060806116da60016003611d69565b5f6060806116da60016004611d69565b5f6060806116da60016005611d69565b6060815f61186282611deb565b949350505050565b60605f82516002026001600160401b0381111561188957611889612357565b6040519080825280601f01601f1916602001820160405280156118b3576020820181803683370190505b50905061ffff80196020850160208651028101600285015b818310156118ed578051835186169085161781526020909201916002016118cb565b50939695505050505050565b60606040518060e0016040528060a2815260200161258c60a29139905090565b606060405180606001604052806040815260200161250c60409139905090565b5f806119c86040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a1487878760405180602001604052805f815250611e59565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a415780611a44565b60205b915050875192505b8519600184841a1b16158183101615611a6a57600182019150611a4c565b9681019660208290036008810293841c90931b92611ab55760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612345565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611b8b5760018301516021909301805190935f90819060ff168180611b10838e61200a565b915091508186165f03611b32575f809b509b5050505050505050505050611b96565b5f87611b42600185038916612035565b016004028b015195505062ffffff9081169350841683039150611b769050575060019750601c1a9550611b96945050505050565b611b7f83612035565b84019350505050611ae7565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611bc39083565b95945050505050565b606060405180606001604052806040815260200161254c60409139905090565b5f81515f14611c0e576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611c72575060208101516001600160e01b038116601b0b60e082901d5f611c438383836120ee565b905061ffff811115611c6857604051631e4e01d760e21b815260040160405180910390fd5b9250611cac915050565b81515f03611c9357604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d4657602082015160408301516001600160e01b038216601b0b60e083901d5f611ce38383836120ee565b6001600160e01b038516601b0b935060e085901d925090505f611d078484836120ee565b905060ff821180611d18575060ff81115b15611d3657604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cac9350505050565b600282511015611c9357604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611d7c575060ff84115b15611da457604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b60605f611df783612130565b90505f611e058260206124e0565b9050606060405190508160200181016040528281526020850160208651028101602083015b81831015611e4d57602083515102806020855101835e6020939093019201611e2a565b50919695505050505050565b611ee66040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f6b57611f6b612357565b604051908082528060200260200182016040528015611f94578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611bc3565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611b96575060019250929050565b5f5f1982036120475750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f6120fc868686612179565b91509150806121275760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f60208201602083510281015b8082101561217257815151928301928084101561216657634e487b715f5260116020526024601cfd5b5060208201915061213d565b5050919050565b5f805f8512156121a657604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f036121b857505f90506001611abe565b8460ff84168501858112156121ea5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f83121561223657604c1983121561220d575f809550955050505050611abe565b825f03600a0a9150818481612224576122246124ad565b0495505084029091149150611abe9050565b5f8313156122cf57604d8313156122735760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f1981612289576122896124ad565b048411156122bd5760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611abe9050565b8360019550955050505050611abe565b6122e76124f7565b565b5f602082840312156122f9575f80fd5b81356001600160e01b031981168114612310575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6123106020830184612317565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561237b575f80fd5b81356001600160401b0380821115612391575f80fd5b818401915084601f8301126123a4575f80fd5b8135818111156123b6576123b6612357565b604051601f8201601f19908116603f011681019083821181831017156123de576123de612357565b816040528281528760208487010111156123f6575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526124316060840186612317565b8381036040850152845180825260208087019201905f5b8181101561246457835183529284019291840191600101612448565b509098975050505050505050565b634e487b7160e01b5f52601160045260245ffd5b808201808211156101d1576101d1612472565b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f826124db57634e487b7160e01b5f52601260045260245ffd5b500490565b80820281158282048414176101d1576101d1612472565b634e487b7160e01b5f52605160045260245ffdfe1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1c151cb11bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f14718565589"; /// @dev The runtime bytecode of the contract. bytes constant RUNTIME_CODE = - hex"608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122ad565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612309565b6100ce6100c936600461232f565b610bc5565b60405161009d939291906123d9565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461232f565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612436565b6101f1906002612436565b6101fc906001612436565b610207906001612436565b6001600160401b0381111561021e5761021e61231b565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122a381526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a38152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612455565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a38152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a381526020019060019003908161045c579050509050611745815f8151811061048957610489612455565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612455565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612455565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612455565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610591579050509050611793815f815181106105be576105be612455565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612455565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612455565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612455565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a38152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612455565b602002602001018190525085886001815181106107a0576107a0612455565b602002602001018190525084886002815181106107bf576107bf612455565b602002602001018190525083886003815181106107de576107de612455565b602002602001018190525082886004815181106107fd576107fd612455565b6020026020010181905250818860058151811061081c5761081c612455565b6020026020010181905250808860068151811061083b5761083b612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a381526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612455565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612455565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612455565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612455565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612455565b6001600160401b039092166020928302919091019091015280896109be60066001612436565b815181106109ce576109ce612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a38152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612455565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612455565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612455565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612455565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612455565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612455565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612455565b6001600160401b0390921660209283029190910190910152808a610b8860066002612436565b81518110610b9857610b98612455565b602090810291909101015289610bb5610bb082611855565b6118b7565b9b50505050505050505050505090565b5f6060805f805f610be587610bd8611946565b610be0611966565b611986565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612436565b90505f610c2e83836f07fffffe0000000003ff200000000000611a77565b80925081945050505f80610c4786610240015184611b13565b915091508115610cdc575f610c5c8783611bea565b90506122a35f610c6a611c19565b90505f60028251610c7b919061247d565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612436565b610d5b906002612436565b610d66906001612436565b610d71906001612436565b6001600160401b03811115610d8857610d8861231b565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122a3815260200190600190039081610dd7579050509050611c39815f81518110610e0457610e04612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610e3a57610e3a612455565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122a3815260200190600190039081610e6a579050509050611c39815f81518110610e9757610e97612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610ecd57610ecd612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600281518110610f0357610f03612455565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122a3815260200190600190039081610f33579050509050611c39815f81518110610f6057610f60612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600181518110610f9657610f96612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a3815260200190600190039081610fc6579050509050611c39815f81518110610ff357610ff3612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061102957611029612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061105f5761105f612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061109557611095612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106110cb576110cb612455565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122a38152602001906001900390816110fb579050509050611c39815f8151811061112857611128612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061115e5761115e612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061119457611194612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816003815181106111ca576111ca612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061120057611200612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161122f579050509050611c62815f8151811061125c5761125c612455565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122a381526020019060019003908161128b579050509050611cfe815f815181106112b8576112b8612455565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612455565b6020026020010181905250858860018151811061130a5761130a612455565b6020026020010181905250848860028151811061132957611329612455565b6020026020010181905250838860038151811061134857611348612455565b6020026020010181905250828860048151811061136757611367612455565b6020026020010181905250818860058151811061138657611386612455565b602002602001018190525080886006815181106113a5576113a5612455565b602090810291909101015260408051600680825260e082019092525f91816020015b6122a38152602001906001900390816113c7579050509050611c39815f815181106113f4576113f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160018151811061142a5761142a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160028151811061146057611460612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061149657611496612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816004815181106114cc576114cc612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061150257611502612455565b6001600160401b0390921660209283029190910190910152808961152860066001612436565b8151811061153857611538612455565b602090810291909101015260408051600780825261010082019092525f91816020015b6122a381526020019060019003908161155b579050509050611c39815f8151811061158857611588612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816001815181106115be576115be612455565b60200260200101906001600160401b031690816001600160401b031681525050611c39816002815181106115f4576115f4612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160038151811061162a5761162a612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160048151811061166057611660612455565b60200260200101906001600160401b031690816001600160401b031681525050611c398160058151811061169657611696612455565b60200260200101906001600160401b031690816001600160401b031681525050611c3981600681518110610b6257610b62612455565b5f6060806116da5f80611db6565b92509250925093509350939050565b5f6060806116da5f6001611db6565b5f6060806116da60015f611db6565b5f6060806116da600180611db6565b5f6060806116da60016002611db6565b5f6060806116da60025f611db6565b5f6060806116da60026001611db6565b5f6060806116da60035f611db6565b5f6060806116da60036001611db6565b5f6060806116da60036002611db6565b5f6060806116da600380611db6565b5f6060806116da60036004611db6565b5f6060806116da60045f611db6565b5f6060806116da60046001611db6565b5f6060806116da60046002611db6565b5f6060806116da60046003611db6565b5f6060806116da600480611db6565b5f6060806116da600585611db6565b5f60608060ff80851690600886901c1661181461180e836006612436565b82611db6565b945094509450505093509350939050565b5f6060806116da60016003611db6565b5f6060806116da60016004611db6565b5f6060806116da60016005611db6565b60605f61186183611e38565b9050606060405190506020820260200181016040528181526020840160208551028101602083015b818310156118ac57602083515102806020855101835e6020939093019201611889565b509195945050505050565b60605f82516002026001600160401b038111156118d6576118d661231b565b6040519080825280601f01601f191660200182016040528015611900576020820181803683370190505b50905061ffff80196020850160208651028101600285015b8183101561193a57805183518616908516178152602090920191600201611918565b50939695505050505050565b60606040518060e0016040528060a281526020016124f160a29139905090565b606060405180606001604052806040815260200161259360409139905090565b5f80611a156040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a6187878760405180602001604052805f815250611e66565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a8e5780611a91565b60205b915050875192505b8519600184841a1b16158183101615611ab757600182019150611a99565b9681019660208290036008810293841c90931b92611b025760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612309565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611bd85760018301516021909301805190935f90819060ff168180611b5d838e612017565b915091508186165f03611b7f575f809b509b5050505050505050505050611be3565b5f87611b8f600185038916612042565b016004028b015195505062ffffff9081169350841683039150611bc39050575060019750601c1a9550611be3945050505050565b611bcc83612042565b84019350505050611b34565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611c109083565b95945050505050565b60606040518060600160405280604081526020016124b160409139905090565b5f81515f14611c5b576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611cbf575060208101516001600160e01b038116601b0b60e082901d5f611c908383836120fb565b905061ffff811115611cb557604051631e4e01d760e21b815260040160405180910390fd5b9250611cf9915050565b81515f03611ce057604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d9357602082015160408301516001600160e01b038216601b0b60e083901d5f611d308383836120fb565b6001600160e01b038516601b0b935060e085901d925090505f611d548484836120fb565b905060ff821180611d65575060ff81115b15611d8357604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cf99350505050565b600282511015611ce057604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611dc9575060ff84115b15611df157604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b5f60208201602083510281015b80821015611e5f5781515183019250602082019150611e45565b5050919050565b611ef36040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f7857611f7861231b565b604051908082528060200260200182016040528015611fa1578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611c10565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611be3575060019250929050565b5f5f1982036120545750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f61210986868661213d565b91509150806121345760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f805f85121561216a57604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f0361217c57505f90506001611b0b565b8460ff84168501858112156121ae5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f8312156121fa57604c198312156121d1575f809550955050505050611b0b565b825f03600a0a91508184816121e8576121e8612469565b0495505084029091149150611b0b9050565b5f83131561229357604d8313156122375760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f198161224d5761224d612469565b048411156122815760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611b0b9050565b8360019550955050505050611b0b565b6122ab61249c565b565b5f602082840312156122bd575f80fd5b81356001600160e01b0319811681146122d4575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6122d460208301846122db565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561233f575f80fd5b81356001600160401b0380821115612355575f80fd5b818401915084601f830112612368575f80fd5b81358181111561237a5761237a61231b565b604051601f8201601f19908116603f011681019083821181831017156123a2576123a261231b565b816040528281528760208487010111156123ba575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526123f560608401866122db565b8381036040850152845180825260208087019201905f5b818110156124285783518352928401929184019160010161240c565b509098975050505050505050565b808201808211156101d157634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f8261249757634e487b7160e01b5f52601260045260245ffd5b500490565b634e487b7160e01b5f52605160045260245ffdfe16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f147185655891c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c391c621cfe1c391c391c391c391c391c391c391c391c391c391c391c391c39"; + hex"608060405234801561000f575f80fd5b506004361061007a575f3560e01c80636f5aa28d116100585780636f5aa28d146100dd578063c6c0cbb61461010b578063ccf4477514610135578063d6d8c9a814610148575f80fd5b806301ffc9a71461007e578063336284d4146100a6578063570c7a63146100bb575b5f80fd5b61009161008c3660046122e9565b610150565b60405190151581526020015b60405180910390f35b6100ae6101d7565b60405161009d9190612345565b6100ce6100c936600461236b565b610bc5565b60405161009d93929190612415565b6040517ff2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b815260200161009d565b61011e61011936600461236b565b610d09565b60408051921515835260208301919091520161009d565b60408051602081019091525f81526100ae565b6100ae610d41565b5f6001600160e01b031982166391ccb1d560e01b148061018057506001600160e01b03198216636f5aa28d60e01b145b8061019b57506001600160e01b03198216631a2c8edd60e01b145b806101b657506001600160e01b03198216630cd8a13560e21b145b806101d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b60605f6101e660046001612486565b6101f1906002612486565b6101fc906001612486565b610207906001612486565b6001600160401b0381111561021e5761021e612357565b60405190808252806020026020018201604052801561025157816020015b606081526020019060019003908161023c5790505b50604080516002808252606082019092529192505f9190816020015b6122df81526020019060019003908161026d5790505090506116cc815f8151811061029a5761029a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116e9816001815181106102d0576102d0612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df8152602001906001900390816103005790505090506116f8815f8151811061032d5761032d612499565b60200260200101906001600160401b031690816001600160401b0316815250506117078160018151811061036357610363612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160028151811061039957610399612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df8152602001906001900390816103c9579050509050611726815f815181106103f6576103f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117358160018151811061042c5761042c612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df81526020019060019003908161045c579050509050611745815f8151811061048957610489612499565b60200260200101906001600160401b031690816001600160401b031681525050611754816001815181106104bf576104bf612499565b60200260200101906001600160401b031690816001600160401b031681525050611764816002815181106104f5576104f5612499565b60200260200101906001600160401b031690816001600160401b0316815250506117748160038151811061052b5761052b612499565b60200260200101906001600160401b031690816001600160401b0316815250506117838160048151811061056157610561612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610591579050509050611793815f815181106105be576105be612499565b60200260200101906001600160401b031690816001600160401b0316815250506117a2816001815181106105f4576105f4612499565b60200260200101906001600160401b031690816001600160401b0316815250506117b28160028151811061062a5761062a612499565b60200260200101906001600160401b031690816001600160401b0316815250506117c28160038151811061066057610660612499565b60200260200101906001600160401b031690816001600160401b0316815250506117d28160048151811061069657610696612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816106c55790505090506117e1815f815181106106f2576106f2612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df8152602001906001900390816107215790505090506117f0815f8151811061074e5761074e612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f8151811061078157610781612499565b602002602001018190525085886001815181106107a0576107a0612499565b602002602001018190525084886002815181106107bf576107bf612499565b602002602001018190525083886003815181106107de576107de612499565b602002602001018190525082886004815181106107fd576107fd612499565b6020026020010181905250818860058151811061081c5761081c612499565b6020026020010181905250808860068151811061083b5761083b612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df81526020019060019003908161085d5790505090506116cc815f8151811061088a5761088a612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f8816001815181106108c0576108c0612499565b60200260200101906001600160401b031690816001600160401b031681525050611707816002815181106108f6576108f6612499565b60200260200101906001600160401b031690816001600160401b0316815250506117168160038151811061092c5761092c612499565b60200260200101906001600160401b031690816001600160401b0316815250506118258160048151811061096257610962612499565b60200260200101906001600160401b031690816001600160401b0316815250506118358160058151811061099857610998612499565b6001600160401b039092166020928302919091019091015280896109be60066001612486565b815181106109ce576109ce612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df8152602001906001900390816109f15790505090506116cc815f81518110610a1e57610a1e612499565b60200260200101906001600160401b031690816001600160401b0316815250506116f881600181518110610a5457610a54612499565b60200260200101906001600160401b031690816001600160401b03168152505061170781600281518110610a8a57610a8a612499565b60200260200101906001600160401b031690816001600160401b03168152505061171681600381518110610ac057610ac0612499565b60200260200101906001600160401b031690816001600160401b03168152505061182581600481518110610af657610af6612499565b60200260200101906001600160401b031690816001600160401b03168152505061183581600581518110610b2c57610b2c612499565b60200260200101906001600160401b031690816001600160401b03168152505061184581600681518110610b6257610b62612499565b6001600160401b0390921660209283029190910190910152808a610b8860066002612486565b81518110610b9857610b98612499565b602090810291909101015289610bb5610bb082611855565b61186a565b9b50505050505050505050505090565b5f6060805f805f610be587610bd86118f9565b610be0611919565b611939565b9250925092505f610bfb82610220015160200190565b90505f8261022001515182610c109190612486565b90505f610c2e83836f07fffffe0000000003ff200000000000611a2a565b80925081945050505f80610c4786610240015184611ac6565b915091508115610cdc575f610c5c8783611b9d565b90506122df5f610c6a611bcc565b90505f60028251610c7b91906124c1565b9050808510610cac576040516303bdd1b160e51b815260048101869052602481018290526044015b60405180910390fd5b6001850160020282015161ffff169250610cc58c8c8686565b9e509e509e50505050505050505050505050610d02565b5050604080515f80825281830190925260208101828152919a5090985096505050505050505b9193909250565b5f805f805f610d31866002810151815160228084019461ffff93909316840101920160200190565b505f988998509650505050505050565b60605f610d5060046001612486565b610d5b906002612486565b610d66906001612486565b610d71906001612486565b6001600160401b03811115610d8857610d88612357565b604051908082528060200260200182016040528015610dbb57816020015b6060815260200190600190039081610da65790505b50604080516002808252606082019092529192505f9190816020015b6122df815260200190600190039081610dd7579050509050611bec815f81518110610e0457610e04612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610e3a57610e3a612499565b6001600160401b039290921660209283029190910190910152604080516003808252608082019092525f91816020015b6122df815260200190600190039081610e6a579050509050611bec815f81518110610e9757610e97612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610ecd57610ecd612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600281518110610f0357610f03612499565b6001600160401b039290921660209283029190910190910152604080516002808252606082019092525f91816020015b6122df815260200190600190039081610f33579050509050611bec815f81518110610f6057610f60612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600181518110610f9657610f96612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df815260200190600190039081610fc6579050509050611bec815f81518110610ff357610ff3612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061102957611029612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061105f5761105f612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061109557611095612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106110cb576110cb612499565b6001600160401b03929092166020928302919091019091015260408051600580825260c082019092525f91816020015b6122df8152602001906001900390816110fb579050509050611bec815f8151811061112857611128612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061115e5761115e612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061119457611194612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816003815181106111ca576111ca612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061120057611200612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161122f579050509050611c15815f8151811061125c5761125c612499565b6001600160401b0392909216602092830291909101909101526040805160018082528183019092525f91816020015b6122df81526020019060019003908161128b579050509050611cb1815f815181106112b8576112b8612499565b60200260200101906001600160401b031690816001600160401b03168152505086885f815181106112eb576112eb612499565b6020026020010181905250858860018151811061130a5761130a612499565b6020026020010181905250848860028151811061132957611329612499565b6020026020010181905250838860038151811061134857611348612499565b6020026020010181905250828860048151811061136757611367612499565b6020026020010181905250818860058151811061138657611386612499565b602002602001018190525080886006815181106113a5576113a5612499565b602090810291909101015260408051600680825260e082019092525f91816020015b6122df8152602001906001900390816113c7579050509050611bec815f815181106113f4576113f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160018151811061142a5761142a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160028151811061146057611460612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061149657611496612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816004815181106114cc576114cc612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061150257611502612499565b6001600160401b0390921660209283029190910190910152808961152860066001612486565b8151811061153857611538612499565b602090810291909101015260408051600780825261010082019092525f91816020015b6122df81526020019060019003908161155b579050509050611bec815f8151811061158857611588612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816001815181106115be576115be612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec816002815181106115f4576115f4612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160038151811061162a5761162a612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160048151811061166057611660612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec8160058151811061169657611696612499565b60200260200101906001600160401b031690816001600160401b031681525050611bec81600681518110610b6257610b62612499565b5f6060806116da5f80611d69565b92509250925093509350939050565b5f6060806116da5f6001611d69565b5f6060806116da60015f611d69565b5f6060806116da600180611d69565b5f6060806116da60016002611d69565b5f6060806116da60025f611d69565b5f6060806116da60026001611d69565b5f6060806116da60035f611d69565b5f6060806116da60036001611d69565b5f6060806116da60036002611d69565b5f6060806116da600380611d69565b5f6060806116da60036004611d69565b5f6060806116da60045f611d69565b5f6060806116da60046001611d69565b5f6060806116da60046002611d69565b5f6060806116da60046003611d69565b5f6060806116da600480611d69565b5f6060806116da600585611d69565b5f60608060ff80851690600886901c1661181461180e836006612486565b82611d69565b945094509450505093509350939050565b5f6060806116da60016003611d69565b5f6060806116da60016004611d69565b5f6060806116da60016005611d69565b6060815f61186282611deb565b949350505050565b60605f82516002026001600160401b0381111561188957611889612357565b6040519080825280601f01601f1916602001820160405280156118b3576020820181803683370190505b50905061ffff80196020850160208651028101600285015b818310156118ed578051835186169085161781526020909201916002016118cb565b50939695505050505050565b60606040518060e0016040528060a2815260200161258c60a29139905090565b606060405180606001604052806040815260200161250c60409139905090565b5f806119c86040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b606061ffff600288015116935060ff600388015116925061ffff600588015116600588019750808852602081018801915050611a1487878760405180602001604052805f815250611e59565b915080826101e001819052505093509350939050565b5f808060018187870360208111611a415780611a44565b60205b915050875192505b8519600184841a1b16158183101615611a6a57600182019150611a4c565b9681019660208290036008810293841c90931b92611ab55760408051602081018590520160408051601f198184030181529082905263e47fe8b760e01b8252610ca391600401612345565b50869350909150505b935093915050565b600182810180515f928392600560ff93909316602102870192830192909101835b81831015611b8b5760018301516021909301805190935f90819060ff168180611b10838e61200a565b915091508186165f03611b32575f809b509b5050505050505050505050611b96565b5f87611b42600185038916612035565b016004028b015195505062ffffff9081169350841683039150611b769050575060019750601c1a9550611b96945050505050565b611b7f83612035565b84019350505050611ae7565b5f8095509550505050505b9250929050565b6101c08201516002828102820101516101e08401515f9261ffff9092169190611bc39083565b95945050505050565b606060405180606001604052806040815260200161254c60409139905090565b5f81515f14611c0e576040516304f8b58160e51b815260040160405180910390fd5b505f919050565b5f8151600103611c72575060208101516001600160e01b038116601b0b60e082901d5f611c438383836120ee565b905061ffff811115611c6857604051631e4e01d760e21b815260040160405180910390fd5b9250611cac915050565b81515f03611c9357604051630f16066b60e41b815260040160405180910390fd5b604051630358cd2160e31b815260040160405180910390fd5b919050565b5f8151600203611d4657602082015160408301516001600160e01b038216601b0b60e083901d5f611ce38383836120ee565b6001600160e01b038516601b0b935060e085901d925090505f611d078484836120ee565b905060ff821180611d18575060ff81115b15611d3657604051631e4e01d760e21b815260040160405180910390fd5b60081b179450611cac9350505050565b600282511015611c9357604051630f16066b60e41b815260040160405180910390fd5b5f60608060ff851180611d7c575060ff84115b15611da457604051639b0f326160e01b81526004810186905260248101859052604401610ca3565b6040805160248101909152600386602383015385602283015360106021830153806020830153506004815260408051602081019091525f8152600197919650945092505050565b60605f611df783612130565b90505f611e058260206124e0565b9050606060405190508160200181016040528281526020850160208651028101602083015b81831015611e4d57602083515102806020855101835e6020939093019201611e2a565b50919695505050505050565b611ee66040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020015f81526020015f81526020015f81526020015f81526020015f81526020015f80191681526020016060815260200160608152602001606081526020015f815260200160608152602001606081525090565b5f6040518061026001604052805f81526020015f81526020015f81526020015f81526020015f81526020015f81526020015f801b81526020015f8152602001600481526020015f81526020015f81526020015f81526020015f801b815260200184815260200185815260200160046001600160401b03811115611f6b57611f6b612357565b604051908082528060200260200182016040528015611f94578160200160208202803683370190505b5081525f602080830182905260408084018b905260609384018a90528051601f01601f19168281528083018252835161ffff191681178452855290840182905283018190529082018190526080820181905260a08201819052610120820181905261014082018190526102008201529050611bc3565b5f80825f528360205360215f2090506001815f1a1b915062ffffff8116611b96575060019250929050565b5f5f1982036120475750610100919050565b507f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f7f5555555555555555555555555555555555555555555555555555555555555555600183901c16909103600281901c7f3333333333333333333333333333333333333333333333333333333333333333908116911601600481901c01167f01010101010101010101010101010101010101010101010101010101010101010260f81c90565b5f805f6120fc868686612179565b91509150806121275760405162bc8ecf60e31b81526004810187905260248101869052604401610ca3565b50949350505050565b5f60208201602083510281015b8082101561217257815151928301928084101561216657634e487b715f5260116020526024601cfd5b5060208201915061213d565b5050919050565b5f805f8512156121a657604051634a7d166b60e01b81526004810186905260248101859052604401610ca3565b845f036121b857505f90506001611abe565b8460ff84168501858112156121ea5760405163d556b11160e01b81526004810188905260248101879052604401610ca3565b5f805f83121561223657604c1983121561220d575f809550955050505050611abe565b825f03600a0a9150818481612224576122246124ad565b0495505084029091149150611abe9050565b5f8313156122cf57604d8313156122735760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b82600a0a9150815f1981612289576122896124ad565b048411156122bd5760405163c849483b60e01b8152600481018a90526024810189905260ff88166044820152606401610ca3565b5091909102925060019150611abe9050565b8360019550955050505050611abe565b6122e76124f7565b565b5f602082840312156122f9575f80fd5b81356001600160e01b031981168114612310575f80fd5b9392505050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6123106020830184612317565b634e487b7160e01b5f52604160045260245ffd5b5f6020828403121561237b575f80fd5b81356001600160401b0380821115612391575f80fd5b818401915084601f8301126123a4575f80fd5b8135818111156123b6576123b6612357565b604051601f8201601f19908116603f011681019083821181831017156123de576123de612357565b816040528281528760208487010111156123f6575f80fd5b826020860160208301375f928101602001929092525095945050505050565b83151581525f6020606060208401526124316060840186612317565b8381036040850152845180825260208087019201905f5b8181101561246457835183529284019291840191600101612448565b509098975050505050505050565b634e487b7160e01b5f52601160045260245ffd5b808201808211156101d1576101d1612472565b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52601260045260245ffd5b5f826124db57634e487b7160e01b5f52601260045260245ffd5b500490565b80820281158282048414176101d1576101d1612472565b634e487b7160e01b5f52605160045260245ffdfe1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1c151cb11bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f8170717161825183518450101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f14718565589"; /// @dev The addresses that MUST already have code on a network before /// this release can be broadcast there, `abi.encode`d as an `address[]` diff --git a/src/lib/LibOrder.sol b/src/lib/LibOrder.sol index 67afa32db8..6b65c2d0ae 100644 --- a/src/lib/LibOrder.sol +++ b/src/lib/LibOrder.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {OrderV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @title LibOrder /// @notice Consistent handling of `OrderV4` for where it matters w.r.t. diff --git a/src/lib/LibRaindex.sol b/src/lib/LibRaindex.sol index 91a0a238bb..a1bf901367 100644 --- a/src/lib/LibRaindex.sol +++ b/src/lib/LibRaindex.sol @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import { SourceIndexV2, StateNamespace, StackItem, EvalV4 -} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {LibNamespace, FullyQualifiedNamespace} from "rain-interpreter-interface-0.1.0/src/lib/ns/LibNamespace.sol"; -import {LibContext} from "rain-interpreter-interface-0.1.0/src/lib/caller/LibContext.sol"; +} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {LibNamespace, FullyQualifiedNamespace} from "rainlang-interface-0.2.8/src/lib/ns/LibNamespace.sol"; +import {LibContext} from "rainlang-interface-0.2.8/src/lib/caller/LibContext.sol"; /// @dev Raindex context is actually fairly complex. The calling context column /// is populated before calculate order, but the remaining columns are only diff --git a/src/lib/LibRaindexArb.sol b/src/lib/LibRaindexArb.sol index c6932678c2..868db4dae5 100644 --- a/src/lib/LibRaindexArb.sol +++ b/src/lib/LibRaindexArb.sol @@ -2,12 +2,12 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {LibRaindex} from "./LibRaindex.sol"; import {Address} from "@openzeppelin-contracts-5.6.1/utils/Address.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title LibRaindexArb library LibRaindexArb { diff --git a/src/lib/LibRaindexSubParser.sol b/src/lib/LibRaindexSubParser.sol index 9aa1a0f9b8..420c7052eb 100644 --- a/src/lib/LibRaindexSubParser.sol +++ b/src/lib/LibRaindexSubParser.sol @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {AuthoringMetaV2, OperandV2} from "rain-interpreter-interface-0.1.0/src/interface/ISubParserV4.sol"; -import {LibUint256Matrix} from "rain-solmem-0.1.3/src/lib/LibUint256Matrix.sol"; -import {LibSubParse} from "rainlang-0.1.5/src/lib/parse/LibSubParse.sol"; +import {AuthoringMetaV2, OperandV2} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; +import {LibUint256Matrix} from "rain-solmem-0.1.28/src/lib/LibUint256Matrix.sol"; +import {LibSubParse} from "rainlang-0.2.5/src/lib/parse/LibSubParse.sol"; import { CONTEXT_BASE_COLUMN, CONTEXT_BASE_ROW_SENDER, CONTEXT_BASE_ROW_CALLING_CONTRACT, CONTEXT_BASE_ROWS -} from "rain-interpreter-interface-0.1.0/src/lib/caller/LibContext.sol"; +} from "rainlang-interface-0.2.8/src/lib/caller/LibContext.sol"; import { CONTEXT_COLUMNS, CONTEXT_COLUMNS_EXTENDED, diff --git a/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol b/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol index 3ed9649f5e..d27ec78df3 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol @@ -17,9 +17,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract RaindexV6ArbOrderTakerBadRaindexTest is GenericPoolRaindexV6ArbOrderTakerTest { /// arb5 MUST revert BadRaindex when `raindex` is not the trusted deterministic @@ -50,9 +53,7 @@ contract RaindexV6ArbOrderTakerBadRaindexTest is GenericPoolRaindexV6ArbOrderTak }), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol b/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol index e15e1b4573..50f6ee04e6 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol @@ -12,11 +12,14 @@ import { TaskV2, EvaluableV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// @title RaindexV6ArbOrderTakerBeforeArbOrderTest /// @notice Pins the ORDERING of `arb5`: `_beforeArb(task)` is called BEFORE the @@ -29,9 +32,7 @@ contract RaindexV6ArbOrderTakerBeforeArbOrderTest is Test { function _gatedTask(bytes memory bytecode) internal pure returns (TaskV2 memory) { return TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode ), signedContext: new SignedContextV1[](0) }); diff --git a/test/abstract/RaindexV6ArbOrderTaker.context.t.sol b/test/abstract/RaindexV6ArbOrderTaker.context.t.sol index 65dc97cbf6..e80506cbb4 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.context.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.context.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol"; -import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol"; import { TakeOrdersConfigV5, @@ -12,11 +12,11 @@ import { OrderConfigV4, OrderV4, IInterpreterV4 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {StateNamespace, LibNamespace} from "../../src/concrete/raindex/RaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; contract RaindexV6ArbOrderTakerContextTest is RaindexV6ExternalRealTest { function testRaindexV6ArbOrderTakerContext() external { diff --git a/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol b/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol index 7d240cbaab..ed23a7975f 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol"; -import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol"; import { TakeOrdersConfigV5, @@ -12,10 +12,10 @@ import { OrderConfigV4, OrderV4, IInterpreterV4 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev Discriminates that `arb5` passes the input token's OWN decimals and the /// output token's OWN decimals to `finalizeArb` in the correct positions. The diff --git a/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol b/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol index 1069dfc726..bd3594a10c 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol"; -import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol"; import { TakeOrdersConfigV5, @@ -12,10 +12,10 @@ import { OrderConfigV4, OrderV4, IInterpreterV4 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6ArbOrderTakerFinalizeTaskArgTest /// @notice Proves that arb5 forwards the CALLER's `task` (the arb5 `task` diff --git a/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol b/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol index 64470a30a1..52e558b510 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol"; -import {IRaindexV6ArbOrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6ArbOrderTaker.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; +import {IRaindexV6ArbOrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6ArbOrderTaker.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol"; contract RaindexV6ArbOrderTakerIERC165Test is Test { diff --git a/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol b/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol index 5da074fb22..1a875c519e 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol @@ -15,11 +15,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol b/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol index 29f2b5d62c..8ce4b4faec 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol @@ -14,9 +14,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract RaindexV6ArbOrderTakerNoOrdersTest is GenericPoolRaindexV6ArbOrderTakerTest { /// arb5 MUST revert with NoOrders when given an empty orders array. @@ -37,9 +40,7 @@ contract RaindexV6ArbOrderTakerNoOrdersTest is GenericPoolRaindexV6ArbOrderTaker }), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol index 3451c2ddd7..f00d3b8a17 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol index da30f7a597..318c0550f1 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol @@ -6,8 +6,8 @@ import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbOrderTaker} from "test/util/concrete/ChildRaindexV6ArbOrderTaker.sol"; import {GenericPoolRaindexV6ArbOrderTaker} from "../../src/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol index 29e0ddd463..e962525d5b 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {GenericPoolRaindexV6ArbOrderTaker} from "../../src/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol b/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol index a0222105ff..3fdaa66a01 100644 --- a/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol +++ b/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol @@ -14,11 +14,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol index 5e27031b76..3c709aac57 100644 --- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol @@ -5,10 +5,13 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// _checkTaskHash MUST pass when the runtime task matches the configured task. contract RaindexV6ArbTaskGatedCheckTaskHashPassMatchTest is Test { @@ -16,11 +19,7 @@ contract RaindexV6ArbTaskGatedCheckTaskHashPassMatchTest is Test { vm.assume(bytecode.length > 0); TaskV2 memory task = TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode), new SignedContextV1[](0) ); ChildRaindexV6ArbTaskGated child = new ChildRaindexV6ArbTaskGated(RaindexV6ArbConfig(task)); diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol index db26bf2692..aa2ee5021e 100644 --- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol @@ -5,10 +5,13 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// _checkTaskHash MUST pass through when iTaskHash is zero, regardless of /// the task provided at runtime. @@ -16,11 +19,7 @@ contract RaindexV6ArbTaskGatedCheckTaskHashPassZeroTest is Test { function testCheckTaskHashPassesWhenZero(bytes memory runtimeBytecode) external { // Construct with empty bytecode so iTaskHash == 0. TaskV2 memory constructTask = TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), ""), new SignedContextV1[](0) ); ChildRaindexV6ArbTaskGated child = new ChildRaindexV6ArbTaskGated(RaindexV6ArbConfig(constructTask)); @@ -28,9 +27,7 @@ contract RaindexV6ArbTaskGatedCheckTaskHashPassZeroTest is Test { // Any runtime task should pass. TaskV2 memory runtimeTask = TaskV2( EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - runtimeBytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), runtimeBytecode ), new SignedContextV1[](0) ); diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol index 0754cdf375..a5a5514a9c 100644 --- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol @@ -5,10 +5,13 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig, WrongTask} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// _checkTaskHash MUST revert with WrongTask when iTaskHash is nonzero and /// the runtime task does not match. @@ -19,17 +22,13 @@ contract RaindexV6ArbTaskGatedCheckTaskHashWrongTaskTest is Test { TaskV2 memory constructTask = TaskV2( EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - constructBytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), constructBytecode ), new SignedContextV1[](0) ); TaskV2 memory runtimeTask = TaskV2( EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - runtimeBytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), runtimeBytecode ), new SignedContextV1[](0) ); diff --git a/test/abstract/RaindexV6ArbTaskGated.construct.t.sol b/test/abstract/RaindexV6ArbTaskGated.construct.t.sol index 89b4c4446e..ec40430129 100644 --- a/test/abstract/RaindexV6ArbTaskGated.construct.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.construct.t.sol @@ -5,20 +5,19 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig, RaindexV6ArbCommon} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// Construction MUST emit the Construct event with the sender and config. contract RaindexV6ArbTaskGatedConstructTest is Test { function testConstructEmitsEvent(bytes memory bytecode) external { TaskV2 memory task = TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode), new SignedContextV1[](0) ); RaindexV6ArbConfig memory config = RaindexV6ArbConfig(task); diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol index 740b2771a8..146521a56e 100644 --- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol @@ -5,10 +5,13 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// The constructor branch on `bytecode.length != 0` MUST trip at the exact /// boundary of one byte: empty bytecode leaves `iTaskHash` at zero (branch not @@ -18,11 +21,7 @@ import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreter contract RaindexV6ArbTaskGatedITaskHashBoundaryTest is Test { function buildTask(bytes memory bytecode) internal pure returns (TaskV2 memory) { return TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode), new SignedContextV1[](0) ); } diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol index bf4c5796e6..ef65a7af85 100644 --- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol @@ -5,10 +5,13 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// When constructed with non-empty bytecode the task hash MUST be the /// keccak256 of the abi-encoded task. @@ -17,11 +20,7 @@ contract RaindexV6ArbTaskGatedITaskHashNonzeroTest is Test { vm.assume(bytecode.length > 0); TaskV2 memory task = TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode), new SignedContextV1[](0) ); ChildRaindexV6ArbTaskGated child = new ChildRaindexV6ArbTaskGated(RaindexV6ArbConfig(task)); diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol index 6225ab57f4..f20afff6cb 100644 --- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol +++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol @@ -5,20 +5,19 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol"; import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol"; -import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// When constructed with empty bytecode the task hash MUST be zero. contract RaindexV6ArbTaskGatedITaskHashZeroTest is Test { function testITaskHashZeroEmptyBytecode() external { TaskV2 memory task = TaskV2( - EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" - ), + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), ""), new SignedContextV1[](0) ); ChildRaindexV6ArbTaskGated child = new ChildRaindexV6ArbTaskGated(RaindexV6ArbConfig(task)); diff --git a/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol b/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol index a33179b555..02436e7cb9 100644 --- a/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol @@ -16,11 +16,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; import {MaliciousRaindex} from "test/util/concrete/MaliciousRaindex.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol b/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol index ecddf35365..8e0b24a60b 100644 --- a/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol @@ -12,11 +12,14 @@ import { TaskV2, EvaluableV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; /// @title RaindexV6FlashBorrowerBeforeArbOrderTest /// @notice Pins the ORDERING of `arb4`: `_beforeArb(task)` is called BEFORE the @@ -30,9 +33,7 @@ contract RaindexV6FlashBorrowerBeforeArbOrderTest is Test { function _gatedTask(bytes memory bytecode) internal pure returns (TaskV2 memory) { return TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode ), signedContext: new SignedContextV1[](0) }); diff --git a/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol b/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol index 4acc62d1b1..1647d23843 100644 --- a/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol @@ -17,9 +17,9 @@ import { SignedContextV1, TaskV2, IInterpreterV4 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev Discriminates that `arb4` passes the INPUT token's OWN decimals and the /// OUTPUT token's OWN decimals to `finalizeArb` in the correct positions. The diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol index de991e5c3d..e506f16378 100644 --- a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol @@ -16,12 +16,12 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LossyConversionFromFloat} from "rain-math-float-0.1.1/src/error/ErrDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LossyConversionFromFloat} from "rain-math-float-0.2.1/src/error/ErrDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol index 09d0d360bf..0faa61d46a 100644 --- a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol index 6e283bc043..7a3972745a 100644 --- a/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol @@ -17,11 +17,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol b/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol index 6cf756885e..9a6b877ee9 100644 --- a/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol @@ -15,11 +15,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol b/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol index 6cf0c861e5..c307f652bc 100644 --- a/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol @@ -15,9 +15,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract RaindexV6FlashBorrowerIOIsInputTest is ArbTest { function buildArb() internal override returns (address payable) { @@ -49,9 +52,7 @@ contract RaindexV6FlashBorrowerIOIsInputTest is ArbTest { "", TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol b/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol index 8ab3648105..684c378267 100644 --- a/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol b/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol index 26b2b3928f..2085abf182 100644 --- a/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol @@ -14,9 +14,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract RaindexV6FlashBorrowerNoOrdersTest is ArbTest { function buildArb() internal override returns (address payable) { @@ -44,9 +47,7 @@ contract RaindexV6FlashBorrowerNoOrdersTest is ArbTest { "", TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol b/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol index d393047388..acd4a815c3 100644 --- a/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol b/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol index fc54e0970f..07b3f8dbee 100644 --- a/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol b/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol index aba8255270..4ceea49179 100644 --- a/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol +++ b/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol @@ -14,11 +14,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol b/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol index 8ce11291b5..c07439e657 100644 --- a/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol +++ b/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol @@ -6,7 +6,7 @@ import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMoc import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {FlashLenderCallbackFailed} from "../../src/abstract/RaindexV6FlashLender.sol"; diff --git a/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol b/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol index b9a6787a45..00fbacfc87 100644 --- a/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol +++ b/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol @@ -6,7 +6,7 @@ import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMoc import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; /// @title RaindexV6FlashLenderMockSuccessTest diff --git a/test/abstract/RaindexV6FlashLender.reentrant.t.sol b/test/abstract/RaindexV6FlashLender.reentrant.t.sol index beed62b569..3a79287af8 100644 --- a/test/abstract/RaindexV6FlashLender.reentrant.t.sol +++ b/test/abstract/RaindexV6FlashLender.reentrant.t.sol @@ -11,13 +11,13 @@ import { TakeOrdersConfigV5, ClearConfigV2, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {EvaluableV4, SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {EvaluableV4, SignedContextV1} from "rainlang-interface-0.2.8/src/interface/IInterpreterCallerV4.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6FlashLenderReentrant /// Test that flash borrowers can reenter the raindex, which is necessary for diff --git a/test/abstract/RaindexV6FlashLender.transfers.t.sol b/test/abstract/RaindexV6FlashLender.transfers.t.sol index fee4891ff3..b6630ff1fc 100644 --- a/test/abstract/RaindexV6FlashLender.transfers.t.sol +++ b/test/abstract/RaindexV6FlashLender.transfers.t.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; import {IERC20Errors} from "@openzeppelin-contracts-5.6.1/token/ERC20/ERC20.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {FlashLenderCallbackFailed} from "../../src/abstract/RaindexV6FlashLender.sol"; import {TKN} from "test/util/concrete/TKN.sol"; import {IPull} from "test/util/concrete/IPull.sol"; diff --git a/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol b/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol index 465b548bc0..d51e659312 100644 --- a/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol +++ b/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol @@ -14,9 +14,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract GenericPoolRaindexV6ArbOrderTakerSenderTest is GenericPoolRaindexV6ArbOrderTakerTest { /// forge-config: default.fuzz.runs = 10 @@ -36,9 +39,7 @@ contract GenericPoolRaindexV6ArbOrderTakerSenderTest is GenericPoolRaindexV6ArbO }), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol index 07e76aa7f4..9f624e6b45 100644 --- a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol +++ b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol @@ -15,11 +15,11 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol index 266bcec684..dda95f8b87 100644 --- a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol +++ b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol @@ -14,9 +14,12 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract GenericPoolRaindexV6FlashBorrowerTest is ArbTest { function buildArb() internal override returns (address payable) { @@ -47,9 +50,7 @@ contract GenericPoolRaindexV6FlashBorrowerTest is ArbTest { abi.encode(iRefundoor, iRefundoor, ""), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol index 6c41ed7c69..74ab915e69 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol @@ -6,9 +6,9 @@ import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IRouteProcessor} from "src/interface/IRouteProcessor.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol index 6c6cee33ca..51cb5528f4 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol index 069197449c..4d5ac9b1fc 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol @@ -16,14 +16,17 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; import {MockRouteProcessor} from "test/util/concrete/MockRouteProcessor.sol"; import {RealisticOrderTakerMockRaindex} from "test/util/concrete/RealisticOrderTakerMockRaindex.sol"; @@ -65,9 +68,7 @@ contract RouteProcessorRaindexV6ArbOrderTakerNonStandardDecimalsTest is Test { OrderV4 memory order = OrderV4({ owner: address(0x1234), evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), validInputs: validInputs, validOutputs: validOutputs, @@ -91,9 +92,7 @@ contract RouteProcessorRaindexV6ArbOrderTakerNonStandardDecimalsTest is Test { }), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol index 51657454f7..f794a0e9cf 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol @@ -16,11 +16,11 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol index 1693a23dcc..94c0bc0b97 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol index 905de12845..d85769cbfb 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol @@ -5,12 +5,12 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IRouteProcessor} from "src/interface/IRouteProcessor.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; import {MockRouteProcessor} from "test/util/concrete/MockRouteProcessor.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; /// @title RouteProcessorRaindexV6ArbOrderTakerOnTakeOrders2FuzzTest diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol index 9793f3198e..fd52072351 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol @@ -14,10 +14,13 @@ import { IInterpreterStoreV3, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; contract RouteProcessorRaindexV6ArbOrderTakerSenderTest is RouteProcessorRaindexV6ArbOrderTakerTest { /// forge-config: default.fuzz.runs = 100 @@ -39,9 +42,7 @@ contract RouteProcessorRaindexV6ArbOrderTakerSenderTest is RouteProcessorRaindex }), TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - "" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), "" ), signedContext: new SignedContextV1[](0) }) diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol index 6f17626f77..12da71d391 100644 --- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol +++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol"; -import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; diff --git a/test/concrete/parser/RaindexV6SubParser.ierc165.t.sol b/test/concrete/parser/RaindexV6SubParser.ierc165.t.sol index d4fcbd285b..f983bf4ef6 100644 --- a/test/concrete/parser/RaindexV6SubParser.ierc165.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.ierc165.t.sol @@ -6,10 +6,10 @@ import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol"; import {RaindexV6SubParser} from "../../../src/concrete/parser/RaindexV6SubParser.sol"; -import {ISubParserV4} from "rain-interpreter-interface-0.1.0/src/interface/ISubParserV4.sol"; +import {ISubParserV4} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; -import {IParserToolingV1} from "rain-sol-codegen-0.1.0/src/interface/IParserToolingV1.sol"; -import {ISubParserToolingV1} from "rain-sol-codegen-0.1.0/src/interface/ISubParserToolingV1.sol"; +import {IParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IParserToolingV1.sol"; +import {ISubParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/ISubParserToolingV1.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; diff --git a/test/concrete/parser/RaindexV6SubParser.pointers.t.sol b/test/concrete/parser/RaindexV6SubParser.pointers.t.sol index 3ffb8d458a..4b87214d04 100644 --- a/test/concrete/parser/RaindexV6SubParser.pointers.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.pointers.t.sol @@ -14,7 +14,7 @@ import { SUB_PARSER_OPERAND_HANDLERS, RaindexV6SubParser } from "../../../src/concrete/parser/RaindexV6SubParser.sol"; -import {LibGenParseMeta} from "rain-interpreter-interface-0.1.0/src/lib/codegen/LibGenParseMeta.sol"; +import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; diff --git a/test/concrete/parser/RaindexV6SubParser.routing.t.sol b/test/concrete/parser/RaindexV6SubParser.routing.t.sol index d601950164..ecaa71a766 100644 --- a/test/concrete/parser/RaindexV6SubParser.routing.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.routing.t.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {OperandV2} from "rain-interpreter-interface-0.1.0/src/interface/ISubParserV4.sol"; -import {OPCODE_CONTEXT} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {OperandV2} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; +import {OPCODE_CONTEXT} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; import {LibRaindexSubParser} from "../../../src/lib/LibRaindexSubParser.sol"; /// @title RaindexV6SubParserRoutingTest diff --git a/test/concrete/parser/RaindexV6SubParser.routingTokenDecimalsAndMasks.t.sol b/test/concrete/parser/RaindexV6SubParser.routingTokenDecimalsAndMasks.t.sol index ae07112ebc..da15820e74 100644 --- a/test/concrete/parser/RaindexV6SubParser.routingTokenDecimalsAndMasks.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.routingTokenDecimalsAndMasks.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {OperandV2} from "rain-interpreter-interface-0.1.0/src/interface/ISubParserV4.sol"; -import {OPCODE_CONTEXT} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {ContextGridOverflow} from "rainlang-0.1.5/src/error/ErrSubParse.sol"; -import {LibSubParse} from "rainlang-0.1.5/src/lib/parse/LibSubParse.sol"; +import {OperandV2} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; +import {OPCODE_CONTEXT} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {ContextGridOverflow} from "rainlang-0.2.5/src/error/ErrSubParse.sol"; +import {LibSubParse} from "rainlang-0.2.5/src/lib/parse/LibSubParse.sol"; import {LibRaindexSubParser} from "../../../src/lib/LibRaindexSubParser.sol"; /// @title RaindexV6SubParserRoutingTokenDecimalsAndMasksTest diff --git a/test/concrete/parser/RaindexV6SubParser.signedContext.t.sol b/test/concrete/parser/RaindexV6SubParser.signedContext.t.sol index b28707ea89..7070d1974a 100644 --- a/test/concrete/parser/RaindexV6SubParser.signedContext.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.signedContext.t.sol @@ -2,10 +2,10 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {StackAllocationMismatch} from "rainlang-0.1.5/src/error/ErrIntegrity.sol"; -import {ExpectedOperand, UnexpectedOperandValue} from "rainlang-0.1.5/src/error/ErrParse.sol"; +import {StackAllocationMismatch} from "rainlang-0.2.5/src/error/ErrIntegrity.sol"; +import {ExpectedOperand, UnexpectedOperandValue} from "rainlang-0.2.5/src/error/ErrParse.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; -import {OpTest, StackItem} from "rainlang-0.1.5/src/../test/abstract/OpTest.sol"; +import {OpTest, StackItem} from "rainlang-0.2.5/src/../test/abstract/OpTest.sol"; import {LibRaindexSubParserContextFixture} from "test/util/fixture/LibRaindexSubParserContextFixture.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; diff --git a/test/concrete/parser/RaindexV6SubParser.signers.t.sol b/test/concrete/parser/RaindexV6SubParser.signers.t.sol index 45fdc44e43..f176be16e9 100644 --- a/test/concrete/parser/RaindexV6SubParser.signers.t.sol +++ b/test/concrete/parser/RaindexV6SubParser.signers.t.sol @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {StackAllocationMismatch} from "rainlang-0.1.5/src/error/ErrIntegrity.sol"; -import {ExpectedOperand, UnexpectedOperandValue} from "rainlang-0.1.5/src/error/ErrParse.sol"; -import {OpTest, StackItem} from "rainlang-0.1.5/src/../test/abstract/OpTest.sol"; +import {StackAllocationMismatch} from "rainlang-0.2.5/src/error/ErrIntegrity.sol"; +import {ExpectedOperand, UnexpectedOperandValue} from "rainlang-0.2.5/src/error/ErrParse.sol"; +import {OpTest, StackItem} from "rainlang-0.2.5/src/../test/abstract/OpTest.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; import {LibRaindexSubParserContextFixture} from "test/util/fixture/LibRaindexSubParserContextFixture.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; diff --git a/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol b/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol index 85bd77bfee..d0c63efdb7 100644 --- a/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol +++ b/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol @@ -9,7 +9,7 @@ import { TaskV2, OrderV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol b/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol index 8d1ff73718..fe76ce8f8f 100644 --- a/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol +++ b/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol @@ -3,13 +3,11 @@ pragma solidity =0.8.25; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; -import {OrderConfigV4, OrderV4, IOV2, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, IOV2, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {NotRainMetaV1, META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.7/src/interface/unstable/IMetaV1_2.sol"; import {LibMeta} from "rain-metadata-0.1.7/src/lib/LibMeta.sol"; -import { - IExpressionDeployerV3 -} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; +import {IExpressionDeployerV3} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; /// @title RaindexV6AddOrderMockTest /// @notice Tests the addOrder function of the RaindexV6 contract. diff --git a/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol b/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol index b1aa4d06bd..f87f5b6c33 100644 --- a/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol +++ b/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; -import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol b/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol index 54518ff825..3c67320b67 100644 --- a/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol +++ b/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; -import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.addOrder.t.sol b/test/concrete/raindex/RaindexV6.addOrder.t.sol index e6f3397920..7121a0f349 100644 --- a/test/concrete/raindex/RaindexV6.addOrder.t.sol +++ b/test/concrete/raindex/RaindexV6.addOrder.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; -import {OrderConfigV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol"; +import {OrderConfigV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol"; /// @title RaindexV6AddOrderTest diff --git a/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol b/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol index 3ccdb6f855..e8c467293a 100644 --- a/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol +++ b/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol @@ -20,7 +20,7 @@ import { CONTEXT_VAULT_IO_BALANCE_BEFORE, CONTEXT_VAULT_IO_BALANCE_DIFF } from "src/lib/LibRaindex.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import { IRaindexV6, OrderV4, @@ -30,12 +30,12 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4, EvalV4, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4, EvalV4, StackItem} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; import {ITOFUTokenDecimals, TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibOrder} from "src/lib/LibOrder.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol"; diff --git a/test/concrete/raindex/RaindexV6.clear.badStack.t.sol b/test/concrete/raindex/RaindexV6.clear.badStack.t.sol index dc7df3bd64..08c816a57a 100644 --- a/test/concrete/raindex/RaindexV6.clear.badStack.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.badStack.t.sol @@ -11,7 +11,7 @@ import { ClearConfigV2, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; diff --git a/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol b/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol index e24297a955..aa713bec8d 100644 --- a/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol @@ -4,10 +4,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol"; -import {ClearStateChangeV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {OrderV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {StateNamespace} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {ClearStateChangeV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {OrderV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {StateNamespace} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; import {RaindexV6ClearStateChangeHarness} from "test/util/concrete/RaindexV6ClearStateChangeHarness.sol"; /// @title RaindexV6ClearStateChangeTest diff --git a/test/concrete/raindex/RaindexV6.clear.context.t.sol b/test/concrete/raindex/RaindexV6.clear.context.t.sol index 0e9c297eb4..729dc61c04 100644 --- a/test/concrete/raindex/RaindexV6.clear.context.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.context.t.sol @@ -12,12 +12,12 @@ import { SignedContextV1, IOV2, EvaluableV4 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; struct ClearContextVaultIds { diff --git a/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol b/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol index 136772ce06..8a9ec805ad 100644 --- a/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol @@ -7,8 +7,8 @@ import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRea import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; -import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; /// @title RaindexV6ClearDeadOrderTest /// If either order passed to `clear3` is dead (never added, or removed) the diff --git a/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol b/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol index 8e12f47fa8..dc6d916646 100644 --- a/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol @@ -15,9 +15,9 @@ import { IInterpreterV4, IInterpreterStoreV3, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; import {LibOrder} from "src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol b/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol index 9da426ff01..cf967deb94 100644 --- a/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol @@ -13,8 +13,8 @@ import { SignedContextV1, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; /// @title RaindexV6ClearHandleIORevertTest diff --git a/test/concrete/raindex/RaindexV6.clear.mock.t.sol b/test/concrete/raindex/RaindexV6.clear.mock.t.sol index d21f463dc8..d48c834361 100644 --- a/test/concrete/raindex/RaindexV6.clear.mock.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.mock.t.sol @@ -16,15 +16,15 @@ import { IInterpreterV4, TaskV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {NotOrderOwner, StackItem, NegativeBounty, ClearZeroAmount} from "../../../src/concrete/raindex/RaindexV6.sol"; -import {LibNamespace} from "rain-interpreter-interface-0.1.0/src/lib/ns/LibNamespace.sol"; -import {StateNamespace, SourceIndexV2} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {LibNamespace} from "rainlang-interface-0.2.8/src/lib/ns/LibNamespace.sol"; +import {StateNamespace, SourceIndexV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; import {Math} from "@openzeppelin-contracts-5.6.1/utils/math/Math.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; import {console2} from "forge-std-1.16.2/src/console2.sol"; import {MockInterpreter} from "test/util/concrete/MockInterpreter.sol"; diff --git a/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol b/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol index ed9de13095..77acb054fb 100644 --- a/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; import {SameOwner} from "../../../src/concrete/raindex/RaindexV6.sol"; /// Clearing two orders with the same owner must revert with SameOwner. diff --git a/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol b/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol index 4db8e5df4e..9c9f2bfef7 100644 --- a/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol @@ -11,7 +11,7 @@ import { ClearConfigV2, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; contract RaindexV6ClearSameTokenTest is RaindexV6ExternalRealTest { diff --git a/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol b/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol index c27bbbfa95..63faf47993 100644 --- a/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol +++ b/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol @@ -9,7 +9,7 @@ import { TaskV2, SignedContextV1, ClearConfigV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {ClearZeroAmount} from "../../../src/concrete/raindex/RaindexV6.sol"; diff --git a/test/concrete/raindex/RaindexV6.deposit.entask.t.sol b/test/concrete/raindex/RaindexV6.deposit.entask.t.sol index 539e8c3ad5..2cdb0b71ed 100644 --- a/test/concrete/raindex/RaindexV6.deposit.entask.t.sol +++ b/test/concrete/raindex/RaindexV6.deposit.entask.t.sol @@ -8,10 +8,10 @@ import { EvaluableV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; diff --git a/test/concrete/raindex/RaindexV6.deposit.t.sol b/test/concrete/raindex/RaindexV6.deposit.t.sol index 5350f86db0..946545d2c6 100644 --- a/test/concrete/raindex/RaindexV6.deposit.t.sol +++ b/test/concrete/raindex/RaindexV6.deposit.t.sol @@ -5,10 +5,10 @@ pragma solidity =0.8.25; import {stdError} from "forge-std-1.16.2/src/Test.sol"; import {REVERTING_MOCK_BYTECODE, CONSOLE_ADDRESS} from "test/util/lib/LibTestConstants.sol"; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; -import {TaskV2, EvaluableV4, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, EvaluableV4, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {Reenteroor} from "test/util/concrete/Reenteroor.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; diff --git a/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol b/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol index c5f0dac1bd..3b727027e1 100644 --- a/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol +++ b/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol @@ -3,12 +3,12 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IRaindexV6Stub} from "test/util/abstract/IRaindexV6Stub.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; diff --git a/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol b/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol index e7078d2029..5d6938f851 100644 --- a/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol +++ b/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol @@ -9,7 +9,7 @@ import { EvaluableV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.entask.t.sol b/test/concrete/raindex/RaindexV6.entask.t.sol index e4298cfcdd..20cd2a42df 100644 --- a/test/concrete/raindex/RaindexV6.entask.t.sol +++ b/test/concrete/raindex/RaindexV6.entask.t.sol @@ -8,7 +8,7 @@ import { EvaluableV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; contract RaindexV6EnactTest is RaindexV6ExternalRealTest { function checkReentrancyRW() internal view { diff --git a/test/concrete/raindex/RaindexV6.multicall.t.sol b/test/concrete/raindex/RaindexV6.multicall.t.sol index 850314a682..c39a1fef50 100644 --- a/test/concrete/raindex/RaindexV6.multicall.t.sol +++ b/test/concrete/raindex/RaindexV6.multicall.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; -import {IRaindexV6, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {IRaindexV6, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// `multicall` is inherited from OpenZeppelin and not declared on the Raindex /// interface, so reach it through a minimal local interface. diff --git a/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol b/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol index 2cbab91ccb..afbf93ed00 100644 --- a/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol +++ b/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol @@ -10,7 +10,7 @@ import { EvaluableV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IMetaV1_2} from "rain-metadata-0.1.7/src/interface/unstable/IMetaV1_2.sol"; import {META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.7/src/lib/LibMeta.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol b/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol index e0de1234e8..474546f4a1 100644 --- a/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol +++ b/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol @@ -11,8 +11,8 @@ import { IOV2, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; /// @title RaindexV6QuoteSameTokenTest diff --git a/test/concrete/raindex/RaindexV6.quote.t.sol b/test/concrete/raindex/RaindexV6.quote.t.sol index 580750cb8a..a536cb22b9 100644 --- a/test/concrete/raindex/RaindexV6.quote.t.sol +++ b/test/concrete/raindex/RaindexV6.quote.t.sol @@ -11,14 +11,14 @@ import { TaskV2, OrderV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; /// @title RaindexV6QuoteTest contract RaindexV6QuoteTest is RaindexV6ExternalRealTest { diff --git a/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol index 395874bcbd..760252d7b7 100644 --- a/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol +++ b/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol @@ -9,7 +9,7 @@ import { OrderV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol index 215755e683..e9522b739d 100644 --- a/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol +++ b/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; -import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {NotOrderOwner} from "../../../src/concrete/raindex/RaindexV6.sol"; diff --git a/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol index 68def23b5d..71ba83760b 100644 --- a/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol +++ b/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; -import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; import {NotOrderOwner} from "../../../src/concrete/raindex/RaindexV6.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol index b5f0194c09..046b84b67d 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderConfigV4, OrderV4, TaskV2, TakeOrdersConfigV5} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {OrderConfigV4, OrderV4, TaskV2, TakeOrdersConfigV5} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol"; contract RaindexV6TakeOrderBadStackTest is RaindexV6ExternalRealTest { diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol index 7a667285c1..25cc9b4563 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol @@ -14,8 +14,8 @@ import { TakeOrdersConfigV5, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6TakeOrderBatchEvalConsistencyTest /// @notice Within a single `takeOrders4` batch, each order's `calculate` should diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol index 995053e602..ceb88576e4 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol @@ -12,8 +12,8 @@ import { TakeOrdersConfigV5, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6TakeOrderBatchStateAdversarialTest /// @notice Audit Protofire H01 (#2617): adversarial coverage of the per-owner diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol index e782d075f0..fb6486c993 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol @@ -11,8 +11,8 @@ import { TakeOrdersConfigV5, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6TakeOrderBatchStateBypassTest /// @notice Audit Protofire H01 (#2617): a stateful per-order cap enforced in an diff --git a/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol index b8bbde46b2..be5f219b97 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol index c3730c03da..27d3745c33 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; /// When an order's IORatio exceeds the taker's maximumIORatio, the order diff --git a/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol index 339dc44949..f52b1c654b 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol @@ -13,9 +13,9 @@ import { TakeOrdersConfigV5, TaskV2, IRaindexV6 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; import {MinimumIO, TokenMismatch} from "../../../src/concrete/raindex/RaindexV6.sol"; import {RecordingTaker} from "test/util/concrete/RecordingTaker.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol index db680c9c57..af67cd08bf 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol @@ -13,8 +13,8 @@ import { TakeOrdersConfigV5, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6TakeOrderFreshVaultZeroTest /// @notice Vault-0 input deferral and batch accrual, run against a diff --git a/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol index d1b9730af9..e199bbe8f9 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol @@ -12,8 +12,8 @@ import { TakeOrdersConfigV5, EvaluableV4, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol index 64deb41871..7c3f2c537b 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol @@ -13,12 +13,12 @@ import { OrderConfigV4, TaskV2, IRaindexV6 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; contract RaindexV6TakeOrderMaximumInputTest is RaindexV6ExternalRealTest { using LibDecimalFloat for Float; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol index ceede19639..793eea5e30 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol @@ -14,9 +14,9 @@ import { IOV2, EvaluableV4, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; contract RaindexV6TakeOrderMaximumOutputTest is RaindexV6ExternalRealTest { using LibDecimalFloat for Float; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol index a4c2476122..d61ac26077 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {MinimumIO} from "../../../src/concrete/raindex/RaindexV6.sol"; /// When the total taker IO is less than the configured minimumIO, diff --git a/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol index 8f18df4f5f..39fb27b5c7 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {MinimumIO} from "../../../src/concrete/raindex/RaindexV6.sol"; /// @title RaindexV6TakeOrderMinimumIOOutputTest diff --git a/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol index 12dc04be38..15f714b4f7 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol @@ -12,8 +12,8 @@ import { TakeOrdersConfigV5, TakeOrderConfigV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; /// @title RaindexV6TakeOrderNoopTest diff --git a/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol index a70386f49d..f4561fa217 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol @@ -12,8 +12,8 @@ import { OrderConfigV4, EvaluableV4, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol index d4218a1894..73afe39e3a 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol @@ -11,9 +11,9 @@ import { TakeOrderConfigV4, SignedContextV1, TakeOrdersConfigV5 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; contract RaindexV6TakeOrderSameTokenTest is RaindexV6ExternalRealTest { /// forge-config: default.fuzz.runs = 10 diff --git a/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol index 9fcb0352d8..851506511a 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; import {RecordingOrderTaker} from "test/util/concrete/RecordingOrderTaker.sol"; diff --git a/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol index cdffd6bc22..db11f6d448 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol @@ -10,9 +10,9 @@ import { TakeOrdersConfigV5, EvaluableV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {TokenMismatch} from "../../../src/concrete/raindex/RaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @title RaindexV6TakeOrderTokenMismatchTest /// @notice A test harness for testing the RaindexV6 takeOrder function. diff --git a/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol index e41fe4e19a..35e626a0be 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol @@ -15,8 +15,8 @@ import { ClearConfigV2, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {NegativeBounty} from "../../../src/concrete/raindex/RaindexV6.sol"; /// @title RaindexV6TakeOrderVaultZeroInputTest diff --git a/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol index d7a47746fd..fb50c86dbd 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol @@ -6,8 +6,8 @@ import {Vm} from "forge-std-1.16.2/src/Test.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol"; import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol"; -import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; /// @title RaindexV6TakeOrderZeroAmountTest diff --git a/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol index 274bd4deca..3a6599c3b1 100644 --- a/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol +++ b/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol @@ -9,9 +9,9 @@ import { TakeOrderConfigV4, TakeOrdersConfigV5, IRaindexV6 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// `takeOrders4` guards a zero maximum IO before dereferencing any order IO /// index, so a zero max with an out-of-range index reverts with the explicit diff --git a/test/concrete/raindex/RaindexV6.vaultBalance.t.sol b/test/concrete/raindex/RaindexV6.vaultBalance.t.sol index 4b99361dd3..3989f50934 100644 --- a/test/concrete/raindex/RaindexV6.vaultBalance.t.sol +++ b/test/concrete/raindex/RaindexV6.vaultBalance.t.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @title RaindexV6VaultBalanceTest /// Tests the basic functionality of reading from the vault balance. diff --git a/test/concrete/raindex/RaindexV6.vaultBalanceRevert.t.sol b/test/concrete/raindex/RaindexV6.vaultBalanceRevert.t.sol index 887b6bc7a0..f7da49161c 100644 --- a/test/concrete/raindex/RaindexV6.vaultBalanceRevert.t.sol +++ b/test/concrete/raindex/RaindexV6.vaultBalanceRevert.t.sol @@ -9,10 +9,10 @@ import { NegativePull, NegativePush } from "src/concrete/raindex/RaindexV6.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {RaindexV6VaultBalanceHarness} from "test/util/concrete/RaindexV6VaultBalanceHarness.sol"; diff --git a/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol b/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol index 1eb44f6cb5..14681dfa72 100644 --- a/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol +++ b/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {ITOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol"; diff --git a/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol b/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol index 613b252a42..225842012f 100644 --- a/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol +++ b/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol @@ -8,13 +8,13 @@ import { EvaluableV4, TaskV2, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibFormatDecimalFloat} from "rain-math-float-0.2.1/src/lib/format/LibFormatDecimalFloat.sol"; import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol"; import {console2} from "forge-std-1.16.2/src/Test.sol"; diff --git a/test/concrete/raindex/RaindexV6.withdraw.t.sol b/test/concrete/raindex/RaindexV6.withdraw.t.sol index 4c28c99d08..87e31f12f1 100644 --- a/test/concrete/raindex/RaindexV6.withdraw.t.sol +++ b/test/concrete/raindex/RaindexV6.withdraw.t.sol @@ -8,13 +8,13 @@ import {Math} from "@openzeppelin-contracts-5.6.1/utils/math/Math.sol"; import {RaindexV6ExternalMockTest, REVERTING_MOCK_BYTECODE} from "test/util/abstract/RaindexV6ExternalMockTest.sol"; import {Reenteroor, IERC20} from "test/util/concrete/Reenteroor.sol"; -import {TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import { LibDecimalFloatImplementation -} from "rain-math-float-0.1.1/src/lib/implementation/LibDecimalFloatImplementation.sol"; +} from "rain-math-float-0.2.1/src/lib/implementation/LibDecimalFloatImplementation.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; /// @title RaindexV6WithdrawTest diff --git a/test/lib/LibOrder.t.sol b/test/lib/LibOrder.t.sol index 7f7650adc2..168384a7ae 100644 --- a/test/lib/LibOrder.t.sol +++ b/test/lib/LibOrder.t.sol @@ -5,8 +5,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibOrder, OrderV4} from "../../src/lib/LibOrder.sol"; -import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; -import {IOV2} from "raindex-interface-0.1.3/src/interface/deprecated/v5/IOrderBookV5.sol"; +import {EvaluableV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterCallerV4.sol"; +import {IOV2} from "raindex-interface-0.1.6/src/interface/deprecated/v5/IOrderBookV5.sol"; /// @title LibOrderTest /// Exercises the LibOrder library. diff --git a/test/lib/LibRaindex.doPost.t.sol b/test/lib/LibRaindex.doPost.t.sol index 03cffc4a57..d64722cdab 100644 --- a/test/lib/LibRaindex.doPost.t.sol +++ b/test/lib/LibRaindex.doPost.t.sol @@ -4,12 +4,12 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibRaindexDoPostHarness} from "test/util/concrete/LibRaindexDoPostHarness.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {StateNamespace} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v2/IInterpreterStoreV2.sol"; -import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4, StackItem} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {StateNamespace} from "rainlang-interface-0.2.8/src/interface/deprecated/v2/IInterpreterStoreV2.sol"; +import {EvaluableV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterCallerV4.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; /// @title LibRaindexDoPostTest /// @notice Audit GAP-A11-1/2/3 (#2536): `doPost` skips work for an empty post diff --git a/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol b/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol index c5201b7cf9..d0a517b86f 100644 --- a/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol +++ b/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol @@ -3,11 +3,16 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {EvaluableV4, SignedContextV1, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import {EvaluableV4, SignedContextV1, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; +import { + LibTestInterpreterDeploy, + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS, + TEST_EXPRESSION_DEPLOYER_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; import {LibTestArb, ArbResult} from "test/util/lib/LibTestArb.sol"; /// @title LibRaindexArbFinalizeArbTaskContextTest @@ -16,9 +21,9 @@ import {LibTestArb, ArbResult} from "test/util/lib/LibTestArb.sol"; /// context<1 2>=gas balance. Column 0 is the calling context added by LibContext. contract LibRaindexArbFinalizeArbTaskContextTest is Test { function testFinalizeArbTaskContextValues() external { - LibInterpreterDeploy.etchRainlang(vm); + LibTestInterpreterDeploy.etchTestRainlang(vm); - IParserV2 parser = IParserV2(LibInterpreterDeploy.EXPRESSION_DEPLOYER_DEPLOYED_ADDRESS); + IParserV2 parser = IParserV2(TEST_EXPRESSION_DEPLOYER_ADDRESS); // Task expression: ensure context values match expected Floats. // 20e18 input profit with 18 decimals → Float(20). @@ -36,9 +41,7 @@ contract LibRaindexArbFinalizeArbTaskContextTest is Test { TaskV2 memory task = TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - taskBytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), taskBytecode ), signedContext: new SignedContextV1[](0) }); @@ -60,9 +63,9 @@ contract LibRaindexArbFinalizeArbTaskContextTest is Test { /// column would survive it. Here input profit is zero while output profit is /// 20 and gas is 1 ether, pinning all three columns at distinct values. function testFinalizeArbContextNonZeroOutputAndGas() external { - LibInterpreterDeploy.etchRainlang(vm); + LibTestInterpreterDeploy.etchTestRainlang(vm); - IParserV2 parser = IParserV2(LibInterpreterDeploy.EXPRESSION_DEPLOYER_DEPLOYED_ADDRESS); + IParserV2 parser = IParserV2(TEST_EXPRESSION_DEPLOYER_ADDRESS); // 0 input profit → Float(0); 20e18 output profit (18 dp) → Float(20); // 1 ether gas swept (packed at -18) → Float(1). @@ -78,9 +81,7 @@ contract LibRaindexArbFinalizeArbTaskContextTest is Test { TaskV2 memory task = TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - taskBytecode + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), taskBytecode ), signedContext: new SignedContextV1[](0) }); diff --git a/test/lib/deploy/LibRaindexDeploy.t.sol b/test/lib/deploy/LibRaindexDeploy.t.sol index d518a69fad..614f5fb82f 100644 --- a/test/lib/deploy/LibRaindexDeploy.t.sol +++ b/test/lib/deploy/LibRaindexDeploy.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; import {RaindexV6} from "../../../src/concrete/raindex/RaindexV6.sol"; diff --git a/test/lib/deploy/LibRaindexDeployIsStartBlockBase.t.sol b/test/lib/deploy/LibRaindexDeployIsStartBlockBase.t.sol index d4317998f1..23079627d0 100644 --- a/test/lib/deploy/LibRaindexDeployIsStartBlockBase.t.sol +++ b/test/lib/deploy/LibRaindexDeployIsStartBlockBase.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "src/lib/deploy/LibRaindexDeploy.sol"; /// @title LibRaindexDeployIsStartBlockBaseTest diff --git a/test/lib/deploy/LibRaindexDeployIsStartBlockFlare.t.sol b/test/lib/deploy/LibRaindexDeployIsStartBlockFlare.t.sol index c3d8eadb89..97be74d5f9 100644 --- a/test/lib/deploy/LibRaindexDeployIsStartBlockFlare.t.sol +++ b/test/lib/deploy/LibRaindexDeployIsStartBlockFlare.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "src/lib/deploy/LibRaindexDeploy.sol"; /// @title LibRaindexDeployIsStartBlockFlareTest diff --git a/test/lib/deploy/LibRaindexDeployIsStartBlockPolygon.t.sol b/test/lib/deploy/LibRaindexDeployIsStartBlockPolygon.t.sol index be63beda80..85cef776a7 100644 --- a/test/lib/deploy/LibRaindexDeployIsStartBlockPolygon.t.sol +++ b/test/lib/deploy/LibRaindexDeployIsStartBlockPolygon.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "src/lib/deploy/LibRaindexDeploy.sol"; /// @title LibRaindexDeployIsStartBlockPolygonTest diff --git a/test/lib/deploy/LibRaindexDeployProd.t.sol b/test/lib/deploy/LibRaindexDeployProd.t.sol index 177826f78d..b0723e575f 100644 --- a/test/lib/deploy/LibRaindexDeployProd.t.sol +++ b/test/lib/deploy/LibRaindexDeployProd.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; /// @title LibRaindexDeployProdTest diff --git a/test/util/abstract/ArbTest.sol b/test/util/abstract/ArbTest.sol index 03c3c26440..88e69ba9f2 100644 --- a/test/util/abstract/ArbTest.sol +++ b/test/util/abstract/ArbTest.sol @@ -15,7 +15,7 @@ import { EvaluableV4 } from "test/util/concrete/FlashLendingMockRaindex.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; abstract contract ArbTest is Test { diff --git a/test/util/abstract/IRaindexV6Stub.sol b/test/util/abstract/IRaindexV6Stub.sol index a3a2f089f7..e9825e5a9c 100644 --- a/test/util/abstract/IRaindexV6Stub.sol +++ b/test/util/abstract/IRaindexV6Stub.sol @@ -13,9 +13,9 @@ import { TaskV2, QuoteV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IERC3156FlashLender} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashLender.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IERC3156FlashLender} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashLender.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; abstract contract IRaindexV6Stub is IRaindexV6 { /// @inheritdoc IRaindexV6 diff --git a/test/util/abstract/MockRaindexBase.sol b/test/util/abstract/MockRaindexBase.sol index a21614973b..73817a31ec 100644 --- a/test/util/abstract/MockRaindexBase.sol +++ b/test/util/abstract/MockRaindexBase.sol @@ -14,8 +14,8 @@ import { TaskV2, QuoteV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; /// @dev Base for mock raindex contracts that stub all IRaindexV6 functions. /// Inheritors override flashLoan and/or takeOrders4 with real token transfers. diff --git a/test/util/abstract/RaindexV6ExternalMockTest.sol b/test/util/abstract/RaindexV6ExternalMockTest.sol index 146819b8fd..d85517738e 100644 --- a/test/util/abstract/RaindexV6ExternalMockTest.sol +++ b/test/util/abstract/RaindexV6ExternalMockTest.sol @@ -9,17 +9,17 @@ import {IMetaV1_2} from "rain-metadata-0.1.7/src/lib/LibMeta.sol"; import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol"; import {IRaindexV6Stub} from "test/util/abstract/IRaindexV6Stub.sol"; import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {IRaindexV6, OrderConfigV4, OrderV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {IRaindexV6, OrderConfigV4, OrderV4, TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; -import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; +import {EvaluableV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterCallerV4.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; /// @title RaindexV6ExternalTest /// Abstract contract that performs common setup needed for testing a raindex diff --git a/test/util/abstract/RaindexV6ExternalRealTest.sol b/test/util/abstract/RaindexV6ExternalRealTest.sol index b1ff1f3263..6e615c9a1d 100644 --- a/test/util/abstract/RaindexV6ExternalRealTest.sol +++ b/test/util/abstract/RaindexV6ExternalRealTest.sol @@ -5,22 +5,28 @@ pragma solidity =0.8.25; import {Test, Vm, console2} from "forge-std-1.16.2/src/Test.sol"; import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol"; import {IRaindexV6Stub} from "test/util/abstract/IRaindexV6Stub.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; import { IRaindexV6, IInterpreterV4, TaskV2, EvaluableV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {RaindexV6SubParser} from "../../../src/concrete/parser/RaindexV6SubParser.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +import { + LibTestInterpreterDeploy, + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS, + TEST_EXPRESSION_DEPLOYER_ADDRESS, + TEST_PARSER_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {LibEtchRaindex} from "test/util/lib/LibEtchRaindex.sol"; @@ -37,12 +43,12 @@ abstract contract RaindexV6ExternalRealTest is Test, IRaindexV6Stub { LibRainDeploy.etchZoltuFactory(vm); LibRainDeploy.deployZoltu(LibTOFUTokenDecimals.TOFU_DECIMALS_EXPECTED_CREATION_CODE); - LibInterpreterDeploy.etchRainlang(vm); + LibTestInterpreterDeploy.etchTestRainlang(vm); LibEtchRaindex.etchRaindex(vm); - iInterpreter = IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS); - iStore = IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS); - iParserV2 = IParserV2(LibInterpreterDeploy.EXPRESSION_DEPLOYER_DEPLOYED_ADDRESS); + iInterpreter = IInterpreterV4(TEST_INTERPRETER_ADDRESS); + iStore = IInterpreterStoreV3(TEST_STORE_ADDRESS); + iParserV2 = IParserV2(TEST_EXPRESSION_DEPLOYER_ADDRESS); iRaindex = IRaindexV6(LibRaindexDeploy.RAINDEX_DEPLOYED_ADDRESS); @@ -62,7 +68,7 @@ abstract contract RaindexV6ExternalRealTest is Test, IRaindexV6Stub { vm.assume(account != address(iInterpreter)); vm.assume(account != address(iStore)); vm.assume(account != address(iParserV2)); - vm.assume(account != LibInterpreterDeploy.PARSER_DEPLOYED_ADDRESS); + vm.assume(account != TEST_PARSER_ADDRESS); vm.assume(account != LibRaindexDeploy.RAINDEX_DEPLOYED_ADDRESS); vm.assume(account != address(iToken0)); diff --git a/test/util/abstract/RaindexV6SubParserContextTest.sol b/test/util/abstract/RaindexV6SubParserContextTest.sol index df9f7586d0..5ae0e05259 100644 --- a/test/util/abstract/RaindexV6SubParserContextTest.sol +++ b/test/util/abstract/RaindexV6SubParserContextTest.sol @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {StackAllocationMismatch} from "rainlang-0.1.5/src/error/ErrIntegrity.sol"; -import {OpTest, StackItem} from "rainlang-0.1.5/src/../test/abstract/OpTest.sol"; +import {StackAllocationMismatch} from "rainlang-0.2.5/src/error/ErrIntegrity.sol"; +import {OpTest, StackItem} from "rainlang-0.2.5/src/../test/abstract/OpTest.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; import {LibRaindexSubParserContextFixture} from "test/util/fixture/LibRaindexSubParserContextFixture.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; diff --git a/test/util/concrete/Alice.sol b/test/util/concrete/Alice.sol index fec9acf1a8..55385e304a 100644 --- a/test/util/concrete/Alice.sol +++ b/test/util/concrete/Alice.sol @@ -6,7 +6,7 @@ import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {IPull} from "test/util/concrete/IPull.sol"; /// Alice has some daisy contract pull tokens from her. diff --git a/test/util/concrete/CalcInterpreter.sol b/test/util/concrete/CalcInterpreter.sol index e1aa451c80..2dd949cf76 100644 --- a/test/util/concrete/CalcInterpreter.sol +++ b/test/util/concrete/CalcInterpreter.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {StackItem} from "src/concrete/raindex/RaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {EvalV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {EvalV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// A constructable interpreter mock that returns [ratio, max] for the calculate /// entrypoint and an empty stack for handle IO. diff --git a/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol b/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol index 345268955f..a535808096 100644 --- a/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol +++ b/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol @@ -4,7 +4,7 @@ pragma solidity =0.8.25; import {RaindexV6ArbOrderTaker} from "../../../src/abstract/RaindexV6ArbOrderTaker.sol"; import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @dev A task-gated arb order taker: combines the `arb5` entrypoint from /// `RaindexV6ArbOrderTaker` with the task-hash gating mixin diff --git a/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol b/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol index 49934cb0b0..14dc881e9f 100644 --- a/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol +++ b/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol @@ -4,7 +4,7 @@ pragma solidity =0.8.25; import {RaindexV6FlashBorrower} from "../../../src/abstract/RaindexV6FlashBorrower.sol"; import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @dev A task-gated flash borrower arb: combines the `arb4` entrypoint from /// `RaindexV6FlashBorrower` with the task-hash gating mixin diff --git a/test/util/concrete/ChildRaindexV6ArbTaskGated.sol b/test/util/concrete/ChildRaindexV6ArbTaskGated.sol index bf26669cf3..5597c01c89 100644 --- a/test/util/concrete/ChildRaindexV6ArbTaskGated.sol +++ b/test/util/concrete/ChildRaindexV6ArbTaskGated.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @dev We need a contract that is deployable in order to test the abstract /// base contract. Exposes `_checkTaskHash` as an external function. diff --git a/test/util/concrete/FixedStackInterpreter.sol b/test/util/concrete/FixedStackInterpreter.sol index 11e4585492..1ce6679323 100644 --- a/test/util/concrete/FixedStackInterpreter.sol +++ b/test/util/concrete/FixedStackInterpreter.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {EvalV4, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {EvalV4, StackItem} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// @dev A fixed-stack interpreter: `eval4` returns the configured stack and no /// KVs. Used to drive `calculateOrderIO`'s read-back of (IORatio, outputMax) diff --git a/test/util/concrete/FlashLendingMockRaindex.sol b/test/util/concrete/FlashLendingMockRaindex.sol index fb9613306f..82bef79bea 100644 --- a/test/util/concrete/FlashLendingMockRaindex.sol +++ b/test/util/concrete/FlashLendingMockRaindex.sol @@ -15,8 +15,8 @@ import { TaskV2, QuoteV2, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; contract FlashLendingMockRaindex is IRaindexV6 { function flashLoan(IERC3156FlashBorrower receiver, address token, uint256 amount, bytes calldata data) diff --git a/test/util/concrete/LeftoverFlashLendingMockRaindex.sol b/test/util/concrete/LeftoverFlashLendingMockRaindex.sol index 92dfc7c490..25383b12e7 100644 --- a/test/util/concrete/LeftoverFlashLendingMockRaindex.sol +++ b/test/util/concrete/LeftoverFlashLendingMockRaindex.sol @@ -7,7 +7,7 @@ import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Mock raindex whose `flashLoan` performs a real net-neutral ERC3156 diff --git a/test/util/concrete/LibRaindexArbFinalizeHarness.sol b/test/util/concrete/LibRaindexArbFinalizeHarness.sol index 95e99eb9d1..fdbd8346e0 100644 --- a/test/util/concrete/LibRaindexArbFinalizeHarness.sol +++ b/test/util/concrete/LibRaindexArbFinalizeHarness.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {LibRaindexArb} from "src/lib/LibRaindexArb.sol"; -import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; +import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; /// @dev Exposes the internal `finalizeArb` so its zero-balance sweep guards can /// be exercised directly. `finalizeArb` sends to `msg.sender`, which here is the diff --git a/test/util/concrete/LibRaindexDoPostHarness.sol b/test/util/concrete/LibRaindexDoPostHarness.sol index a26645df2a..dfa4e1017f 100644 --- a/test/util/concrete/LibRaindexDoPostHarness.sol +++ b/test/util/concrete/LibRaindexDoPostHarness.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {LibRaindex} from "src/lib/LibRaindex.sol"; -import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TaskV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; /// @dev Exposes the internal `LibRaindex.doPost` for direct testing. contract LibRaindexDoPostHarness { diff --git a/test/util/concrete/MaliciousRaindex.sol b/test/util/concrete/MaliciousRaindex.sol index 4824002de9..129493b133 100644 --- a/test/util/concrete/MaliciousRaindex.sol +++ b/test/util/concrete/MaliciousRaindex.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; -import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +import {IERC3156FlashBorrower} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Malicious raindex that records the token allowances it has from the diff --git a/test/util/concrete/MockInterpreter.sol b/test/util/concrete/MockInterpreter.sol index abce70121d..471e817bf3 100644 --- a/test/util/concrete/MockInterpreter.sol +++ b/test/util/concrete/MockInterpreter.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {StackItem} from "src/concrete/raindex/RaindexV6.sol"; -import {EvalV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {EvalV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; contract MockInterpreter { StackItem[] internal sStack; diff --git a/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol b/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol index 625b9dff86..e6fc4fde9e 100644 --- a/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol +++ b/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {RaindexV6, OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {OrderV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {OrderV4, SignedContextV1} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; diff --git a/test/util/concrete/RaindexV6ClearDriverHarness.sol b/test/util/concrete/RaindexV6ClearDriverHarness.sol index a0b3008ab7..23e9950fb7 100644 --- a/test/util/concrete/RaindexV6ClearDriverHarness.sol +++ b/test/util/concrete/RaindexV6ClearDriverHarness.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6} from "src/concrete/raindex/RaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev RaindexV6 subclass that exposes order-liveness and vault seeding so a /// full `clear3` can be driven against fresh-compiled source bytecode. diff --git a/test/util/concrete/RaindexV6ClearStateChangeHarness.sol b/test/util/concrete/RaindexV6ClearStateChangeHarness.sol index 4f37b24d33..58265a516e 100644 --- a/test/util/concrete/RaindexV6ClearStateChangeHarness.sol +++ b/test/util/concrete/RaindexV6ClearStateChangeHarness.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {RaindexV6, OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol"; -import {ClearStateChangeV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {ClearStateChangeV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev Exposes RaindexV6's internal pure clear-state-change math so it can be /// tested against a FRESH-COMPILED copy of the source (not the etched committed diff --git a/test/util/concrete/RaindexV6VaultBalanceHarness.sol b/test/util/concrete/RaindexV6VaultBalanceHarness.sol index 7394651212..edd488a5d0 100644 --- a/test/util/concrete/RaindexV6VaultBalanceHarness.sol +++ b/test/util/concrete/RaindexV6VaultBalanceHarness.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {RaindexV6} from "src/concrete/raindex/RaindexV6.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev Exposes RaindexV6's internal vault-balance / token helpers for testing. contract RaindexV6VaultBalanceHarness is RaindexV6 { diff --git a/test/util/concrete/RealisticFlashLendingMockRaindex.sol b/test/util/concrete/RealisticFlashLendingMockRaindex.sol index 665b47924e..8bb1371c98 100644 --- a/test/util/concrete/RealisticFlashLendingMockRaindex.sol +++ b/test/util/concrete/RealisticFlashLendingMockRaindex.sol @@ -4,11 +4,11 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; -import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Mock raindex with real ERC3156 flash loan transfers and real diff --git a/test/util/concrete/RealisticOrderTakerMockRaindex.sol b/test/util/concrete/RealisticOrderTakerMockRaindex.sol index 543948c1b6..85791c4b2a 100644 --- a/test/util/concrete/RealisticOrderTakerMockRaindex.sol +++ b/test/util/concrete/RealisticOrderTakerMockRaindex.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; -import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; +import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Mock raindex with real takeOrders4 transfers and onTakeOrders2 diff --git a/test/util/concrete/RecordingFlashLendingMockRaindex.sol b/test/util/concrete/RecordingFlashLendingMockRaindex.sol index a823c84438..300dbb9fb9 100644 --- a/test/util/concrete/RecordingFlashLendingMockRaindex.sol +++ b/test/util/concrete/RecordingFlashLendingMockRaindex.sol @@ -4,11 +4,11 @@ pragma solidity =0.8.25; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol"; -import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; +import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Mock raindex identical to `RealisticFlashLendingMockRaindex` (real diff --git a/test/util/concrete/RecordingOrderTaker.sol b/test/util/concrete/RecordingOrderTaker.sol index 71cadaf7bb..20f73923c1 100644 --- a/test/util/concrete/RecordingOrderTaker.sol +++ b/test/util/concrete/RecordingOrderTaker.sol @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// Records whether `onTakeOrders2` was invoked, so a test can assert the /// callback fires only when at least one order was actually taken. diff --git a/test/util/concrete/RecordingTaker.sol b/test/util/concrete/RecordingTaker.sol index 6ae4f5731f..ebf8eca4c1 100644 --- a/test/util/concrete/RecordingTaker.sol +++ b/test/util/concrete/RecordingTaker.sol @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol"; -import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IRaindexV6OrderTaker} from "raindex-interface-0.1.6/src/interface/IRaindexV6OrderTaker.sol"; +import {Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// Records onTakeOrders2 invocation + the args it was called with so a test can /// assert the callback fires only when something was taken and with the right diff --git a/test/util/concrete/Reenteroor.sol b/test/util/concrete/Reenteroor.sol index 1dfb2cfe7c..adba2eea82 100644 --- a/test/util/concrete/Reenteroor.sol +++ b/test/util/concrete/Reenteroor.sol @@ -6,7 +6,7 @@ import {Address} from "@openzeppelin-contracts-5.6.1/utils/Address.sol"; import { IERC3156FlashBorrower, ON_FLASH_LOAN_CALLBACK_SUCCESS -} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol"; +} from "raindex-interface-0.1.6/src/interface/ierc3156/IERC3156FlashBorrower.sol"; import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol"; /// @title Reenteroor diff --git a/test/util/concrete/ReentrantExchange.sol b/test/util/concrete/ReentrantExchange.sol index 5457891512..e88d8e9997 100644 --- a/test/util/concrete/ReentrantExchange.sol +++ b/test/util/concrete/ReentrantExchange.sol @@ -12,10 +12,10 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; /// @dev Exchange that re-enters arb4 when called during _exchange. contract ReentrantExchange { diff --git a/test/util/concrete/ReentrantMockRaindex.sol b/test/util/concrete/ReentrantMockRaindex.sol index ed58d9e8c6..c02094ee77 100644 --- a/test/util/concrete/ReentrantMockRaindex.sol +++ b/test/util/concrete/ReentrantMockRaindex.sol @@ -12,9 +12,9 @@ import { EvaluableV4, SignedContextV1, Float -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol"; /// @dev Mock Raindex whose takeOrders4 callback re-enters arb5 on the taker. diff --git a/test/util/lib/LibTestAddOrder.sol b/test/util/lib/LibTestAddOrder.sol index 4621d94b18..3ecea125c3 100644 --- a/test/util/lib/LibTestAddOrder.sol +++ b/test/util/lib/LibTestAddOrder.sol @@ -4,12 +4,12 @@ pragma solidity ^0.8.19; import {META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.7/src/lib/LibMeta.sol"; import {LibOrder} from "../../../src/lib/LibOrder.sol"; -import {OrderConfigV4, OrderV4, IOV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4, SourceIndexV2} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; +import {OrderConfigV4, OrderV4, IOV2} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4, SourceIndexV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {EvaluableV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterCallerV4.sol"; import {HANDLE_IO_ENTRYPOINT} from "../../../src/concrete/raindex/RaindexV6.sol"; -import {LibBytecode} from "rain-interpreter-interface-0.1.0/src/lib/bytecode/LibBytecode.sol"; +import {LibBytecode} from "rainlang-interface-0.2.8/src/lib/bytecode/LibBytecode.sol"; library LibTestAddOrder { /// Serialized parser (parse2) output for "_ _:1e18 1e18;:;": the diff --git a/test/util/lib/LibTestArb.sol b/test/util/lib/LibTestArb.sol index e8fcefc595..f95e64f415 100644 --- a/test/util/lib/LibTestArb.sol +++ b/test/util/lib/LibTestArb.sol @@ -13,12 +13,15 @@ import { EvaluableV4, SignedContextV1, TaskV2 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; import {GenericPoolRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; @@ -55,9 +58,7 @@ library LibTestArb { function noopTask() internal pure returns (TaskV2 memory) { return TaskV2({ evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), signedContext: new SignedContextV1[](0) }); @@ -114,9 +115,7 @@ library LibTestArb { OrderV4 memory order = OrderV4({ owner: address(0x1234), evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), validInputs: validInputs, validOutputs: validOutputs, @@ -182,9 +181,7 @@ library LibTestArb { OrderV4 memory order = OrderV4({ owner: address(0x1234), evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), validInputs: validInputs, validOutputs: validOutputs, diff --git a/test/util/lib/LibTestFlashBorrowerArb.sol b/test/util/lib/LibTestFlashBorrowerArb.sol index e618b9e828..be65ab8301 100644 --- a/test/util/lib/LibTestFlashBorrowerArb.sol +++ b/test/util/lib/LibTestFlashBorrowerArb.sol @@ -12,13 +12,16 @@ import { IOV2, EvaluableV4, SignedContextV1 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.8/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; import {GenericPoolRaindexV6FlashBorrower} from "../../../src/concrete/arb/GenericPoolRaindexV6FlashBorrower.sol"; import {MockToken} from "test/util/concrete/MockToken.sol"; @@ -77,9 +80,7 @@ library LibTestFlashBorrowerArb { OrderV4 memory order = OrderV4({ owner: address(0x1234), evaluable: EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - hex"" + IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), hex"" ), validInputs: validInputs, validOutputs: validOutputs, diff --git a/test/util/lib/LibTestTakeOrder.sol b/test/util/lib/LibTestTakeOrder.sol index 8933c11bb9..592a65b6ab 100644 --- a/test/util/lib/LibTestTakeOrder.sol +++ b/test/util/lib/LibTestTakeOrder.sol @@ -12,13 +12,17 @@ import { OrderConfigV4, TaskV2, IRaindexV6 -} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol"; -import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; -import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol"; -import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol"; -import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; -import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol"; +} from "raindex-interface-0.1.6/src/interface/IRaindexV6.sol"; +import {IInterpreterV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; +import {IInterpreterStoreV3} from "rainlang-interface-0.2.8/src/interface/IInterpreterStoreV3.sol"; +import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; +import {SignedContextV1} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {Float, LibDecimalFloat} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; +import { + TEST_INTERPRETER_ADDRESS, + TEST_STORE_ADDRESS, + TEST_EXPRESSION_DEPLOYER_ADDRESS +} from "rainlang-0.2.5/test/lib/deploy/LibTestInterpreterDeploy.sol"; import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol"; library LibTestTakeOrder { @@ -40,7 +44,7 @@ library LibTestTakeOrder { address outputToken, bytes32 outputVaultId ) internal returns (OrderV4 memory) { - IParserV2 parser = IParserV2(LibInterpreterDeploy.EXPRESSION_DEPLOYER_DEPLOYED_ADDRESS); + IParserV2 parser = IParserV2(TEST_EXPRESSION_DEPLOYER_ADDRESS); IRaindexV6 raindex = IRaindexV6(LibRaindexDeploy.RAINDEX_DEPLOYED_ADDRESS); bytes memory bytecode = parser.parse2(expression); @@ -49,11 +53,8 @@ library LibTestTakeOrder { IOV2[] memory outputs = new IOV2[](1); outputs[0] = IOV2(outputToken, outputVaultId); - EvaluableV4 memory evaluable = EvaluableV4( - IInterpreterV4(LibInterpreterDeploy.INTERPRETER_DEPLOYED_ADDRESS), - IInterpreterStoreV3(LibInterpreterDeploy.STORE_DEPLOYED_ADDRESS), - bytecode - ); + EvaluableV4 memory evaluable = + EvaluableV4(IInterpreterV4(TEST_INTERPRETER_ADDRESS), IInterpreterStoreV3(TEST_STORE_ADDRESS), bytecode); OrderConfigV4 memory orderConfig = OrderConfigV4(evaluable, inputs, outputs, bytes32(0), bytes32(0), ""); vm.prank(owner);