diff --git a/.gas-snapshot b/.gas-snapshot index 40cb347b3..1ecfb10fc 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,302 +1,413 @@ -Burn_LockupDynamic_Integration_Concrete_Test:test_Burn_CallerApprovedOperator() (gas: 82944) -Burn_LockupDynamic_Integration_Concrete_Test:test_Burn_CallerNFTOwner() (gas: 70040) -Burn_LockupLinear_Integration_Concrete_Test:test_Burn_CallerApprovedOperator() (gas: 83160) -Burn_LockupLinear_Integration_Concrete_Test:test_Burn_CallerNFTOwner() (gas: 70299) -CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_CancelMultiple() (gas: 825327) -CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_CancelMultiple_ArrayCountZero() (gas: 6249) -CancelMultiple_LockupDynamic_Integration_Fuzz_Test:testFuzz_CancelMultiple(uint256,uint40) (runs: 50, μ: 1189888, ~: 1194666) -CancelMultiple_LockupLinear_Integration_Concrete_Test:test_CancelMultiple() (gas: 558971) -CancelMultiple_LockupLinear_Integration_Concrete_Test:test_CancelMultiple_ArrayCountZero() (gas: 6313) -CancelMultiple_LockupLinear_Integration_Fuzz_Test:testFuzz_CancelMultiple(uint256,uint40) (runs: 50, μ: 792602, ~: 793724) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerRecipient() (gas: 388606) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderDoesNotImplementHook() (gas: 374225) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderNotContract() (gas: 100002) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderReentrancy() (gas: 376293) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderReverts() (gas: 374725) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerSender() (gas: 383652) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientDoesNotImplementHook() (gas: 369169) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientNotContract() (gas: 97284) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientReentrancy() (gas: 371361) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientReverts() (gas: 369748) -Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_StatusPending() (gas: 76354) -Cancel_LockupDynamic_Integration_Fuzz_Test:testFuzz_Cancel_CallerRecipient(uint256,uint128) (runs: 50, μ: 431864, ~: 433061) -Cancel_LockupDynamic_Integration_Fuzz_Test:testFuzz_Cancel_CallerSender(uint256,uint128) (runs: 50, μ: 451169, ~: 452317) -Cancel_LockupDynamic_Integration_Fuzz_Test:testFuzz_Cancel_StatusPending(uint256) (runs: 50, μ: 76922, ~: 77115) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerRecipient() (gas: 272486) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderDoesNotImplementHook() (gas: 258004) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderNotContract() (gas: 80382) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderReentrancy() (gas: 260080) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerRecipient_SenderReverts() (gas: 258504) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerSender() (gas: 267507) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientDoesNotImplementHook() (gas: 252935) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientNotContract() (gas: 77660) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientReentrancy() (gas: 255135) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_CallerSender_RecipientReverts() (gas: 253514) -Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_StatusPending() (gas: 76412) -Cancel_LockupLinear_Integration_Fuzz_Test:testFuzz_Cancel_CallerRecipient(uint256,uint128) (runs: 50, μ: 288908, ~: 288864) -Cancel_LockupLinear_Integration_Fuzz_Test:testFuzz_Cancel_CallerSender(uint256,uint128) (runs: 50, μ: 308395, ~: 308310) -Cancel_LockupLinear_Integration_Fuzz_Test:testFuzz_Cancel_StatusPending(uint256) (runs: 50, μ: 76952, ~: 77027) -ClaimProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_ClaimProtocolRevenues() (gas: 317052) -ClaimProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ClaimProtocolRevenues() (gas: 244406) -Constructor_LockupDynamic_Integration_Concrete_Test:test_Constructor() (gas: 5301627) -Constructor_LockupLinear_Integration_Concrete_Test:test_Constructor() (gas: 4113621) -CreateWithDeltas_LockupDynamic_Integration_Concrete_Test:test_CreateWithDeltas() (gas: 376989) -CreateWithDeltas_LockupDynamic_Integration_Fuzz_Test:testFuzz_CreateWithDeltas((uint128,uint64,uint40)[]) (runs: 50, μ: 4097904, ~: 3555562) -CreateWithDurations_LockupLinear_Integration_Concrete_Test:test_CreateWithDurations() (gas: 282804) -CreateWithDurations_LockupLinear_Integration_Fuzz_Test:testFuzz_CreateWithDurations((uint40,uint40)) (runs: 50, μ: 283400, ~: 283496) -CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_CreateWithMilestones() (gas: 365507) -CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_CreateWithMilestones_AssetMissingReturnValue() (gas: 372340) -CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test:testFuzz_CreateWithMilestones(address,(address,uint40,bool,address,uint128,address,(address,uint256),(uint128,uint64,uint40)[]),uint256) (runs: 50, μ: 3980454, ~: 3933203) -CreateWithRange_LockupLinear_Integration_Concrete_Test:test_CreateWithRange() (gas: 278259) -CreateWithRange_LockupLinear_Integration_Concrete_Test:test_CreateWithRange_AssetMissingReturnValue() (gas: 285026) -CreateWithRange_LockupLinear_Integration_Fuzz_Test:testFuzz_CreateWithRange(address,(address,address,uint128,address,bool,(uint40,uint40,uint40),(address,uint256)),uint256) (runs: 50, μ: 370254, ~: 369049) +Burn_LockupDynamic_Integration_Concrete_Test:test_Burn_CallerApprovedOperator() (gas: 87602) +Burn_LockupDynamic_Integration_Concrete_Test:test_Burn_CallerNFTOwner() (gas: 78186) +Burn_LockupDynamic_Integration_Concrete_Test:test_Burn_NonTransferableNFT() (gas: 78195) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_NFTDoesNotExist() (gas: 79400) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11325) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 90312) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusPending() (gas: 14289) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 19525) +Burn_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusStreaming() (gas: 19561) +Burn_LockupLinear_Integration_Concrete_Test:test_Burn_CallerApprovedOperator() (gas: 87770) +Burn_LockupLinear_Integration_Concrete_Test:test_Burn_CallerNFTOwner() (gas: 78343) +Burn_LockupLinear_Integration_Concrete_Test:test_Burn_NonTransferableNFT() (gas: 78352) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_NFTDoesNotExist() (gas: 79539) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11311) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 81013) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusPending() (gas: 14275) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 19511) +Burn_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusStreaming() (gas: 19547) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_CancelMultiple() (gas: 833554) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_CancelMultiple_ArrayCountZero() (gas: 6271) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_AllStreamsCold() (gas: 32346) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_AllStreamsNotCancelable() (gas: 859532) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_OnlyNull() (gas: 12362) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_SomeNull() (gas: 78556) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_SomeStreamsCold() (gas: 341289) +CancelMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_SomeStreamsNotCancelable() (gas: 946037) +CancelMultiple_LockupDynamic_Integration_Fuzz_Test:testFuzz_CancelMultiple(uint256,uint40) (runs: 50, μ: 1197185, ~: 1201634) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_CancelMultiple() (gas: 565501) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_CancelMultiple_ArrayCountZero() (gas: 6294) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_AllStreamsCold() (gas: 32494) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_AllStreamsNotCancelable() (gas: 572744) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_OnlyNull() (gas: 12391) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_SomeNull() (gas: 78577) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_SomeStreamsCold() (gas: 245380) +CancelMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_SomeStreamsNotCancelable() (gas: 657233) +CancelMultiple_LockupLinear_Integration_Fuzz_Test:testFuzz_CancelMultiple(uint256,uint40) (runs: 50, μ: 796979, ~: 798072) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel() (gas: 386274) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_RecipientDoesNotImplementHook() (gas: 371426) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_RecipientNotContract() (gas: 97176) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_RecipientReentrancy() (gas: 373617) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_RecipientReverts() (gas: 371993) +Cancel_LockupDynamic_Integration_Concrete_Test:test_Cancel_StatusPending() (gas: 76401) +Cancel_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11321) +Cancel_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 87398) +Cancel_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusDepleted() (gas: 68055) +Cancel_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 27022) +Cancel_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamNotCancelable() (gas: 261520) +Cancel_LockupDynamic_Integration_Fuzz_Test:testFuzz_Cancel(uint256,uint128) (runs: 50, μ: 453882, ~: 455045) +Cancel_LockupDynamic_Integration_Fuzz_Test:testFuzz_Cancel_StatusPending(uint256) (runs: 50, μ: 76949, ~: 77128) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel() (gas: 269481) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_RecipientDoesNotImplementHook() (gas: 254609) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_RecipientNotContract() (gas: 77523) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_RecipientReentrancy() (gas: 256789) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_RecipientReverts() (gas: 255176) +Cancel_LockupLinear_Integration_Concrete_Test:test_Cancel_StatusPending() (gas: 76441) +Cancel_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11307) +Cancel_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 78102) +Cancel_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusDepleted() (gas: 68238) +Cancel_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 27130) +Cancel_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamNotCancelable() (gas: 185647) +Cancel_LockupLinear_Integration_Fuzz_Test:testFuzz_Cancel(uint256,uint128) (runs: 50, μ: 310112, ~: 310054) +Cancel_LockupLinear_Integration_Fuzz_Test:testFuzz_Cancel_StatusPending(uint256) (runs: 50, μ: 77003, ~: 77168) +ClaimProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_ClaimProtocolRevenues() (gas: 319728) +ClaimProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_ProtocolRevenuesZero() (gas: 18907) +ClaimProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ClaimProtocolRevenues() (gas: 246456) +ClaimProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_RevertGiven_ProtocolRevenuesZero() (gas: 18915) +Constructor_LockupDynamic_Integration_Concrete_Test:test_Constructor() (gas: 5384679) +Constructor_LockupLinear_Integration_Concrete_Test:test_Constructor() (gas: 4190426) +CreateWithDeltas_LockupDynamic_Integration_Concrete_Test:test_CreateWithDeltas() (gas: 380621) +CreateWithDeltas_LockupDynamic_Integration_Fuzz_Test:testFuzz_CreateWithDeltas((uint128,uint64,uint40)[]) (runs: 50, μ: 4100590, ~: 3557971) +CreateWithDurations_LockupLinear_Integration_Concrete_Test:test_CreateWithDurations() (gas: 287592) +CreateWithDurations_LockupLinear_Integration_Fuzz_Test:testFuzz_CreateWithDurations((uint40,uint40)) (runs: 50, μ: 286543, ~: 286543) +CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_CreateWithMilestones() (gas: 370968) +CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_CreateWithMilestones_AssetMissingReturnValue() (gas: 377756) +CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_EndTimeNotInTheFuture() (gas: 47537) +CreateWithMilestones_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_ProtocolFeeTooHigh() (gas: 58079) +CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test:testFuzz_CreateWithMilestones(address,(address,uint40,bool,bool,address,uint128,address,(address,uint256),(uint128,uint64,uint40)[]),uint256) (runs: 50, μ: 3951267, ~: 3991455) +CreateWithRange_LockupLinear_Integration_Concrete_Test:test_CreateWithRange() (gas: 282990) +CreateWithRange_LockupLinear_Integration_Concrete_Test:test_CreateWithRange_AssetMissingReturnValue() (gas: 289757) +CreateWithRange_LockupLinear_Integration_Concrete_Test:test_RevertGiven_EndTimeNotInTheFuture() (gas: 41154) +CreateWithRange_LockupLinear_Integration_Concrete_Test:test_RevertGiven_ProtocolFeeTooHigh() (gas: 51749) +CreateWithRange_LockupLinear_Integration_Fuzz_Test:testFuzz_CreateWithRange(address,(address,address,uint128,address,bool,bool,(uint40,uint40,uint40),(address,uint256)),uint256) (runs: 50, μ: 374036, ~: 389079) FlashFee_Integration_Concrete_Test:test_FlashFee() (gas: 50968) -FlashFee_Integration_Fuzz_Test:testFuzz_FlashFee(uint256,uint256) (runs: 50, μ: 51825, ~: 52081) -FlashFee_Unit_Concrete_Test:test_FlashFee() (gas: 38333) -FlashFee_Unit_Concrete_Test:test_FlashFee_Zero() (gas: 7703) +FlashFee_Integration_Concrete_Test:test_RevertGiven_AssetNotFlashLoanable() (gas: 18626) +FlashFee_Integration_Fuzz_Test:testFuzz_FlashFee(uint256,uint256) (runs: 50, μ: 51818, ~: 52081) FlashLoanFunction_Integration_Concrete_Test:test_FlashLoan() (gas: 402140) -FlashLoanFunction_Integration_Fuzz_Test:testFuzz_FlashLoanFunction(uint256,uint128,bytes) (runs: 50, μ: 403379, ~: 407116) -GenerateAccentColor_Integration_Concrete_Test:test_GenerateAccentColor() (gas: 12968) -GetAsset_LockupDynamic_Integration_Concrete_Test:test_GetAsset() (gas: 304908) -GetAsset_LockupLinear_Integration_Concrete_Test:test_GetAsset() (gas: 232195) -GetCliffTime_LockupLinear_Integration_Concrete_Test:test_GetCliffTime() (gas: 232745) -GetDepositedAmount_LockupDynamic_Integration_Concrete_Test:test_GetDepositedAmount() (gas: 307727) -GetDepositedAmount_LockupLinear_Integration_Concrete_Test:test_GetDepositedAmount() (gas: 235010) -GetEndTime_LockupDynamic_Integration_Concrete_Test:test_GetEndTime() (gas: 307525) -GetEndTime_LockupLinear_Integration_Concrete_Test:test_GetEndTime() (gas: 234884) -GetRange_LockupDynamic_Integration_Concrete_Test:test_GetRange() (gas: 306932) -GetRange_LockupLinear_Integration_Concrete_Test:test_GetRange() (gas: 235033) -GetRecipient_LockupDynamic_Integration_Concrete_Test:test_GetRecipient() (gas: 12630) -GetRecipient_LockupLinear_Integration_Concrete_Test:test_GetRecipient() (gas: 12654) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusDepleted() (gas: 360020) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusPending() (gas: 329847) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusSettled() (gas: 335055) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusStreaming() (gas: 335069) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusCanceled() (gas: 374400) -GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusDepleted() (gas: 396242) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusDepleted() (gas: 285519) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusPending() (gas: 255146) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusSettled() (gas: 260354) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusStreaming() (gas: 260368) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusCanceled() (gas: 296443) -GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusDepleted() (gas: 318241) -GetSegments_LockupDynamic_Integration_Concrete_Test:test_GetSegments() (gas: 312411) -GetSender_LockupDynamic_Integration_Concrete_Test:test_GetSender() (gas: 304626) -GetSender_LockupLinear_Integration_Concrete_Test:test_GetSender() (gas: 231929) -GetStartTime_LockupDynamic_Integration_Concrete_Test:test_GetStartTime() (gas: 307832) -GetStartTime_LockupLinear_Integration_Concrete_Test:test_GetStartTime() (gas: 235141) -GetStream_LockupDynamic_Integration_Concrete_Test:test_GetStream() (gas: 275361) -GetStream_LockupDynamic_Integration_Concrete_Test:test_GetStream_StatusSettled() (gas: 51468) -GetStream_LockupLinear_Integration_Concrete_Test:test_GetStream() (gas: 34457) -GetStream_LockupLinear_Integration_Concrete_Test:test_GetStream_StatusSettled() (gas: 38946) -GetWithdrawnAmount_LockupDynamic_Integration_Concrete_Test:test_GetWithdrawnAmount() (gas: 381641) -GetWithdrawnAmount_LockupDynamic_Integration_Concrete_Test:test_GetWithdrawnAmount_NoPreviousWithdrawals() (gas: 333074) -GetWithdrawnAmount_LockupDynamic_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount(uint256,uint128) (runs: 50, μ: 384690, ~: 385328) -GetWithdrawnAmount_LockupDynamic_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount_NoPreviousWithdrawals(uint256) (runs: 50, μ: 334801, ~: 334953) -GetWithdrawnAmount_LockupLinear_Integration_Concrete_Test:test_GetWithdrawnAmount() (gas: 279721) -GetWithdrawnAmount_LockupLinear_Integration_Concrete_Test:test_GetWithdrawnAmount_NoPreviousWithdrawals() (gas: 260373) -GetWithdrawnAmount_LockupLinear_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount(uint256,uint128) (runs: 50, μ: 282907, ~: 282863) -GetWithdrawnAmount_LockupLinear_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount_NoPreviousWithdrawals(uint256) (runs: 50, μ: 262086, ~: 262252) -IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable() (gas: 510191) -IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable_Cold() (gas: 333252) -IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable_StreamCancelable() (gas: 324518) -IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable() (gas: 368272) -IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable_Cold() (gas: 260725) -IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable_StreamCancelable() (gas: 251874) -IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusCanceled() (gas: 373153) -IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusDepleted() (gas: 359721) -IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusPending() (gas: 327808) -IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusSettled() (gas: 333578) -IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusStreaming() (gas: 349896) -IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusCanceled() (gas: 295291) -IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusDepleted() (gas: 285322) -IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusPending() (gas: 255209) -IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusSettled() (gas: 261091) -IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusStreaming() (gas: 261670) -IsDepleted_LockupDynamic_Integration_Concrete_Test:test_IsDepleted() (gas: 359126) -IsDepleted_LockupDynamic_Integration_Concrete_Test:test_IsDepleted_StreamNotDepleted() (gas: 323942) -IsDepleted_LockupLinear_Integration_Concrete_Test:test_IsDepleted() (gas: 284667) -IsDepleted_LockupLinear_Integration_Concrete_Test:test_IsDepleted_StreamNotDepleted() (gas: 251283) -IsStream_LockupDynamic_Integration_Concrete_Test:test_IsStream() (gas: 324260) -IsStream_LockupDynamic_Integration_Concrete_Test:test_IsStream_Null() (gas: 8505) -IsStream_LockupLinear_Integration_Concrete_Test:test_IsStream() (gas: 251601) -IsStream_LockupLinear_Integration_Concrete_Test:test_IsStream_Null() (gas: 8548) -IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusCanceled() (gas: 372669) -IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusDepleted() (gas: 359213) -IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusPending() (gas: 327267) -IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusSettled() (gas: 333145) -IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusStreaming() (gas: 349315) -IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusCanceled() (gas: 294776) -IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusDepleted() (gas: 284776) -IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusPending() (gas: 254630) -IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusSettled() (gas: 260630) -IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusStreaming() (gas: 261051) +FlashLoanFunction_Integration_Concrete_Test:test_RevertGiven_AssetNotFlashLoanable() (gas: 21603) +FlashLoanFunction_Integration_Fuzz_Test:testFuzz_FlashLoanFunction(uint256,uint128,bytes) (runs: 50, μ: 402214, ~: 406940) +GenerateAccentColor_Integration_Concrete_Test:test_GenerateAccentColor() (gas: 13215) +GetAsset_LockupDynamic_Integration_Concrete_Test:test_GetAsset() (gas: 307759) +GetAsset_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12049) +GetAsset_LockupLinear_Integration_Concrete_Test:test_GetAsset() (gas: 234467) +GetAsset_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12035) +GetCliffTime_LockupLinear_Integration_Concrete_Test:test_GetCliffTime() (gas: 234951) +GetCliffTime_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11392) +GetDepositedAmount_LockupDynamic_Integration_Concrete_Test:test_GetDepositedAmount() (gas: 310556) +GetDepositedAmount_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11682) +GetDepositedAmount_LockupLinear_Integration_Concrete_Test:test_GetDepositedAmount() (gas: 237238) +GetDepositedAmount_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11678) +GetEndTime_LockupDynamic_Integration_Concrete_Test:test_GetEndTime() (gas: 310354) +GetEndTime_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11538) +GetEndTime_LockupLinear_Integration_Concrete_Test:test_GetEndTime() (gas: 237090) +GetEndTime_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11546) +GetRange_LockupDynamic_Integration_Concrete_Test:test_GetRange() (gas: 309780) +GetRange_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 13125) +GetRange_LockupLinear_Integration_Concrete_Test:test_GetRange() (gas: 237308) +GetRange_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 13308) +GetRecipient_LockupDynamic_Integration_Concrete_Test:test_GetRecipient() (gas: 12585) +GetRecipient_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_NFTBurned() (gas: 72494) +GetRecipient_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 10989) +GetRecipient_LockupLinear_Integration_Concrete_Test:test_GetRecipient() (gas: 12565) +GetRecipient_LockupLinear_Integration_Concrete_Test:test_RevertGiven_NFTBurned() (gas: 72651) +GetRecipient_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 10993) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusDepleted() (gas: 362837) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusPending() (gas: 332698) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusSettled() (gas: 337906) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StatusStreaming() (gas: 337920) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusCanceled() (gas: 377552) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusDepleted() (gas: 399360) +GetRefundedAmount_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12045) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusDepleted() (gas: 287754) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusPending() (gas: 257418) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusSettled() (gas: 262626) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StatusStreaming() (gas: 262640) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusCanceled() (gas: 298987) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_GetRefundedAmount_StreamHasBeenCanceled_StatusDepleted() (gas: 320748) +GetRefundedAmount_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12031) +GetSegments_LockupDynamic_Integration_Concrete_Test:test_GetSegments() (gas: 315258) +GetSegments_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 13758) +GetSender_LockupDynamic_Integration_Concrete_Test:test_GetSender() (gas: 307477) +GetSender_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11814) +GetSender_LockupLinear_Integration_Concrete_Test:test_GetSender() (gas: 234201) +GetSender_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11816) +GetStartTime_LockupDynamic_Integration_Concrete_Test:test_GetStartTime() (gas: 310683) +GetStartTime_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11823) +GetStartTime_LockupLinear_Integration_Concrete_Test:test_GetStartTime() (gas: 237413) +GetStartTime_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11831) +GetStream_LockupDynamic_Integration_Concrete_Test:test_GetStream() (gas: 278720) +GetStream_LockupDynamic_Integration_Concrete_Test:test_GetStream_StatusSettled() (gas: 52024) +GetStream_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 15544) +GetStream_LockupLinear_Integration_Concrete_Test:test_GetStream() (gas: 34920) +GetStream_LockupLinear_Integration_Concrete_Test:test_GetStream_StatusSettled() (gas: 39431) +GetStream_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 14299) +GetWithdrawnAmount_LockupDynamic_Integration_Concrete_Test:test_GetWithdrawnAmount() (gas: 384696) +GetWithdrawnAmount_LockupDynamic_Integration_Concrete_Test:test_GetWithdrawnAmount_NoPreviousWithdrawals() (gas: 335880) +GetWithdrawnAmount_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12012) +GetWithdrawnAmount_LockupDynamic_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount(uint256,uint128) (runs: 50, μ: 387706, ~: 388207) +GetWithdrawnAmount_LockupDynamic_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount_NoPreviousWithdrawals(uint256) (runs: 50, μ: 337569, ~: 337804) +GetWithdrawnAmount_LockupLinear_Integration_Concrete_Test:test_GetWithdrawnAmount() (gas: 282118) +GetWithdrawnAmount_LockupLinear_Integration_Concrete_Test:test_GetWithdrawnAmount_NoPreviousWithdrawals() (gas: 262600) +GetWithdrawnAmount_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11998) +GetWithdrawnAmount_LockupLinear_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount(uint256,uint128) (runs: 50, μ: 285304, ~: 285260) +GetWithdrawnAmount_LockupLinear_Integration_Fuzz_Test:testFuzz_GetWithdrawnAmount_NoPreviousWithdrawals(uint256) (runs: 50, μ: 264330, ~: 264524) +IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable() (gas: 515865) +IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable_Cold() (gas: 336103) +IsCancelable_LockupDynamic_Integration_Concrete_Test:test_IsCancelable_StreamCancelable() (gas: 327347) +IsCancelable_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11239) +IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable() (gas: 372779) +IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable_Cold() (gas: 262975) +IsCancelable_LockupLinear_Integration_Concrete_Test:test_IsCancelable_StreamCancelable() (gas: 254102) +IsCancelable_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11263) +IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusCanceled() (gas: 376250) +IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusDepleted() (gas: 362483) +IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusPending() (gas: 330604) +IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusSettled() (gas: 336374) +IsCold_LockupDynamic_Integration_Concrete_Test:test_IsCold_StatusStreaming() (gas: 352684) +IsCold_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11525) +IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusCanceled() (gas: 297736) +IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusDepleted() (gas: 287458) +IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusPending() (gas: 257382) +IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusSettled() (gas: 263264) +IsCold_LockupLinear_Integration_Concrete_Test:test_IsCold_StatusStreaming() (gas: 263799) +IsCold_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11568) +IsDepleted_LockupDynamic_Integration_Concrete_Test:test_IsDepleted() (gas: 361921) +IsDepleted_LockupDynamic_Integration_Concrete_Test:test_IsDepleted_StreamNotDepleted() (gas: 326771) +IsDepleted_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11191) +IsDepleted_LockupLinear_Integration_Concrete_Test:test_IsDepleted() (gas: 286858) +IsDepleted_LockupLinear_Integration_Concrete_Test:test_IsDepleted_StreamNotDepleted() (gas: 253511) +IsDepleted_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11212) +IsStream_LockupDynamic_Integration_Concrete_Test:test_IsStream() (gas: 327111) +IsStream_LockupDynamic_Integration_Concrete_Test:test_IsStream_Null() (gas: 8527) +IsStream_LockupLinear_Integration_Concrete_Test:test_IsStream() (gas: 253873) +IsStream_LockupLinear_Integration_Concrete_Test:test_IsStream_Null() (gas: 8570) +IsTransferable_LockupDynamic_Integration_Concrete_Test:test_IsTransferable_Stream() (gas: 327273) +IsTransferable_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11674) +IsTransferable_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamTransferNotEnabled() (gas: 515864) +IsTransferable_LockupLinear_Integration_Concrete_Test:test_IsTransferable_Stream() (gas: 254057) +IsTransferable_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11739) +IsTransferable_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamTransferNotEnabled() (gas: 372834) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusCanceled() (gas: 375788) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusDepleted() (gas: 361997) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusPending() (gas: 330041) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusSettled() (gas: 335985) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_IsWarm_StatusStreaming() (gas: 352169) +IsWarm_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11085) +IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusCanceled() (gas: 297243) +IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusDepleted() (gas: 286934) +IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusPending() (gas: 256781) +IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusSettled() (gas: 262847) +IsWarm_LockupLinear_Integration_Concrete_Test:test_IsWarm_StatusStreaming() (gas: 263246) +IsWarm_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11106) MapSymbol_Integration_Concrete_Test:test_MapSymbol_LockupDynamic() (gas: 16959) -MapSymbol_Integration_Concrete_Test:test_MapSymbol_LockupLinear() (gas: 16777) +MapSymbol_Integration_Concrete_Test:test_MapSymbol_LockupLinear() (gas: 16733) +MapSymbol_Integration_Concrete_Test:test_RevertGiven_UnknownNFT() (gas: 1039753) MaxFlashLoan_Integration_Concrete_Test:test_MaxFlashLoan() (gas: 178987) MaxFlashLoan_Integration_Concrete_Test:test_MaxFlashLoan_AssetNotFlashLoanable() (gas: 15248) -MaxFlashLoan_Integration_Fuzz_Test:testFuzz_MaxFlashLoan(uint256) (runs: 50, μ: 178980, ~: 178996) +MaxFlashLoan_Integration_Fuzz_Test:testFuzz_MaxFlashLoan(uint256) (runs: 50, μ: 178984, ~: 179002) ProtocolFees_Integration_Concrete_Test:test_ProtocolFees() (gas: 41254) ProtocolFees_Integration_Concrete_Test:test_ProtocolFees_ProtocolFeeNotSet() (gas: 9943) -ProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_ProtocolRevenues() (gas: 317399) +ProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_ProtocolRevenues() (gas: 320228) ProtocolRevenues_LockupDynamic_Integration_Concrete_Test:test_ProtocolRevenues_ProtocolRevenuesZero() (gas: 10125) -ProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ProtocolRevenues() (gas: 244717) -ProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ProtocolRevenues_ProtocolRevenuesZero() (gas: 10133) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusDepleted() (gas: 359163) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusPending() (gas: 333012) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusSettled() (gas: 333005) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusStreaming() (gas: 339838) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 372545) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 395772) -RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamNotCancelable() (gas: 517772) -RefundableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_RefundableAmountOf(uint256) (runs: 50, μ: 46751, ~: 30742) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusDepleted() (gas: 284678) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusPending() (gas: 260318) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusSettled() (gas: 260441) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusStreaming() (gas: 261928) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 294604) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 317787) -RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamNotCancelable() (gas: 375836) -RefundableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_RefundableAmountOf(uint256) (runs: 50, μ: 30756, ~: 30880) -Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce() (gas: 685980) -Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientDoesNotImplementHook() (gas: 678983) -Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientNotContract() (gas: 289776) -Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientReentrancy() (gas: 684192) -Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientReverts() (gas: 679634) -Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce() (gas: 474755) -Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientDoesNotImplementHook() (gas: 467756) -Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientNotContract() (gas: 217209) -Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientReentrancy() (gas: 473025) -Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientReverts() (gas: 468407) +ProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ProtocolRevenues() (gas: 246945) +ProtocolRevenues_LockupLinear_Integration_Concrete_Test:test_ProtocolRevenues_ProtocolRevenuesZero() (gas: 10111) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusDepleted() (gas: 361958) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusPending() (gas: 335841) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusSettled() (gas: 335834) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StatusStreaming() (gas: 342703) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 375697) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 398868) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RefundableAmountOf_StreamNotCancelable() (gas: 523491) +RefundableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11099) +RefundableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_RefundableAmountOf(uint256) (runs: 50, μ: 42776, ~: 30742) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusDepleted() (gas: 286891) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusPending() (gas: 262568) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusSettled() (gas: 262691) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StatusStreaming() (gas: 264178) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 297148) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 320272) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RefundableAmountOf_StreamNotCancelable() (gas: 380410) +RefundableAmountOf_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11110) +RefundableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_RefundableAmountOf(uint256) (runs: 50, μ: 30748, ~: 30858) +Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce() (gas: 694498) +Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientDoesNotImplementHook() (gas: 687573) +Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientNotContract() (gas: 292606) +Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientReentrancy() (gas: 692702) +Renounce_LockupDynamic_Integration_Concrete_Test:test_Renounce_RecipientReverts() (gas: 688180) +Renounce_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11567) +Renounce_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 87385) +Renounce_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusDepleted() (gas: 68359) +Renounce_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 24692) +Renounce_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamNotCancelable() (gas: 649846) +Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce() (gas: 481553) +Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientDoesNotImplementHook() (gas: 474596) +Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientNotContract() (gas: 219349) +Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientReentrancy() (gas: 479733) +Renounce_LockupLinear_Integration_Concrete_Test:test_Renounce_RecipientReverts() (gas: 475203) +Renounce_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11575) +Renounce_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusCanceled() (gas: 78108) +Renounce_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusDepleted() (gas: 68564) +Renounce_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StatusSettled() (gas: 24822) +Renounce_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamNotCancelable() (gas: 436925) SafeAssetDecimals_Integration_Concrete_Test:test_SafeAssetDecimals() (gas: 12117) SafeAssetDecimals_Integration_Concrete_Test:test_SafeAssetDecimals_DecimalsNotImplemented() (gas: 10852) SafeAssetDecimals_Integration_Concrete_Test:test_SafeAssetDecimals_EOA() (gas: 11625) SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol() (gas: 18550) -SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_Bytes32() (gas: 59605) +SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_Bytes32() (gas: 62214) SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_EOA() (gas: 13222) -SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_LongSymbol() (gas: 622290) +SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_LongSymbol() (gas: 624896) SafeAssetSymbol_Integration_Concrete_Test:test_SafeAssetSymbol_SymbolNotImplemented() (gas: 12399) -SetComptroller_LockupDynamic_Integration_Concrete_Test:test_SetComptroller_NewComptroller() (gas: 309153) +SetComptroller_LockupDynamic_Integration_Concrete_Test:test_SetComptroller_NewComptroller() (gas: 311753) SetComptroller_LockupDynamic_Integration_Concrete_Test:test_SetComptroller_SameComptroller() (gas: 23283) -SetComptroller_LockupLinear_Integration_Concrete_Test:test_SetComptroller_NewComptroller() (gas: 309238) -SetComptroller_LockupLinear_Integration_Concrete_Test:test_SetComptroller_SameComptroller() (gas: 23368) -SetFlashFee_Integration_Concrete_Test:test_SetFlashFee() (gas: 44409) -SetFlashFee_Integration_Concrete_Test:test_SetFlashFee_SameFee() (gas: 21981) -SetFlashFee_Integration_Fuzz_Test:testFuzz_SetFlashFee(uint256) (runs: 50, μ: 37754, ~: 39448) -SetNFTDescriptor_LockupDynamic_Integration_Concrete_Test:test_SetNFTDescriptor_NewNFTDescriptor() (gas: 6558206) -SetNFTDescriptor_LockupDynamic_Integration_Concrete_Test:test_SetNFTDescriptor_SameNFTDescriptor() (gas: 2259730) -SetNFTDescriptor_LockupLinear_Integration_Concrete_Test:test_SetNFTDescriptor_NewNFTDescriptor() (gas: 6557611) -SetNFTDescriptor_LockupLinear_Integration_Concrete_Test:test_SetNFTDescriptor_SameNFTDescriptor() (gas: 2259015) +SetComptroller_LockupLinear_Integration_Concrete_Test:test_SetComptroller_NewComptroller() (gas: 311750) +SetComptroller_LockupLinear_Integration_Concrete_Test:test_SetComptroller_SameComptroller() (gas: 23280) +SetFlashFee_Integration_Fuzz_Test:testFuzz_SetFlashFee(uint256) (runs: 50, μ: 37740, ~: 39448) +SetNFTDescriptor_LockupDynamic_Integration_Concrete_Test:test_SetNFTDescriptor_NewNFTDescriptor() (gas: 6551561) +SetNFTDescriptor_LockupDynamic_Integration_Concrete_Test:test_SetNFTDescriptor_SameNFTDescriptor() (gas: 2258131) +SetNFTDescriptor_LockupLinear_Integration_Concrete_Test:test_SetNFTDescriptor_NewNFTDescriptor() (gas: 6550197) +SetNFTDescriptor_LockupLinear_Integration_Concrete_Test:test_SetNFTDescriptor_SameNFTDescriptor() (gas: 2256602) SetProtocolFee_Integration_Concrete_Test:test_SetProtocolFee() (gas: 47804) SetProtocolFee_Integration_Concrete_Test:test_SetProtocolFee_SameFee() (gas: 22636) -SetProtocolFee_Integration_Fuzz_Test:testFuzz_SetProtocolFee(uint256) (runs: 50, μ: 43131, ~: 43074) -StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf() (gas: 349974) -StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_AssetsFullyWithdrawn() (gas: 359860) -StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_RefundableAmountNotZero() (gas: 333790) -StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_StartTimeInTheFuture() (gas: 327889) -StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_StreamCanceled() (gas: 373305) -StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf() (gas: 261080) -StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_AssetsFullyWithdrawn() (gas: 285393) -StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_RefundableAmountNotZero() (gas: 261245) -StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_StartTimeInTheFuture() (gas: 255222) -StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_StreamCanceled() (gas: 295382) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_CurrentMilestone1st() (gas: 45895) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_CurrentMilestoneNot1st() (gas: 50716) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_OneSegment() (gas: 254129) +SetProtocolFee_Integration_Fuzz_Test:testFuzz_SetProtocolFee(uint256) (runs: 50, μ: 43144, ~: 43219) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11651) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf() (gas: 352806) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_AssetsFullyWithdrawn() (gas: 362622) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_RefundableAmountNotZero() (gas: 336586) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_StartTimeInTheFuture() (gas: 330685) +StatusOf_LockupDynamic_Integration_Concrete_Test:test_StatusOf_StreamCanceled() (gas: 376424) +StatusOf_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11681) +StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf() (gas: 263297) +StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_AssetsFullyWithdrawn() (gas: 287573) +StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_RefundableAmountNotZero() (gas: 263462) +StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_StartTimeInTheFuture() (gas: 257439) +StatusOf_LockupLinear_Integration_Concrete_Test:test_StatusOf_StreamCanceled() (gas: 297893) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11319) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_CurrentMilestone1st() (gas: 45931) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_CurrentMilestoneNot1st() (gas: 50774) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_OneSegment() (gas: 257024) StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StartTimeInTheFuture() (gas: 20230) StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StartTimeInThePresent() (gas: 25593) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StatusDepleted() (gas: 68727) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StatusDepleted() (gas: 68693) StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StatusPending() (gas: 20360) StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StatusSettled() (gas: 26624) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 87497) -StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 116148) -StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Calculation((uint128,uint64,uint40)[],uint40) (runs: 50, μ: 3521477, ~: 3128962) -StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Monotonicity((uint128,uint64,uint40)[],uint40,uint40) (runs: 50, μ: 3965669, ~: 4101937) -StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_OneSegment((uint128,uint64,uint40),uint40) (runs: 50, μ: 274310, ~: 268277) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInTheFuture() (gas: 26302) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInThePast() (gas: 17313) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInThePresent() (gas: 27143) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusDepleted() (gas: 68936) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusPending() (gas: 20327) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusSettled() (gas: 26710) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 78272) -StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 106846) -StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Calculation(uint40,uint128) (runs: 50, μ: 232343, ~: 233061) -StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_CliffTimeInTheFuture(uint40) (runs: 50, μ: 27377, ~: 27626) -StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Monotonicity(uint40,uint40,uint128) (runs: 50, μ: 237382, ~: 239360) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 87798) +StreamedAmountOf_LockupDynamic_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 116415) +StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Calculation((uint128,uint64,uint40)[],uint40) (runs: 50, μ: 3525063, ~: 3130793) +StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Monotonicity((uint128,uint64,uint40)[],uint40,uint40) (runs: 50, μ: 3968937, ~: 4106456) +StreamedAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_OneSegment((uint128,uint64,uint40),uint40) (runs: 50, μ: 276737, ~: 270630) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 11349) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInTheFuture() (gas: 26236) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInThePast() (gas: 17291) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_CliffTimeInThePresent() (gas: 27121) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusDepleted() (gas: 68877) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusPending() (gas: 20305) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StatusSettled() (gas: 26688) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 78522) +StreamedAmountOf_LockupLinear_Integration_Concrete_Test:test_StreamedAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 107059) +StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Calculation(uint40,uint128) (runs: 50, μ: 234376, ~: 234297) +StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_CliffTimeInTheFuture(uint40) (runs: 50, μ: 27341, ~: 27604) +StreamedAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_StreamedAmountOf_Monotonicity(uint40,uint40,uint128) (runs: 50, μ: 239452, ~: 241444) ToggleFlashAsset_Integration_Concrete_Test:test_ToggleFlashAsset() (gas: 31848) ToggleFlashAsset_Integration_Concrete_Test:test_ToggleFlashAsset_FlagNotEnabled() (gas: 41868) -TokenURI_LockupDynamic_Integration_Concrete_Test:test_TokenURI_Decoded() (gas: 3422904) -TokenURI_LockupDynamic_Integration_Concrete_Test:test_TokenURI_Full() (gas: 2743187) -TokenURI_LockupLinear_Integration_Concrete_Test:test_TokenURI_Decoded() (gas: 3341348) -TokenURI_LockupLinear_Integration_Concrete_Test:test_TokenURI_Full() (gas: 2661789) -WasCanceled_LockupDynamic_Integration_Concrete_Test:test_WasCanceled() (gas: 361404) -WasCanceled_LockupDynamic_Integration_Concrete_Test:test_WasCanceled_StreamNotCanceled() (gas: 324810) -WasCanceled_LockupLinear_Integration_Concrete_Test:test_WasCanceled() (gas: 286684) -WasCanceled_LockupLinear_Integration_Concrete_Test:test_WasCanceled_StreamNotCanceled() (gas: 252129) -WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_WithdrawMaxAndTransfer() (gas: 153323) -WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_WithdrawMaxAndTransfer_WithdrawableAmountZero() (gas: 99935) -WithdrawMaxAndTransfer_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMaxAndTransfer(uint256,address) (runs: 50, μ: 131864, ~: 151107) -WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_WithdrawMaxAndTransfer() (gas: 106420) -WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_WithdrawMaxAndTransfer_WithdrawableAmountZero() (gas: 100091) -WithdrawMaxAndTransfer_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMaxAndTransfer(uint256,address) (runs: 50, μ: 96364, ~: 106586) -WithdrawMax_LockupDynamic_Integration_Concrete_Test:test_WithdrawMax() (gas: 134454) -WithdrawMax_LockupDynamic_Integration_Concrete_Test:test_WithdrawMax_EndTimeNotInTheFuture() (gas: 79700) -WithdrawMax_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMax(uint256) (runs: 50, μ: 116746, ~: 119825) -WithdrawMax_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMax_EndTimeNotInTheFuture(uint256) (runs: 50, μ: 82256, ~: 82383) -WithdrawMax_LockupLinear_Integration_Concrete_Test:test_WithdrawMax() (gas: 73906) -WithdrawMax_LockupLinear_Integration_Concrete_Test:test_WithdrawMax_EndTimeNotInTheFuture() (gas: 80006) -WithdrawMax_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMax(uint256) (runs: 50, μ: 72863, ~: 73017) -WithdrawMax_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMax_EndTimeNotInTheFuture(uint256) (runs: 50, μ: 82507, ~: 82689) -WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_WithdrawMultiple() (gas: 1805869) -WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_WithdrawMultiple_ArrayCountsZero() (gas: 9087) -WithdrawMultiple_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMultiple(uint256,address,uint128) (runs: 50, μ: 2707361, ~: 2707710) -WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_WithdrawMultiple() (gas: 1242199) -WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_WithdrawMultiple_ArrayCountsZero() (gas: 9126) -WithdrawMultiple_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMultiple(uint256,address,uint128) (runs: 50, μ: 1742432, ~: 1742287) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw() (gas: 381705) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_CallerApprovedOperator() (gas: 112523) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_CallerRecipient() (gas: 81082) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_EndTimeNotInTheFuture() (gas: 72554) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientDoesNotImplementHook() (gas: 359872) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientNotContract() (gas: 122112) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientReentrancy() (gas: 387067) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientReverts() (gas: 360427) -Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_StreamHasBeenCanceled() (gas: 379300) -Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw(uint256,address,uint128) (runs: 50, μ: 125749, ~: 98023) -Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_CallerApprovedOperator(address) (runs: 50, μ: 145230, ~: 145230) -Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_SegmentFuzing(((uint128,uint64,uint40)[],uint256,address)) (runs: 50, μ: 3950416, ~: 3852837) -Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_StreamHasBeenCanceled(uint256,address,uint128) (runs: 50, μ: 158615, ~: 158813) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw() (gas: 265613) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_CallerApprovedOperator() (gas: 92923) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_CallerRecipient() (gas: 61471) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_EndTimeNotInTheFuture() (gas: 72822) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientDoesNotImplementHook() (gas: 257393) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientNotContract() (gas: 75290) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientReentrancy() (gas: 270988) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientReverts() (gas: 257948) -Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_StreamHasBeenCanceled() (gas: 290354) -Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw(uint256,address,uint128) (runs: 50, μ: 98763, ~: 98632) -Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw_CallerApprovedOperator(address) (runs: 50, μ: 112042, ~: 112042) -Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw_StreamHasBeenCanceled(uint256,address,uint128) (runs: 50, μ: 139114, ~: 139033) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf() (gas: 375341) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_NoPreviousWithdrawals() (gas: 344798) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StartTimeInThePresent() (gas: 334407) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusDepleted() (gas: 360935) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusPending() (gas: 331156) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusSettled() (gas: 337357) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 375385) -WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 397521) -WithdrawableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf(uint40,uint128) (runs: 50, μ: 332813, ~: 349508) -WithdrawableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_NoPreviousWithdrawals(uint40) (runs: 50, μ: 294637, ~: 286681) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_CliffTimeInTheFuture() (gas: 251328) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_NoPreviousWithdrawals() (gas: 261221) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusDepleted() (gas: 286431) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusPending() (gas: 256422) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusSettled() (gas: 262753) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 297470) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 319562) -WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_WithWithdrawals() (gas: 284809) -WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf(uint40,uint128,uint128) (runs: 50, μ: 458973, ~: 459024) -WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_CliffTimeInTheFuture(uint40) (runs: 50, μ: 261387, ~: 261691) -WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_NoPreviousWithdrawals(uint40,uint128) (runs: 50, μ: 435199, ~: 436054) +TokenURI_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_NFTDoesNotExist() (gas: 13542) +TokenURI_LockupDynamic_Integration_Concrete_Test:test_TokenURI_Decoded() (gas: 6624) +TokenURI_LockupDynamic_Integration_Concrete_Test:test_TokenURI_Full() (gas: 6601) +TokenURI_LockupLinear_Integration_Concrete_Test:test_RevertGiven_NFTDoesNotExist() (gas: 13525) +TokenURI_LockupLinear_Integration_Concrete_Test:test_TokenURI_Decoded() (gas: 6624) +TokenURI_LockupLinear_Integration_Concrete_Test:test_TokenURI_Full() (gas: 6601) +TransferFrom_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamNotTransferable() (gas: 314210) +TransferFrom_LockupDynamic_Integration_Concrete_Test:test_TransferFrom() (gas: 326549) +TransferFrom_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamNotTransferable() (gas: 240360) +TransferFrom_LockupLinear_Integration_Concrete_Test:test_TransferFrom() (gas: 253204) +WasCanceled_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12048) +WasCanceled_LockupDynamic_Integration_Concrete_Test:test_WasCanceled() (gas: 364519) +WasCanceled_LockupDynamic_Integration_Concrete_Test:test_WasCanceled_StreamNotCanceled() (gas: 327661) +WasCanceled_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12069) +WasCanceled_LockupLinear_Integration_Concrete_Test:test_WasCanceled() (gas: 289228) +WasCanceled_LockupLinear_Integration_Concrete_Test:test_WasCanceled_StreamNotCanceled() (gas: 254401) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_NFTBurned() (gas: 75407) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 14162) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamNotTransferable() (gas: 265101) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_WithdrawMaxAndTransfer() (gas: 159731) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Concrete_Test:test_WithdrawMaxAndTransfer_WithdrawableAmountZero() (gas: 101620) +WithdrawMaxAndTransfer_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMaxAndTransfer(uint256,address) (runs: 50, μ: 136641, ~: 156598) +WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_RevertGiven_NFTBurned() (gas: 75586) +WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 14179) +WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamNotTransferable() (gas: 189302) +WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_WithdrawMaxAndTransfer() (gas: 112620) +WithdrawMaxAndTransfer_LockupLinear_Integration_Concrete_Test:test_WithdrawMaxAndTransfer_WithdrawableAmountZero() (gas: 101808) +WithdrawMaxAndTransfer_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMaxAndTransfer(uint256,address) (runs: 50, μ: 102527, ~: 110966) +WithdrawMax_LockupDynamic_Integration_Concrete_Test:test_WithdrawMax() (gas: 135187) +WithdrawMax_LockupDynamic_Integration_Concrete_Test:test_WithdrawMax_EndTimeNotInTheFuture() (gas: 80257) +WithdrawMax_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMax(uint256) (runs: 50, μ: 117346, ~: 120408) +WithdrawMax_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMax_EndTimeNotInTheFuture(uint256) (runs: 50, μ: 82843, ~: 82981) +WithdrawMax_LockupLinear_Integration_Concrete_Test:test_WithdrawMax() (gas: 74491) +WithdrawMax_LockupLinear_Integration_Concrete_Test:test_WithdrawMax_EndTimeNotInTheFuture() (gas: 80494) +WithdrawMax_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMax(uint256) (runs: 50, μ: 73588, ~: 73703) +WithdrawMax_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMax_EndTimeNotInTheFuture(uint256) (runs: 50, μ: 83108, ~: 83276) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_AllStatusesDepleted() (gas: 73864) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_OnlyNull() (gas: 21063) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_SomeNull() (gas: 124687) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_SomeStatusesDepleted() (gas: 83337) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_WithdrawMultiple() (gas: 1831194) +WithdrawMultiple_LockupDynamic_Integration_Concrete_Test:test_WithdrawMultiple_ArrayCountsZero() (gas: 9109) +WithdrawMultiple_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawMultiple(uint256,address,uint128) (runs: 50, μ: 2745377, ~: 2745599) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_AllStatusesDepleted() (gas: 74018) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_OnlyNull() (gas: 21020) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_SomeNull() (gas: 105130) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_RevertGiven_SomeStatusesDepleted() (gas: 83491) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_WithdrawMultiple() (gas: 1264004) +WithdrawMultiple_LockupLinear_Integration_Concrete_Test:test_WithdrawMultiple_ArrayCountsZero() (gas: 9165) +WithdrawMultiple_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawMultiple(uint256,address,uint128) (runs: 50, μ: 1773543, ~: 1773439) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 19918) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_StreamDepleted() (gas: 67824) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw() (gas: 385175) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_CallerApprovedOperator() (gas: 112713) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_CallerRecipient() (gas: 81272) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_EndTimeNotInTheFuture() (gas: 72502) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientDoesNotImplementHook() (gas: 362822) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientNotContract() (gas: 122683) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientReentrancy() (gas: 390163) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_RecipientReverts() (gas: 363377) +Withdraw_LockupDynamic_Integration_Concrete_Test:test_Withdraw_StreamHasBeenCanceled() (gas: 382351) +Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw(uint256,address,uint128) (runs: 50, μ: 125244, ~: 98689) +Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_CallerApprovedOperator(address) (runs: 50, μ: 145456, ~: 145456) +Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_SegmentFuzing(((uint128,uint64,uint40)[],uint256,address)) (runs: 50, μ: 3969894, ~: 4005165) +Withdraw_LockupDynamic_Integration_Fuzz_Test:testFuzz_Withdraw_StreamHasBeenCanceled(uint256,address,uint128) (runs: 50, μ: 160727, ~: 160960) +Withdraw_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 19917) +Withdraw_LockupLinear_Integration_Concrete_Test:test_RevertGiven_StreamDepleted() (gas: 68020) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw() (gas: 268395) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_CallerApprovedOperator() (gas: 93092) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_CallerRecipient() (gas: 61640) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_EndTimeNotInTheFuture() (gas: 72719) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientDoesNotImplementHook() (gas: 259694) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientNotContract() (gas: 75746) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientReentrancy() (gas: 273430) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_RecipientReverts() (gas: 260249) +Withdraw_LockupLinear_Integration_Concrete_Test:test_Withdraw_StreamHasBeenCanceled() (gas: 292858) +Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw(uint256,address,uint128) (runs: 50, μ: 99397, ~: 99269) +Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw_CallerApprovedOperator(address) (runs: 50, μ: 112211, ~: 112211) +Withdraw_LockupLinear_Integration_Fuzz_Test:testFuzz_Withdraw_StreamHasBeenCanceled(uint256,address,uint128) (runs: 50, μ: 141197, ~: 141030) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12045) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf() (gas: 378164) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_NoPreviousWithdrawals() (gas: 347681) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StartTimeInThePresent() (gas: 337258) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusDepleted() (gas: 363752) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusPending() (gas: 334007) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusSettled() (gas: 340230) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 378537) +WithdrawableAmountOf_LockupDynamic_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 400661) +WithdrawableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf(uint40,uint128) (runs: 50, μ: 335946, ~: 352606) +WithdrawableAmountOf_LockupDynamic_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_NoPreviousWithdrawals(uint40) (runs: 50, μ: 298357, ~: 289776) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_RevertGiven_Null() (gas: 12076) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_CliffTimeInTheFuture() (gas: 253622) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_NoPreviousWithdrawals() (gas: 263493) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusDepleted() (gas: 288666) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusPending() (gas: 258694) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StatusSettled() (gas: 265047) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusCanceled() (gas: 300014) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_StreamHasBeenCanceled_StatusDepleted() (gas: 322024) +WithdrawableAmountOf_LockupLinear_Integration_Concrete_Test:test_WithdrawableAmountOf_WithWithdrawals() (gas: 287044) +WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf(uint40,uint128,uint128) (runs: 50, μ: 464066, ~: 464719) +WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_CliffTimeInTheFuture(uint40) (runs: 50, μ: 263687, ~: 263963) +WithdrawableAmountOf_LockupLinear_Integration_Fuzz_Test:testFuzz_WithdrawableAmountOf_NoPreviousWithdrawals(uint40,uint128) (runs: 50, μ: 439908, ~: 438806) \ No newline at end of file diff --git a/.github/workflows/ci-deep.yml b/.github/workflows/ci-deep.yml index f00248f20..66f525ad6 100644 --- a/.github/workflows/ci-deep.yml +++ b/.github/workflows/ci-deep.yml @@ -68,12 +68,24 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" + - name: "Install Pnpm" + uses: "pnpm/action-setup@v2" + with: + version: "8" + + - name: "Install Node.js" + uses: "actions/setup-node@v3" + with: + cache: "pnpm" + node-version: "lts/*" + + - name: "Install the Node.js dependencies" + run: "pnpm install" + - name: "Show the Foundry config" run: "forge config" @@ -81,14 +93,15 @@ jobs: run: "FOUNDRY_PROFILE=optimized forge build" - name: "Build the test contracts" - run: "FOUNDRY_PROFILE=test-optimized forge build" + run: "FOUNDRY_PROFILE=test-optimized forge build" - - name: "Cache the build so that it can be re-used by the other jobs" + - name: "Cache the build and the node modules so that they can be re-used by the other jobs" uses: "actions/cache/save@v3" with: - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -105,19 +118,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -137,19 +149,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -170,19 +181,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -202,19 +212,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -224,4 +233,4 @@ jobs: - name: "Add test summary" run: | echo "## Fork tests result" >> $GITHUB_STEP_SUMMARY - echo "✅ Passed" >> $GITHUB_STEP_SUMMARY \ No newline at end of file + echo "✅ Passed" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/ci-slither.yml b/.github/workflows/ci-slither.yml new file mode 100644 index 000000000..d2e2f57d5 --- /dev/null +++ b/.github/workflows/ci-slither.yml @@ -0,0 +1,83 @@ +name: "CI Slither" + +env: + API_KEY_ETHERSCAN: ${{ secrets.API_KEY_ETHERSCAN }} + API_KEY_INFURA: ${{ secrets.API_KEY_INFURA }} + RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }} + +on: + schedule: + - cron: "0 3 * * 0" # at 3:00am UTC every Sunday + +jobs: + lint: + runs-on: "ubuntu-latest" + steps: + - name: "Check out the repo" + uses: "actions/checkout@v3" + + - name: "Install Foundry" + uses: "foundry-rs/foundry-toolchain@v1" + + - name: "Install Pnpm" + uses: "pnpm/action-setup@v2" + with: + version: "8" + + - name: "Install Node.js" + uses: "actions/setup-node@v3" + with: + cache: "pnpm" + node-version: "lts/*" + + - name: "Install the Node.js dependencies" + run: "pnpm install" + + - name: "Lint the contracts" + run: "pnpm lint" + + - name: "Add lint summary" + run: | + echo "## Lint result" >> $GITHUB_STEP_SUMMARY + echo "✅ Passed" >> $GITHUB_STEP_SUMMARY + + slither-analyze: + runs-on: "ubuntu-latest" + permissions: + actions: "read" + contents: "read" + security-events: "write" + steps: + - name: "Check out the repo" + uses: "actions/checkout@v3" + + - name: "Install Pnpm" + uses: "pnpm/action-setup@v2" + with: + version: "8" + + - name: "Install Node.js" + uses: "actions/setup-node@v3" + with: + cache: "pnpm" + node-version: "lts/*" + + - name: "Install the Node.js dependencies" + run: "pnpm install" + + - name: "Run Slither analysis" + uses: "crytic/slither-action@v0.3.0" + id: "slither" + with: + fail-on: "none" + sarif: "results.sarif" + + - name: "Upload SARIF file to GitHub code scanning" + uses: "github/codeql-action/upload-sarif@v2" + with: + sarif_file: ${{ steps.slither.outputs.sarif }} + + - name: "Add Slither summary" + run: | + echo "## Slither result" >> $GITHUB_STEP_SUMMARY + echo "✅ Uploaded to GitHub code scanning" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a5f6eb27..2c424484e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,8 +53,6 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" @@ -78,16 +76,17 @@ jobs: - name: "Generate and prepare the contract artifacts" run: "./shell/prepare-artifacts.sh" - + - name: "Build the test contracts" run: "FOUNDRY_PROFILE=test-optimized forge build" - - name: "Cache the build so that it can be re-used by the other jobs" + - name: "Cache the build and the node modules so that they can be re-used by the other jobs" uses: "actions/cache/save@v3" with: - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -109,19 +108,29 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Install Pnpm" + uses: "pnpm/action-setup@v2" + with: + version: "8" + + - name: "Install Node.js" + uses: "actions/setup-node@v3" + with: + cache: "pnpm" + node-version: "lts/*" + + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -141,19 +150,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -171,19 +179,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -201,19 +208,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -233,19 +239,18 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" - - name: "Restore the cached build" + - name: "Restore the cached build and the node modules" uses: "actions/cache/restore@v3" with: fail-on-cache-miss: true - key: "foundry-build-${{ github.sha }}" + key: "build-and-modules-${{ github.sha }}" path: | cache + node_modules out out-optimized @@ -267,12 +272,21 @@ jobs: steps: - name: "Check out the repo" uses: "actions/checkout@v3" - with: - submodules: "recursive" - name: "Install Foundry" uses: "foundry-rs/foundry-toolchain@v1" + - name: "Restore the cached build and the node modules" + uses: "actions/cache/restore@v3" + with: + fail-on-cache-miss: true + key: "build-and-modules-${{ github.sha }}" + path: | + cache + node_modules + out + out-optimized + - name: "Generate the coverage report using the unit and the integration tests" run: "forge coverage --match-path \"test/{unit,integration}/**/*.sol\" --report lcov" @@ -284,4 +298,4 @@ jobs: - name: "Add coverage summary" run: | echo "## Coverage result" >> $GITHUB_STEP_SUMMARY - echo "✅ Uploaded to Codecov" >> $GITHUB_STEP_SUMMARY \ No newline at end of file + echo "✅ Uploaded to Codecov" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/deploy-comptroller.yml b/.github/workflows/deploy-comptroller.yml index fd391ea5d..03eff8a05 100644 --- a/.github/workflows/deploy-comptroller.yml +++ b/.github/workflows/deploy-comptroller.yml @@ -20,7 +20,7 @@ on: description: "Initial contract admin." required: false chain: - default: "goerli" + default: "sepolia" description: "Chain name as defined in the Foundry config." required: false diff --git a/.github/workflows/deploy-core.yml b/.github/workflows/deploy-core.yml index 905257159..24159ddd5 100644 --- a/.github/workflows/deploy-core.yml +++ b/.github/workflows/deploy-core.yml @@ -20,7 +20,7 @@ on: description: "Initial protocol admin." required: false chain: - default: "goerli" + default: "sepolia" description: "Chain name as defined in the Foundry config." required: false max-segment-count: diff --git a/.github/workflows/deploy-lockup-dynamic.yml b/.github/workflows/deploy-lockup-dynamic.yml index d90cbc431..f2d7c72a5 100644 --- a/.github/workflows/deploy-lockup-dynamic.yml +++ b/.github/workflows/deploy-lockup-dynamic.yml @@ -20,7 +20,7 @@ on: description: "Initial contract admin." required: false chain: - default: "goerli" + default: "sepolia" description: "Chain name as defined in the Foundry config." required: false comptroller: diff --git a/.github/workflows/deploy-lockup-linear.yml b/.github/workflows/deploy-lockup-linear.yml index 6ddcb368e..9d51e5855 100644 --- a/.github/workflows/deploy-lockup-linear.yml +++ b/.github/workflows/deploy-lockup-linear.yml @@ -20,7 +20,7 @@ on: description: "Initial contract admin." required: false chain: - default: "goerli" + default: "sepolia" description: "Chain name as defined in the Foundry config." required: false comptroller: diff --git a/.github/workflows/deploy-nft-descriptor.yml b/.github/workflows/deploy-nft-descriptor.yml index 6f76bd1be..ef5ee19f4 100644 --- a/.github/workflows/deploy-nft-descriptor.yml +++ b/.github/workflows/deploy-nft-descriptor.yml @@ -16,7 +16,7 @@ on: workflow_dispatch: inputs: chain: - default: "goerli" + default: "sepolia" description: "Chain name as defined in the Foundry config." required: false diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4c47bc02c..000000000 --- a/.gitmodules +++ /dev/null @@ -1,24 +0,0 @@ -[submodule "lib/forge-std"] - branch = "v1" - path = "lib/forge-std" - url = "https://github.com/foundry-rs/forge-std" -[submodule "lib/openzeppelin-contracts"] - branch = "release-v4.9" - path = "lib/openzeppelin-contracts" - url = "https://github.com/OpenZeppelin/openzeppelin-contracts" -[submodule "lib/prb-math"] - branch = "release-v4" - path = "lib/prb-math" - url = "https://github.com/PaulRBerg/prb-math" -[submodule "lib/prb-test"] - branch = "release-v0" - path = "lib/prb-test" - url = "https://github.com/PaulRBerg/prb-test" -[submodule "lib/solady"] - branch = "main" - path = "lib/solady" - url = "https://github.com/Vectorized/solady" -[submodule "lib/solarray"] - branch = "master" - path = "lib/solarray" - url = "https://github.com/evmcheb/solarray" diff --git a/.solhint.json b/.solhint.json index 22cafb398..31a4d5b8c 100644 --- a/.solhint.json +++ b/.solhint.json @@ -6,12 +6,14 @@ "compiler-version": ["error", ">=0.8.19"], "contract-name-camelcase": "off", "const-name-snakecase": "off", + "custom-errors": "off", "func-name-mixedcase": "off", "func-visibility": ["error", { "ignoreConstructors": true }], "max-line-length": ["error", 123], "named-parameters-mapping": "warn", "no-empty-blocks": "off", "not-rely-on-time": "off", + "one-contract-per-file": "off", "var-name-mixedcase": "off" } } diff --git a/CHANGELOG.md b/CHANGELOG.md index cfd69bb8c..ebbe9af96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,34 @@ All notable changes to this project will be documented in this file. The format is based on [Common Changelog](https://common-changelog.org/). +[1.1.0]: https://github.com/sablier-labs/v2-core/compare/v1.0.2...v1.1.0 [1.0.2]: https://github.com/sablier-labs/v2-core/compare/v1.0.1...v1.0.2 [1.0.1]: https://github.com/sablier-labs/v2-core/compare/v1.0.0...v1.0.1 [1.0.0]: https://github.com/sablier-labs/v2-core/releases/tag/v1.0.0 +## [1.1.0] - 2023-12-15 + +### Changed + +- **Breaking**: Remove ability to cancel for recipients ([#710](https://github.com/sablier-labs/v2-core/pull/710)) +- Move `isWarm` and `isCold` to `SablierV2Lockup` ([#664](https://github.com/sablier-labs/v2-core/pull/664)) +- Replace the streamed amount with the deposit amount in the NFT descriptor + ([#692](https://github.com/sablier-labs/v2-core/pull/692)) +- Simplify `renounce` and `withdraw` implementations ([#683](https://github.com/sablier-labs/v2-core/pull/683), + [#705](https://github.com/sablier-labs/v2-core/pull/705)) +- Update import paths to use Node.js dependencies ([#734](https://github.com/sablier-labs/v2-core/pull/734)) +- Upgrade Solidity to `0.8.21` ([#688](https://github.com/sablier-labs/v2-core/pull/688)) + +### Added + +- Add `ERC-4906` metadata update in `transferFrom` ([#686](https://github.com/sablier-labs/v2-core/pull/686)) +- Add `transferable` boolean flag ([#668](https://github.com/sablier-labs/v2-core/pull/668)) + +### Removed + +- Remove `@openzeppelin/contracts` from Node.js peer dependencies + ([#694](https://github.com/sablier-labs/v2-core/pull/694)) + ## [1.0.2] - 2023-08-14 ### Changed diff --git a/README.md b/README.md index 7a0877e3d..147a9d1e7 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,32 @@ In-depth documentation is available at [docs.sablier.com](https://docs.sablier.c ## Background -Sablier is a smart contract protocol that enables trustless streaming of ERC-20 assets. In this context, streaming means -the ability to make payments by the second. +Sablier V2 is a token distribution protocol used by DAOs and businesses for vesting, payroll, airdrops, and more. The +linear stream is our flagship payment model, which distributes assets on a continuous, by-the-second basis. -The protocol features two streaming models called Lockup Linear and Lockup Dynamic, in which the sender locks up a -specified amount of ERC-20 assets in a contract. The contract progressively allocates the funds to the designated -recipient, who can access them as they become available over time. The streaming rate is influenced by various factors, -including the start and end times, as well as the total amount of assets locked up. +The way it works is that the sender of a payment stream first deposits a specific amount of ERC-20 tokens in a contract. +Then, the contract progressively allocates the funds to the recipient, who can access them as they become available over +time. The payment rate is influenced by various factors, including the start and end times, as well as the total amount +of tokens deposited. ## Install +### Node.js (recommended) + +Sablier V2 Core is available as a Node.js package: + +```shell +yarn add @sablier/v2-core +``` + +Finally, add these to your `remappings.txt` file: + +```text +@sablier/v2-core/=node_modules/@sablier/v2-core/ +@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/ +@prb/math/=node_modules/@prb/math/ +``` + ### Foundry First, run the install step: @@ -34,27 +50,18 @@ First, run the install step: forge install sablier-labs/v2-core ``` -Your `.gitmodules` file should now contain the following entry: +Second, you need to install the project's dependencies: -```toml -[submodule "lib/v2-core"] - branch = "release" - path = "lib/v2-core" - url = "https://github.com/sablier-labs/v2-core" +```shell +forge install --no-commit OpenZeppelin/openzeppelin-contracts@v4.9.2 PaulRBerg/prb-math ``` -Finally, add this to your `remappings.txt` file: +Finally, add these to your `remappings.txt` file: ```text @sablier/v2-core/=lib/v2-core/ -``` - -### Node.js - -Sablier V2 Core is available as a Node.js package: - -```shell -pnpm add @sablier/v2-core +@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/ +@prb/math/=lib/prb-math/ ``` ## Usage @@ -83,6 +90,11 @@ contract, which is more gas-efficient and easier to maintain. For more information, see the [Technical Overview](https://docs.sablier.com/contracts/v2/reference/overview) in our docs, as well as these [diagrams](https://docs.sablier.com/contracts/v2/reference/diagrams). +### Branching Tree Technique + +You may notice that some test files are accompanied by `.tree` files. This is called the Branching Tree Technique, and +it is explained in depth [here](https://github.com/sablier-labs/v2-core/wiki/Tests#branching-tree-technique). + ## Deployments The list of all deployment addresses can be found [here](https://docs.sablier.com). For guidance on the deploy scripts, diff --git a/SECURITY.md b/SECURITY.md index 22319f6eb..8ae591510 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -24,7 +24,7 @@ The Program does NOT cover the following: - Code located in the [test](./test) or [script](./script) directories. - External code in the [lib](./lib) directory, except for code that is explicitly used by a deployed contract located in the [src](./src) directory. -- Contract deployments on test networks, such as Goerli. +- Contract deployments on test networks, such as Sepolia. - Bugs in third-party contracts or platforms interacting with Sablier V2 Core. - Previously reported or discovered vulnerabilities in contracts built by third parties on Sablier V2 Core. - Bugs that have already been reported. @@ -52,6 +52,7 @@ vulnerability, it must adhere to these assumptions as well: are not supported. - An address' ERC-20 balance can only change as a result of a `transfer` call by the sender or a `transferFrom` call by an approved address. This excludes rebase tokens and interest-bearing tokens. +- The token contract does not allow callbacks (e.g. ERC-777 is not supported). ### Rewards diff --git a/foundry.toml b/foundry.toml index d788a459c..5eed6d8ed 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,7 +1,6 @@ [profile.default] auto_detect_solc = false bytecode_hash = "none" - cbor_metadata = false emv_version = "paris" fs_permissions = [{ access = "read", path = "out-optimized" }] libs = ["lib"] @@ -16,7 +15,7 @@ out = "out" script = "script" sender = "0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38" - solc = "0.8.19" + solc = "0.8.21" src = "src" test = "test" @@ -53,7 +52,9 @@ [profile.smt.model_checker] engine = "chc" # constrained Horn clauses invariants = ["contract", "reentrancy"] + show_proved_safe = true show_unproved = true + show_unsupported = true timeout = 100_000 # in milliseconds, per solving query targets = [ "assert", @@ -79,11 +80,10 @@ repository = "https://github.com/sablier-labs/v2-core" [etherscan] - arbitrum_one = { key = "${API_KEY_ARBISCAN}" } + arbitrum = { key = "${API_KEY_ARBISCAN}" } avalanche = { key = "${API_KEY_SNOWTRACE" } bnb_smart_chain = { key = "${API_KEY_BSCSCAN}" } gnosis_chain = { key = "${API_KEY_GNOSISSCAN}" } - goerli = { key = "${API_KEY_ETHERSCAN}" } mainnet = { key = "${API_KEY_ETHERSCAN}" } optimism = { key = "${API_KEY_OPTIMISTIC_ETHERSCAN}" } polygon = { key = "${API_KEY_POLYGONSCAN}" } @@ -100,11 +100,10 @@ wrap_comments = true [rpc_endpoints] - arbitrum_one = "https://arbitrum-mainnet.infura.io/v3/${API_KEY_INFURA}" + arbitrum = "https://arbitrum-mainnet.infura.io/v3/${API_KEY_INFURA}" avalanche = "https://avalanche-mainnet.infura.io/v3/${API_KEY_INFURA}" bnb_smart_chain = "https://bsc-dataseed.binance.org" gnosis_chain = "https://rpc.gnosischain.com" - goerli = "https://goerli.infura.io/v3/${API_KEY_INFURA}" localhost = "http://localhost:8545" mainnet = "${RPC_URL_MAINNET}" optimism = "https://optimism-mainnet.infura.io/v3/${API_KEY_INFURA}" diff --git a/lib/forge-std b/lib/forge-std deleted file mode 160000 index e8a047e3f..000000000 --- a/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e8a047e3f40f13fa37af6fe14e6e06283d9a060e diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts deleted file mode 160000 index e50c24f58..000000000 --- a/lib/openzeppelin-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e50c24f5839db17f46991478384bfda14acfb830 diff --git a/lib/prb-math b/lib/prb-math deleted file mode 160000 index 77fa88eda..000000000 --- a/lib/prb-math +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 77fa88eda4a4a91b3f3e9431df291292c26b6c71 diff --git a/lib/prb-test b/lib/prb-test deleted file mode 160000 index 1e9ead2f7..000000000 --- a/lib/prb-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e9ead2f7bfaedda3038081c16484b0d7d0b2712 diff --git a/lib/solady b/lib/solady deleted file mode 160000 index c863813a6..000000000 --- a/lib/solady +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c863813a6fa2068e1ec834ebc037ededb99a6f97 diff --git a/lib/solarray b/lib/solarray deleted file mode 160000 index 0625e7e43..000000000 --- a/lib/solarray +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc diff --git a/package.json b/package.json index ae66ed1c0..7e452e296 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "@sablier/v2-core", - "description": "Core smart contracts of the Sablier V2 token streaming protocol", + "description": "Core smart contracts of the Sablier V2 token distribution protocol", "license": "BUSL-1.1", - "version": "1.0.2", + "version": "1.1.0", "author": { "name": "Sablier Labs Ltd", "url": "https://sablier.com" @@ -12,20 +12,26 @@ }, "dependencies": { "@openzeppelin/contracts": "4.9.2", - "@prb/math": "4.0.1" + "@prb/math": "4.0.2" }, "devDependencies": { + "@prb/test": "0.6.4", + "forge-std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e", "prettier": "^2.8.8", - "solhint-community": "^3.5.2" + "solady": "0.0.129", + "solarray": "github:evmcheb/solarray#0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc", + "solhint": "^4.0.0" }, "files": [ "artifacts", "src", + "test/utils", "CHANGELOG.md", "LICENSE-GPL.md" ], "homepage": "https://github.com/sablier-labs/v2-core#readme", "keywords": [ + "asset-distribution", "asset-streaming", "blockchain", "cryptoasset-streaming", @@ -38,11 +44,14 @@ "sablier-v2", "smart-contracts", "solidity", - "token-streaming" + "token-distribution", + "token-streaming", + "token-vesting", + "vesting", + "web3" ], "peerDependencies": { - "@openzeppelin/contracts": "4.9.2", - "@prb/math": "4.0.1" + "@prb/math": "4.0.x" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8049a4a94..fa7d38c08 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,16 +9,28 @@ dependencies: specifier: 4.9.2 version: 4.9.2 '@prb/math': - specifier: 4.0.1 - version: 4.0.1 + specifier: 4.0.2 + version: 4.0.2 devDependencies: + '@prb/test': + specifier: 0.6.4 + version: 0.6.4 + forge-std: + specifier: github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e + version: github.com/foundry-rs/forge-std/e8a047e3f40f13fa37af6fe14e6e06283d9a060e prettier: specifier: ^2.8.8 version: 2.8.8 - solhint-community: - specifier: ^3.5.2 - version: 3.5.2 + solady: + specifier: 0.0.129 + version: 0.0.129 + solarray: + specifier: github:evmcheb/solarray#0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc + version: github.com/evmcheb/solarray/0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc + solhint: + specifier: ^4.0.0 + version: 4.0.0 packages: @@ -47,16 +59,57 @@ packages: resolution: {integrity: sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==} dev: false - /@prb/math@4.0.1: - resolution: {integrity: sha512-ANTz2KMV+dMdZ57mWgDTR6jZo5uQzUczQEHCxd7CvJZZ9yafnfPhUUILHvvigIOZ85fZbTPVkC8YoRG1z5Qf7g==} + /@pnpm/config.env-replace@1.1.0: + resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==} + engines: {node: '>=12.22.0'} + dev: true + + /@pnpm/network.ca-file@1.0.2: + resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==} + engines: {node: '>=12.22.0'} + dependencies: + graceful-fs: 4.2.10 + dev: true + + /@pnpm/npm-conf@2.2.2: + resolution: {integrity: sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==} + engines: {node: '>=12'} + dependencies: + '@pnpm/config.env-replace': 1.1.0 + '@pnpm/network.ca-file': 1.0.2 + config-chain: 1.1.13 + dev: true + + /@prb/math@4.0.2: + resolution: {integrity: sha512-kJgqvXR6iyU7+N959RzggSFhBdnRuSDnc/bs8u6MzdWw7aYIUaAr+uMVdpP6Dheypjerd7sfJgFOs19FRFhscg==} dev: false + /@prb/test@0.6.4: + resolution: {integrity: sha512-P0tTMsB6XQ0Wp61EYdXJYFhsOVGyZvcOFub2y9yk0sF+GYDusctR7DzEI+vOP0SILm3knFkEJASjewHEBppdRQ==} + dev: true + + /@sindresorhus/is@5.6.0: + resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==} + engines: {node: '>=14.16'} + dev: true + /@solidity-parser/parser@0.16.0: resolution: {integrity: sha512-ESipEcHyRHg4Np4SqBCfcXwyxxna1DgFVz69bgpLV8vzl/NP1DtcKsJ4dJZXWQhY/Z4J2LeKBiOkOVZn9ct33Q==} dependencies: antlr4ts: 0.5.0-alpha.4 dev: true + /@szmarczak/http-timer@5.0.1: + resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} + engines: {node: '>=14.16'} + dependencies: + defer-to-connect: 2.0.1 + dev: true + + /@types/http-cache-semantics@4.0.4: + resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} + dev: true + /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -126,6 +179,24 @@ packages: balanced-match: 1.0.2 dev: true + /cacheable-lookup@7.0.0: + resolution: {integrity: sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==} + engines: {node: '>=14.16'} + dev: true + + /cacheable-request@10.2.14: + resolution: {integrity: sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==} + engines: {node: '>=14.16'} + dependencies: + '@types/http-cache-semantics': 4.0.4 + get-stream: 6.0.1 + http-cache-semantics: 4.1.1 + keyv: 4.5.4 + mimic-response: 4.0.0 + normalize-url: 8.0.0 + responselike: 3.0.0 + dev: true + /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} @@ -174,6 +245,13 @@ packages: engines: {node: '>=14'} dev: true + /config-chain@1.1.13: + resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} + dependencies: + ini: 1.3.8 + proto-list: 1.2.4 + dev: true + /cosmiconfig@8.2.0: resolution: {integrity: sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==} engines: {node: '>=14'} @@ -184,6 +262,23 @@ packages: path-type: 4.0.0 dev: true + /decompress-response@6.0.0: + resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} + engines: {node: '>=10'} + dependencies: + mimic-response: 3.1.0 + dev: true + + /deep-extend@0.6.0: + resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} + engines: {node: '>=4.0.0'} + dev: true + + /defer-to-connect@2.0.1: + resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==} + engines: {node: '>=10'} + dev: true + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: true @@ -211,10 +306,20 @@ packages: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} dev: true + /form-data-encoder@2.1.4: + resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==} + engines: {node: '>= 14.17'} + dev: true + /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} dev: true + /get-stream@6.0.1: + resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} + engines: {node: '>=10'} + dev: true + /glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} @@ -226,6 +331,27 @@ packages: once: 1.4.0 dev: true + /got@12.6.1: + resolution: {integrity: sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==} + engines: {node: '>=14.16'} + dependencies: + '@sindresorhus/is': 5.6.0 + '@szmarczak/http-timer': 5.0.1 + cacheable-lookup: 7.0.0 + cacheable-request: 10.2.14 + decompress-response: 6.0.0 + form-data-encoder: 2.1.4 + get-stream: 6.0.1 + http2-wrapper: 2.2.1 + lowercase-keys: 3.0.0 + p-cancelable: 3.0.0 + responselike: 3.0.0 + dev: true + + /graceful-fs@4.2.10: + resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} + dev: true + /has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} @@ -236,6 +362,18 @@ packages: engines: {node: '>=8'} dev: true + /http-cache-semantics@4.1.1: + resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} + dev: true + + /http2-wrapper@2.2.1: + resolution: {integrity: sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==} + engines: {node: '>=10.19.0'} + dependencies: + quick-lru: 5.1.1 + resolve-alpn: 1.2.1 + dev: true + /ignore@5.2.4: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} @@ -260,6 +398,10 @@ packages: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} dev: true + /ini@1.3.8: + resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} + dev: true + /is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} dev: true @@ -280,6 +422,10 @@ packages: argparse: 2.0.1 dev: true + /json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + dev: true + /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} dev: true @@ -292,6 +438,19 @@ packages: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} dev: true + /keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + dependencies: + json-buffer: 3.0.1 + dev: true + + /latest-version@7.0.0: + resolution: {integrity: sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==} + engines: {node: '>=14.16'} + dependencies: + package-json: 8.1.1 + dev: true + /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true @@ -304,6 +463,28 @@ packages: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} dev: true + /lowercase-keys@3.0.0: + resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + + /lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + dependencies: + yallist: 4.0.0 + dev: true + + /mimic-response@3.1.0: + resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} + engines: {node: '>=10'} + dev: true + + /mimic-response@4.0.0: + resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + /minimatch@5.1.6: resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} engines: {node: '>=10'} @@ -311,12 +492,36 @@ packages: brace-expansion: 2.0.1 dev: true + /minimist@1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + dev: true + + /normalize-url@8.0.0: + resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==} + engines: {node: '>=14.16'} + dev: true + /once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 dev: true + /p-cancelable@3.0.0: + resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==} + engines: {node: '>=12.20'} + dev: true + + /package-json@8.1.1: + resolution: {integrity: sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==} + engines: {node: '>=14.16'} + dependencies: + got: 12.6.1 + registry-auth-token: 5.0.2 + registry-url: 6.0.1 + semver: 7.5.4 + dev: true + /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -350,24 +555,71 @@ packages: hasBin: true dev: true + /proto-list@1.2.4: + resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} + dev: true + /punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} dev: true + /quick-lru@5.1.1: + resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==} + engines: {node: '>=10'} + dev: true + + /rc@1.2.8: + resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} + hasBin: true + dependencies: + deep-extend: 0.6.0 + ini: 1.3.8 + minimist: 1.2.8 + strip-json-comments: 2.0.1 + dev: true + + /registry-auth-token@5.0.2: + resolution: {integrity: sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==} + engines: {node: '>=14'} + dependencies: + '@pnpm/npm-conf': 2.2.2 + dev: true + + /registry-url@6.0.1: + resolution: {integrity: sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==} + engines: {node: '>=12'} + dependencies: + rc: 1.2.8 + dev: true + /require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} dev: true + /resolve-alpn@1.2.1: + resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==} + dev: true + /resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} dev: true - /semver@6.3.0: - resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} + /responselike@3.0.0: + resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==} + engines: {node: '>=14.16'} + dependencies: + lowercase-keys: 3.0.0 + dev: true + + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + engines: {node: '>=10'} hasBin: true + dependencies: + lru-cache: 6.0.0 dev: true /slice-ansi@4.0.0: @@ -379,8 +631,12 @@ packages: is-fullwidth-code-point: 3.0.0 dev: true - /solhint-community@3.5.2: - resolution: {integrity: sha512-l3lF2n8mF33p266u5atCSqjT9SyyOBD1qaWrQBAXHNk2xAxmi+pEynIVuTIn6FVD3JiuHRgutjKJcngs8Iolbg==} + /solady@0.0.129: + resolution: {integrity: sha512-2i+8lsLLT7nAED+A9C+ZLi8YmpSnUNKGKozkesN2Qm3P3iMvorXAsD5LyT1MAC3eyVfhY3PuvBkvgd31nUzkoQ==} + dev: true + + /solhint@4.0.0: + resolution: {integrity: sha512-bFViMcFvhqVd/HK3Roo7xZXX5nbujS7Bxeg5vnZc9QvH0yCWCrQ38Yrn1pbAY9tlKROc6wFr+rK1mxYgYrjZgA==} hasBin: true dependencies: '@solidity-parser/parser': 0.16.0 @@ -394,9 +650,10 @@ packages: glob: 8.1.0 ignore: 5.2.4 js-yaml: 4.1.0 + latest-version: 7.0.0 lodash: 4.17.21 pluralize: 8.0.0 - semver: 6.3.0 + semver: 7.5.4 strip-ansi: 6.0.1 table: 6.8.1 text-table: 0.2.0 @@ -420,6 +677,11 @@ packages: ansi-regex: 5.0.1 dev: true + /strip-json-comments@2.0.1: + resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} + engines: {node: '>=0.10.0'} + dev: true + /supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -458,3 +720,19 @@ packages: /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} dev: true + + /yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true + + github.com/evmcheb/solarray/0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc: + resolution: {tarball: https://codeload.github.com/evmcheb/solarray/tar.gz/0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc} + name: solarray#0625e7e4369eb299753fcb90a3cd7ffb91e1b5bc + version: 0.0.0 + dev: true + + github.com/foundry-rs/forge-std/e8a047e3f40f13fa37af6fe14e6e06283d9a060e: + resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/e8a047e3f40f13fa37af6fe14e6e06283d9a060e} + name: forge-std + version: 1.5.6 + dev: true diff --git a/remappings.txt b/remappings.txt index b35a5d2ab..167506d32 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,6 +1,6 @@ -@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/ -@prb/math/=lib/prb-math/ -@prb/test/=lib/prb-test/src/ -forge-std/=lib/forge-std/src/ -solady/=lib/solady/src/ -solarray/=lib/solarray/src/ +@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/ +@prb/math/=node_modules/@prb/math/ +@prb/test/=node_modules/@prb/test/ +forge-std/=node_modules/forge-std/ +solady/=node_modules/solady/ +solarray/=node_modules/solarray/ \ No newline at end of file diff --git a/script/Base.s.sol b/script/Base.s.sol index 53c814f2a..e9f18740e 100644 --- a/script/Base.s.sol +++ b/script/Base.s.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; -import { Script } from "forge-std/Script.sol"; +import { Script } from "forge-std/src/Script.sol"; abstract contract BaseScript is Script { /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable. diff --git a/script/DeployComptroller.s.sol b/script/DeployComptroller.s.sol index ee8fd0843..cfeb4769c 100644 --- a/script/DeployComptroller.s.sol +++ b/script/DeployComptroller.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; diff --git a/script/DeployCore.s.sol b/script/DeployCore.s.sol index a53aa44d5..cb70fa7a1 100644 --- a/script/DeployCore.s.sol +++ b/script/DeployCore.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol"; diff --git a/script/DeployCore2.s.sol b/script/DeployCore2.s.sol index f448eb466..0752639c1 100644 --- a/script/DeployCore2.s.sol +++ b/script/DeployCore2.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; diff --git a/script/DeployDeterministicComptroller.s.sol b/script/DeployDeterministicComptroller.s.sol index 35e07cff2..e609d960c 100644 --- a/script/DeployDeterministicComptroller.s.sol +++ b/script/DeployDeterministicComptroller.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; diff --git a/script/DeployDeterministicCore.s.sol b/script/DeployDeterministicCore.s.sol index ebedcded8..aac8a7ab9 100644 --- a/script/DeployDeterministicCore.s.sol +++ b/script/DeployDeterministicCore.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; import { SablierV2LockupDynamic } from "../src/SablierV2LockupDynamic.sol"; diff --git a/script/DeployDeterministicCore2.s.sol b/script/DeployDeterministicCore2.s.sol index a7a0183cf..c6b76b4f7 100644 --- a/script/DeployDeterministicCore2.s.sol +++ b/script/DeployDeterministicCore2.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; import { SablierV2Comptroller } from "../src/SablierV2Comptroller.sol"; diff --git a/script/DeployDeterministicLockupDynamic.s.sol b/script/DeployDeterministicLockupDynamic.s.sol index 4ddf6e20f..8c25b4a83 100644 --- a/script/DeployDeterministicLockupDynamic.s.sol +++ b/script/DeployDeterministicLockupDynamic.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; diff --git a/script/DeployDeterministicLockupLinear.s.sol b/script/DeployDeterministicLockupLinear.s.sol index 86b710364..3526a45fb 100644 --- a/script/DeployDeterministicLockupLinear.s.sol +++ b/script/DeployDeterministicLockupLinear.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; diff --git a/script/DeployLockupDynamic.s.sol b/script/DeployLockupDynamic.s.sol index 3b1256acb..b27f75396 100644 --- a/script/DeployLockupDynamic.s.sol +++ b/script/DeployLockupDynamic.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; diff --git a/script/DeployLockupLinear.s.sol b/script/DeployLockupLinear.s.sol index 813e36877..b3af99d1b 100644 --- a/script/DeployLockupLinear.s.sol +++ b/script/DeployLockupLinear.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2NFTDescriptor } from "../src/interfaces/ISablierV2NFTDescriptor.sol"; diff --git a/script/GenerateSVG.s.sol b/script/GenerateSVG.s.sol index ed568de6b..df3bbc9d7 100644 --- a/script/GenerateSVG.s.sol +++ b/script/GenerateSVG.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { Strings } from "@openzeppelin/contracts/utils/Strings.sol"; @@ -19,12 +19,12 @@ contract GenerateSVG is BaseScript, SablierV2NFTDescriptor { /// @param progress The streamed amount as a numerical percentage with 4 implied decimals. /// @param status The status of the stream, as a string. - /// @param streamed The abbreviated streamed amount, as a string. + /// @param amount The abbreviated deposited amount, as a string. /// @param duration The total duration of the stream in days, as a number. function run( uint256 progress, string memory status, - string memory streamed, + string memory amount, uint256 duration ) public @@ -34,6 +34,7 @@ contract GenerateSVG is BaseScript, SablierV2NFTDescriptor { svg = NFTSVG.generateSVG( NFTSVG.SVGParams({ accentColor: generateAccentColor({ sablier: LOCKUP_LINEAR, streamId: uint256(keccak256(msg.data)) }), + amount: string.concat(SVGElements.SIGN_GE, " ", amount), assetAddress: DAI.toHexString(), assetSymbol: "DAI", duration: calculateDurationInDays({ startTime: 0, endTime: duration * 1 days }), @@ -41,7 +42,6 @@ contract GenerateSVG is BaseScript, SablierV2NFTDescriptor { progress: stringifyPercentage(progress), progressNumerical: progress, status: status, - streamed: streamed.equal("0") ? "0" : string.concat(SVGElements.SIGN_GE, " ", streamed), streamingModel: "Lockup Linear" }) ); diff --git a/script/Init.s.sol b/script/Init.s.sol index 16f2db254..8a99762ac 100644 --- a/script/Init.s.sol +++ b/script/Init.s.sol @@ -1,15 +1,16 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { ud2x18 } from "@prb/math/src/UD2x18.sol"; +import { ud60x18 } from "@prb/math/src/UD60x18.sol"; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2LockupDynamic } from "../src/interfaces/ISablierV2LockupDynamic.sol"; import { ISablierV2LockupLinear } from "../src/interfaces/ISablierV2LockupLinear.sol"; import { Broker, LockupDynamic, LockupLinear } from "../src/types/DataTypes.sol"; -import { ud2x18, ud60x18 } from "../src/types/Math.sol"; import { BaseScript } from "./Base.s.sol"; @@ -73,6 +74,7 @@ contract Init is BaseScript { totalAmount: totalAmounts[i], asset: asset, cancelable: true, + transferable: true, durations: LockupLinear.Durations({ cliff: cliffDurations[i], total: totalDurations[i] }), broker: Broker(address(0), ud60x18(0)) }) @@ -98,6 +100,7 @@ contract Init is BaseScript { asset: asset, broker: Broker(address(0), ud60x18(0)), cancelable: true, + transferable: true, recipient: recipient, sender: sender, segments: segments, diff --git a/shell/generate-svg-panoply.sh b/shell/generate-svg-panoply.sh index 0bbf39c36..4f9973ba5 100755 --- a/shell/generate-svg-panoply.sh +++ b/shell/generate-svg-panoply.sh @@ -9,12 +9,12 @@ # Strict mode: https://gist.github.com/vncsna/64825d5609c146e80de8b1fd623011ca set -euo pipefail -./shell/generate-svg.sh 0 "Pending" "0" 5 -./shell/generate-svg.sh 0 "Pending" "0" 21 -./shell/generate-svg.sh 0 "Pending" "0" 565 +./shell/generate-svg.sh 0 "Pending" "100" 5 +./shell/generate-svg.sh 0 "Pending" "100" 21 +./shell/generate-svg.sh 0 "Pending" "100" 565 -./shell/generate-svg.sh 0 "Canceled" "0" 3 -./shell/generate-svg.sh 0 "Canceled" "0" 3 +./shell/generate-svg.sh 0 "Canceled" "100" 3 +./shell/generate-svg.sh 0 "Canceled" "100" 3 ./shell/generate-svg.sh 144 "Canceled" "29.81K" 24 ./shell/generate-svg.sh 7231 "Canceled" "421.11K" 24 diff --git a/shell/generate-svg.sh b/shell/generate-svg.sh index eca4f9379..4f5a0d556 100755 --- a/shell/generate-svg.sh +++ b/shell/generate-svg.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Notes: -# - There are four input arguments: progress, status, streamed amount, and duration +# - There are four input arguments: progress, status, deposit amount, and duration # Pre-requisites: # - foundry (https://getfoundry.sh) @@ -12,7 +12,7 @@ set -euo pipefail # Load the arguments while using default values arg_progress=${1:-4235} arg_status=${2:-"Streaming"} -arg_streamed=${3:-"1.23M"} +arg_amount=${3:-"1.23M"} arg_duration=${4:-"91"} # Run the Forge script and extract the SVG from stdout @@ -21,13 +21,13 @@ output=$( --sig "run(uint256,string,string,uint256)" \ "$arg_progress" \ "$arg_status" \ - "$arg_streamed" \ + "$arg_amount" \ "$arg_duration" ) svg=$(echo "$output" | awk -F "svg: string " '{print $2}' | awk 'NF > 0') # Generate the file name -name="nft-${arg_progress}-${arg_status}-${arg_streamed}-${arg_duration}.svg" +name="nft-${arg_progress}-${arg_status}-${arg_amount}-${arg_duration}.svg" sanitized="$(echo "$name" | sed "s/ //g" )" # remove whitespaces # Put the SVG in a file diff --git a/shell/prepare-artifacts.sh b/shell/prepare-artifacts.sh index 04ca4f002..06ab4fe97 100755 --- a/shell/prepare-artifacts.sh +++ b/shell/prepare-artifacts.sh @@ -45,7 +45,6 @@ cp out-optimized/IERC721Metadata.sol/IERC721Metadata.json $erc721 hooks=./artifacts/interfaces/hooks cp out-optimized/ISablierV2LockupRecipient.sol/ISablierV2LockupRecipient.json $hooks -cp out-optimized/ISablierV2LockupSender.sol/ISablierV2LockupSender.json $hooks libraries=./artifacts/libraries cp out-optimized/Errors.sol/Errors.json $libraries diff --git a/slither.config.json b/slither.config.json index 725063073..16f73fce4 100644 --- a/slither.config.json +++ b/slither.config.json @@ -1,12 +1,12 @@ { "detectors_to_exclude": "naming-convention,reentrancy-events,solc-version,timestamp", - "filter_paths": "(lib|test)", + "filter_paths": "(test)", "solc_remaps": [ - "@openzeppelin/contracts=lib/openzeppelin-contracts/contracts/", - "@prb/math/=lib/prb-math/", - "@prb/test/=lib/prb-test/src/", - "forge-std/=lib/forge-std/src/", - "solady/=lib/solady/src/", - "solarray/=lib/solarray/src/" + "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/", + "@prb/math/=node_modules/@prb-math/", + "@prb/test/=node_modules/@prb/test/", + "forge-std/=node_modules/forge-std/", + "solady/=node_modules/solady/", + "solarray/=node_modules/solarray/" ] } diff --git a/src/SablierV2LockupDynamic.sol b/src/SablierV2LockupDynamic.sol index 8bf388d6d..e8a15a4cb 100644 --- a/src/SablierV2LockupDynamic.sol +++ b/src/SablierV2LockupDynamic.sol @@ -14,7 +14,6 @@ import { ISablierV2Comptroller } from "./interfaces/ISablierV2Comptroller.sol"; import { ISablierV2Lockup } from "./interfaces/ISablierV2Lockup.sol"; import { ISablierV2LockupDynamic } from "./interfaces/ISablierV2LockupDynamic.sol"; import { ISablierV2LockupRecipient } from "./interfaces/hooks/ISablierV2LockupRecipient.sol"; -import { ISablierV2LockupSender } from "./interfaces/hooks/ISablierV2LockupSender.sol"; import { ISablierV2NFTDescriptor } from "./interfaces/ISablierV2NFTDescriptor.sol"; import { Errors } from "./libraries/Errors.sol"; import { Helpers } from "./libraries/Helpers.sol"; @@ -185,8 +184,19 @@ contract SablierV2LockupDynamic is result = _streams[streamId].isCancelable; } } - /// @inheritdoc ISablierV2Lockup + /// @inheritdoc SablierV2Lockup + function isTransferable(uint256 streamId) + public + view + override(ISablierV2Lockup, SablierV2Lockup) + notNull(streamId) + returns (bool result) + { + result = _streams[streamId].isTransferable; + } + + /// @inheritdoc ISablierV2Lockup function isDepleted(uint256 streamId) public view @@ -266,6 +276,7 @@ contract SablierV2LockupDynamic is asset: params.asset, broker: params.broker, cancelable: params.cancelable, + transferable: params.transferable, recipient: params.recipient, segments: segments, sender: params.sender, @@ -495,38 +506,28 @@ contract SablierV2LockupDynamic is address sender = _streams[streamId].sender; address recipient = _ownerOf(streamId); + // Retrieve the ERC-20 asset from storage. + IERC20 asset = _streams[streamId].asset; + // Interactions: refund the sender. - _streams[streamId].asset.safeTransfer({ to: sender, value: senderAmount }); - - // Interactions: if `msg.sender` is the sender and the recipient is a contract, try to invoke the cancel - // hook on the recipient without reverting if the hook is not implemented, and without bubbling up any - // potential revert. - if (msg.sender == sender) { - if (recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamCanceled({ - streamId: streamId, - sender: sender, - senderAmount: senderAmount, - recipientAmount: recipientAmount - }) { } catch { } - } - } - // Interactions: if `msg.sender` is the recipient and the sender is a contract, try to invoke the cancel - // hook on the sender without reverting if the hook is not implemented, and also without bubbling up any - // potential revert. - else { - if (sender.code.length > 0) { - try ISablierV2LockupSender(sender).onStreamCanceled({ - streamId: streamId, - recipient: recipient, - senderAmount: senderAmount, - recipientAmount: recipientAmount - }) { } catch { } - } - } + asset.safeTransfer({ to: sender, value: senderAmount }); // Log the cancellation. - emit ISablierV2Lockup.CancelLockupStream(streamId, sender, recipient, senderAmount, recipientAmount); + emit ISablierV2Lockup.CancelLockupStream(streamId, sender, recipient, asset, senderAmount, recipientAmount); + + // Emits an ERC-4906 event to trigger an update of the NFT metadata. + emit MetadataUpdate({ _tokenId: streamId }); + + // Interactions: if the recipient is a contract, try to invoke the cancel hook on the recipient without + // reverting if the hook is not implemented, and without bubbling up any potential revert. + if (recipient.code.length > 0) { + try ISablierV2LockupRecipient(recipient).onStreamCanceled({ + streamId: streamId, + sender: sender, + senderAmount: senderAmount, + recipientAmount: recipientAmount + }) { } catch { } + } } /// @dev See the documentation for the user-facing functions that call this internal function. @@ -553,6 +554,7 @@ contract SablierV2LockupDynamic is stream.amounts.deposited = createAmounts.deposit; stream.asset = params.asset; stream.isCancelable = params.cancelable; + stream.isTransferable = params.transferable; stream.isStream = true; stream.sender = params.sender; @@ -601,6 +603,7 @@ contract SablierV2LockupDynamic is amounts: createAmounts, asset: params.asset, cancelable: params.cancelable, + transferable: params.transferable, segments: params.segments, range: LockupDynamic.Range({ start: stream.startTime, end: stream.endTime }), broker: params.broker.account @@ -616,26 +619,10 @@ contract SablierV2LockupDynamic is // Effects: renounce the stream by making it not cancelable. _streams[streamId].isCancelable = false; - - // Interactions: if the recipient is a contract, try to invoke the renounce hook on the recipient without - // reverting if the hook is not implemented, and also without bubbling up any potential revert. - address recipient = _ownerOf(streamId); - if (recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamRenounced(streamId) { } catch { } - } - - // Log the renouncement. - emit ISablierV2Lockup.RenounceLockupStream(streamId); } /// @dev See the documentation for the user-facing functions that call this internal function. function _withdraw(uint256 streamId, address to, uint128 amount) internal override { - // Checks: the withdraw amount is not greater than the withdrawable amount. - uint128 withdrawableAmount = _withdrawableAmountOf(streamId); - if (amount > withdrawableAmount) { - revert Errors.SablierV2Lockup_Overdraw(streamId, amount, withdrawableAmount); - } - // Effects: update the withdrawn amount. _streams[streamId].amounts.withdrawn = _streams[streamId].amounts.withdrawn + amount; @@ -652,25 +639,13 @@ contract SablierV2LockupDynamic is _streams[streamId].isCancelable = false; } - // Interactions: perform the ERC-20 transfer. - _streams[streamId].asset.safeTransfer({ to: to, value: amount }); - - // Retrieve the recipient from storage. - address recipient = _ownerOf(streamId); + // Retrieve the ERC-20 asset from storage. + IERC20 asset = _streams[streamId].asset; - // Interactions: if `msg.sender` is not the recipient and the recipient is a contract, try to invoke the - // withdraw hook on it without reverting if the hook is not implemented, and also without bubbling up - // any potential revert. - if (msg.sender != recipient && recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamWithdrawn({ - streamId: streamId, - caller: msg.sender, - to: to, - amount: amount - }) { } catch { } - } + // Interactions: perform the ERC-20 transfer. + asset.safeTransfer({ to: to, value: amount }); // Log the withdrawal. - emit ISablierV2Lockup.WithdrawFromLockupStream(streamId, to, amount); + emit ISablierV2Lockup.WithdrawFromLockupStream(streamId, to, asset, amount); } } diff --git a/src/SablierV2LockupLinear.sol b/src/SablierV2LockupLinear.sol index 82efe356a..1f0c4da75 100644 --- a/src/SablierV2LockupLinear.sol +++ b/src/SablierV2LockupLinear.sol @@ -12,7 +12,6 @@ import { ISablierV2Lockup } from "./interfaces/ISablierV2Lockup.sol"; import { ISablierV2LockupLinear } from "./interfaces/ISablierV2LockupLinear.sol"; import { ISablierV2NFTDescriptor } from "./interfaces/ISablierV2NFTDescriptor.sol"; import { ISablierV2LockupRecipient } from "./interfaces/hooks/ISablierV2LockupRecipient.sol"; -import { ISablierV2LockupSender } from "./interfaces/hooks/ISablierV2LockupSender.sol"; import { Errors } from "./libraries/Errors.sol"; import { Helpers } from "./libraries/Helpers.sol"; import { Lockup, LockupLinear } from "./types/DataTypes.sol"; @@ -169,6 +168,17 @@ contract SablierV2LockupLinear is } } + /// @inheritdoc SablierV2Lockup + function isTransferable(uint256 streamId) + public + view + override(ISablierV2Lockup, SablierV2Lockup) + notNull(streamId) + returns (bool result) + { + result = _streams[streamId].isTransferable; + } + /// @inheritdoc ISablierV2Lockup function isDepleted(uint256 streamId) public @@ -257,6 +267,7 @@ contract SablierV2LockupLinear is asset: params.asset, broker: params.broker, cancelable: params.cancelable, + transferable: params.transferable, range: range, recipient: params.recipient, sender: params.sender, @@ -410,38 +421,28 @@ contract SablierV2LockupLinear is address sender = _streams[streamId].sender; address recipient = _ownerOf(streamId); + // Retrieve the ERC-20 asset from storage. + IERC20 asset = _streams[streamId].asset; + // Interactions: refund the sender. - _streams[streamId].asset.safeTransfer({ to: sender, value: senderAmount }); - - // Interactions: if `msg.sender` is the sender and the recipient is a contract, try to invoke the cancel - // hook on the recipient without reverting if the hook is not implemented, and without bubbling up any - // potential revert. - if (msg.sender == sender) { - if (recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamCanceled({ - streamId: streamId, - sender: sender, - senderAmount: senderAmount, - recipientAmount: recipientAmount - }) { } catch { } - } - } - // Interactions: if `msg.sender` is the recipient and the sender is a contract, try to invoke the cancel - // hook on the sender without reverting if the hook is not implemented, and also without bubbling up any - // potential revert. - else { - if (sender.code.length > 0) { - try ISablierV2LockupSender(sender).onStreamCanceled({ - streamId: streamId, - recipient: recipient, - senderAmount: senderAmount, - recipientAmount: recipientAmount - }) { } catch { } - } - } + asset.safeTransfer({ to: sender, value: senderAmount }); // Log the cancellation. - emit ISablierV2Lockup.CancelLockupStream(streamId, sender, recipient, senderAmount, recipientAmount); + emit ISablierV2Lockup.CancelLockupStream(streamId, sender, recipient, asset, senderAmount, recipientAmount); + + // Emits an ERC-4906 event to trigger an update of the NFT metadata. + emit MetadataUpdate({ _tokenId: streamId }); + + // Interactions: if the recipient is a contract, try to invoke the cancel hook on the recipient without + // reverting if the hook is not implemented, and without bubbling up any potential revert. + if (recipient.code.length > 0) { + try ISablierV2LockupRecipient(recipient).onStreamCanceled({ + streamId: streamId, + sender: sender, + senderAmount: senderAmount, + recipientAmount: recipientAmount + }) { } catch { } + } } /// @dev See the documentation for the user-facing functions that call this internal function. @@ -467,6 +468,7 @@ contract SablierV2LockupLinear is cliffTime: params.range.cliff, endTime: params.range.end, isCancelable: params.cancelable, + isTransferable: params.transferable, isDepleted: false, isStream: true, sender: params.sender, @@ -508,6 +510,7 @@ contract SablierV2LockupLinear is amounts: createAmounts, asset: params.asset, cancelable: params.cancelable, + transferable: params.transferable, range: params.range, broker: params.broker.account }); @@ -522,26 +525,10 @@ contract SablierV2LockupLinear is // Effects: renounce the stream by making it not cancelable. _streams[streamId].isCancelable = false; - - // Interactions: if the recipient is a contract, try to invoke the renounce hook on the recipient without - // reverting if the hook is not implemented, and also without bubbling up any potential revert. - address recipient = _ownerOf(streamId); - if (recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamRenounced(streamId) { } catch { } - } - - // Log the renouncement. - emit ISablierV2Lockup.RenounceLockupStream(streamId); } /// @dev See the documentation for the user-facing functions that call this internal function. function _withdraw(uint256 streamId, address to, uint128 amount) internal override { - // Checks: the withdraw amount is not greater than the withdrawable amount. - uint128 withdrawableAmount = _withdrawableAmountOf(streamId); - if (amount > withdrawableAmount) { - revert Errors.SablierV2Lockup_Overdraw(streamId, amount, withdrawableAmount); - } - // Effects: update the withdrawn amount. _streams[streamId].amounts.withdrawn = _streams[streamId].amounts.withdrawn + amount; @@ -558,25 +545,13 @@ contract SablierV2LockupLinear is _streams[streamId].isCancelable = false; } - // Interactions: perform the ERC-20 transfer. - _streams[streamId].asset.safeTransfer({ to: to, value: amount }); - - // Retrieve the recipient from storage. - address recipient = _ownerOf(streamId); + // Retrieve the ERC-20 asset from storage. + IERC20 asset = _streams[streamId].asset; - // Interactions: if `msg.sender` is not the recipient and the recipient is a contract, try to invoke the - // withdraw hook on it without reverting if the hook is not implemented, and also without bubbling up - // any potential revert. - if (msg.sender != recipient && recipient.code.length > 0) { - try ISablierV2LockupRecipient(recipient).onStreamWithdrawn({ - streamId: streamId, - caller: msg.sender, - to: to, - amount: amount - }) { } catch { } - } + // Interactions: perform the ERC-20 transfer. + asset.safeTransfer({ to: to, value: amount }); // Log the withdrawal. - emit ISablierV2Lockup.WithdrawFromLockupStream(streamId, to, amount); + emit ISablierV2Lockup.WithdrawFromLockupStream(streamId, to, asset, amount); } } diff --git a/src/SablierV2NFTDescriptor.sol b/src/SablierV2NFTDescriptor.sol index b1bdce663..741bb51ce 100644 --- a/src/SablierV2NFTDescriptor.sol +++ b/src/SablierV2NFTDescriptor.sol @@ -30,12 +30,12 @@ contract SablierV2NFTDescriptor is ISablierV2NFTDescriptor { struct TokenURIVars { address asset; string assetSymbol; + uint128 depositedAmount; string json; ISablierV2Lockup sablier; string sablierAddress; string status; string svg; - uint128 streamedAmount; uint256 streamedPercentage; string streamingModel; } @@ -49,13 +49,13 @@ contract SablierV2NFTDescriptor is ISablierV2NFTDescriptor { vars.sablierAddress = address(sablier).toHexString(); vars.asset = address(vars.sablier.getAsset(streamId)); vars.assetSymbol = safeAssetSymbol(vars.asset); + vars.depositedAmount = vars.sablier.getDepositedAmount(streamId); // Load the stream's data. vars.status = stringifyStatus(vars.sablier.statusOf(streamId)); - vars.streamedAmount = vars.sablier.streamedAmountOf(streamId); vars.streamedPercentage = calculateStreamedPercentage({ - streamedAmount: vars.streamedAmount, - depositedAmount: vars.sablier.getDepositedAmount(streamId) + streamedAmount: vars.sablier.streamedAmountOf(streamId), + depositedAmount: vars.depositedAmount }); vars.streamingModel = mapSymbol(sablier); @@ -63,6 +63,7 @@ contract SablierV2NFTDescriptor is ISablierV2NFTDescriptor { vars.svg = NFTSVG.generateSVG( NFTSVG.SVGParams({ accentColor: generateAccentColor(address(sablier), streamId), + amount: abbreviateAmount({ amount: vars.depositedAmount, decimals: safeAssetDecimals(vars.asset) }), assetAddress: vars.asset.toHexString(), assetSymbol: vars.assetSymbol, duration: calculateDurationInDays({ @@ -73,7 +74,6 @@ contract SablierV2NFTDescriptor is ISablierV2NFTDescriptor { progress: stringifyPercentage(vars.streamedPercentage), progressNumerical: vars.streamedPercentage, status: vars.status, - streamed: abbreviateAmount({ amount: vars.streamedAmount, decimals: safeAssetDecimals(vars.asset) }), streamingModel: vars.streamingModel }) ); diff --git a/src/abstracts/NoDelegateCall.sol b/src/abstracts/NoDelegateCall.sol index f0684aeb2..c01be8734 100644 --- a/src/abstracts/NoDelegateCall.sol +++ b/src/abstracts/NoDelegateCall.sol @@ -7,11 +7,11 @@ import { Errors } from "../libraries/Errors.sol"; /// @notice This contract implements logic to prevent delegate calls. abstract contract NoDelegateCall { /// @dev The address of the original contract that was deployed. - address private immutable _original; + address private immutable ORIGINAL; /// @dev Sets the original contract address. constructor() { - _original = address(this); + ORIGINAL = address(this); } /// @notice Prevents delegate calls. @@ -23,11 +23,11 @@ abstract contract NoDelegateCall { /// @dev This function checks whether the current call is a delegate call, and reverts if it is. /// /// - A private function is used instead of inlining this logic in a modifier because Solidity copies modifiers into - /// every function that uses them. The `_original` address would get copied in every place the modifier is used, + /// every function that uses them. The `ORIGINAL` address would get copied in every place the modifier is used, /// which would increase the contract size. By using a function instead, we can avoid this duplication of code /// and reduce the overall size of the contract. function _preventDelegateCall() private view { - if (address(this) != _original) { + if (address(this) != ORIGINAL) { revert Errors.DelegateCall(); } } diff --git a/src/abstracts/SablierV2Lockup.sol b/src/abstracts/SablierV2Lockup.sol index e644483d6..a3a323f3e 100644 --- a/src/abstracts/SablierV2Lockup.sol +++ b/src/abstracts/SablierV2Lockup.sol @@ -8,6 +8,7 @@ import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions import { ISablierV2Comptroller } from "../interfaces/ISablierV2Comptroller.sol"; import { ISablierV2Lockup } from "../interfaces/ISablierV2Lockup.sol"; import { ISablierV2NFTDescriptor } from "../interfaces/ISablierV2NFTDescriptor.sol"; +import { ISablierV2LockupRecipient } from "../interfaces/hooks/ISablierV2LockupRecipient.sol"; import { Errors } from "../libraries/Errors.sol"; import { Lockup } from "../types/DataTypes.sol"; import { SablierV2Base } from "./SablierV2Base.sol"; @@ -123,6 +124,9 @@ abstract contract SablierV2Lockup is withdrawableAmount = _withdrawableAmountOf(streamId); } + /// @inheritdoc ISablierV2Lockup + function isTransferable(uint256 streamId) public view virtual returns (bool); + /*////////////////////////////////////////////////////////////////////////// USER-FACING NON-CONSTANT FUNCTIONS //////////////////////////////////////////////////////////////////////////*/ @@ -146,7 +150,7 @@ abstract contract SablierV2Lockup is } /// @inheritdoc ISablierV2Lockup - function cancel(uint256 streamId) public override noDelegateCall updateMetadata(streamId) { + function cancel(uint256 streamId) public override noDelegateCall { // Checks: the stream is neither depleted nor canceled. This also checks that the stream is not null. if (isDepleted(streamId)) { revert Errors.SablierV2Lockup_StreamDepleted(streamId); @@ -154,8 +158,8 @@ abstract contract SablierV2Lockup is revert Errors.SablierV2Lockup_StreamCanceled(streamId); } - // Checks: `msg.sender` is either the stream's sender or the stream's recipient (i.e. the NFT owner). - if (!_isCallerStreamSender(streamId) && msg.sender != _ownerOf(streamId)) { + // Checks: `msg.sender` is the stream's sender. + if (!_isCallerStreamSender(streamId)) { revert Errors.SablierV2Lockup_Unauthorized(streamId, msg.sender); } @@ -195,8 +199,18 @@ abstract contract SablierV2Lockup is revert Errors.SablierV2Lockup_Unauthorized(streamId, msg.sender); } - // Effects: renounce the stream. + // Checks and Effects: renounce the stream. _renounce(streamId); + + // Log the renouncement. + emit ISablierV2Lockup.RenounceLockupStream(streamId); + + // Interactions: if the recipient is a contract, try to invoke the renounce hook on the recipient without + // reverting if the hook is not implemented, and also without bubbling up any potential revert. + address recipient = _ownerOf(streamId); + if (recipient.code.length > 0) { + try ISablierV2LockupRecipient(recipient).onStreamRenounced(streamId) { } catch { } + } } /// @inheritdoc ISablierV2Lockup @@ -232,13 +246,18 @@ abstract contract SablierV2Lockup is revert Errors.SablierV2Lockup_StreamDepleted(streamId); } + bool isCallerStreamSender = _isCallerStreamSender(streamId); + // Checks: `msg.sender` is the stream's sender, the stream's recipient, or an approved third party. - if (!_isCallerStreamSender(streamId) && !_isCallerStreamRecipientOrApproved(streamId)) { + if (!isCallerStreamSender && !_isCallerStreamRecipientOrApproved(streamId)) { revert Errors.SablierV2Lockup_Unauthorized(streamId, msg.sender); } + // Retrieve the recipient from storage. + address recipient = _ownerOf(streamId); + // Checks: if `msg.sender` is the stream's sender, the withdrawal address must be the recipient. - if (_isCallerStreamSender(streamId) && to != _ownerOf(streamId)) { + if (isCallerStreamSender && to != recipient) { revert Errors.SablierV2Lockup_InvalidSenderWithdrawal(streamId, msg.sender, to); } @@ -252,8 +271,26 @@ abstract contract SablierV2Lockup is revert Errors.SablierV2Lockup_WithdrawAmountZero(streamId); } - // Checks, Effects and Interactions: make the withdrawal. + // Checks: the withdraw amount is not greater than the withdrawable amount. + uint128 withdrawableAmount = _withdrawableAmountOf(streamId); + if (amount > withdrawableAmount) { + revert Errors.SablierV2Lockup_Overdraw(streamId, amount, withdrawableAmount); + } + + // Effects and Interactions: make the withdrawal. _withdraw(streamId, to, amount); + + // Interactions: if `msg.sender` is not the recipient and the recipient is a contract, try to invoke the + // withdraw hook on it without reverting if the hook is not implemented, and also without bubbling up + // any potential revert. + if (msg.sender != recipient && recipient.code.length > 0) { + try ISablierV2LockupRecipient(recipient).onStreamWithdrawn({ + streamId: streamId, + caller: msg.sender, + to: to, + amount: amount + }) { } catch { } + } } /// @inheritdoc ISablierV2Lockup @@ -270,7 +307,6 @@ abstract contract SablierV2Lockup is override noDelegateCall notNull(streamId) - updateMetadata(streamId) { // Checks: the caller is the current recipient. This also checks that the NFT was not burned. address currentRecipient = _ownerOf(streamId); @@ -281,7 +317,7 @@ abstract contract SablierV2Lockup is // Skip the withdrawal if the withdrawable amount is zero. uint128 withdrawableAmount = _withdrawableAmountOf(streamId); if (withdrawableAmount > 0) { - _withdraw({ streamId: streamId, to: currentRecipient, amount: withdrawableAmount }); + withdraw({ streamId: streamId, to: currentRecipient, amount: withdrawableAmount }); } // Checks and Effects: transfer the NFT. @@ -321,6 +357,39 @@ abstract contract SablierV2Lockup is INTERNAL CONSTANT FUNCTIONS //////////////////////////////////////////////////////////////////////////*/ + /// @notice Overrides the internal ERC-721 transfer function to emit an ERC-4906 event upon transfer. The goal is to + /// refresh the NFT metadata on external platforms. + /// @dev This event is also emitted when the NFT is minted or burned. + function _afterTokenTransfer( + address, /* from */ + address, /* to */ + uint256 streamId, + uint256 /* batchSize */ + ) + internal + override + updateMetadata(streamId) + { } + + /// @notice Overrides the internal ERC-721 transfer function to check that the stream is transferable. + /// @dev There are two cases when the transferable flag is ignored: + /// - If `from` is 0, then the transfer is a mint and is allowed. + /// - If `to` is 0, then the transfer is a burn and is also allowed. + function _beforeTokenTransfer( + address from, + address to, + uint256 streamId, + uint256 /* batchSize */ + ) + internal + view + override + { + if (!isTransferable(streamId) && to != address(0) && from != address(0)) { + revert Errors.SablierV2Lockup_NotTransferable(streamId); + } + } + /// @notice Checks whether `msg.sender` is the stream's recipient or an approved third party. /// @param streamId The stream id for the query. function _isCallerStreamRecipientOrApproved(uint256 streamId) internal view returns (bool) { diff --git a/src/interfaces/ISablierV2Lockup.sol b/src/interfaces/ISablierV2Lockup.sol index 7049dff2c..15ab4f511 100644 --- a/src/interfaces/ISablierV2Lockup.sol +++ b/src/interfaces/ISablierV2Lockup.sol @@ -22,14 +22,16 @@ interface ISablierV2Lockup is /// @param streamId The id of the stream. /// @param sender The address of the stream's sender. /// @param recipient The address of the stream's recipient. + /// @param asset The contract address of the ERC-20 asset used for streaming. /// @param senderAmount The amount of assets refunded to the stream's sender, denoted in units of the asset's /// decimals. /// @param recipientAmount The amount of assets left for the stream's recipient to withdraw, denoted in units of the /// asset's decimals. event CancelLockupStream( - uint256 indexed streamId, + uint256 streamId, address indexed sender, address indexed recipient, + IERC20 indexed asset, uint128 senderAmount, uint128 recipientAmount ); @@ -49,8 +51,9 @@ interface ISablierV2Lockup is /// @notice Emitted when assets are withdrawn from a stream. /// @param streamId The id of the stream. /// @param to The address that has received the withdrawn assets. + /// @param asset The contract address of the ERC-20 asset used for streaming. /// @param amount The amount of assets withdrawn, denoted in units of the asset's decimals. - event WithdrawFromLockupStream(uint256 indexed streamId, address indexed to, uint128 amount); + event WithdrawFromLockupStream(uint256 indexed streamId, address indexed to, IERC20 indexed asset, uint128 amount); /*////////////////////////////////////////////////////////////////////////// CONSTANT FUNCTIONS @@ -118,6 +121,11 @@ interface ISablierV2Lockup is /// @param streamId The stream id for the query. function isStream(uint256 streamId) external view returns (bool result); + /// @notice Retrieves a flag indicating whether the stream NFT can be transferred. + /// @dev Reverts if `streamId` references a null stream. + /// @param streamId The stream id for the query. + function isTransferable(uint256 streamId) external view returns (bool result); + /// @notice Retrieves a flag indicating whether the stream is warm, i.e. either pending or streaming. /// @dev Reverts if `streamId` references a null stream. /// @param streamId The stream id for the query. @@ -176,13 +184,12 @@ interface ISablierV2Lockup is /// Notes: /// - If there any assets left for the recipient to withdraw, the stream is marked as canceled. Otherwise, the /// stream is marked as depleted. - /// - This function attempts to invoke a hook on either the sender or the recipient, depending on who `msg.sender` - /// is, and if the resolved address is a contract. + /// - This function attempts to invoke a hook on the recipient, if the resolved address is a contract. /// /// Requirements: /// - Must not be delegate called. /// - The stream must be warm and cancelable. - /// - `msg.sender` must be either the stream's sender or the stream's recipient (i.e. the NFT owner). + /// - `msg.sender` must be the stream's sender. /// /// @param streamId The id of the stream to cancel. function cancel(uint256 streamId) external; diff --git a/src/interfaces/ISablierV2LockupDynamic.sol b/src/interfaces/ISablierV2LockupDynamic.sol index a2f99301f..d117d9c8a 100644 --- a/src/interfaces/ISablierV2LockupDynamic.sol +++ b/src/interfaces/ISablierV2LockupDynamic.sol @@ -22,6 +22,7 @@ interface ISablierV2LockupDynamic is ISablierV2Lockup { /// broker fee amount, all denoted in units of the asset's decimals. /// @param asset The contract address of the ERC-20 asset used for streaming. /// @param cancelable Boolean indicating whether the stream will be cancelable or not. + /// @param transferable Boolean indicating whether the stream NFT is transferable or not. /// @param segments The segments the protocol uses to compose the custom streaming curve. /// @param range Struct containing (i) the stream's start time and (ii) end time, both as Unix timestamps. /// @param broker The address of the broker who has helped create the stream, e.g. a front-end website. @@ -33,6 +34,7 @@ interface ISablierV2LockupDynamic is ISablierV2Lockup { Lockup.CreateAmounts amounts, IERC20 indexed asset, bool cancelable, + bool transferable, LockupDynamic.Segment[] segments, LockupDynamic.Range range, address broker diff --git a/src/interfaces/ISablierV2LockupLinear.sol b/src/interfaces/ISablierV2LockupLinear.sol index 90e5dd7f2..be1edebd3 100644 --- a/src/interfaces/ISablierV2LockupLinear.sol +++ b/src/interfaces/ISablierV2LockupLinear.sol @@ -22,6 +22,7 @@ interface ISablierV2LockupLinear is ISablierV2Lockup { /// broker fee amount, all denoted in units of the asset's decimals. /// @param asset The contract address of the ERC-20 asset used for streaming. /// @param cancelable Boolean indicating whether the stream will be cancelable or not. + /// @param transferable Boolean indicating whether the stream NFT is transferable or not. /// @param range Struct containing (i) the stream's start time, (ii) cliff time, and (iii) end time, all as Unix /// timestamps. /// @param broker The address of the broker who has helped create the stream, e.g. a front-end website. @@ -33,6 +34,7 @@ interface ISablierV2LockupLinear is ISablierV2Lockup { Lockup.CreateAmounts amounts, IERC20 indexed asset, bool cancelable, + bool transferable, LockupLinear.Range range, address broker ); diff --git a/src/interfaces/hooks/ISablierV2LockupSender.sol b/src/interfaces/hooks/ISablierV2LockupSender.sol deleted file mode 100644 index c3ba379a8..000000000 --- a/src/interfaces/hooks/ISablierV2LockupSender.sol +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19; - -/// @title ISablierV2LockupSender -/// @notice Interface for sender contracts capable of reacting to cancellations. -/// @dev Implementation of this interface is optional. If a sender contract doesn't implement this interface, -/// function execution will not revert. -interface ISablierV2LockupSender { - /// @notice Responds to recipient-triggered cancellations. - /// - /// @dev Notes: - /// - This function may revert, but the Sablier contract will ignore the revert. - /// - /// @param streamId The id of the canceled stream. - /// @param recipient The stream's recipient, who canceled the stream. - /// @param senderAmount The amount of assets refunded to the stream's sender, denoted in units of the asset's - /// decimals. - /// @param recipientAmount The amount of assets left for the stream's recipient to withdraw, denoted in units of the - /// asset's decimals. - function onStreamCanceled( - uint256 streamId, - address recipient, - uint128 senderAmount, - uint128 recipientAmount - ) - external; -} diff --git a/src/libraries/Errors.sol b/src/libraries/Errors.sol index 4eb1a17a3..147cf9d1a 100644 --- a/src/libraries/Errors.sol +++ b/src/libraries/Errors.sol @@ -57,6 +57,9 @@ library Errors { /// @notice Thrown when the stream's sender tries to withdraw to an address other than the recipient's. error SablierV2Lockup_InvalidSenderWithdrawal(uint256 streamId, address sender, address to); + /// @notice Thrown when trying to transfer Stream NFT when transferability is disabled. + error SablierV2Lockup_NotTransferable(uint256 tokenId); + /// @notice Thrown when the id references a null stream. error SablierV2Lockup_Null(uint256 streamId); diff --git a/src/libraries/NFTSVG.sol b/src/libraries/NFTSVG.sol index 3d3550763..807b03e3b 100644 --- a/src/libraries/NFTSVG.sol +++ b/src/libraries/NFTSVG.sol @@ -13,6 +13,7 @@ library NFTSVG { struct SVGParams { string accentColor; + string amount; string assetAddress; string assetSymbol; string duration; @@ -20,11 +21,13 @@ library NFTSVG { uint256 progressNumerical; string sablierAddress; string status; - string streamed; string streamingModel; } struct SVGVars { + string amountCard; + uint256 amountWidth; + uint256 amountXPosition; string cards; uint256 cardsWidth; string durationCard; @@ -36,9 +39,6 @@ library NFTSVG { string statusCard; uint256 statusWidth; uint256 statusXPosition; - string streamedCard; - uint256 streamedWidth; - uint256 streamedXPosition; } function generateSVG(SVGParams memory params) internal pure returns (string memory) { @@ -58,9 +58,9 @@ library NFTSVG { (vars.statusWidth, vars.statusCard) = SVGElements.card({ cardType: SVGElements.CardType.STATUS, content: params.status }); - // Generate the streamed card. - (vars.streamedWidth, vars.streamedCard) = - SVGElements.card({ cardType: SVGElements.CardType.STREAMED, content: params.streamed }); + // Generate the deposit amount card. + (vars.amountWidth, vars.amountCard) = + SVGElements.card({ cardType: SVGElements.CardType.AMOUNT, content: params.amount }); // Generate the duration card. (vars.durationWidth, vars.durationCard) = @@ -69,28 +69,28 @@ library NFTSVG { unchecked { // Calculate the width of the row containing the cards and the margins between them. vars.cardsWidth = - vars.streamedWidth + vars.durationWidth + vars.progressWidth + vars.statusWidth + CARD_MARGIN * 3; + vars.amountWidth + vars.durationWidth + vars.progressWidth + vars.statusWidth + CARD_MARGIN * 3; // Calculate the positions on the X axis based on the following layout: // - // ___________________________ SVG Width (1000px) _____________________________ - // | | | | | | | | | | - // | <-> | Progress | 16px | Status | 16px | Streamed | 16px | Duration | <-> | + // ___________________________ SVG Width (1000px) ___________________________ + // | | | | | | | | | | + // | <-> | Progress | 16px | Status | 16px | Amount | 16px | Duration | <-> | vars.progressXPosition = (1000 - vars.cardsWidth) / 2; vars.statusXPosition = vars.progressXPosition + vars.progressWidth + CARD_MARGIN; - vars.streamedXPosition = vars.statusXPosition + vars.statusWidth + CARD_MARGIN; - vars.durationXPosition = vars.streamedXPosition + vars.streamedWidth + CARD_MARGIN; + vars.amountXPosition = vars.statusXPosition + vars.statusWidth + CARD_MARGIN; + vars.durationXPosition = vars.amountXPosition + vars.amountWidth + CARD_MARGIN; } // Concatenate all cards. - vars.cards = string.concat(vars.progressCard, vars.statusCard, vars.streamedCard, vars.durationCard); + vars.cards = string.concat(vars.progressCard, vars.statusCard, vars.amountCard, vars.durationCard); return string.concat( '', SVGElements.BACKGROUND, generateDefs(params.accentColor, params.status, vars.cards), generateFloatingText(params.sablierAddress, params.streamingModel, params.assetAddress, params.assetSymbol), - generateHrefs(vars.progressXPosition, vars.statusXPosition, vars.streamedXPosition, vars.durationXPosition), + generateHrefs(vars.progressXPosition, vars.statusXPosition, vars.amountXPosition, vars.durationXPosition), "" ); } @@ -146,7 +146,7 @@ library NFTSVG { function generateHrefs( uint256 progressXPosition, uint256 statusXPosition, - uint256 streamedXPosition, + uint256 amountXPosition, uint256 durationXPosition ) internal @@ -164,8 +164,8 @@ library NFTSVG { '', - '', '=0.8.19; - -// Math.sol -// -// This file re-exports all PRBMath types used in V2 Core. It is provided for convenience so -// that users don't have to install PRBMath separately. - -import { SD59x18, sd, sd59x18 } from "@prb/math/src/SD59x18.sol"; -import { UD2x18, ud2x18 } from "@prb/math/src/UD2x18.sol"; -import { UD60x18, ud, ud60x18 } from "@prb/math/src/UD60x18.sol"; diff --git a/src/types/Tokens.sol b/src/types/Tokens.sol deleted file mode 100644 index 0bf468e5c..000000000 --- a/src/types/Tokens.sol +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -// solhint-disable no-unused-import -pragma solidity >=0.8.19; - -// Tokens.sol -// -// This file re-exports all token interfaces used in V2 Core. It is provided for convenience so -// that users don't have to install OpenZeppelin separately. - -import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; -import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; diff --git a/test/Base.t.sol b/test/Base.t.sol index d64cc6355..b735e2f5f 100644 --- a/test/Base.t.sol +++ b/test/Base.t.sol @@ -3,7 +3,6 @@ pragma solidity >=0.8.19 <0.9.0; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { StdCheats } from "forge-std/StdCheats.sol"; import { ISablierV2Comptroller } from "../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2LockupDynamic } from "../src/interfaces/ISablierV2LockupDynamic.sol"; @@ -18,17 +17,17 @@ import { ERC20MissingReturn } from "./mocks/erc20/ERC20MissingReturn.sol"; import { GoodFlashLoanReceiver } from "./mocks/flash-loan/GoodFlashLoanReceiver.sol"; import { Noop } from "./mocks/Noop.sol"; import { GoodRecipient } from "./mocks/hooks/GoodRecipient.sol"; -import { GoodSender } from "./mocks/hooks/GoodSender.sol"; import { Assertions } from "./utils/Assertions.sol"; import { Calculations } from "./utils/Calculations.sol"; import { Constants } from "./utils/Constants.sol"; import { Defaults } from "./utils/Defaults.sol"; +import { DeployOptimized } from "./utils/DeployOptimized.sol"; import { Events } from "./utils/Events.sol"; import { Fuzzers } from "./utils/Fuzzers.sol"; import { Users } from "./utils/Types.sol"; /// @notice Base test contract with common logic needed by all tests. -abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzzers, StdCheats { +abstract contract Base_Test is Assertions, Calculations, Constants, DeployOptimized, Events, Fuzzers { /*////////////////////////////////////////////////////////////////////////// VARIABLES //////////////////////////////////////////////////////////////////////////*/ @@ -44,7 +43,6 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz Defaults internal defaults; GoodFlashLoanReceiver internal goodFlashLoanReceiver; GoodRecipient internal goodRecipient; - GoodSender internal goodSender; ISablierV2LockupDynamic internal lockupDynamic; ISablierV2LockupLinear internal lockupLinear; ISablierV2NFTDescriptor internal nftDescriptor; @@ -60,7 +58,6 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz dai = new ERC20("Dai Stablecoin", "DAI"); goodFlashLoanReceiver = new GoodFlashLoanReceiver(); goodRecipient = new GoodRecipient(); - goodSender = new GoodSender(); noop = new Noop(); usdt = new ERC20MissingReturn("Tether USD", "USDT", 6); @@ -68,7 +65,6 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz vm.label({ account: address(dai), newLabel: "DAI" }); vm.label({ account: address(goodFlashLoanReceiver), newLabel: "Good Flash Loan Receiver" }); vm.label({ account: address(goodRecipient), newLabel: "Good Recipient" }); - vm.label({ account: address(goodSender), newLabel: "Good Sender" }); vm.label({ account: address(nftDescriptor), newLabel: "NFT Descriptor" }); vm.label({ account: address(noop), newLabel: "Noop" }); vm.label({ account: address(usdt), newLabel: "USDT" }); @@ -136,7 +132,7 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz return user; } - /// @dev Conditionally deploys V2 Core normally or from a source precompiled with `--via-ir`. + /// @dev Conditionally deploys V2 Core normally or from an optimized source compiled with `--via-ir`. /// We cannot use the {DeployCore} script because some tests rely on hard coded addresses for the /// deployed contracts. Since the script itself would have to be deployed, using it would bump the /// deployer's nonce, which would in turn lead to different addresses (recall that the addresses @@ -149,10 +145,8 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz new SablierV2LockupDynamic(users.admin, comptroller, nftDescriptor, defaults.MAX_SEGMENT_COUNT()); lockupLinear = new SablierV2LockupLinear(users.admin, comptroller, nftDescriptor); } else { - comptroller = deployPrecompiledComptroller(users.admin); - nftDescriptor = deployPrecompiledNFTDescriptor(); - lockupDynamic = deployPrecompiledDynamic(users.admin, comptroller, nftDescriptor); - lockupLinear = deployPrecompiledLinear(users.admin, comptroller, nftDescriptor); + (comptroller, lockupDynamic, lockupLinear, nftDescriptor) = + deployOptimizedCore(users.admin, defaults.MAX_SEGMENT_COUNT()); } vm.label({ account: address(comptroller), newLabel: "Comptroller" }); @@ -161,53 +155,6 @@ abstract contract Base_Test is Assertions, Calculations, Constants, Events, Fuzz vm.label({ account: address(nftDescriptor), newLabel: "NFTDescriptor" }); } - /// @dev Deploys {SablierV2Comptroller} from a source precompiled with `--via-ir`. - function deployPrecompiledComptroller(address initialAdmin) internal returns (ISablierV2Comptroller) { - return ISablierV2Comptroller( - deployCode("out-optimized/SablierV2Comptroller.sol/SablierV2Comptroller.json", abi.encode(initialAdmin)) - ); - } - - /// @dev Deploys {SablierV2LockupDynamic} from a source precompiled with `--via-ir`. - function deployPrecompiledDynamic( - address initialAdmin, - ISablierV2Comptroller comptroller_, - ISablierV2NFTDescriptor nftDescriptor_ - ) - internal - returns (ISablierV2LockupDynamic) - { - return ISablierV2LockupDynamic( - deployCode( - "out-optimized/SablierV2LockupDynamic.sol/SablierV2LockupDynamic.json", - abi.encode(initialAdmin, address(comptroller_), address(nftDescriptor_), defaults.MAX_SEGMENT_COUNT()) - ) - ); - } - - /// @dev Deploys {SablierV2LockupLinear} from a source precompiled with `--via-ir`. - function deployPrecompiledLinear( - address initialAdmin, - ISablierV2Comptroller comptroller_, - ISablierV2NFTDescriptor nftDescriptor_ - ) - internal - returns (ISablierV2LockupLinear) - { - return ISablierV2LockupLinear( - deployCode( - "out-optimized/SablierV2LockupLinear.sol/SablierV2LockupLinear.json", - abi.encode(initialAdmin, address(comptroller_), address(nftDescriptor_)) - ) - ); - } - - /// @dev Deploys {SablierV2NFTDescriptor} from a source precompiled with `--via-ir`. - function deployPrecompiledNFTDescriptor() internal returns (ISablierV2NFTDescriptor) { - return - ISablierV2NFTDescriptor(deployCode("out-optimized/SablierV2NFTDescriptor.sol/SablierV2NFTDescriptor.json")); - } - /*////////////////////////////////////////////////////////////////////////// CALL EXPECTS //////////////////////////////////////////////////////////////////////////*/ diff --git a/test/fork/Fork.t.sol b/test/fork/Fork.t.sol index 455660636..257f93aaf 100644 --- a/test/fork/Fork.t.sol +++ b/test/fork/Fork.t.sol @@ -12,8 +12,8 @@ abstract contract Fork_Test is Base_Test { CONSTANTS //////////////////////////////////////////////////////////////////////////*/ - IERC20 internal immutable asset; - address internal immutable holder; + IERC20 internal immutable ASSET; + address internal immutable HOLDER; /*////////////////////////////////////////////////////////////////////////// VARIABLES @@ -25,9 +25,9 @@ abstract contract Fork_Test is Base_Test { CONSTRUCTOR //////////////////////////////////////////////////////////////////////////*/ - constructor(IERC20 asset_, address holder_) { - asset = asset_; - holder = holder_; + constructor(IERC20 asset, address holder) { + ASSET = asset; + HOLDER = holder; } /*////////////////////////////////////////////////////////////////////////// @@ -47,11 +47,11 @@ abstract contract Fork_Test is Base_Test { // Label the contracts. labelContracts(); - // Make the asset holder the caller in this test suite. - vm.startPrank({ msgSender: holder }); + // Make the ASSET HOLDER the caller in this test suite. + vm.startPrank({ msgSender: HOLDER }); - // Query the initial balance of the asset holder. - initialHolderBalance = asset.balanceOf(holder); + // Query the initial balance of the ASSET HOLDER. + initialHolderBalance = ASSET.balanceOf(HOLDER); } /*////////////////////////////////////////////////////////////////////////// @@ -63,20 +63,20 @@ abstract contract Fork_Test is Base_Test { // The protocol does not allow the zero address to interact with it. vm.assume(sender != address(0) && recipient != address(0) && broker != address(0)); - // The goal is to not have overlapping users because the asset balance tests would fail otherwise. + // The goal is to not have overlapping users because the ASSET balance tests would fail otherwise. vm.assume(sender != recipient && sender != broker && recipient != broker); - vm.assume(sender != holder && recipient != holder && broker != holder); + vm.assume(sender != HOLDER && recipient != HOLDER && broker != HOLDER); vm.assume(sender != sablierContract && recipient != sablierContract && broker != sablierContract); // Avoid users blacklisted by USDC or USDT. - assumeNoBlacklisted(address(asset), sender); - assumeNoBlacklisted(address(asset), recipient); - assumeNoBlacklisted(address(asset), broker); + assumeNoBlacklisted(address(ASSET), sender); + assumeNoBlacklisted(address(ASSET), recipient); + assumeNoBlacklisted(address(ASSET), broker); } /// @dev Labels the most relevant contracts. function labelContracts() internal { - vm.label({ account: address(asset), newLabel: IERC20Metadata(address(asset)).symbol() }); - vm.label({ account: holder, newLabel: "Holder" }); + vm.label({ account: address(ASSET), newLabel: IERC20Metadata(address(ASSET)).symbol() }); + vm.label({ account: HOLDER, newLabel: "HOLDER" }); } } diff --git a/test/fork/LockupDynamic.t.sol b/test/fork/LockupDynamic.t.sol index dace293ab..54c671cb4 100644 --- a/test/fork/LockupDynamic.t.sol +++ b/test/fork/LockupDynamic.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/src/UD60x18.sol"; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { Broker, Lockup, LockupDynamic } from "src/types/DataTypes.sol"; @@ -14,7 +14,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { CONSTRUCTOR //////////////////////////////////////////////////////////////////////////*/ - constructor(IERC20 asset_, address holder_) Fork_Test(asset_, holder_) { } + constructor(IERC20 asset, address holder) Fork_Test(asset, holder) { } /*////////////////////////////////////////////////////////////////////////// SET-UP FUNCTION @@ -25,7 +25,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Approve {SablierV2LockupDynamic} to transfer the holder's assets. // We use a low-level call to ignore reverts because the asset can have the missing return value bug. - (bool success,) = address(asset).call(abi.encodeCall(IERC20.approve, (address(lockupDynamic), MAX_UINT256))); + (bool success,) = address(ASSET).call(abi.encodeCall(IERC20.approve, (address(lockupDynamic), MAX_UINT256))); success; } @@ -42,6 +42,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { uint40 warpTimestamp; LockupDynamic.Segment[] segments; uint128 withdrawAmount; + bool transferable; } struct Vars { @@ -119,6 +120,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { params.broker.fee = _bound(params.broker.fee, 0, MAX_FEE); params.protocolFee = _bound(params.protocolFee, 0, MAX_FEE); params.startTime = boundUint40(params.startTime, 0, defaults.START_TIME()); + params.transferable = true; // Fuzz the segment milestones. fuzzSegmentMilestones(params.segments, params.startTime); @@ -134,37 +136,41 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Set the fuzzed protocol fee. changePrank({ msgSender: users.admin }); - comptroller.setProtocolFee({ asset: asset, newProtocolFee: params.protocolFee }); + comptroller.setProtocolFee({ asset: ASSET, newProtocolFee: params.protocolFee }); // Make the holder the caller. - changePrank(holder); + changePrank(HOLDER); /*////////////////////////////////////////////////////////////////////////// CREATE //////////////////////////////////////////////////////////////////////////*/ // Load the pre-create protocol revenues. - vars.initialProtocolRevenues = lockupDynamic.protocolRevenues(asset); + vars.initialProtocolRevenues = lockupDynamic.protocolRevenues(ASSET); // Load the pre-create asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupDynamic), params.broker.account)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupDynamic), params.broker.account)); vars.initialLockupDynamicBalance = vars.balances[0]; vars.initialBrokerBalance = vars.balances[1]; - // Expect the relevant event to be emitted. vars.streamId = lockupDynamic.nextStreamId(); - vm.expectEmit({ emitter: address(lockupDynamic) }); vars.range = LockupDynamic.Range({ start: params.startTime, end: params.segments[params.segments.length - 1].milestone }); + + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupDynamic) }); + emit MetadataUpdate({ _tokenId: vars.streamId }); + vm.expectEmit({ emitter: address(lockupDynamic) }); emit CreateLockupDynamicStream({ streamId: vars.streamId, - funder: holder, + funder: HOLDER, sender: params.sender, recipient: params.recipient, amounts: vars.createAmounts, - asset: asset, + asset: ASSET, cancelable: true, + transferable: params.transferable, segments: params.segments, range: vars.range, broker: params.broker.account @@ -173,9 +179,10 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Create the stream. lockupDynamic.createWithMilestones( LockupDynamic.CreateWithMilestones({ - asset: asset, + asset: ASSET, broker: params.broker, cancelable: true, + transferable: params.transferable, recipient: params.recipient, segments: params.segments, sender: params.sender, @@ -192,10 +199,11 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Assert that the stream has been created. LockupDynamic.Stream memory actualStream = lockupDynamic.getStream(vars.streamId); assertEq(actualStream.amounts, Lockup.Amounts(vars.createAmounts.deposit, 0, 0)); - assertEq(actualStream.asset, asset, "asset"); + assertEq(actualStream.asset, ASSET, "asset"); assertEq(actualStream.endTime, vars.range.end, "endTime"); assertEq(actualStream.isCancelable, vars.isCancelable, "isCancelable"); assertEq(actualStream.isDepleted, false, "isDepleted"); + assertEq(actualStream.isTransferable, true, "isTransferable"); assertEq(actualStream.isStream, true, "isStream"); assertEq(actualStream.segments, params.segments, "segments"); assertEq(actualStream.sender, params.sender, "sender"); @@ -219,7 +227,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { assertEq(vars.actualNextStreamId, vars.expectedNextStreamId, "post-create nextStreamId"); // Assert that the protocol fee has been recorded. - vars.actualProtocolRevenues = lockupDynamic.protocolRevenues(asset); + vars.actualProtocolRevenues = lockupDynamic.protocolRevenues(ASSET); vars.expectedProtocolRevenues = vars.initialProtocolRevenues + vars.createAmounts.protocolFee; assertEq(vars.actualProtocolRevenues, vars.expectedProtocolRevenues, "post-create protocolRevenues"); @@ -230,7 +238,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Load the post-create asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupDynamic), holder, params.broker.account)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupDynamic), HOLDER, params.broker.account)); vars.actualLockupDynamicBalance = vars.balances[0]; vars.actualHolderBalance = vars.balances[1]; vars.actualBrokerBalance = vars.balances[2]; @@ -273,13 +281,14 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { if (params.withdrawAmount > 0) { // Load the pre-withdraw asset balances. vars.initialLockupDynamicBalance = vars.actualLockupDynamicBalance; - vars.initialRecipientBalance = asset.balanceOf(params.recipient); + vars.initialRecipientBalance = ASSET.balanceOf(params.recipient); // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockupDynamic) }); emit WithdrawFromLockupStream({ streamId: vars.streamId, to: params.recipient, + asset: ASSET, amount: params.withdrawAmount }); vm.expectEmit({ emitter: address(lockupDynamic) }); @@ -307,7 +316,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Load the post-withdraw asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupDynamic), params.recipient)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupDynamic), params.recipient)); vars.actualLockupDynamicBalance = vars.balances[0]; vars.actualRecipientBalance = vars.balances[1]; @@ -332,7 +341,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { if (!vars.isDepleted && !vars.isSettled) { // Load the pre-cancel asset balances. vars.balances = getTokenBalances( - address(asset), Solarray.addresses(address(lockupDynamic), params.sender, params.recipient) + address(ASSET), Solarray.addresses(address(lockupDynamic), params.sender, params.recipient) ); vars.initialLockupDynamicBalance = vars.balances[0]; vars.initialSenderBalance = vars.balances[1]; @@ -343,7 +352,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { vars.senderAmount = lockupDynamic.refundableAmountOf(vars.streamId); vars.recipientAmount = lockupDynamic.withdrawableAmountOf(vars.streamId); emit CancelLockupStream( - vars.streamId, params.sender, params.recipient, vars.senderAmount, vars.recipientAmount + vars.streamId, params.sender, params.recipient, ASSET, vars.senderAmount, vars.recipientAmount ); vm.expectEmit({ emitter: address(lockupDynamic) }); emit MetadataUpdate({ _tokenId: vars.streamId }); @@ -359,7 +368,7 @@ abstract contract LockupDynamic_Fork_Test is Fork_Test { // Load the post-cancel asset balances. vars.balances = getTokenBalances( - address(asset), Solarray.addresses(address(lockupDynamic), params.sender, params.recipient) + address(ASSET), Solarray.addresses(address(lockupDynamic), params.sender, params.recipient) ); vars.actualLockupDynamicBalance = vars.balances[0]; vars.actualSenderBalance = vars.balances[1]; diff --git a/test/fork/LockupLinear.t.sol b/test/fork/LockupLinear.t.sol index eba56cdfb..e0fa7c6a6 100644 --- a/test/fork/LockupLinear.t.sol +++ b/test/fork/LockupLinear.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { Broker, Lockup, LockupLinear } from "src/types/DataTypes.sol"; @@ -14,7 +14,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { CONSTRUCTOR //////////////////////////////////////////////////////////////////////////*/ - constructor(IERC20 asset_, address holder_) Fork_Test(asset_, holder_) { } + constructor(IERC20 asset, address holder) Fork_Test(asset, holder) { } /*////////////////////////////////////////////////////////////////////////// SET-UP FUNCTION @@ -25,7 +25,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Approve {SablierV2LockupLinear} to transfer the asset holder's assets. // We use a low-level call to ignore reverts because the asset can have the missing return value bug. - (bool success,) = address(asset).call(abi.encodeCall(IERC20.approve, (address(lockupLinear), MAX_UINT256))); + (bool success,) = address(ASSET).call(abi.encodeCall(IERC20.approve, (address(lockupLinear), MAX_UINT256))); success; } @@ -42,6 +42,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { uint128 totalAmount; uint40 warpTimestamp; uint128 withdrawAmount; + bool transferable; } struct Vars { @@ -91,7 +92,8 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { /// - It should bump the next stream id. /// - It should record the protocol fee. /// - It should mint the NFT. - /// - It should emit a {CreateLockupDynamicStream} event. + /// - It should emit a {MetadataUpdate} event + /// - It should emit a {CreateLockupLinearStream} event. /// - It may make a withdrawal. /// - It may update the withdrawn amounts. /// - It may emit a {WithdrawFromLockupStream} event. @@ -121,6 +123,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { params.range.start = boundUint40(params.range.start, currentTime - 1000 seconds, currentTime + 10_000 seconds); params.range.cliff = boundUint40(params.range.cliff, params.range.start, params.range.start + 52 weeks); params.totalAmount = boundUint128(params.totalAmount, 1, uint128(initialHolderBalance)); + params.transferable = true; // Bound the end time so that it is always greater than both the current time and the cliff time (this is // a requirement of the protocol). @@ -132,10 +135,10 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Set the fuzzed protocol fee. changePrank({ msgSender: users.admin }); - comptroller.setProtocolFee({ asset: asset, newProtocolFee: params.protocolFee }); + comptroller.setProtocolFee({ asset: ASSET, newProtocolFee: params.protocolFee }); // Make the holder the caller. - changePrank(holder); + changePrank(HOLDER); /*////////////////////////////////////////////////////////////////////////// CREATE @@ -143,11 +146,11 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Load the pre-create protocol revenues. Vars memory vars; - vars.initialProtocolRevenues = lockupLinear.protocolRevenues(asset); + vars.initialProtocolRevenues = lockupLinear.protocolRevenues(ASSET); // Load the pre-create asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupLinear), params.broker.account)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupLinear), params.broker.account)); vars.initialLockupLinearBalance = vars.balances[0]; vars.initialBrokerBalance = vars.balances[1]; @@ -156,17 +159,21 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { vars.createAmounts.brokerFee = ud(params.totalAmount).mul(params.broker.fee).intoUint128(); vars.createAmounts.deposit = params.totalAmount - vars.createAmounts.protocolFee - vars.createAmounts.brokerFee; - // Expect the relevant event to be emitted. vars.streamId = lockupLinear.nextStreamId(); + + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupLinear) }); + emit MetadataUpdate({ _tokenId: vars.streamId }); vm.expectEmit({ emitter: address(lockupLinear) }); emit CreateLockupLinearStream({ streamId: vars.streamId, - funder: holder, + funder: HOLDER, sender: params.sender, recipient: params.recipient, amounts: vars.createAmounts, - asset: asset, + asset: ASSET, cancelable: true, + transferable: params.transferable, range: params.range, broker: params.broker.account }); @@ -174,9 +181,10 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Create the stream. lockupLinear.createWithRange( LockupLinear.CreateWithRange({ - asset: asset, + asset: ASSET, broker: params.broker, cancelable: true, + transferable: params.transferable, range: params.range, recipient: params.recipient, sender: params.sender, @@ -187,11 +195,12 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Assert that the stream has been created. LockupLinear.Stream memory actualStream = lockupLinear.getStream(vars.streamId); assertEq(actualStream.amounts, Lockup.Amounts(vars.createAmounts.deposit, 0, 0)); - assertEq(actualStream.asset, asset, "asset"); + assertEq(actualStream.asset, ASSET, "asset"); assertEq(actualStream.cliffTime, params.range.cliff, "cliffTime"); assertEq(actualStream.endTime, params.range.end, "endTime"); assertEq(actualStream.isCancelable, true, "isCancelable"); assertEq(actualStream.isDepleted, false, "isDepleted"); + assertEq(actualStream.isTransferable, true, "isTransferable"); assertEq(actualStream.isStream, true, "isStream"); assertEq(actualStream.sender, params.sender, "sender"); assertEq(actualStream.startTime, params.range.start, "startTime"); @@ -208,7 +217,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { assertEq(vars.actualNextStreamId, vars.expectedNextStreamId, "post-create nextStreamId"); // Assert that the protocol fee has been recorded. - vars.actualProtocolRevenues = lockupLinear.protocolRevenues(asset); + vars.actualProtocolRevenues = lockupLinear.protocolRevenues(ASSET); vars.expectedProtocolRevenues = vars.initialProtocolRevenues + vars.createAmounts.protocolFee; assertEq(vars.actualProtocolRevenues, vars.expectedProtocolRevenues, "post-create protocolRevenues"); @@ -219,7 +228,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Load the post-create asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupLinear), holder, params.broker.account)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupLinear), HOLDER, params.broker.account)); vars.actualLockupLinearBalance = vars.balances[0]; vars.actualHolderBalance = vars.balances[1]; vars.actualBrokerBalance = vars.balances[2]; @@ -258,13 +267,14 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { if (params.withdrawAmount > 0) { // Load the pre-withdraw asset balances. vars.initialLockupLinearBalance = vars.actualLockupLinearBalance; - vars.initialRecipientBalance = asset.balanceOf(params.recipient); + vars.initialRecipientBalance = ASSET.balanceOf(params.recipient); // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockupLinear) }); emit WithdrawFromLockupStream({ streamId: vars.streamId, to: params.recipient, + asset: ASSET, amount: params.withdrawAmount }); vm.expectEmit({ emitter: address(lockupLinear) }); @@ -292,7 +302,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Load the post-withdraw asset balances. vars.balances = - getTokenBalances(address(asset), Solarray.addresses(address(lockupLinear), params.recipient)); + getTokenBalances(address(ASSET), Solarray.addresses(address(lockupLinear), params.recipient)); vars.actualLockupLinearBalance = vars.balances[0]; vars.actualRecipientBalance = vars.balances[1]; @@ -315,7 +325,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { if (!vars.isDepleted && !vars.isSettled) { // Load the pre-cancel asset balances. vars.balances = getTokenBalances( - address(asset), Solarray.addresses(address(lockupLinear), params.sender, params.recipient) + address(ASSET), Solarray.addresses(address(lockupLinear), params.sender, params.recipient) ); vars.initialLockupLinearBalance = vars.balances[0]; vars.initialSenderBalance = vars.balances[1]; @@ -326,7 +336,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { vars.senderAmount = lockupLinear.refundableAmountOf(vars.streamId); vars.recipientAmount = lockupLinear.withdrawableAmountOf(vars.streamId); emit CancelLockupStream( - vars.streamId, params.sender, params.recipient, vars.senderAmount, vars.recipientAmount + vars.streamId, params.sender, params.recipient, ASSET, vars.senderAmount, vars.recipientAmount ); vm.expectEmit({ emitter: address(lockupLinear) }); emit MetadataUpdate({ _tokenId: vars.streamId }); @@ -342,7 +352,7 @@ abstract contract LockupLinear_Fork_Test is Fork_Test { // Load the post-cancel asset balances. vars.balances = getTokenBalances( - address(asset), Solarray.addresses(address(lockupLinear), params.sender, params.recipient) + address(ASSET), Solarray.addresses(address(lockupLinear), params.sender, params.recipient) ); vars.actualLockupLinearBalance = vars.balances[0]; vars.actualSenderBalance = vars.balances[1]; diff --git a/test/fork/assets/DAI.t.sol b/test/fork/assets/DAI.t.sol index 063c2cd30..3fdb579c3 100644 --- a/test/fork/assets/DAI.t.sol +++ b/test/fork/assets/DAI.t.sol @@ -7,9 +7,9 @@ import { LockupDynamic_Fork_Test } from "../LockupDynamic.t.sol"; import { LockupLinear_Fork_Test } from "../LockupLinear.t.sol"; /// @dev A typical 18-decimal ERC-20 asset with a normal total supply. -IERC20 constant asset = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); -address constant holder = 0x66F62574ab04989737228D18C3624f7FC1edAe14; +IERC20 constant ASSET = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); +address constant HOLDER = 0x66F62574ab04989737228D18C3624f7FC1edAe14; -contract DAI_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(asset, holder) { } +contract DAI_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(ASSET, HOLDER) { } -contract DAI_LockupLinear_Fork_Test is LockupLinear_Fork_Test(asset, holder) { } +contract DAI_LockupLinear_Fork_Test is LockupLinear_Fork_Test(ASSET, HOLDER) { } diff --git a/test/fork/assets/EURS.t.sol b/test/fork/assets/EURS.t.sol index 2d100155c..969daa1bc 100644 --- a/test/fork/assets/EURS.t.sol +++ b/test/fork/assets/EURS.t.sol @@ -7,9 +7,9 @@ import { LockupDynamic_Fork_Test } from "../LockupDynamic.t.sol"; import { LockupLinear_Fork_Test } from "../LockupLinear.t.sol"; /// @dev An ERC-20 asset with 2 decimals. -IERC20 constant asset = IERC20(0xdB25f211AB05b1c97D595516F45794528a807ad8); -address constant holder = 0x9712c160925403A9458BfC6bBD7D8a1E694C984a; +IERC20 constant ASSET = IERC20(0xdB25f211AB05b1c97D595516F45794528a807ad8); +address constant HOLDER = 0x9712c160925403A9458BfC6bBD7D8a1E694C984a; -contract EURS_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(asset, holder) { } +contract EURS_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(ASSET, HOLDER) { } -contract EURS_LockupLinear_Fork_Test is LockupLinear_Fork_Test(asset, holder) { } +contract EURS_LockupLinear_Fork_Test is LockupLinear_Fork_Test(ASSET, HOLDER) { } diff --git a/test/fork/assets/SHIB.t.sol b/test/fork/assets/SHIB.t.sol index 0e755b45e..e8d321a03 100644 --- a/test/fork/assets/SHIB.t.sol +++ b/test/fork/assets/SHIB.t.sol @@ -7,9 +7,9 @@ import { LockupDynamic_Fork_Test } from "../LockupDynamic.t.sol"; import { LockupLinear_Fork_Test } from "../LockupLinear.t.sol"; /// @dev An ERC-20 asset with a large total supply. -IERC20 constant asset = IERC20(0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE); -address constant holder = 0x73AF3bcf944a6559933396c1577B257e2054D935; +IERC20 constant ASSET = IERC20(0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE); +address constant HOLDER = 0x73AF3bcf944a6559933396c1577B257e2054D935; -contract SHIB_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(asset, holder) { } +contract SHIB_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(ASSET, HOLDER) { } -contract SHIB_LockupLinear_Fork_Test is LockupLinear_Fork_Test(asset, holder) { } +contract SHIB_LockupLinear_Fork_Test is LockupLinear_Fork_Test(ASSET, HOLDER) { } diff --git a/test/fork/assets/USDC.t.sol b/test/fork/assets/USDC.t.sol index 5956d558f..ea79ae380 100644 --- a/test/fork/assets/USDC.t.sol +++ b/test/fork/assets/USDC.t.sol @@ -7,9 +7,9 @@ import { LockupDynamic_Fork_Test } from "../LockupDynamic.t.sol"; import { LockupLinear_Fork_Test } from "../LockupLinear.t.sol"; /// @dev An ERC-20 asset with 6 decimals. -IERC20 constant asset = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); -address constant holder = 0x09528d637deb5857dc059dddE6316D465a8b3b69; +IERC20 constant ASSET = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); +address constant HOLDER = 0x09528d637deb5857dc059dddE6316D465a8b3b69; -contract USDC_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(asset, holder) { } +contract USDC_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(ASSET, HOLDER) { } -contract USDC_LockupLinear_Fork_Test is LockupLinear_Fork_Test(asset, holder) { } +contract USDC_LockupLinear_Fork_Test is LockupLinear_Fork_Test(ASSET, HOLDER) { } diff --git a/test/fork/assets/USDT.t.sol b/test/fork/assets/USDT.t.sol index 93f78ae2d..421144ca1 100644 --- a/test/fork/assets/USDT.t.sol +++ b/test/fork/assets/USDT.t.sol @@ -7,9 +7,9 @@ import { LockupDynamic_Fork_Test } from "../LockupDynamic.t.sol"; import { LockupLinear_Fork_Test } from "../LockupLinear.t.sol"; /// @dev An ERC-20 asset that suffers from the missing return value bug. -IERC20 constant asset = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); -address constant holder = 0xee5B5B923fFcE93A870B3104b7CA09c3db80047A; +IERC20 constant ASSET = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); +address constant HOLDER = 0xee5B5B923fFcE93A870B3104b7CA09c3db80047A; -contract USDT_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(asset, holder) { } +contract USDT_LockupDynamic_Fork_Test is LockupDynamic_Fork_Test(ASSET, HOLDER) { } -contract USDT_LockupLinear_Fork_Test is LockupLinear_Fork_Test(asset, holder) { } +contract USDT_LockupLinear_Fork_Test is LockupLinear_Fork_Test(ASSET, HOLDER) { } diff --git a/test/integration/Integration.t.sol b/test/integration/Integration.t.sol index eaeba7b0d..2e0c62ab9 100644 --- a/test/integration/Integration.t.sol +++ b/test/integration/Integration.t.sol @@ -7,9 +7,7 @@ import { Base_Test } from "../Base.t.sol"; import { FaultyFlashLoanReceiver } from "../mocks/flash-loan/FaultyFlashLoanReceiver.sol"; import { ReentrantFlashLoanReceiver } from "../mocks/flash-loan/ReentrantFlashLoanReceiver.sol"; import { ReentrantRecipient } from "../mocks/hooks/ReentrantRecipient.sol"; -import { ReentrantSender } from "../mocks/hooks/ReentrantSender.sol"; import { RevertingRecipient } from "../mocks/hooks/RevertingRecipient.sol"; -import { RevertingSender } from "../mocks/hooks/RevertingSender.sol"; /// @notice Common logic needed by all integration tests, both concrete and fuzz tests. abstract contract Integration_Test is Base_Test { @@ -20,9 +18,7 @@ abstract contract Integration_Test is Base_Test { FaultyFlashLoanReceiver internal faultyFlashLoanReceiver = new FaultyFlashLoanReceiver(); ReentrantFlashLoanReceiver internal reentrantFlashLoanReceiver = new ReentrantFlashLoanReceiver(); ReentrantRecipient internal reentrantRecipient = new ReentrantRecipient(); - ReentrantSender internal reentrantSender = new ReentrantSender(); RevertingRecipient internal revertingRecipient = new RevertingRecipient(); - RevertingSender internal revertingSender = new RevertingSender(); /*////////////////////////////////////////////////////////////////////////// SET-UP FUNCTION @@ -53,9 +49,7 @@ abstract contract Integration_Test is Base_Test { vm.label({ account: address(faultyFlashLoanReceiver), newLabel: "Faulty Flash Loan Receiver" }); vm.label({ account: address(reentrantFlashLoanReceiver), newLabel: "Reentrant Flash Loan Receiver" }); vm.label({ account: address(reentrantRecipient), newLabel: "Reentrant Lockup Recipient" }); - vm.label({ account: address(reentrantSender), newLabel: "Reentrant Lockup Sender" }); vm.label({ account: address(revertingRecipient), newLabel: "Reverting Lockup Recipient" }); - vm.label({ account: address(revertingSender), newLabel: "Reverting Lockup Sender" }); } /*////////////////////////////////////////////////////////////////////////// diff --git a/test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol b/test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol index 5bfb3d2c6..c5ff9c6e7 100644 --- a/test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol +++ b/test/integration/concrete/lockup-dynamic/LockupDynamic.t.sol @@ -13,7 +13,6 @@ import { ClaimProtocolRevenues_Integration_Concrete_Test } from import { GetAsset_Integration_Concrete_Test } from "../lockup/get-asset/getAsset.t.sol"; import { GetDepositedAmount_Integration_Concrete_Test } from "../lockup/get-deposited-amount/getDepositedAmount.t.sol"; import { GetEndTime_Integration_Concrete_Test } from "../lockup/get-end-time/getEndTime.t.sol"; -import { ProtocolRevenues_Integration_Concrete_Test } from "../lockup/protocol-revenues/protocolRevenues.t.sol"; import { GetRecipient_Integration_Concrete_Test } from "../lockup/get-recipient/getRecipient.t.sol"; import { GetRefundedAmount_Integration_Concrete_Test } from "../lockup/get-refunded-amount/getRefundedAmount.t.sol"; import { GetSender_Integration_Concrete_Test } from "../lockup/get-sender/getSender.t.sol"; @@ -23,12 +22,15 @@ import { IsCancelable_Integration_Concrete_Test } from "../lockup/is-cancelable/ import { IsCold_Integration_Concrete_Test } from "../lockup/is-cold/isCold.t.sol"; import { IsDepleted_Integration_Concrete_Test } from "../lockup/is-depleted/isDepleted.t.sol"; import { IsStream_Integration_Concrete_Test } from "../lockup/is-stream/isStream.t.sol"; +import { IsTransferable_Integration_Concrete_Test } from "../lockup/is-transferable/isTransferable.t.sol"; import { IsWarm_Integration_Concrete_Test } from "../lockup/is-warm/isWarm.t.sol"; +import { ProtocolRevenues_Integration_Concrete_Test } from "../lockup/protocol-revenues/protocolRevenues.t.sol"; import { RefundableAmountOf_Integration_Concrete_Test } from "../lockup/refundable-amount-of/refundableAmountOf.t.sol"; import { Renounce_Integration_Concrete_Test } from "../lockup/renounce/renounce.t.sol"; import { SetComptroller_Integration_Concrete_Test } from "../lockup/set-comptroller/setComptroller.t.sol"; import { SetNFTDescriptor_Integration_Concrete_Test } from "../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; import { StatusOf_Integration_Concrete_Test } from "../lockup/status-of/statusOf.t.sol"; +import { TransferFrom_Integration_Concrete_Test } from "../lockup/transfer-from/transferFrom.t.sol"; import { Withdraw_Integration_Concrete_Test } from "../lockup/withdraw/withdraw.t.sol"; import { WasCanceled_Integration_Concrete_Test } from "../lockup/was-canceled/wasCanceled.t.sol"; import { WithdrawMax_Integration_Concrete_Test } from "../lockup/withdraw-max/withdrawMax.t.sol"; @@ -180,34 +182,6 @@ contract GetRefundedAmount_LockupDynamic_Integration_Concrete_Test is } } -contract ProtocolRevenues_LockupDynamic_Integration_Concrete_Test is - LockupDynamic_Integration_Concrete_Test, - ProtocolRevenues_Integration_Concrete_Test -{ - function setUp() - public - virtual - override(LockupDynamic_Integration_Concrete_Test, ProtocolRevenues_Integration_Concrete_Test) - { - LockupDynamic_Integration_Concrete_Test.setUp(); - ProtocolRevenues_Integration_Concrete_Test.setUp(); - } -} - -contract RefundableAmountOf_LockupDynamic_Integration_Concrete_Test is - LockupDynamic_Integration_Concrete_Test, - RefundableAmountOf_Integration_Concrete_Test -{ - function setUp() - public - virtual - override(LockupDynamic_Integration_Concrete_Test, RefundableAmountOf_Integration_Concrete_Test) - { - LockupDynamic_Integration_Concrete_Test.setUp(); - RefundableAmountOf_Integration_Concrete_Test.setUp(); - } -} - contract GetSender_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, GetSender_Integration_Concrete_Test @@ -306,6 +280,20 @@ contract IsStream_LockupDynamic_Integration_Concrete_Test is } } +contract IsTransferable_LockupDynamic_Integration_Concrete_Test is + LockupDynamic_Integration_Concrete_Test, + IsTransferable_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupDynamic_Integration_Concrete_Test, IsTransferable_Integration_Concrete_Test) + { + LockupDynamic_Integration_Concrete_Test.setUp(); + IsTransferable_Integration_Concrete_Test.setUp(); + } +} + contract IsWarm_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, IsWarm_Integration_Concrete_Test @@ -320,6 +308,34 @@ contract IsWarm_LockupDynamic_Integration_Concrete_Test is } } +contract ProtocolRevenues_LockupDynamic_Integration_Concrete_Test is + LockupDynamic_Integration_Concrete_Test, + ProtocolRevenues_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupDynamic_Integration_Concrete_Test, ProtocolRevenues_Integration_Concrete_Test) + { + LockupDynamic_Integration_Concrete_Test.setUp(); + ProtocolRevenues_Integration_Concrete_Test.setUp(); + } +} + +contract RefundableAmountOf_LockupDynamic_Integration_Concrete_Test is + LockupDynamic_Integration_Concrete_Test, + RefundableAmountOf_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupDynamic_Integration_Concrete_Test, RefundableAmountOf_Integration_Concrete_Test) + { + LockupDynamic_Integration_Concrete_Test.setUp(); + RefundableAmountOf_Integration_Concrete_Test.setUp(); + } +} + contract Renounce_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, Renounce_Integration_Concrete_Test @@ -376,6 +392,20 @@ contract StatusOf_LockupDynamic_Integration_Concrete_Test is } } +contract TransferFrom_LockupDynamic_Integration_Concrete_Test is + LockupDynamic_Integration_Concrete_Test, + TransferFrom_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupDynamic_Integration_Concrete_Test, TransferFrom_Integration_Concrete_Test) + { + LockupDynamic_Integration_Concrete_Test.setUp(); + TransferFrom_Integration_Concrete_Test.setUp(); + } +} + contract WasCanceled_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integration_Concrete_Test, WasCanceled_Integration_Concrete_Test diff --git a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol index f5b6105e0..cd79d99a4 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol +++ b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol @@ -145,7 +145,9 @@ contract CreateWithDeltas_LockupDynamic_Integration_Concrete_Test is // Expect the broker fee to be paid to the broker. expectCallToTransferFrom({ from: funder, to: users.broker, amount: defaults.BROKER_FEE_AMOUNT() }); - // Expect the relevant event to be emitted. + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupDynamic) }); + emit MetadataUpdate({ _tokenId: streamId }); vm.expectEmit({ emitter: address(lockupDynamic) }); emit CreateLockupDynamicStream({ streamId: streamId, @@ -155,6 +157,7 @@ contract CreateWithDeltas_LockupDynamic_Integration_Concrete_Test is amounts: defaults.lockupCreateAmounts(), asset: dai, cancelable: true, + transferable: true, segments: segments, range: range, broker: users.broker diff --git a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.tree b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.tree index 3648c8bf9..3824747f3 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.tree +++ b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.tree @@ -18,5 +18,6 @@ createWithDeltas.t.sol ├── it should bump the next stream id ├── it should record the protocol fee ├── it should mint the NFT + ├── it should emit a {MetadataUpdate} event ├── it should perform the ERC-20 transfers └── it should emit a {CreateLockupDynamicStream} event diff --git a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol index 7f3c7693c..46e62461a 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol +++ b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { UD60x18, ud, ZERO } from "@prb/math/src/UD60x18.sol"; -import { stdError } from "forge-std/StdError.sol"; +import { stdError } from "forge-std/src/StdError.sol"; import { ISablierV2LockupDynamic } from "src/interfaces/ISablierV2LockupDynamic.sol"; import { Errors } from "src/libraries/Errors.sol"; @@ -359,7 +359,9 @@ contract CreateWithMilestones_LockupDynamic_Integration_Concrete_Test is amount: defaults.BROKER_FEE_AMOUNT() }); - // Expect the relevant event to be emitted. + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupDynamic) }); + emit MetadataUpdate({ _tokenId: streamId }); vm.expectEmit({ emitter: address(lockupDynamic) }); emit CreateLockupDynamicStream({ streamId: streamId, @@ -370,6 +372,7 @@ contract CreateWithMilestones_LockupDynamic_Integration_Concrete_Test is segments: defaults.segments(), asset: IERC20(asset), cancelable: true, + transferable: true, range: defaults.lockupDynamicRange(), broker: users.broker }); diff --git a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.tree b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.tree index 3f40483aa..c90aecfc5 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.tree +++ b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.tree @@ -45,6 +45,7 @@ createWithMilestones.t.sol │ ├── it should bump the next stream id │ ├── it should record the protocol fee │ ├── it should mint the NFT + │ ├── it should emit a {MetadataUpdate} event │ ├── it should perform the ERC-20 transfers │ └── it should emit a {CreateLockupDynamicStream} event └── when the asset does not miss the ERC-20 return value @@ -52,5 +53,6 @@ createWithMilestones.t.sol ├── it should bump the next stream id ├── it should record the protocol fee ├── it should mint the NFT + ├── it should emit a {MetadataUpdate} event ├── it should perform the ERC-20 transfers └── it should emit a {CreateLockupDynamicStream} event diff --git a/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol b/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol index c3e203e9b..80f06f345 100644 --- a/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol +++ b/test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol @@ -2,10 +2,10 @@ // solhint-disable max-line-length,no-console,quotes pragma solidity >=0.8.19 <0.9.0; -import { console2 } from "forge-std/console2.sol"; -import { LibString } from "solady/utils/LibString.sol"; -import { StdStyle } from "forge-std/StdStyle.sol"; -import { Base64 } from "solady/utils/Base64.sol"; +import { console2 } from "forge-std/src/console2.sol"; +import { LibString } from "solady/src/utils/LibString.sol"; +import { StdStyle } from "forge-std/src/StdStyle.sol"; +import { Base64 } from "solady/src/utils/Base64.sol"; import { LockupDynamic_Integration_Concrete_Test } from "../LockupDynamic.t.sol"; @@ -51,14 +51,14 @@ contract TokenURI_LockupDynamic_Integration_Concrete_Test is LockupDynamic_Integ tokenURI = tokenURI.replace({ search: "data:application/json;base64,", replacement: "" }); string memory actualDecodedTokenURI = string(Base64.decode(tokenURI)); string memory expectedDecodedTokenURI = - unicode'{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Dynamic contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\\n\\n- Stream ID: 1\\n- Lockup Dynamic Address: 0xdb25a7b768311de128bbda7b8426c3f9c74f3240\\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\\n\\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Dynamic #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(61,88%,40%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(61,88%,40%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(61,88%,40%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(61,88%,40%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(61,88%,40%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Streamed" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Streamed</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 2.50K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="128" y="790"/><use href="#Status" x="352" y="790"/><use href="#Streamed" x="552" y="790"/><use href="#Duration" x="720" y="790"/></svg>"}'; + unicode'{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Dynamic contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\\n\\n- Stream ID: 1\\n- Lockup Dynamic Address: 0xdb25a7b768311de128bbda7b8426c3f9c74f3240\\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\\n\\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Dynamic #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(61,88%,40%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(61,88%,40%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(61,88%,40%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(61,88%,40%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(61,88%,40%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Amount" fill="#fff"><rect width="120" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Amount</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 10K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="144" y="790"/><use href="#Status" x="368" y="790"/><use href="#Amount" x="568" y="790"/><use href="#Duration" x="704" y="790"/></svg>"}'; assertEq(actualDecodedTokenURI, expectedDecodedTokenURI, "decoded token URI"); } function test_TokenURI_Full() external skipOnMismatch givenNFTExists { string memory actualTokenURI = lockupDynamic.tokenURI(defaultStreamId); string memory expectedTokenURI = - "data:application/json;base64,{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Dynamic contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\n\n- Stream ID: 1\n- Lockup Dynamic Address: 0xdb25a7b768311de128bbda7b8426c3f9c74f3240\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\n\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Dynamic #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(61,88%,40%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(61,88%,40%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(61,88%,40%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(61,88%,40%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(61,88%,40%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Streamed" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Streamed</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 2.50K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="128" y="790"/><use href="#Status" x="352" y="790"/><use href="#Streamed" x="552" y="790"/><use href="#Duration" x="720" y="790"/></svg>"}"; + "data:application/json;base64,{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Dynamic contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\n\n- Stream ID: 1\n- Lockup Dynamic Address: 0xdb25a7b768311de128bbda7b8426c3f9c74f3240\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\n\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Dynamic #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(61,88%,40%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(61,88%,40%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(61,88%,40%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(61,88%,40%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(61,88%,40%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Amount" fill="#fff"><rect width="120" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Amount</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 10K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0xdb25a7b768311de128bbda7b8426c3f9c74f3240 • Sablier V2 Lockup Dynamic</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="144" y="790"/><use href="#Status" x="368" y="790"/><use href="#Amount" x="568" y="790"/><use href="#Duration" x="704" y="790"/></svg>"}"; assertEq(actualTokenURI, expectedTokenURI, "token URI"); } } diff --git a/test/integration/concrete/lockup-linear/LockupLinear.t.sol b/test/integration/concrete/lockup-linear/LockupLinear.t.sol index 9715b771b..e347f38a7 100644 --- a/test/integration/concrete/lockup-linear/LockupLinear.t.sol +++ b/test/integration/concrete/lockup-linear/LockupLinear.t.sol @@ -15,7 +15,6 @@ import { GetAsset_Integration_Concrete_Test } from "../lockup/get-asset/getAsset import { GetDepositedAmount_Integration_Concrete_Test } from "../lockup/get-deposited-amount/getDepositedAmount.t.sol"; import { GetEndTime_Integration_Concrete_Test } from "../lockup/get-end-time/getEndTime.t.sol"; import { GetRefundedAmount_Integration_Concrete_Test } from "../lockup/get-refunded-amount/getRefundedAmount.t.sol"; -import { ProtocolRevenues_Integration_Concrete_Test } from "../lockup/protocol-revenues/protocolRevenues.t.sol"; import { GetRecipient_Integration_Concrete_Test } from "../lockup/get-recipient/getRecipient.t.sol"; import { GetSender_Integration_Concrete_Test } from "../lockup/get-sender/getSender.t.sol"; import { GetStartTime_Integration_Concrete_Test } from "../lockup/get-start-time/getStartTime.t.sol"; @@ -24,12 +23,15 @@ import { IsCancelable_Integration_Concrete_Test } from "../lockup/is-cancelable/ import { IsCold_Integration_Concrete_Test } from "../lockup/is-cold/isCold.t.sol"; import { IsDepleted_Integration_Concrete_Test } from "../lockup/is-depleted/isDepleted.t.sol"; import { IsStream_Integration_Concrete_Test } from "../lockup/is-stream/isStream.t.sol"; +import { IsTransferable_Integration_Concrete_Test } from "../lockup/is-transferable/isTransferable.t.sol"; import { IsWarm_Integration_Concrete_Test } from "../lockup/is-warm/isWarm.t.sol"; +import { ProtocolRevenues_Integration_Concrete_Test } from "../lockup/protocol-revenues/protocolRevenues.t.sol"; import { RefundableAmountOf_Integration_Concrete_Test } from "../lockup/refundable-amount-of/refundableAmountOf.t.sol"; import { Renounce_Integration_Concrete_Test } from "../lockup/renounce/renounce.t.sol"; import { SetComptroller_Integration_Concrete_Test } from "../lockup/set-comptroller/setComptroller.t.sol"; import { SetNFTDescriptor_Integration_Concrete_Test } from "../lockup/set-nft-descriptor/setNFTDescriptor.t.sol"; import { StatusOf_Integration_Concrete_Test } from "../lockup/status-of/statusOf.t.sol"; +import { TransferFrom_Integration_Concrete_Test } from "../lockup/transfer-from/transferFrom.t.sol"; import { WasCanceled_Integration_Concrete_Test } from "../lockup/was-canceled/wasCanceled.t.sol"; import { Withdraw_Integration_Concrete_Test } from "../lockup/withdraw/withdraw.t.sol"; import { WithdrawMax_Integration_Concrete_Test } from "../lockup/withdraw-max/withdrawMax.t.sol"; @@ -279,6 +281,20 @@ contract IsStream_LockupLinear_Integration_Concrete_Test is } } +contract IsTransferable_LockupLinear_Integration_Concrete_Test is + LockupLinear_Integration_Concrete_Test, + IsTransferable_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupLinear_Integration_Concrete_Test, IsTransferable_Integration_Concrete_Test) + { + LockupLinear_Integration_Concrete_Test.setUp(); + IsTransferable_Integration_Concrete_Test.setUp(); + } +} + contract IsWarm_LockupLinear_Integration_Concrete_Test is LockupLinear_Integration_Concrete_Test, IsWarm_Integration_Concrete_Test @@ -377,6 +393,20 @@ contract StatusOf_LockupLinear_Integration_Concrete_Test is } } +contract TransferFrom_LockupLinear_Integration_Concrete_Test is + LockupLinear_Integration_Concrete_Test, + TransferFrom_Integration_Concrete_Test +{ + function setUp() + public + virtual + override(LockupLinear_Integration_Concrete_Test, TransferFrom_Integration_Concrete_Test) + { + LockupLinear_Integration_Concrete_Test.setUp(); + TransferFrom_Integration_Concrete_Test.setUp(); + } +} + contract WasCanceled_LockupLinear_Integration_Concrete_Test is LockupLinear_Integration_Concrete_Test, WasCanceled_Integration_Concrete_Test diff --git a/test/integration/concrete/lockup-linear/create-with-durations/createWithDurations.t.sol b/test/integration/concrete/lockup-linear/create-with-durations/createWithDurations.t.sol index 4fa4d6ce8..02f9c53ab 100644 --- a/test/integration/concrete/lockup-linear/create-with-durations/createWithDurations.t.sol +++ b/test/integration/concrete/lockup-linear/create-with-durations/createWithDurations.t.sol @@ -110,7 +110,9 @@ contract CreateWithDurations_LockupLinear_Integration_Concrete_Test is // Expect the broker fee to be paid to the broker. expectCallToTransferFrom({ from: funder, to: users.broker, amount: defaults.BROKER_FEE_AMOUNT() }); - // Expect the relevant event to be emitted. + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupLinear) }); + emit MetadataUpdate({ _tokenId: streamId }); vm.expectEmit({ emitter: address(lockupLinear) }); emit CreateLockupLinearStream({ streamId: streamId, @@ -120,6 +122,7 @@ contract CreateWithDurations_LockupLinear_Integration_Concrete_Test is amounts: defaults.lockupCreateAmounts(), asset: dai, cancelable: true, + transferable: true, range: range, broker: users.broker }); diff --git a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol index 33d7ae280..65a988b08 100644 --- a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol +++ b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol @@ -197,7 +197,9 @@ contract CreateWithRange_LockupLinear_Integration_Concrete_Test is amount: defaults.BROKER_FEE_AMOUNT() }); - // Expect the relevant event to be emitted. + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockupLinear) }); + emit MetadataUpdate({ _tokenId: streamId }); vm.expectEmit({ emitter: address(lockupLinear) }); emit CreateLockupLinearStream({ streamId: streamId, @@ -207,6 +209,7 @@ contract CreateWithRange_LockupLinear_Integration_Concrete_Test is amounts: defaults.lockupCreateAmounts(), asset: IERC20(asset), cancelable: true, + transferable: true, range: defaults.lockupLinearRange(), broker: users.broker }); diff --git a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.tree b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.tree index 16b1ba5da..6d810042a 100644 --- a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.tree +++ b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.tree @@ -31,6 +31,7 @@ createWithRange.t.sol │ ├── it should bump the next stream id │ ├── it should record the protocol fee │ ├── it should mint the NFT + │ ├── it should emit a {MetadataUpdate} event │ ├── it should perform the ERC-20 transfers │ └── it should emit a {CreateLockupLinearStream} event └── when the asset does not miss the ERC-20 return value @@ -38,6 +39,7 @@ createWithRange.t.sol ├── it should bump the next stream id ├── it should record the protocol fee ├── it should mint the NFT + ├── it should emit a {MetadataUpdate} event ├── it should perform the ERC-20 transfers └── it should emit a {CreateLockupLinearStream} event diff --git a/test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol b/test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol index 2f628b15f..2f1d12906 100644 --- a/test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol +++ b/test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol @@ -2,10 +2,10 @@ // solhint-disable max-line-length,no-console,quotes pragma solidity >=0.8.19 <0.9.0; -import { console2 } from "forge-std/console2.sol"; -import { LibString } from "solady/utils/LibString.sol"; -import { StdStyle } from "forge-std/StdStyle.sol"; -import { Base64 } from "solady/utils/Base64.sol"; +import { console2 } from "forge-std/src/console2.sol"; +import { LibString } from "solady/src/utils/LibString.sol"; +import { StdStyle } from "forge-std/src/StdStyle.sol"; +import { Base64 } from "solady/src/utils/Base64.sol"; import { LockupLinear_Integration_Concrete_Test } from "../LockupLinear.t.sol"; @@ -51,14 +51,14 @@ contract TokenURI_LockupLinear_Integration_Concrete_Test is LockupLinear_Integra tokenURI = tokenURI.replace({ search: "data:application/json;base64,", replacement: "" }); string memory actualDecodedTokenURI = string(Base64.decode(tokenURI)); string memory expectedDecodedTokenURI = - unicode'{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Linear contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\\n\\n- Stream ID: 1\\n- Lockup Linear Address: 0x3381cd18e2fb4db236bf0525938ab6e43db0440f\\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\\n\\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Linear #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(19,22%,63%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(19,22%,63%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(19,22%,63%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(19,22%,63%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(19,22%,63%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Streamed" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Streamed</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 2.50K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="128" y="790"/><use href="#Status" x="352" y="790"/><use href="#Streamed" x="552" y="790"/><use href="#Duration" x="720" y="790"/></svg>"}'; + unicode'{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Linear contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\\n\\n- Stream ID: 1\\n- Lockup Linear Address: 0x3381cd18e2fb4db236bf0525938ab6e43db0440f\\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\\n\\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Linear #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(19,22%,63%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(19,22%,63%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(19,22%,63%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(19,22%,63%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(19,22%,63%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Amount" fill="#fff"><rect width="120" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Amount</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 10K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="144" y="790"/><use href="#Status" x="368" y="790"/><use href="#Amount" x="568" y="790"/><use href="#Duration" x="704" y="790"/></svg>"}'; assertEq(actualDecodedTokenURI, expectedDecodedTokenURI, "decoded token URI"); } function test_TokenURI_Full() external skipOnMismatch givenNFTExists { string memory actualTokenURI = lockupLinear.tokenURI(defaultStreamId); string memory expectedTokenURI = - "data:application/json;base64,{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Linear contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\n\n- Stream ID: 1\n- Lockup Linear Address: 0x3381cd18e2fb4db236bf0525938ab6e43db0440f\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\n\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Linear #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(19,22%,63%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(19,22%,63%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(19,22%,63%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(19,22%,63%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(19,22%,63%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Streamed" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Streamed</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 2.50K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="128" y="790"/><use href="#Status" x="352" y="790"/><use href="#Streamed" x="552" y="790"/><use href="#Duration" x="720" y="790"/></svg>"}"; + "data:application/json;base64,{"attributes":[{"trait_type":"Asset","value":"DAI"},{"trait_type":"Sender","value":"0x6332e7b1deb1f1a0b77b2bb18b144330c7291bca"},{"trait_type":"Status","value":"Streaming"}],"description":"This NFT represents a payment stream in a Sablier V2 Lockup Linear contract. The owner of this NFT can withdraw the streamed assets, which are denominated in DAI.\n\n- Stream ID: 1\n- Lockup Linear Address: 0x3381cd18e2fb4db236bf0525938ab6e43db0440f\n- DAI Address: 0x03a6a84cd762d9707a21605b548aaab891562aab\n\n⚠️ WARNING: Transferring the NFT makes the new owner the recipient of the stream. The funds are not automatically withdrawn for the previous recipient.","external_url":"https://sablier.com","name":"Sablier V2 Lockup Linear #1","image":"data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000" viewBox="0 0 1000 1000"><rect width="100%" height="100%" filter="url(#Noise)"/><rect x="70" y="70" width="860" height="860" fill="#fff" fill-opacity=".03" rx="45" ry="45" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><defs><circle id="Glow" r="500" fill="url(#RadialGlow)"/><filter id="Noise"><feFlood x="0" y="0" width="100%" height="100%" flood-color="hsl(230,21%,11%)" flood-opacity="1" result="floodFill"/><feTurbulence baseFrequency=".4" numOctaves="3" result="Noise" type="fractalNoise"/><feBlend in="Noise" in2="floodFill" mode="soft-light"/></filter><path id="Logo" fill="#fff" fill-opacity=".1" d="m133.559,124.034c-.013,2.412-1.059,4.848-2.923,6.402-2.558,1.819-5.168,3.439-7.888,4.996-14.44,8.262-31.047,12.565-47.674,12.569-8.858.036-17.838-1.272-26.328-3.663-9.806-2.766-19.087-7.113-27.562-12.778-13.842-8.025,9.468-28.606,16.153-35.265h0c2.035-1.838,4.252-3.546,6.463-5.224h0c6.429-5.655,16.218-2.835,20.358,4.17,4.143,5.057,8.816,9.649,13.92,13.734h.037c5.736,6.461,15.357-2.253,9.38-8.48,0,0-3.515-3.515-3.515-3.515-11.49-11.478-52.656-52.664-64.837-64.837l.049-.037c-1.725-1.606-2.719-3.847-2.751-6.204h0c-.046-2.375,1.062-4.582,2.726-6.229h0l.185-.148h0c.099-.062,.222-.148,.37-.259h0c2.06-1.362,3.951-2.621,6.044-3.842C57.763-3.473,97.76-2.341,128.637,18.332c16.671,9.946-26.344,54.813-38.651,40.199-6.299-6.096-18.063-17.743-19.668-18.811-6.016-4.047-13.061,4.776-7.752,9.751l68.254,68.371c1.724,1.601,2.714,3.84,2.738,6.192Z"/><path id="FloatingText" fill="none" d="M125 45h750s80 0 80 80v750s0 80 -80 80h-750s-80 0 -80 -80v-750s0 -80 80 -80"/><radialGradient id="RadialGlow"><stop offset="0%" stop-color="hsl(19,22%,63%)" stop-opacity=".6"/><stop offset="100%" stop-color="hsl(230,21%,11%)" stop-opacity="0"/></radialGradient><linearGradient id="SandTop" x1="0%" y1="0%"><stop offset="0%" stop-color="hsl(19,22%,63%)"/><stop offset="100%" stop-color="hsl(230,21%,11%)"/></linearGradient><linearGradient id="SandBottom" x1="100%" y1="100%"><stop offset="10%" stop-color="hsl(230,21%,11%)"/><stop offset="100%" stop-color="hsl(19,22%,63%)"/><animate attributeName="x1" dur="6s" repeatCount="indefinite" values="30%;60%;120%;60%;30%;"/></linearGradient><linearGradient id="HourglassStroke" gradientTransform="rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="50%" stop-color="hsl(19,22%,63%)"/><stop offset="80%" stop-color="hsl(230,21%,11%)"/></linearGradient><g id="Hourglass"><path d="M 50,360 a 300,300 0 1,1 600,0 a 300,300 0 1,1 -600,0" fill="#fff" fill-opacity=".02" stroke="url(#HourglassStroke)" stroke-width="4"/><path d="m566,161.201v-53.924c0-19.382-22.513-37.563-63.398-51.198-40.756-13.592-94.946-21.079-152.587-21.079s-111.838,7.487-152.602,21.079c-40.893,13.636-63.413,31.816-63.413,51.198v53.924c0,17.181,17.704,33.427,50.223,46.394v284.809c-32.519,12.96-50.223,29.206-50.223,46.394v53.924c0,19.382,22.52,37.563,63.413,51.198,40.763,13.592,94.954,21.079,152.602,21.079s111.831-7.487,152.587-21.079c40.886-13.636,63.398-31.816,63.398-51.198v-53.924c0-17.196-17.704-33.435-50.223-46.401V207.603c32.519-12.967,50.223-29.206,50.223-46.401Zm-347.462,57.793l130.959,131.027-130.959,131.013V218.994Zm262.924.022v262.018l-130.937-131.006,130.937-131.013Z" fill="#161822"></path><polygon points="350 350.026 415.03 284.978 285 284.978 350 350.026" fill="url(#SandBottom)"/><path d="m416.341,281.975c0,.914-.354,1.809-1.035,2.68-5.542,7.076-32.661,12.45-65.28,12.45-32.624,0-59.738-5.374-65.28-12.45-.681-.872-1.035-1.767-1.035-2.68,0-.914.354-1.808,1.035-2.676,5.542-7.076,32.656-12.45,65.28-12.45,32.619,0,59.738,5.374,65.28,12.45.681.867,1.035,1.762,1.035,2.676Z" fill="url(#SandTop)"/><path d="m481.46,504.101v58.449c-2.35.77-4.82,1.51-7.39,2.23-30.3,8.54-74.65,13.92-124.06,13.92-53.6,0-101.24-6.33-131.47-16.16v-58.439h262.92Z" fill="url(#SandBottom)"/><ellipse cx="350" cy="504.101" rx="131.462" ry="28.108" fill="url(#SandTop)"/><g fill="none" stroke="url(#HourglassStroke)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4"><path d="m565.641,107.28c0,9.537-5.56,18.629-15.676,26.973h-.023c-9.204,7.596-22.194,14.562-38.197,20.592-39.504,14.936-97.325,24.355-161.733,24.355-90.48,0-167.948-18.582-199.953-44.948h-.023c-10.115-8.344-15.676-17.437-15.676-26.973,0-39.735,96.554-71.921,215.652-71.921s215.629,32.185,215.629,71.921Z"/><path d="m134.36,161.203c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="161.203" x2="134.36" y2="107.28"/><line x1="565.64" y1="161.203" x2="565.64" y2="107.28"/><line x1="184.584" y1="206.823" x2="184.585" y2="537.579"/><line x1="218.181" y1="218.118" x2="218.181" y2="562.537"/><line x1="481.818" y1="218.142" x2="481.819" y2="562.428"/><line x1="515.415" y1="207.352" x2="515.416" y2="537.579"/><path d="m184.58,537.58c0,5.45,4.27,10.65,12.03,15.42h.02c5.51,3.39,12.79,6.55,21.55,9.42,30.21,9.9,78.02,16.28,131.83,16.28,49.41,0,93.76-5.38,124.06-13.92,2.7-.76,5.29-1.54,7.75-2.35,8.77-2.87,16.05-6.04,21.56-9.43h0c7.76-4.77,12.04-9.97,12.04-15.42"/><path d="m184.582,492.656c-31.354,12.485-50.223,28.58-50.223,46.142,0,9.536,5.564,18.627,15.677,26.969h.022c8.503,7.005,20.213,13.463,34.524,19.159,9.999,3.991,21.269,7.609,33.597,10.788,36.45,9.407,82.181,15.002,131.835,15.002s95.363-5.595,131.807-15.002c10.847-2.79,20.867-5.926,29.924-9.349,1.244-.467,2.473-.942,3.673-1.424,14.326-5.696,26.035-12.161,34.524-19.173h.022c10.114-8.342,15.677-17.433,15.677-26.969,0-17.562-18.869-33.665-50.223-46.15"/><path d="m134.36,592.72c0,39.735,96.554,71.921,215.652,71.921s215.629-32.186,215.629-71.921"/><line x1="134.36" y1="592.72" x2="134.36" y2="538.797"/><line x1="565.64" y1="592.72" x2="565.64" y2="538.797"/><polyline points="481.822 481.901 481.798 481.877 481.775 481.854 350.015 350.026 218.185 218.129"/><polyline points="218.185 481.901 218.231 481.854 350.015 350.026 481.822 218.152"/></g></g><g id="Progress" fill="#fff"><rect width="208" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Progress</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">25%</text><g fill="none"><circle cx="166" cy="50" r="22" stroke="hsl(230,21%,11%)" stroke-width="10"/><circle cx="166" cy="50" pathLength="10000" r="22" stroke="hsl(19,22%,63%)" stroke-dasharray="10000" stroke-dashoffset="7500" stroke-linecap="round" stroke-width="5" transform="rotate(-90)" transform-origin="166 50"/></g></g><g id="Status" fill="#fff"><rect width="184" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Status</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">Streaming</text></g><g id="Amount" fill="#fff"><rect width="120" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Amount</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&#8805; 10K</text></g><g id="Duration" fill="#fff"><rect width="152" height="100" fill-opacity=".03" rx="15" ry="15" stroke="#fff" stroke-opacity=".1" stroke-width="4"/><text x="20" y="34" font-family="'Courier New',Arial,monospace" font-size="22px">Duration</text><text x="20" y="72" font-family="'Courier New',Arial,monospace" font-size="26px">&lt; 1 Day</text></g></defs><text text-rendering="optimizeSpeed"><textPath startOffset="-100%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="0%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x3381cd18e2fb4db236bf0525938ab6e43db0440f • Sablier V2 Lockup Linear</textPath><textPath startOffset="-50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath><textPath startOffset="50%" href="#FloatingText" fill="#fff" font-family="'Courier New',Arial,monospace" fill-opacity=".8" font-size="26px"><animate additive="sum" attributeName="startOffset" begin="0s" dur="50s" from="0%" repeatCount="indefinite" to="100%"/>0x03a6a84cd762d9707a21605b548aaab891562aab • DAI</textPath></text><use href="#Glow" fill-opacity=".9"/><use href="#Glow" x="1000" y="1000" fill-opacity=".9"/><use href="#Logo" x="170" y="170" transform="scale(.6)"/><use href="#Hourglass" x="150" y="90" transform="rotate(10)" transform-origin="500 500"/><use href="#Progress" x="144" y="790"/><use href="#Status" x="368" y="790"/><use href="#Amount" x="568" y="790"/><use href="#Duration" x="704" y="790"/></svg>"}"; assertEq(actualTokenURI, expectedTokenURI, "token URI"); } } diff --git a/test/integration/concrete/lockup/burn/burn.t.sol b/test/integration/concrete/lockup/burn/burn.t.sol index dfd4aa35c..f73493e41 100644 --- a/test/integration/concrete/lockup/burn/burn.t.sol +++ b/test/integration/concrete/lockup/burn/burn.t.sol @@ -9,9 +9,11 @@ import { Integration_Test } from "../../../Integration.t.sol"; abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { uint256 internal streamId; + uint256 internal notTransferableStreamId; function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { streamId = createDefaultStream(); + notTransferableStreamId = createDefaultStreamNotTransferable(); // Make the Recipient (owner of the NFT) the caller in this test suite. changePrank({ msgSender: users.recipient }); @@ -81,14 +83,16 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int givenStreamHasNotBeenDepleted { vm.warp({ timestamp: defaults.CLIFF_TIME() }); + changePrank({ msgSender: users.sender }); lockup.cancel(streamId); + changePrank({ msgSender: users.recipient }); vm.expectRevert(abi.encodeWithSelector(Errors.SablierV2Lockup_StreamNotDepleted.selector, streamId)); lockup.burn(streamId); } - modifier givenStreamHasBeenDepleted() { + modifier givenStreamHasBeenDepleted(uint256 streamId_) { vm.warp({ timestamp: defaults.END_TIME() }); - lockup.withdrawMax({ streamId: streamId, to: users.recipient }); + lockup.withdrawMax({ streamId: streamId_, to: users.recipient }); _; } @@ -96,7 +100,7 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int external whenNotDelegateCalled givenNotNull - givenStreamHasBeenDepleted + givenStreamHasBeenDepleted(streamId) { changePrank({ msgSender: users.eve }); vm.expectRevert(abi.encodeWithSelector(Errors.SablierV2Lockup_Unauthorized.selector, streamId, users.eve)); @@ -111,7 +115,7 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int external whenNotDelegateCalled givenNotNull - givenStreamHasBeenDepleted + givenStreamHasBeenDepleted(streamId) whenCallerAuthorized { // Burn the NFT so that it no longer exists. @@ -126,13 +130,34 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int _; } + function test_Burn_NonTransferableNFT() + external + whenNotDelegateCalled + givenNotNull + givenStreamHasBeenDepleted(notTransferableStreamId) + whenCallerAuthorized + givenNFTExists + { + // Expect the relevant event to be emitted. + vm.expectEmit({ emitter: address(lockup) }); + emit MetadataUpdate({ _tokenId: notTransferableStreamId }); + lockup.burn(notTransferableStreamId); + vm.expectRevert("ERC721: invalid token ID"); + lockup.getRecipient(notTransferableStreamId); + } + + modifier givenTransferableStream() { + _; + } + function test_Burn_CallerApprovedOperator() external whenNotDelegateCalled givenNotNull - givenStreamHasBeenDepleted + givenStreamHasBeenDepleted(streamId) whenCallerAuthorized givenNFTExists + givenTransferableStream { // Approve the operator to handle the stream. lockup.approve({ to: users.operator, tokenId: streamId }); @@ -140,6 +165,10 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int // Make the approved operator the caller in this test. changePrank({ msgSender: users.operator }); + // Expect the relevant event to be emitted. + vm.expectEmit({ emitter: address(lockup) }); + emit MetadataUpdate({ _tokenId: streamId }); + // Burn the NFT. lockup.burn(streamId); @@ -152,10 +181,14 @@ abstract contract Burn_Integration_Concrete_Test is Integration_Test, Lockup_Int external whenNotDelegateCalled givenNotNull - givenStreamHasBeenDepleted + givenStreamHasBeenDepleted(streamId) whenCallerAuthorized givenNFTExists + givenTransferableStream { + // Expect the relevant event to be emitted. + vm.expectEmit({ emitter: address(lockup) }); + emit MetadataUpdate({ _tokenId: streamId }); lockup.burn(streamId); vm.expectRevert("ERC721: invalid token ID"); lockup.getRecipient(streamId); diff --git a/test/integration/concrete/lockup/burn/burn.tree b/test/integration/concrete/lockup/burn/burn.tree index cbf412d28..90efa59eb 100644 --- a/test/integration/concrete/lockup/burn/burn.tree +++ b/test/integration/concrete/lockup/burn/burn.tree @@ -21,7 +21,13 @@ burn.t.sol ├── given the NFT does not exist │ └── it should revert └── given the NFT exists - ├── when the caller is an approved third party - │ └── it should burn the NFT - └── when the caller is the owner of the NFT - └── it should burn the NFT + ├── given the NFT is not transferable + │ ├── it should burn the NFT + │ └── it should emit a {MetadataUpdate} event + └── given the NFT is transferable + ├── when the caller is an approved third party + │ ├── it should burn the NFT + │ └── it should emit a {MetadataUpdate} event + └── when the caller is the owner of the NFT + ├── it should burn the NFT + └── it should emit a {MetadataUpdate} event diff --git a/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.t.sol b/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.t.sol index 67103ba5d..0e69e0b64 100644 --- a/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.t.sol +++ b/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; import { Errors } from "src/libraries/Errors.sol"; @@ -72,7 +72,7 @@ abstract contract CancelMultiple_Integration_Concrete_Test is lockup.cancelMultiple(testStreamIds); } - function test_RevertWhen_CallerUnauthorizedAllStreams_ApprovedOperator() + function test_RevertWhen_CallerUnauthorizedAllStreams_Recipient() external whenNotDelegateCalled whenArrayCountNotZero @@ -80,32 +80,8 @@ abstract contract CancelMultiple_Integration_Concrete_Test is givenAllStreamsWarm whenCallerUnauthorized { - // Approve the operator for all streams. + // Make the Recipient the caller in this test. changePrank({ msgSender: users.recipient }); - lockup.setApprovalForAll({ operator: users.operator, approved: true }); - - // Make the approved operator the caller in this test. - changePrank({ msgSender: users.operator }); - - // Run the test. - vm.expectRevert( - abi.encodeWithSelector(Errors.SablierV2Lockup_Unauthorized.selector, testStreamIds[0], users.operator) - ); - lockup.cancelMultiple(testStreamIds); - } - - function test_RevertWhen_CallerUnauthorizedAllStreams_FormerRecipient() - external - whenNotDelegateCalled - whenArrayCountNotZero - givenNoNull - givenAllStreamsWarm - whenCallerUnauthorized - { - // Transfer the streams to Alice. - changePrank({ msgSender: users.recipient }); - lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: testStreamIds[0] }); - lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: testStreamIds[1] }); // Run the test. vm.expectRevert( @@ -135,29 +111,7 @@ abstract contract CancelMultiple_Integration_Concrete_Test is lockup.cancelMultiple(streamIds); } - function test_RevertWhen_CallerUnauthorizedSomeStreams_ApprovedOperator() - external - whenNotDelegateCalled - whenArrayCountNotZero - givenNoNull - givenAllStreamsWarm - whenCallerUnauthorized - { - // Approve the operator to handle the first stream. - changePrank({ msgSender: users.recipient }); - lockup.approve({ to: users.operator, tokenId: testStreamIds[0] }); - - // Make the approved operator the caller in this test. - changePrank({ msgSender: users.operator }); - - // Run the test. - vm.expectRevert( - abi.encodeWithSelector(Errors.SablierV2Lockup_Unauthorized.selector, testStreamIds[0], users.operator) - ); - lockup.cancelMultiple(testStreamIds); - } - - function test_RevertWhen_CallerUnauthorizedSomeStreams_FormerRecipient() + function test_RevertWhen_CallerUnauthorizedSomeStreams_Recipient() external whenNotDelegateCalled whenArrayCountNotZero @@ -165,9 +119,8 @@ abstract contract CancelMultiple_Integration_Concrete_Test is givenAllStreamsWarm whenCallerUnauthorized { - // Transfer the first stream to Eve. + // Make the Recipient the caller in this test. changePrank({ msgSender: users.recipient }); - lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: testStreamIds[0] }); // Run the test. vm.expectRevert( @@ -229,6 +182,7 @@ abstract contract CancelMultiple_Integration_Concrete_Test is streamId: testStreamIds[0], sender: users.sender, recipient: users.recipient, + asset: dai, senderAmount: senderAmount0, recipientAmount: defaults.DEPOSIT_AMOUNT() - senderAmount0 }); @@ -237,6 +191,7 @@ abstract contract CancelMultiple_Integration_Concrete_Test is streamId: testStreamIds[1], sender: users.sender, recipient: users.recipient, + asset: dai, senderAmount: senderAmount1, recipientAmount: defaults.DEPOSIT_AMOUNT() - senderAmount1 }); diff --git a/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.tree b/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.tree index 2b7439c4b..2cd6a411f 100644 --- a/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.tree +++ b/test/integration/concrete/lockup/cancel-multiple/cancelMultiple.tree @@ -18,16 +18,12 @@ cancelMultiple.t.sol ├── when the caller is unauthorized for all streams │ ├── when the caller is a malicious third party │ │ └── it should revert - │ ├── when the caller is an approved third party - │ │ └── it should revert - │ └── when the caller is a former recipient + │ └── when the caller is the recipient │ └── it should revert ├── when the caller is unauthorized for some streams │ ├── when the caller is a malicious third party │ │ └── it should revert - │ ├── when the caller is an approved third party - │ │ └── it should revert - │ └── when the caller is a former recipient + │ └── when the caller is the recipient │ └── it should revert └── when the caller is authorized for all streams ├── given all streams are not cancelable @@ -35,13 +31,7 @@ cancelMultiple.t.sol ├── given some streams are not cancelable │ └── it should revert └── given all streams are cancelable - ├── when the caller is the sender - │ ├── it should cancel the streams - │ ├── it should refund the sender - │ ├── it should update the refunded amounts - │ └── it should emit {CancelLockupStream} events - └── when the caller is the recipient - ├── it should cancel the streams - ├── it should refund the sender - ├── it should update the refunded amounts - └── it should emit {CancelLockupStream} events + ├── it should cancel the streams + ├── it should refund the sender + ├── it should update the refunded amounts + └── it should emit {CancelLockupStream} events diff --git a/test/integration/concrete/lockup/cancel/cancel.t.sol b/test/integration/concrete/lockup/cancel/cancel.t.sol index 50b5e5012..616e864ee 100644 --- a/test/integration/concrete/lockup/cancel/cancel.t.sol +++ b/test/integration/concrete/lockup/cancel/cancel.t.sol @@ -3,7 +3,6 @@ pragma solidity >=0.8.19 <0.9.0; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; import { ISablierV2LockupRecipient } from "src/interfaces/hooks/ISablierV2LockupRecipient.sol"; -import { ISablierV2LockupSender } from "src/interfaces/hooks/ISablierV2LockupSender.sol"; import { Errors } from "src/libraries/Errors.sol"; import { Lockup } from "src/types/DataTypes.sol"; @@ -65,37 +64,15 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I lockup.cancel(defaultStreamId); } - function test_RevertWhen_CallerUnauthorized_ApprovedOperator() + function test_RevertWhen_CallerUnauthorized_Recipient() external whenNotDelegateCalled givenNotNull givenStreamWarm whenCallerUnauthorized { - // Approve Alice for the stream. + // Make the Recipient the caller in this test. changePrank({ msgSender: users.recipient }); - lockup.approve({ to: users.operator, tokenId: defaultStreamId }); - - // Make Alice the caller in this test. - changePrank({ msgSender: users.operator }); - - // Run the test. - vm.expectRevert( - abi.encodeWithSelector(Errors.SablierV2Lockup_Unauthorized.selector, defaultStreamId, users.operator) - ); - lockup.cancel(defaultStreamId); - } - - function test_RevertWhen_CallerUnauthorized_FormerRecipient() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerUnauthorized - { - // Transfer the stream to Alice. - changePrank({ msgSender: users.recipient }); - lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: defaultStreamId }); // Run the test. vm.expectRevert( @@ -133,7 +110,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I assertFalse(isCancelable, "isCancelable"); } - function test_Cancel_CallerSender_RecipientNotContract() + function test_Cancel_RecipientNotContract() external whenNotDelegateCalled givenNotNull @@ -141,7 +118,6 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender { lockup.cancel(defaultStreamId); Lockup.Status actualStatus = lockup.statusOf(defaultStreamId); @@ -149,7 +125,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I assertEq(actualStatus, expectedStatus); } - function test_Cancel_CallerSender_RecipientDoesNotImplementHook() + function test_Cancel_RecipientDoesNotImplementHook() external whenNotDelegateCalled givenNotNull @@ -157,7 +133,6 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender givenRecipientContract { // Create the stream with a no-op contract as the recipient. @@ -182,7 +157,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I assertEq(actualStatus, expectedStatus); } - function test_Cancel_CallerSender_RecipientReverts() + function test_Cancel_RecipientReverts() external whenNotDelegateCalled givenNotNull @@ -190,7 +165,6 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender givenRecipientContract givenRecipientImplementsHook { @@ -216,7 +190,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I assertEq(actualStatus, expectedStatus); } - function test_Cancel_CallerSender_RecipientReentrancy() + function test_Cancel_RecipientReentrancy() external whenNotDelegateCalled givenNotNull @@ -224,7 +198,6 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender givenRecipientContract givenRecipientImplementsHook whenRecipientDoesNotRevert @@ -251,7 +224,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I assertEq(actualStatus, expectedStatus); } - function test_Cancel_CallerSender() + function test_Cancel() external whenNotDelegateCalled givenNotNull @@ -259,7 +232,6 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender givenRecipientContract givenRecipientImplementsHook whenRecipientDoesNotRevert @@ -283,7 +255,7 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit CancelLockupStream(streamId, users.sender, address(goodRecipient), senderAmount, recipientAmount); + emit CancelLockupStream(streamId, users.sender, address(goodRecipient), dai, senderAmount, recipientAmount); vm.expectEmit({ emitter: address(lockup) }); emit MetadataUpdate({ _tokenId: streamId }); @@ -309,181 +281,4 @@ abstract contract Cancel_Integration_Concrete_Test is Integration_Test, Cancel_I address expectedNFTOwner = address(goodRecipient); assertEq(actualNFTOwner, expectedNFTOwner, "NFT owner"); } - - function test_Cancel_CallerRecipient_SenderNotContract() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - { - lockup.cancel(defaultStreamId); - Lockup.Status actualStatus = lockup.statusOf(defaultStreamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - } - - function test_Cancel_CallerRecipient_SenderDoesNotImplementHook() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - givenSenderContract - { - // Create a stream with a no-op contract as the stream's sender. - uint256 streamId = createDefaultStreamWithSender(address(noop)); - - // Expect a call to the hook. - uint128 senderAmount = lockup.refundableAmountOf(streamId); - uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); - vm.expectCall( - address(noop), - abi.encodeCall( - ISablierV2LockupSender.onStreamCanceled, (streamId, users.recipient, senderAmount, recipientAmount) - ) - ); - - // Cancel the stream. - lockup.cancel(streamId); - - // Assert that the stream's status is "CANCELED". - Lockup.Status actualStatus = lockup.statusOf(streamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - } - - function test_Cancel_CallerRecipient_SenderReverts() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - givenSenderContract - givenSenderImplementsHook - { - // Create a stream with a reverting contract as the stream's sender. - uint256 streamId = createDefaultStreamWithSender(address(revertingSender)); - - // Expect a call to the hook. - uint128 senderAmount = lockup.refundableAmountOf(streamId); - uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); - vm.expectCall( - address(revertingSender), - abi.encodeCall( - ISablierV2LockupSender.onStreamCanceled, (streamId, users.recipient, senderAmount, recipientAmount) - ) - ); - - // Cancel the stream. - lockup.cancel(streamId); - - // Assert that the stream's status is "CANCELED". - Lockup.Status actualStatus = lockup.statusOf(streamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - } - - function test_Cancel_CallerRecipient_SenderReentrancy() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - givenSenderContract - givenSenderImplementsHook - whenSenderDoesNotRevert - { - // Create a stream with a reentrant contract as the stream's sender. - uint256 streamId = createDefaultStreamWithSender(address(reentrantSender)); - - // Expect a call to the hook. - uint128 senderAmount = lockup.refundableAmountOf(streamId); - uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); - vm.expectCall( - address(reentrantSender), - abi.encodeCall( - ISablierV2LockupSender.onStreamCanceled, (streamId, users.recipient, senderAmount, recipientAmount) - ) - ); - - // Cancel the stream. - lockup.cancel(streamId); - - // Assert that the stream's status is "CANCELED". - Lockup.Status actualStatus = lockup.statusOf(streamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - } - - function test_Cancel_CallerRecipient() - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - givenSenderContract - givenSenderImplementsHook - whenSenderDoesNotRevert - whenNoSenderReentrancy - { - // Create the stream. - uint256 streamId = createDefaultStreamWithSender(address(goodSender)); - - // Expect the assets to be refunded to the sender contract. - uint128 senderAmount = lockup.refundableAmountOf(streamId); - expectCallToTransfer({ to: address(goodSender), amount: senderAmount }); - - // Expect a call to the hook. - uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); - vm.expectCall( - address(goodSender), - abi.encodeCall( - ISablierV2LockupSender.onStreamCanceled, (streamId, users.recipient, senderAmount, recipientAmount) - ) - ); - - // Expect the relevant events to be emitted. - vm.expectEmit({ emitter: address(lockup) }); - emit CancelLockupStream(streamId, address(goodSender), users.recipient, senderAmount, recipientAmount); - vm.expectEmit({ emitter: address(lockup) }); - emit MetadataUpdate({ _tokenId: streamId }); - - // Cancel the stream. - lockup.cancel(streamId); - - // Assert that the stream's status is "CANCELED". - Lockup.Status actualStatus = lockup.statusOf(streamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - - // Assert that the stream is not cancelable anymore. - bool isCancelable = lockup.isCancelable(streamId); - assertFalse(isCancelable, "isCancelable"); - - // Assert that the refunded amount has been updated. - uint128 actualRefundedAmount = lockup.getRefundedAmount(streamId); - uint128 expectedRefundedAmount = senderAmount; - assertEq(actualRefundedAmount, expectedRefundedAmount, "refundedAmount"); - - // Assert that the NFT has not been burned. - address actualNFTOwner = lockup.ownerOf({ tokenId: streamId }); - address expectedNFTOwner = users.recipient; - assertEq(actualNFTOwner, expectedNFTOwner, "NFT owner"); - } } diff --git a/test/integration/concrete/lockup/cancel/cancel.tree b/test/integration/concrete/lockup/cancel/cancel.tree index c1fda77c5..491c3f2e3 100644 --- a/test/integration/concrete/lockup/cancel/cancel.tree +++ b/test/integration/concrete/lockup/cancel/cancel.tree @@ -16,9 +16,7 @@ cancel.t.sol ├── when the caller is unauthorized │ ├── when the caller is a malicious third party │ │ └── it should revert - │ ├── when the caller is an approved third party - │ │ └── it should revert - │ └── when the caller is a former recipient + │ └── when the caller is the recipient │ └── it should revert └── when the caller is authorized ├── given the stream is not cancelable @@ -29,65 +27,34 @@ cancel.t.sol │ ├── it should mark the stream as depleted │ └── it should make the stream not cancelable └── given the stream's status is "STREAMING" - ├── when the caller is the sender - │ ├── given the recipient is not a contract - │ │ ├── it should cancel the stream - │ │ └── it should mark the stream as canceled - │ └── given the recipient is a contract - │ ├── given the recipient does not implement the hook - │ │ ├── it should cancel the stream - │ │ ├── it should mark the stream as canceled - │ │ ├── it should call the recipient hook - │ │ └── it should ignore the revert - │ └── given the recipient implements the hook - │ ├── when the recipient reverts - │ │ ├── it should cancel the stream - │ │ ├── it should mark the stream as canceled - │ │ ├── it should call the recipient hook - │ │ └── it should ignore the revert - │ └── when the recipient does not revert - │ ├── when there is reentrancy - │ │ ├── it should cancel the stream - │ │ ├── it should mark the stream as canceled - │ │ ├── it should call the recipient hook - │ │ └── it should ignore the revert - │ └── when there is no reentrancy - │ ├── it should cancel the stream - │ ├── it should mark the stream as canceled - │ ├── it should make the stream not cancelable - │ ├── it should update the refunded amount - │ ├── it should refund the sender - │ ├── it should call the recipient hook - │ ├── it should emit a {CancelLockupStream} event - │ └── it should emit a {MetadataUpdate} event - └── when the caller is the recipient - ├── given the sender is not a contract + ├── given the recipient is not a contract + │ ├── it should cancel the stream + │ └── it should mark the stream as canceled + └── given the recipient is a contract + ├── given the recipient does not implement the hook │ ├── it should cancel the stream - │ └── it should mark the stream as canceled - └── given the sender is a contract - ├── given the sender does not implement the hook - │ ├── it should cancel the stream - │ ├── it should mark the stream as canceled - │ ├── it should call the sender hook - │ └── it should ignore the revert - └── given the sender implements the hook - ├── when the sender reverts + │ ├── it should mark the stream as canceled + │ ├── it should call the recipient hook + │ └── it should ignore the revert + └── given the recipient implements the hook + ├── when the recipient reverts + │ ├── it should cancel the stream + │ ├── it should mark the stream as canceled + │ ├── it should call the recipient hook + │ └── it should ignore the revert + └── when the recipient does not revert + ├── when there is reentrancy │ ├── it should cancel the stream │ ├── it should mark the stream as canceled - │ ├── it should call the sender hook + │ ├── it should call the recipient hook │ └── it should ignore the revert - └── when the sender does not revert - ├── when there is reentrancy - │ ├── it should cancel the stream - │ ├── it should mark the stream as canceled - │ ├── it should call the sender hook - │ └── it should ignore the revert - └── when there is no reentrancy - ├── it should cancel the stream - ├── it should mark the stream as canceled - ├── it should make the stream not cancelable - ├── it should update the refunded amount - ├── it should refund the sender - ├── it should call the sender hook - ├── it should emit a {MetadataUpdate} event - └── it should emit a {CancelLockupStream} event + └── when there is no reentrancy + ├── it should cancel the stream + ├── it should mark the stream as canceled + ├── it should make the stream not cancelable + ├── it should update the refunded amount + ├── it should refund the sender + ├── it should call the recipient hook + ├── it should emit a {MetadataUpdate} event + └── it should emit a {CancelLockupStream} event + \ No newline at end of file diff --git a/test/integration/concrete/lockup/is-transferable/isTransferable.t.sol b/test/integration/concrete/lockup/is-transferable/isTransferable.t.sol new file mode 100644 index 000000000..e36599786 --- /dev/null +++ b/test/integration/concrete/lockup/is-transferable/isTransferable.t.sol @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity >=0.8.19 <0.9.0; + +import { Errors } from "src/libraries/Errors.sol"; + +import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; +import { Integration_Test } from "../../../Integration.t.sol"; + +abstract contract IsTransferable_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { + uint256 internal defaultStreamId; + + function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { } + + function test_RevertGiven_Null() external { + uint256 nullStreamId = 1729; + vm.expectRevert(abi.encodeWithSelector(Errors.SablierV2Lockup_Null.selector, nullStreamId)); + lockup.isTransferable(nullStreamId); + } + + modifier givenNotNull() { + defaultStreamId = createDefaultStream(); + _; + } + + function test_RevertGiven_StreamTransferNotEnabled() external givenNotNull { + uint256 notTransferableStreamId = createDefaultStreamNotTransferable(); + bool isTransferable = lockup.isTransferable(notTransferableStreamId); + assertFalse(isTransferable, "isTransferable"); + } + + modifier givenStreamTransferable() { + _; + } + + function test_IsTransferable_Stream() external givenNotNull givenStreamTransferable { + bool isTransferable = lockup.isTransferable(defaultStreamId); + assertTrue(isTransferable, "isTransferable"); + } +} diff --git a/test/integration/concrete/lockup/is-transferable/isTransferable.tree b/test/integration/concrete/lockup/is-transferable/isTransferable.tree new file mode 100644 index 000000000..2fefdc265 --- /dev/null +++ b/test/integration/concrete/lockup/is-transferable/isTransferable.tree @@ -0,0 +1,8 @@ +isTransferable.t.sol +├── given the id references a null stream +│ └── it should revert +└── given the id does not reference a null stream + ├── given the stream is not transferable + │ └── it should return false + └── given the stream is transferable + └── it should return true diff --git a/test/integration/concrete/lockup/transfer-from/transferFrom.t.sol b/test/integration/concrete/lockup/transfer-from/transferFrom.t.sol new file mode 100644 index 000000000..648ee00ce --- /dev/null +++ b/test/integration/concrete/lockup/transfer-from/transferFrom.t.sol @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity >=0.8.19 <0.9.0; + +import { Errors } from "src/libraries/Errors.sol"; + +import { Lockup_Integration_Shared_Test } from "../../../shared/lockup/Lockup.t.sol"; +import { Integration_Test } from "../../../Integration.t.sol"; + +abstract contract TransferFrom_Integration_Concrete_Test is Integration_Test, Lockup_Integration_Shared_Test { + function setUp() public virtual override(Integration_Test, Lockup_Integration_Shared_Test) { + changePrank({ msgSender: users.recipient }); + } + + function test_RevertGiven_StreamNotTransferable() external { + uint256 notTransferableStreamId = createDefaultStreamNotTransferable(); + vm.expectRevert( + abi.encodeWithSelector(Errors.SablierV2Lockup_NotTransferable.selector, notTransferableStreamId) + ); + lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: notTransferableStreamId }); + } + + modifier givenStreamTransferable() { + _; + } + + function test_TransferFrom() external givenStreamTransferable { + // Create a stream. + uint256 streamId = createDefaultStream(); + + // Expect the relevant events to be emitted. + vm.expectEmit({ emitter: address(lockup) }); + emit Transfer({ from: users.recipient, to: users.alice, tokenId: streamId }); + vm.expectEmit({ emitter: address(lockup) }); + emit MetadataUpdate({ _tokenId: streamId }); + + // Transfer the NFT. + lockup.transferFrom({ from: users.recipient, to: users.alice, tokenId: streamId }); + + // Assert that Alice is the new stream recipient (and NFT owner). + address actualRecipient = lockup.getRecipient(streamId); + address expectedRecipient = users.alice; + assertEq(actualRecipient, expectedRecipient, "recipient"); + } +} diff --git a/test/integration/concrete/lockup/transfer-from/transferFrom.tree b/test/integration/concrete/lockup/transfer-from/transferFrom.tree new file mode 100644 index 000000000..bc08e8ce5 --- /dev/null +++ b/test/integration/concrete/lockup/transfer-from/transferFrom.tree @@ -0,0 +1,7 @@ +transferFrom.t.sol +├── given the stream is not transferable +│ └── it should revert +└── given the stream is transferable + ├── it should transfer the NFT + ├── it should emit a {Transfer} event + └── it should emit a {MetadataUpdate} event \ No newline at end of file diff --git a/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol b/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol index 3d6ad1339..86bddab4f 100644 --- a/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol +++ b/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol @@ -65,6 +65,21 @@ abstract contract WithdrawMaxAndTransfer_Integration_Concrete_Test is lockup.withdrawMaxAndTransfer({ streamId: defaultStreamId, newRecipient: users.alice }); } + function test_RevertGiven_StreamNotTransferable() + external + whenNotDelegateCalled + givenNotNull + whenCallerCurrentRecipient + givenNFTNotBurned + givenWithdrawableAmountNotZero + { + uint256 notTransferableStreamId = createDefaultStreamNotTransferable(); + vm.expectRevert( + abi.encodeWithSelector(Errors.SablierV2Lockup_NotTransferable.selector, notTransferableStreamId) + ); + lockup.withdrawMaxAndTransfer({ streamId: notTransferableStreamId, newRecipient: users.recipient }); + } + function test_WithdrawMaxAndTransfer() external whenNotDelegateCalled @@ -72,6 +87,7 @@ abstract contract WithdrawMaxAndTransfer_Integration_Concrete_Test is whenCallerCurrentRecipient givenNFTNotBurned givenWithdrawableAmountNotZero + givenStreamTransferable { // Simulate the passage of time. vm.warp({ timestamp: defaults.WARP_26_PERCENT() }); @@ -84,9 +100,16 @@ abstract contract WithdrawMaxAndTransfer_Integration_Concrete_Test is // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: defaultStreamId, + to: users.recipient, + amount: withdrawAmount, + asset: dai + }); vm.expectEmit({ emitter: address(lockup) }); emit Transfer({ from: users.recipient, to: users.alice, tokenId: defaultStreamId }); + vm.expectEmit({ emitter: address(lockup) }); + emit MetadataUpdate({ _tokenId: defaultStreamId }); // Make the max withdrawal and transfer the NFT. lockup.withdrawMaxAndTransfer({ streamId: defaultStreamId, newRecipient: users.alice }); diff --git a/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree b/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree index 166704694..f53682e9e 100644 --- a/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree +++ b/test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.tree @@ -5,17 +5,21 @@ withdrawMaxAndTransfer.t.sol ├── given the id references a null stream │ └── it should revert └── given the id does not reference a null stream - ├── when the caller is not the current recipient + ├── given the stream is not transferable │ └── it should revert - └── when the caller is the current recipient + └── given the stream is transferable ├── given the NFT has been burned │ └── it should revert └── given the NFT has not been burned ├── given the withdrawable amount is zero │ └── it should skip the withdrawal └── given the withdrawable amount is not zero - ├── it should make the max withdrawal - ├── it should update the withdrawn amount - ├── it should transfer the NFT - ├── it should emit a {WithdrawFromLockupStream} event - └── it should emit a {Transfer} event + ├── when the caller is not the current recipient + │ └── it should revert + └── when the caller is the current recipient + ├── it should make the max withdrawal + ├── it should update the withdrawn amount + ├── it should transfer the NFT + ├── it should emit a {WithdrawFromLockupStream} event + ├── it should emit a {Transfer} event + └── it should emit a {MetadataUpdate} event diff --git a/test/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol b/test/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol index e6f83c856..2721c5654 100644 --- a/test/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol +++ b/test/integration/concrete/lockup/withdraw-max/withdrawMax.t.sol @@ -23,7 +23,8 @@ abstract contract WithdrawMax_Integration_Concrete_Test is Integration_Test, Wit emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, - amount: defaults.DEPOSIT_AMOUNT() + amount: defaults.DEPOSIT_AMOUNT(), + asset: dai }); // Make the max withdrawal. @@ -61,7 +62,12 @@ abstract contract WithdrawMax_Integration_Concrete_Test is Integration_Test, Wit // Expect the relevant event to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: defaultStreamId, + to: users.recipient, + amount: withdrawAmount, + asset: dai + }); // Make the max withdrawal. lockup.withdrawMax({ streamId: defaultStreamId, to: users.recipient }); diff --git a/test/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol b/test/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol index 25eb3b761..308fc2b3a 100644 --- a/test/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol +++ b/test/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; import { Errors } from "src/libraries/Errors.sol"; @@ -294,7 +294,7 @@ abstract contract WithdrawMultiple_Integration_Concrete_Test is vm.warp({ timestamp: earlyStopTime }); // Cancel the 3rd stream. - changePrank({ msgSender: users.recipient }); + changePrank({ msgSender: users.sender }); lockup.cancel(testStreamIds[2]); // Run the test with the caller provided in {whenCallerAuthorizedAllStreams}. @@ -307,11 +307,26 @@ abstract contract WithdrawMultiple_Integration_Concrete_Test is // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: testStreamIds[0], to: users.recipient, amount: testAmounts[0] }); + emit WithdrawFromLockupStream({ + streamId: testStreamIds[0], + to: users.recipient, + asset: dai, + amount: testAmounts[0] + }); vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: testStreamIds[1], to: users.recipient, amount: testAmounts[1] }); + emit WithdrawFromLockupStream({ + streamId: testStreamIds[1], + to: users.recipient, + asset: dai, + amount: testAmounts[1] + }); vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: testStreamIds[2], to: users.recipient, amount: testAmounts[2] }); + emit WithdrawFromLockupStream({ + streamId: testStreamIds[2], + to: users.recipient, + asset: dai, + amount: testAmounts[2] + }); // Make the withdrawals. lockup.withdrawMultiple({ streamIds: testStreamIds, to: users.recipient, amounts: testAmounts }); diff --git a/test/integration/concrete/lockup/withdraw/withdraw.t.sol b/test/integration/concrete/lockup/withdraw/withdraw.t.sol index 88faa15d5..fbbeca2f6 100644 --- a/test/integration/concrete/lockup/withdraw/withdraw.t.sol +++ b/test/integration/concrete/lockup/withdraw/withdraw.t.sol @@ -296,7 +296,12 @@ abstract contract Withdraw_Integration_Concrete_Test is Integration_Test, Withdr // Expect the relevant event to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: defaultStreamId, + to: users.recipient, + asset: dai, + amount: withdrawAmount + }); // Make the withdrawal. lockup.withdraw({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); @@ -491,7 +496,12 @@ abstract contract Withdraw_Integration_Concrete_Test is Integration_Test, Withdr // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: streamId, to: address(goodRecipient), amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: streamId, + to: address(goodRecipient), + asset: dai, + amount: withdrawAmount + }); vm.expectEmit({ emitter: address(lockup) }); emit MetadataUpdate({ _tokenId: streamId }); diff --git a/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol b/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol index f1edb0951..4e956be9c 100644 --- a/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol +++ b/test/integration/concrete/nft-descriptor/generateAccentColor.t.sol @@ -7,7 +7,7 @@ contract GenerateAccentColor_Integration_Concrete_Test is NFTDescriptor_Integrat function test_GenerateAccentColor() external { // Passing a dummy contract instead of a real Sablier contract to make this test easy to maintain. string memory actualColor = nftDescriptorMock.generateAccentColor_({ sablier: address(noop), streamId: 1337 }); - string memory expectedColor = "hsl(6,51%,82%)"; + string memory expectedColor = "hsl(302,69%,44%)"; assertEq(actualColor, expectedColor, "accentColor"); } } diff --git a/test/integration/fuzz/lockup-dynamic/createWithDeltas.t.sol b/test/integration/fuzz/lockup-dynamic/createWithDeltas.t.sol index 51a1a5ce8..aaf2455ab 100644 --- a/test/integration/fuzz/lockup-dynamic/createWithDeltas.t.sol +++ b/test/integration/fuzz/lockup-dynamic/createWithDeltas.t.sol @@ -91,6 +91,7 @@ contract CreateWithDeltas_LockupDynamic_Integration_Fuzz_Test is amounts: vars.createAmounts, asset: dai, cancelable: true, + transferable: true, segments: vars.segmentsWithMilestones, range: range, broker: users.broker @@ -100,6 +101,7 @@ contract CreateWithDeltas_LockupDynamic_Integration_Fuzz_Test is LockupDynamic.CreateWithDeltas memory params = defaults.createWithDeltas(); params.segments = segments; params.totalAmount = vars.totalAmount; + params.transferable = true; lockupDynamic.createWithDeltas(params); // Check if the stream is settled. It is possible for a Lockup Dynamic stream to settle at the time of creation @@ -113,6 +115,7 @@ contract CreateWithDeltas_LockupDynamic_Integration_Fuzz_Test is assertEq(actualStream.asset, dai, "asset"); assertEq(actualStream.endTime, range.end, "endTime"); assertEq(actualStream.isCancelable, vars.isCancelable, "isCancelable"); + assertEq(actualStream.isTransferable, true, "isTransferable"); assertEq(actualStream.isDepleted, false, "isDepleted"); assertEq(actualStream.isStream, true, "isStream"); assertEq(actualStream.segments, vars.segmentsWithMilestones, "segments"); diff --git a/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol b/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol index c30911a5f..cbcf7d2c0 100644 --- a/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol +++ b/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { MAX_UD60x18, UD60x18, ud, ZERO } from "@prb/math/src/UD60x18.sol"; -import { stdError } from "forge-std/StdError.sol"; +import { stdError } from "forge-std/src/StdError.sol"; import { Errors } from "src/libraries/Errors.sol"; import { Broker, Lockup, LockupDynamic } from "src/types/DataTypes.sol"; @@ -227,6 +227,7 @@ contract CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test is params.broker.fee = _bound(params.broker.fee, 0, MAX_FEE); protocolFee = _bound(protocolFee, 0, MAX_FEE); params.startTime = boundUint40(params.startTime, 0, defaults.START_TIME()); + params.transferable = true; // Fuzz the segment milestones. fuzzSegmentMilestones(params.segments, params.startTime); @@ -277,6 +278,7 @@ contract CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test is amounts: vars.createAmounts, asset: dai, cancelable: params.cancelable, + transferable: params.transferable, segments: params.segments, range: range, broker: params.broker.account @@ -288,6 +290,7 @@ contract CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test is asset: dai, broker: params.broker, cancelable: params.cancelable, + transferable: params.transferable, recipient: params.recipient, segments: params.segments, sender: params.sender, @@ -307,6 +310,7 @@ contract CreateWithMilestones_LockupDynamic_Integration_Fuzz_Test is assertEq(actualStream.asset, dai, "asset"); assertEq(actualStream.endTime, range.end, "endTime"); assertEq(actualStream.isCancelable, vars.isCancelable, "isCancelable"); + assertEq(actualStream.isTransferable, true, "isTransferable"); assertEq(actualStream.isDepleted, false, "isStream"); assertEq(actualStream.isStream, true, "isStream"); assertEq(actualStream.sender, params.sender, "sender"); diff --git a/test/integration/fuzz/lockup-dynamic/withdraw.t.sol b/test/integration/fuzz/lockup-dynamic/withdraw.t.sol index 04177f618..196ac96cb 100644 --- a/test/integration/fuzz/lockup-dynamic/withdraw.t.sol +++ b/test/integration/fuzz/lockup-dynamic/withdraw.t.sol @@ -98,7 +98,7 @@ contract Withdraw_LockupDynamic_Integration_Fuzz_Test is // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockupDynamic) }); - emit WithdrawFromLockupStream({ streamId: vars.streamId, to: params.to, amount: vars.withdrawAmount }); + emit WithdrawFromLockupStream({ streamId: vars.streamId, to: params.to, amount: vars.withdrawAmount, asset: dai }); vm.expectEmit({ emitter: address(lockupDynamic) }); emit MetadataUpdate({ _tokenId: vars.streamId }); diff --git a/test/integration/fuzz/lockup-linear/createWithDurations.t.sol b/test/integration/fuzz/lockup-linear/createWithDurations.t.sol index 73dc6930c..c84b7af53 100644 --- a/test/integration/fuzz/lockup-linear/createWithDurations.t.sol +++ b/test/integration/fuzz/lockup-linear/createWithDurations.t.sol @@ -117,6 +117,7 @@ contract CreateWithDurations_LockupLinear_Integration_Fuzz_Test is amounts: defaults.lockupCreateAmounts(), asset: dai, cancelable: true, + transferable: true, range: range, broker: users.broker }); diff --git a/test/integration/fuzz/lockup-linear/createWithRange.t.sol b/test/integration/fuzz/lockup-linear/createWithRange.t.sol index 2bd4b8f3d..3b9cd914b 100644 --- a/test/integration/fuzz/lockup-linear/createWithRange.t.sol +++ b/test/integration/fuzz/lockup-linear/createWithRange.t.sol @@ -147,6 +147,7 @@ contract CreateWithRange_LockupLinear_Integration_Fuzz_Test is params.range.end = boundUint40(params.range.end, params.range.cliff + 1 seconds, MAX_UNIX_TIMESTAMP); params.broker.fee = _bound(params.broker.fee, 0, MAX_FEE); protocolFee = _bound(protocolFee, 0, MAX_FEE); + params.transferable = true; // Calculate the fee amounts and the deposit amount. Vars memory vars; @@ -189,6 +190,7 @@ contract CreateWithRange_LockupLinear_Integration_Fuzz_Test is amounts: vars.createAmounts, asset: dai, cancelable: params.cancelable, + transferable: params.transferable, range: params.range, broker: params.broker.account }); @@ -201,6 +203,7 @@ contract CreateWithRange_LockupLinear_Integration_Fuzz_Test is cancelable: params.cancelable, range: params.range, recipient: params.recipient, + transferable: params.transferable, sender: params.sender, totalAmount: params.totalAmount }) @@ -214,6 +217,7 @@ contract CreateWithRange_LockupLinear_Integration_Fuzz_Test is assertEq(actualStream.endTime, params.range.end, "endTime"); assertEq(actualStream.isCancelable, params.cancelable, "isCancelable"); assertEq(actualStream.isDepleted, false, "isStream"); + assertEq(actualStream.isTransferable, true, "isTransferable"); assertEq(actualStream.isStream, true, "isStream"); assertEq(actualStream.sender, params.sender, "sender"); assertEq(actualStream.startTime, params.range.start, "startTime"); diff --git a/test/integration/fuzz/lockup/cancel.t.sol b/test/integration/fuzz/lockup/cancel.t.sol index f83f7ec00..d59082cb5 100644 --- a/test/integration/fuzz/lockup/cancel.t.sol +++ b/test/integration/fuzz/lockup/cancel.t.sol @@ -41,7 +41,7 @@ abstract contract Cancel_Integration_Fuzz_Test is Integration_Test, Cancel_Integ /// /// - Multiple values for the current time /// - With and without withdrawals - function testFuzz_Cancel_CallerSender( + function testFuzz_Cancel( uint256 timeJump, uint128 withdrawAmount ) @@ -52,7 +52,6 @@ abstract contract Cancel_Integration_Fuzz_Test is Integration_Test, Cancel_Integ whenCallerAuthorized givenStreamCancelable givenStatusStreaming - whenCallerSender givenRecipientContract givenRecipientImplementsHook whenRecipientDoesNotRevert @@ -82,7 +81,7 @@ abstract contract Cancel_Integration_Fuzz_Test is Integration_Test, Cancel_Integ // Expect the relevant events to be emitted. uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); vm.expectEmit({ emitter: address(lockup) }); - emit CancelLockupStream(streamId, users.sender, address(goodRecipient), senderAmount, recipientAmount); + emit CancelLockupStream(streamId, users.sender, address(goodRecipient), dai, senderAmount, recipientAmount); vm.expectEmit({ emitter: address(lockup) }); emit MetadataUpdate({ _tokenId: streamId }); @@ -103,69 +102,4 @@ abstract contract Cancel_Integration_Fuzz_Test is Integration_Test, Cancel_Integ address expectedNFTOwner = address(goodRecipient); assertEq(actualNFTOwner, expectedNFTOwner, "NFT owner"); } - - /// @dev Given enough fuzz runs, all of the following scenarios will be fuzzed: - /// - /// - Multiple values for the current time - /// - With and without withdrawals - function testFuzz_Cancel_CallerRecipient( - uint256 timeJump, - uint128 withdrawAmount - ) - external - whenNotDelegateCalled - givenNotNull - givenStreamWarm - whenCallerAuthorized - givenStreamCancelable - givenStatusStreaming - whenCallerRecipient - givenSenderContract - givenSenderImplementsHook - whenSenderDoesNotRevert - whenNoSenderReentrancy - { - timeJump = _bound(timeJump, defaults.CLIFF_DURATION(), defaults.TOTAL_DURATION() - 1); - - // Create the stream. - uint256 streamId = createDefaultStreamWithSender(address(goodSender)); - - // Simulate the passage of time. - vm.warp({ timestamp: defaults.START_TIME() + timeJump }); - - // Bound the withdraw amount. - uint128 streamedAmount = lockup.streamedAmountOf(streamId); - withdrawAmount = boundUint128(withdrawAmount, 0, streamedAmount - 1); - - // Make the withdrawal only if the amount is greater than zero. - if (withdrawAmount > 0) { - lockup.withdraw({ streamId: streamId, to: users.recipient, amount: withdrawAmount }); - } - - // Expect the assets to be refunded to the sender contract. - uint128 senderAmount = lockup.refundableAmountOf(streamId); - expectCallToTransfer({ to: address(goodSender), amount: senderAmount }); - - // Expect the relevant event to be emitted. - uint128 recipientAmount = lockup.withdrawableAmountOf(streamId); - vm.expectEmit({ emitter: address(lockup) }); - emit CancelLockupStream(streamId, address(goodSender), users.recipient, senderAmount, recipientAmount); - - // Cancel the stream. - lockup.cancel(streamId); - - // Assert that the stream's status is "CANCELED". - Lockup.Status actualStatus = lockup.statusOf(streamId); - Lockup.Status expectedStatus = Lockup.Status.CANCELED; - assertEq(actualStatus, expectedStatus); - - // Assert that the stream is not cancelable anymore. - bool isCancelable = lockup.isCancelable(streamId); - assertFalse(isCancelable, "isCancelable"); - - // Assert that the NFT has not been burned. - address actualNFTOwner = lockup.ownerOf({ tokenId: streamId }); - address expectedNFTOwner = users.recipient; - assertEq(actualNFTOwner, expectedNFTOwner, "NFT owner"); - } } diff --git a/test/integration/fuzz/lockup/cancelMultiple.t.sol b/test/integration/fuzz/lockup/cancelMultiple.t.sol index e78a71803..d9e2b451e 100644 --- a/test/integration/fuzz/lockup/cancelMultiple.t.sol +++ b/test/integration/fuzz/lockup/cancelMultiple.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { Lockup } from "src/types/DataTypes.sol"; @@ -48,6 +48,7 @@ abstract contract CancelMultiple_Integration_Fuzz_Test is Integration_Test, Canc streamId: streamIds[0], sender: users.sender, recipient: users.recipient, + asset: dai, senderAmount: senderAmount0, recipientAmount: defaults.DEPOSIT_AMOUNT() - senderAmount0 }); @@ -56,6 +57,7 @@ abstract contract CancelMultiple_Integration_Fuzz_Test is Integration_Test, Canc streamId: streamIds[1], sender: users.sender, recipient: users.recipient, + asset: dai, senderAmount: senderAmount1, recipientAmount: defaults.DEPOSIT_AMOUNT() - senderAmount1 }); diff --git a/test/integration/fuzz/lockup/withdraw.t.sol b/test/integration/fuzz/lockup/withdraw.t.sol index fea5abecb..3ef2815c4 100644 --- a/test/integration/fuzz/lockup/withdraw.t.sol +++ b/test/integration/fuzz/lockup/withdraw.t.sol @@ -75,7 +75,9 @@ abstract contract Withdraw_Integration_Fuzz_Test is Integration_Test, Withdraw_I vm.warp({ timestamp: defaults.START_TIME() + timeJump }); // Cancel the stream. + changePrank({ msgSender: users.sender }); lockup.cancel({ streamId: defaultStreamId }); + changePrank({ msgSender: users.recipient }); // Bound the withdraw amount. uint128 withdrawableAmount = lockup.withdrawableAmountOf(defaultStreamId); @@ -86,7 +88,7 @@ abstract contract Withdraw_Integration_Fuzz_Test is Integration_Test, Withdraw_I // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream(defaultStreamId, to, withdrawAmount); + emit WithdrawFromLockupStream(defaultStreamId, to, dai, withdrawAmount); vm.expectEmit({ emitter: address(lockup) }); emit MetadataUpdate({ _tokenId: defaultStreamId }); @@ -150,7 +152,7 @@ abstract contract Withdraw_Integration_Fuzz_Test is Integration_Test, Withdraw_I // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream(defaultStreamId, to, withdrawAmount); + emit WithdrawFromLockupStream(defaultStreamId, to, dai, withdrawAmount); vm.expectEmit({ emitter: address(lockup) }); emit MetadataUpdate({ _tokenId: defaultStreamId }); diff --git a/test/integration/fuzz/lockup/withdrawMax.t.sol b/test/integration/fuzz/lockup/withdrawMax.t.sol index de6199755..60b631199 100644 --- a/test/integration/fuzz/lockup/withdrawMax.t.sol +++ b/test/integration/fuzz/lockup/withdrawMax.t.sol @@ -25,6 +25,7 @@ abstract contract WithdrawMax_Integration_Fuzz_Test is Integration_Test, Withdra emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, + asset: dai, amount: defaults.DEPOSIT_AMOUNT() }); @@ -65,7 +66,12 @@ abstract contract WithdrawMax_Integration_Fuzz_Test is Integration_Test, Withdra // Expect the relevant event to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: defaultStreamId, + to: users.recipient, + asset: dai, + amount: withdrawAmount + }); // Make the max withdrawal. lockup.withdrawMax({ streamId: defaultStreamId, to: users.recipient }); diff --git a/test/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol b/test/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol index 3392e4cb7..8aef73118 100644 --- a/test/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol +++ b/test/integration/fuzz/lockup/withdrawMaxAndTransfer.t.sol @@ -25,6 +25,7 @@ abstract contract WithdrawMaxAndTransfer_Integration_Fuzz_Test is givenNotNull whenCallerCurrentRecipient givenNFTNotBurned + givenStreamTransferable { vm.assume(newRecipient != address(0)); timeJump = _bound(timeJump, 0, defaults.TOTAL_DURATION() * 2); @@ -41,7 +42,12 @@ abstract contract WithdrawMaxAndTransfer_Integration_Fuzz_Test is // Expect the relevant event to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: defaultStreamId, to: users.recipient, amount: withdrawAmount }); + emit WithdrawFromLockupStream({ + streamId: defaultStreamId, + to: users.recipient, + asset: dai, + amount: withdrawAmount + }); } // Expect the relevant event to be emitted. diff --git a/test/integration/fuzz/lockup/withdrawMultiple.t.sol b/test/integration/fuzz/lockup/withdrawMultiple.t.sol index 8b38c8cdd..e26326d4c 100644 --- a/test/integration/fuzz/lockup/withdrawMultiple.t.sol +++ b/test/integration/fuzz/lockup/withdrawMultiple.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { Solarray } from "solarray/Solarray.sol"; +import { Solarray } from "solarray/src/Solarray.sol"; import { Lockup } from "src/types/DataTypes.sol"; @@ -64,9 +64,9 @@ abstract contract WithdrawMultiple_Integration_Fuzz_Test is // Expect the relevant events to be emitted. vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: ongoingStreamId, to: to, amount: ongoingWithdrawAmount }); + emit WithdrawFromLockupStream({ streamId: ongoingStreamId, to: to, asset: dai, amount: ongoingWithdrawAmount }); vm.expectEmit({ emitter: address(lockup) }); - emit WithdrawFromLockupStream({ streamId: settledStreamId, to: to, amount: settledWithdrawAmount }); + emit WithdrawFromLockupStream({ streamId: settledStreamId, to: to, asset: dai, amount: settledWithdrawAmount }); // Make the withdrawals. uint256[] memory streamIds = Solarray.uint256s(ongoingStreamId, settledStreamId); diff --git a/test/integration/shared/lockup-dynamic/LockupDynamic.t.sol b/test/integration/shared/lockup-dynamic/LockupDynamic.t.sol index f257a3d34..314c81aac 100644 --- a/test/integration/shared/lockup-dynamic/LockupDynamic.t.sol +++ b/test/integration/shared/lockup-dynamic/LockupDynamic.t.sol @@ -26,6 +26,7 @@ abstract contract LockupDynamic_Integration_Shared_Test is Lockup_Integration_Sh _params.createWithDeltas.totalAmount = defaults.TOTAL_AMOUNT(); _params.createWithDeltas.asset = dai; _params.createWithDeltas.cancelable = true; + _params.createWithDeltas.transferable = true; _params.createWithDeltas.broker = defaults.broker(); _params.createWithMilestones.sender = users.sender; @@ -33,6 +34,7 @@ abstract contract LockupDynamic_Integration_Shared_Test is Lockup_Integration_Sh _params.createWithMilestones.totalAmount = defaults.TOTAL_AMOUNT(); _params.createWithMilestones.asset = dai; _params.createWithMilestones.cancelable = true; + _params.createWithMilestones.transferable = true; _params.createWithMilestones.startTime = defaults.START_TIME(); _params.createWithMilestones.broker = defaults.broker(); @@ -93,6 +95,13 @@ abstract contract LockupDynamic_Integration_Shared_Test is Lockup_Integration_Sh streamId = lockupDynamic.createWithMilestones(params); } + /// @dev Creates the default stream with the NFT transfer disabled. + function createDefaultStreamNotTransferable() internal override returns (uint256 streamId) { + LockupDynamic.CreateWithMilestones memory params = _params.createWithMilestones; + params.transferable = false; + streamId = lockupDynamic.createWithMilestones(params); + } + /// @dev Creates the default stream with the provided range. function createDefaultStreamWithRange(LockupDynamic.Range memory range) internal returns (uint256 streamId) { LockupDynamic.CreateWithMilestones memory params = _params.createWithMilestones; diff --git a/test/integration/shared/lockup-linear/LockupLinear.t.sol b/test/integration/shared/lockup-linear/LockupLinear.t.sol index a45e38c21..2a909fa0d 100644 --- a/test/integration/shared/lockup-linear/LockupLinear.t.sol +++ b/test/integration/shared/lockup-linear/LockupLinear.t.sol @@ -65,6 +65,13 @@ abstract contract LockupLinear_Integration_Shared_Test is Lockup_Integration_Sha streamId = lockupLinear.createWithRange(params); } + /// @dev Creates the default stream with the NFT transfer disabled. + function createDefaultStreamNotTransferable() internal override returns (uint256 streamId) { + LockupLinear.CreateWithRange memory params = _params.createWithRange; + params.transferable = false; + streamId = lockupLinear.createWithRange(params); + } + /// @dev Creates the default stream with the provided end time. function createDefaultStreamWithEndTime(uint40 endTime) internal override returns (uint256 streamId) { LockupLinear.CreateWithRange memory params = _params.createWithRange; diff --git a/test/integration/shared/lockup/Lockup.t.sol b/test/integration/shared/lockup/Lockup.t.sol index 4cc656927..7974e50d6 100644 --- a/test/integration/shared/lockup/Lockup.t.sol +++ b/test/integration/shared/lockup/Lockup.t.sol @@ -47,6 +47,9 @@ abstract contract Lockup_Integration_Shared_Test is Base_Test { /// @dev Creates the default stream but make it not cancelable. function createDefaultStreamNotCancelable() internal virtual returns (uint256 streamId); + /// @dev Creates the default stream with the NFT transfer disabled. + function createDefaultStreamNotTransferable() internal virtual returns (uint256 streamId); + /// @dev Creates the default stream with the provided address. function createDefaultStreamWithAsset(IERC20 asset) internal virtual returns (uint256 streamId); diff --git a/test/integration/shared/lockup/cancel.t.sol b/test/integration/shared/lockup/cancel.t.sol index b808ab233..eba14f6ac 100644 --- a/test/integration/shared/lockup/cancel.t.sol +++ b/test/integration/shared/lockup/cancel.t.sol @@ -8,7 +8,7 @@ abstract contract Cancel_Integration_Shared_Test is Lockup_Integration_Shared_Te function setUp() public virtual override { defaultStreamId = createDefaultStream(); - changePrank({ msgSender: users.recipient }); + changePrank({ msgSender: users.sender }); } modifier whenNotDelegateCalled() { @@ -47,11 +47,6 @@ abstract contract Cancel_Integration_Shared_Test is Lockup_Integration_Shared_Te _; } - modifier whenCallerSender() { - changePrank({ msgSender: users.sender }); - _; - } - modifier givenRecipientContract() { _; } @@ -67,25 +62,4 @@ abstract contract Cancel_Integration_Shared_Test is Lockup_Integration_Shared_Te modifier whenNoRecipientReentrancy() { _; } - - modifier whenCallerRecipient() { - changePrank({ msgSender: users.recipient }); - _; - } - - modifier givenSenderContract() { - _; - } - - modifier givenSenderImplementsHook() { - _; - } - - modifier whenSenderDoesNotRevert() { - _; - } - - modifier whenNoSenderReentrancy() { - _; - } } diff --git a/test/integration/shared/lockup/cancelMultiple.t.sol b/test/integration/shared/lockup/cancelMultiple.t.sol index 6efc4de97..f5f366c8b 100644 --- a/test/integration/shared/lockup/cancelMultiple.t.sol +++ b/test/integration/shared/lockup/cancelMultiple.t.sol @@ -48,7 +48,7 @@ abstract contract CancelMultiple_Integration_Shared_Test is Lockup_Integration_S _; vm.warp({ timestamp: originalTime }); createTestStreams(); - changePrank({ msgSender: users.recipient }); + changePrank({ msgSender: users.sender }); _; } diff --git a/test/integration/shared/lockup/withdrawMaxAndTransfer.t.sol b/test/integration/shared/lockup/withdrawMaxAndTransfer.t.sol index da1c44fc5..5f6fcf64f 100644 --- a/test/integration/shared/lockup/withdrawMaxAndTransfer.t.sol +++ b/test/integration/shared/lockup/withdrawMaxAndTransfer.t.sol @@ -23,6 +23,10 @@ abstract contract WithdrawMaxAndTransfer_Integration_Shared_Test is Lockup_Integ _; } + modifier givenStreamTransferable() { + _; + } + modifier givenNFTNotBurned() { _; } diff --git a/test/invariant/Invariant.t.sol b/test/invariant/Invariant.t.sol index e9e3b3fa5..8e563b6c5 100644 --- a/test/invariant/Invariant.t.sol +++ b/test/invariant/Invariant.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { StdInvariant } from "forge-std/StdInvariant.sol"; +import { StdInvariant } from "forge-std/src/StdInvariant.sol"; import { Base_Test } from "../Base.t.sol"; import { ComptrollerHandler } from "./handlers/ComptrollerHandler.sol"; diff --git a/test/invariant/handlers/BaseHandler.sol b/test/invariant/handlers/BaseHandler.sol index 797f7932b..75523ea07 100644 --- a/test/invariant/handlers/BaseHandler.sol +++ b/test/invariant/handlers/BaseHandler.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { Vm } from "@prb/test/PRBTest.sol"; -import { StdCheats } from "forge-std/StdCheats.sol"; +import { Vm } from "@prb/test/src/PRBTest.sol"; +import { StdCheats } from "forge-std/src/StdCheats.sol"; import { Constants } from "../../utils/Constants.sol"; import { Fuzzers } from "../../utils/Fuzzers.sol"; diff --git a/test/invariant/handlers/LockupHandler.sol b/test/invariant/handlers/LockupHandler.sol index 7b39b6d01..1a93ffc24 100644 --- a/test/invariant/handlers/LockupHandler.sol +++ b/test/invariant/handlers/LockupHandler.sol @@ -288,6 +288,11 @@ abstract contract LockupHandler is BaseHandler { return; } + // Skip if the stream is not transferable. + if (!lockup.isTransferable(currentStreamId)) { + return; + } + // The protocol doesn't allow a zero amount to be withdrawn. uint128 withdrawableAmount = lockup.withdrawableAmountOf(currentStreamId); if (withdrawableAmount == 0) { @@ -326,6 +331,11 @@ abstract contract LockupHandler is BaseHandler { return; } + // Skip if the stream is not transferable. + if (!lockup.isTransferable(currentStreamId)) { + return; + } + // Transfer the NFT to the new recipient. lockup.transferFrom({ from: currentRecipient, to: newRecipient, tokenId: currentStreamId }); diff --git a/test/mocks/hooks/GoodSender.sol b/test/mocks/hooks/GoodSender.sol deleted file mode 100644 index 0710741d8..000000000 --- a/test/mocks/hooks/GoodSender.sol +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19; - -import { ISablierV2LockupSender } from "../../../src/interfaces/hooks/ISablierV2LockupSender.sol"; - -contract GoodSender is ISablierV2LockupSender { - function onStreamCanceled( - uint256 streamId, - address recipient, - uint128 senderAmount, - uint128 recipientAmount - ) - external - pure - { - streamId; - recipient; - senderAmount; - recipientAmount; - } -} diff --git a/test/mocks/hooks/ReentrantSender.sol b/test/mocks/hooks/ReentrantSender.sol deleted file mode 100644 index 10baf18e7..000000000 --- a/test/mocks/hooks/ReentrantSender.sol +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19; - -import { ISablierV2Lockup } from "../../../src/interfaces/ISablierV2Lockup.sol"; -import { ISablierV2LockupSender } from "../../../src/interfaces/hooks/ISablierV2LockupSender.sol"; - -contract ReentrantSender is ISablierV2LockupSender { - function onStreamCanceled( - uint256 streamId, - address recipient, - uint128 senderAmount, - uint128 recipientAmount - ) - external - { - streamId; - senderAmount; - recipient; - recipientAmount; - ISablierV2Lockup(msg.sender).cancel(streamId); - } -} diff --git a/test/mocks/hooks/RevertingSender.sol b/test/mocks/hooks/RevertingSender.sol deleted file mode 100644 index 1b4863d4e..000000000 --- a/test/mocks/hooks/RevertingSender.sol +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity >=0.8.19; - -import { ISablierV2LockupSender } from "../../../src/interfaces/hooks/ISablierV2LockupSender.sol"; - -contract RevertingSender is ISablierV2LockupSender { - function onStreamCanceled( - uint256 streamId, - address recipient, - uint128 senderAmount, - uint128 recipientAmount - ) - external - pure - { - streamId; - recipient; - senderAmount; - recipientAmount; - revert("You shall not pass"); - } -} diff --git a/test/unit/concrete/comptroller/Comptroller.t.sol b/test/unit/concrete/comptroller/Comptroller.t.sol index 4d1185ff6..635946627 100644 --- a/test/unit/concrete/comptroller/Comptroller.t.sol +++ b/test/unit/concrete/comptroller/Comptroller.t.sol @@ -16,7 +16,7 @@ contract Comptroller_Unit_Concrete_Test is Base_Test { if (!isTestOptimizedProfile()) { comptroller = new SablierV2Comptroller(users.admin); } else { - comptroller = deployPrecompiledComptroller(users.admin); + comptroller = deployOptimizedComptroller(users.admin); } vm.label({ account: address(comptroller), newLabel: "SablierV2Comptroller" }); } diff --git a/test/unit/concrete/nft-descriptor/generateSVG.t.sol b/test/unit/concrete/nft-descriptor/generateSVG.t.sol index e8a787a2e..8230c5970 100644 --- a/test/unit/concrete/nft-descriptor/generateSVG.t.sol +++ b/test/unit/concrete/nft-descriptor/generateSVG.t.sol @@ -8,10 +8,14 @@ import { SVGElements } from "src/libraries/SVGElements.sol"; import { NFTDescriptor_Unit_Concrete_Test } from "./NFTDescriptor.t.sol"; contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { + /// @dev If you need to update the hard-coded token URI: + /// 1. Use "vm.writeFile" to log the strings to a file. + /// 2. Remember to escape 'Courier New' with \'Courier New\'. function test_GenerateSVG_Pending() external { string memory actualSVG = nftDescriptorMock.generateSVG_( NFTSVG.SVGParams({ accentColor: "hsl(155,18%,30%)", + amount: "100", assetAddress: "0x03a6a84cd762d9707a21605b548aaab891562aab", assetSymbol: "DAI", duration: "5 Days", @@ -19,12 +23,11 @@ contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { progressNumerical: 0, sablierAddress: "0xf3a045dc986015be9ae43bb3462ae5981b0816e0", status: "Pending", - streamed: "0", streamingModel: "Lockup Linear" }) ); string memory expectedSVG = - unicode'Progress0%StatusPendingStreamed0Duration5 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; + unicode'Progress0%StatusPendingAmount100Duration5 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; assertEq(actualSVG, expectedSVG, "SVG mismatch"); } @@ -32,6 +35,7 @@ contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { string memory actualSVG = nftDescriptorMock.generateSVG_( NFTSVG.SVGParams({ accentColor: "hsl(114,3%,53%)", + amount: string.concat(SVGElements.SIGN_GE, " 1.23M"), assetAddress: "0x03a6a84cd762d9707a21605b548aaab891562aab", assetSymbol: "DAI", duration: "91 Days", @@ -39,12 +43,11 @@ contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { progressNumerical: 4235, sablierAddress: "0xf3a045dc986015be9ae43bb3462ae5981b0816e0", status: "Streaming", - streamed: string.concat(SVGElements.SIGN_GE, " 1.23M"), streamingModel: "Lockup Linear" }) ); string memory expectedSVG = - unicode'Progress42.35%StatusStreamingStreamed≥ 1.23MDuration91 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; + unicode'Progress42.35%StatusStreamingAmount≥ 1.23MDuration91 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; assertEq(actualSVG, expectedSVG, "SVG mismatch"); } @@ -52,6 +55,7 @@ contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { string memory actualSVG = nftDescriptorMock.generateSVG_( NFTSVG.SVGParams({ accentColor: "hsl(123,25%,44%)", + amount: "100", assetAddress: "0x03a6a84cd762d9707a21605b548aaab891562aab", assetSymbol: "DAI", duration: "5 Days", @@ -59,12 +63,11 @@ contract GenerateSVG_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Test { progressNumerical: 100, sablierAddress: "0xf3a045dc986015be9ae43bb3462ae5981b0816e0", status: "Depleted", - streamed: "100", streamingModel: "Lockup Linear" }) ); string memory expectedSVG = - unicode'Progress100%StatusDepletedStreamed100Duration5 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; + unicode'Progress100%StatusDepletedAmount100Duration5 Days0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0xf3a045dc986015be9ae43bb3462ae5981b0816e0 • Sablier V2 Lockup Linear0x03a6a84cd762d9707a21605b548aaab891562aab • DAI0x03a6a84cd762d9707a21605b548aaab891562aab • DAI'; assertEq(actualSVG, expectedSVG, "SVG mismatch"); } } diff --git a/test/unit/concrete/nft-descriptor/hourglass.t.sol b/test/unit/concrete/nft-descriptor/hourglass.t.sol index 257ebbd90..4c67580de 100644 --- a/test/unit/concrete/nft-descriptor/hourglass.t.sol +++ b/test/unit/concrete/nft-descriptor/hourglass.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { LibString } from "solady/utils/LibString.sol"; +import { LibString } from "solady/src/utils/LibString.sol"; import { SVGElements } from "src/libraries/SVGElements.sol"; diff --git a/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol b/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol index 2b75e9abf..9f5797882 100644 --- a/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol +++ b/test/unit/concrete/nft-descriptor/stringifyCardType.t.sol @@ -9,7 +9,7 @@ contract StringifyCardType_Unit_Concrete_Test is NFTDescriptor_Unit_Concrete_Tes function test_StringifyCardType() external { assertEq(nftDescriptorMock.stringifyCardType_(SVGElements.CardType.PROGRESS), "Progress"); assertEq(nftDescriptorMock.stringifyCardType_(SVGElements.CardType.STATUS), "Status"); - assertEq(nftDescriptorMock.stringifyCardType_(SVGElements.CardType.STREAMED), "Streamed"); + assertEq(nftDescriptorMock.stringifyCardType_(SVGElements.CardType.AMOUNT), "Amount"); assertEq(nftDescriptorMock.stringifyCardType_(SVGElements.CardType.DURATION), "Duration"); } } diff --git a/test/utils/Assertions.sol b/test/utils/Assertions.sol index ebd3020c0..f4f86cd5c 100644 --- a/test/utils/Assertions.sol +++ b/test/utils/Assertions.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { PRBMathAssertions } from "@prb/math/src/test/Assertions.sol"; -import { PRBTest } from "@prb/test/PRBTest.sol"; +import { PRBMathAssertions } from "@prb/math/test/utils/Assertions.sol"; +import { PRBTest } from "@prb/test/src/PRBTest.sol"; import { Lockup, LockupDynamic, LockupLinear } from "../../src/types/DataTypes.sol"; @@ -47,6 +47,7 @@ abstract contract Assertions is PRBTest, PRBMathAssertions { assertEq(a.endTime, b.endTime, "endTime"); assertEq(a.isCancelable, b.isCancelable, "isCancelable"); assertEq(a.isDepleted, b.isDepleted, "isDepleted"); + assertEq(a.isTransferable, b.isTransferable, "isTransferable"); assertEq(a.isStream, b.isStream, "isStream"); assertEq(a.sender, b.sender, "sender"); assertEq(a.startTime, b.startTime, "startTime"); @@ -59,6 +60,7 @@ abstract contract Assertions is PRBTest, PRBMathAssertions { assertEq(a.endTime, b.endTime, "endTime"); assertEq(a.isCancelable, b.isCancelable, "isCancelable"); assertEq(a.isDepleted, b.isDepleted, "isDepleted"); + assertEq(a.isTransferable, b.isTransferable, "isTransferable"); assertEq(a.isStream, b.isStream, "isStream"); assertEq(a.segments, b.segments, "segments"); assertEq(a.sender, b.sender, "sender"); diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol index cfc5061a7..3c5d16699 100644 --- a/test/utils/Defaults.sol +++ b/test/utils/Defaults.sol @@ -104,6 +104,7 @@ contract Defaults is Constants { isCancelable: true, isDepleted: false, isStream: true, + isTransferable: true, segments: segments(), sender: users.sender, startTime: START_TIME, @@ -122,6 +123,7 @@ contract Defaults is Constants { cliffTime: CLIFF_TIME, endTime: END_TIME, isCancelable: true, + isTransferable: true, isDepleted: false, isStream: true, sender: users.sender, @@ -185,6 +187,7 @@ contract Defaults is Constants { asset: asset, broker: broker(), cancelable: true, + transferable: true, recipient: users.recipient, segments: segmentsWithDeltas(), sender: users.sender, @@ -197,6 +200,7 @@ contract Defaults is Constants { asset: asset, broker: broker(), cancelable: true, + transferable: true, durations: durations(), recipient: users.recipient, sender: users.sender, @@ -209,6 +213,7 @@ contract Defaults is Constants { asset: asset, broker: broker(), cancelable: true, + transferable: true, recipient: users.recipient, segments: segments(), sender: users.sender, @@ -222,6 +227,7 @@ contract Defaults is Constants { asset: asset, broker: broker(), cancelable: true, + transferable: true, range: lockupLinearRange(), recipient: users.recipient, sender: users.sender, diff --git a/test/utils/DeployOptimized.sol b/test/utils/DeployOptimized.sol new file mode 100644 index 000000000..6891b70cf --- /dev/null +++ b/test/utils/DeployOptimized.sol @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity >=0.8.19 <0.9.0; + +import { StdCheats } from "forge-std/src/StdCheats.sol"; + +import { ISablierV2Comptroller } from "../../src/interfaces/ISablierV2Comptroller.sol"; +import { ISablierV2LockupDynamic } from "../../src/interfaces/ISablierV2LockupDynamic.sol"; +import { ISablierV2LockupLinear } from "../../src/interfaces/ISablierV2LockupLinear.sol"; +import { ISablierV2NFTDescriptor } from "../../src/interfaces/ISablierV2NFTDescriptor.sol"; + +abstract contract DeployOptimized is StdCheats { + /// @dev Deploys {SablierV2Comptroller} from an optimized source compiled with `--via-ir`. + function deployOptimizedComptroller(address initialAdmin) internal returns (ISablierV2Comptroller) { + return ISablierV2Comptroller( + deployCode("out-optimized/SablierV2Comptroller.sol/SablierV2Comptroller.json", abi.encode(initialAdmin)) + ); + } + + /// @dev Deploys {SablierV2LockupDynamic} from an optimized source compiled with `--via-ir`. + function deployOptimizedLockupDynamic( + address initialAdmin, + ISablierV2Comptroller comptroller_, + ISablierV2NFTDescriptor nftDescriptor_, + uint256 maxSegmentCount + ) + internal + returns (ISablierV2LockupDynamic) + { + return ISablierV2LockupDynamic( + deployCode( + "out-optimized/SablierV2LockupDynamic.sol/SablierV2LockupDynamic.json", + abi.encode(initialAdmin, address(comptroller_), address(nftDescriptor_), maxSegmentCount) + ) + ); + } + + /// @dev Deploys {SablierV2LockupLinear} from an optimized source compiled with `--via-ir`. + function deployOptimizedLockupLinear( + address initialAdmin, + ISablierV2Comptroller comptroller_, + ISablierV2NFTDescriptor nftDescriptor_ + ) + internal + returns (ISablierV2LockupLinear) + { + return ISablierV2LockupLinear( + deployCode( + "out-optimized/SablierV2LockupLinear.sol/SablierV2LockupLinear.json", + abi.encode(initialAdmin, address(comptroller_), address(nftDescriptor_)) + ) + ); + } + + /// @dev Deploys {SablierV2NFTDescriptor} from an optimized source compiled with `--via-ir`. + function deployOptimizedNFTDescriptor() internal returns (ISablierV2NFTDescriptor) { + return + ISablierV2NFTDescriptor(deployCode("out-optimized/SablierV2NFTDescriptor.sol/SablierV2NFTDescriptor.json")); + } + + function deployOptimizedCore( + address initialAdmin, + uint256 maxSegmentCount + ) + internal + returns ( + ISablierV2Comptroller comptroller_, + ISablierV2LockupDynamic lockupDynamic_, + ISablierV2LockupLinear lockupLinear_, + ISablierV2NFTDescriptor nftDescriptor_ + ) + { + comptroller_ = deployOptimizedComptroller(initialAdmin); + nftDescriptor_ = deployOptimizedNFTDescriptor(); + lockupDynamic_ = deployOptimizedLockupDynamic(initialAdmin, comptroller_, nftDescriptor_, maxSegmentCount); + lockupLinear_ = deployOptimizedLockupLinear(initialAdmin, comptroller_, nftDescriptor_); + } +} diff --git a/test/utils/Events.sol b/test/utils/Events.sol index fccfbeed3..13192c7a9 100644 --- a/test/utils/Events.sol +++ b/test/utils/Events.sol @@ -69,9 +69,10 @@ abstract contract Events { //////////////////////////////////////////////////////////////////////////*/ event CancelLockupStream( - uint256 indexed streamId, + uint256 streamId, address indexed sender, address indexed recipient, + IERC20 indexed asset, uint128 senderAmount, uint128 recipientAmount ); @@ -82,7 +83,7 @@ abstract contract Events { address indexed admin, ISablierV2NFTDescriptor oldNFTDescriptor, ISablierV2NFTDescriptor newNFTDescriptor ); - event WithdrawFromLockupStream(uint256 indexed streamId, address indexed to, uint128 amount); + event WithdrawFromLockupStream(uint256 indexed streamId, address indexed to, IERC20 indexed asset, uint128 amount); /*////////////////////////////////////////////////////////////////////////// SABLIER-V2-LOCKUP-DYNAMIC @@ -96,6 +97,7 @@ abstract contract Events { Lockup.CreateAmounts amounts, IERC20 indexed asset, bool cancelable, + bool transferable, LockupDynamic.Segment[] segments, LockupDynamic.Range range, address broker @@ -113,6 +115,7 @@ abstract contract Events { Lockup.CreateAmounts amounts, IERC20 indexed asset, bool cancelable, + bool transferable, LockupLinear.Range range, address broker ); diff --git a/test/utils/Precompiles.sol b/test/utils/Precompiles.sol index 3c423b253..f04592286 100644 --- a/test/utils/Precompiles.sol +++ b/test/utils/Precompiles.sol @@ -25,13 +25,13 @@ contract Precompiles { //////////////////////////////////////////////////////////////////////////*/ bytes public constant BYTECODE_COMPTROLLER = - hex"60803461009857601f6104a638819003918201601f19168301916001600160401b0383118484101761009d5780849260209460405283398101031261009857516001600160a01b0381169081900361009857600080546001600160a01b0319168217815560405191907fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a36103f290816100b48239f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe608060408181526004918236101561001657600080fd5b600092833560e01c9182634d81e51d1461039d5750816375829def146102e5578163907a267b14610253578163b5b3ca2c146101ab578163cb01e30e146100f957508063dcf844a7146100c3578063e07df5b4146100a55763f851a4401461007d57600080fd5b346100a157816003193601126100a1576001600160a01b0360209254169051908152f35b5080fd5b50346100a157816003193601126100a1576020906001549051908152f35b50346100a15760203660031901126100a157806020926001600160a01b036100e96103d7565b1681526003845220549051908152f35b9050346101a75760203660031901126101a7576101146103d7565b6001600160a01b03918285541633810361017a575050169081835260026020528083209081549160ff8316159260ff84169060ff1916179055519081527f8cd3a7bc46b26a3b0c07a05a47af78abcaa647626f631d92ea64f8867b23bbec60203392a380f35b84516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b8280fd5b9050346101a757816003193601126101a7576101c56103d7565b90602435916001600160a01b039182865416338103610226575050907f371789a3d97098f3070492613273a065a7e8a19e009fd1ae92a4b4d4c71ed62d9116928385526003602052808520928084549455815193845260208401523392a380f35b85516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b919050346101a75760203660031901126101a7578135916001600160a01b038454163381036102b85750507fc059ba3e07a1c4d1fa8845bdb2af2dd85e844684e0a59e6073499e4338788465906001549280600155815193845260208401523392a280f35b82516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b919050346101a75760203660031901126101a7578135916001600160a01b03918284168094036103995784549283169033820361036d575050507fffffffffffffffffffffffff00000000000000000000000000000000000000001681178255337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808380a380f35b516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b8480fd5b849084346101a75760203660031901126101a75760ff906020936001600160a01b036103c76103d7565b1681526002855220541615158152f35b600435906001600160a01b03821682036103ed57565b600080fd"; + hex"60803461009857601f6104b338819003918201601f19168301916001600160401b0383118484101761009d5780849260209460405283398101031261009857516001600160a01b0381169081900361009857600080546001600160a01b0319168217815560405191907fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a36103ff90816100b48239f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe608060408181526004918236101561001657600080fd5b600092833560e01c9182634d81e51d1461039d5750816375829def146102e5578163907a267b14610253578163b5b3ca2c146101ab578163cb01e30e146100f957508063dcf844a7146100c3578063e07df5b4146100a55763f851a4401461007d57600080fd5b346100a157816003193601126100a1576001600160a01b0360209254169051908152f35b5080fd5b50346100a157816003193601126100a1576020906001549051908152f35b50346100a15760203660031901126100a157806020926001600160a01b036100e96103d7565b1681526003845220549051908152f35b9050346101a75760203660031901126101a7576101146103d7565b6001600160a01b03918285541633810361017a575050169081835260026020528083209081549160ff8316159260ff84169060ff1916179055519081527f8cd3a7bc46b26a3b0c07a05a47af78abcaa647626f631d92ea64f8867b23bbec60203392a380f35b84516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b8280fd5b9050346101a757816003193601126101a7576101c56103d7565b90602435916001600160a01b039182865416338103610226575050907f371789a3d97098f3070492613273a065a7e8a19e009fd1ae92a4b4d4c71ed62d9116928385526003602052808520928084549455815193845260208401523392a380f35b85516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b919050346101a75760203660031901126101a7578135916001600160a01b038454163381036102b85750507fc059ba3e07a1c4d1fa8845bdb2af2dd85e844684e0a59e6073499e4338788465906001549280600155815193845260208401523392a280f35b82516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b919050346101a75760203660031901126101a7578135916001600160a01b03918284168094036103995784549283169033820361036d575050507fffffffffffffffffffffffff00000000000000000000000000000000000000001681178255337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808380a380f35b516331b339a960e21b81526001600160a01b039091169181019182523360208301529081906040010390fd5b8480fd5b849084346101a75760203660031901126101a75760ff906020936001600160a01b036103c76103d7565b1681526002855220541615158152f35b600435906001600160a01b03821682036103ed57565b600080fdfea164736f6c6343000815000a"; bytes public constant BYTECODE_LOCKUP_DYNAMIC = - hex"60c0346200046e57601f62005ccb38819003918201601f19168301916001600160401b038311848410176200032b578084926080946040528339810103126200046e5780516001600160a01b038082169290918390036200046e5760208101518281168091036200046e5760408201519183831683036200046e5760600151936200008962000473565b90601d82527f5361626c696572205632204c6f636b75702044796e616d6963204e46540000006020830152620000be62000473565b601181527029a0a116ab1916a627a1a5aaa816a22ca760791b602082015230608052600080546001600160a01b03199081168417825560018054909116909517909455927fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a38051906001600160401b0382116200032b5760035490600182811c9216801562000463575b60208310146200044d5781601f849311620003d8575b50602090601f83116001146200034d5760009262000341575b50508160011b916000199060031b1c1916176003555b80516001600160401b0381116200032b576004918254600181811c9116801562000320575b60208210146200030b579081601f849311620002b3575b50602090601f831160011462000248576000926200023c575b50508160011b916000199060031b1c19161790555b1660018060a01b0319600a541617600a5560a0526001600955604051615837908162000494823960805181615243015260a05181818161122701526148170152f35b015190503880620001e5565b6000858152602081209350601f198516905b8181106200029a575090846001959493921062000280575b505050811b019055620001fa565b015160001960f88460031b161c1916905538808062000272565b929360206001819287860151815501950193016200025a565b909150836000526020600020601f840160051c8101916020851062000300575b90601f859493920160051c01905b818110620002f05750620001cc565b60008155849350600101620002e1565b9091508190620002d3565b602284634e487b7160e01b6000525260246000fd5b90607f1690620001b5565b634e487b7160e01b600052604160045260246000fd5b0151905038806200017a565b600360009081527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b9350601f198516905b818110620003bf5750908460019594939210620003a5575b505050811b0160035562000190565b015160001960f88460031b161c1916905538808062000396565b929360206001819287860151815501950193016200037e565b60036000529091507fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b601f840160051c8101916020851062000442575b90601f859493920160051c01905b81811062000432575062000161565b6000815584935060010162000423565b909150819062000415565b634e487b7160e01b600052602260045260246000fd5b91607f16916200014b565b600080fd5b60408051919082016001600160401b038111838210176200032b5760405256fe608080604052600436101561001357600080fd5b60003560e01c90816301ffc9a7146129da5750806306fdde0314612917578063081812fc146128f9578063095ea7b3146127655780631400ecec146126c05780631c1cdd4c1461265a5780631e99d5691461263c57806321714be11461253f57806323b872dd1461251657806339a73c03146124d357806340e58ee514612132578063425d30dd1461211457806342842e0e146120c457806342966c6814611fd45780634857501f14611f5e5780634869e12d14611f225780635fe3b56714611efb5780636352211e14611ecc5780636d0cee7514611e7457806370a0823114611dca57806375829def14611d385780637cad6cd114611c665780637de6b1db14611a3d5780638659c270146115e5578063894e9a0d1461139c5780638bad38dd146113205780638f69b9931461129d5780639067b6771461124a5780639188ec841461120f57806395d89b4114611101578063a22cb46514611030578063a2ffb89714610f37578063a6202bf214610e2e578063a80fc07114610dd9578063ad35efd414610d76578063b637b86514610d16578063b88d4fde14610c8b578063b8a3be6614610c54578063b971302a14610c02578063bc063e1a14610bdf578063bc2be1be14610b8c578063bf061d0a1461091f578063c156a11d14610842578063c87b56dd1461070f578063cc364f4814610674578063d4dbd20b1461061f578063d511609f146105d0578063d975dfed14610583578063e985e9c51461052c578063ea5ead19146104e4578063eac8f5b814610478578063f590c17614610450578063f851a440146104295763fdd46d601461027157600080fd5b346104245760603660031901126104245760043561028d612b07565b604435906001600160801b038216808303610424576102aa615239565b6102b384613351565b61040c576102d784600052600b6020526001600160a01b0360406000205416331490565b15806103fc575b6103d95761030284600052600b6020526001600160a01b0360406000205416331490565b806103b5575b610388576001600160a01b0382161561035e5715610346579161033d6020926000805160206158178339815191529483615454565b604051908152a1005b6024836040519063d2aabcd960e01b82526004820152fd5b60046040517fc61a0e9e000000000000000000000000000000000000000000000000000000008152fd5b6064846001600160a01b038460405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b508360005260056020526001600160a01b0380604060002054169083161415610308565b60405163216caf0d60e01b815260048101859052336024820152604490fd5b0390fd5b506104068461566e565b156102de565b60248460405190634a5541ef60e01b82526004820152fd5b600080fd5b346104245760003660031901126104245760206001600160a01b0360005416604051908152f35b3461042457602036600319011261042457602061046e6004356133a1565b6040519015158152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260206001600160a01b0360016040600020015416604051908152f35b6024906040519062b8e7e760e51b82526004820152fd5b3461042457604036600319011261042457600080516020615817833981519152602060043561033d610514612b07565b61051d836152fb565b90610526615239565b83615333565b3461042457604036600319011261042457610545612af1565b61054d612b07565b906001600160a01b03809116600052600860205260406000209116600052602052602060ff604060002054166040519015158152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd576105bf6020916152fb565b6001600160801b0360405191168152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b602052602060026040600020015460801c604051908152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260206001600160801b0360036040600020015416604051908152f35b34610424576020366003190112610424576004356000602060405161069881612c34565b828152015280600052600b60205260ff60016040600020015460a81c16156104cd57600052600b602052604080600020548151906106d582612c34565b64ffffffffff90818160a01c16835260c81c16602082015261070d825180926020908164ffffffffff91828151168552015116910152565bf35b3461042457602080600319360112610424576004359061074d6107488360005260056020526001600160a01b0360406000205416151590565b612cd3565b60006001600160a01b03600a5416926044604051809581937fe9dc637500000000000000000000000000000000000000000000000000000000835230600484015260248301525afa918215610836576000926107bd575b506107b9604051928284938452830190612acc565b0390f35b9091503d806000833e6107d08183612c81565b81019082818303126104245780519067ffffffffffffffff8211610424570181601f8201121561042457805161080581612ca3565b926108136040519485612c81565b8184528482840101116104245761082f91848085019101612aa9565b90826107a4565b6040513d6000823e3d90fd5b346104245760403660031901126104245760043561085e612b07565b610866615239565b81600052600b60205260ff60016040600020015460a81c1615610908578160005260056020526001600160a01b03604060002054168033036108e9579161033d81602093600080516020615817833981519152956108c3836152fb565b6001600160801b0381166108d8575b50612f66565b6108e3908285615454565b876108d2565b60405163216caf0d60e01b815260048101849052336024820152604490fd5b6024826040519062b8e7e760e51b82526004820152fd5b3461042457602060031981813601126104245760043567ffffffffffffffff9182821161042457610100823603918201126104245761095c615239565b60e48201359060221901811215610424578101600481013590838211610424576024016060820236038113610424576109969136916133e4565b908151906109a382613258565b916109b16040519384612c81565b808352601f196109c082613258565b018660005b828110610b765750505064ffffffffff90814216956001600160801b0395866109ed82613545565b515116828a6109fb84613545565b5101511685806040610a0c86613545565b510151168b01169060405192610a2184612c18565b83528b8301526040820152610a3587613545565b52610a3f86613545565b5060019386855b898c878310610af5578c82856001600160a01b038d6084810135828116908190036104245760248201359485151580960361042457610aed96610ade94610a8f60448601613483565b610a9b86600401613483565b98610aa860648801613497565b93836040519b610ab78d612bfb565b168b528c8b015260408a015216606088015216608086015260a085015260a43691016134ab565b60c083015260e0820152614769565b604051908152f35b889385806040610b298b86610b198a8e9a610b10828d613568565b5151169a613568565b5101511694600019890190613568565b51015116816040610b3a888c613568565b5101511601169160405193610b4e85612c18565b84528301526040820152610b62828b613568565b52610b6d818a613568565b50018790610a46565b610b7e6132fe565b8282880101520187906109c5565b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b602052602064ffffffffff60406000205460a01c16604051908152f35b3461042457600036600319011261042457602060405167016345785d8a00008152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260206001600160a01b0360406000205416604051908152f35b3461042457602036600319011261042457600435600052600b602052602060ff60016040600020015460a81c166040519015158152f35b3461042457608036600319011261042457610ca4612af1565b610cac612b07565b6064359167ffffffffffffffff8311610424573660238401121561042457826004013591610cd983612ca3565b92610ce76040519485612c81565b8084523660248287010111610424576020816000926024610d149801838801378501015260443591612df1565b005b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b6020526107b9610d626004604060002001613270565b604051918291602083526020830190612b97565b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57610db09061466d565b6040516005821015610dc3576020918152f35b634e487b7160e01b600052602160045260246000fd5b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260206001600160801b0360026040600020015416604051908152f35b3461042457602036600319011261042457610e47612af1565b6001600160a01b038060005416338103610f0e57508116908160005260026020526001600160801b0360406000205416908115610edd5781610eaf9184600052600260205260406000206fffffffffffffffffffffffffffffffff1981541690553390615295565b6040519081527fca7a4a65a94ed2f37538814e00e1cd4c41a78261561e3f3794592f11409cf5af60203392a3005b602483604051907f8410168c0000000000000000000000000000000000000000000000000000000082526004820152fd5b6040516331b339a960e21b81526001600160a01b03919091166004820152336024820152604490fd5b346104245760603660031901126104245767ffffffffffffffff60043581811161042457610f69903690600401612b66565b610f71612b07565b9260443590811161042457610f8a903690600401612b66565b9190610f94615239565b828203610ff95760005b828110610fa757005b806000805160206158178339815191526020610fc6600194878a615323565b35610fec610fdd610fd8868b8a615323565b613497565b610fe5615239565b8b83615333565b604051908152a101610f9e565b50604491604051917faec9344000000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b3461042457604036600319011261042457611049612af1565b60243590811515809203610424576001600160a01b0316908133146110bd57336000526008602052604060002082600052602052604060002060ff1981541660ff83161790556040519081527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3160203392a3005b606460405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c6572000000000000006044820152fd5b3461042457600036600319011261042457604051600060045490600182811c91818416918215611205575b60209485851084146111ef5785879486865291826000146111cf575050600114611172575b5061115e92500383612c81565b6107b9604051928284938452830190612acc565b84915060046000527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b906000915b8583106111b757505061115e935082010185611151565b805483890185015287945086939092019181016111a0565b60ff19168582015261115e95151560051b85010192508791506111519050565b634e487b7160e01b600052602260045260246000fd5b92607f169261112c565b346104245760003660031901126104245760206040517f00000000000000000000000000000000000000000000000000000000000000008152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd57600052600b602052602064ffffffffff60406000205460c81c16604051908152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd576112d79061466d565b600581101580610dc35760028214908115611313575b8115611301575b6020826040519015158152f35b9050610dc357600460209114826112f4565b50506003811460006112ed565b34610424576020366003190112610424576004356001600160a01b0390818116809103610424578160005416338103610f0e575060015491816001600160a01b03198416176001556040519216825260208201527fdcb09aef4bf01068924ccce937981cbe59d25ba08380cf941aaaea4e4bd3960d60403392a2005b346104245760203660031901126104245760606101206040516113be81612c50565b60008152600060208201526000604082015260008382015260006080820152600060a0820152600060c0820152600060e08201526113fa6132fe565b6101008201520152600435600052600b60205260ff60016040600020015460a81c16156115cd57600435600052600b60205260406000206114cf60046040519261144384612c50565b80546001600160a01b038116855264ffffffffff8160a01c16602086015264ffffffffff8160c81c16604086015260ff8160f01c161515606086015260f81c1515608085015260ff60018201546001600160a01b03811660a0870152818160a01c16151560c087015260a81c16151560e08501526114c36002820161331d565b61010085015201613270565b6101208201526114e060043561466d565b906005821015610dc357600261012092146115c1575b6107b9604051928392602084526001600160a01b03815116602085015264ffffffffff602082015116604085015264ffffffffff60408201511660608501526060810151151560808501526080810151151560a08501526001600160a01b0360a08201511660c085015260c0810151151560e085015260e081015115156101008501526115ad61010082015183860190604090816001600160801b0391828151168552826020820151166020860152015116910152565b0151610180808401526101a0830190612b97565b600060608201526114f6565b602460405162b8e7e760e51b81526004356004820152fd5b34610424576020806003193601126104245760043567ffffffffffffffff811161042457611617903690600401612b66565b90611620615239565b6000915b80831061162d57005b611638838284615323565b3592611642615239565b61164b84613351565b156116685760248460405190634a5541ef60e01b82526004820152fd5b611674849293946133a1565b611a255761169882600052600b6020526001600160a01b0360406000205416331490565b1580611a05575b6119e6576116ac826134da565b82600052600b928387526116c6600260406000200161331d565b936001600160801b03928386511684821610156119ce578260005281895260ff60406000205460f01c16156119b6579061171582858b61170b819796838c5116613388565b9901511690613388565b93826000528184526040600020966003885498600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8b161781558388161561199c575b0191811691826fffffffffffffffffffffffffffffffff198254161790556117a86001600160a01b03809916926005875289604060002054169487528360019a8b6040600020015416615295565b3382036118b957823b611815575b7f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd26000805160206158178339815191529685925b604080516001600160801b03928316815292909116602083015290a4604051908152a1019190611624565b9350813b15610424576040516372eba20360e01b8152600481018490526001600160a01b03821660248201526001600160801b03858116604483015286166064820152600080516020615817833981519152958b9585927f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd2929190600081608481838b5af16118aa575b5092509650506117b6565b6118b390612c6d565b8e61189f565b813b6118f8575b7f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd26000805160206158178339815191529685926117ea565b9350803b15610424576040516372eba20360e01b8152600481018490526001600160a01b03831660248201526001600160801b03858116604483015286166064820152600080516020615817833981519152958b9585927f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd2929190600081608481838a5af161198d575b5092509650506118c0565b61199690612c6d565b8e611982565b60018101600160a01b60ff60a01b1982541617905561175a565b602483604051906339c6dc7360e21b82526004820152fd5b602483604051906322cad1af60e11b82526004820152fd5b60405163216caf0d60e01b815260048101839052336024820152604490fd5b5081600052600585526001600160a01b036040600020541633141561169f565b6024826040519063fe19f19f60e01b82526004820152fd5b346104245760208060031936011261042457600435611a5a615239565b80600052600b825260ff60016040600020015460a81c16156104cd57611a7f8161466d565b916000926005811015610dc35760048103611aac5760248360405190634a5541ef60e01b82526004820152fd5b60038103611acc576024836040519063fe19f19f60e01b82526004820152fd5b916002849314611c4e57611af681600052600b6020526001600160a01b0360406000205416331490565b15611c2e5780600052600b825260ff60406000205460f01c1615611c165780600052600b8252604060002060ff60f01b198154169055600582526001600160a01b0360406000205416803b611b84575b50807f0eb069207093cd3e51cd1370d2d369770057fbe29947e577e5fb428c6c6fc78f8460008051602061581783398151915295a2604051908152a1005b803b15610424576000805160206158178339815191529360008084936024604051809481937f341a0bd90000000000000000000000000000000000000000000000000000000083528860048401525af1611be1575b509350611b46565b9050611bed9150612c6d565b8060007f0eb069207093cd3e51cd1370d2d369770057fbe29947e577e5fb428c6c6fc78f611bd9565b602490604051906339c6dc7360e21b82526004820152fd5b60405163216caf0d60e01b81526004810191909152336024820152604490fd5b602490604051906322cad1af60e11b82526004820152fd5b34610424576020366003190112610424576004356001600160a01b0390818116809103610424578160005416338103610f0e5750600a5491816001600160a01b0319841617600a556040519216825260208201527fa2548bd4b805e907c1558a47b5858324fe8bb4a2e1ddfca647eecbf65610eebc60403392a26009546000198101908111611d225760407f6bd5c950a8d8df17f772f5af37cb3655737899cbf903264b9795592da439661c91815190600182526020820152a1005b634e487b7160e01b600052601160045260246000fd5b3461042457602036600319011261042457611d51612af1565b6000546001600160a01b0380821692338403611da3576001600160a01b03199350169182911617600055337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf80600080a3005b6040516331b339a960e21b81526001600160a01b0385166004820152336024820152604490fd5b34610424576020366003190112610424576001600160a01b03611deb612af1565b168015611e0a5760005260066020526020604060002054604051908152f35b608460405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f74206120766160448201527f6c6964206f776e657200000000000000000000000000000000000000000000006064820152fd5b3461042457602036600319011261042457600435611eab6107488260005260056020526001600160a01b0360406000205416151590565b600052600560205260206001600160a01b0360406000205416604051908152f35b34610424576020366003190112610424576020611eea600435612d1e565b6001600160a01b0360405191168152f35b346104245760003660031901126104245760206001600160a01b0360015416604051908152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd576105bf6020916146ee565b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd576000611f9a8261466d565b6005811015610dc357600203611fb8575b6020906040519015158152f35b50600052600b602052602060ff60406000205460f01c16611fab565b3461042457602036600319011261042457600435611ff0615239565b611ff981613351565b15612093576120078161566e565b15611c2e5761201581612d1e565b50600061202182612d1e565b82825260076020526001600160a01b0360408320916001600160a01b0319928381541690551690818352600660205260408320831981540190558383526005602052604083209081541690557fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8280a4005b602490604051907f817cd6390000000000000000000000000000000000000000000000000000000082526004820152fd5b34610424576120d236612b31565b60405191602083019383851067ffffffffffffffff8611176120fe57610d149460405260008452612df1565b634e487b7160e01b600052604160045260246000fd5b3461042457602036600319011261042457602061046e600435613351565b34610424576020806003193601126104245760043590612150615239565b61215982613351565b156121765760248260405190634a5541ef60e01b82526004820152fd5b61217f826133a1565b611a25576121a382600052600b6020526001600160a01b0360406000205416331490565b15806124b3575b6119e6576121b7826134da565b9180600052600b82526121d0600260406000200161331d565b926001600160801b03908185511682821610156119ce5782600052600b845260ff60406000205460f01c16156119b65780828561221361221d94838a5116613388565b9701511690613388565b9082600052600b84526040600020916003835493600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff861617815583831615612499575b0191861691826fffffffffffffffffffffffffffffffff198254161790556122b16001600160a01b03809416926005875283856040600020541695600b895260016040600020015416615295565b3382036123b957823b612318575b7f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd28491600080516020615817833981519152975b604080516001600160801b03928316815292909116602083015290a4604051908152a1005b823b15610424576040516372eba20360e01b8152600481018590526001600160a01b03831660248201526001600160801b038781166044830152821660648201526000805160206158178339815191529685927f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd292909190600081608481838b5af16123aa575b5097509150506122bf565b6123b390612c6d565b8961239f565b813b6123f8575b7f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd28491600080516020615817833981519152976122f3565b813b15610424576040516372eba20360e01b8152600481018590526001600160a01b03841660248201526001600160801b038781166044830152821660648201526000805160206158178339815191529685927f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd292909190600081608481838a5af161248a575b5097509150506123c0565b61249390612c6d565b8961247f565b60018101600160a01b60ff60a01b19825416179055612263565b5081600052600581526001600160a01b03604060002054163314156121aa565b34610424576020366003190112610424576001600160a01b036124f4612af1565b16600052600260205260206001600160801b0360406000205416604051908152f35b3461042457610d1461252736612b31565b9161253a6125358433612e87565b612d80565b612f66565b3461042457600319602036820112610424576004359067ffffffffffffffff90818311610424576101209083360301126104245761257b615239565b6040519161258883612bfb565b61259481600401612b1d565b83526125a2602482016133d2565b6020840152604481013580151581036104245760408401526125c660648201612b1d565b60608401526125d760848201612cbf565b60808401526125e860a48201612b1d565b60a08401526125fa3660c483016134ab565b60c084015261010481013591821161042457013660238201121561042457602091612632610aed9236906024600482013591016133e4565b60e0820152614769565b34610424576000366003190112610424576020600954604051908152f35b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd576126949061466d565b6005811015610dc35780602091159081156126b5575b506040519015158152f35b6001915014826126aa565b346104245760203660031901126104245760043580600052600b60205260ff60016040600020015460a81c16156104cd5760209060009080600052600b8352604060002060ff815460f01c1680612753575b61272a575b50506001600160801b0360405191168152f35b61274c92506001600160801b03600261274692015416916134da565b90613388565b8280612717565b5060ff600182015460a01c1615612712565b346104245760403660031901126104245761277e612af1565b602435906001600160a01b03808061279585612d1e565b1692169180831461288f5780331490811561286a575b5015612800578260005260076020526040600020826001600160a01b03198254161790556127d883612d1e565b167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600080a4005b608460405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c0000006064820152fd5b9050600052600860205260406000203360005260205260ff60406000205416846127ab565b608460405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560448201527f72000000000000000000000000000000000000000000000000000000000000006064820152fd5b34610424576020366003190112610424576020611eea600435612d43565b3461042457600036600319011261042457604051600060035490600182811c918184169182156129d0575b60209485851084146111ef5785879486865291826000146111cf575050600114612973575061115e92500383612c81565b84915060036000527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b906000915b8583106129b857505061115e935082010185611151565b805483890185015287945086939092019181016129a1565b92607f1692612942565b3461042457602036600319011261042457600435907fffffffff00000000000000000000000000000000000000000000000000000000821680920361042457817f80ac58cd0000000000000000000000000000000000000000000000000000000060209314908115612a7f575b8115612a55575b5015158152f35b7f01ffc9a70000000000000000000000000000000000000000000000000000000091501483612a4e565b7f5b5e139f0000000000000000000000000000000000000000000000000000000081149150612a47565b60005b838110612abc5750506000910152565b8181015183820152602001612aac565b90602091612ae581518092818552858086019101612aa9565b601f01601f1916010190565b600435906001600160a01b038216820361042457565b602435906001600160a01b038216820361042457565b35906001600160a01b038216820361042457565b6060906003190112610424576001600160a01b0390600435828116810361042457916024359081168103610424579060443590565b9181601f840112156104245782359167ffffffffffffffff8311610424576020808501948460051b01011161042457565b90815180825260208080930193019160005b828110612bb7575050505090565b835180516001600160801b031686528083015167ffffffffffffffff168684015260409081015164ffffffffff169086015260609094019392810192600101612ba9565b610100810190811067ffffffffffffffff8211176120fe57604052565b6060810190811067ffffffffffffffff8211176120fe57604052565b6040810190811067ffffffffffffffff8211176120fe57604052565b610140810190811067ffffffffffffffff8211176120fe57604052565b67ffffffffffffffff81116120fe57604052565b90601f8019910116810190811067ffffffffffffffff8211176120fe57604052565b67ffffffffffffffff81116120fe57601f01601f191660200190565b35906001600160801b038216820361042457565b15612cda57565b606460405162461bcd60e51b815260206004820152601860248201527f4552433732313a20696e76616c696420746f6b656e20494400000000000000006044820152fd5b60005260056020526001600160a01b0360406000205416612d40811515612cd3565b90565b612d666107488260005260056020526001600160a01b0360406000205416151590565b60005260076020526001600160a01b036040600020541690565b15612d8757565b608460405162461bcd60e51b815260206004820152602d60248201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560448201527f72206f7220617070726f766564000000000000000000000000000000000000006064820152fd5b90612e15939291612e056125358433612e87565b612e10838383612f66565b6130bd565b15612e1c57565b60405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b906001600160a01b038080612e9b84612d1e565b16931691838314938415612ece575b508315612eb8575b50505090565b612ec491929350612d43565b1614388080612eb2565b909350600052600860205260406000208260005260205260ff604060002054169238612eaa565b15612efc57565b608460405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201527f6f776e65720000000000000000000000000000000000000000000000000000006064820152fd5b90612f8e91612f7484612d1e565b916001600160a01b03938493848094169485911614612ef5565b169182156130245781612fab91612fa486612d1e565b1614612ef5565b7fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60008481526007602052604081206001600160a01b03199081815416905583825260066020526040822060001981540190558482526040822060018154019055858252600560205284604083209182541617905580a4565b608460405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f2061646460448201527f72657373000000000000000000000000000000000000000000000000000000006064820152fd5b3d156130b8573d9061309e82612ca3565b916130ac6040519384612c81565b82523d6000602084013e565b606090565b91926000929190813b1561324e5760209161312d91856040519586809581947f150b7a02000000000000000000000000000000000000000000000000000000009b8c84523360048501526001600160a01b0380951660248501526044840152608060648401526084830190612acc565b0393165af1908290826131e7575b50506131c15761314961308d565b805190816131bc5760405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b602001fd5b7fffffffff00000000000000000000000000000000000000000000000000000000161490565b909192506020813d8211613246575b8161320360209383612c81565b810103126132425751907fffffffff000000000000000000000000000000000000000000000000000000008216820361323f575090388061313b565b80fd5b5080fd5b3d91506131f6565b5050505050600190565b67ffffffffffffffff81116120fe5760051b60200190565b90815461327c81613258565b9260409361328c85519182612c81565b828152809460208092019260005281600020906000935b8585106132b257505050505050565b600184819284516132c281612c18565b64ffffffffff87546001600160801b038116835267ffffffffffffffff8160801c168584015260c01c16868201528152019301940193916132a3565b6040519061330b82612c18565b60006040838281528260208201520152565b9060405161332a81612c18565b6040819360018154916001600160801b0392838116865260801c6020860152015416910152565b80600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260ff60016040600020015460a01c1690565b6001600160801b039182169082160391908211611d2257565b80600052600b60205260ff60016040600020015460a81c16156104cd57600052600b60205260406000205460f81c90565b359064ffffffffff8216820361042457565b9291926133f082613258565b6040946133ff86519283612c81565b8195848352602080930191606080960285019481861161042457925b85841061342b5750505050505050565b86848303126104245782519061344082612c18565b61344985612cbf565b8252858501359067ffffffffffffffff8216820361042457828792838b9501526134748688016133d2565b8682015281520193019261341b565b356001600160a01b03811681036104245790565b356001600160801b03811681036104245790565b9190826040910312610424576040516134c381612c34565b60208082946134d181612b1d565b84520135910152565b64ffffffffff80421682600052600b602052604060002091825482828260a01c16101561353b5760c81c16111561352957600401546001101561352057612d409061357c565b612d409061459e565b6001600160801b039150600201541690565b5050505050600090565b8051156135525760200190565b634e487b7160e01b600052603260045260246000fd5b80518210156135525760209160051b010190565b64ffffffffff90814216906000908152600b6020526040908181208251936135a385612c50565b8154956001600160a01b039182881687526020870197828160a01c168952828160c81c168789015260ff8160f01c161515606089015260f81c1515608088015260ff6001938486015490811660a08a0152818160a01c16151560c08a015260a81c16151560e088015261012061362f60046136206002880161331d565b966101008b0197885201613270565b9701918783528087613641889a613545565b5101511693828288965b16106137255750916136d56136da928488816136df98976001600160801b039e8f6136778b8a51613568565b5151169d8a8f9b602061369467ffffffffffffffff928d51613568565b510151169984836136a6848451613568565b5101511696508115613719576136c492935051906000190190613568565b5101511680925b0316920316613799565b613b08565b61396b565b9283136136f85750506136f2839161375d565b16011690565b5160200151929392831692841683101591506137149050575090565b905090565b505050511680926136cb565b8094986001600160801b03908161373d8c8851613568565b51511601169801938282808a613754898951613568565b5101511661364b565b600081126137685790565b602490604051907f2463f3d50000000000000000000000000000000000000000000000000000000082526004820152fd5b90600160ff1b808314908115613881575b5061385757600082121561384e576137d3826000035b600083121561384757826000039061388b565b917f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8311613811576000916000199118131561380d575090565b0390565b604491604051917fd49c26b300000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b829061388b565b6137d3826137c0565b60046040517f9fe2b450000000000000000000000000000000000000000000000000000000008152fd5b90508114386137aa565b670de0b6b3a7640000916000198383099280830292838086109503948086039514613947578285101561390b57908291096001821901821680920460028082600302188083028203028083028203028083028203028083028203028083028203028092029003029360018380600003040190848311900302920304170290565b82606492604051927f63a05778000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b505080925015613955570490565b634e487b7160e01b600052601260045260246000fd5b90600160ff1b808314908115613a4f575b50613a25576000821215613a1c576139a5826000035b6000831215613a15578260000390613a59565b917f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff83116139df576000916000199118131561380d575090565b604491604051917f120b5b4300000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b8290613a59565b6139a582613992565b60046040517fa6070c25000000000000000000000000000000000000000000000000000000008152fd5b905081143861397c565b90919060001983820983820291828083109203918083039214613af757670de0b6b3a76400009081831015613ac057947faccb18165bd6fe31ae1cf318dc5b51eee0e1ba569b88cd74c1773b91fac1066994950990828211900360ee1b910360121c170290565b60449086604051917f5173648d00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050670de0b6b3a764000090049150565b80613b225750600090612d405750670de0b6b3a764000090565b90670de0b6b3a7640000808314613b6f575080613b47575050670de0b6b3a764000090565b670de0b6b3a76400008114613b6b57613b66906136da612d4093614449565b613b8f565b5090565b91505090565b8015613955576ec097ce7bc90715b34b9f10000000000590565b6000811215613bc45768033dd1780914b97114198112613bbe57613bb590600003613b8f565b612d4090613b75565b50600090565b680a688906bd8affffff811361441857670de0b6b3a764000080604092831b05907780000000000000000000000000000000000000000000000067ff0000000000000083166142fb575b66ff00000000000083166141f3575b65ff000000000083166140f3575b64ff000000008316613ffb575b63ff0000008316613f0b575b62ff00008316613e23575b61ff008316613d43575b60ff8316613c6c575b02911c60bf031c90565b60808316613d31575b838316613d1f575b60208316613d0d575b60108316613cfb575b60088316613ce9575b60048316613cd7575b60028316613cc5575b6001831615613c62576801000000000000000102831c613c62565b6801000000000000000102831c613caa565b6801000000000000000302831c613ca1565b6801000000000000000602831c613c98565b6801000000000000000b02831c613c8f565b6801000000000000001602831c613c86565b6801000000000000002c02831c613c7d565b6801000000000000005902831c613c75565b6180008316613e11575b6140008316613dff575b6120008316613ded575b6110008316613ddb575b6108008316613dc9575b6104008316613db7575b6102008316613da5575b610100831615613c5957680100000000000000b102831c613c59565b6801000000000000016302831c613d89565b680100000000000002c602831c613d7f565b6801000000000000058c02831c613d75565b68010000000000000b1702831c613d6b565b6801000000000000162e02831c613d61565b68010000000000002c5d02831c613d57565b680100000000000058b902831c613d4d565b628000008316613ef9575b624000008316613ee7575b622000008316613ed5575b621000008316613ec3575b620800008316613eb1575b620400008316613e9f575b620200008316613e8d575b62010000831615613c4f576801000000000000b17202831c613c4f565b680100000000000162e402831c613e70565b6801000000000002c5c802831c613e65565b68010000000000058b9102831c613e5a565b680100000000000b172102831c613e4f565b68010000000000162e4302831c613e44565b680100000000002c5c8602831c613e39565b6801000000000058b90c02831c613e2e565b63800000008316613fe9575b63400000008316613fd7575b63200000008316613fc5575b63100000008316613fb3575b63080000008316613fa1575b63040000008316613f8f575b63020000008316613f7d575b6301000000831615613c445768010000000000b1721802831c613c44565b6801000000000162e43002831c613f5f565b68010000000002c5c86002831c613f53565b680100000000058b90c002831c613f47565b6801000000000b17217f02831c613f3b565b680100000000162e42ff02831c613f2f565b6801000000002c5c85fe02831c613f23565b68010000000058b90bfc02831c613f17565b64800000000083166140e1575b64400000000083166140cf575b64200000000083166140bd575b64100000000083166140ab575b6408000000008316614099575b6404000000008316614087575b6402000000008316614075575b640100000000831615613c3857680100000000b17217f802831c613c38565b68010000000162e42ff102831c614056565b680100000002c5c85fe302831c614049565b6801000000058b90bfce02831c61403c565b68010000000b17217fbb02831c61402f565b6801000000162e42fff002831c614022565b68010000002c5c8601cc02831c614015565b680100000058b90c0b4902831c614008565b6580000000000083166141e1575b6540000000000083166141cf575b6520000000000083166141bd575b6510000000000083166141ab575b650800000000008316614199575b650400000000008316614187575b650200000000008316614175575b65010000000000831615613c2b576801000000b17218355102831c613c2b565b680100000162e430e5a202831c614155565b6801000002c5c863b73f02831c614147565b68010000058b90cf1e6e02831c614139565b680100000b1721bcfc9a02831c61412b565b68010000162e43f4f83102831c61411d565b680100002c5c89d5ec6d02831c61410f565b6801000058b91b5bc9ae02831c614101565b668000000000000083166142e9575b664000000000000083166142d7575b662000000000000083166142c5575b661000000000000083166142b3575b660800000000000083166142a1575b6604000000000000831661428f575b6602000000000000831661427d575b6601000000000000831615613c1d5768010000b17255775c0402831c613c1d565b6801000162e525ee054702831c61425c565b68010002c5cc37da949202831c61424d565b680100058ba01fb9f96d02831c61423e565b6801000b175effdc76ba02831c61422f565b680100162f3904051fa102831c614220565b6801002c605e2e8cec5002831c614211565b68010058c86da1c09ea202831c614202565b67800000000000000083166143f9575b67400000000000000083166143e7575b67200000000000000083166143d5575b67100000000000000083166143c3575b67080000000000000083166143b1575b670400000000000000831661439f575b670200000000000000831661438d575b670100000000000000831615613c0e57680100b1afa5abcbed6102831c613c0e565b68010163da9fb33356d802831c61436b565b680102c9a3e778060ee702831c61435b565b6801059b0d31585743ae02831c61434b565b68010b5586cf9890f62a02831c61433b565b6801172b83c7d517adce02831c61432b565b6801306fe0a31b7152df02831c61431b565b5077b504f333f9de64848000000000000000000000000000000061430b565b602490604051907f0360d0280000000000000000000000000000000000000000000000000000000082526004820152fd5b8060008083131561456d57670de0b6b3a76400009283811261453657506001925b808305906001600160801b03821160071b91821c9167ffffffffffffffff831160061b92831c63ffffffff811160051b90811c61ffff811160041b90811c60ff811160031b90811c91600f831160021b92831c936001978860038711811b96871c11961717171717171781810294811d9082821461452a57506706f05b59d3b20000905b8482136144fe5750505050500290565b808391020590671bc16d674ec8000082121561451d575b831d906144ee565b8091950194831d90614515565b93505093925050020290565b6000199392508015614559576ec097ce7bc90715b34b9f1000000000059161446a565b602482634e487b7160e01b81526012600452fd5b602483604051907f059b101b0000000000000000000000000000000000000000000000000000000082526004820152fd5b6000818152600b6020526145d3604082205464ffffffffff808281809460a01c1693849160c81c160316918142160316613799565b91808252600b602052600460408320018054156146595790829167ffffffffffffffff935261462b6020832054828452600b6020526136da6001600160801b03968760026040882001541696879360801c1690613b08565b92831361464157505061463d9061375d565b1690565b60029350604092508152600b60205220015460801c90565b602483634e487b7160e01b81526032600452fd5b80600052600b602052604060002060ff600182015460a01c16600014614694575050600490565b805460f81c6146e7575460a01c64ffffffffff164210613bbe576146b7816134da565b90600052600b6020526001600160801b0380600260406000200154169116106000146146e257600190565b600290565b5050600390565b80600052600b602052614707600260406000200161331d565b81600052600b602052604060002060ff600182015460a01c1660001461473a57506001600160801b039150602001511690565b5460f81c61474c5750612d40906134da565b612d4091506001600160801b036040818351169201511690613388565b906001600160a01b036001541660206001600160a01b0360a0850151166024604051809481937fdcf844a700000000000000000000000000000000000000000000000000000000835260048301525afa801561083657600090614fa8575b6147ea91506001600160801b0360808501511690602060c08601510151916156d7565b6001600160801b0381511660e08401519064ffffffffff6020860151168115614f7e5782518015614f54577f00000000000000000000000000000000000000000000000000000000000000008111614f23575064ffffffffff604061484e85613545565b51015116811015614ecc5750600091829083815185905b808210614e39575050505064ffffffffff421664ffffffffff8216811015614df95750506001600160801b0382168103614db75750506009549283600052600b6020526040600020916001600160801b0381511660028401906fffffffffffffffffffffffffffffffff198254161790556001600160a01b0360a0830151166001840154750100000000000000000000000000000000000000000060408501511515927fffffffffffffffffffff00ff000000000000000000000000000000000000000087549316171760018601556001600160a01b038451169160e0850151926040614959855195600019870190613568565b510151927fff000000000000000000000000000000000000000000000000000000000000007eff0000000000000000000000000000000000000000000000000000000000007dffffffffff0000000000000000000000000000000000000000000000000078ffffffffff000000000000000000000000000000000000000060208b015160a01b169660c81b169460f01b16911617171717845560005b818110614ce8575050600185016009556001600160a01b0360a08301511660005260026020526001600160801b0380604060002054168160208401511601166001600160a01b0360a0840151166000526040600020906fffffffffffffffffffffffffffffffff198254161790556001600160a01b036060830151168015614ca4578590614aa2614a9c8360005260056020526001600160a01b0360406000205416151590565b15615156565b614ac5614a9c8360005260056020526001600160a01b0360406000205416151590565b8060005260066020526040600020600181540190558160005260056020526040600020816001600160a01b031982541617905560007fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8180a4614b4e6001600160a01b0360a0840151166001600160801b03808451168160208601511601169030903390614fdc565b6001600160801b0360408201511680614c75575b507f5fdd2815acf0f9021ab8eb10cffdc5974c4521cd6d431e3b0d93f13ffe0059796001600160a01b0383511691866001600160a01b03606086015116946001600160a01b0360a08201511696614c6a614c4b60408401511515926001600160a01b0360c060e087015192549664ffffffffff60405198614be28a612c34565b818160a01c168a5260c81c1660208901520151511693614c3560405198899889523360208a01526040890190604090816001600160801b0391828151168552826020820151166020860152015116910152565b60a08701526101408060c0880152860190612b97565b9260e08501906020908164ffffffffff91828151168552015116910152565b6101208301520390a4565b614c9e906001600160a01b0360a0850151166001600160a01b0360c08601515116903390614fdc565b38614b62565b606460405162461bcd60e51b815260206004820152602060248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152fd5b614cf68160e0860151613568565b5190600486015491680100000000000000008310156120fe57600183018060048901558310156135525760019260048801600052602060002001906001600160801b03815116908254917fffffff00000000000000000000000000000000000000000000000000000000007cffffffffff000000000000000000000000000000000000000000000000604077ffffffffffffffff00000000000000000000000000000000602086015160801b1694015160c01b1693161717179055016149f5565b6040517fd90b7e390000000000000000000000000000000000000000000000000000000081526001600160801b03918216600482015291166024820152604490fd5b6040517f210aec0e00000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b9193509194614e5d906001600160801b03614e548589613568565b51511690615439565b9464ffffffffff806040614e718685613568565b51015116941680851115614e8f575060018493019192919092614865565b8385606492604051927f7b0bada8000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b64ffffffffff6040614edd85613545565b5101516040517fb4c9e52c00000000000000000000000000000000000000000000000000000000815264ffffffffff938416600482015291169091166024820152604490fd5b602490604051907f4757689b0000000000000000000000000000000000000000000000000000000082526004820152fd5b60046040517f3952c64e000000000000000000000000000000000000000000000000000000008152fd5b60046040517f6095d3bc000000000000000000000000000000000000000000000000000000008152fd5b6020823d602011614fd4575b81614fc160209383612c81565b8101031261323f57506147ea90516147c7565b3d9150614fb4565b9290604051927f23b872dd0000000000000000000000000000000000000000000000000000000060208501526001600160a01b03809216602485015216604483015260648201526064815260a081019181831067ffffffffffffffff8411176120fe5761504b9260405261504d565b565b6001600160a01b0316906150ad60405161506681612c34565b6020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808587829751910182855af16150a761308d565b916151a1565b805191821591848315615132575b5050509050156150c85750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152fd5b9193818094500103126132425782015190811515820361323f5750803880846150bb565b1561515d57565b606460405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152fd5b9192901561520257508151156151b5575090565b3b156151be5790565b606460405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152fd5b8251909150156152155750805190602001fd5b6103f89060405191829162461bcd60e51b8352602060048401526024830190612acc565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361526b57565b60046040517fa1c0d6e5000000000000000000000000000000000000000000000000000000008152fd5b916001600160a01b03604051927fa9059cbb000000000000000000000000000000000000000000000000000000006020850152166024830152604482015260448152608081019181831067ffffffffffffffff8411176120fe5761504b9260405261504d565b612d4090615308816146ee565b90600052600b60205260026040600020015460801c90613388565b91908110156135525760051b0190565b92919061533f84613351565b61040c5761536384600052600b6020526001600160a01b0360406000205416331490565b1580615429575b6103d95761538e84600052600b6020526001600160a01b0360406000205416331490565b80615405575b6153d8576001600160a01b0381161561035e576001600160801b038216156153c05761504b9293615454565b6024846040519063d2aabcd960e01b82526004820152fd5b836001600160a01b0360649260405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b508360005260056020526001600160a01b0380604060002054169082161415615394565b506154338461566e565b1561536a565b9190916001600160801b0380809416911601918211611d2257565b929190926001600160801b038061546a836152fb565b1692818116938085116156315750600095838752602092600b84526154cf61549d6040946002868c20015460801c615439565b868a52600b86526002858b200190836fffffffffffffffffffffffffffffffff1983549260801b16911617815561331d565b906154ea818684015116928286818351169201511690613388565b161115615602575b838752600b83526001600160a01b03916155158683856001858d20015416615295565b8488526005845282818920541680331415806155f8575b615561575b507ffa54f9f9bdcdd28778cbb9f78490df6691cc4e2729588e10f4cc0a26c465686a9495969750519586521693a3565b803b156155f45797807ffa54f9f9bdcdd28778cbb9f78490df6691cc4e2729588e10f4cc0a26c465686a9697989960848451809481937f13375c3b0000000000000000000000000000000000000000000000000000000083528c600484015233602484015289891660448401528d60648401525af16155e5575b8897969550615531565b6155ee90612c6d565b386155db565b8880fd5b50803b151561552c565b838752600b835281872060018101600160a01b60ff60a01b1982541617905560ff60f01b1981541690556154f2565b8360649186604051927fa1fb2bbc000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b60009080825260056020526001600160a01b0380604084205416928333149384156156b3575b505082156156a157505090565b9091506156ae3392612d43565b161490565b60ff9294509060409181526008602052818120338252602052205416913880615694565b9092916156e26132fe565b936001600160801b03928381169182156157ee5767016345785d8a00008082116157b757808511615780575061572c8561571d819386613a59565b16946020890195865284613a59565b169184615743604089019480865282875116615439565b16101561576a5761575c84918261576595511690613388565b91511690613388565b168252565b634e487b7160e01b600052600160045260246000fd5b84604491604051917f4fea5c1a00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449250604051917f47152d6700000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050505050905060405161580181612c18565b6000815260006020820152600060408201529056fef8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7"; + hex"60c0346200046e57601f62005ca638819003918201601f19168301916001600160401b038311848410176200032b578084926080946040528339810103126200046e5780516001600160a01b038082169290918390036200046e5760208101518281168091036200046e5760408201519183831683036200046e5760600151936200008962000473565b90601d82527f5361626c696572205632204c6f636b75702044796e616d6963204e46540000006020830152620000be62000473565b601181527029a0a116ab1916a627a1a5aaa816a22ca760791b602082015230608052600080546001600160a01b03199081168417825560018054909116909517909455927fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a38051906001600160401b0382116200032b5760035490600182811c9216801562000463575b60208310146200044d5781601f849311620003d8575b50602090601f83116001146200034d5760009262000341575b50508160011b916000199060031b1c1916176003555b80516001600160401b0381116200032b576004918254600181811c9116801562000320575b60208210146200030b579081601f849311620002b3575b50602090601f831160011462000248576000926200023c575b50508160011b916000199060031b1c19161790555b1660018060a01b0319600a541617600a5560a052600160095560405161581290816200049482396080518161439b015260a05181818161120e01526139930152f35b015190503880620001e5565b6000858152602081209350601f198516905b8181106200029a575090846001959493921062000280575b505050811b019055620001fa565b015160001960f88460031b161c1916905538808062000272565b929360206001819287860151815501950193016200025a565b909150836000526020600020601f840160051c8101916020851062000300575b90601f859493920160051c01905b818110620002f05750620001cc565b60008155849350600101620002e1565b9091508190620002d3565b602284634e487b7160e01b6000525260246000fd5b90607f1690620001b5565b634e487b7160e01b600052604160045260246000fd5b0151905038806200017a565b600360009081527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b9350601f198516905b818110620003bf5750908460019594939210620003a5575b505050811b0160035562000190565b015160001960f88460031b161c1916905538808062000396565b929360206001819287860151815501950193016200037e565b60036000529091507fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b601f840160051c8101916020851062000442575b90601f859493920160051c01905b81811062000432575062000161565b6000815584935060010162000423565b909150819062000415565b634e487b7160e01b600052602260045260246000fd5b91607f16916200014b565b600080fd5b60408051919082016001600160401b038111838210176200032b5760405256fe608080604052600436101561001357600080fd5b60003560e01c90816301ffc9a7146128d25750806306fdde031461280f578063081812fc146127f1578063095ea7b31461265d5780631400ecec146125b8578063168444561461233d5780631c1cdd4c146122d75780631e99d569146122b957806323b872dd1461229057806339a73c031461224d57806340e58ee514612014578063425d30dd14611ff657806342842e0e14611fa657806342966c6814611e285780634857501f14611db25780634869e12d14611d765780635fe3b56714611d4f5780636352211e14611d205780636d0cee7514611cc857806370a0823114611c1e57806375829def14611b8c5780637cad6cd114611aba5780637de6b1db146118ce5780638659c270146115f0578063894e9a0d146113835780638bad38dd146113075780638f69b993146112845780639067b677146112315780639188ec84146111f657806395d89b41146110e8578063a22cb46514611017578063a2ffb89714610f1e578063a6202bf214610e1e578063a80fc07114610dc9578063ad35efd414610d66578063b256456914610d48578063b637b86514610ce8578063b88d4fde14610c5f578063b8a3be6614610c28578063b971302a14610bd6578063bc063e1a14610bb3578063bc2be1be14610b60578063c156a11d14610aac578063c33cd35e14610997578063c87b56dd14610864578063cc364f48146107ca578063d4dbd20b14610775578063d511609f14610726578063d975dfed146106d9578063e985e9c514610682578063ea5ead1914610652578063eac8f5b8146105e6578063f590c176146105be578063f851a440146105975763fdd46d601461027c57600080fd5b34610480576060366003190112610480576004356102986129ff565b604435916001600160801b039182841693848103610480576102b8614391565b6102c1836132ed565b61057f576102e583600052600b6020526001600160a01b0360406000205416331490565b9182158061056f575b6105505783600052602094600586526001600160a01b039081604060002054169480610544575b61051e5781831693841561050d5788156104f55761033287614453565b8281168a116104c1575091889161038e6103626103cb958a600052600b8c5260026040600020015460801c61474f565b89600052600b8b52600260406000200190836001600160801b031983549260801b169116178155613282565b906103aa818b8401511692826040818351169201511690613324565b16111561048f575b86600052600b88526001604060002001541692836143ed565b81847f40b88e5c41c5a97ffb7b6ef88a0a2d505aa0c634cf8a0275cb236ea7dd87ed4d876040518a8152a48133141580610485575b61041f575b6000805160206157e68339815191528484604051908152a1005b813b15610480576000805160206157e68339815191529460846000928360405195869485936313375c3b60e01b8552896004860152336024860152604485015260648401525af1610471575b80610405565b61047a90612b72565b3861046b565b600080fd5b50813b1515610400565b86600052600b8852604060002060018101600160a01b60ff60a01b1982541617905560ff60f01b1981541690556103b2565b60405163287ecaef60e21b8152600481018990526001600160801b03928316602482015291166044820152606490fd5b0390fd5b6024876040519063d2aabcd960e01b82526004820152fd5b600460405163630d074f60e11b8152fd5b606486838560405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b50848284161415610315565b60405163216caf0d60e01b815260048101859052336024820152604490fd5b506105798461476a565b156102ee565b60248360405190634a5541ef60e01b82526004820152fd5b346104805760003660031901126104805760206001600160a01b0360005416604051908152f35b346104805760203660031901126104805760206105dc60043561333d565b6040519015158152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260206001600160a01b0360016040600020015416604051908152f35b6024906040519062b8e7e760e51b82526004820152fd5b34610480576040366003190112610480576106806004356106716129ff565b61067a82614453565b9161448b565b005b346104805760403660031901126104805761069b6129e9565b6106a36129ff565b906001600160a01b03809116600052600860205260406000209116600052602052602060ff604060002054166040519015158152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57610715602091614453565b6001600160801b0360405191168152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b602052602060026040600020015460801c604051908152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260206001600160801b0360036040600020015416604051908152f35b3461048057602036600319011261048057600435600060206040516107ee81612b39565b828152015280600052600b60205260ff60016040600020015460a81c161561063b57600052600b6020526040806000205464ffffffffff82519161083183612b39565b818160a01c16835260c81c166020820152610862825180926020908164ffffffffff91828151168552015116910152565bf35b346104805760208060031936011261048057600435906108a261089d8360005260056020526001600160a01b0360406000205416151590565b612bd8565b60006001600160a01b03600a5416926044604051809581937fe9dc637500000000000000000000000000000000000000000000000000000000835230600484015260248301525afa91821561098b57600092610912575b5061090e6040519282849384528301906129c4565b0390f35b9091503d806000833e6109258183612b86565b81019082818303126104805780519067ffffffffffffffff8211610480570181601f8201121561048057805161095a81612ba8565b926109686040519485612b86565b81845284828401011161048057610984918480850191016129a1565b90826108f9565b6040513d6000823e3d90fd5b3461048057600319602036820112610480576004359067ffffffffffffffff9081831161048057610140908336030112610480576109d3614391565b604051916109e083612b1c565b6109ec81600401612a15565b83526109fa6024820161336e565b6020840152610a0b60448201612af3565b6040840152610a1c60648201612af3565b6060840152610a2d60848201612a15565b6080840152610a3e60a48201612bc4565b60a0840152610a4f60c48201612a15565b60c0840152610a613660e48301613454565b60e084015261012481013591821161048057013660238201121561048057602091610a99610aa4923690602460048201359101613380565b6101008201526138e5565b604051908152f35b3461048057604036600319011261048057600435610ac86129ff565b90610ad1614391565b80600052600b60205260ff60016040600020015460a81c161561063b578060005260056020526001600160a01b036040600020541691823303610b415761068092610b1b83614453565b6001600160801b038116610b30575b50612e6b565b610b3b90828561448b565b84610b2a565b60405163216caf0d60e01b815260048101839052336024820152604490fd5b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b602052602064ffffffffff60406000205460a01c16604051908152f35b3461048057600036600319011261048057602060405167016345785d8a00008152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260206001600160a01b0360406000205416604051908152f35b3461048057602036600319011261048057600435600052600b602052602060ff60016040600020015460a81c166040519015158152f35b3461048057608036600319011261048057610c786129e9565b610c806129ff565b6064359167ffffffffffffffff8311610480573660238401121561048057826004013591610cad83612ba8565b92610cbb6040519485612b86565b80845236602482870101116104805760208160009260246106809801838801378501015260443591612cf6565b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205261090e610d3460046040600020016131d5565b604051918291602083526020830190612a8f565b346104805760203660031901126104805760206105dc6004356132b6565b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57610da0906137e3565b6040516005821015610db3576020918152f35b634e487b7160e01b600052602160045260246000fd5b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260206001600160801b0360026040600020015416604051908152f35b3461048057602036600319011261048057610e376129e9565b6001600160a01b038060005416338103610ef557508116908160005260026020526001600160801b0360406000205416908115610ec45781610e969184600052600260205260406000206001600160801b0319815416905533906143ed565b6040519081527fca7a4a65a94ed2f37538814e00e1cd4c41a78261561e3f3794592f11409cf5af60203392a3005b602483604051907f8410168c0000000000000000000000000000000000000000000000000000000082526004820152fd5b6040516331b339a960e21b81526001600160a01b03919091166004820152336024820152604490fd5b346104805760603660031901126104805767ffffffffffffffff60043581811161048057610f50903690600401612a5e565b610f586129ff565b9260443590811161048057610f71903690600401612a5e565b9190610f7b614391565b828203610fe05760005b828110610f8e57005b806000805160206157e68339815191526020610fad600194878a61447b565b35610fd3610fc4610fbf868b8a61447b565b613440565b610fcc614391565b8b836144b8565b604051908152a101610f85565b50604491604051917faec9344000000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b34610480576040366003190112610480576110306129e9565b60243590811515809203610480576001600160a01b0316908133146110a457336000526008602052604060002082600052602052604060002060ff1981541660ff83161790556040519081527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3160203392a3005b606460405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c6572000000000000006044820152fd5b3461048057600036600319011261048057604051600060045490600182811c918184169182156111ec575b60209485851084146111d65785879486865291826000146111b6575050600114611159575b5061114592500383612b86565b61090e6040519282849384528301906129c4565b84915060046000527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b906000915b85831061119e575050611145935082010185611138565b80548389018501528794508693909201918101611187565b60ff19168582015261114595151560051b85010192508791506111389050565b634e487b7160e01b600052602260045260246000fd5b92607f1692611113565b346104805760003660031901126104805760206040517f00000000000000000000000000000000000000000000000000000000000000008152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57600052600b602052602064ffffffffff60406000205460c81c16604051908152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b576112be906137e3565b600581101580610db357600282149081156112fa575b81156112e8575b6020826040519015158152f35b9050610db357600460209114826112db565b50506003811460006112d4565b34610480576020366003190112610480576004356001600160a01b0390818116809103610480578160005416338103610ef5575060015491816001600160a01b03198416176001556040519216825260208201527fdcb09aef4bf01068924ccce937981cbe59d25ba08380cf941aaaea4e4bd3960d60403392a2005b346104805760203660031901126104805760606101406040516113a581612b55565b60008152600060208201526000604082015260008382015260006080820152600060a0820152600060c0820152600060e082015260006101008201526113e9613263565b6101208201520152600435600052600b60205260ff60016040600020015460a81c16156115d857600435600052600b60205260406000206114cc60046040519261143284612b55565b80546001600160a01b038116855264ffffffffff8160a01c16602086015264ffffffffff8160c81c16604086015260ff8160f01c161515606086015260f81c1515608085015260ff60018201546001600160a01b03811660a0870152818160a01c16151560c0870152818160a81c16151560e087015260b01c1615156101008501526114c060028201613282565b610120850152016131d5565b6101408201526114dd6004356137e3565b906005821015610db357600261014092146115cc575b61090e604051928392602084526001600160a01b03815116602085015264ffffffffff602082015116604085015264ffffffffff60408201511660608501526060810151151560808501526080810151151560a08501526001600160a01b0360a08201511660c085015260c0810151151560e085015260e0810151151561010085015261010081015115156101208501526115b861012082015183860190604090816001600160801b0391828151168552826020820151166020860152015116910152565b01516101a0808401526101c0830190612a8f565b600060608201526114f3565b602460405162b8e7e760e51b81526004356004820152fd5b34610480576020806003193601126104805760043567ffffffffffffffff811161048057611622903690600401612a5e565b9061162b614391565b6000915b80831061163857005b61164383828461447b565b359261164d614391565b611656846132ed565b156116735760248460405190634a5541ef60e01b82526004820152fd5b61167f8492939461333d565b6118b6576116a382600052600b6020526001600160a01b0360406000205416331490565b15610b41576116b182613483565b82600052600b8087526116ca6002604060002001613282565b906001600160801b039283835116848216101561189e578560005281895260ff60406000205460f01c1615611886579061173882858b61172e7f5edb27d6c1a327513b90a792050debf074b7194444885e3144d4decc5caaaa509683895116613324565b9601511690613324565b9580600052818a526040600020938a855498600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8b16178755600388821697881561186c575b0197831697886001600160801b03198254161790556001600160a01b03809a16958691600584528b604060002054169687945260019b8c6040600020015416946117cb8b85886143ed565b604080518881526001600160801b0392831660208201529290911690820152606090a46000805160206157e68339815191528a604051838152a1813b611819575b505050505001919061162f565b813b15610480576000608492819560405197889687956372eba20360e01b875260048701526024860152604485015260648401525af161185d575b8080808061180c565b61186690612b72565b85611854565b60018101600160a01b60ff60a01b19825416179055611780565b602486604051906339c6dc7360e21b82526004820152fd5b602486604051906322cad1af60e11b82526004820152fd5b6024826040519063fe19f19f60e01b82526004820152fd5b346104805760208060031936011261048057600435906118ec614391565b81600052600b815260ff60016040600020015460a81c1615611aa357611911826137e3565b6005811015610db3576004810361193a5760248360405190634a5541ef60e01b82526004820152fd5b6003810361195a576024836040519063fe19f19f60e01b82526004820152fd5b600214611a8b5761198182600052600b6020526001600160a01b0360406000205416331490565b15610b415781600052600b815260ff60406000205460f01c1615611a735781600052600b8152604060002060ff60f01b19815416905560405191807f0eb069207093cd3e51cd1370d2d369770057fbe29947e577e5fb428c6c6fc78f600080a2600582526001600160a01b036040600020541692833b611a16575b6000805160206157e68339815191528383604051908152a1005b833b1561048057600081602481836000805160206157e6833981519152987f341a0bd90000000000000000000000000000000000000000000000000000000083528760048401525af1156119fc57611a6d90612b72565b836119fc565b602482604051906339c6dc7360e21b82526004820152fd5b602482604051906322cad1af60e11b82526004820152fd5b6024826040519062b8e7e760e51b82526004820152fd5b34610480576020366003190112610480576004356001600160a01b0390818116809103610480578160005416338103610ef55750600a5491816001600160a01b0319841617600a556040519216825260208201527fa2548bd4b805e907c1558a47b5858324fe8bb4a2e1ddfca647eecbf65610eebc60403392a26009546000198101908111611b765760407f6bd5c950a8d8df17f772f5af37cb3655737899cbf903264b9795592da439661c91815190600182526020820152a1005b634e487b7160e01b600052601160045260246000fd5b3461048057602036600319011261048057611ba56129e9565b6000546001600160a01b0380821692338403611bf7576001600160a01b03199350169182911617600055337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf80600080a3005b6040516331b339a960e21b81526001600160a01b0385166004820152336024820152604490fd5b34610480576020366003190112610480576001600160a01b03611c3f6129e9565b168015611c5e5760005260066020526020604060002054604051908152f35b608460405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f74206120766160448201527f6c6964206f776e657200000000000000000000000000000000000000000000006064820152fd5b3461048057602036600319011261048057600435611cff61089d8260005260056020526001600160a01b0360406000205416151590565b600052600560205260206001600160a01b0360406000205416604051908152f35b34610480576020366003190112610480576020611d3e600435612c23565b6001600160a01b0360405191168152f35b346104805760003660031901126104805760206001600160a01b0360015416604051908152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b5761071560209161386a565b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b576000611dee826137e3565b6005811015610db357600203611e0c575b6020906040519015158152f35b50600052600b602052602060ff60406000205460f01c16611dff565b3461048057602036600319011261048057600435611e44614391565b611e4d816132ed565b15611f7557611e5b8161476a565b15611f5557611e6981612c23565b611e72826132b6565b159081611f4c575b81611f39575b50611f2157602081611ea06000805160206157e683398151915293612c23565b9080600052600783526001600160a01b036040600020926001600160a01b031993848154169055169182600052600684526040600020600019815401905581600052600584526040600020908154169055806000604051937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8280a48152a1005b60249060405190630da9b01360e01b82526004820152fd5b6001600160a01b03915016151582611e80565b60009150611e7a565b60405163216caf0d60e01b81526004810191909152336024820152604490fd5b602490604051907f817cd6390000000000000000000000000000000000000000000000000000000082526004820152fd5b3461048057611fb436612a29565b60405191602083019383851067ffffffffffffffff861117611fe0576106809460405260008452612cf6565b634e487b7160e01b600052604160045260246000fd5b346104805760203660031901126104805760206105dc6004356132ed565b34610480576020806003193601126104805760043590612032614391565b61203b826132ed565b156120585760248260405190634a5541ef60e01b82526004820152fd5b6120618261333d565b6118b65761208582600052600b6020526001600160a01b0360406000205416331490565b15610b415761209382613483565b9180600052600b82526120ac6002604060002001613282565b906001600160801b0393848351168582161015611a8b5781600052600b845260ff60406000205460f01c1615611a73578085856120ef6120f99483885116613324565b9501511690613324565b9080600052600b84526000805160206157e6833981519152604060002094855494600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff87161787556003888616978815612233575b0197811697886001600160801b03198254161790556001600160a01b038096169560058352867f5edb27d6c1a327513b90a792050debf074b7194444885e3144d4decc5caaaa508260406000205416978893600b875260016040600020015416946121bc8d85886143ed565b604080518a81526001600160801b0392831660208201529290911690820152606090a4604051838152a1813b6121ee57005b813b15610480576000608492819560405197889687956372eba20360e01b875260048701526024860152604485015260648401525af161222a57005b61068090612b72565b60018101600160a01b60ff60a01b19825416179055612150565b34610480576020366003190112610480576001600160a01b0361226e6129e9565b16600052600260205260206001600160801b0360406000205416604051908152f35b34610480576106806122a136612a29565b916122b46122af8433612d8c565b612c85565b612e6b565b34610480576000366003190112610480576020600954604051908152f35b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b57612311906137e3565b6005811015610db3578060209115908115612332575b506040519015158152f35b600191501482612327565b346104805760206003198181360112610480576004359067ffffffffffffffff9081831161048057610120833603918201126104805761237b614391565b6101048301359060221901811215610480578201600481013590828211610480576024016060820236038113610480576123b6913691613380565b918251906123c3826131bd565b916123d16040519384612b86565b808352601f196123e0826131bd565b018660005b8281106125a25750505064ffffffffff90814216946001600160801b03968761240d826134ee565b515116828a61241b846134ee565b510151168580604061242c866134ee565b510151168a0116906040519261244184612b00565b83528b8301526040820152612455876134ee565b5261245f866134ee565b5060019386855b8a8c87831061252157908b846001600160a01b038c60a48101358281169081900361048057610aa4956124e195612511946124a36024860161341f565b6124af6044870161341f565b6124bb6064880161342c565b916124c88860040161342c565b94846124d660848b01613440565b966040519d8e612b1c565b168c528d8c0152151560408b0152151560608a01521660808801521660a086015260c085015260c4369101613454565b60e08301526101008201526138e5565b8893858060406125558b866125458a8e9a61253c828d613511565b5151169a613511565b5101511694600019890190613511565b51015116816040612566888c613511565b510151160116916040519361257a85612b00565b8452830152604082015261258e828b613511565b52612599818a613511565b50018790612466565b6125aa613263565b8282880101520187906123e5565b346104805760203660031901126104805760043580600052600b60205260ff60016040600020015460a81c161561063b5760209060009080600052600b8352604060002060ff815460f01c168061264b575b612622575b50506001600160801b0360405191168152f35b61264492506001600160801b03600261263e9201541691613483565b90613324565b828061260f565b5060ff600182015460a01c161561260a565b34610480576040366003190112610480576126766129e9565b602435906001600160a01b03808061268d85612c23565b1692169180831461278757803314908115612762575b50156126f8578260005260076020526040600020826001600160a01b03198254161790556126d083612c23565b167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600080a4005b608460405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c0000006064820152fd5b9050600052600860205260406000203360005260205260ff60406000205416846126a3565b608460405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560448201527f72000000000000000000000000000000000000000000000000000000000000006064820152fd5b34610480576020366003190112610480576020611d3e600435612c48565b3461048057600036600319011261048057604051600060035490600182811c918184169182156128c8575b60209485851084146111d65785879486865291826000146111b657505060011461286b575061114592500383612b86565b84915060036000527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b906000915b8583106128b0575050611145935082010185611138565b80548389018501528794508693909201918101612899565b92607f169261283a565b3461048057602036600319011261048057600435907fffffffff00000000000000000000000000000000000000000000000000000000821680920361048057817f80ac58cd0000000000000000000000000000000000000000000000000000000060209314908115612977575b811561294d575b5015158152f35b7f01ffc9a70000000000000000000000000000000000000000000000000000000091501483612946565b7f5b5e139f000000000000000000000000000000000000000000000000000000008114915061293f565b60005b8381106129b45750506000910152565b81810151838201526020016129a4565b906020916129dd815180928185528580860191016129a1565b601f01601f1916010190565b600435906001600160a01b038216820361048057565b602435906001600160a01b038216820361048057565b35906001600160a01b038216820361048057565b6060906003190112610480576001600160a01b0390600435828116810361048057916024359081168103610480579060443590565b9181601f840112156104805782359167ffffffffffffffff8311610480576020808501948460051b01011161048057565b90815180825260208080930193019160005b828110612aaf575050505090565b835180516001600160801b031686528083015167ffffffffffffffff168684015260409081015164ffffffffff169086015260609094019392810192600101612aa1565b3590811515820361048057565b6060810190811067ffffffffffffffff821117611fe057604052565b610120810190811067ffffffffffffffff821117611fe057604052565b6040810190811067ffffffffffffffff821117611fe057604052565b610160810190811067ffffffffffffffff821117611fe057604052565b67ffffffffffffffff8111611fe057604052565b90601f8019910116810190811067ffffffffffffffff821117611fe057604052565b67ffffffffffffffff8111611fe057601f01601f191660200190565b35906001600160801b038216820361048057565b15612bdf57565b606460405162461bcd60e51b815260206004820152601860248201527f4552433732313a20696e76616c696420746f6b656e20494400000000000000006044820152fd5b60005260056020526001600160a01b0360406000205416612c45811515612bd8565b90565b612c6b61089d8260005260056020526001600160a01b0360406000205416151590565b60005260076020526001600160a01b036040600020541690565b15612c8c57565b608460405162461bcd60e51b815260206004820152602d60248201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560448201527f72206f7220617070726f766564000000000000000000000000000000000000006064820152fd5b90612d1a939291612d0a6122af8433612d8c565b612d15838383612e6b565b613024565b15612d2157565b60405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b906001600160a01b038080612da084612c23565b16931691838314938415612dd3575b508315612dbd575b50505090565b612dc991929350612c48565b1614388080612db7565b909350600052600860205260406000208260005260205260ff604060002054169238612daf565b15612e0157565b608460405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201527f6f776e65720000000000000000000000000000000000000000000000000000006064820152fd5b90612e949291612e7a83612c23565b916001600160a01b03948593848094169687911614612dfa565b1690811580612f8b57612ea6846132b6565b159081612f82575b5080612f79575b612f615791808492612ee36000805160206157e683398151915296602096612edc85612c23565b1614612dfa565b60009382855260078652604085206001600160a01b031990818154169055818652600687526040862060001981540190558286526040862060018154019055838652600587528260408720918254161790557fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef6040519580a48152a1565b60248360405190630da9b01360e01b82526004820152fd5b50831515612eb5565b90501538612eae565b608460405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f2061646460448201527f72657373000000000000000000000000000000000000000000000000000000006064820152fd5b3d1561301f573d9061300582612ba8565b916130136040519384612b86565b82523d6000602084013e565b606090565b9290803b156131b45761308e916020916001600160a01b0394604051809581948293897f150b7a02000000000000000000000000000000000000000000000000000000009b8c865233600487015216602485015260448401526080606484015260848301906129c4565b03916000968791165af19082908261314d575b5050613127576130af612ff4565b805190816131225760405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b602001fd5b7fffffffff00000000000000000000000000000000000000000000000000000000161490565b909192506020813d82116131ac575b8161316960209383612b86565b810103126131a85751907fffffffff00000000000000000000000000000000000000000000000000000000821682036131a557509038806130a1565b80fd5b5080fd5b3d915061315c565b50505050600190565b67ffffffffffffffff8111611fe05760051b60200190565b9081546131e1816131bd565b926040936131f185519182612b86565b828152809460208092019260005281600020906000935b85851061321757505050505050565b6001848192845161322781612b00565b64ffffffffff87546001600160801b038116835267ffffffffffffffff8160801c168584015260c01c1686820152815201930194019391613208565b6040519061327082612b00565b60006040838281528260208201520152565b9060405161328f81612b00565b6040819360018154916001600160801b0392838116865260801c6020860152015416910152565b80600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260ff60016040600020015460b01c1690565b80600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260ff60016040600020015460a01c1690565b6001600160801b039182169082160391908211611b7657565b80600052600b60205260ff60016040600020015460a81c161561063b57600052600b60205260406000205460f81c90565b359064ffffffffff8216820361048057565b92919261338c826131bd565b60409461339b86519283612b86565b8195848352602080930191606080960285019481861161048057925b8584106133c75750505050505050565b8684830312610480578251906133dc82612b00565b6133e585612bc4565b8252858501359067ffffffffffffffff8216820361048057828792838b95015261341086880161336e565b868201528152019301926133b7565b3580151581036104805790565b356001600160a01b03811681036104805790565b356001600160801b03811681036104805790565b91908260409103126104805760405161346c81612b39565b602080829461347a81612a15565b84520135910152565b64ffffffffff80421682600052600b602052604060002091825482828260a01c1610156134e45760c81c1611156134d25760040154600110156134c957612c4590613525565b612c4590613714565b6001600160801b039150600201541690565b5050505050600090565b8051156134fb5760200190565b634e487b7160e01b600052603260045260246000fd5b80518210156134fb5760209160051b010190565b64ffffffffff90814216906000908152600b60205260409081812082519361354c85612b55565b8154956001600160a01b039182881687526020870197828160a01c168952828160c81c168789015260ff8160f01c161515606089015260f81c1515608088015260ff6001938486015490811660a08a0152818160a01c16151560c08a0152818160a81c16151560e08a015260b01c1615156101008801526101406135e660046135d760028801613282565b966101208b01978852016131d5565b97019187835280876135f8889a6134ee565b5101511693828288965b16106136dc57509161368c6136919284888161369698976001600160801b039e8f61362e8b8a51613511565b5151169d8a8f9b602061364b67ffffffffffffffff928d51613511565b5101511699848361365d848451613511565b51015116965081156136d05761367b92935051906000190190613511565b5101511680925b03169203166149e6565b614bc6565b614ad8565b9283136136af5750506136a983916149aa565b16011690565b5160200151929392831692841683101591506136cb9050575090565b905090565b50505051168092613682565b8094986001600160801b0390816136f48c8851613511565b51511601169801938282808a61370b898951613511565b51015116613602565b64ffffffffff613749600091838352600b60205280806040852054818160a01c1693849160c81c1603169181421603166149e6565b91808252600b602052600460408320018054156137cf5790829167ffffffffffffffff93526137a16020832054828452600b6020526136916001600160801b03968760026040882001541696879360801c1690614bc6565b9283136137b75750506137b3906149aa565b1690565b60029350604092508152600b60205220015460801c90565b602483634e487b7160e01b81526032600452fd5b80600052600b602052604060002060ff600182015460a01c1660001461380a575050600490565b805460f81c613863575460a01c64ffffffffff16421061385d5761382d81613483565b90600052600b6020526001600160801b03806002604060002001541691161060001461385857600190565b600290565b50600090565b5050600390565b80600052600b6020526138836002604060002001613282565b81600052600b602052604060002060ff600182015460a01c166000146138b657506001600160801b039150602001511690565b5460f81c6138c85750612c4590613483565b612c4591506001600160801b036040818351169201511690613324565b906001600160a01b036001541660206001600160a01b0360c0850151166024604051809481937fdcf844a700000000000000000000000000000000000000000000000000000000835260048301525afa801561098b57600090614198575b61396691506001600160801b0360a08501511690602060e08601510151916147d3565b6001600160801b0381511661010084015164ffffffffff602086015116821561416e5781518015614144577f00000000000000000000000000000000000000000000000000000000000000008111614113575064ffffffffff60406139ca846134ee565b510151168110156140bc5750600090819082815184905b808210614029575050505064ffffffffff421664ffffffffff8216811015613fe95750506001600160801b0316808203613fb25750506009549283600052600b6020526040600020916001600160801b0381511660028401906001600160801b03198254161790556001600160a01b0360c083015116600184015490750100000000000000000000000000000000000000000060408501511515928654927fffffffffffffffffff0000ff000000000000000000000000000000000000000076ff000000000000000000000000000000000000000000006060890151151560b01b16921617171760018601556001600160a01b0384511691610100850151926040613af3855195600019870190613511565b510151927fff000000000000000000000000000000000000000000000000000000000000007eff0000000000000000000000000000000000000000000000000000000000007dffffffffff0000000000000000000000000000000000000000000000000078ffffffffff000000000000000000000000000000000000000060208b015160a01b169660c81b169460f01b16911617171717845560005b818110613ee2575050600185016009556001600160a01b0360c08301511660005260026020526001600160801b0380604060002054168160208401511601166001600160a01b0360c0840151166000526040600020906001600160801b03198254161790556001600160a01b036080830151168015613e9e57613c31613c2b8760005260056020526001600160a01b0360406000205416151590565b15614346565b613c3a866132b6565b1580613e95575b80613e8d575b613e755760206000805160206157e683398151915291613c80613c2b8960005260056020526001600160a01b0360406000205416151590565b806000526006825260406000206001815401905587600052600582526040600020816001600160a01b0319825416179055876040519160007fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8180a4878152a1613d106001600160a01b0360c0840151166001600160801b038084511681602086015116011690309033906141cc565b6001600160801b0360408201511680613e46575b507fef3d668acee46576ad5d407c42ab4d0cde13f3cd70b28f09a0fb9e3bf5bf09cb613e036001600160a01b03845116926001600160a01b03608086015116946001600160a01b0360c08201511696613e3b613e1b60408401511515928c606086015115156001600160a01b0360e061010089015194549864ffffffffff6040519a613daf8c612b39565b818160a01c168c5260c81c1660208b01520151511695604051998a99610160948b523360208c015260408b0190604090816001600160801b0391828151168552826020820151166020860152015116910152565b60a089015260c08801528060e0880152860190612a8f565b926101008501906020908164ffffffffff91828151168552015116910152565b6101408301520390a4565b613e6f906001600160a01b0360c0850151166001600160a01b0360e086015151169033906141cc565b38613d24565b60248660405190630da9b01360e01b82526004820152fd5b506000613c47565b50801515613c41565b606460405162461bcd60e51b815260206004820152602060248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152fd5b613ef181610100860151613511565b519060048601549168010000000000000000831015611fe057600183018060048901558310156134fb5760019260048801600052602060002001906001600160801b03815116908254917fffffff00000000000000000000000000000000000000000000000000000000007cffffffffff000000000000000000000000000000000000000000000000604077ffffffffffffffff00000000000000000000000000000000602086015160801b1694015160c01b169316171717905501613b8f565b60449250604051917fd90b7e3900000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b6040517f210aec0e00000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b919350919361404d906001600160801b036140448588613511565b5151169061474f565b9364ffffffffff8060406140618685613511565b5101511694168085111561407f5750600184930191929190926139e1565b8385606492604051927f7b0bada8000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b64ffffffffff60406140cd846134ee565b5101516040517fb4c9e52c00000000000000000000000000000000000000000000000000000000815264ffffffffff938416600482015291169091166024820152604490fd5b602490604051907f4757689b0000000000000000000000000000000000000000000000000000000082526004820152fd5b60046040517f3952c64e000000000000000000000000000000000000000000000000000000008152fd5b60046040517f6095d3bc000000000000000000000000000000000000000000000000000000008152fd5b6020823d6020116141c4575b816141b160209383612b86565b810103126131a557506139669051613943565b3d91506141a4565b9290604051927f23b872dd0000000000000000000000000000000000000000000000000000000060208501526001600160a01b03809216602485015216604483015260648201526064815260a081019181831067ffffffffffffffff841117611fe05761423b9260405261423d565b565b6001600160a01b03169061429d60405161425681612b39565b6020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808587829751910182855af1614297612ff4565b91614912565b805191821591848315614322575b5050509050156142b85750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152fd5b9193818094500103126131a8578201519081151582036131a55750803880846142ab565b1561434d57565b606460405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152fd5b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036143c357565b60046040517fa1c0d6e5000000000000000000000000000000000000000000000000000000008152fd5b916001600160a01b03604051927fa9059cbb000000000000000000000000000000000000000000000000000000006020850152166024830152604482015260448152608081019181831067ffffffffffffffff841117611fe05761423b9260405261423d565b612c45906144608161386a565b90600052600b60205260026040600020015460801c90613324565b91908110156134fb5760051b0190565b6144af6000805160206157e6833981519152936020936144a9614391565b836144b8565b604051908152a1565b906144c2826132ed565b614737576144e682600052600b6020526001600160a01b0360406000205416331490565b91821580614727575b611f55576000928184526020600581526001600160a01b0393604091858388205416938061471b575b6146f6578582169586156146e6576001600160801b03808a16998a156146cf5761454188614453565b8281168c116146a05750926145f58b89946001898e7f40b88e5c41c5a97ffb7b6ef88a0a2d505aa0c634cf8a0275cb236ea7dd87ed4d978f9a6145976145c0918c8552600b8b526002868620015460801c61474f565b8b8452600b8a5260028585200190836001600160801b031983549260801b169116178155613282565b906145db818a84015116928286818351169201511690613324565b161115614672575b888152600b87522001541696876143ed565b85518b8152a48133141580614668575b614612575b505050505050565b813b15614664576084929185915196879586946313375c3b60e01b86526004860152336024860152604485015260648401525af1614655575b808080808061460a565b61465e90612b72565b3861464b565b8480fd5b50813b1515614605565b888152600b8752818120838101600160a01b60ff60a01b1982541617905560ff60f01b1981541690556145e3565b865163287ecaef60e21b8152600481018a90526001600160801b03928316602482015291166044820152606490fd5b60248887519063d2aabcd960e01b82526004820152fd5b6004845163630d074f60e11b8152fd5b6064858784865192632dcbf6b960e11b84526004840152336024840152166044820152fd5b50838683161415614518565b506147318161476a565b156144ef565b60248260405190634a5541ef60e01b82526004820152fd5b9190916001600160801b0380809416911601918211611b7657565b60009080825260056020526001600160a01b0380604084205416928333149384156147af575b5050821561479d57505090565b9091506147aa3392612c48565b161490565b60ff9294509060409181526008602052818120338252602052205416913880614790565b9092916147de613263565b936001600160801b03928381169182156148ea5767016345785d8a00008082116148b35780851161487c575061482885614819819386615736565b16946020890195865284615736565b16918461483f60408901948086528287511661474f565b1610156148665761485884918261486195511690613324565b91511690613324565b168252565b634e487b7160e01b600052600160045260246000fd5b84604491604051917f4fea5c1a00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449250604051917f47152d6700000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b505050505090506040516148fd81612b00565b60008152600060208201526000604082015290565b919290156149735750815115614926575090565b3b1561492f5790565b606460405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152fd5b8251909150156149865750805190602001fd5b6104f19060405191829162461bcd60e51b83526020600484015260248301906129c4565b600081126149b55790565b602490604051907f2463f3d50000000000000000000000000000000000000000000000000000000082526004820152fd5b90600160ff1b808314908115614ace575b50614aa4576000821215614a9b57614a20826000035b6000831215614a9457826000039061566c565b917f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8311614a5e5760009160001991181315614a5a575090565b0390565b604491604051917fd49c26b300000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b829061566c565b614a2082614a0d565b60046040517f9fe2b450000000000000000000000000000000000000000000000000000000008152fd5b90508114386149f7565b90600160ff1b808314908115614bbc575b50614b92576000821215614b8957614b12826000035b6000831215614b82578260000390615736565b917f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8311614b4c5760009160001991181315614a5a575090565b604491604051917f120b5b4300000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b8290615736565b614b1282614aff565b60046040517fa6070c25000000000000000000000000000000000000000000000000000000008152fd5b9050811438614ae9565b80614be05750600090612c455750670de0b6b3a764000090565b90670de0b6b3a7640000808314614c2d575080614c05575050670de0b6b3a764000090565b670de0b6b3a76400008114614c2957614c2490613691612c4593615517565b614c63565b5090565b91505090565b8015614c4d576ec097ce7bc90715b34b9f10000000000590565b634e487b7160e01b600052601260045260246000fd5b6000811215614c925768033dd1780914b9711419811261385d57614c8990600003614c63565b612c4590614c33565b680a688906bd8affffff81136154e657670de0b6b3a764000080604092831b05907780000000000000000000000000000000000000000000000067ff0000000000000083166153c9575b66ff00000000000083166152c1575b65ff000000000083166151c1575b64ff0000000083166150c9575b63ff0000008316614fd9575b62ff00008316614ef1575b61ff008316614e11575b60ff8316614d3a575b02911c60bf031c90565b60808316614dff575b838316614ded575b60208316614ddb575b60108316614dc9575b60088316614db7575b60048316614da5575b60028316614d93575b6001831615614d30576801000000000000000102831c614d30565b6801000000000000000102831c614d78565b6801000000000000000302831c614d6f565b6801000000000000000602831c614d66565b6801000000000000000b02831c614d5d565b6801000000000000001602831c614d54565b6801000000000000002c02831c614d4b565b6801000000000000005902831c614d43565b6180008316614edf575b6140008316614ecd575b6120008316614ebb575b6110008316614ea9575b6108008316614e97575b6104008316614e85575b6102008316614e73575b610100831615614d2757680100000000000000b102831c614d27565b6801000000000000016302831c614e57565b680100000000000002c602831c614e4d565b6801000000000000058c02831c614e43565b68010000000000000b1702831c614e39565b6801000000000000162e02831c614e2f565b68010000000000002c5d02831c614e25565b680100000000000058b902831c614e1b565b628000008316614fc7575b624000008316614fb5575b622000008316614fa3575b621000008316614f91575b620800008316614f7f575b620400008316614f6d575b620200008316614f5b575b62010000831615614d1d576801000000000000b17202831c614d1d565b680100000000000162e402831c614f3e565b6801000000000002c5c802831c614f33565b68010000000000058b9102831c614f28565b680100000000000b172102831c614f1d565b68010000000000162e4302831c614f12565b680100000000002c5c8602831c614f07565b6801000000000058b90c02831c614efc565b638000000083166150b7575b634000000083166150a5575b63200000008316615093575b63100000008316615081575b6308000000831661506f575b6304000000831661505d575b6302000000831661504b575b6301000000831615614d125768010000000000b1721802831c614d12565b6801000000000162e43002831c61502d565b68010000000002c5c86002831c615021565b680100000000058b90c002831c615015565b6801000000000b17217f02831c615009565b680100000000162e42ff02831c614ffd565b6801000000002c5c85fe02831c614ff1565b68010000000058b90bfc02831c614fe5565b64800000000083166151af575b644000000000831661519d575b642000000000831661518b575b6410000000008316615179575b6408000000008316615167575b6404000000008316615155575b6402000000008316615143575b640100000000831615614d0657680100000000b17217f802831c614d06565b68010000000162e42ff102831c615124565b680100000002c5c85fe302831c615117565b6801000000058b90bfce02831c61510a565b68010000000b17217fbb02831c6150fd565b6801000000162e42fff002831c6150f0565b68010000002c5c8601cc02831c6150e3565b680100000058b90c0b4902831c6150d6565b6580000000000083166152af575b65400000000000831661529d575b65200000000000831661528b575b651000000000008316615279575b650800000000008316615267575b650400000000008316615255575b650200000000008316615243575b65010000000000831615614cf9576801000000b17218355102831c614cf9565b680100000162e430e5a202831c615223565b6801000002c5c863b73f02831c615215565b68010000058b90cf1e6e02831c615207565b680100000b1721bcfc9a02831c6151f9565b68010000162e43f4f83102831c6151eb565b680100002c5c89d5ec6d02831c6151dd565b6801000058b91b5bc9ae02831c6151cf565b668000000000000083166153b7575b664000000000000083166153a5575b66200000000000008316615393575b66100000000000008316615381575b6608000000000000831661536f575b6604000000000000831661535d575b6602000000000000831661534b575b6601000000000000831615614ceb5768010000b17255775c0402831c614ceb565b6801000162e525ee054702831c61532a565b68010002c5cc37da949202831c61531b565b680100058ba01fb9f96d02831c61530c565b6801000b175effdc76ba02831c6152fd565b680100162f3904051fa102831c6152ee565b6801002c605e2e8cec5002831c6152df565b68010058c86da1c09ea202831c6152d0565b67800000000000000083166154c7575b67400000000000000083166154b5575b67200000000000000083166154a3575b6710000000000000008316615491575b670800000000000000831661547f575b670400000000000000831661546d575b670200000000000000831661545b575b670100000000000000831615614cdc57680100b1afa5abcbed6102831c614cdc565b68010163da9fb33356d802831c615439565b680102c9a3e778060ee702831c615429565b6801059b0d31585743ae02831c615419565b68010b5586cf9890f62a02831c615409565b6801172b83c7d517adce02831c6153f9565b6801306fe0a31b7152df02831c6153e9565b5077b504f333f9de6484800000000000000000000000000000006153d9565b602490604051907f0360d0280000000000000000000000000000000000000000000000000000000082526004820152fd5b8060008083131561563b57670de0b6b3a76400009283811261560457506001925b808305906001600160801b03821160071b91821c9167ffffffffffffffff831160061b92831c63ffffffff811160051b90811c61ffff811160041b90811c60ff811160031b90811c91600f831160021b92831c936001978860038711811b96871c11961717171717171781810294811d908282146155f857506706f05b59d3b20000905b8482136155cc5750505050500290565b808391020590671bc16d674ec800008212156155eb575b831d906155bc565b8091950194831d906155e3565b93505093925050020290565b6000199392508015615627576ec097ce7bc90715b34b9f10000000000591615538565b602482634e487b7160e01b81526012600452fd5b602483604051907f059b101b0000000000000000000000000000000000000000000000000000000082526004820152fd5b670de0b6b3a764000091600019838309928083029283808610950394808603951461572857828510156156ec57908291096001821901821680920460028082600302188083028203028083028203028083028203028083028203028083028203028092029003029360018380600003040190848311900302920304170290565b82606492604051927f63a05778000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b505080925015614c4d570490565b909190600019838209838202918280831092039180830392146157d457670de0b6b3a7640000908183101561579d57947faccb18165bd6fe31ae1cf318dc5b51eee0e1ba569b88cd74c1773b91fac1066994950990828211900360ee1b910360121c170290565b60449086604051917f5173648d00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050670de0b6b3a76400009004915056fef8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7a164736f6c6343000815000a"; bytes public constant BYTECODE_LOCKUP_LINEAR = - hex"60a034620003e757601f196001600160401b03601f620048b23881900382810185168601919084831187841017620003ec57808792606094604052833981010312620003e75783516001600160a01b03928382169291839003620003e7576020918287015196858816809803620003e75760400151948516809503620003e7576200008962000402565b90601c82527f5361626c696572205632204c6f636b7570204c696e656172204e46540000000084830152620000bd62000402565b601181527029a0a116ab1916a627a1a5aaa816a624a760791b8582015230608052600080546001600160a01b031990811688178255600180548216909b178b5596817fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a38351858111620003d35760039485548c81811c91168015620003c8575b89821014620003b45790818684931162000361575b508890868311600114620002f8578492620002ec575b505060001982871b1c1916908b1b1784555b8151948511620002d8576004958654998b8b811c9b168015620002cd575b828c1014620002ba57848b1162000271575b869798999a50819487116001146200020a57505093620001fe575b505082871b92600019911b1c19161790555b600a541617600a5560095560405161448f908162000423823960805181613f9e0152f35b015191503880620001c8565b8883528183208c9890969594939116915b8282106200025757505085116200023c575b50505050811b019055620001da565b01519060f884600019921b161c19169055388080806200022d565b8484015187558c989096019593840193908101906200021b565b87835281832085880160051c81019b838910620002af575b860160051c019a8c905b8c8110620002a3575050620001ad565b848155018c9062000293565b909b508b9062000289565b634e487b7160e01b835260228852602483fd5b9a607f169a6200019b565b634e487b7160e01b81526041600452602490fd5b0151905038806200016b565b908c8e9416918886528a862092865b8c82821062000341575050841162000328575b505050811b0184556200017d565b015160001983891b60f8161c191690553880806200031a565b91929395968291958786015181550195019301908f959493929162000307565b9091508684528884208680850160051c8201928b8610620003aa575b918f91869594930160051c01915b8281106200039b57505062000155565b8681558594508f91016200038b565b925081926200037d565b634e487b7160e01b84526022600452602484fd5b90607f169062000140565b634e487b7160e01b82526041600452602482fd5b600080fd5b634e487b7160e01b600052604160045260246000fd5b60408051919082016001600160401b03811183821017620003ec5760405256fe608080604052600436101561001357600080fd5b600090813560e01c90816301ffc9a71461296e5750806306fdde03146128ac578063081812fc1461288d578063095ea7b3146126fe5780631400ecec1461265e5780631b4103a9146125435780631c1cdd4c146124de5780631e99d569146124c057806323b872dd1461249657806339a73c031461245557806340e58ee51461207b578063425d30dd1461205c57806342842e0e1461200c57806342966c6814611f1a5780634857501f14611e905780634869e12d14611e555780634bc78b7314611d405780635fe3b56714611d195780636352211e14611ce95780636d0cee7514611c9357806370a0823114611bea57806375829def14611b57578063780a82c814611b075780637cad6cd114611a365780637de6b1db1461184b5780638659c27014611413578063894e9a0d146111e25780638bad38dd146111655780638f69b993146110c95780639067b6771461107657806395d89b4114610f69578063a22cb46514610e98578063a2ffb89714610c43578063a6202bf214610b3d578063a80fc07114610aeb578063ad35efd414610a89578063b88d4fde146109f8578063b8a3be66146109c3578063b971302a14610974578063bc063e1a14610951578063bc2be1be14610901578063c156a11d14610834578063c87b56dd146106f6578063cc364f481461064a578063d4dbd20b146105f8578063d511609f146105ac578063d975dfed14610560578063e985e9c51461050b578063ea5ead19146104e5578063eac8f5b81461047c578063f590c17614610453578063f851a4401461042d5763fdd46d601461026857600080fd5b3461042a57606036600319011261042a57600435610284612a9d565b61028c612bdc565b90610295613f94565b61029e836131c3565b610412576102c283600052600b6020526001600160a01b0360406000205416331490565b1580610402575b6103df576102ed83600052600b6020526001600160a01b0360406000205416331490565b806103bd575b610390576001600160a01b03811615610366576001600160801b0382161561034e57916103446020927ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce794836140bf565b604051908152a180f35b6024836040519063d2aabcd960e01b82526004820152fd5b60046040517fc61a0e9e000000000000000000000000000000000000000000000000000000008152fd5b826001600160a01b0360649260405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b5082845260056020526001600160a01b038060408620541690821614156102f3565b60405163216caf0d60e01b815260048101849052336024820152604490fd5b0390fd5b5061040c836142e7565b156102c9565b60248360405190634a5541ef60e01b82526004820152fd5b80fd5b503461042a578060031936011261042a576001600160a01b036020915416604051908152f35b503461042a57602036600319011261042a576020610472600435613229565b6040519015158152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760016040836001600160a01b039360209552600b855220015416604051908152f35b6024906040519062b8e7e760e51b82526004820152fd5b503461042a57604036600319011261042a57600435610502612a9d565b61028c82614056565b503461042a57604036600319011261042a57610525612a87565b604061052f612a9d565b926001600160a01b0380931681526008602052209116600052602052602060ff604060002054166040519015158152f35b503461042a57602036600319011261042a5760ff6001604060043593848152600b60205220015460d01c16156104ce5761059b602091614056565b6001600160801b0360405191168152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760408260029260209452600b845220015460801c604051908152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760036040836001600160801b039360209552600b855220015416604051908152f35b503461042a57602036600319011261042a57600435610667613170565b50808252600b60205260ff600160408420015460d01c16156104ce578160409160609352600b60205220805490600164ffffffffff91015481604051936106ad85612b49565b818160a01c16855260c81c16602084015260a01c1660408201526106f460405180926040908164ffffffffff91828151168552826020820151166020860152015116910152565bf35b503461042a576020806003193601126108205760043561073461072f8260005260056020526001600160a01b0360406000205416151590565b612bf2565b826001600160a01b03600a5416916044604051809481937fe9dc637500000000000000000000000000000000000000000000000000000000835230600484015260248301525afa9283156108285780936107a3575b505061079f604051928284938452830190612a62565b0390f35b909192503d8082843e6107b68184612b9e565b82019183818403126108205780519067ffffffffffffffff8211610824570182601f82011215610820578051916107ec83612bc0565b936107fa6040519586612b9e565b83855285848401011161042a57509061081891848085019101612a3f565b903880610789565b5080fd5b8280fd5b604051903d90823e3d90fd5b503461042a57604036600319011261042a57600435610851612a9d565b610859613f94565b818352600b60205260ff600160408520015460d01c16156108ea5781835260056020526001600160a01b036040842054168033036103df5791610344816020937ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7956108c483614056565b6001600160801b0381166108d9575b50612e85565b6108e49082856140bf565b386108d3565b6024826040519062b8e7e760e51b82526004820152fd5b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760408264ffffffffff9260209452600b8452205460a01c16604051908152f35b503461042a578060031936011261042a57602060405167016345785d8a00008152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce576040826001600160a01b039260209452600b8452205416604051908152f35b503461042a57602036600319011261042a5760ff600160406020936004358152600b855220015460d01c166040519015158152f35b503461042a57608036600319011261042a57610a12612a87565b610a1a612a9d565b906064359067ffffffffffffffff8211610a855736602383011215610a855781600401359284610a4985612bc0565b93610a576040519586612b9e565b85855236602487830101116108205785610a8296602460209301838801378501015260443591612d10565b80f35b8380fd5b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce57610ac29061349f565b604051906005811015610ad757602092508152f35b602483634e487b7160e01b81526021600452fd5b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760026040836001600160801b039360209552600b855220015416604051908152f35b503461042a57602036600319011261042a57610b57612a87565b6001600160a01b0380835416338103610c1a575081169081835260026020526001600160801b03604084205416908115610be95781610bba918486526002602052604086206fffffffffffffffffffffffffffffffff1981541690553390613ff0565b6040519081527fca7a4a65a94ed2f37538814e00e1cd4c41a78261561e3f3794592f11409cf5af60203392a380f35b602483604051907f8410168c0000000000000000000000000000000000000000000000000000000082526004820152fd5b6040516331b339a960e21b81526001600160a01b03919091166004820152336024820152604490fd5b503461042a57606036600319011261042a5767ffffffffffffffff60043581811161082457610c76903690600401612ae8565b91610c7f612a9d565b90604435908111610e9457610c98903690600401612ae8565b9093610ca2613f94565b818103610e5e57855b818110610cb6578680f35b610cc181838761407e565b35610ccd82858961407e565b356001600160801b0381168103610e5957610ce6613f94565b610cef826131c3565b610e4157610d1382600052600b6020526001600160a01b0360406000205416331490565b1580610e31575b610e1257610d3e82600052600b6020526001600160a01b0360406000205416331490565b80610dea575b610dbd576001600160a01b03861615610366576001600160801b03811615610da557602082610d987ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce79389600197966140bf565b604051908152a101610cab565b6024826040519063d2aabcd960e01b82526004820152fd5b6064826001600160a01b038860405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b5081895260056020526001600160a01b0360408a2054166001600160a01b0387161415610d44565b60405163216caf0d60e01b815260048101839052336024820152604490fd5b50610e3b826142e7565b15610d1a565b60248260405190634a5541ef60e01b82526004820152fd5b600080fd5b604491604051917faec9344000000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b8480fd5b503461042a57604036600319011261042a57610eb2612a87565b60243590811515809203610e59576001600160a01b031690813314610f255733835260086020526040832082600052602052604060002060ff1981541660ff83161790556040519081527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3160203392a380f35b606460405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c6572000000000000006044820152fd5b503461042a578060031936011261042a57604051908060045491600183811c9281851694851561106c575b602095868610811461105857858852879493929187908215611036575050600114610fdc575b5050610fc892500383612b9e565b61079f604051928284938452830190612a62565b90859250600482527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b5b85831061101e575050610fc893508201013880610fba565b80548389018501528794508693909201918101611006565b9250935050610fc894915060ff191682840152151560051b8201013880610fba565b602483634e487b7160e01b81526022600452fd5b93607f1693610f94565b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce57600160408364ffffffffff9360209552600b855220015460a01c16604051908152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce576111029061349f565b90600582101590816111435760028314918215611157575b821561112e575b6020836040519015158152f35b90915061114357506004602091143880611121565b80634e487b7160e01b602492526021600452fd5b50600383149150600061111a565b503461042a57602036600319011261042a576004356001600160a01b03908181168091036108245781835416338103610c1a575060015491816001600160a01b03198416176001556040519216825260208201527fdcb09aef4bf01068924ccce937981cbe59d25ba08380cf941aaaea4e4bd3960d60403392a280f35b503461042a57602036600319011261042a5760405161120081612b65565b8181528160208201528160408201528160608201528160808201528160a08201528160c08201528160e08201528161010082015261012061123f613170565b9101526004358152600b60205260ff600160408320015460d01c16156113fb576004358152600b6020526040812061130a60026040519261127f84612b65565b80546001600160a01b038116855264ffffffffff8160a01c16602086015264ffffffffff8160c81c16604086015260ff8160f01c161515606086015260f81c1515608085015260ff60018201546001600160a01b03811660a087015264ffffffffff8160a01c1660c0870152818160c81c16151560e087015260d01c1615156101008501520161318f565b61012082015261131b60043561349f565b6005811015610ad75791600261018093146113f0575b506106f4610120604051926001600160a01b03815116845264ffffffffff602082015116602085015264ffffffffff60408201511660408501526060810151151560608501526080810151151560808501526001600160a01b0360a08201511660a085015264ffffffffff60c08201511660c085015260e0810151151560e085015261010081015115156101008501520151610120830190604090816001600160801b0391828151168552826020820151166020860152015116910152565b606082015238611331565b602460405162b8e7e760e51b81526004356004820152fd5b503461042a576020908160031936011261042a5760043567ffffffffffffffff81116108205761144883913690600401612ae8565b90611451613f94565b83915b80831061145f578480f35b61146e8382849795969761407e565b3593611478613f94565b611481856131c3565b1561149e5760248560405190634a5541ef60e01b82526004820152fd5b909192936114ab81613229565b611833576114cf81600052600b6020526001600160a01b0360406000205416331490565b1580611815575b6117f5576114e38161325a565b818652600b908188526114fb6002604089200161318f565b6001600160801b03918282511683821610156117dd57848952838a5260ff60408a205460f01c16156117c55792828261154d86838e6115438f9a829a60409e9d9a51166131fa565b94015116906131fa565b848752838652888720916115dc835494600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff871617855560038185169586156117ab575b0190831699818b6fffffffffffffffffffffffffffffffff19819454161790556001600160a01b0380971696879160058c52818f82205416998c5260019e8f9120015416613ff0565b3384036116d757843b611650575b50507f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd260407ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce79786935b825191825288820152a4604051908152a1019190939293611454565b90919293809596503b156116d3576040516372eba20360e01b8152600481018790526001600160a01b03851660248201526001600160801b039182166044820152911660648201528b94939291908b90818160848183895af1156115ea576116be9192939597949650612b35565b6116cf57918a939194928a8d6115ea565b8980fd5b8b80fd5b833b61172c575b50507f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd260407ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7978693611634565b90919280949596503b156116d3576040516372eba20360e01b8152600481018790526001600160a01b03861660248201526001600160801b039182166044820152911660648201528b94939291908b90818160848183885af1156116de5761179a9192939597949650612b35565b6116cf57918a939194928a8d6116de565b60018101600160c81b60ff60c81b19825416179055611593565b602485604051906339c6dc7360e21b82526004820152fd5b602485604051906322cad1af60e11b82526004820152fd5b60405163216caf0d60e01b81526004810191909152336024820152604490fd5b50808552600586526001600160a01b036040862054163314156114d6565b6024906040519063fe19f19f60e01b82526004820152fd5b503461042a57602080600319360112610820576004359061186a613f94565b818352600b815260ff600160408520015460d01c16156108ea5761188d8261349f565b6005811015611a2257600481036118b65760248360405190634a5541ef60e01b82526004820152fd5b600381036118d6576024836040519063fe19f19f60e01b82526004820152fd5b600214611a0a576118fd82600052600b6020526001600160a01b0360406000205416331490565b15610e1257818352600b815260ff604084205460f01c16156119f257818352600b81526040832060ff60f01b19815416905560058152826001600160a01b03604082205416803b61199b575b50506040517ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce792807f0eb069207093cd3e51cd1370d2d369770057fbe29947e577e5fb428c6c6fc78f8680a28152a180f35b803b15610820578180916024604051809481937f341a0bd90000000000000000000000000000000000000000000000000000000083528960048401525af115611949576119e790612b35565b610824578238611949565b602482604051906339c6dc7360e21b82526004820152fd5b602482604051906322cad1af60e11b82526004820152fd5b602484634e487b7160e01b81526021600452fd5b503461042a57602036600319011261042a576004356001600160a01b03908181168091036108245781835416338103610c1a5750600a5491816001600160a01b0319841617600a556040519216825260208201527fa2548bd4b805e907c1558a47b5858324fe8bb4a2e1ddfca647eecbf65610eebc60403392a26009546000198101908111611af35760407f6bd5c950a8d8df17f772f5af37cb3655737899cbf903264b9795592da439661c91815190600182526020820152a180f35b602482634e487b7160e01b81526011600452fd5b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce5760408264ffffffffff9260209452600b8452205460c81c16604051908152f35b503461042a57602036600319011261042a57611b71612a87565b9080546001600160a01b0380821693338503611bc3576001600160a01b03199394501691829116178255337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808380a380f35b6040516331b339a960e21b81526001600160a01b0386166004820152336024820152604490fd5b503461042a57602036600319011261042a576001600160a01b03611c0c612a87565b168015611c29578160409160209352600683522054604051908152f35b608460405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f74206120766160448201527f6c6964206f776e657200000000000000000000000000000000000000000000006064820152fd5b503461042a57602036600319011261042a576001600160a01b036040602092600435611cd861072f8260005260056020526001600160a01b0360406000205416151590565b815260058452205416604051908152f35b503461042a57602036600319011261042a576020611d08600435612c3d565b6001600160a01b0360405191168152f35b503461042a578060031936011261042a5760206001600160a01b0360015416604051908152f35b503461042a5761014036600319011261042a57611d5b613f94565b60405190611d6882612b19565b611d70612a87565b8252611d7a612a9d565b6020830152611d87612bdc565b60408301526001600160a01b03906064358281168103610e595760608401526084358015158103610e5957608084015260603660a319011261042a5750604051611dd081612b49565b64ffffffffff60a4358181168103610e5957825260c4358181168103610e5957602083015260e4359081168103610e5957604082015260a0830152604061010319360112610e595760405191611e2583612b82565b610104359182168203610e595782611e4d9260209452610124358482015260c08201526135a1565b604051908152f35b503461042a57602036600319011261042a5760ff6001604060043593848152600b60205220015460d01c16156104ce5761059b602091613526565b503461042a57602036600319011261042a5760043590818152600b60205260ff600160408320015460d01c16156108ea5780611ecb8361349f565b926005841015611f0657600260209403611eec575b50506040519015158152f35b8152600b8352604090205460f01c60ff1690503880611ee0565b602482634e487b7160e01b81526021600452fd5b503461042a57602036600319011261042a57600435611f37613f94565b611f40816131c3565b15611fdb57611f4e816142e7565b156117f557611f5c81612c3d565b5081611f6782612c3d565b82825260076020526001600160a01b0360408320916001600160a01b031992838154169055169081835260066020526040832060001981540190558383526005602052604083209081541690557fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8280a480f35b602490604051907f817cd6390000000000000000000000000000000000000000000000000000000082526004820152fd5b503461042a5761201b36612ab3565b60405191602083019383851067ffffffffffffffff86111761204657610a8294604052858452612d10565b634e487b7160e01b600052604160045260246000fd5b503461042a57602036600319011261042a5760206104726004356131c3565b503461042a57602080600319360112610820576004359061209a613f94565b6120a3826131c3565b156120c05760248260405190634a5541ef60e01b82526004820152fd5b6120c982613229565b61243d576120ed82600052600b6020526001600160a01b0360406000205416331490565b158061241f575b610e12576121018261325a565b91808452600b82526121186002604086200161318f565b6001600160801b039384825116858216101561240757828652600b845260ff604087205460f01c16156123ef578161215c82878761154360409683839951166131fa565b848852600b8452828820916121eb835498600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8b161785558a60038286169687156123d5575b019184169a828c6fffffffffffffffffffffffffffffffff198195541617905560016001600160a01b0380921698899360058c52600b8483832054169c5220015416613ff0565b3384036122c857908891853b61225b575b5050507f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd260407ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce79786935b825191825288820152a4604051908152a180f35b853b15610824576040516372eba20360e01b8152600481018890526001600160a01b03861660248201526001600160801b03918216604482015291166064820152818160848183895af16122b0575b806121fc565b6122b990612b35565b6122c45786386122aa565b8680fd5b83989792983b612322575b50507f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd2604085927ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce79899612247565b833b156123d1576040516372eba20360e01b8152600481018790526001600160a01b03861660248201526001600160801b03918216604482015291166064820152868160848183875af1612377575b806122d3565b604085927ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7986123c77f2971bd77136e1a620a6b1eb4ad5edd190e9fd391b26bfc5dea50b882fc6b9fd294612b35565b9850925050612371565b8780fd5b60018101600160c81b60ff60c81b198254161790556121a4565b602483604051906339c6dc7360e21b82526004820152fd5b602483604051906322cad1af60e11b82526004820152fd5b50818352600581526001600160a01b036040842054163314156120f4565b6024826040519063fe19f19f60e01b82526004820152fd5b503461042a57602036600319011261042a576001600160801b0360406020926001600160a01b03612484612a87565b16815260028452205416604051908152f35b503461042a57610a826124a836612ab3565b916124bb6124b68433612da6565b612c9f565b612e85565b503461042a578060031936011261042a576020600954604051908152f35b503461042a57602036600319011261042a57600435808252600b60205260ff600160408420015460d01c16156104ce576125179061349f565b9060058210156111435760208215838115612538575b506040519015158152f35b60019150148261252d565b503461042a5761012036600319011261042a5761255e613f94565b612566613170565b9064ffffffffff80421680845260a4358281168103610a855781018216602085015260c435908183168203610a855701166040830152606435916001600160a01b039081841680940361082457608435801515809103610a855760243594838616809603610e94576004359584871680970361265a57604435906001600160801b0382168092036122c457604051976125fe89612b19565b8852602088015260408701526060860152608085015260a0840152604060e319360112610820576040519161263283612b82565b60e435918216820361042a576020611e4d8585858152610104358482015260c08201526135a1565b8580fd5b503461042a57602036600319011261042a5760043590818152600b60205260ff600160408320015460d01c16156108ea57602091604082828152600b85522060ff815460f01c16806126ec575b6126c3575b50506001600160801b0360405191168152f35b6126e592506001600160801b0360026126df920154169161325a565b906131fa565b38806126b0565b5060ff600182015460c81c16156126ab565b503461042a57604036600319011261042a57612718612a87565b602435906001600160a01b03808061272f85612c3d565b1692169180831461282357803314908115612802575b501561279857828452600760205260408420826001600160a01b031982541617905561277083612c3d565b167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258480a480f35b608460405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c0000006064820152fd5b9050845260086020526040842033855260205260ff60408520541638612745565b608460405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560448201527f72000000000000000000000000000000000000000000000000000000000000006064820152fd5b503461042a57602036600319011261042a576020611d08600435612c62565b503461042a578060031936011261042a57604051908060035491600183811c92818516948515612964575b60209586861081146110585785885287949392918790821561103657505060011461290a575050610fc892500383612b9e565b90859250600382527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b5b85831061294c575050610fc893508201013880610fba565b80548389018501528794508693909201918101612934565b93607f16936128d7565b905034610820576020366003190112610820576004357fffffffff00000000000000000000000000000000000000000000000000000000811680910361082457602092507f80ac58cd000000000000000000000000000000000000000000000000000000008114908115612a15575b81156129eb575b5015158152f35b7f01ffc9a700000000000000000000000000000000000000000000000000000000915014386129e4565b7f5b5e139f00000000000000000000000000000000000000000000000000000000811491506129dd565b60005b838110612a525750506000910152565b8181015183820152602001612a42565b90602091612a7b81518092818552858086019101612a3f565b601f01601f1916010190565b600435906001600160a01b0382168203610e5957565b602435906001600160a01b0382168203610e5957565b6060906003190112610e59576001600160a01b03906004358281168103610e5957916024359081168103610e59579060443590565b9181601f84011215610e595782359167ffffffffffffffff8311610e59576020808501948460051b010111610e5957565b60e0810190811067ffffffffffffffff82111761204657604052565b67ffffffffffffffff811161204657604052565b6060810190811067ffffffffffffffff82111761204657604052565b610140810190811067ffffffffffffffff82111761204657604052565b6040810190811067ffffffffffffffff82111761204657604052565b90601f8019910116810190811067ffffffffffffffff82111761204657604052565b67ffffffffffffffff811161204657601f01601f191660200190565b604435906001600160801b0382168203610e5957565b15612bf957565b606460405162461bcd60e51b815260206004820152601860248201527f4552433732313a20696e76616c696420746f6b656e20494400000000000000006044820152fd5b60005260056020526001600160a01b0360406000205416612c5f811515612bf2565b90565b612c8561072f8260005260056020526001600160a01b0360406000205416151590565b60005260076020526001600160a01b036040600020541690565b15612ca657565b608460405162461bcd60e51b815260206004820152602d60248201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560448201527f72206f7220617070726f766564000000000000000000000000000000000000006064820152fd5b90612d34939291612d246124b68433612da6565b612d2f838383612e85565b612fdc565b15612d3b57565b60405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b906001600160a01b038080612dba84612c3d565b16931691838314938415612ded575b508315612dd7575b50505090565b612de391929350612c62565b1614388080612dd1565b909350600052600860205260406000208260005260205260ff604060002054169238612dc9565b15612e1b57565b608460405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201527f6f776e65720000000000000000000000000000000000000000000000000000006064820152fd5b90612ead91612e9384612c3d565b916001600160a01b03938493848094169485911614612e14565b16918215612f435781612eca91612ec386612c3d565b1614612e14565b7fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60008481526007602052604081206001600160a01b03199081815416905583825260066020526040822060001981540190558482526040822060018154019055858252600560205284604083209182541617905580a4565b608460405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f2061646460448201527f72657373000000000000000000000000000000000000000000000000000000006064820152fd5b3d15612fd7573d90612fbd82612bc0565b91612fcb6040519384612b9e565b82523d6000602084013e565b606090565b91926000929190813b156131665760209161304c91856040519586809581947f150b7a02000000000000000000000000000000000000000000000000000000009b8c84523360048501526001600160a01b0380951660248501526044840152608060648401526084830190612a62565b0393165af190829082613106575b50506130e057613068612fac565b805190816130db5760405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b602001fd5b7fffffffff00000000000000000000000000000000000000000000000000000000161490565b909192506020813d821161315e575b8161312260209383612b9e565b810103126108205751907fffffffff000000000000000000000000000000000000000000000000000000008216820361042a575090388061305a565b3d9150613115565b5050505050600190565b6040519061317d82612b49565b60006040838281528260208201520152565b9060405161319c81612b49565b6040819360018154916001600160801b0392838116865260801c6020860152015416910152565b80600052600b60205260ff60016040600020015460d01c16156104ce57600052600b60205260ff60016040600020015460c81c1690565b6001600160801b03918216908216039190821161321357565b634e487b7160e01b600052601160045260246000fd5b80600052600b60205260ff60016040600020015460d01c16156104ce57600052600b60205260406000205460f81c90565b600090808252600b6020526040822091825464ffffffffff42818360c81c16116133085780600186015460a01c1691824210156132f2576132a79394955060a01c16809103904203613310565b90828152600b6020526001600160801b03926132cd8460026040852001541680946133f0565b9283116132da5750501690565b60029350604092508152600b60205220015460801c90565b505050505060026001600160801b039101541690565b505091505090565b670de0b6b3a76400009160001983830992808302928380861095039480860395146133cc578285101561339057908291096001821901821680920460028082600302188083028203028083028203028083028203028083028203028083028203028092029003029360018380600003040190848311900302920304170290565b82606492604051927f63a05778000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b5050809250156133da570490565b634e487b7160e01b600052601260045260246000fd5b9091906000198382098382029182808310920391808303921461348e57670de0b6b3a7640000908183101561345757947faccb18165bd6fe31ae1cf318dc5b51eee0e1ba569b88cd74c1773b91fac1066994950990828211900360ee1b910360121c170290565b60449086604051917f5173648d00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050670de0b6b3a764000090049150565b80600052600b602052604060002060ff600182015460c81c166000146134c6575050600490565b805460f81c61351f575460a01c64ffffffffff164210613519576134e98161325a565b90600052600b6020526001600160801b03806002604060002001541691161060001461351457600190565b600290565b50600090565b5050600390565b80600052600b60205261353f600260406000200161318f565b81600052600b602052604060002060ff600182015460c81c1660001461357257506001600160801b039150602001511690565b5460f81c6135845750612c5f9061325a565b612c5f91506001600160801b0360408183511692015116906131fa565b906001600160a01b036001541660206001600160a01b036060850151166024604051809481937fdcf844a700000000000000000000000000000000000000000000000000000000835260048301525afa8015613d2b57600090613cf7575b61362291506001600160801b0360408501511690602060c0860151015191614350565b916001600160801b0383511660a08201519015613ccd5764ffffffffff815116602082019064ffffffffff82511690818111613c8d57505064ffffffffff604091511691019064ffffffffff8251169081811015613c4d57505064ffffffffff8042169151169081811015613c0d575050600954926001600160801b03815116604051906136af82612b49565b815260006020820152600060408201526001600160a01b036060840151169060a08401519164ffffffffff6020840151169064ffffffffff60408501511691608087015115159064ffffffffff6001600160a01b038951169651166040519661371788612b65565b87526020870152604086015260608501526000608085015260a084015260c0830152600060e0830152600161010083015261012082015284600052600b60205260406000206001600160a01b038251166001600160a01b03198254161781556137a864ffffffffff602084015116829064ffffffffff60a01b1964ffffffffff60a01b83549260a01b169116179055565b604082015181547eff0000000000000000000000000000000000000000000000000000000000006060850151151560f01b169078ffffffffffffffffffffffffffffffffffffffffffffffffff7dffffffffff000000000000000000000000000000000000000000000000007fff000000000000000000000000000000000000000000000000000000000000006080880151151560f81b169460c81b1691161717178155600181016001600160a01b0360a0840151166001600160a01b031982541617815561389f64ffffffffff60c085015116829064ffffffffff60a01b1964ffffffffff60a01b83549260a01b169116179055565b60e083015181546101008501517fffffffffff0000ffffffffffffffffffffffffffffffffffffffffffffffffff90911691151560c81b79ff00000000000000000000000000000000000000000000000000169190911790151560d01b7aff000000000000000000000000000000000000000000000000000016179055610120909101518051602082015160801b6fffffffffffffffffffffffffffffffff199081166001600160801b03928316176002850155926040906003019201511682825416179055600185016009556001600160a01b0360608401511660005260026020526001600160801b0380604060002054168160208501511601166001600160a01b036060850151166000526040600020918254161790556001600160a01b036020830151168015613bc95784906139f76139f18360005260056020526001600160a01b0360406000205416151590565b15613eb1565b613a1a6139f18360005260056020526001600160a01b0360406000205416151590565b8060005260066020526040600020600181540190558160005260056020526040600020816001600160a01b031982541617905560007fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8180a4613aa36001600160a01b036060840151166001600160801b03808451168160208601511601169030903390613d37565b6001600160801b0360408201511680613b9a575b506001600160a01b038251167f6a14b1f86e996f59f3a5a72afa0f99cc59199944c80ad4f7260c9b3e3a07b1106101406001600160a01b03602086015116936001600160a01b0360608701511695613b9160808201511515916001600160a01b0360c060a0830151920151511692613b61604051958d87523360208801526040870190604090816001600160801b0391828151168552826020820151166020860152015116910152565b60a0850152805164ffffffffff90811660c08601526020820151811660e086015260409091015116610100840152565b610120820152a4565b613bc3906001600160a01b036060850151166001600160a01b0360c08601515116903390613d37565b38613ab7565b606460405162461bcd60e51b815260206004820152602060248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152fd5b6040517f210aec0e00000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b6040517f9fee269100000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b6040517f4c23297000000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b60046040517f6095d3bc000000000000000000000000000000000000000000000000000000008152fd5b6020823d602011613d23575b81613d1060209383612b9e565b8101031261042a575061362290516135ff565b3d9150613d03565b6040513d6000823e3d90fd5b9290604051927f23b872dd0000000000000000000000000000000000000000000000000000000060208501526001600160a01b03809216602485015216604483015260648201526064815260a081019181831067ffffffffffffffff84111761204657613da692604052613da8565b565b6001600160a01b031690613e08604051613dc181612b82565b6020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808587829751910182855af1613e02612fac565b91613efc565b805191821591848315613e8d575b505050905015613e235750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152fd5b9193818094500103126108205782015190811515820361042a575080388084613e16565b15613eb857565b606460405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152fd5b91929015613f5d5750815115613f10575090565b3b15613f195790565b606460405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152fd5b825190915015613f705750805190602001fd5b6103fe9060405191829162461bcd60e51b8352602060048401526024830190612a62565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003613fc657565b60046040517fa1c0d6e5000000000000000000000000000000000000000000000000000000008152fd5b916001600160a01b03604051927fa9059cbb000000000000000000000000000000000000000000000000000000006020850152166024830152604482015260448152608081019181831067ffffffffffffffff84111761204657613da692604052613da8565b612c5f9061406381613526565b90600052600b60205260026040600020015460801c906131fa565b919081101561408e5760051b0190565b634e487b7160e01b600052603260045260246000fd5b9190916001600160801b038080941691160191821161321357565b929190926001600160801b03806140d583614056565b1692818116938085116142aa5750600095838752602092600b84526141486141086040946002868c20015460801c6140a4565b868a52600b86526141436002868c20019182906001600160801b036fffffffffffffffffffffffffffffffff1983549260801b169116179055565b61318f565b906141638186840151169282868183511692015116906131fa565b16111561427b575b838752600b83526001600160a01b039161418e8683856001858d20015416613ff0565b848852600584528281892054168033141580614271575b6141da575b507ffa54f9f9bdcdd28778cbb9f78490df6691cc4e2729588e10f4cc0a26c465686a9495969750519586521693a3565b803b1561426d5797807ffa54f9f9bdcdd28778cbb9f78490df6691cc4e2729588e10f4cc0a26c465686a9697989960848451809481937f13375c3b0000000000000000000000000000000000000000000000000000000083528c600484015233602484015289891660448401528d60648401525af161425e575b88979695506141aa565b61426790612b35565b38614254565b8880fd5b50803b15156141a5565b838752600b835281872060018101600160c81b60ff60c81b1982541617905560ff60f01b19815416905561416b565b8360649186604051927fa1fb2bbc000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b60009080825260056020526001600160a01b03806040842054169283331493841561432c575b5050821561431a57505090565b9091506143273392612c62565b161490565b60ff929450906040918152600860205281812033825260205220541691388061430d565b90929161435b613170565b936001600160801b03928381169182156144675767016345785d8a0000808211614430578085116143f957506143a5856143968193866133f0565b169460208901958652846133f0565b1691846143bc6040890194808652828751166140a4565b1610156143e3576143d58491826143de955116906131fa565b915116906131fa565b168252565b634e487b7160e01b600052600160045260246000fd5b84604491604051917f4fea5c1a00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449250604051917f47152d6700000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050505050905060405161447a81612b49565b6000815260006020820152600060408201529056"; + hex"60a034620003e757601f196001600160401b03601f62004c523881900382810185168601919084831187841017620003ec57808792606094604052833981010312620003e75783516001600160a01b03928382169291839003620003e7576020918287015196858816809803620003e75760400151948516809503620003e7576200008962000402565b90601c82527f5361626c696572205632204c6f636b7570204c696e656172204e46540000000084830152620000bd62000402565b601181527029a0a116ab1916a627a1a5aaa816a624a760791b8582015230608052600080546001600160a01b031990811688178255600180548216909b178b5596817fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808180a38351858111620003d35760039485548c81811c91168015620003c8575b89821014620003b45790818684931162000361575b508890868311600114620002f8578492620002ec575b505060001982871b1c1916908b1b1784555b8151948511620002d8576004958654998b8b811c9b168015620002cd575b828c1014620002ba57848b1162000271575b869798999a50819487116001146200020a57505093620001fe575b505082871b92600019911b1c19161790555b600a541617600a5560095560405161482f9081620004238239608051816143320152f35b015191503880620001c8565b8883528183208c9890969594939116915b8282106200025757505085116200023c575b50505050811b019055620001da565b01519060f884600019921b161c19169055388080806200022d565b8484015187558c989096019593840193908101906200021b565b87835281832085880160051c81019b838910620002af575b860160051c019a8c905b8c8110620002a3575050620001ad565b848155018c9062000293565b909b508b9062000289565b634e487b7160e01b835260228852602483fd5b9a607f169a6200019b565b634e487b7160e01b81526041600452602490fd5b0151905038806200016b565b908c8e9416918886528a862092865b8c82821062000341575050841162000328575b505050811b0184556200017d565b015160001983891b60f8161c191690553880806200031a565b91929395968291958786015181550195019301908f959493929162000307565b9091508684528884208680850160051c8201928b8610620003aa575b918f91869594930160051c01915b8281106200039b57505062000155565b8681558594508f91016200038b565b925081926200037d565b634e487b7160e01b84526022600452602484fd5b90607f169062000140565b634e487b7160e01b82526041600452602482fd5b600080fd5b634e487b7160e01b600052604160045260246000fd5b60408051919082016001600160401b03811183821017620003ec5760405256fe608080604052600436101561001357600080fd5b600090813560e01c90816301ffc9a714612dd45750806306fdde0314612d12578063081812fc14612cf3578063095ea7b314612b645780631400ecec14612ac45780631c1cdd4c14612a5f5780631e99d56914612a4157806323b872dd14612a1757806339a73c03146129d657806340e58ee514612738578063425d30dd1461271957806342842e0e146126c957806342966c681461253f5780634857501f146124b55780634869e12d1461247a5780635fe3b567146124535780636352211e146124235780636d0cee75146123cd57806370a082311461232457806375829def14612291578063780a82c8146122415780637cad6cd1146121705780637de6b1db14611f905780638659c27014611c6f578063894e9a0d14611a1b5780638bad38dd1461199e5780638f69b993146119025780639067b677146118af57806395d89b41146117a257806396ce143114611683578063a22cb465146115b2578063a2ffb897146111c5578063a6202bf2146110c8578063a80fc07114611076578063ab167ccc14610f3d578063ad35efd414610edb578063b256456914610ebc578063b88d4fde14610e32578063b8a3be6614610dfd578063b971302a14610dae578063bc063e1a14610d8b578063bc2be1be14610d3b578063c156a11d146109c1578063c87b56dd14610887578063cc364f48146107d9578063d4dbd20b14610787578063d511609f1461073b578063d975dfed146106ef578063e985e9c51461069a578063ea5ead1914610674578063eac8f5b81461060b578063f590c176146105e2578063f851a440146105bc5763fdd46d601461027357600080fd5b346105b95760603660031901126105b95760043561028f612f03565b610297613043565b906102a0614328565b6102a9836136d3565b6105a1576102cd83600052600b6020526001600160a01b0360406000205416331490565b90811580610591575b61057257838552602092600584526001600160a01b0391826040882054169380610566575b61054057828116928315610516576001600160801b038084169384156104fe57610324896143ea565b82811686116104ca5750938093926103ca9261038f6103578d9a99988d8c52600b8d52600260408d20015460801c614438565b8c8b52600b8c5261038a600260408d20019182906001600160801b036001600160801b031983549260801b169116179055565b613668565b906103ab818c840151169282604081835116920151169061370a565b16111561049a575b898852600b89526001604089200154169283614384565b82877f40b88e5c41c5a97ffb7b6ef88a0a2d505aa0c634cf8a0275cb236ea7dd87ed4d88604051868152a48233141580610490575b610432575b837ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce78688604051908152a180f35b823b1561048c57608484928360405195869485936313375c3b60e01b85528b6004860152336024860152604485015260648401525af1610474575b8080610404565b61047d90612f7f565b61048857823861046d565b8280fd5b8380fd5b50823b15156103ff565b898852600b89526040882060018101600160c81b60ff60c81b1982541617905560ff60f01b1981541690556103b3565b60405163287ecaef60e21b8152600481018b90526001600160801b03928316602482015291166044820152606490fd5b0390fd5b6024896040519063d2aabcd960e01b82526004820152fd5b60046040517fc61a0e9e000000000000000000000000000000000000000000000000000000008152fd5b858360649260405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b508383821614156102fb565b60405163216caf0d60e01b815260048101859052336024820152604490fd5b5061059b84614453565b156102d6565b60248360405190634a5541ef60e01b82526004820152fd5b80fd5b50346105b957806003193601126105b9576001600160a01b036020915416604051908152f35b50346105b95760203660031901126105b9576020610601600435613739565b6040519015158152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760016040836001600160a01b039360209552600b855220015416604051908152f35b6024906040519062b8e7e760e51b82526004820152fd5b50346105b95760403660031901126105b957600435610691612f03565b610297826143ea565b50346105b95760403660031901126105b9576106b4612eed565b60406106be612f03565b926001600160a01b0380931681526008602052209116600052602052602060ff604060002054166040519015158152f35b50346105b95760203660031901126105b95760ff6001604060043593848152600b60205220015460d01c161561065d5761072a6020916143ea565b6001600160801b0360405191168152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760408260029260209452600b845220015460801c604051908152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760036040836001600160801b039360209552600b855220015416604051908152f35b50346105b95760203660031901126105b9576004356107f6613649565b50808252600b60205260ff600160408420015460d01c161561065d578160409160609352600b60205220600181549164ffffffffff918291015460a01c16906040519261084284612fcd565b818160a01c16845260c81c166020830152604082015261088560405180926040908164ffffffffff91828151168552826020820151166020860152015116910152565bf35b50346105b9576020806003193601126109b1576004356108c56108c08260005260056020526001600160a01b0360406000205416151590565b613059565b826001600160a01b03600a5416916044604051809481937fe9dc637500000000000000000000000000000000000000000000000000000000835230600484015260248301525afa9283156109b5578093610934575b5050610930604051928284938452830190612ec8565b0390f35b909192503d8082843e6109478184613005565b82019183818403126109b15780519067ffffffffffffffff8211610488570182601f820112156109b15780519161097d83613027565b9361098b6040519586613005565b8385528584840101116105b95750906109a991848085019101612ea5565b90388061091a565b5080fd5b604051903d90823e3d90fd5b50346105b95760403660031901126105b9576004356109de612f03565b906109e7614328565b808352602091600b835260ff600160408620015460d01c1615610d2457818452600583526001600160a01b03806040862054169081330361057257610a2b846143ea565b906001600160801b0390818316918215938415610a52575b89610a4f8989896132ec565b80f35b610a5a614328565b610a63886136d3565b610d0c57610a8788600052600b6020526001600160a01b0360406000205416331490565b94851580610cfc575b610cdd57888b5260058a528360408c2054169580610cd3575b610caf57861561051657610c9757610ac0886143ea565b8281168511610c67575090610b20610aed8b969594938a8852600b8c52600260408920015460801c614438565b898752600b8b5261038a600260408920019182906001600160801b036001600160801b031983549260801b169116179055565b90610b3c818b840151169282604081835116920151169061370a565b161115610c37575b868452600b8852600160408520015416610b5f828683614384565b84877f40b88e5c41c5a97ffb7b6ef88a0a2d505aa0c634cf8a0275cb236ea7dd87ed4d8a604051868152a48133141580610c2d575b610bd2575b5050507ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7610a4f94604051858152a13880808080610a43565b813b156104885782916084839260405194859384926313375c3b60e01b84528b600485015233602485015289604485015260648401525af1610c15575b80610b99565b610c1e90612f7f565b610c29578438610c0f565b8480fd5b50813b1515610b94565b868452600b88526040842060018101600160c81b60ff60c81b1982541617905560ff60f01b198154169055610b44565b60405163287ecaef60e21b8152600481018a90526001600160801b03928316602482015291166044820152606490fd5b6024886040519063d2aabcd960e01b82526004820152fd5b6064898860405191632dcbf6b960e11b835260048301523360248301526044820152fd5b5085871415610aa9565b60405163216caf0d60e01b8152600481018a9052336024820152604490fd5b50610d0689614453565b15610a90565b60248860405190634a5541ef60e01b82526004820152fd5b6024826040519062b8e7e760e51b82526004820152fd5b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760408264ffffffffff9260209452600b8452205460a01c16604051908152f35b50346105b957806003193601126105b957602060405167016345785d8a00008152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d576040826001600160a01b039260209452600b8452205416604051908152f35b50346105b95760203660031901126105b95760ff600160406020936004358152600b855220015460d01c166040519015158152f35b50346105b95760803660031901126105b957610e4c612eed565b610e54612f03565b906064359067ffffffffffffffff821161048c573660238301121561048c5781600401359284610e8385613027565b93610e916040519586613005565b85855236602487830101116109b15785610a4f96602460209301838801378501015260443591613177565b50346105b95760203660031901126105b957602061060160043561369c565b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d57610f1490613820565b604051906005811015610f2957602092508152f35b602483634e487b7160e01b81526021600452fd5b50346105b9576101403660031901126105b957610f58614328565b610f60613649565b9064ffffffffff80421680845260c43582811681036110715781018216602085015260e4359081831682036110715701166040830152606435916001600160a01b03918284168094036105b957506084358015158091036110715760a435908115158092036110715760243594848616809603611071576004359585871680970361107157604435906001600160801b038216809203611071576040519761100789612fb0565b8852602088015260408701526060860152608085015260a084015260c0830152604061010319360112611071576040519161104183612fe9565b61010435918216820361107157826110699260209452610124358482015260e0820152613922565b604051908152f35b600080fd5b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760026040836001600160801b039360209552600b855220015416604051908152f35b50346105b95760203660031901126105b9576110e2612eed565b6001600160a01b038083541633810361119c575081169081835260026020526001600160801b0360408420541690811561116b578161113c918486526002602052604086206001600160801b031981541690553390614384565b6040519081527fca7a4a65a94ed2f37538814e00e1cd4c41a78261561e3f3794592f11409cf5af60203392a380f35b602483604051907f8410168c0000000000000000000000000000000000000000000000000000000082526004820152fd5b6040516331b339a960e21b81526001600160a01b03919091166004820152336024820152604490fd5b50346105b95760603660031901126105b95767ffffffffffffffff600435818111610488576111f8903690600401612f4e565b90611201612f03565b92604435908111610c295761121a903690600401612f4e565b611225949194614328565b80840361157b5791926001600160a01b038216159290865b818110611248578780f35b611253818388614412565b359061126081858a614412565b356001600160801b038116810361107157611279614328565b611282836136d3565b6105a1576112a683600052600b6020526001600160a01b0360406000205416331490565b80158061156b575b61057257838b5260056020526001600160a01b0360408c2054169080611558575b61152b5787610516576001600160801b03821615611513576112f0846143ea565b6001600160801b0381166001600160801b038416116114e15750908a91848352600b80602052611360600261038a611331868360408a20015460801c614438565b918988528460205260408820019182906001600160801b036001600160801b031983549260801b169116179055565b6001600160801b03611384816020840151169282604081835116920151169061370a565b1611156114b1575b8584526020526001600160a01b036001604085200154166113b76001600160801b0384168a83614384565b6040516001600160801b0384168152867f40b88e5c41c5a97ffb7b6ef88a0a2d505aa0c634cf8a0275cb236ea7dd87ed4d60206001600160a01b038d1693a480331415806114a7575b61143b575b5050507ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce76020600193604051908152a10161123d565b803b15610488576001600160a01b036084898580946001600160801b0360405197889687956313375c3b60e01b87528d60048801523360248801521660448601521660648401525af161148f575b80611405565b61149890612f7f565b6114a3578838611489565b8880fd5b50803b1515611400565b858452806020526040842060018101600160c81b60ff60c81b1982541617905560ff60f01b19815416905561138c565b60405163287ecaef60e21b8152600481018690526001600160801b038481166024830152919091166044820152606490fd5b6024846040519063d2aabcd960e01b82526004820152fd5b6064846001600160a01b038960405192632dcbf6b960e11b84526004840152336024840152166044820152fd5b50806001600160a01b03881614156112cf565b5061157584614453565b156112ae565b83604491604051917faec9344000000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b50346105b95760403660031901126105b9576115cc612eed565b60243590811515809203611071576001600160a01b03169081331461163f5733835260086020526040832082600052602052604060002060ff1981541660ff83161790556040519081527f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3160203392a380f35b606460405162461bcd60e51b815260206004820152601960248201527f4552433732313a20617070726f766520746f2063616c6c6572000000000000006044820152fd5b50346105b9576101603660031901126105b95761169e614328565b604051906116ab82612fb0565b6116b3612eed565b82526116bd612f03565b60208301526116ca613043565b60408301526001600160a01b03906064358281168103611071576060840152608435801515810361107157608084015260a43580151581036110715760a084015260603660c31901126105b9575060405161172481612fcd565b64ffffffffff60c435818116810361107157825260e435818116810361107157602083015261010435908116810361107157604082015260c0830152604061012319360112611071576040519161177a83612fe9565b61012435918216820361107157826110699260209452610144358482015260e0820152613922565b50346105b957806003193601126105b957604051908060045491600183811c928185169485156118a5575b60209586861081146118915785885287949392918790821561186f575050600114611815575b505061180192500383613005565b610930604051928284938452830190612ec8565b90859250600482527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b5b858310611857575050611801935082010138806117f3565b8054838901850152879450869390920191810161183f565b925093505061180194915060ff191682840152151560051b82010138806117f3565b602483634e487b7160e01b81526022600452fd5b93607f16936117cd565b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d57600160408364ffffffffff9360209552600b855220015460a01c16604051908152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5761193b90613820565b906005821015908161197c5760028314918215611990575b8215611967575b6020836040519015158152f35b90915061197c5750600460209114388061195a565b80634e487b7160e01b602492526021600452fd5b506003831491506000611953565b50346105b95760203660031901126105b9576004356001600160a01b0390818116809103610488578183541633810361119c575060015491816001600160a01b03198416176001556040519216825260208201527fdcb09aef4bf01068924ccce937981cbe59d25ba08380cf941aaaea4e4bd3960d60403392a280f35b50346105b95760203660031901126105b957604051611a3981612f93565b8181528160208201528160408201528160608201528160808201528160a08201528160c08201528160e08201528161010082015281610120820152610140611a7f613649565b9101526004358152600b60205260ff600160408320015460d01c1615611c57576004358152600b60205260408120611b58600260405192611abf84612f93565b80546001600160a01b038116855264ffffffffff8160a01c16602086015264ffffffffff8160c81c16604086015260ff8160f01c161515606086015260f81c1515608085015260ff60018201546001600160a01b03811660a087015264ffffffffff8160a01c1660c0870152818160c81c16151560e0870152818160d01c16151561010087015260d81c16151561012085015201613668565b610140820152611b69600435613820565b6005811015610f29579160026101a09314611c4c575b50610885610140604051926001600160a01b03815116845264ffffffffff602082015116602085015264ffffffffff60408201511660408501526060810151151560608501526080810151151560808501526001600160a01b0360a08201511660a085015264ffffffffff60c08201511660c085015260e0810151151560e0850152610100810151151561010085015261012081015115156101208501520151610140830190604090816001600160801b0391828151168552826020820151166020860152015116910152565b606082015238611b7f565b602460405162b8e7e760e51b81526004356004820152fd5b50346105b957602090816003193601126105b95760043567ffffffffffffffff81116109b157611ca483913690600401612f4e565b9190611cae614328565b83925b808410611cbc578480f35b611ccb84828497959697614412565b3594611cd5614328565b611cde866136d3565b15611cfb5760248660405190634a5541ef60e01b82526004820152fd5b611d0486613739565b611f7857611d2886600052600b6020526001600160a01b0360406000205416331490565b15611f5957611d368661376a565b95808552600b90818752611d4f60026040882001613668565b906001600160801b039283835116848b161015611f415781885280895260ff604089205460f01c1615611f2957611d9f8a858b611d9560409a9b9c9d9e8389511661370a565b960151169061370a565b92828a52818b52868a20908b8b7f5edb27d6c1a327513b90a792050debf074b7194444885e3144d4decc5caaaa50845497600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8a1617865560038a8216968715611f0f575b01998516998a6001600160801b03198254161790556001600160a01b0380991698899360058652818e822054169889965260019d8e912001541694611e4c8b8588614384565b604080518a81526001600160801b0392831660208201529290911690820152606090a47ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce78b604051858152a1813b611eb0575b505050505001919093919293611cb1565b813b15611f0b57899493919285809460849360405197889687956372eba20360e01b875260048701526024860152604485015260648401525af1611ef7575b808080611e9f565b611f0090612f7f565b610c29578487611eef565b8980fd5b60018101600160c81b60ff60c81b19825416179055611e06565b602482604051906339c6dc7360e21b82526004820152fd5b602482604051906322cad1af60e11b82526004820152fd5b60405163216caf0d60e01b815260048101879052336024820152604490fd5b6024866040519063fe19f19f60e01b82526004820152fd5b50346105b9576020806003193601126109b15760043590611faf614328565b818352600b815260ff600160408520015460d01c1615610d2457611fd282613820565b600581101561215c5760048103611ffb5760248360405190634a5541ef60e01b82526004820152fd5b6003810361201b576024836040519063fe19f19f60e01b82526004820152fd5b600214611f415761204282600052600b6020526001600160a01b0360406000205416331490565b1561213d57818352600b815260ff604084205460f01c1615611f2957818352600b81526040832060ff60f01b19815416905582604051837f0eb069207093cd3e51cd1370d2d369770057fbe29947e577e5fb428c6c6fc78f8380a2600583526001600160a01b03604083205416803b6120e5575b5050507ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce791604051908152a180f35b803b1561048857816024818580947f341a0bd90000000000000000000000000000000000000000000000000000000083528960048401525af1612129575b806120b6565b61213290612f7f565b610488578238612123565b60405163216caf0d60e01b815260048101839052336024820152604490fd5b602484634e487b7160e01b81526021600452fd5b50346105b95760203660031901126105b9576004356001600160a01b0390818116809103610488578183541633810361119c5750600a5491816001600160a01b0319841617600a556040519216825260208201527fa2548bd4b805e907c1558a47b5858324fe8bb4a2e1ddfca647eecbf65610eebc60403392a2600954600019810190811161222d5760407f6bd5c950a8d8df17f772f5af37cb3655737899cbf903264b9795592da439661c91815190600182526020820152a180f35b602482634e487b7160e01b81526011600452fd5b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d5760408264ffffffffff9260209452600b8452205460c81c16604051908152f35b50346105b95760203660031901126105b9576122ab612eed565b9080546001600160a01b03808216933385036122fd576001600160a01b03199394501691829116178255337fbdd36143ee09de60bdefca70680e0f71189b2ed7acee364b53917ad433fdaf808380a380f35b6040516331b339a960e21b81526001600160a01b0386166004820152336024820152604490fd5b50346105b95760203660031901126105b9576001600160a01b03612346612eed565b168015612363578160409160209352600683522054604051908152f35b608460405162461bcd60e51b815260206004820152602960248201527f4552433732313a2061646472657373207a65726f206973206e6f74206120766160448201527f6c6964206f776e657200000000000000000000000000000000000000000000006064820152fd5b50346105b95760203660031901126105b9576001600160a01b0360406020926004356124126108c08260005260056020526001600160a01b0360406000205416151590565b815260058452205416604051908152f35b50346105b95760203660031901126105b95760206124426004356130a4565b6001600160a01b0360405191168152f35b50346105b957806003193601126105b95760206001600160a01b0360015416604051908152f35b50346105b95760203660031901126105b95760ff6001604060043593848152600b60205220015460d01c161561065d5761072a6020916138a7565b50346105b95760203660031901126105b95760043590818152600b60205260ff600160408320015460d01c1615610d2457806124f083613820565b92600584101561252b57600260209403612511575b50506040519015158152f35b8152600b8352604090205460f01c60ff1690503880612505565b602482634e487b7160e01b81526021600452fd5b50346105b95760203660031901126105b95760043561255c614328565b612565816136d3565b156126985761257381614453565b1561267857612581816130a4565b61258a8261369c565b159081612670575b8161265d575b50612645576020816125ca7ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce7936130a4565b90808552600783526001600160a01b0360408620926001600160a01b03199384815416905516918286526006845260408620600019815401905581865260058452604086209081541690558085604051937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8280a48152a180f35b60249060405190630da9b01360e01b82526004820152fd5b6001600160a01b03915016151538612598565b839150612592565b60405163216caf0d60e01b81526004810191909152336024820152604490fd5b602490604051907f817cd6390000000000000000000000000000000000000000000000000000000082526004820152fd5b50346105b9576126d836612f19565b60405191602083019383851067ffffffffffffffff86111761270357610a4f94604052858452613177565b634e487b7160e01b600052604160045260246000fd5b50346105b95760203660031901126105b95760206106016004356136d3565b50346105b9576020806003193601126109b15760043590612757614328565b612760826136d3565b1561277d5760248260405190634a5541ef60e01b82526004820152fd5b9061278781613739565b6129be576127ab81600052600b6020526001600160a01b0360406000205416331490565b15612678576127b98161376a565b818452600b83526127cf60026040862001613668565b926001600160801b03918285511683821610156129a657838652600b825260ff604087205460f01c161561298e5792827ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce783612844878460409761283a8d9b6128ef9b8e511661370a565b9b0151169061370a565b92848852600b825287868120947f5edb27d6c1a327513b90a792050debf074b7194444885e3144d4decc5caaaa50865491600160f81b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84161788556003858216988915612974575b01948d169c858e6001600160801b0319819854161790556001600160a01b038094169b8c94600589526001818e892054169d8e98600b8c5220015416968588614384565b604080518b81526001600160801b0392831660208201529290911690820152606090a4604051848152a1823b612923578480f35b823b15610c2957608492859160405197889687956372eba20360e01b875260048701526024860152604485015260648401525af1612965575b81818080808480f35b61296e90612f7f565b3861295c565b60018101600160c81b60ff60c81b198254161790556128ab565b602484604051906339c6dc7360e21b82526004820152fd5b602484604051906322cad1af60e11b82526004820152fd5b6024906040519063fe19f19f60e01b82526004820152fd5b50346105b95760203660031901126105b9576001600160801b0360406020926001600160a01b03612a05612eed565b16815260028452205416604051908152f35b50346105b957610a4f612a2936612f19565b91612a3c612a37843361320d565b613106565b6132ec565b50346105b957806003193601126105b9576020600954604051908152f35b50346105b95760203660031901126105b957600435808252600b60205260ff600160408420015460d01c161561065d57612a9890613820565b90600582101561197c5760208215838115612ab9575b506040519015158152f35b600191501482612aae565b50346105b95760203660031901126105b95760043590818152600b60205260ff600160408320015460d01c1615610d2457602091604082828152600b85522060ff815460f01c1680612b52575b612b29575b50506001600160801b0360405191168152f35b612b4b92506001600160801b036002612b45920154169161376a565b9061370a565b3880612b16565b5060ff600182015460c81c1615612b11565b50346105b95760403660031901126105b957612b7e612eed565b602435906001600160a01b038080612b95856130a4565b16921691808314612c8957803314908115612c68575b5015612bfe57828452600760205260408420826001600160a01b0319825416179055612bd6836130a4565b167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258480a480f35b608460405162461bcd60e51b815260206004820152603d60248201527f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60448201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c0000006064820152fd5b9050845260086020526040842033855260205260ff60408520541638612bab565b608460405162461bcd60e51b815260206004820152602160248201527f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560448201527f72000000000000000000000000000000000000000000000000000000000000006064820152fd5b50346105b95760203660031901126105b95760206124426004356130c9565b50346105b957806003193601126105b957604051908060035491600183811c92818516948515612dca575b60209586861081146118915785885287949392918790821561186f575050600114612d7057505061180192500383613005565b90859250600382527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b5b858310612db2575050611801935082010138806117f3565b80548389018501528794508693909201918101612d9a565b93607f1693612d3d565b9050346109b15760203660031901126109b1576004357fffffffff00000000000000000000000000000000000000000000000000000000811680910361048857602092507f80ac58cd000000000000000000000000000000000000000000000000000000008114908115612e7b575b8115612e51575b5015158152f35b7f01ffc9a70000000000000000000000000000000000000000000000000000000091501438612e4a565b7f5b5e139f0000000000000000000000000000000000000000000000000000000081149150612e43565b60005b838110612eb85750506000910152565b8181015183820152602001612ea8565b90602091612ee181518092818552858086019101612ea5565b601f01601f1916010190565b600435906001600160a01b038216820361107157565b602435906001600160a01b038216820361107157565b6060906003190112611071576001600160a01b0390600435828116810361107157916024359081168103611071579060443590565b9181601f840112156110715782359167ffffffffffffffff8311611071576020808501948460051b01011161107157565b67ffffffffffffffff811161270357604052565b610160810190811067ffffffffffffffff82111761270357604052565b610100810190811067ffffffffffffffff82111761270357604052565b6060810190811067ffffffffffffffff82111761270357604052565b6040810190811067ffffffffffffffff82111761270357604052565b90601f8019910116810190811067ffffffffffffffff82111761270357604052565b67ffffffffffffffff811161270357601f01601f191660200190565b604435906001600160801b038216820361107157565b1561306057565b606460405162461bcd60e51b815260206004820152601860248201527f4552433732313a20696e76616c696420746f6b656e20494400000000000000006044820152fd5b60005260056020526001600160a01b03604060002054166130c6811515613059565b90565b6130ec6108c08260005260056020526001600160a01b0360406000205416151590565b60005260076020526001600160a01b036040600020541690565b1561310d57565b608460405162461bcd60e51b815260206004820152602d60248201527f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560448201527f72206f7220617070726f766564000000000000000000000000000000000000006064820152fd5b9061319b93929161318b612a37843361320d565b6131968383836132ec565b6134b7565b156131a257565b60405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b906001600160a01b038080613221846130a4565b16931691838314938415613254575b50831561323e575b50505090565b61324a919293506130c9565b1614388080613238565b909350600052600860205260406000208260005260205260ff604060002054169238613230565b1561328257565b608460405162461bcd60e51b815260206004820152602560248201527f4552433732313a207472616e736665722066726f6d20696e636f72726563742060448201527f6f776e65720000000000000000000000000000000000000000000000000000006064820152fd5b9061331592916132fb836130a4565b916001600160a01b0394859384809416968791161461327b565b169081158061341e576133278461369c565b159081613415575b508061340c575b6133f457918084926133767ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce79660209661336f856130a4565b161461327b565b60009382855260078652604085206001600160a01b031990818154169055818652600687526040862060001981540190558286526040862060018154019055838652600587528260408720918254161790557fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef6040519580a48152a1565b60248360405190630da9b01360e01b82526004820152fd5b50831515613336565b9050153861332f565b608460405162461bcd60e51b8152602060048201526024808201527f4552433732313a207472616e7366657220746f20746865207a65726f2061646460448201527f72657373000000000000000000000000000000000000000000000000000000006064820152fd5b3d156134b2573d9061349882613027565b916134a66040519384613005565b82523d6000602084013e565b606090565b9290803b1561364057613521916020916001600160a01b0394604051809581948293897f150b7a02000000000000000000000000000000000000000000000000000000009b8c86523360048701521660248501526044840152608060648401526084830190612ec8565b03916000968791165af1908290826135e0575b50506135ba57613542613487565b805190816135b55760405162461bcd60e51b815260206004820152603260248201527f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560448201527f63656976657220696d706c656d656e74657200000000000000000000000000006064820152608490fd5b602001fd5b7fffffffff00000000000000000000000000000000000000000000000000000000161490565b909192506020813d8211613638575b816135fc60209383613005565b810103126109b15751907fffffffff00000000000000000000000000000000000000000000000000000000821682036105b95750903880613534565b3d91506135ef565b50505050600190565b6040519061365682612fcd565b60006040838281528260208201520152565b9060405161367581612fcd565b6040819360018154916001600160801b0392838116865260801c6020860152015416910152565b80600052600b60205260ff60016040600020015460d01c161561065d57600052600b60205260ff60016040600020015460d81c1690565b80600052600b60205260ff60016040600020015460d01c161561065d57600052600b60205260ff60016040600020015460c81c1690565b6001600160801b03918216908216039190821161372357565b634e487b7160e01b600052601160045260246000fd5b80600052600b60205260ff60016040600020015460d01c161561065d57600052600b60205260406000205460f81c90565b600090808252600b6020526040822091825464ffffffffff42818360c81c16116138185780600186015460a01c169182421015613802576137b79394955060a01c16809103904203614693565b90828152600b6020526001600160801b03926137dd846002604085200154168094614773565b9283116137ea5750501690565b60029350604092508152600b60205220015460801c90565b505050505060026001600160801b039101541690565b505091505090565b80600052600b602052604060002060ff600182015460c81c16600014613847575050600490565b805460f81c6138a0575460a01c64ffffffffff16421061389a5761386a8161376a565b90600052600b6020526001600160801b03806002604060002001541691161060001461389557600190565b600290565b50600090565b5050600390565b80600052600b6020526138c06002604060002001613668565b81600052600b602052604060002060ff600182015460c81c166000146138f357506001600160801b039150602001511690565b5460f81c61390557506130c69061376a565b6130c691506001600160801b03604081835116920151169061370a565b906001600160a01b036001541660206001600160a01b036060850151166024604051809481937fdcf844a700000000000000000000000000000000000000000000000000000000835260048301525afa801561415757600090614123575b6139a391506001600160801b0360408501511690602060e08601510151916144bc565b916001600160801b0383511660c082015190156140f95764ffffffffff815116602082019064ffffffffff825116908181116140b957505064ffffffffff604091511691019064ffffffffff825116908181101561407957505064ffffffffff8042169151169081811015614039575050600954926001600160801b0381511660405190613a3082612fcd565b815260006020820152600060408201526001600160a01b036060840151169060c08401519164ffffffffff6020840151169064ffffffffff604085015116906080870151151560a088015115159364ffffffffff6001600160a01b038a511697511660405197613a9f89612f93565b88526020880152604087015260608601526000608086015260a085015260c0840152600060e0840152600161010084015261012083015261014082015284600052600b60205260406000206001600160a01b038251166001600160a01b0319825416178155613b3664ffffffffff602084015116829064ffffffffff60a01b1964ffffffffff60a01b83549260a01b169116179055565b604082015181547eff0000000000000000000000000000000000000000000000000000000000006060850151151560f01b169078ffffffffffffffffffffffffffffffffffffffffffffffffff7dffffffffff000000000000000000000000000000000000000000000000007fff000000000000000000000000000000000000000000000000000000000000006080880151151560f81b169460c81b1691161717178155600181016001600160a01b0360a0840151166001600160a01b0319825416178155613c2d64ffffffffff60c085015116829064ffffffffff60a01b1964ffffffffff60a01b83549260a01b169116179055565b60e083015181546101008501516101208601517fffffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffff90921692151560c81b79ff00000000000000000000000000000000000000000000000000169290921791151560d01b7aff0000000000000000000000000000000000000000000000000000169190911790151560d81b7bff00000000000000000000000000000000000000000000000000000016179055610140909101518051602082015160801b6001600160801b03199081166001600160801b03928316176002850155926040906003019201511682825416179055600185016009556001600160a01b0360608401511660005260026020526001600160801b0380604060002054168160208501511601166001600160a01b036060850151166000526040600020918254161790556001600160a01b036020830151168015613ff557613da8613da28660005260056020526001600160a01b0360406000205416151590565b156142dd565b613db18561369c565b1580613fec575b80613fe4575b613fcc5760207ff8e1a15aba9398e019f0b49df1a4fde98ee17ae345cb5f6b5e2c27f5033e8ce791613e09613da28860005260056020526001600160a01b0360406000205416151590565b806000526006825260406000206001815401905586600052600582526040600020816001600160a01b0319825416179055866040519160007fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8180a4868152a1613e996001600160a01b036060840151166001600160801b03808451168160208601511601169030903390614163565b6001600160801b0360408201511680613f9d575b506001600160a01b038251167f075861cbceafeb777e8f15f357121b08f6f3adba387d599bb7b5278ca6192df5610160866001600160a01b0360208701511694613f946001600160a01b03606089015116976080810151151560a0820151151590613f5e6001600160a01b0360e060c08601519501515116956040519788523360208901526040880190604090816001600160801b0391828151168552826020820151166020860152015116910152565b60a086015260c0850152805164ffffffffff90811660e08601526020820151811661010086015260409091015116610120840152565b610140820152a4565b613fc6906001600160a01b036060850151166001600160a01b0360e08601515116903390614163565b38613ead565b60248560405190630da9b01360e01b82526004820152fd5b506000613dbe565b50801515613db8565b606460405162461bcd60e51b815260206004820152602060248201527f4552433732313a206d696e7420746f20746865207a65726f20616464726573736044820152fd5b6040517f210aec0e00000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b6040517f9fee269100000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b6040517f4c23297000000000000000000000000000000000000000000000000000000000815264ffffffffff918216600482015291166024820152604490fd5b60046040517f6095d3bc000000000000000000000000000000000000000000000000000000008152fd5b6020823d60201161414f575b8161413c60209383613005565b810103126105b957506139a39051613980565b3d915061412f565b6040513d6000823e3d90fd5b9290604051927f23b872dd0000000000000000000000000000000000000000000000000000000060208501526001600160a01b03809216602485015216604483015260648201526064815260a081019181831067ffffffffffffffff841117612703576141d2926040526141d4565b565b6001600160a01b0316906142346040516141ed81612fe9565b6020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808587829751910182855af161422e613487565b916145fb565b8051918215918483156142b9575b50505090501561424f5750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152fd5b9193818094500103126109b1578201519081151582036105b9575080388084614242565b156142e457565b606460405162461bcd60e51b815260206004820152601c60248201527f4552433732313a20746f6b656e20616c7265616479206d696e746564000000006044820152fd5b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361435a57565b60046040517fa1c0d6e5000000000000000000000000000000000000000000000000000000008152fd5b916001600160a01b03604051927fa9059cbb000000000000000000000000000000000000000000000000000000006020850152166024830152604482015260448152608081019181831067ffffffffffffffff841117612703576141d2926040526141d4565b6130c6906143f7816138a7565b90600052600b60205260026040600020015460801c9061370a565b91908110156144225760051b0190565b634e487b7160e01b600052603260045260246000fd5b9190916001600160801b038080941691160191821161372357565b60009080825260056020526001600160a01b038060408420541692833314938415614498575b5050821561448657505090565b90915061449333926130c9565b161490565b60ff9294509060409181526008602052818120338252602052205416913880614479565b9092916144c7613649565b936001600160801b03928381169182156145d35767016345785d8a000080821161459c57808511614565575061451185614502819386614773565b16946020890195865284614773565b169184614528604089019480865282875116614438565b16101561454f5761454184918261454a9551169061370a565b9151169061370a565b168252565b634e487b7160e01b600052600160045260246000fd5b84604491604051917f4fea5c1a00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449250604051917f47152d6700000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b505050505090506040516145e681612fcd565b60008152600060208201526000604082015290565b9192901561465c575081511561460f575090565b3b156146185790565b606460405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152fd5b82519091501561466f5750805190602001fd5b6104fa9060405191829162461bcd60e51b8352602060048401526024830190612ec8565b670de0b6b3a764000091600019838309928083029283808610950394808603951461474f578285101561471357908291096001821901821680920460028082600302188083028203028083028203028083028203028083028203028083028203028092029003029360018380600003040190848311900302920304170290565b82606492604051927f63a05778000000000000000000000000000000000000000000000000000000008452600484015260248301526044820152fd5b50508092501561475d570490565b634e487b7160e01b600052601260045260246000fd5b9091906000198382098382029182808310920391808303921461481157670de0b6b3a764000090818310156147da57947faccb18165bd6fe31ae1cf318dc5b51eee0e1ba569b88cd74c1773b91fac1066994950990828211900360ee1b910360121c170290565b60449086604051917f5173648d00000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b5050670de0b6b3a76400009004915056fea164736f6c6343000815000a"; bytes public constant BYTECODE_NFT_DESCRIPTOR = - hex"6080806040523461001757615da890816200001d8239f35b600080fdfe6080604052600436101561001257600080fd5b60003560e01c63e9dc63751461002757600080fd5b346142f35760403660031901126142f3576001600160a01b0360043516600435036142f357610056608061486b565b60006080819052606060a081905260c0819052610100819052610120819052610140819052610160829052610180919091526101a0526004356001600160a01b031660e08190526100a690614c55565b6101005260e0516040517feac8f5b80000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa908115614300576000916147da575b506001600160a01b03610116911680608052615665565b60a05260e0516040517fad35efd40000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa80156143005760009061479d575b6101779150615885565b6101205260e0516040517f4869e12d0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa80156143005760249160009161477e575b506fffffffffffffffffffffffffffffffff81166101605260e0516040517fa80fc071000000000000000000000000000000000000000000000000000000008152833560048201529260209184919082906001600160a01b03165afa9182156143005760009261474d575b506fffffffffffffffffffffffffffffffff821615614737576fffffffffffffffffffffffffffffffff9182169082166127100282160416610180526102846004356153c3565b610120608001526040514660208201526bffffffffffffffffffffffff1960043560601b16604082015260243560548201526054815280608081011067ffffffffffffffff60808301111761430c57608081016040526020815191012061041b602963ffffffff61032b6103048261016861ffff8860101c160616614b05565b91601e604660ff6103218460146050848d60081c16060116614b05565b9816060116614b05565b6040519485927f68736c2800000000000000000000000000000000000000000000000000000000602085015261036b815180926020602488019101614823565b83017f2c0000000000000000000000000000000000000000000000000000000000000060248201526103a7825180936020602585019101614823565b7f252c000000000000000000000000000000000000000000000000000000000000602583830101526103e58351809460206027868601019101614823565b01017f252900000000000000000000000000000000000000000000000000000000000060278201520360098101845201826148dc565b61042f6001600160a01b0360805116614c55565b60a05160e0516040517fbc2be1be0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa801561430057602491600091614718575b5060206001600160a01b0360606080015116604051938480927f9067b677000000000000000000000000000000000000000000000000000000008252823560048301525afa8015614300576104f1926000916146e9575b5064ffffffffff80911691166151d1565b61010051610180516105786021610515606461050e818606615740565b9404614b05565b604051938161052e869351809260208087019101614823565b82016105438251809360208085019101614823565b017f250000000000000000000000000000000000000000000000000000000000000060208201520360018101845201826148dc565b610100608001519060a060800151936105bf6fffffffffffffffffffffffffffffffff60e0608001511660ff6105b86001600160a01b03608051166155d8565b1690614e85565b956101206080015197604051996105d58b61486b565b8a5260208a015260408901526060880152608087015260a086015260c085015260e0840152610100830152610120820152604051806101c081011067ffffffffffffffff6101c08301111761430c576101c081016040526060815260006020820152606060408201526000606082015260006080820152606060a0820152600060c0820152600060e08201526060610100820152600061012082015260006101408201526060610160820152600061018082015260006101a082015260808201516106a660a0840151845190615a76565b906109b361015c604051926106ba846148c0565b600884527f50726f677265737300000000000000000000000000000000000000000000000060208501526107236040516106f381614888565b60009052855160208701207fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4701490565b156146e1576090945b61073586614b05565b916040519586938493661e339034b21e9160c91b60208601526109818351958692610767846027840160208901614823565b6d11103334b6361e9111b33333111f60911b602785840101526c1e3932b1ba103bb4b23a341e9160991b603585840101526107ae8551809660206042888701019101614823565b7f22206865696768743d22313030222066696c6c2d6f7061636974793d222e3033828501860160428101919091527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e88201528651966108b491889160f990910190602001614823565b661e17ba32bc3a1f60c91b8285018601870160f98101919091527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b61014082015287519761094f91899161015190910190602001614823565b661e17ba32bc3a1f60c91b6101518888888887010101010152602061015888888885519c8d9701010101019101614823565b631e17b39f60e11b90860190910190910190910190910161015881019190915281900361013c810190915201826148dc565b60a083015260c0820152602860e0830151604051906109d182614888565b60008252610c7761015c604051926109e8846148c0565b600684527f53746174757300000000000000000000000000000000000000000000000000006020850152610a1b84615cb6565b610a2482615d33565b808211156146d95750945b610a3a878701614b05565b91604051958693661e339034b21e9160c91b60208601528151610a64816027880160208601614823565b85016d11103334b6361e9111b33333111f60911b60278201526c1e3932b1ba103bb4b23a341e9160991b6035820152610aa7825180936020604285019101614823565b017f22206865696768743d22313030222066696c6c2d6f7061636974793d222e303360428201527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e8820152610ba382518093602060f985019101614823565b01661e17ba32bc3a1f60c91b60f98201527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b610140820152610c3282518093602061015185019101614823565b01661e17ba32bc3a1f60c91b610151820152610c5982518093602061015885019101614823565b01631e17b39f60e11b6101588201520361013c8101845201826148dc565b61010084015201610120820152602861010083015160405190610c9982614888565b60008252610ce361015c60405192610cb0846148c0565b600884527f53747265616d65640000000000000000000000000000000000000000000000006020850152610a1b84615cb6565b6101608401520161018082015261102660608301516030604051610d0681614888565b60008152610fad61015c60405194610d1d866148c0565b600886527f4475726174696f6e0000000000000000000000000000000000000000000000006020870152610d5086615cb6565b610d5982615d33565b808211156146d15750935b610d7060288601614b05565b91604051978893661e339034b21e9160c91b60208601528151610d9a816027880160208601614823565b85016d11103334b6361e9111b33333111f60911b60278201526c1e3932b1ba103bb4b23a341e9160991b6035820152610ddd825180936020604285019101614823565b017f22206865696768743d22313030222066696c6c2d6f7061636974793d222e303360428201527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e8820152610ed982518093602060f985019101614823565b01661e17ba32bc3a1f60c91b60f98201527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b610140820152610f6882518093602061015185019101614823565b01661e17ba32bc3a1f60c91b610151820152610f8f82518093602061015885019101614823565b01631e17b39f60e11b6101588201520361013c8101865201846148dc565b8260408601526028810160608601526101808501519060c0860151809161012088015192839185010101605881016020890152605719906103e8030160011c8060e0890152016010810161014088015201602081016101a08701520101608084015260a083015161010084015161016085015191614e1c565b8152604051908161010081011067ffffffffffffffff6101008401111761430c57610100820160405260c782527f3c726563742077696474683d223130302522206865696768743d22313030252260208301527f2066696c7465723d2275726c28234e6f69736529222f3e3c7265637420783d2260408301527f37302220793d223730222077696474683d2238363022206865696768743d223860608301527f3630222066696c6c3d2223666666222066696c6c2d6f7061636974793d222e3060808301527f33222072783d223435222072793d22343522207374726f6b653d22236666662260a08301527f207374726f6b652d6f7061636974793d222e3122207374726f6b652d7769647460c08301527f683d2234222f3e0000000000000000000000000000000000000000000000000060e083015282519160e084015191805194604051611175816148a4565b603381527f3c636972636c652069643d22476c6f772220723d22353030222066696c6c3d2260208201527f75726c282352616469616c476c6f7729222f3e000000000000000000000000006040820152604051966111d28861486b565b61011c88527f3c66696c7465722069643d224e6f697365223e3c6665466c6f6f6420783d223060208901527f2220793d2230222077696474683d223130302522206865696768743d2231303060408901527f252220666c6f6f642d636f6c6f723d2268736c283233302c3231252c3131252960608901527f2220666c6f6f642d6f7061636974793d22312220726573756c743d22666c6f6f60808901527f6446696c6c222f3e3c666554757262756c656e6365206261736546726571756560a08901527f6e63793d222e3422206e756d4f6374617665733d22332220726573756c743d2260c08901527f4e6f6973652220747970653d226672616374616c4e6f697365222f3e3c66654260e08901527f6c656e6420696e3d224e6f6973652220696e323d22666c6f6f6446696c6c22206101008901527f6d6f64653d22736f66742d6c69676874222f3e3c2f66696c7465723e0000000061012089015260405197886103a081011067ffffffffffffffff6103a08b01111761430c576103a0890160405261037b89527f3c706174682069643d224c6f676f222066696c6c3d2223666666222066696c6c60208a01527f2d6f7061636974793d222e312220643d226d3133332e3535392c3132342e303360408a01527f34632d2e3031332c322e3431322d312e3035392c342e3834382d322e3932332c60608a01527f362e3430322d322e3535382c312e3831392d352e3136382c332e3433392d372e60808a01527f3838382c342e3939362d31342e34342c382e3236322d33312e3034372c31322e60a08a01527f3536352d34372e3637342c31322e3536392d382e3835382e3033362d31372e3860c08a01527f33382d312e3237322d32362e3332382d332e3636332d392e3830362d322e373660e08a01527f362d31392e3038372d372e3131332d32372e3536322d31322e3737382d31332e6101008a01527f3834322d382e3032352c392e3436382d32382e3630362c31362e3135332d33356101208a01527f2e323635683063322e3033352d312e3833382c342e3235322d332e3534362c366101408a01527f2e3436332d352e323234683063362e3432392d352e3635352c31362e3231382d6101608a01527f322e3833352c32302e3335382c342e31372c342e3134332c352e3035372c382e6101808a01527f3831362c392e3634392c31332e39322c31332e373334682e30333763352e37336101a08a01527f362c362e3436312c31352e3335372d322e3235332c392e33382d382e34382c306101c08a01527f2c302d332e3531352d332e3531352d332e3531352d332e3531352d31312e34396101e08a01527f2d31312e3437382d35322e3635362d35322e3636342d36342e3833372d36342e6102008a01527f3833376c2e3034392d2e303337632d312e3732352d312e3630362d322e3731396102208a01527f2d332e3834372d322e3735312d362e3230346830632d2e3034362d322e3337356102408a01527f2c312e3036322d342e3538322c322e3732362d362e32323968306c2e3138352d6102608a01527f2e3134386830632e3039392d2e3036322c2e3232322d2e3134382c2e33372d2e6102808a01527f323539683063322e30362d312e3336322c332e3935312d322e3632312c362e306102a08a01527f34342d332e3834324335372e3736332d332e3437332c39372e37362d322e33346102c08a01527f312c3132382e3633372c31382e3333326331362e3637312c392e3934362d32366102e08a01527f2e3334342c35342e3831332d33382e3635312c34302e3139392d362e3239392d6103008a01527f362e3039362d31382e3036332d31372e3734332d31392e3636382d31382e38316103208a01527f312d362e3031362d342e3034372d31332e3036312c342e3737362d372e3735326103408a01527f2c392e3735316c36382e3235342c36382e33373163312e3732342c312e3630316103608a01527f2c322e3731342c332e38342c322e3733382c362e3139325a222f3e00000000006103808a0152604051978860a081011067ffffffffffffffff60a08b01111761430c57611cb0611d119160a08b0160405260758b527f3c706174682069643d22466c6f6174696e6754657874222066696c6c3d226e6f60208c01527f6e652220643d224d31323520343568373530733830203020383020383076373560408c01527f307330203830202d3830203830682d373530732d38302030202d3830202d383060608c01527f762d3735307330202d3830203830202d3830222f3e000000000000000000000060808c0152611867615a3d565b906040517f3c72616469616c4772616469656e742069643d2252616469616c476c6f77223e6020820152611d0c60d87f3c73746f70206f66667365743d223025222073746f702d636f6c6f723d22000093846040850152805161199960b88660208501936118d981605e840187614823565b8101997f222073746f702d6f7061636974793d222e36222f3e0000000000000000000000605e8c01527f3c73746f70206f66667365743d2231303025222073746f702d636f6c6f723d229a8b607382015261193e825180936020609385019101614823565b017f222073746f702d6f7061636974793d2230222f3e00000000000000000000000060938201527f3c2f72616469616c4772616469656e743e00000000000000000000000000000060a78201520360988101885201866148dc565b6119a1615a3d565b90604051967f3c6c696e6561724772616469656e742069643d2253616e64546f70222078313d60208901527f223025222079313d223025223e000000000000000000000000000000000000006040890152604d8801528251611a0781606b8a0184614823565b8701917f222f3e00000000000000000000000000000000000000000000000000000000009283606b82015289606e820152611a4c825180936020608e85019101614823565b019082608e830152611a9060a2897f3c2f6c696e6561724772616469656e743e0000000000000000000000000000009485609182015203608281018b5201896148dc565b611bd6610108611a9e615a3d565b6040519b8c917f3c6c696e6561724772616469656e742069643d2253616e64426f74746f6d222060208401527f78313d2231303025222079313d2231303025223e00000000000000000000000060408401527f3c73746f70206f66667365743d22313025222073746f702d636f6c6f723d22006054840152611b2a815180926020607387019101614823565b8201908760738301526076820152875190611b49826096830188614823565b018660968201527f3c616e696d617465206174747269627574654e616d653d22783122206475723d60998201527f2236732220726570656174436f756e743d22696e646566696e6974652220766160b98201527f6c7565733d223330253b3630253b313230253b3630253b3330253b222f3e000060d98201528560f78201520360e881018c52018a6148dc565b611bde615a3d565b906040519a8b957f3c6c696e6561724772616469656e742069643d22486f7572676c61737353747260208801527f6f6b6522206772616469656e745472616e73666f726d3d22726f74617465283960408801527f302922206772616469656e74556e6974733d227573657253706163654f6e557360608801527f65223e000000000000000000000000000000000000000000000000000000000060808801527f3c73746f70206f66667365743d22353025222073746f702d636f6c6f723d2200608388015251809260a2880190614823565b84018360a28201527f3c73746f70206f66667365743d22383025222073746f702d636f6c6f723d220060a5820152611cf282518093602060c485019101614823565b019160c483015260c78201520360b88101875201856148dc565b614e1c565b92611d31611d1d615813565b896020815191012090602081519101201490565b9788156146a8575b506040518060c081011067ffffffffffffffff60c08301111761430c5760c08101604052609081527f3c7061746820643d224d2035302c3336302061203330302c333030203020312c60208201527f31203630302c302061203330302c333030203020312c31202d3630302c30222060408201527f66696c6c3d2223666666222066696c6c2d6f7061636974793d222e303222207360608201527f74726f6b653d2275726c2823486f7572676c6173735374726f6b65292220737460808201527f726f6b652d77696474683d2234222f3e0000000000000000000000000000000060a082015260405193846102c081011067ffffffffffffffff6102c08701111761430c576102c0850160405261029885527f3c7061746820643d226d3536362c3136312e323031762d35332e39323463302d60208601527f31392e3338322d32322e3531332d33372e3536332d36332e3339382d35312e3160408601527f39382d34302e3735362d31332e3539322d39342e3934362d32312e3037392d3160608601527f35322e3538372d32312e303739732d3131312e3833382c372e3438372d31353260808601527f2e3630322c32312e303739632d34302e3839332c31332e3633362d36332e343160a08601527f332c33312e3831362d36332e3431332c35312e3139387635332e39323463302c60c08601527f31372e3138312c31372e3730342c33332e3432372c35302e3232332c34362e3360e08601527f3934763238342e383039632d33322e3531392c31322e39362d35302e3232332c6101008601527f32392e3230362d35302e3232332c34362e3339347635332e39323463302c31396101208601527f2e3338322c32322e35322c33372e3536332c36332e3431332c35312e3139382c6101408601527f34302e3736332c31332e3539322c39342e3935342c32312e3037392c3135322e6101608601527f3630322c32312e303739733131312e3833312d372e3438372c3135322e3538376101808601527f2d32312e3037396334302e3838362d31332e3633362c36332e3339382d33312e6101a08601527f3831362c36332e3339382d35312e313938762d35332e39323463302d31372e316101c08601527f39362d31372e3730342d33332e3433352d35302e3232332d34362e34303156326101e08601527f30372e3630336333322e3531392d31322e3936372c35302e3232332d32392e326102008601527f30362c35302e3232332d34362e3430315a6d2d3334372e3436322c35372e37396102208601527f336c3133302e3935392c3133312e3032372d3133302e3935392c3133312e30316102408601527f33563231382e3939345a6d3236322e3932342e303232763236322e3031386c2d6102608601527f3133302e3933372d3133312e3030362c3133302e3933372d3133312e3031335a6102808601527f222066696c6c3d2223313631383232223e3c2f706174683e00000000000000006102a0860152896000146144835760405161218b81614888565b60008152995b1561432257604051806101e081011067ffffffffffffffff6101e08301111761430c576101e081016040526101b181527f3c7061746820643d226d3438312e34362c3438312e35347638312e3031632d3260208201527f2e33352e37372d342e38322c312e35312d372e33392c322e32332d33302e332c60408201527f382e35342d37342e36352c31332e39322d3132342e30362c31332e39322d353360608201527f2e362c302d3130312e32342d362e33332d3133312e34372d31362e3136762d3860808201527f316c34362e332d34362e3331683137302e33336c34362e32392c34362e33315a60a08201527f222066696c6c3d2275726c282353616e64426f74746f6d29222f3e3c7061746860c08201527f20643d226d3433352e31372c3433352e323363302c312e31372d2e34362c322e60e08201527f33322d312e33332c332e34342d372e31312c392e30382d34312e39332c31352e6101008201527f39382d38332e38312c31352e3938732d37362e372d362e392d38332e38322d316101208201527f352e3938632d2e38372d312e31322d312e33332d322e32372d312e33332d332e6101408201527f3434762d2e30346c382e33342d382e33352e30312d2e30316331332e37322d366101608201527f2e35312c34322e39352d31312e30322c37362e382d31312e30327336322e39376101808201527f2c342e34392c37362e37322c31316c382e34322c382e34325a222066696c6c3d6101a08201527f2275726c282353616e64546f7029222f3e0000000000000000000000000000006101c0820152995b60405196876107e081011067ffffffffffffffff6107e08a01111761430c57613b9c9c612e586036602d9960819f97631e17b39f60e11b8d7f3c2f646566733e000000000000000000000000000000000000000000000000009a612f279f6107e0016040526107a782527f3c672066696c6c3d226e6f6e6522207374726f6b653d2275726c2823486f757260208301527f676c6173735374726f6b652922207374726f6b652d6c696e656361703d22726f60408301527f756e6422207374726f6b652d6d697465726c696d69743d22313022207374726f60608301527f6b652d77696474683d2234223e3c7061746820643d226d3536352e3634312c3160808301527f30372e323863302c392e3533372d352e35362c31382e3632392d31352e36373660a08301527f2c32362e393733682d2e303233632d392e3230342c372e3539362d32322e313960c08301527f342c31342e3536322d33382e3139372c32302e3539322d33392e3530342c313460e08301527f2e3933362d39372e3332352c32342e3335352d3136312e3733332c32342e33356101008301527f352d39302e34382c302d3136372e3934382d31382e3538322d3139392e3935336101208301527f2d34342e393438682d2e303233632d31302e3131352d382e3334342d31352e366101408301527f37362d31372e3433372d31352e3637362d32362e3937332c302d33392e3733356101608301527f2c39362e3535342d37312e3932312c3231352e3635322d37312e3932317332316101808301527f352e3632392c33322e3138352c3231352e3632392c37312e3932315a222f3e3c6101a08301527f7061746820643d226d3133342e33362c3136312e32303363302c33392e3733356101c08301527f2c39362e3535342c37312e3932312c3231352e3635322c37312e3932317332316101e08301527f352e3632392d33322e3138362c3231352e3632392d37312e393231222f3e3c6c6102008301527f696e652078313d223133342e3336222079313d223136312e323033222078323d6102208301527f223133342e3336222079323d223130372e3238222f3e3c6c696e652078313d226102408301527f3536352e3634222079313d223136312e323033222078323d223536352e3634226102608301527f2079323d223130372e3238222f3e3c6c696e652078313d223138342e353834226102808301527f2079313d223230362e383233222078323d223138342e353835222079323d22356102a08301527f33372e353739222f3e3c6c696e652078313d223231382e313831222079313d226102c08301527f3231382e313138222078323d223231382e313831222079323d223536322e35336102e08301527f37222f3e3c6c696e652078313d223438312e383138222079313d223231382e316103008301527f3432222078323d223438312e383139222079323d223536322e343238222f3e3c6103208301527f6c696e652078313d223531352e343135222079313d223230372e3335322220786103408301527f323d223531352e343136222079323d223533372e353739222f3e3c70617468206103608301527f643d226d3138342e35382c3533372e353863302c352e34352c342e32372c31306103808301527f2e36352c31322e30332c31352e3432682e303263352e35312c332e33392c31326103a08301527f2e37392c362e35352c32312e35352c392e34322c33302e32312c392e392c37386103c08301527f2e30322c31362e32382c3133312e38332c31362e32382c34392e34312c302c396103e08301527f332e37362d352e33382c3132342e30362d31332e39322c322e372d2e37362c356104008301527f2e32392d312e35342c372e37352d322e33352c382e37372d322e38372c31362e6104208301527f30352d362e30342c32312e35362d392e3433683063372e37362d342e37372c316104408301527f322e30342d392e39372c31322e30342d31352e3432222f3e3c7061746820643d6104608301527f226d3138342e3538322c3439322e363536632d33312e3335342c31322e3438356104808301527f2d35302e3232332c32382e35382d35302e3232332c34362e3134322c302c392e6104a08301527f3533362c352e3536342c31382e3632372c31352e3637372c32362e393639682e6104c08301527f30323263382e3530332c372e3030352c32302e3231332c31332e3436332c33346104e08301527f2e3532342c31392e3135392c392e3939392c332e3939312c32312e3236392c376105008301527f2e3630392c33332e3539372c31302e3738382c33362e34352c392e3430372c386105208301527f322e3138312c31352e3030322c3133312e3833352c31352e3030327339352e336105408301527f36332d352e3539352c3133312e3830372d31352e3030326331302e3834372d326105608301527f2e37392c32302e3836372d352e3932362c32392e3932342d392e3334392c312e6105808301527f3234342d2e3436372c322e3437332d2e3934322c332e3637332d312e3432342c6105a08301527f31342e3332362d352e3639362c32362e3033352d31322e3136312c33342e35326105c08301527f342d31392e313733682e3032326331302e3131342d382e3334322c31352e36376105e08301527f372d31372e3433332c31352e3637372d32362e3936392c302d31372e3536322d6106008301527f31382e3836392d33332e3636352d35302e3232332d34362e3135222f3e3c70616106208301527f746820643d226d3133342e33362c3539322e373263302c33392e3733352c39366106408301527f2e3535342c37312e3932312c3231352e3635322c37312e393231733231352e366106608301527f32392d33322e3138362c3231352e3632392d37312e393231222f3e3c6c696e656106808301527f2078313d223133342e3336222079313d223539322e3732222078323d223133346106a08301527f2e3336222079323d223533382e373937222f3e3c6c696e652078313d223536356106c08301527f2e3634222079313d223539322e3732222078323d223536352e3634222079323d6106e08301527f223533382e373937222f3e3c706f6c796c696e6520706f696e74733d223438316107008301527f2e383232203438312e393031203438312e373938203438312e383737203438316107208301527f2e373735203438312e383534203335302e303135203335302e303236203231386107408301527f2e313835203231382e313239222f3e3c706f6c796c696e6520706f696e74733d6107608301527f223231382e313835203438312e393031203231382e323331203438312e3835346107808301527f203335302e303135203335302e303236203438312e383232203231382e3135326107a08301527f222f3e3c2f673e000000000000000000000000000000000000000000000000006107c0830152604051998a957f3c672069643d22486f7572676c617373223e000000000000000000000000000060208801528551612df48160329860208a8c019101614823565b8701612e098251809360208a85019101614823565b01612e1d8251809360208985019101614823565b01612e318251809360208885019101614823565b01612e458251809360208785019101614823565b01918201520360168101865201846148dc565b6040519e8f9788977f3c646566733e000000000000000000000000000000000000000000000000000060208a0152612e9b8151809260206026809d019101614823565b8901612eb08251809360208c85019101614823565b01612ec48251809360208b85019101614823565b01612ed88251809360208a85019101614823565b01612eec8251809360208985019101614823565b01612f008251809360208885019101614823565b01612f148251809360208785019101614823565b019182015203600d8101895201876148dc565b6137ba604c60c0830151610120840151936135166131496040602084015193015196612f538186615981565b9461314461012b604051612f66816148c0565b600581527f2d3130302500000000000000000000000000000000000000000000000000000060208201526040519889917f3c74657874506174682073746172744f66667365743d220000000000000000006020840152612fd0815180926020603787019101614823565b7f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666683820160378101919091527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e00000000000000000061010982015282519261311491849161012090910190602001614823565b6a1e17ba32bc3a2830ba341f60a91b90830190910161012081019190915281900361010b810190915201876148dc565b615981565b9561332861012b60405161315c816148c0565b600281527f30250000000000000000000000000000000000000000000000000000000000006020820152604051998a917f3c74657874506174682073746172744f66667365743d2200000000000000000060208401526131c6815180926020603787019101614823565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e00000000000000000061010982015261330382518093602061012085019101614823565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b81018a5201886148dc565b61333281846159e9565b9261351161012b604051613345816148c0565b600481527f2d3530250000000000000000000000000000000000000000000000000000000060208201526040519687917f3c74657874506174682073746172744f66667365743d2200000000000000000060208401526133af815180926020603787019101614823565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e0000000000000000006101098201526134ec82518093602061012085019101614823565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b8101875201856148dc565b6159e9565b906136f561012b604051613529816148c0565b600381527f353025000000000000000000000000000000000000000000000000000000000060208201526040519485917f3c74657874506174682073746172744f66667365743d220000000000000000006020840152613593815180926020603787019101614823565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e0000000000000000006101098201526136d082518093602061012085019101614823565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b8101855201836148dc565b6040519586937f3c7465787420746578742d72656e646572696e673d226f7074696d697a65537060208601527f656564223e000000000000000000000000000000000000000000000000000000604086015261375b815180926020604589019101614823565b8401613771825180936020604585019101614823565b01613786825180936020604585019101614823565b0161379b825180936020604585019101614823565b01661e17ba32bc3a1f60c91b604582015203602c8101845201826148dc565b613a9b61019c60e084015193610140810151906137fc6137f66137f06137ea60806101a086015195015199614b05565b94614b05565b92614b05565b96614b05565b906040519687937f3c75736520687265663d2223476c6f77222066696c6c2d6f7061636974793d2260208601527f2e39222f3e00000000000000000000000000000000000000000000000000000060408601527f3c75736520687265663d2223476c6f772220783d22313030302220793d22313060458601527f3030222066696c6c2d6f7061636974793d222e39222f3e00000000000000000060658601527f3c75736520687265663d22234c6f676f2220783d223137302220793d22313730607c8601527f22207472616e73666f726d3d227363616c65282e3629222f3e3c757365206872609c8601527f65663d2223486f7572676c6173732220783d223135302220793d22393022207460bc8601527f72616e73666f726d3d22726f746174652831302922207472616e73666f726d2d60dc8601527f6f726967696e3d2235303020353030222f3e000000000000000000000000000060fc8601527f3c75736520687265663d222350726f67726573732220783d220000000000000061010e860152805161399681610127936020858a019101614823565b8501927f2220793d22373930222f3e0000000000000000000000000000000000000000008481809694819501527f3c75736520687265663d22235374617475732220783d22000000000000000000610132820152825190613a01826101499560208785019101614823565b01918201527f3c75736520687265663d222353747265616d65642220783d2200000000000000610154820152825190613a448261016d9560208785019101614823565b01918201527f3c75736520687265663d22234475726174696f6e2220783d2200000000000000610178820152825190613a87826101919560208785019101614823565b01918201520361017c8101855201836148dc565b6040519586937f3c73766720786d6c6e733d22687474703a2f2f7777772e77332e6f72672f323060208601527f30302f737667222077696474683d223130303022206865696768743d2231303060408601527f30222076696577426f783d2230203020313030302031303030223e00000000006060860152613b27815180926020607b89019101614823565b8401613b3d825180936020607b85019101614823565b01613b52825180936020607b85019101614823565b01613b67825180936020607b85019101614823565b017f3c2f7376673e0000000000000000000000000000000000000000000000000000607b8201520360618101845201826148dc565b6101405260a05160e0516040517fb971302a0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa908115614300576000916142b5575b6142b161424a61414f614240609487613d376089613c158a614c55565b9260a0608001516040519485927f5b7b2274726169745f74797065223a224173736574222c2276616c7565223a226020850152613c5c815180926020604088019101614823565b8301907f227d2c7b2274726169745f74797065223a2253656e646572222c2276616c756560408301527f223a22000000000000000000000000000000000000000000000000000000000091826060820152613cc1825180936020606385019101614823565b01907f227d2c7b2274726169745f74797065223a22537461747573222c2276616c756560638301526083820152613d02825180936020608685019101614823565b017f227d5d000000000000000000000000000000000000000000000000000000000060868201520360698101845201826148dc565b6101a05160a05161403961017e613d4f602435614b05565b936080800151613d696001600160a01b0360805116614c55565b90604051968793613f2660208601987f54686973204e465420726570726573656e74732061207061796d656e742073748a527f7265616d20696e2061205361626c696572205632200000000000000000000000604088015282516020840190613dd68160558b0184614823565b8801947f20636f6e74726163742e20546865206f776e6572206f662074686973204e465460558701527f2063616e207769746864726177207468652073747265616d656420617373657460758701527f732c207768696368206172652064656e6f6d696e6174656420696e2000000000609587015282516020840196613e608260b183018a614823565b017f2e5c6e5c6e2d2053747265616d2049443a20000000000000000000000000000060b1820152613e9b82518093602060c385019101614823565b01613ed47f5c6e2d2000000000000000000000000000000000000000000000000000000000958660c384015251809360c7840190614823565b01947f20416464726573733a2000000000000000000000000000000000000000000000958660c7820152613f1282518093602060d185019101614823565b019260d184015251809360d5840190614823565b019060d5820152613f4182518093602060df85019101614823565b017f5c6e5c6e0000000000000000000000000000000000000000000000000000000060df8201527fe29aa0efb88f205741524e494e473a205472616e7366657272696e672074686560e38201527f204e4654206d616b657320746865206e6577206f776e657220746865207265636101038201527f697069656e74206f66207468652073747265616d2e205468652066756e6473206101238201527f617265206e6f74206175746f6d61746963616c6c792077697468647261776e206101438201527f666f72207468652070726576696f757320726563697069656e742e00000000006101638201520361015e8101855201836148dc565b6101a051906141aa61404c602435614b05565b916140cb602d604051809560208201976a029b0b13634b2b9102b19160ad1b8952614081815180926020602b87019101614823565b82017f2023000000000000000000000000000000000000000000000000000000000000602b8201526140bc8251809360208785019101614823565b0103600d8101865201846148dc565b610140516140d890614991565b94604051998a977f7b2261747472696275746573223a00000000000000000000000000000000000060208a0152614119815180926020602e8d019101614823565b8801917f2c226465736372697074696f6e223a2200000000000000000000000000000000602e840152518093603e840190614823565b01917f222c2265787465726e616c5f75726c223a2268747470733a2f2f7361626c6965603e8401527f722e636f6d222c226e616d65223a220000000000000000000000000000000000605e840152518093606d840190614823565b017f222c22696d616765223a22646174613a696d6167652f7376672b786d6c3b6261606d8201527f736536342c000000000000000000000000000000000000000000000000000000608d82015261420b825180936020609285019101614823565b017f227d00000000000000000000000000000000000000000000000000000000000060928201520360748101845201826148dc565b60c0819052614991565b61429d603d60405180937f646174613a6170706c69636174696f6e2f6a736f6e3b6261736536342c000000602083015261428d8151809260208686019101614823565b810103601d8101845201826148dc565b604051918291602083526020830190614846565b0390f35b90506020813d6020116142f8575b816142d0602093836148dc565b810103126142f35751906001600160a01b03821682036142f3579061414f613bf8565b600080fd5b3d91506142c3565b6040513d6000823e3d90fd5b634e487b7160e01b600052604160045260246000fd5b6040518061012081011067ffffffffffffffff6101208301111761430c57610120810160405260f881527f3c7061746820643d226d3438312e34362c3530342e3130317635382e3434396360208201527f2d322e33352e37372d342e38322c312e35312d372e33392c322e32332d33302e60408201527f332c382e35342d37342e36352c31332e39322d3132342e30362c31332e39322d60608201527f35332e362c302d3130312e32342d362e33332d3133312e34372d31362e31367660808201527f2d35382e343339683236322e39325a222066696c6c3d2275726c282353616e6460a08201527f426f74746f6d29222f3e3c656c6c697073652063783d22333530222063793d2260c08201527f3530342e313031222072783d223133312e343632222072793d2232382e31303860e08201527f222066696c6c3d2275726c282353616e64546f7029222f3e0000000000000000610100820152996123de565b604051806101c081011067ffffffffffffffff6101c08301111761430c576101c0810160405261019981527f3c706f6c79676f6e20706f696e74733d22333530203335302e3032362034313560208201527f2e3033203238342e39373820323835203238342e39373820333530203335302e60408201527f303236222066696c6c3d2275726c282353616e64426f74746f6d29222f3e3c7060608201527f61746820643d226d3431362e3334312c3238312e39373563302c2e3931342d2e60808201527f3335342c312e3830392d312e3033352c322e36382d352e3534322c372e30373660a08201527f2d33322e3636312c31322e34352d36352e32382c31322e34352d33322e36323460c08201527f2c302d35392e3733382d352e3337342d36352e32382d31322e34352d2e36383160e08201527f2d2e3837322d312e3033352d312e3736372d312e3033352d322e36382c302d2e6101008201527f3931342e3335342d312e3830382c312e3033352d322e3637362c352e3534322d6101208201527f372e3037362c33322e3635362d31322e34352c36352e32382d31322e34352c336101408201527f322e3631392c302c35392e3733382c352e3337342c36352e32382c31322e34356101608201527f2e3638312e3836372c312e3033352c312e3736322c312e3033352c322e3637366101808201527f5a222066696c6c3d2275726c282353616e64546f7029222f3e000000000000006101a082015299612191565b6146ca9198506146b661584c565b906020815191012090602081519101201490565b9638611d39565b905093610d64565b905094610a2f565b60d09461072c565b61470b915060203d602011614711575b61470381836148dc565b810190614926565b386104e0565b503d6146f9565b614731915060203d6020116147115761470381836148dc565b38610489565b634e487b7160e01b600052601260045260246000fd5b61477091925060203d602011614777575b61476881836148dc565b8101906148fe565b903861023d565b503d61475e565b614797915060203d6020116147775761476881836148dc565b386101d2565b506020813d6020116147d2575b816147b7602093836148dc565b810103126142f3575160058110156142f3576101779061016d565b3d91506147aa565b90506020813d60201161481b575b816147f5602093836148dc565b810103126142f357516001600160a01b03811681036142f3576001600160a01b036100ff565b3d91506147e8565b60005b8381106148365750506000910152565b8181015183820152602001614826565b9060209161485f81518092818552858086019101614823565b601f01601f1916010190565b610140810190811067ffffffffffffffff82111761430c57604052565b6020810190811067ffffffffffffffff82111761430c57604052565b6060810190811067ffffffffffffffff82111761430c57604052565b6040810190811067ffffffffffffffff82111761430c57604052565b90601f8019910116810190811067ffffffffffffffff82111761430c57604052565b908160209103126142f357516fffffffffffffffffffffffffffffffff811681036142f35790565b908160209103126142f3575164ffffffffff811681036142f35790565b67ffffffffffffffff811161430c57601f01601f191660200190565b9061496982614943565b61497660405191826148dc565b8281528092614987601f1991614943565b0190602036910137565b805115614af1576040516149a4816148a4565b604081527f4142434445464748494a4b4c4d4e4f505152535455565758595a61626364656660208201527f6768696a6b6c6d6e6f707172737475767778797a303132333435363738392b2f60408201528151600292838201809211614adb5760038092047f3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81168103614adb57614a3e908594951b61495f565b936020850193829183518401925b838110614a8a5750505050510680600114614a7757600214614a6c575090565b603d90600019015390565b50603d9081600019820153600119015390565b85600491979293949701918251600190603f9082828260121c16880101518453828282600c1c16880101518385015382828260061c1688010151888501531685010151878201530195929190614a4c565b634e487b7160e01b600052601160045260246000fd5b50604051614afe81614888565b6000815290565b806000917a184f03e93ff9f4daa797ed6e38ed64bf6a1f01000000000000000080821015614c47575b506d04ee2d6d415b85acef810000000080831015614c38575b50662386f26fc1000080831015614c29575b506305f5e10080831015614c1a575b5061271080831015614c0b575b506064821015614bfb575b600a80921015614bf1575b600190816021614b9c82870161495f565b95860101905b614bae575b5050505090565b600019019083907f30313233343536373839616263646566000000000000000000000000000000008282061a835304918215614bec57919082614ba2565b614ba7565b9160010191614b8b565b9190606460029104910191614b80565b60049193920491019138614b75565b60089193920491019138614b68565b60109193920491019138614b59565b60209193920491019138614b47565b604093508104915038614b2e565b6001600160a01b031660405190614c6b826148a4565b602a8252602082016040368237825115614d8357603090538151600190811015614d8357607860218401536029905b808211614d08575050614caa5790565b60646040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602060248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152fd5b9091600f81166010811015614d6e577f3031323334353637383961626364656600000000000000000000000000000000901a614d448486614d99565b5360041c918015614d59576000190190614c9a565b60246000634e487b7160e01b81526011600452fd5b60246000634e487b7160e01b81526032600452fd5b634e487b7160e01b600052603260045260246000fd5b908151811015614d83570160200190565b60405190614db7826148c0565b600482527f2667743b000000000000000000000000000000000000000000000000000000006020830152565b60405190614df0826148c0565b600482527f266c743b000000000000000000000000000000000000000000000000000000006020830152565b90614e839294936040519586928451614e3d81602097888089019101614823565b8401614e5182518093888085019101614823565b01614e6482518093878085019101614823565b01614e7782518093868085019101614823565b010380855201836148dc565b565b80156151965760009180615171575090505b6001908082811015614f0457505050614eae614de3565b614f01602260405183614ecb829551809260208086019101614823565b81017f203100000000000000000000000000000000000000000000000000000000000060208201520360028101845201826148dc565b90565b66038d7ea4c6800011156151145760409081519060a0820182811067ffffffffffffffff82111761430c57808452614f3b81614888565b600081528252825190614f4d826148c0565b8482526020917f4b0000000000000000000000000000000000000000000000000000000000000083820152828401528351614f87816148c0565b8581527f4d0000000000000000000000000000000000000000000000000000000000000083820152848401528351614fbe816148c0565b8581527f42000000000000000000000000000000000000000000000000000000000000008382015260608401528351614ff6816148c0565b8581527f54000000000000000000000000000000000000000000000000000000000000008382015260808401526000918583965b6150e8575b5084519461503c866148c0565b6007908187527f2623383830353b0000000000000000000000000000000000000000000000000083880152519560005b8281106150d557505050506150b66150bc917f20000000000000000000000000000000000000000000000000000000000000006027870152600886526150b1866148c0565b614b05565b91615740565b916005851015614d8357614f019460051b015192614e1c565b818101840151888201850152830161506c565b9591926103e89081851061510b57508680916064600a870406950493019661502a565b9392965061502f565b505061511e614daa565b614f0160286040518361513b829551809260208086019101614823565b81017f203939392e39395400000000000000000000000000000000000000000000000060208201520360088101845201826148dc565b600a0a918215615182575004614e97565b80634e487b7160e01b602492526012600452fd5b50506040516151a4816148c0565b600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b620151809103048061523957506151e6614de3565b614f01602660405183615203829551809260208086019101614823565b81017f203120446179000000000000000000000000000000000000000000000000000060208201520360068101845201826148dc565b61270f811161530857600181036152c557614f01602061528d60405161525e816148c0565b600481527f20446179000000000000000000000000000000000000000000000000000000008382015293614b05565b60405193816152a58693518092868087019101614823565b82016152b982518093868085019101614823565b010380845201826148dc565b614f01602061528d6040516152d9816148c0565b600581527f20446179730000000000000000000000000000000000000000000000000000008382015293614b05565b50615311614daa565b614f01602a6040518361532e829551809260208086019101614823565b81017f2039393939204461797300000000000000000000000000000000000000000000602082015203600a8101845201826148dc565b6020818303126142f35780519067ffffffffffffffff82116142f3570181601f820112156142f357805161539781614943565b926153a560405194856148dc565b818452602082840101116142f357614f019160208085019101614823565b6001600160a01b031660409081516395d89b4160e01b8152600081600481855afa90811561559d5760009161557c575b506154588351615402816148c0565b601181527f5341422d56322d4c4f434b55502d4c494e0000000000000000000000000000006020918201528251908301207fc66b376a19264d832c1bc254000c18944ca5aa57ed50f4ea637c4da424d4c3bb1490565b1561549657505051615469816148c0565b600d81527f4c6f636b7570204c696e65617200000000000000000000000000000000000000602082015290565b6154fa83516154a4816148c0565b601181527f5341422d56322d4c4f434b55502d44594e0000000000000000000000000000006020918201528251908301207f6ab655856fa5352de8c05542b1937ac63c59342da992602767c02734cc5391651490565b156155385750505161550b816148c0565b600e81527f4c6f636b75702044796e616d6963000000000000000000000000000000000000602082015290565b6155789083519384937f814a8a2e000000000000000000000000000000000000000000000000000000008552600485015260248401526044830190614846565b0390fd5b615597913d8091833e61558f81836148dc565b810190615364565b386153f3565b83513d6000823e3d90fd5b3d156155d3573d906155b982614943565b916155c760405193846148dc565b82523d6000602084013e565b606090565b60405160208101907f313ce56700000000000000000000000000000000000000000000000000000000825260048152615610816148c0565b6000928392839251915afa6156236155a8565b908061565a575b156156565760208180518101031261565257602001519060ff8216820361564f575090565b80fd5b5080fd5b5090565b50602081511461562a565b6000809160405160208101906395d89b4160e01b825260048152615688816148c0565b51915afa6156946155a8565b90158015615734575b6156fa57806020806156b493518301019101615364565b601e815111600014614f0157506040516156cd816148c0565b600b81527f4c6f6e672053796d626f6c000000000000000000000000000000000000000000602082015290565b50604051615707816148c0565b600581527f4552433230000000000000000000000000000000000000000000000000000000602082015290565b5060408151111561569d565b806157525750604051614afe81614888565b600a8110156157b75761576490614b05565b614f01602260405180937f2e3000000000000000000000000000000000000000000000000000000000000060208301526157a78151809260208686019101614823565b81010360028101845201826148dc565b6157c090614b05565b614f01602160405180937f2e0000000000000000000000000000000000000000000000000000000000000060208301526158038151809260208686019101614823565b81010360018101845201826148dc565b60405190615820826148c0565b600782527f536574746c6564000000000000000000000000000000000000000000000000006020830152565b60405190615859826148c0565b600882527f4465706c657465640000000000000000000000000000000000000000000000006020830152565b600581101561596b576004810361589f5750614f0161584c565b600381036158e157506040516158b4816148c0565b600881527f43616e63656c6564000000000000000000000000000000000000000000000000602082015290565b6001810361592357506040516158f6816148c0565b600981527f53747265616d696e670000000000000000000000000000000000000000000000602082015290565b60020361593257614f01615813565b60405161593e816148c0565b600781527f50656e64696e6700000000000000000000000000000000000000000000000000602082015290565b634e487b7160e01b600052602160045260246000fd5b6030614e839193929360405194816159a3879351809260208087019101614823565b820164010714051160dd1b60208201526a029b0b13634b2b9102b19160ad1b60258201526159da8251809360208785019101614823565b010360108101855201836148dc565b6025614e83919392936040519481615a0b879351809260208087019101614823565b820164010714051160dd1b6020820152615a2e8251809360208785019101614823565b010360058101855201836148dc565b60405190615a4a826148c0565b601082527f68736c283233302c3231252c31312529000000000000000000000000000000006020830152565b8015615ca857615a84615a3d565b90612710908103908111614adb57614f0191615aa261013692614b05565b6040519485927f3c672066696c6c3d226e6f6e65223e000000000000000000000000000000000060208501527f3c636972636c652063783d22313636222063793d2235302220723d2232322220602f8501527f7374726f6b653d22000000000000000000000000000000000000000000000000604f850152615b2e815180926020605788019101614823565b83017f22207374726f6b652d77696474683d223130222f3e000000000000000000000060578201527f3c636972636c652063783d22313636222063793d2235302220706174684c656e606c8201527f6774683d2231303030302220723d22323222207374726f6b653d220000000000608c820152615bb682518093602060a785019101614823565b017f22207374726f6b652d6461736861727261793d22313030303022207374726f6b60a78201527f652d646173686f66667365743d2200000000000000000000000000000000000060c7820152615c1782518093602060d585019101614823565b017f22207374726f6b652d6c696e656361703d22726f756e6422207374726f6b652d60d58201527f77696474683d223522207472616e73666f726d3d22726f74617465282d39302960f58201527f22207472616e73666f726d2d6f726967696e3d22313636203530222f3e000000610115820152631e17b39f60e11b610132820152036101168101845201826148dc565b5050604051614afe81614888565b60009080518015615d2b579060009182915b818310615cda57505050600d02900390565b909193603b60f81b7fff00000000000000000000000000000000000000000000000000000000000000615d0d8785614d99565b511614615d23575b600d01936001019190615cc8565b849350615d15565b505050600090565b60009080518015615d2b579060009182915b818310615d575750505060041b900390565b909193603b60f81b7fff00000000000000000000000000000000000000000000000000000000000000615d8a8785614d99565b511614615da0575b601001936001019190615d45565b849350615d9256"; + hex"6080806040523461001757615db990816200001d8239f35b600080fdfe6080604052600436101561001257600080fd5b60003560e01c63e9dc63751461002757600080fd5b346142f85760403660031901126142f8576001600160a01b0360043516600435036142f857610056608061486e565b60006080819052606060a081905260c082905260e0819052610120819052610140819052610160819052610180919091526101a0526004356001600160a01b03166101008190526100a690614c58565b61012052610100516040517feac8f5b80000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa908115614305576000916147dd575b506001600160a01b03610117911680608052615669565b60a052610100516040517fa80fc0710000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa8015614305576fffffffffffffffffffffffffffffffff916000916147be575b501660c052610100516040517fad35efd40000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa801561430557600090614781575b6101e59150615889565b61014052610100516040517f4869e12d0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa90811561430557600091614752575b5060c0516fffffffffffffffffffffffffffffffff16801561473c576fffffffffffffffffffffffffffffffff612710819302160416610100608001526102876004356153c7565b610120608001526040514660208201526bffffffffffffffffffffffff1960043560601b16604082015260243560548201526054815280608081011067ffffffffffffffff60808301111761431157608081016040526020815191012061041a602963ffffffff61032e6103078261016861ffff8860101c160616614b08565b91601e604660ff6103248460146050848d60081c16060116614b08565b9816060116614b08565b6040519485927f68736c2800000000000000000000000000000000000000000000000000000000602085015261036e815180926020602488019101614826565b83017f2c0000000000000000000000000000000000000000000000000000000000000060248201526103aa825180936020602585019101614826565b017f252c00000000000000000000000000000000000000000000000000000000000060258201526103e5825180936020602785019101614826565b017f252900000000000000000000000000000000000000000000000000000000000060278201520360098101845201826148df565b6104526fffffffffffffffffffffffffffffffff6040608001511660ff61044b6001600160a01b03608051166155dc565b1690614e89565b6104666001600160a01b0360805116614c58565b60a051610100516040517fbc2be1be0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa80156143055760249160009161471d575b5060206001600160a01b03608080015116604051938480927f9067b677000000000000000000000000000000000000000000000000000000008252823560048301525afa801561430557610528926000916146ee575b5064ffffffffff80911691166151d5565b61012051610180519092916105b2602161054f6064610548818706615744565b9504614b08565b6040519481610568879351809260208087019101614826565b820161057d8251809360208085019101614826565b017f250000000000000000000000000000000000000000000000000000000000000060208201520360018101855201836148df565b610100608001519260c060800151956101206080015197604051996105d68b61486e565b8a5260208a015260408901526060880152608087015260a086015260c085015260e0840152610100830152610120820152604051806101c081011067ffffffffffffffff6101c083011117614311576101c0810160405260608152600060208201526000604082015260608082015260006080820152606060a0820152600060c0820152600060e08201526060610100820152600061012082015260006101408201526060610160820152600061018082015260006101a082015260a08201516106a660c0840151845190615a7a565b906109b361015c604051926106ba846148c3565b600884527f50726f677265737300000000000000000000000000000000000000000000000060208501526107236040516106f38161488b565b60009052855160208701207fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4701490565b156146e6576090945b61073586614b08565b916040519586938493661e339034b21e9160c91b60208601526109818351958692610767846027840160208901614826565b6d11103334b6361e9111b33333111f60911b602785840101526c1e3932b1ba103bb4b23a341e9160991b603585840101526107ae8551809660206042888701019101614826565b7f22206865696768743d22313030222066696c6c2d6f7061636974793d222e3033828501860160428101919091527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e88201528651966108b491889160f990910190602001614826565b661e17ba32bc3a1f60c91b8285018601870160f98101919091527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b61014082015287519761094f91899161015190910190602001614826565b661e17ba32bc3a1f60c91b6101518888888887010101010152602061015888888885519c8d9701010101019101614826565b631e17b39f60e11b90860190910190910190910190910161015881019190915281900361013c810190915201826148df565b6101008301526101208201526028610100830151604051906109d48261488b565b60008252610c7a61015c604051926109eb846148c3565b600684527f53746174757300000000000000000000000000000000000000000000000000006020850152610a1e84615cba565b610a2782615d37565b808211156146de5750945b610a3d878701614b08565b91604051958693661e339034b21e9160c91b60208601528151610a67816027880160208601614826565b85016d11103334b6361e9111b33333111f60911b60278201526c1e3932b1ba103bb4b23a341e9160991b6035820152610aaa825180936020604285019101614826565b017f22206865696768743d22313030222066696c6c2d6f7061636974793d222e303360428201527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e8820152610ba682518093602060f985019101614826565b01661e17ba32bc3a1f60c91b60f98201527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b610140820152610c3582518093602061015185019101614826565b01661e17ba32bc3a1f60c91b610151820152610c5c82518093602061015885019101614826565b01631e17b39f60e11b6101588201520361013c8101845201826148df565b610160840152016101808201526028602083015160405190610c9b8261488b565b60008252610ce561015c60405192610cb2846148c3565b600684527f416d6f756e7400000000000000000000000000000000000000000000000000006020850152610a1e84615cba565b835201602082015261102060808301516030604051610d038161488b565b60008152610faa61015c60405194610d1a866148c3565b600886527f4475726174696f6e0000000000000000000000000000000000000000000000006020870152610d4d86615cba565b610d5682615d37565b808211156146d65750935b610d6d60288601614b08565b91604051978893661e339034b21e9160c91b60208601528151610d97816027880160208601614826565b85016d11103334b6361e9111b33333111f60911b60278201526c1e3932b1ba103bb4b23a341e9160991b6035820152610dda825180936020604285019101614826565b017f22206865696768743d22313030222066696c6c2d6f7061636974793d222e303360428201527f222072783d223135222072793d22313522207374726f6b653d2223666666222060628201527f7374726f6b652d6f7061636974793d222e3122207374726f6b652d77696474686082820152651e911a11179f60d11b60a28201527f3c7465787420783d2232302220793d2233342220666f6e742d66616d696c793d60a88201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f7370616365222060c8820152703337b73a16b9b4bd329e911919383c111f60791b60e8820152610ed682518093602060f985019101614826565b01661e17ba32bc3a1f60c91b60f98201527f3c7465787420783d2232302220793d2237322220666f6e742d66616d696c793d6101008201527f2227436f7572696572204e6577272c417269616c2c6d6f6e6f73706163652220610120820152703337b73a16b9b4bd329e91191b383c111f60791b610140820152610f6582518093602061015185019101614826565b01661e17ba32bc3a1f60c91b610151820152610f8c82518093602061015885019101614826565b01631e17b39f60e11b6101588201520361013c8101865201846148df565b8260a08601526028810160c0860152602085015190610120860151809161018088015192839185010101605881016080890152605719906103e8030160011c8061014089015201601081016101a088015201602081016040870152010160e0840152610100830151610160840151845191614e1f565b6060820152604051908161010081011067ffffffffffffffff6101008401111761431157610100820160405260c782527f3c726563742077696474683d223130302522206865696768743d22313030252260208301527f2066696c7465723d2275726c28234e6f69736529222f3e3c7265637420783d2260408301527f37302220793d223730222077696474683d2238363022206865696768743d223860608301527f3630222066696c6c3d2223666666222066696c6c2d6f7061636974793d222e3060808301527f33222072783d223435222072793d22343522207374726f6b653d22236666662260a08301527f207374726f6b652d6f7061636974793d222e3122207374726f6b652d7769647460c08301527f683d2234222f3e0000000000000000000000000000000000000000000000000060e083015282519161010084015191606081015194604051611176816148a7565b603381527f3c636972636c652069643d22476c6f772220723d22353030222066696c6c3d2260208201527f75726c282352616469616c476c6f7729222f3e000000000000000000000000006040820152604051966111d38861486e565b61011c88527f3c66696c7465722069643d224e6f697365223e3c6665466c6f6f6420783d223060208901527f2220793d2230222077696474683d223130302522206865696768743d2231303060408901527f252220666c6f6f642d636f6c6f723d2268736c283233302c3231252c3131252960608901527f2220666c6f6f642d6f7061636974793d22312220726573756c743d22666c6f6f60808901527f6446696c6c222f3e3c666554757262756c656e6365206261736546726571756560a08901527f6e63793d222e3422206e756d4f6374617665733d22332220726573756c743d2260c08901527f4e6f6973652220747970653d226672616374616c4e6f697365222f3e3c66654260e08901527f6c656e6420696e3d224e6f6973652220696e323d22666c6f6f6446696c6c22206101008901527f6d6f64653d22736f66742d6c69676874222f3e3c2f66696c7465723e0000000061012089015260405197886103a081011067ffffffffffffffff6103a08b011117614311576103a0890160405261037b89527f3c706174682069643d224c6f676f222066696c6c3d2223666666222066696c6c60208a01527f2d6f7061636974793d222e312220643d226d3133332e3535392c3132342e303360408a01527f34632d2e3031332c322e3431322d312e3035392c342e3834382d322e3932332c60608a01527f362e3430322d322e3535382c312e3831392d352e3136382c332e3433392d372e60808a01527f3838382c342e3939362d31342e34342c382e3236322d33312e3034372c31322e60a08a01527f3536352d34372e3637342c31322e3536392d382e3835382e3033362d31372e3860c08a01527f33382d312e3237322d32362e3332382d332e3636332d392e3830362d322e373660e08a01527f362d31392e3038372d372e3131332d32372e3536322d31322e3737382d31332e6101008a01527f3834322d382e3032352c392e3436382d32382e3630362c31362e3135332d33356101208a01527f2e323635683063322e3033352d312e3833382c342e3235322d332e3534362c366101408a01527f2e3436332d352e323234683063362e3432392d352e3635352c31362e3231382d6101608a01527f322e3833352c32302e3335382c342e31372c342e3134332c352e3035372c382e6101808a01527f3831362c392e3634392c31332e39322c31332e373334682e30333763352e37336101a08a01527f362c362e3436312c31352e3335372d322e3235332c392e33382d382e34382c306101c08a01527f2c302d332e3531352d332e3531352d332e3531352d332e3531352d31312e34396101e08a01527f2d31312e3437382d35322e3635362d35322e3636342d36342e3833372d36342e6102008a01527f3833376c2e3034392d2e303337632d312e3732352d312e3630362d322e3731396102208a01527f2d332e3834372d322e3735312d362e3230346830632d2e3034362d322e3337356102408a01527f2c312e3036322d342e3538322c322e3732362d362e32323968306c2e3138352d6102608a01527f2e3134386830632e3039392d2e3036322c2e3232322d2e3134382c2e33372d2e6102808a01527f323539683063322e30362d312e3336322c332e3935312d322e3632312c362e306102a08a01527f34342d332e3834324335372e3736332d332e3437332c39372e37362d322e33346102c08a01527f312c3132382e3633372c31382e3333326331362e3637312c392e3934362d32366102e08a01527f2e3334342c35342e3831332d33382e3635312c34302e3139392d362e3239392d6103008a01527f362e3039362d31382e3036332d31372e3734332d31392e3636382d31382e38316103208a01527f312d362e3031362d342e3034372d31332e3036312c342e3737362d372e3735326103408a01527f2c392e3735316c36382e3235342c36382e33373163312e3732342c312e3630316103608a01527f2c322e3731342c332e38342c322e3733382c362e3139325a222f3e00000000006103808a0152604051978860a081011067ffffffffffffffff60a08b01111761431157611cb1611d129160a08b0160405260758b527f3c706174682069643d22466c6f6174696e6754657874222066696c6c3d226e6f60208c01527f6e652220643d224d31323520343568373530733830203020383020383076373560408c01527f307330203830202d3830203830682d373530732d38302030202d3830202d383060608c01527f762d3735307330202d3830203830202d3830222f3e000000000000000000000060808c0152611868615a41565b906040517f3c72616469616c4772616469656e742069643d2252616469616c476c6f77223e6020820152611d0d60d87f3c73746f70206f66667365743d223025222073746f702d636f6c6f723d22000093846040850152805161199a60b88660208501936118da81605e840187614826565b8101997f222073746f702d6f7061636974793d222e36222f3e0000000000000000000000605e8c01527f3c73746f70206f66667365743d2231303025222073746f702d636f6c6f723d229a8b607382015261193f825180936020609385019101614826565b017f222073746f702d6f7061636974793d2230222f3e00000000000000000000000060938201527f3c2f72616469616c4772616469656e743e00000000000000000000000000000060a78201520360988101885201866148df565b6119a2615a41565b90604051967f3c6c696e6561724772616469656e742069643d2253616e64546f70222078313d60208901527f223025222079313d223025223e000000000000000000000000000000000000006040890152604d8801528251611a0881606b8a0184614826565b8701917f222f3e00000000000000000000000000000000000000000000000000000000009283606b82015289606e820152611a4d825180936020608e85019101614826565b019082608e830152611a9160a2897f3c2f6c696e6561724772616469656e743e0000000000000000000000000000009485609182015203608281018b5201896148df565b611bd7610108611a9f615a41565b6040519b8c917f3c6c696e6561724772616469656e742069643d2253616e64426f74746f6d222060208401527f78313d2231303025222079313d2231303025223e00000000000000000000000060408401527f3c73746f70206f66667365743d22313025222073746f702d636f6c6f723d22006054840152611b2b815180926020607387019101614826565b8201908760738301526076820152875190611b4a826096830188614826565b018660968201527f3c616e696d617465206174747269627574654e616d653d22783122206475723d60998201527f2236732220726570656174436f756e743d22696e646566696e6974652220766160b98201527f6c7565733d223330253b3630253b313230253b3630253b3330253b222f3e000060d98201528560f78201520360e881018c52018a6148df565b611bdf615a41565b906040519a8b957f3c6c696e6561724772616469656e742069643d22486f7572676c61737353747260208801527f6f6b6522206772616469656e745472616e73666f726d3d22726f74617465283960408801527f302922206772616469656e74556e6974733d227573657253706163654f6e557360608801527f65223e000000000000000000000000000000000000000000000000000000000060808801527f3c73746f70206f66667365743d22353025222073746f702d636f6c6f723d2200608388015251809260a2880190614826565b84018360a28201527f3c73746f70206f66667365743d22383025222073746f702d636f6c6f723d220060a5820152611cf382518093602060c485019101614826565b019160c483015260c78201520360b88101875201856148df565b614e1f565b92611d32611d1e615817565b896020815191012090602081519101201490565b9788156146ad575b506040518060c081011067ffffffffffffffff60c0830111176143115760c08101604052609081527f3c7061746820643d224d2035302c3336302061203330302c333030203020312c60208201527f31203630302c302061203330302c333030203020312c31202d3630302c30222060408201527f66696c6c3d2223666666222066696c6c2d6f7061636974793d222e303222207360608201527f74726f6b653d2275726c2823486f7572676c6173735374726f6b65292220737460808201527f726f6b652d77696474683d2234222f3e0000000000000000000000000000000060a082015260405193846102c081011067ffffffffffffffff6102c087011117614311576102c0850160405261029885527f3c7061746820643d226d3536362c3136312e323031762d35332e39323463302d60208601527f31392e3338322d32322e3531332d33372e3536332d36332e3339382d35312e3160408601527f39382d34302e3735362d31332e3539322d39342e3934362d32312e3037392d3160608601527f35322e3538372d32312e303739732d3131312e3833382c372e3438372d31353260808601527f2e3630322c32312e303739632d34302e3839332c31332e3633362d36332e343160a08601527f332c33312e3831362d36332e3431332c35312e3139387635332e39323463302c60c08601527f31372e3138312c31372e3730342c33332e3432372c35302e3232332c34362e3360e08601527f3934763238342e383039632d33322e3531392c31322e39362d35302e3232332c6101008601527f32392e3230362d35302e3232332c34362e3339347635332e39323463302c31396101208601527f2e3338322c32322e35322c33372e3536332c36332e3431332c35312e3139382c6101408601527f34302e3736332c31332e3539322c39342e3935342c32312e3037392c3135322e6101608601527f3630322c32312e303739733131312e3833312d372e3438372c3135322e3538376101808601527f2d32312e3037396334302e3838362d31332e3633362c36332e3339382d33312e6101a08601527f3831362c36332e3339382d35312e313938762d35332e39323463302d31372e316101c08601527f39362d31372e3730342d33332e3433352d35302e3232332d34362e34303156326101e08601527f30372e3630336333322e3531392d31322e3936372c35302e3232332d32392e326102008601527f30362c35302e3232332d34362e3430315a6d2d3334372e3436322c35372e37396102208601527f336c3133302e3935392c3133312e3032372d3133302e3935392c3133312e30316102408601527f33563231382e3939345a6d3236322e3932342e303232763236322e3031386c2d6102608601527f3133302e3933372d3133312e3030362c3133302e3933372d3133312e3031335a6102808601527f222066696c6c3d2223313631383232223e3c2f706174683e00000000000000006102a0860152896000146144885760405161218c8161488b565b60008152995b1561432757604051806101e081011067ffffffffffffffff6101e083011117614311576101e081016040526101b181527f3c7061746820643d226d3438312e34362c3438312e35347638312e3031632d3260208201527f2e33352e37372d342e38322c312e35312d372e33392c322e32332d33302e332c60408201527f382e35342d37342e36352c31332e39322d3132342e30362c31332e39322d353360608201527f2e362c302d3130312e32342d362e33332d3133312e34372d31362e3136762d3860808201527f316c34362e332d34362e3331683137302e33336c34362e32392c34362e33315a60a08201527f222066696c6c3d2275726c282353616e64426f74746f6d29222f3e3c7061746860c08201527f20643d226d3433352e31372c3433352e323363302c312e31372d2e34362c322e60e08201527f33322d312e33332c332e34342d372e31312c392e30382d34312e39332c31352e6101008201527f39382d38332e38312c31352e3938732d37362e372d362e392d38332e38322d316101208201527f352e3938632d2e38372d312e31322d312e33332d322e32372d312e33332d332e6101408201527f3434762d2e30346c382e33342d382e33352e30312d2e30316331332e37322d366101608201527f2e35312c34322e39352d31312e30322c37362e382d31312e30327336322e39376101808201527f2c342e34392c37362e37322c31316c382e34322c382e34325a222066696c6c3d6101a08201527f2275726c282353616e64546f7029222f3e0000000000000000000000000000006101c0820152995b60405196876107e081011067ffffffffffffffff6107e08a01111761431157613b9f9c612e5a6036602d9960819f97631e17b39f60e11b8d7f3c2f646566733e000000000000000000000000000000000000000000000000009a612f2b9f6107e0016040526107a782527f3c672066696c6c3d226e6f6e6522207374726f6b653d2275726c2823486f757260208301527f676c6173735374726f6b652922207374726f6b652d6c696e656361703d22726f60408301527f756e6422207374726f6b652d6d697465726c696d69743d22313022207374726f60608301527f6b652d77696474683d2234223e3c7061746820643d226d3536352e3634312c3160808301527f30372e323863302c392e3533372d352e35362c31382e3632392d31352e36373660a08301527f2c32362e393733682d2e303233632d392e3230342c372e3539362d32322e313960c08301527f342c31342e3536322d33382e3139372c32302e3539322d33392e3530342c313460e08301527f2e3933362d39372e3332352c32342e3335352d3136312e3733332c32342e33356101008301527f352d39302e34382c302d3136372e3934382d31382e3538322d3139392e3935336101208301527f2d34342e393438682d2e303233632d31302e3131352d382e3334342d31352e366101408301527f37362d31372e3433372d31352e3637362d32362e3937332c302d33392e3733356101608301527f2c39362e3535342d37312e3932312c3231352e3635322d37312e3932317332316101808301527f352e3632392c33322e3138352c3231352e3632392c37312e3932315a222f3e3c6101a08301527f7061746820643d226d3133342e33362c3136312e32303363302c33392e3733356101c08301527f2c39362e3535342c37312e3932312c3231352e3635322c37312e3932317332316101e08301527f352e3632392d33322e3138362c3231352e3632392d37312e393231222f3e3c6c6102008301527f696e652078313d223133342e3336222079313d223136312e323033222078323d6102208301527f223133342e3336222079323d223130372e3238222f3e3c6c696e652078313d226102408301527f3536352e3634222079313d223136312e323033222078323d223536352e3634226102608301527f2079323d223130372e3238222f3e3c6c696e652078313d223138342e353834226102808301527f2079313d223230362e383233222078323d223138342e353835222079323d22356102a08301527f33372e353739222f3e3c6c696e652078313d223231382e313831222079313d226102c08301527f3231382e313138222078323d223231382e313831222079323d223536322e35336102e08301527f37222f3e3c6c696e652078313d223438312e383138222079313d223231382e316103008301527f3432222078323d223438312e383139222079323d223536322e343238222f3e3c6103208301527f6c696e652078313d223531352e343135222079313d223230372e3335322220786103408301527f323d223531352e343136222079323d223533372e353739222f3e3c70617468206103608301527f643d226d3138342e35382c3533372e353863302c352e34352c342e32372c31306103808301527f2e36352c31322e30332c31352e3432682e303263352e35312c332e33392c31326103a08301527f2e37392c362e35352c32312e35352c392e34322c33302e32312c392e392c37386103c08301527f2e30322c31362e32382c3133312e38332c31362e32382c34392e34312c302c396103e08301527f332e37362d352e33382c3132342e30362d31332e39322c322e372d2e37362c356104008301527f2e32392d312e35342c372e37352d322e33352c382e37372d322e38372c31362e6104208301527f30352d362e30342c32312e35362d392e3433683063372e37362d342e37372c316104408301527f322e30342d392e39372c31322e30342d31352e3432222f3e3c7061746820643d6104608301527f226d3138342e3538322c3439322e363536632d33312e3335342c31322e3438356104808301527f2d35302e3232332c32382e35382d35302e3232332c34362e3134322c302c392e6104a08301527f3533362c352e3536342c31382e3632372c31352e3637372c32362e393639682e6104c08301527f30323263382e3530332c372e3030352c32302e3231332c31332e3436332c33346104e08301527f2e3532342c31392e3135392c392e3939392c332e3939312c32312e3236392c376105008301527f2e3630392c33332e3539372c31302e3738382c33362e34352c392e3430372c386105208301527f322e3138312c31352e3030322c3133312e3833352c31352e3030327339352e336105408301527f36332d352e3539352c3133312e3830372d31352e3030326331302e3834372d326105608301527f2e37392c32302e3836372d352e3932362c32392e3932342d392e3334392c312e6105808301527f3234342d2e3436372c322e3437332d2e3934322c332e3637332d312e3432342c6105a08301527f31342e3332362d352e3639362c32362e3033352d31322e3136312c33342e35326105c08301527f342d31392e313733682e3032326331302e3131342d382e3334322c31352e36376105e08301527f372d31372e3433332c31352e3637372d32362e3936392c302d31372e3536322d6106008301527f31382e3836392d33332e3636352d35302e3232332d34362e3135222f3e3c70616106208301527f746820643d226d3133342e33362c3539322e373263302c33392e3733352c39366106408301527f2e3535342c37312e3932312c3231352e3635322c37312e393231733231352e366106608301527f32392d33322e3138362c3231352e3632392d37312e393231222f3e3c6c696e656106808301527f2078313d223133342e3336222079313d223539322e3732222078323d223133346106a08301527f2e3336222079323d223533382e373937222f3e3c6c696e652078313d223536356106c08301527f2e3634222079313d223539322e3732222078323d223536352e3634222079323d6106e08301527f223533382e373937222f3e3c706f6c796c696e6520706f696e74733d223438316107008301527f2e383232203438312e393031203438312e373938203438312e383737203438316107208301527f2e373735203438312e383534203335302e303135203335302e303236203231386107408301527f2e313835203231382e313239222f3e3c706f6c796c696e6520706f696e74733d6107608301527f223231382e313835203438312e393031203231382e323331203438312e3835346107808301527f203335302e303135203335302e303236203438312e383232203231382e3135326107a08301527f222f3e3c2f673e000000000000000000000000000000000000000000000000006107c0830152604051998a957f3c672069643d22486f7572676c617373223e00000000000000000000000000006020880152603295612df68151809260208a8c019101614826565b8701612e0b8251809360208a85019101614826565b01612e1f8251809360208985019101614826565b01612e338251809360208885019101614826565b01612e478251809360208785019101614826565b01918201520360168101865201846148df565b6040519e8f9788977f3c646566733e000000000000000000000000000000000000000000000000000060208a0152612e9f6026998260208c9451948593019101614826565b8901612eb48251809360208c85019101614826565b01612ec88251809360208b85019101614826565b01612edc8251809360208a85019101614826565b01612ef08251809360208985019101614826565b01612f048251809360208885019101614826565b01612f188251809360208785019101614826565b019182015203600d8101895201876148df565b6137be604c60e08301516101208401519361351a61314d6060604084015193015196612f578186615985565b9461314861012b604051612f6a816148c3565b600581527f2d3130302500000000000000000000000000000000000000000000000000000060208201526040519889917f3c74657874506174682073746172744f66667365743d220000000000000000006020840152612fd4815180926020603787019101614826565b7f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666683820160378101919091527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e00000000000000000061010982015282519261311891849161012090910190602001614826565b6a1e17ba32bc3a2830ba341f60a91b90830190910161012081019190915281900361010b810190915201876148df565b615985565b9561332c61012b604051613160816148c3565b600281527f30250000000000000000000000000000000000000000000000000000000000006020820152604051998a917f3c74657874506174682073746172744f66667365743d2200000000000000000060208401526131ca815180926020603787019101614826565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e00000000000000000061010982015261330782518093602061012085019101614826565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b81018a5201886148df565b61333681846159ed565b9261351561012b604051613349816148c3565b600481527f2d3530250000000000000000000000000000000000000000000000000000000060208201526040519687917f3c74657874506174682073746172744f66667365743d2200000000000000000060208401526133b3815180926020603787019101614826565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e0000000000000000006101098201526134f082518093602061012085019101614826565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b8101875201856148df565b6159ed565b906136f961012b60405161352d816148c3565b600381527f353025000000000000000000000000000000000000000000000000000000000060208201526040519485917f3c74657874506174682073746172744f66667365743d220000000000000000006020840152613597815180926020603787019101614826565b82017f2220687265663d2223466c6f6174696e6754657874222066696c6c3d2223666660378201527f662220666f6e742d66616d696c793d2227436f7572696572204e6577272c417260578201527f69616c2c6d6f6e6f7370616365222066696c6c2d6f7061636974793d222e3822607782015271103337b73a16b9b4bd329e91191b383c111f60711b60978201527f3c616e696d6174652061646469746976653d2273756d2220617474726962757460a98201527f654e616d653d2273746172744f66667365742220626567696e3d22307322206460c98201527f75723d22353073222066726f6d3d2230252220726570656174436f756e743d2260e98201527f696e646566696e6974652220746f3d2231303025222f3e0000000000000000006101098201526136d482518093602061012085019101614826565b016a1e17ba32bc3a2830ba341f60a91b6101208201520361010b8101855201836148df565b6040519586937f3c7465787420746578742d72656e646572696e673d226f7074696d697a65537060208601527f656564223e000000000000000000000000000000000000000000000000000000604086015261375f815180926020604589019101614826565b8401613775825180936020604585019101614826565b0161378a825180936020604585019101614826565b0161379f825180936020604585019101614826565b01661e17ba32bc3a1f60c91b604582015203602c8101845201826148df565b613a9e61019a6101408401516101a0850151906137ff6137f96137f36137ed60e060408b01519a015194614b08565b94614b08565b97614b08565b91614b08565b956040519687937f3c75736520687265663d2223476c6f77222066696c6c2d6f7061636974793d2260208601527f2e39222f3e00000000000000000000000000000000000000000000000000000060408601527f3c75736520687265663d2223476c6f772220783d22313030302220793d22313060458601527f3030222066696c6c2d6f7061636974793d222e39222f3e00000000000000000060658601527f3c75736520687265663d22234c6f676f2220783d223137302220793d22313730607c8601527f22207472616e73666f726d3d227363616c65282e3629222f3e3c757365206872609c8601527f65663d2223486f7572676c6173732220783d223135302220793d22393022207460bc8601527f72616e73666f726d3d22726f746174652831302922207472616e73666f726d2d60dc8601527f6f726967696e3d2235303020353030222f3e000000000000000000000000000060fc8601527f3c75736520687265663d222350726f67726573732220783d220000000000000061010e8601526101279061399a815180926020858a019101614826565b8501937f2220793d22373930222f3e00000000000000000000000000000000000000000080948180948801527f3c75736520687265663d22235374617475732220783d2200000000000000000061013288015261014996613a048251809360208b85019101614826565b01958601527f3c75736520687265663d2223416d6f756e742220783d2200000000000000000061015486015261016b94613a478251809360208985019101614826565b01938401527f3c75736520687265663d22234475726174696f6e2220783d220000000000000061017684015261018f92613a8a8251809360208785019101614826565b01918201520361017a8101855201836148df565b6040519586937f3c73766720786d6c6e733d22687474703a2f2f7777772e77332e6f72672f323060208601527f30302f737667222077696474683d223130303022206865696768743d2231303060408601527f30222076696577426f783d2230203020313030302031303030223e00000000006060860152613b2a815180926020607b89019101614826565b8401613b40825180936020607b85019101614826565b01613b55825180936020607b85019101614826565b01613b6a825180936020607b85019101614826565b017f3c2f7376673e0000000000000000000000000000000000000000000000000000607b8201520360618101845201826148df565b6101605260a051610100516040517fb971302a0000000000000000000000000000000000000000000000000000000081526024803560048301529091602091839182906001600160a01b03165afa908115614305576000916142ba575b6142b661424f614154614245609487613d3b6089613c198a614c58565b9260c0608001516040519485927f5b7b2274726169745f74797065223a224173736574222c2276616c7565223a226020850152613c60815180926020604088019101614826565b8301907f227d2c7b2274726169745f74797065223a2253656e646572222c2276616c756560408301527f223a22000000000000000000000000000000000000000000000000000000000091826060820152613cc5825180936020606385019101614826565b01907f227d2c7b2274726169745f74797065223a22537461747573222c2276616c756560638301526083820152613d06825180936020608685019101614826565b017f227d5d000000000000000000000000000000000000000000000000000000000060868201520360698101845201826148df565b6101a05160a05161403e61017e613d53602435614b08565b9360a060800151613d6e6001600160a01b0360805116614c58565b90604051968793613f2b60208601987f54686973204e465420726570726573656e74732061207061796d656e742073748a527f7265616d20696e2061205361626c696572205632200000000000000000000000604088015282516020840190613ddb8160558b0184614826565b8801947f20636f6e74726163742e20546865206f776e6572206f662074686973204e465460558701527f2063616e207769746864726177207468652073747265616d656420617373657460758701527f732c207768696368206172652064656e6f6d696e6174656420696e2000000000609587015282516020840196613e658260b183018a614826565b017f2e5c6e5c6e2d2053747265616d2049443a20000000000000000000000000000060b1820152613ea082518093602060c385019101614826565b01613ed97f5c6e2d2000000000000000000000000000000000000000000000000000000000958660c384015251809360c7840190614826565b01947f20416464726573733a2000000000000000000000000000000000000000000000958660c7820152613f1782518093602060d185019101614826565b019260d184015251809360d5840190614826565b019060d5820152613f4682518093602060df85019101614826565b017f5c6e5c6e0000000000000000000000000000000000000000000000000000000060df8201527fe29aa0efb88f205741524e494e473a205472616e7366657272696e672074686560e38201527f204e4654206d616b657320746865206e6577206f776e657220746865207265636101038201527f697069656e74206f66207468652073747265616d2e205468652066756e6473206101238201527f617265206e6f74206175746f6d61746963616c6c792077697468647261776e206101438201527f666f72207468652070726576696f757320726563697069656e742e00000000006101638201520361015e8101855201836148df565b6101a051906141af614051602435614b08565b916140d0602d604051809560208201976a029b0b13634b2b9102b19160ad1b8952614086815180926020602b87019101614826565b82017f2023000000000000000000000000000000000000000000000000000000000000602b8201526140c18251809360208785019101614826565b0103600d8101865201846148df565b610160516140dd90614994565b94604051998a977f7b2261747472696275746573223a00000000000000000000000000000000000060208a015261411e815180926020602e8d019101614826565b8801917f2c226465736372697074696f6e223a2200000000000000000000000000000000602e840152518093603e840190614826565b01917f222c2265787465726e616c5f75726c223a2268747470733a2f2f7361626c6965603e8401527f722e636f6d222c226e616d65223a220000000000000000000000000000000000605e840152518093606d840190614826565b017f222c22696d616765223a22646174613a696d6167652f7376672b786d6c3b6261606d8201527f736536342c000000000000000000000000000000000000000000000000000000608d820152614210825180936020609285019101614826565b017f227d00000000000000000000000000000000000000000000000000000000000060928201520360748101845201826148df565b60e0819052614994565b6142a2603d60405180937f646174613a6170706c69636174696f6e2f6a736f6e3b6261736536342c00000060208301526142928151809260208686019101614826565b810103601d8101845201826148df565b604051918291602083526020830190614849565b0390f35b90506020813d6020116142fd575b816142d5602093836148df565b810103126142f85751906001600160a01b03821682036142f85790614154613bfc565b600080fd5b3d91506142c8565b6040513d6000823e3d90fd5b634e487b7160e01b600052604160045260246000fd5b6040518061012081011067ffffffffffffffff6101208301111761431157610120810160405260f881527f3c7061746820643d226d3438312e34362c3530342e3130317635382e3434396360208201527f2d322e33352e37372d342e38322c312e35312d372e33392c322e32332d33302e60408201527f332c382e35342d37342e36352c31332e39322d3132342e30362c31332e39322d60608201527f35332e362c302d3130312e32342d362e33332d3133312e34372d31362e31367660808201527f2d35382e343339683236322e39325a222066696c6c3d2275726c282353616e6460a08201527f426f74746f6d29222f3e3c656c6c697073652063783d22333530222063793d2260c08201527f3530342e313031222072783d223133312e343632222072793d2232382e31303860e08201527f222066696c6c3d2275726c282353616e64546f7029222f3e0000000000000000610100820152996123df565b604051806101c081011067ffffffffffffffff6101c083011117614311576101c0810160405261019981527f3c706f6c79676f6e20706f696e74733d22333530203335302e3032362034313560208201527f2e3033203238342e39373820323835203238342e39373820333530203335302e60408201527f303236222066696c6c3d2275726c282353616e64426f74746f6d29222f3e3c7060608201527f61746820643d226d3431362e3334312c3238312e39373563302c2e3931342d2e60808201527f3335342c312e3830392d312e3033352c322e36382d352e3534322c372e30373660a08201527f2d33322e3636312c31322e34352d36352e32382c31322e34352d33322e36323460c08201527f2c302d35392e3733382d352e3337342d36352e32382d31322e34352d2e36383160e08201527f2d2e3837322d312e3033352d312e3736372d312e3033352d322e36382c302d2e6101008201527f3931342e3335342d312e3830382c312e3033352d322e3637362c352e3534322d6101208201527f372e3037362c33322e3635362d31322e34352c36352e32382d31322e34352c336101408201527f322e3631392c302c35392e3733382c352e3337342c36352e32382c31322e34356101608201527f2e3638312e3836372c312e3033352c312e3736322c312e3033352c322e3637366101808201527f5a222066696c6c3d2275726c282353616e64546f7029222f3e000000000000006101a082015299612192565b6146cf9198506146bb615850565b906020815191012090602081519101201490565b9638611d3a565b905093610d61565b905094610a32565b60d09461072c565b614710915060203d602011614716575b61470881836148df565b810190614929565b38610517565b503d6146fe565b614736915060203d6020116147165761470881836148df565b386104c1565b634e487b7160e01b600052601260045260246000fd5b614774915060203d60201161477a575b61476c81836148df565b810190614901565b3861023f565b503d614762565b506020813d6020116147b6575b8161479b602093836148df565b810103126142f8575160058110156142f8576101e5906101db565b3d915061478e565b6147d7915060203d60201161477a5761476c81836148df565b38610181565b90506020813d60201161481e575b816147f8602093836148df565b810103126142f857516001600160a01b03811681036142f8576001600160a01b03610100565b3d91506147eb565b60005b8381106148395750506000910152565b8181015183820152602001614829565b9060209161486281518092818552858086019101614826565b601f01601f1916010190565b610140810190811067ffffffffffffffff82111761431157604052565b6020810190811067ffffffffffffffff82111761431157604052565b6060810190811067ffffffffffffffff82111761431157604052565b6040810190811067ffffffffffffffff82111761431157604052565b90601f8019910116810190811067ffffffffffffffff82111761431157604052565b908160209103126142f857516fffffffffffffffffffffffffffffffff811681036142f85790565b908160209103126142f8575164ffffffffff811681036142f85790565b67ffffffffffffffff811161431157601f01601f191660200190565b9061496c82614946565b61497960405191826148df565b828152809261498a601f1991614946565b0190602036910137565b805115614af4576040516149a7816148a7565b604081527f4142434445464748494a4b4c4d4e4f505152535455565758595a61626364656660208201527f6768696a6b6c6d6e6f707172737475767778797a303132333435363738392b2f60408201528151600292838201809211614ade5760038092047f3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81168103614ade57614a41908594951b614962565b936020850193829183518401925b838110614a8d5750505050510680600114614a7a57600214614a6f575090565b603d90600019015390565b50603d9081600019820153600119015390565b85600491979293949701918251600190603f9082828260121c16880101518453828282600c1c16880101518385015382828260061c1688010151888501531685010151878201530195929190614a4f565b634e487b7160e01b600052601160045260246000fd5b50604051614b018161488b565b6000815290565b806000917a184f03e93ff9f4daa797ed6e38ed64bf6a1f01000000000000000080821015614c4a575b506d04ee2d6d415b85acef810000000080831015614c3b575b50662386f26fc1000080831015614c2c575b506305f5e10080831015614c1d575b5061271080831015614c0e575b506064821015614bfe575b600a80921015614bf4575b600190816021614b9f828701614962565b95860101905b614bb1575b5050505090565b600019019083907f30313233343536373839616263646566000000000000000000000000000000008282061a835304918215614bef57919082614ba5565b614baa565b9160010191614b8e565b9190606460029104910191614b83565b60049193920491019138614b78565b60089193920491019138614b6b565b60109193920491019138614b5c565b60209193920491019138614b4a565b604093508104915038614b31565b6001600160a01b031660405190614c6e826148a7565b602a8252602082016040368237825115614d8657603090538151600190811015614d8657607860218401536029905b808211614d0b575050614cad5790565b60646040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602060248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152fd5b9091600f81166010811015614d71577f3031323334353637383961626364656600000000000000000000000000000000901a614d478486614d9c565b5360041c918015614d5c576000190190614c9d565b60246000634e487b7160e01b81526011600452fd5b60246000634e487b7160e01b81526032600452fd5b634e487b7160e01b600052603260045260246000fd5b908151811015614d86570160200190565b60405190614dba826148c3565b600482527f2667743b000000000000000000000000000000000000000000000000000000006020830152565b60405190614df3826148c3565b600482527f266c743b000000000000000000000000000000000000000000000000000000006020830152565b90614e87929493604051958692602094614e4181518092888089019101614826565b8401614e5582518093888085019101614826565b01614e6882518093878085019101614826565b01614e7b82518093868085019101614826565b010380855201836148df565b565b801561519a5760009180615175575090505b6001908082811015614f0857505050614eb2614de6565b614f05602260405183614ecf829551809260208086019101614826565b81017f203100000000000000000000000000000000000000000000000000000000000060208201520360028101845201826148df565b90565b66038d7ea4c6800011156151185760409081519060a0820182811067ffffffffffffffff82111761431157808452614f3f8161488b565b600081528252825190614f51826148c3565b8482526020917f4b0000000000000000000000000000000000000000000000000000000000000083820152828401528351614f8b816148c3565b8581527f4d0000000000000000000000000000000000000000000000000000000000000083820152848401528351614fc2816148c3565b8581527f42000000000000000000000000000000000000000000000000000000000000008382015260608401528351614ffa816148c3565b8581527f54000000000000000000000000000000000000000000000000000000000000008382015260808401526000918583965b6150ec575b50845194615040866148c3565b6007908187527f2623383830353b0000000000000000000000000000000000000000000000000083880152519560005b8281106150d957505050506150ba6150c0917f20000000000000000000000000000000000000000000000000000000000000006027870152600886526150b5866148c3565b614b08565b91615744565b916005851015614d8657614f059460051b015192614e1f565b8181018401518882018501528301615070565b9591926103e89081851061510f57508680916064600a870406950493019661502e565b93929650615033565b5050615122614dad565b614f0560286040518361513f829551809260208086019101614826565b81017f203939392e39395400000000000000000000000000000000000000000000000060208201520360088101845201826148df565b600a0a918215615186575004614e9b565b80634e487b7160e01b602492526012600452fd5b50506040516151a8816148c3565b600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b620151809103048061523d57506151ea614de6565b614f05602660405183615207829551809260208086019101614826565b81017f203120446179000000000000000000000000000000000000000000000000000060208201520360068101845201826148df565b61270f811161530c57600181036152c957614f056020615291604051615262816148c3565b600481527f20446179000000000000000000000000000000000000000000000000000000008382015293614b08565b60405193816152a98693518092868087019101614826565b82016152bd82518093868085019101614826565b010380845201826148df565b614f0560206152916040516152dd816148c3565b600581527f20446179730000000000000000000000000000000000000000000000000000008382015293614b08565b50615315614dad565b614f05602a60405183615332829551809260208086019101614826565b81017f2039393939204461797300000000000000000000000000000000000000000000602082015203600a8101845201826148df565b6020818303126142f85780519067ffffffffffffffff82116142f8570181601f820112156142f857805161539b81614946565b926153a960405194856148df565b818452602082840101116142f857614f059160208085019101614826565b6001600160a01b031660409081516395d89b4160e01b8152600081600481855afa9081156155a157600091615580575b5061545c8351615406816148c3565b601181527f5341422d56322d4c4f434b55502d4c494e0000000000000000000000000000006020918201528251908301207fc66b376a19264d832c1bc254000c18944ca5aa57ed50f4ea637c4da424d4c3bb1490565b1561549a5750505161546d816148c3565b600d81527f4c6f636b7570204c696e65617200000000000000000000000000000000000000602082015290565b6154fe83516154a8816148c3565b601181527f5341422d56322d4c4f434b55502d44594e0000000000000000000000000000006020918201528251908301207f6ab655856fa5352de8c05542b1937ac63c59342da992602767c02734cc5391651490565b1561553c5750505161550f816148c3565b600e81527f4c6f636b75702044796e616d6963000000000000000000000000000000000000602082015290565b61557c9083519384937f814a8a2e000000000000000000000000000000000000000000000000000000008552600485015260248401526044830190614849565b0390fd5b61559b913d8091833e61559381836148df565b810190615368565b386153f7565b83513d6000823e3d90fd5b3d156155d7573d906155bd82614946565b916155cb60405193846148df565b82523d6000602084013e565b606090565b60405160208101907f313ce56700000000000000000000000000000000000000000000000000000000825260048152615614816148c3565b6000928392839251915afa6156276155ac565b908061565e575b1561565a5760208180518101031261565657602001519060ff82168203615653575090565b80fd5b5080fd5b5090565b50602081511461562e565b6000809160405160208101906395d89b4160e01b82526004815261568c816148c3565b51915afa6156986155ac565b90158015615738575b6156fe57806020806156b893518301019101615368565b601e815111600014614f0557506040516156d1816148c3565b600b81527f4c6f6e672053796d626f6c000000000000000000000000000000000000000000602082015290565b5060405161570b816148c3565b600581527f4552433230000000000000000000000000000000000000000000000000000000602082015290565b506040815111156156a1565b806157565750604051614b018161488b565b600a8110156157bb5761576890614b08565b614f05602260405180937f2e3000000000000000000000000000000000000000000000000000000000000060208301526157ab8151809260208686019101614826565b81010360028101845201826148df565b6157c490614b08565b614f05602160405180937f2e0000000000000000000000000000000000000000000000000000000000000060208301526158078151809260208686019101614826565b81010360018101845201826148df565b60405190615824826148c3565b600782527f536574746c6564000000000000000000000000000000000000000000000000006020830152565b6040519061585d826148c3565b600882527f4465706c657465640000000000000000000000000000000000000000000000006020830152565b600581101561596f57600481036158a35750614f05615850565b600381036158e557506040516158b8816148c3565b600881527f43616e63656c6564000000000000000000000000000000000000000000000000602082015290565b6001810361592757506040516158fa816148c3565b600981527f53747265616d696e670000000000000000000000000000000000000000000000602082015290565b60020361593657614f05615817565b604051615942816148c3565b600781527f50656e64696e6700000000000000000000000000000000000000000000000000602082015290565b634e487b7160e01b600052602160045260246000fd5b6030614e879193929360405194816159a7879351809260208087019101614826565b820164010714051160dd1b60208201526a029b0b13634b2b9102b19160ad1b60258201526159de8251809360208785019101614826565b010360108101855201836148df565b6025614e87919392936040519481615a0f879351809260208087019101614826565b820164010714051160dd1b6020820152615a328251809360208785019101614826565b010360058101855201836148df565b60405190615a4e826148c3565b601082527f68736c283233302c3231252c31312529000000000000000000000000000000006020830152565b8015615cac57615a88615a41565b90612710908103908111614ade57614f0591615aa661013692614b08565b6040519485927f3c672066696c6c3d226e6f6e65223e000000000000000000000000000000000060208501527f3c636972636c652063783d22313636222063793d2235302220723d2232322220602f8501527f7374726f6b653d22000000000000000000000000000000000000000000000000604f850152615b32815180926020605788019101614826565b83017f22207374726f6b652d77696474683d223130222f3e000000000000000000000060578201527f3c636972636c652063783d22313636222063793d2235302220706174684c656e606c8201527f6774683d2231303030302220723d22323222207374726f6b653d220000000000608c820152615bba82518093602060a785019101614826565b017f22207374726f6b652d6461736861727261793d22313030303022207374726f6b60a78201527f652d646173686f66667365743d2200000000000000000000000000000000000060c7820152615c1b82518093602060d585019101614826565b017f22207374726f6b652d6c696e656361703d22726f756e6422207374726f6b652d60d58201527f77696474683d223522207472616e73666f726d3d22726f74617465282d39302960f58201527f22207472616e73666f726d2d6f726967696e3d22313636203530222f3e000000610115820152631e17b39f60e11b610132820152036101168101845201826148df565b5050604051614b018161488b565b60009080518015615d2f579060009182915b818310615cde57505050600d02900390565b909193603b60f81b7fff00000000000000000000000000000000000000000000000000000000000000615d118785614d9c565b511614615d27575b600d01936001019190615ccc565b849350615d19565b505050600090565b60009080518015615d2f579060009182915b818310615d5b5750505060041b900390565b909193603b60f81b7fff00000000000000000000000000000000000000000000000000000000000000615d8e8785614d9c565b511614615da4575b601001936001019190615d49565b849350615d9656fea164736f6c6343000815000a"; /*////////////////////////////////////////////////////////////////////////// DEPLOYERS diff --git a/test/utils/Precompiles.t.sol b/test/utils/Precompiles.t.sol index 02a95f874..998f48a5c 100644 --- a/test/utils/Precompiles.t.sol +++ b/test/utils/Precompiles.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.19 <=0.9.0; +pragma solidity >=0.8.19 <0.9.0; -import { LibString } from "solady/utils/LibString.sol"; +import { LibString } from "solady/src/utils/LibString.sol"; import { ISablierV2Comptroller } from "../../src/interfaces/ISablierV2Comptroller.sol"; import { ISablierV2LockupDynamic } from "../../src/interfaces/ISablierV2LockupDynamic.sol"; @@ -25,14 +25,15 @@ contract Precompiles_Test is Base_Test { function test_DeployComptroller() external onlyTestOptimizedProfile { address actualComptroller = address(precompiles.deployComptroller(users.admin)); - address expectedComptroller = address(deployPrecompiledComptroller(users.admin)); + address expectedComptroller = address(deployOptimizedComptroller(users.admin)); assertEq(actualComptroller.code, expectedComptroller.code, "bytecodes mismatch"); } function test_DeployLockupDynamic() external onlyTestOptimizedProfile { ISablierV2Comptroller comptroller = precompiles.deployComptroller(users.admin); address actualLockupDynamic = address(precompiles.deployLockupDynamic(users.admin, comptroller, nftDescriptor)); - address expectedLockupDynamic = address(deployPrecompiledDynamic(users.admin, comptroller, nftDescriptor)); + address expectedLockupDynamic = + address(deployOptimizedLockupDynamic(users.admin, comptroller, nftDescriptor, defaults.MAX_SEGMENT_COUNT())); bytes memory expectedLockupDynamicCode = adjustBytecode(expectedLockupDynamic.code, expectedLockupDynamic, actualLockupDynamic); assertEq(actualLockupDynamic.code, expectedLockupDynamicCode, "bytecodes mismatch"); @@ -41,7 +42,7 @@ contract Precompiles_Test is Base_Test { function test_DeployLockupLinear() external onlyTestOptimizedProfile { ISablierV2Comptroller comptroller = precompiles.deployComptroller(users.admin); address actualLockupLinear = address(precompiles.deployLockupLinear(users.admin, comptroller, nftDescriptor)); - address expectedLockupLinear = address(deployPrecompiledLinear(users.admin, comptroller, nftDescriptor)); + address expectedLockupLinear = address(deployOptimizedLockupLinear(users.admin, comptroller, nftDescriptor)); bytes memory expectedLockupLinearCode = adjustBytecode(expectedLockupLinear.code, expectedLockupLinear, actualLockupLinear); assertEq(actualLockupLinear.code, expectedLockupLinearCode, "bytecodes mismatch"); @@ -49,7 +50,7 @@ contract Precompiles_Test is Base_Test { function test_DeployNFTDescriptor() external onlyTestOptimizedProfile { address actualNFTDescriptor = address(precompiles.deployNFTDescriptor()); - address expectedNFTDescriptor = address(deployPrecompiledNFTDescriptor()); + address expectedNFTDescriptor = address(deployOptimizedNFTDescriptor()); assertEq(actualNFTDescriptor.code, expectedNFTDescriptor.code, "bytecodes mismatch"); } @@ -61,21 +62,25 @@ contract Precompiles_Test is Base_Test { ISablierV2NFTDescriptor actualNFTDescriptor ) = precompiles.deployCore(users.admin); - address expectedComptroller = address(deployPrecompiledComptroller(users.admin)); - assertEq(address(actualComptroller).code, expectedComptroller.code, "bytecodes mismatch"); + ( + ISablierV2Comptroller expectedComptroller, + ISablierV2LockupDynamic expectedLockupDynamic, + ISablierV2LockupLinear expectedLockupLinear, + ISablierV2NFTDescriptor expectedNFTDescriptor + ) = deployOptimizedCore(users.admin, defaults.MAX_SEGMENT_COUNT()); + + bytes memory expectedLockupDynamicCode = adjustBytecode( + address(expectedLockupDynamic).code, address(expectedLockupDynamic), address(actualLockupDynamic) + ); - address expectedLockupDynamic = address(deployPrecompiledDynamic(users.admin, actualComptroller, nftDescriptor)); - bytes memory expectedLockupDynamicCode = - adjustBytecode(expectedLockupDynamic.code, expectedLockupDynamic, address(actualLockupDynamic)); - assertEq(address(actualLockupDynamic).code, expectedLockupDynamicCode, "bytecodes mismatch"); + bytes memory expectedLockupLinearCode = adjustBytecode( + address(expectedLockupLinear).code, address(expectedLockupLinear), address(actualLockupLinear) + ); - address expectedLockupLinear = address(deployPrecompiledLinear(users.admin, actualComptroller, nftDescriptor)); - bytes memory expectedLockupLinearCode = - adjustBytecode(expectedLockupLinear.code, expectedLockupLinear, address(actualLockupLinear)); + assertEq(address(actualComptroller).code, address(expectedComptroller).code, "bytecodes mismatch"); + assertEq(address(actualLockupDynamic).code, expectedLockupDynamicCode, "bytecodes mismatch"); assertEq(address(actualLockupLinear).code, expectedLockupLinearCode, "bytecodes mismatch"); - - address expectedNFTDescriptor = address(deployPrecompiledNFTDescriptor()); - assertEq(address(actualNFTDescriptor).code, expectedNFTDescriptor.code, "bytecodes mismatch"); + assertEq(address(actualNFTDescriptor).code, address(expectedNFTDescriptor).code, "bytecodes mismatch"); } /// @dev The expected bytecode has to be adjusted because {SablierV2Lockup} inherits from {NoDelegateCall}, which diff --git a/test/utils/Utils.sol b/test/utils/Utils.sol index 9748d2d3a..f2e483e6e 100644 --- a/test/utils/Utils.sol +++ b/test/utils/Utils.sol @@ -2,10 +2,10 @@ pragma solidity >=0.8.19; import { Strings } from "@openzeppelin/contracts/utils/Strings.sol"; -import { PRBMathUtils } from "@prb/math/src/test/Utils.sol"; +import { PRBMathUtils } from "@prb/math/test/utils/Utils.sol"; -import { Vm } from "@prb/test/PRBTest.sol"; -import { StdUtils } from "forge-std/StdUtils.sol"; +import { Vm } from "@prb/test/src/PRBTest.sol"; +import { StdUtils } from "forge-std/src/StdUtils.sol"; import { LockupDynamic } from "../../src/types/DataTypes.sol";