@pendle/core-v2 0.5.1-beta-4 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (126) hide show
  1. package/contracts/SuperComposableYield/ISuperComposableYield.sol +2 -0
  2. package/contracts/SuperComposableYield/implementations/RewardManager.sol +35 -20
  3. package/contracts/SuperComposableYield/implementations/SCYBase.sol +39 -19
  4. package/contracts/SuperComposableYield/implementations/SCYBaseWithRewards.sol +26 -14
  5. package/contracts/core/PendleBaseToken.sol +2 -2
  6. package/contracts/core/PendleMarket.sol +145 -61
  7. package/contracts/core/PendleMarketFactory.sol +30 -19
  8. package/contracts/core/{PendleOwnershipToken.sol → PendlePrincipalToken.sol} +14 -2
  9. package/contracts/core/PendleRouter.sol +23 -9
  10. package/contracts/core/PendleSCYImpl/AaveV3/PendleAaveV3SCY.sol +21 -20
  11. package/contracts/core/PendleSCYImpl/PendleBenQiErc20SCY.sol +22 -16
  12. package/contracts/core/PendleSCYImpl/PendleBtrflySCY.sol +13 -13
  13. package/contracts/core/PendleSCYImpl/PendleStETHSCY.sol +107 -0
  14. package/contracts/core/PendleSCYImpl/PendleYearnVaultSCY.sol +14 -15
  15. package/contracts/core/PendleYieldContractFactory.sol +29 -14
  16. package/contracts/core/PendleYieldToken.sol +130 -76
  17. package/contracts/core/RouterStatic.sol +16 -157
  18. package/contracts/core/actions/ActionCallback.sol +36 -18
  19. package/contracts/core/actions/ActionCore.sol +41 -88
  20. package/contracts/core/actions/ActionRedeem.sol +36 -0
  21. package/contracts/core/actions/ActionYT.sol +41 -59
  22. package/contracts/core/actions/base/{ActionSCYAndOTBase.sol → ActionSCYAndPTBase.sol} +59 -45
  23. package/contracts/core/actions/base/{ActionSCYAndYOBase.sol → ActionSCYAndPYBase.sol} +57 -19
  24. package/contracts/core/actions/base/ActionSCYAndYTBase.sol +31 -21
  25. package/contracts/interfaces/IPActionCore.sol +21 -28
  26. package/contracts/interfaces/IPActionRedeem.sol +17 -0
  27. package/contracts/interfaces/IPActionYT.sol +5 -12
  28. package/contracts/interfaces/IPAllAction.sol +2 -2
  29. package/contracts/interfaces/IPMarket.sol +33 -10
  30. package/contracts/interfaces/IPMarketAddRemoveCallback.sol +2 -2
  31. package/contracts/interfaces/IPMarketFactory.sol +3 -1
  32. package/contracts/interfaces/IPMarketSwapCallback.sol +1 -1
  33. package/contracts/interfaces/{IPOwnershipToken.sol → IPPrincipalToken.sol} +1 -1
  34. package/contracts/interfaces/IPRouterStatic.sol +7 -82
  35. package/contracts/interfaces/IPYieldContractFactory.sol +10 -2
  36. package/contracts/interfaces/IPYieldToken.sol +14 -5
  37. package/contracts/interfaces/IWstETH.sol +10 -0
  38. package/contracts/libraries/JoeLibrary.sol +1 -1
  39. package/contracts/libraries/math/LogExpMath.sol +1 -1
  40. package/contracts/libraries/math/MarketApproxLib.sol +128 -88
  41. package/contracts/libraries/math/MarketMathAux.sol +13 -13
  42. package/contracts/libraries/math/MarketMathCore.sol +62 -93
  43. package/contracts/libraries/math/Math.sol +14 -2
  44. package/contracts/periphery/PendleGovernanceManager.sol +5 -3
  45. package/package.json +3 -2
  46. package/typechain-types/ActionCallback.ts +5 -5
  47. package/typechain-types/ActionCore.ts +312 -234
  48. package/typechain-types/ActionRedeem.ts +125 -0
  49. package/typechain-types/ActionSCYAndPYBase.ts +223 -0
  50. package/typechain-types/ActionSCYAndYOBase.ts +129 -3
  51. package/typechain-types/ActionSCYAndYTBase.ts +149 -3
  52. package/typechain-types/ActionYT.ts +192 -94
  53. package/typechain-types/IPActionCore.ts +183 -231
  54. package/typechain-types/IPActionRedeem.ts +125 -0
  55. package/typechain-types/IPActionYT.ts +43 -91
  56. package/typechain-types/IPAllAction.ts +258 -321
  57. package/typechain-types/IPMarket.ts +150 -50
  58. package/typechain-types/IPMarketAddRemoveCallback.ts +10 -10
  59. package/typechain-types/IPMarketFactory.ts +28 -6
  60. package/typechain-types/IPMarketSwapCallback.ts +5 -5
  61. package/typechain-types/{IPOwnershipToken.ts → IPPrincipalToken.ts} +5 -5
  62. package/typechain-types/IPRouterStatic.ts +50 -530
  63. package/typechain-types/IPYieldContractFactory.ts +85 -19
  64. package/typechain-types/IPYieldToken.ts +138 -37
  65. package/typechain-types/ISuperComposableYield.ts +13 -0
  66. package/typechain-types/IWstETH.ts +149 -0
  67. package/typechain-types/PendleAaveV3SCY.ts +110 -0
  68. package/typechain-types/PendleBaseToken.ts +1 -1
  69. package/typechain-types/PendleBenQiErc20SCY.ts +55 -12
  70. package/typechain-types/PendleBtrflyScy.ts +27 -23
  71. package/typechain-types/PendleGovernanceManager.ts +5 -5
  72. package/typechain-types/PendleMarket.ts +197 -100
  73. package/typechain-types/PendleMarketFactory.ts +96 -34
  74. package/typechain-types/{PendleOwnershipToken.ts → PendlePrincipalToken.ts} +15 -6
  75. package/typechain-types/PendleRouter.ts +19 -0
  76. package/typechain-types/PendleRouterRedeemUpg.ts +125 -0
  77. package/typechain-types/PendleStEthSCY.ts +872 -0
  78. package/typechain-types/PendleYearnVaultScy.ts +27 -23
  79. package/typechain-types/PendleYieldContractFactory.ts +94 -28
  80. package/typechain-types/PendleYieldToken.ts +142 -57
  81. package/typechain-types/RewardManager.ts +21 -0
  82. package/typechain-types/RouterStatic.ts +50 -530
  83. package/typechain-types/SCYBase.ts +25 -0
  84. package/typechain-types/SCYBaseWithRewards.ts +64 -0
  85. package/typechain-types/factories/ActionCallback__factory.ts +2 -2
  86. package/typechain-types/factories/ActionCore__factory.ts +263 -79
  87. package/typechain-types/factories/ActionRedeem__factory.ts +105 -0
  88. package/typechain-types/factories/ActionSCYAndPYBase__factory.ts +200 -0
  89. package/typechain-types/factories/ActionSCYAndYOBase__factory.ts +148 -0
  90. package/typechain-types/factories/ActionSCYAndYTBase__factory.ts +173 -0
  91. package/typechain-types/factories/ActionYT__factory.ts +265 -56
  92. package/typechain-types/factories/IPActionCore__factory.ts +114 -78
  93. package/typechain-types/factories/IPActionRedeem__factory.ts +70 -0
  94. package/typechain-types/factories/IPActionYT__factory.ts +90 -54
  95. package/typechain-types/factories/IPAllAction__factory.ts +254 -138
  96. package/typechain-types/factories/IPMarketAddRemoveCallback__factory.ts +2 -2
  97. package/typechain-types/factories/IPMarketFactory__factory.ts +26 -1
  98. package/typechain-types/factories/IPMarketSwapCallback__factory.ts +1 -1
  99. package/typechain-types/factories/IPMarket__factory.ts +125 -13
  100. package/typechain-types/factories/{IPOwnershipToken__factory.ts → IPPrincipalToken__factory.ts} +8 -8
  101. package/typechain-types/factories/IPRouterStatic__factory.ts +12 -628
  102. package/typechain-types/factories/IPYieldContractFactory__factory.ts +72 -2
  103. package/typechain-types/factories/IPYieldToken__factory.ts +93 -7
  104. package/typechain-types/factories/ISuperComposableYield__factory.ts +13 -0
  105. package/typechain-types/factories/IWstETH__factory.ts +74 -0
  106. package/typechain-types/factories/PendleAaveV3SCY__factory.ts +97 -3
  107. package/typechain-types/factories/PendleBaseToken__factory.ts +1 -1
  108. package/typechain-types/factories/PendleBenQiErc20SCY__factory.ts +62 -7
  109. package/typechain-types/factories/PendleBtrflyScy__factory.ts +42 -19
  110. package/typechain-types/factories/PendleGovernanceManager__factory.ts +2 -2
  111. package/typechain-types/factories/PendleMarketFactory__factory.ts +66 -15
  112. package/typechain-types/factories/PendleMarket__factory.ts +170 -53
  113. package/typechain-types/factories/PendlePrincipalToken__factory.ts +540 -0
  114. package/typechain-types/factories/PendleRouterRedeemUpg__factory.ts +112 -0
  115. package/typechain-types/factories/PendleRouter__factory.ts +23 -1
  116. package/typechain-types/factories/PendleStEthSCY__factory.ts +716 -0
  117. package/typechain-types/factories/PendleYearnVaultScy__factory.ts +41 -18
  118. package/typechain-types/factories/PendleYieldContractFactory__factory.ts +75 -5
  119. package/typechain-types/factories/PendleYieldToken__factory.ts +102 -33
  120. package/typechain-types/factories/RewardManager__factory.ts +13 -0
  121. package/typechain-types/factories/RouterStatic__factory.ts +13 -629
  122. package/typechain-types/factories/SCYBaseWithRewards__factory.ts +60 -2
  123. package/typechain-types/factories/SCYBase__factory.ts +28 -2
  124. package/typechain-types/hardhat.d.ts +52 -16
  125. package/typechain-types/index.ts +14 -6
  126. package/typechain-types/factories/PendleOwnershipToken__factory.ts +0 -527
package/typechain-types/factories/PendleBenQiErc20SCY__factory.ts CHANGED
@@ -7,6 +7,7 @@ import {
7
7
  Contract,
8
8
  ContractFactory,
9
9
  Overrides,
10
+ BytesLike,
10
11
  BigNumberish,
11
12
  } from "ethers";
12
13
  import { Provider, TransactionRequest } from "@ethersproject/providers";
@@ -38,6 +39,11 @@ const _abi = [
38
39
  name: "__assetDecimals",
39
40
  type: "uint8",
40
41
  },
42
+ {
43
+ internalType: "bytes32",
44
+ name: "__assetId",
45
+ type: "bytes32",
46
+ },
41
47
  {
42
48
  internalType: "address",
43
49
  name: "_underlying",
@@ -92,6 +98,25 @@ const _abi = [
92
98
  name: "Approval",
93
99
  type: "event",
94
100
  },
101
+ {
102
+ anonymous: false,
103
+ inputs: [
104
+ {
105
+ indexed: true,
106
+ internalType: "address",
107
+ name: "user",
108
+ type: "address",
109
+ },
110
+ {
111
+ indexed: false,
112
+ internalType: "uint256[]",
113
+ name: "rewardsOut",
114
+ type: "uint256[]",
115
+ },
116
+ ],
117
+ name: "RedeemReward",
118
+ type: "event",
119
+ },
95
120
  {
96
121
  anonymous: false,
97
122
  inputs: [
@@ -117,6 +142,19 @@ const _abi = [
117
142
  name: "Transfer",
118
143
  type: "event",
119
144
  },
145
+ {
146
+ anonymous: false,
147
+ inputs: [
148
+ {
149
+ indexed: false,
150
+ internalType: "uint256",
151
+ name: "scyIndex",
152
+ type: "uint256",
153
+ },
154
+ ],
155
+ name: "UpdateScyIndex",
156
+ type: "event",
157
+ },
120
158
  {
121
159
  inputs: [],
122
160
  name: "QI",
@@ -204,6 +242,19 @@ const _abi = [
204
242
  stateMutability: "view",
205
243
  type: "function",
206
244
  },
245
+ {
246
+ inputs: [],
247
+ name: "assetId",
248
+ outputs: [
249
+ {
250
+ internalType: "bytes32",
251
+ name: "",
252
+ type: "bytes32",
253
+ },
254
+ ],
255
+ stateMutability: "view",
256
+ type: "function",
257
+ },
207
258
  {
208
259
  inputs: [
209
260
  {
@@ -388,7 +439,7 @@ const _abi = [
388
439
  outputs: [
389
440
  {
390
441
  internalType: "bool",
391
- name: "res",
442
+ name: "",
392
443
  type: "bool",
393
444
  },
394
445
  ],
@@ -397,7 +448,7 @@ const _abi = [
397
448
  },
398
449
  {
399
450
  inputs: [],
400
- name: "lastScyIndex",
451
+ name: "lastRewardUpdateBlock",
401
452
  outputs: [
402
453
  {
403
454
  internalType: "uint256",
@@ -464,7 +515,7 @@ const _abi = [
464
515
  outputs: [
465
516
  {
466
517
  internalType: "uint256",
467
- name: "amountScyOut",
518
+ name: "",
468
519
  type: "uint256",
469
520
  },
470
521
  ],
@@ -553,7 +604,7 @@ const _abi = [
553
604
  outputs: [
554
605
  {
555
606
  internalType: "uint256",
556
- name: "amountBaseOut",
607
+ name: "",
557
608
  type: "uint256",
558
609
  },
559
610
  ],
@@ -585,7 +636,7 @@ const _abi = [
585
636
  outputs: [
586
637
  {
587
638
  internalType: "uint256",
588
- name: "res",
639
+ name: "",
589
640
  type: "uint256",
590
641
  },
591
642
  ],
@@ -598,7 +649,7 @@ const _abi = [
598
649
  outputs: [
599
650
  {
600
651
  internalType: "uint256",
601
- name: "res",
652
+ name: "",
602
653
  type: "uint256",
603
654
  },
604
655
  ],
@@ -724,7 +775,7 @@ const _abi = [
724
775
  ];
725
776
 
726
777
  const _bytecode =
727
- "0x6101606040523480156200001257600080fd5b5060405162002f0d38038062002f0d8339810160408190526200003591620005f6565b888888888383838383838160039080519060200190620000579291906200044b565b5080516200006d9060049060208401906200044b565b50505060ff9182166080521660a052505050506001600160a01b0387811660c081905287821661014081905286831660e0528583166101005291871661012052620000ca93509150600019620000d9602090811b62000cd517901c565b505050505050505050620007d8565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b1580156200012657600080fd5b505afa1580156200013b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001619190620006e3565b6200016d9190620006fd565b604080516001600160a01b038616602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b0390811663095ea7b360e01b17909152919250620001c991869190620001cf16565b50505050565b60006200022b826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316620002b660201b62000dc1179092919060201c565b805190915015620002b157808060200190518101906200024c919062000724565b620002b15760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084015b60405180910390fd5b505050565b6060620002c78484600085620002d1565b90505b9392505050565b606082471015620003345760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401620002a8565b6001600160a01b0385163b6200038d5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620002a8565b600080866001600160a01b03168587604051620003ab919062000748565b60006040518083038185875af1925050503d8060008114620003ea576040519150601f19603f3d011682016040523d82523d6000602084013e620003ef565b606091505b509092509050620004028282866200040d565b979650505050505050565b606083156200041e575081620002ca565b8251156200042f5782518084602001fd5b8160405162461bcd60e51b8152600401620002a8919062000766565b82805462000459906200079b565b90600052602060002090601f0160209004810192826200047d5760008555620004c8565b82601f106200049857805160ff1916838001178555620004c8565b82800160010185558215620004c8579182015b82811115620004c8578251825591602001919060010190620004ab565b50620004d6929150620004da565b5090565b5b80821115620004d65760008155600101620004db565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620005245781810151838201526020016200050a565b83811115620001c95750506000910152565b600082601f8301126200054857600080fd5b81516001600160401b0380821115620005655762000565620004f1565b604051601f8301601f19908116603f01168101908282118183101715620005905762000590620004f1565b81604052838152866020858801011115620005aa57600080fd5b620005bd84602083016020890162000507565b9695505050505050565b805160ff81168114620005d957600080fd5b919050565b80516001600160a01b0381168114620005d957600080fd5b60008060008060008060008060006101208a8c0312156200061657600080fd5b89516001600160401b03808211156200062e57600080fd5b6200063c8d838e0162000536565b9a5060208c01519150808211156200065357600080fd5b50620006628c828d0162000536565b9850506200067360408b01620005c7565b96506200068360608b01620005c7565b95506200069360808b01620005de565b9450620006a360a08b01620005de565b9350620006b360c08b01620005de565b9250620006c360e08b01620005de565b9150620006d46101008b01620005de565b90509295985092959850929598565b600060208284031215620006f657600080fd5b5051919050565b600082198211156200071f57634e487b7160e01b600052601160045260246000fd5b500190565b6000602082840312156200073757600080fd5b81518015158114620002ca57600080fd5b600082516200075c81846020870162000507565b9190910192915050565b60208152600082518060208401526200078781604085016020870162000507565b601f01601f19169190910160400192915050565b600181811c90821680620007b057607f821691505b60208210811415620007d257634e487b7160e01b600052602260045260246000fd5b50919050565b60805160a05160c05160e05161010051610120516101405161265c620008b160003960008181610290015281816109a301528181610bc701528181610c35015281816112190152818161126e01528181611321015281816118f401528181611949015281816119d30152611ddc01526000818161039a01528181611e330152611ebb0152600081816104580152610b490152600081816103660152610af5015260008181610404015281816109f701528181610b8c015281816112f801526119fc015260006105990152600061022c015261265c6000f3fe6080604052600436106101775760003560e01c806306fdde0314610183578063095ea7b3146101ae57806318160ddd146101de57806323b872dd146101fd578063313ce5671461021d578063395093511461025e578063462e4cda1461027e5780634be47418146102bf5780635ab764ed146102df5780635f22f53f146103545780635fe3b567146103885780636265bc85146103bc57806369889d3a146103d25780636f307dc3146103f257806370a082311461042657806373b295c2146104465780637695caa21461047a5780638e37b2691461049157806395d89b41146104a6578063a457c2d7146104bb578063a9059cbb146104db578063b286de76146104fb578063b3f1c93d14610528578063bed64c2f14610548578063c1129b1b1461056a578063c2d416011461058a578063c4f59f9b146105bd578063c6d6916c146105d2578063c9c0c082146105f2578063dd62ed3e14610612578063f048181414610632578063f65d6fc81461068557600080fd5b3661017e57005b600080fd5b34801561018f57600080fd5b5061019861069a565b6040516101a591906121f2565b60405180910390f35b3480156101ba57600080fd5b506101ce6101c9366004612241565b61072c565b60405190151581526020016101a5565b3480156101ea57600080fd5b506002545b6040519081526020016101a5565b34801561020957600080fd5b506101ce61021836600461226b565b610746565b34801561022957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405160ff90911681526020016101a5565b34801561026a57600080fd5b506101ce610279366004612241565b61076c565b34801561028a57600080fd5b506102b27f000000000000000000000000000000000000000000000000000000000000000081565b6040516101a591906122a7565b3480156102cb57600080fd5b506101ef6102da3660046122bb565b6107ab565b3480156102eb57600080fd5b5061033f6102fa3660046122fd565b6001600160a01b039182166000908152600760209081526040808320939094168252918252829020825180840190935280548084526001909101549290910182905291565b604080519283526020830191909152016101a5565b34801561036057600080fd5b506102b27f000000000000000000000000000000000000000000000000000000000000000081565b34801561039457600080fd5b506102b27f000000000000000000000000000000000000000000000000000000000000000081565b3480156103c857600080fd5b506101ef60085481565b3480156103de57600080fd5b506101ef6103ed36600461226b565b6107cd565b3480156103fe57600080fd5b506102b27f000000000000000000000000000000000000000000000000000000000000000081565b34801561043257600080fd5b506101ef610441366004612330565b610848565b34801561045257600080fd5b506102b27f000000000000000000000000000000000000000000000000000000000000000081565b34801561048657600080fd5b5061048f610863565b005b34801561049d57600080fd5b506008546101ef565b3480156104b257600080fd5b50610198610884565b3480156104c757600080fd5b506101ce6104d6366004612241565b610893565b3480156104e757600080fd5b506101ce6104f6366004612241565b610930565b34801561050757600080fd5b5061051b610516366004612330565b61093e565b6040516101a5919061234b565b34801561053457600080fd5b506101ef6105433660046122bb565b61095f565b34801561055457600080fd5b5061055d610981565b6040516101a591906123d3565b34801561057657600080fd5b506101ef61058536600461226b565b610a4c565b34801561059657600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061024c565b3480156105c957600080fd5b5061055d610ad3565b3480156105de57600080fd5b5061048f6105ed366004612330565b610b7b565b3480156105fe57600080fd5b506101ce61060d366004612330565b610b88565b34801561061e57600080fd5b506101ef61062d3660046122fd565b610c00565b34801561063e57600080fd5b5061033f61064d366004612330565b6001600160a01b0316600090815260066020908152604091829020825180840190935280548084526001909101549290910182905291565b34801561069157600080fd5b506101ef610c2b565b6060600380546106a9906123e6565b80601f01602080910402602001604051908101604052809291908181526020018280546106d5906123e6565b80156107225780601f106106f757610100808354040283529160200191610722565b820191906000526020600020905b81548152906001019060200180831161070557829003601f168201915b5050505050905090565b60003361073a818585610dd8565b60019150505b92915050565b600033610754858285610efc565b61075f858585610f70565b60019150505b9392505050565b3360008181526001602090815260408083206001600160a01b038716845290915281205490919061073a90829086906107a6908790612437565b610dd8565b60006107b8333085610746565b506107c4858584610a4c565b95945050505050565b60006107d883610b88565b6107fd5760405162461bcd60e51b81526004016107f49061244f565b60405180910390fd5b600061080884611137565b90506108148482611215565b9150828210156108365760405162461bcd60e51b81526004016107f49061247b565b6108408583611345565b509392505050565b6001600160a01b031660009081526020819052604090205490565b600061086d610ad3565b90506108818161087c60025490565b61141f565b50565b6060600480546106a9906123e6565b3360008181526001602090815260408083206001600160a01b0387168452909152812054909190838110156109185760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016107f4565b6109258286868403610dd8565b506001949350505050565b60003361073a818585610f70565b60606109558261094d84610848565b600254611572565b6107408283611593565b60006109766001600160a01b038516333086611770565b6107c48585846107cd565b60408051600280825260608083018452926020830190803683370190505090507f0000000000000000000000000000000000000000000000000000000000000000816000815181106109d5576109d56124bb565b60200260200101906001600160a01b031690816001600160a01b0316815250507f000000000000000000000000000000000000000000000000000000000000000081600181518110610a2957610a296124bb565b60200260200101906001600160a01b031690816001600160a01b03168152505090565b6000610a5783610b88565b610a735760405162461bcd60e51b81526004016107f49061244f565b6000610a7e30610848565b9050610a8a30826117a8565b610a9484826118f0565b915082821015610ab65760405162461bcd60e51b81526004016107f49061247b565b610aca6001600160a01b0385168684611a20565b61084084611a3f565b60408051600280825260608083018452926020830190803683370190505090507f000000000000000000000000000000000000000000000000000000000000000081600081518110610b2757610b276124bb565b60200260200101906001600160a01b031690816001600160a01b0316815250507f000000000000000000000000000000000000000000000000000000000000000081600181518110610a2957610a296124bb565b6108818161094d83610848565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316148061074057507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b03161492915050565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6000610ccb6008547f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bd6d894d6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610c8e57600080fd5b505af1158015610ca2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cc691906124d1565b611af0565b6008819055919050565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b158015610d2157600080fd5b505afa158015610d35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d5991906124d1565b610d639190612437565b9050610dbb8463095ea7b360e01b8584604051602401610d849291906124ea565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611b06565b50505050565b6060610dd08484600085611bd8565b949350505050565b6001600160a01b038316610e3a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016107f4565b6001600160a01b038216610e9b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016107f4565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6000610f088484610c00565b90506000198114610dbb5781811015610f635760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016107f4565b610dbb8484848403610dd8565b6001600160a01b038316610fd45760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016107f4565b6001600160a01b0382166110365760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016107f4565b611041838383611d09565b6001600160a01b038316600090815260208190526040902054818110156110b95760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016107f4565b6001600160a01b038085166000908152602081905260408082208585039055918516815290812080548492906110f0908490612437565b92505081905550826001600160a01b0316846001600160a01b03166000805160206126078339815191528460405161112a91815260200190565b60405180910390a3610dbb565b60006001600160a01b03821630141561115257611152612503565b6040516370a0823160e01b81526000906001600160a01b038416906370a08231906111819030906004016122a7565b60206040518083038186803b15801561119957600080fd5b505afa1580156111ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111d191906124d1565b6001600160a01b0384166000908152600560205260409020549091506111f79082612519565b6001600160a01b039093166000908152600560205260409020555090565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b03161415611258575080610740565b60405163140e25ad60e31b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a0712d6890602401602060405180830381600087803b1580156112ba57600080fd5b505af11580156112ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112f291906124d1565b5061131c7f0000000000000000000000000000000000000000000000000000000000000000611a3f565b6107657f0000000000000000000000000000000000000000000000000000000000000000611137565b6001600160a01b03821661139b5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f20616464726573730060448201526064016107f4565b6113a760008383611d09565b80600260008282546113b99190612437565b90915550506001600160a01b038216600090815260208190526040812080548392906113e6908490612437565b90915550506040518181526001600160a01b038316906000906000805160206126078339815191529060200160405180910390a35b5050565b611427611d61565b61143082611f3a565b60005b825181101561156d576000838281518110611450576114506124bb565b602002602001015190506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161148891906122a7565b60206040518083038186803b1580156114a057600080fd5b505afa1580156114b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114d891906124d1565b90508315611540576001600160a01b03821660009081526006602052604090206001015461151290859061150c9084612519565b90611fdd565b6001600160a01b0383166000908152600660205260408120805490919061153a908490612437565b90915550505b6001600160a01b0390911660009081526006602052604090206001015561156681612530565b9050611433565b505050565b600061157c610ad3565b9050611588818361141f565b610dbb81858561200c565b6060600061159f610ad3565b905080516001600160401b038111156115ba576115ba6124a5565b6040519080825280602002602001820160405280156115e3578160200160208202803683370190505b50915060005b8151811015611768576000828281518110611606576116066124bb565b6020026020010151905060076000876001600160a01b03166001600160a01b031681526020019081526020016000206000826001600160a01b03166001600160a01b031681526020019081526020016000206001015484838151811061166e5761166e6124bb565b6020908102919091018101919091526001600160a01b03808816600090815260078352604080822092851682529190925281206001015583518490839081106116b9576116b96124bb565b602002602001015160066000836001600160a01b03166001600160a01b0316815260200190815260200160002060010160008282546116f89190612519565b92505081905550838281518110611711576117116124bb565b60200260200101516000146117575761175785858481518110611736576117366124bb565b6020026020010151836001600160a01b0316611a209092919063ffffffff16565b5061176181612530565b90506115e9565b505092915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610dbb9085906323b872dd60e01b90608401610d84565b6001600160a01b0382166118085760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b60648201526084016107f4565b61181482600083611d09565b6001600160a01b038216600090815260208190526040902054818110156118885760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b60648201526084016107f4565b6001600160a01b03831660009081526020819052604081208383039055600280548492906118b7908490612519565b90915550506040518281526000906001600160a01b038516906000805160206126078339815191529060200160405180910390a3505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b03161415611933575080610740565b60405163db006a7560e01b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063db006a7590602401602060405180830381600087803b15801561199557600080fd5b505af11580156119a9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119cd91906124d1565b506119f77f0000000000000000000000000000000000000000000000000000000000000000611a3f565b6107657f0000000000000000000000000000000000000000000000000000000000000000611137565b61156d8363a9059cbb60e01b8484604051602401610d849291906124ea565b6001600160a01b038116301415611a5857611a58612503565b6040516370a0823160e01b81526001600160a01b038216906370a0823190611a849030906004016122a7565b60206040518083038186803b158015611a9c57600080fd5b505afa158015611ab0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ad491906124d1565b6001600160a01b03909116600090815260056020526040902055565b6000818311611aff5781610765565b5090919050565b6000611b5b826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316610dc19092919063ffffffff16565b80519091501561156d5780806020019051810190611b79919061254b565b61156d5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084016107f4565b606082471015611c395760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b60648201526084016107f4565b6001600160a01b0385163b611c905760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016107f4565b600080866001600160a01b03168587604051611cac919061256d565b60006040518083038185875af1925050503d8060008114611ce9576040519150601f19603f3d011682016040523d82523d6000602084013e611cee565b606091505b5091509150611cfe82828661216f565b979650505050505050565b6000611d13610ad3565b9050611d228161087c60025490565b6001600160a01b03841615611d4457611d448185611d3f87610848565b61200c565b6001600160a01b03831615610dbb57610dbb8184611d3f86610848565b6040805160018082528183019092526000916020808301908036833750506040805160018082528183019092529293506000929150602080830190803683370190505090503082600081518110611dba57611dba6124bb565b60200260200101906001600160a01b031690816001600160a01b0316815250507f000000000000000000000000000000000000000000000000000000000000000081600081518110611e0e57611e0e6124bb565b6001600160a01b039283166020918202929092010152604051638805714b60e01b81527f000000000000000000000000000000000000000000000000000000000000000090911690638805714b90611e7490600090869086908390600190600401612589565b600060405180830381600087803b158015611e8e57600080fd5b505af1158015611ea2573d6000803e3d6000fd5b5050604051638805714b60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169250638805714b9150611efc90600190869086906000908490600401612589565b600060405180830381600087803b158015611f1657600080fd5b505af1158015611f2a573d6000803e3d6000fd5b505050504760001461141b575050565b60005b815181101561141b5760066000838381518110611f5c57611f5c6124bb565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020016000206000015460001415611fcd57600160066000848481518110611fa857611fa86124bb565b6020908102919091018101516001600160a01b03168252810191909152604001600020555b611fd681612530565b9050611f3d565b600080611ff2670de0b6b3a7640000856125d1565b9050828181612003576120036125f0565b04949350505050565b60005b8351811015610dbb57600084828151811061202c5761202c6124bb565b6020908102919091018101516001600160a01b0380871660009081526007845260408082209284168252918452818120546006909452205490925081141561207557505061215f565b806120b157506001600160a01b03908116600081815260066020908152604080832054948816835260078252808320938352929052205561215f565b6001600160a01b0382166000908152600660205260408120546120d5908390612519565b905060006120e386836121a8565b6001600160a01b038089166000908152600760209081526040808320938916835292905290812060010180549293508392909190612122908490612437565b9091555050506001600160a01b03928316600081815260066020908152604080832054968a16835260078252808320938352929052209290925550505b61216881612530565b905061200f565b6060831561217e575081610765565b82511561218e5782518084602001fd5b8160405162461bcd60e51b81526004016107f491906121f2565b6000806121b583856125d1565b9050670de0b6b3a764000081612003565b60005b838110156121e15781810151838201526020016121c9565b83811115610dbb5750506000910152565b60208152600082518060208401526122118160408501602087016121c6565b601f01601f19169190910160400192915050565b80356001600160a01b038116811461223c57600080fd5b919050565b6000806040838503121561225457600080fd5b61225d83612225565b946020939093013593505050565b60008060006060848603121561228057600080fd5b61228984612225565b925061229760208501612225565b9150604084013590509250925092565b6001600160a01b0391909116815260200190565b600080600080608085870312156122d157600080fd5b6122da85612225565b93506122e860208601612225565b93969395505050506040820135916060013590565b6000806040838503121561231057600080fd5b61231983612225565b915061232760208401612225565b90509250929050565b60006020828403121561234257600080fd5b61076582612225565b6020808252825182820181905260009190848201906040850190845b8181101561238357835183529284019291840191600101612367565b50909695505050505050565b600081518084526020808501945080840160005b838110156123c85781516001600160a01b0316875295820195908201906001016123a3565b509495945050505050565b602081526000610765602083018461238f565b600181811c908216806123fa57607f821691505b6020821081141561241b57634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b6000821982111561244a5761244a612421565b500190565b60208082526012908201527134b73b30b634b2103130b9b2903a37b5b2b760711b604082015260600190565b60208082526010908201526f1a5b9cdd59999a58da595b9d081bdd5d60821b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156124e357600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b634e487b7160e01b600052600160045260246000fd5b60008282101561252b5761252b612421565b500390565b600060001982141561254457612544612421565b5060010190565b60006020828403121561255d57600080fd5b8151801515811461076557600080fd5b6000825161257f8184602087016121c6565b9190910192915050565b60ff8616815260a0602082015260006125a560a083018761238f565b82810360408401526125b7818761238f565b941515606084015250509015156080909101529392505050565b60008160001904831182151516156125eb576125eb612421565b500290565b634e487b7160e01b600052601260045260246000fdfeddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa26469706673582212209bc249251f9c0415f3956f7100c5cbd82b47ef07ca7a9bc46780ee06570982ba64736f6c63430008090033";
778
+ "0x6101806040523480156200001257600080fd5b50604051620032853803806200328583398101604081905262000035916200068c565b898989898984848484848484816003908051906020019062000059929190620004e1565b5080516200006f906004906020840190620004e1565b505060016005555060ff928316608052911660a05260c05250505050506001600160a01b03861615801592509050620000b057506001600160a01b03821615155b8015620000c557506001600160a01b03811615155b8015620000da57506001600160a01b03831615155b6200011b5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064015b60405180910390fd5b6001600160a01b0384811661016081905283821661010052828216610120528482166101405290861660e0819052620001639160001962000173602090811b62000dbc17901c565b5050505050505050505062000879565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b158015620001c057600080fd5b505afa158015620001d5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001fb919062000784565b6200020791906200079e565b604080516001600160a01b038616602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b0390811663095ea7b360e01b1790915291925062000263918691906200026916565b50505050565b6000620002c5826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166200034c60201b62000ea8179092919060201c565b805190915015620003475780806020019051810190620002e69190620007c5565b620003475760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840162000112565b505050565b60606200035d848460008562000367565b90505b9392505050565b606082471015620003ca5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840162000112565b6001600160a01b0385163b620004235760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640162000112565b600080866001600160a01b03168587604051620004419190620007e9565b60006040518083038185875af1925050503d806000811462000480576040519150601f19603f3d011682016040523d82523d6000602084013e62000485565b606091505b50909250905062000498828286620004a3565b979650505050505050565b60608315620004b457508162000360565b825115620004c55782518084602001fd5b8160405162461bcd60e51b815260040162000112919062000807565b828054620004ef906200083c565b90600052602060002090601f0160209004810192826200051357600085556200055e565b82601f106200052e57805160ff19168380011785556200055e565b828001600101855582156200055e579182015b828111156200055e57825182559160200191906001019062000541565b506200056c92915062000570565b5090565b5b808211156200056c576000815560010162000571565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620005ba578181015183820152602001620005a0565b83811115620002635750506000910152565b600082601f830112620005de57600080fd5b81516001600160401b0380821115620005fb57620005fb62000587565b604051601f8301601f19908116603f0116810190828211818310171562000626576200062662000587565b816040528381528660208588010111156200064057600080fd5b620006538460208301602089016200059d565b9695505050505050565b805160ff811681146200066f57600080fd5b919050565b80516001600160a01b03811681146200066f57600080fd5b6000806000806000806000806000806101408b8d031215620006ad57600080fd5b8a516001600160401b0380821115620006c557600080fd5b620006d38e838f01620005cc565b9b5060208d0151915080821115620006ea57600080fd5b50620006f98d828e01620005cc565b9950506200070a60408c016200065d565b97506200071a60608c016200065d565b965060808b015195506200073160a08c0162000674565b94506200074160c08c0162000674565b93506200075160e08c0162000674565b9250620007626101008c0162000674565b9150620007736101208c0162000674565b90509295989b9194979a5092959850565b6000602082840312156200079757600080fd5b5051919050565b60008219821115620007c057634e487b7160e01b600052601160045260246000fd5b500190565b600060208284031215620007d857600080fd5b815180151581146200036057600080fd5b60008251620007fd8184602087016200059d565b9190910192915050565b6020815260008251806020840152620008288160408501602087016200059d565b601f01601f19169190910160400192915050565b600181811c908216806200085157607f821691505b602082108114156200087357634e487b7160e01b600052602260045260246000fd5b50919050565b60805160a05160c05160e051610100516101205161014051610160516129286200095d600039600081816102ce01528181610a8601528181610c8401528181610cec01528181611a4001528181611a9801528181611b6101528181611d6001528181611db801528181611ea8015261203d0152600081816103d801528181612094015261211c0152600081816104800152610bda0152600081816103a40152610b8601526000818161042c01528181610ada01528181610c4901528181611b8a0152611e7f01526000610298015260006105d80152600061023701526129286000f3fe6080604052600436106101825760003560e01c806306fdde031461018e578063095ea7b3146101b957806318160ddd146101e957806323b872dd14610208578063313ce56714610228578063395093511461026957806344de240a14610289578063462e4cda146102bc5780634be47418146102fd5780635ab764ed1461031d5780635f22f53f146103925780635fe3b567146103c657806369889d3a146103fa5780636f307dc31461041a57806370a082311461044e57806373b295c21461046e5780637695caa2146104a25780638e37b269146104b957806395d89b41146104cf578063a457c2d7146104e4578063a9059cbb14610504578063b286de7614610524578063b3f1c93d14610551578063ba50154d14610571578063bed64c2f14610587578063c1129b1b146105a9578063c2d41601146105c9578063c4f59f9b146105fc578063c6d6916c14610611578063c9c0c08214610631578063dd62ed3e14610651578063f048181414610671578063f65d6fc8146106c457600080fd5b3661018957005b600080fd5b34801561019a57600080fd5b506101a36106d9565b6040516101b09190612487565b60405180910390f35b3480156101c557600080fd5b506101d96101d43660046124d6565b61076b565b60405190151581526020016101b0565b3480156101f557600080fd5b506002545b6040519081526020016101b0565b34801561021457600080fd5b506101d9610223366004612500565b610785565b34801561023457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405160ff90911681526020016101b0565b34801561027557600080fd5b506101d96102843660046124d6565b6107ab565b34801561029557600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006101fa565b3480156102c857600080fd5b506102f07f000000000000000000000000000000000000000000000000000000000000000081565b6040516101b0919061253c565b34801561030957600080fd5b506101fa610318366004612550565b6107ea565b34801561032957600080fd5b5061037d610338366004612592565b6001600160a01b039182166000908152600960209081526040808320939094168252918252829020825180840190935280548084526001909101549290910182905291565b604080519283526020830191909152016101b0565b34801561039e57600080fd5b506102f07f000000000000000000000000000000000000000000000000000000000000000081565b3480156103d257600080fd5b506102f07f000000000000000000000000000000000000000000000000000000000000000081565b34801561040657600080fd5b506101fa610415366004612500565b610842565b34801561042657600080fd5b506102f07f000000000000000000000000000000000000000000000000000000000000000081565b34801561045a57600080fd5b506101fa6104693660046125c5565b610884565b34801561047a57600080fd5b506102f07f000000000000000000000000000000000000000000000000000000000000000081565b3480156104ae57600080fd5b506104b761089f565b005b3480156104c557600080fd5b506101fa600a5481565b3480156104db57600080fd5b506101a36108d6565b3480156104f057600080fd5b506101d96104ff3660046124d6565b6108e5565b34801561051057600080fd5b506101d961051f3660046124d6565b610982565b34801561053057600080fd5b5061054461053f3660046125c5565b610990565b6040516101b091906125e0565b34801561055d57600080fd5b506101fa61056c366004612550565b610a1a565b34801561057d57600080fd5b506101fa60075481565b34801561059357600080fd5b5061059c610a64565b6040516101b09190612668565b3480156105b557600080fd5b506101fa6105c4366004612500565b610b2f565b3480156105d557600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610257565b34801561060857600080fd5b5061059c610b64565b34801561061d57600080fd5b506104b761062c3660046125c5565b610c0c565b34801561063d57600080fd5b506101d961064c3660046125c5565b610c45565b34801561065d57600080fd5b506101fa61066c366004612592565b610cbd565b34801561067d57600080fd5b5061037d61068c3660046125c5565b6001600160a01b0316600090815260086020908152604091829020825180840190935280548084526001909101549290910182905291565b3480156106d057600080fd5b506101fa610ce8565b6060600380546106e89061267b565b80601f01602080910402602001604051908101604052809291908181526020018280546107149061267b565b80156107615780601f1061073657610100808354040283529160200191610761565b820191906000526020600020905b81548152906001019060200180831161074457829003601f168201915b5050505050905090565b600033610779818585610ebf565b60019150505b92915050565b600033610793858285610fe3565b61079e858585611057565b60019150505b9392505050565b3360008181526001602090815260408083206001600160a01b038716845290915281205490919061077990829086906107e59087906126cc565b610ebf565b6000600260055414156108185760405162461bcd60e51b815260040161080f906126e4565b60405180910390fd5b6002600555610828333085610785565b5061083485858461121e565b600160055595945050505050565b6000600260055414156108675760405162461bcd60e51b815260040161080f906126e4565b60026005556108778484846112ad565b6001600555949350505050565b6001600160a01b031660009081526020819052604090205490565b600260055414156108c25760405162461bcd60e51b815260040161080f906126e4565b60026005556108cf611317565b6001600555565b6060600480546106e89061267b565b3360008181526001602090815260408083206001600160a01b03871684529091528120549091908381101561096a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b606482015260840161080f565b6109778286868403610ebf565b506001949350505050565b600033610779818585611057565b6060600260055414156109b55760405162461bcd60e51b815260040161080f906126e4565b60026005556109c382611490565b6109cd82836114a4565b9050816001600160a01b03167f3a77fed7c9a4917745bde0b97b576d95b02425a5222ff309ebb6e1d34c18a10f82604051610a0891906125e0565b60405180910390a26001600555919050565b600060026005541415610a3f5760405162461bcd60e51b815260040161080f906126e4565b6002600555610a596001600160a01b038516333086611681565b6108348585846112ad565b60408051600280825260608083018452926020830190803683370190505090507f000000000000000000000000000000000000000000000000000000000000000081600081518110610ab857610ab8612731565b60200260200101906001600160a01b031690816001600160a01b0316815250507f000000000000000000000000000000000000000000000000000000000000000081600181518110610b0c57610b0c612731565b60200260200101906001600160a01b031690816001600160a01b03168152505090565b600060026005541415610b545760405162461bcd60e51b815260040161080f906126e4565b600260055561087784848461121e565b60408051600280825260608083018452926020830190803683370190505090507f000000000000000000000000000000000000000000000000000000000000000081600081518110610bb857610bb8612731565b60200260200101906001600160a01b031690816001600160a01b0316815250507f000000000000000000000000000000000000000000000000000000000000000081600181518110610b0c57610b0c612731565b60026005541415610c2f5760405162461bcd60e51b815260040161080f906126e4565b6002600555610c3d81611490565b506001600555565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316148061077f57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b03161492915050565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bd6d894d6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610d4557600080fd5b505af1158015610d59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d7d9190612747565b600a8190556040519081527fbccccf411823b290c704d60c85a456e04528fff86811afd664d6ebf56347f5859060200160405180910390a150600a5490565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b158015610e0857600080fd5b505afa158015610e1c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e409190612747565b610e4a91906126cc565b9050610ea28463095ea7b360e01b8584604051602401610e6b929190612760565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526116b9565b50505050565b6060610eb7848460008561178b565b949350505050565b6001600160a01b038316610f215760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b606482015260840161080f565b6001600160a01b038216610f825760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b606482015260840161080f565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6000610fef8484610cbd565b90506000198114610ea2578181101561104a5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000604482015260640161080f565b610ea28484848403610ebf565b6001600160a01b0383166110bb5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b606482015260840161080f565b6001600160a01b03821661111d5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b606482015260840161080f565b6111288383836118bc565b6001600160a01b038316600090815260208190526040902054818110156111a05760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b606482015260840161080f565b6001600160a01b038085166000908152602081905260408082208585039055918516815290812080548492906111d79084906126cc565b92505081905550826001600160a01b0316846001600160a01b03166000805160206128d38339815191528460405161121191815260200190565b60405180910390a3610ea2565b600061122983610c45565b6112455760405162461bcd60e51b815260040161080f90612779565b600061125030610884565b905061125c30826118f4565b6112668482611a3c565b9150828210156112885760405162461bcd60e51b815260040161080f906127a5565b61129c6001600160a01b0385168684611bae565b6112a584611bcd565b509392505050565b60006112b883610c45565b6112d45760405162461bcd60e51b815260040161080f90612779565b60006112df84611c7e565b90506112eb8482611d5c565b91508282101561130d5760405162461bcd60e51b815260040161080f906127a5565b6112a58583611ecc565b61131f611fa6565b61132557565b61132d611fc2565b600061133761219b565b90506000611343610b64565b905061134e816121ab565b60005b815181101561148b57600082828151811061136e5761136e612731565b602002602001015190506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016113a6919061253c565b60206040518083038186803b1580156113be57600080fd5b505afa1580156113d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113f69190612747565b9050841561145e576001600160a01b03821660009081526008602052604090206001015461143090869061142a90846127cf565b9061224e565b6001600160a01b038316600090815260086020526040812080549091906114589084906126cc565b90915550505b6001600160a01b03909116600090815260086020526040902060010155611484816127e6565b9050611351565b505050565b611498611317565b6114a18161227d565b50565b606060006114b0610b64565b905080516001600160401b038111156114cb576114cb61271b565b6040519080825280602002602001820160405280156114f4578160200160208202803683370190505b50915060005b815181101561167957600082828151811061151757611517612731565b6020026020010151905060096000876001600160a01b03166001600160a01b031681526020019081526020016000206000826001600160a01b03166001600160a01b031681526020019081526020016000206001015484838151811061157f5761157f612731565b6020908102919091018101919091526001600160a01b03808816600090815260098352604080822092851682529190925281206001015583518490839081106115ca576115ca612731565b602002602001015160086000836001600160a01b03166001600160a01b03168152602001908152602001600020600101600082825461160991906127cf565b9250508190555083828151811061162257611622612731565b6020026020010151600014611668576116688585848151811061164757611647612731565b6020026020010151836001600160a01b0316611bae9092919063ffffffff16565b50611672816127e6565b90506114fa565b505092915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610ea29085906323b872dd60e01b90608401610e6b565b600061170e826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316610ea89092919063ffffffff16565b80519091501561148b578080602001905181019061172c9190612801565b61148b5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161080f565b6060824710156117ec5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161080f565b6001600160a01b0385163b6118435760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161080f565b600080866001600160a01b0316858760405161185f9190612823565b60006040518083038185875af1925050503d806000811461189c576040519150601f19603f3d011682016040523d82523d6000602084013e6118a1565b606091505b50915091506118b18282866123f9565b979650505050505050565b6118c4611317565b6001600160a01b038316156118dc576118dc8361227d565b6001600160a01b0382161561148b5761148b8261227d565b6001600160a01b0382166119545760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b606482015260840161080f565b611960826000836118bc565b6001600160a01b038216600090815260208190526040902054818110156119d45760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b606482015260840161080f565b6001600160a01b0383166000908152602081905260408120838303905560028054849290611a039084906127cf565b90915550506040518281526000906001600160a01b038516906000805160206128d38339815191529060200160405180910390a3505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b03161415611a7f57508061077f565b60405163db006a7560e01b8152600481018390526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063db006a7590602401602060405180830381600087803b158015611ae457600080fd5b505af1158015611af8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b1c9190612747565b90508015611b5c5760405162461bcd60e51b815260206004820152600d60248201526c1c995919595b4819985a5b1959609a1b604482015260640161080f565b611b857f0000000000000000000000000000000000000000000000000000000000000000611bcd565b610eb77f0000000000000000000000000000000000000000000000000000000000000000611c7e565b61148b8363a9059cbb60e01b8484604051602401610e6b929190612760565b6001600160a01b038116301415611be657611be661283f565b6040516370a0823160e01b81526001600160a01b038216906370a0823190611c1290309060040161253c565b60206040518083038186803b158015611c2a57600080fd5b505afa158015611c3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c629190612747565b6001600160a01b03909116600090815260066020526040902055565b60006001600160a01b038216301415611c9957611c9961283f565b6040516370a0823160e01b81526000906001600160a01b038416906370a0823190611cc890309060040161253c565b60206040518083038186803b158015611ce057600080fd5b505afa158015611cf4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d189190612747565b6001600160a01b038416600090815260066020526040902054909150611d3e90826127cf565b6001600160a01b039093166000908152600660205260409020555090565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b03161415611d9f57508061077f565b60405163140e25ad60e31b8152600481018390526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a0712d6890602401602060405180830381600087803b158015611e0457600080fd5b505af1158015611e18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e3c9190612747565b90508015611e7a5760405162461bcd60e51b815260206004820152600b60248201526a1b5a5b9d0819985a5b195960aa1b604482015260640161080f565b611ea37f0000000000000000000000000000000000000000000000000000000000000000611bcd565b610eb77f0000000000000000000000000000000000000000000000000000000000000000611c7e565b6001600160a01b038216611f225760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640161080f565b611f2e600083836118bc565b8060026000828254611f4091906126cc565b90915550506001600160a01b03821660009081526020819052604081208054839290611f6d9084906126cc565b90915550506040518181526001600160a01b038316906000906000805160206128d38339815191529060200160405180910390a35b5050565b6000436007541415611fb85750600090565b5043600755600190565b604080516001808252818301909252600091602080830190803683375050604080516001808252818301909252929350600092915060208083019080368337019050509050308260008151811061201b5761201b612731565b60200260200101906001600160a01b031690816001600160a01b0316815250507f00000000000000000000000000000000000000000000000000000000000000008160008151811061206f5761206f612731565b6001600160a01b039283166020918202929092010152604051638805714b60e01b81527f000000000000000000000000000000000000000000000000000000000000000090911690638805714b906120d590600090869086908390600190600401612855565b600060405180830381600087803b1580156120ef57600080fd5b505af1158015612103573d6000803e3d6000fd5b5050604051638805714b60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169250638805714b915061215d90600190869086906000908490600401612855565b600060405180830381600087803b15801561217757600080fd5b505af115801561218b573d6000803e3d6000fd5b5050505047600014611fa2575050565b60006121a660025490565b905090565b60005b8151811015611fa257600860008383815181106121cd576121cd612731565b60200260200101516001600160a01b03166001600160a01b03168152602001908152602001600020600001546000141561223e5760016008600084848151811061221957612219612731565b6020908102919091018101516001600160a01b03168252810191909152604001600020555b612247816127e6565b90506121ae565b600080612263670de0b6b3a76400008561289d565b9050828181612274576122746128bc565b04949350505050565b6000612287610b64565b9050600061229483612432565b905060005b8251811015610ea25760008382815181106122b6576122b6612731565b6020908102919091018101516001600160a01b038088166000908152600984526040808220928416825291845281812054600890945220549092508114156122ff5750506123e9565b8061233b57506001600160a01b0390811660008181526008602090815260408083205494891683526009825280832093835292905220556123e9565b6001600160a01b03821660009081526008602052604081205461235f9083906127cf565b9050600061236d868361243d565b6001600160a01b03808a1660009081526009602090815260408083209389168352929052908120600101805492935083929091906123ac9084906126cc565b9091555050506001600160a01b03928316600081815260086020908152604080832054968b16835260098252808320938352929052209290925550505b6123f2816127e6565b9050612299565b606083156124085750816107a4565b8251156124185782518084602001fd5b8160405162461bcd60e51b815260040161080f9190612487565b600061077f82610884565b60008061244a838561289d565b9050670de0b6b3a764000081612274565b60005b8381101561247657818101518382015260200161245e565b83811115610ea25750506000910152565b60208152600082518060208401526124a681604085016020870161245b565b601f01601f19169190910160400192915050565b80356001600160a01b03811681146124d157600080fd5b919050565b600080604083850312156124e957600080fd5b6124f2836124ba565b946020939093013593505050565b60008060006060848603121561251557600080fd5b61251e846124ba565b925061252c602085016124ba565b9150604084013590509250925092565b6001600160a01b0391909116815260200190565b6000806000806080858703121561256657600080fd5b61256f856124ba565b935061257d602086016124ba565b93969395505050506040820135916060013590565b600080604083850312156125a557600080fd5b6125ae836124ba565b91506125bc602084016124ba565b90509250929050565b6000602082840312156125d757600080fd5b6107a4826124ba565b6020808252825182820181905260009190848201906040850190845b81811015612618578351835292840192918401916001016125fc565b50909695505050505050565b600081518084526020808501945080840160005b8381101561265d5781516001600160a01b031687529582019590820190600101612638565b509495945050505050565b6020815260006107a46020830184612624565b600181811c9082168061268f57607f821691505b602082108114156126b057634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082198211156126df576126df6126b6565b500190565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561275957600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60208082526012908201527134b73b30b634b2103130b9b2903a37b5b2b760711b604082015260600190565b60208082526010908201526f1a5b9cdd59999a58da595b9d081bdd5d60821b604082015260600190565b6000828210156127e1576127e16126b6565b500390565b60006000198214156127fa576127fa6126b6565b5060010190565b60006020828403121561281357600080fd5b815180151581146107a457600080fd5b6000825161283581846020870161245b565b9190910192915050565b634e487b7160e01b600052600160045260246000fd5b60ff8616815260a06020820152600061287160a0830187612624565b82810360408401526128838187612624565b941515606084015250509015156080909101529392505050565b60008160001904831182151516156128b7576128b76126b6565b500290565b634e487b7160e01b600052601260045260246000fdfeddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220938cdc2681574b201367cb53ca7f8739663be6b75ed6b5dd70fcce26b4e8403864736f6c63430008090033";
728
779
 
729
780
  type PendleBenQiErc20SCYConstructorParams =
730
781
  | [signer?: Signer]
@@ -749,6 +800,7 @@ export class PendleBenQiErc20SCY__factory extends ContractFactory {
749
800
  _symbol: string,
750
801
  __scydecimals: BigNumberish,
751
802
  __assetDecimals: BigNumberish,
803
+ __assetId: BytesLike,
752
804
  _underlying: string,
753
805
  _qiToken: string,
754
806
  _comptroller: string,
@@ -761,6 +813,7 @@ export class PendleBenQiErc20SCY__factory extends ContractFactory {
761
813
  _symbol,
762
814
  __scydecimals,
763
815
  __assetDecimals,
816
+ __assetId,
764
817
  _underlying,
765
818
  _qiToken,
766
819
  _comptroller,
@@ -774,6 +827,7 @@ export class PendleBenQiErc20SCY__factory extends ContractFactory {
774
827
  _symbol: string,
775
828
  __scydecimals: BigNumberish,
776
829
  __assetDecimals: BigNumberish,
830
+ __assetId: BytesLike,
777
831
  _underlying: string,
778
832
  _qiToken: string,
779
833
  _comptroller: string,
@@ -786,6 +840,7 @@ export class PendleBenQiErc20SCY__factory extends ContractFactory {
786
840
  _symbol,
787
841
  __scydecimals,
788
842
  __assetDecimals,
843
+ __assetId,
789
844
  _underlying,
790
845
  _qiToken,
791
846
  _comptroller,
package/typechain-types/factories/PendleBtrflyScy__factory.ts CHANGED
@@ -7,6 +7,7 @@ import {
7
7
  Contract,
8
8
  ContractFactory,
9
9
  Overrides,
10
+ BytesLike,
10
11
  BigNumberish,
11
12
  } from "ethers";
12
13
  import { Provider, TransactionRequest } from "@ethersproject/providers";
@@ -38,6 +39,11 @@ const _abi = [
38
39
  name: "__assetDecimals",
39
40
  type: "uint8",
40
41
  },
42
+ {
43
+ internalType: "bytes32",
44
+ name: "__assetId",
45
+ type: "bytes32",
46
+ },
41
47
  {
42
48
  internalType: "address",
43
49
  name: "_BTRFLY",
@@ -107,6 +113,19 @@ const _abi = [
107
113
  name: "Transfer",
108
114
  type: "event",
109
115
  },
116
+ {
117
+ anonymous: false,
118
+ inputs: [
119
+ {
120
+ indexed: false,
121
+ internalType: "uint256",
122
+ name: "scyIndex",
123
+ type: "uint256",
124
+ },
125
+ ],
126
+ name: "UpdateScyIndex",
127
+ type: "event",
128
+ },
110
129
  {
111
130
  inputs: [],
112
131
  name: "BTRFLY",
@@ -181,6 +200,19 @@ const _abi = [
181
200
  stateMutability: "view",
182
201
  type: "function",
183
202
  },
203
+ {
204
+ inputs: [],
205
+ name: "assetId",
206
+ outputs: [
207
+ {
208
+ internalType: "bytes32",
209
+ name: "",
210
+ type: "bytes32",
211
+ },
212
+ ],
213
+ stateMutability: "view",
214
+ type: "function",
215
+ },
184
216
  {
185
217
  inputs: [
186
218
  {
@@ -299,21 +331,8 @@ const _abi = [
299
331
  outputs: [
300
332
  {
301
333
  internalType: "bool",
302
- name: "res",
303
- type: "bool",
304
- },
305
- ],
306
- stateMutability: "view",
307
- type: "function",
308
- },
309
- {
310
- inputs: [],
311
- name: "lastScyIndex",
312
- outputs: [
313
- {
314
- internalType: "uint256",
315
334
  name: "",
316
- type: "uint256",
335
+ type: "bool",
317
336
  },
318
337
  ],
319
338
  stateMutability: "view",
@@ -375,7 +394,7 @@ const _abi = [
375
394
  outputs: [
376
395
  {
377
396
  internalType: "uint256",
378
- name: "amountScyOut",
397
+ name: "",
379
398
  type: "uint256",
380
399
  },
381
400
  ],
@@ -451,7 +470,7 @@ const _abi = [
451
470
  outputs: [
452
471
  {
453
472
  internalType: "uint256",
454
- name: "amountBaseOut",
473
+ name: "",
455
474
  type: "uint256",
456
475
  },
457
476
  ],
@@ -483,7 +502,7 @@ const _abi = [
483
502
  outputs: [
484
503
  {
485
504
  internalType: "uint256",
486
- name: "res",
505
+ name: "",
487
506
  type: "uint256",
488
507
  },
489
508
  ],
@@ -496,7 +515,7 @@ const _abi = [
496
515
  outputs: [
497
516
  {
498
517
  internalType: "uint256",
499
- name: "res",
518
+ name: "",
500
519
  type: "uint256",
501
520
  },
502
521
  ],
@@ -631,7 +650,7 @@ const _abi = [
631
650
  ];
632
651
 
633
652
  const _bytecode =
634
- "0x6101206040523480156200001257600080fd5b506040516200243a3803806200243a83398101604081905262000035916200060a565b8686868683838160039080519060200190620000539291906200045f565b508051620000699060049060208401906200045f565b50505060ff9182166080521660a05250506001600160a01b0383811660c081905283821660e052908216610100819052620000b49190600019620000ed602090811b620009bb17901c565b620000e06101005160001960e0516001600160a01b0316620000ed60201b620009bb179092919060201c565b50505050505050620007c6565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b1580156200013a57600080fd5b505afa1580156200014f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001759190620006d1565b620001819190620006eb565b604080516001600160a01b038616602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b0390811663095ea7b360e01b17909152919250620001dd91869190620001e316565b50505050565b60006200023f826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316620002ca60201b62000aa7179092919060201c565b805190915015620002c5578080602001905181019062000260919062000712565b620002c55760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b60648201526084015b60405180910390fd5b505050565b6060620002db8484600085620002e5565b90505b9392505050565b606082471015620003485760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401620002bc565b6001600160a01b0385163b620003a15760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620002bc565b600080866001600160a01b03168587604051620003bf919062000736565b60006040518083038185875af1925050503d8060008114620003fe576040519150601f19603f3d011682016040523d82523d6000602084013e62000403565b606091505b5090925090506200041682828662000421565b979650505050505050565b6060831562000432575081620002de565b825115620004435782518084602001fd5b8160405162461bcd60e51b8152600401620002bc919062000754565b8280546200046d9062000789565b90600052602060002090601f016020900481019282620004915760008555620004dc565b82601f10620004ac57805160ff1916838001178555620004dc565b82800160010185558215620004dc579182015b82811115620004dc578251825591602001919060010190620004bf565b50620004ea929150620004ee565b5090565b5b80821115620004ea5760008155600101620004ef565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620005385781810151838201526020016200051e565b83811115620001dd5750506000910152565b600082601f8301126200055c57600080fd5b81516001600160401b038082111562000579576200057962000505565b604051601f8301601f19908116603f01168101908282118183101715620005a457620005a462000505565b81604052838152866020858801011115620005be57600080fd5b620005d18460208301602089016200051b565b9695505050505050565b805160ff81168114620005ed57600080fd5b919050565b80516001600160a01b0381168114620005ed57600080fd5b600080600080600080600060e0888a0312156200062657600080fd5b87516001600160401b03808211156200063e57600080fd5b6200064c8b838c016200054a565b985060208a01519150808211156200066357600080fd5b50620006728a828b016200054a565b9650506200068360408901620005db565b94506200069360608901620005db565b9350620006a360808901620005f2565b9250620006b360a08901620005f2565b9150620006c360c08901620005f2565b905092959891949750929550565b600060208284031215620006e457600080fd5b5051919050565b600082198211156200070d57634e487b7160e01b600052601160045260246000fd5b500190565b6000602082840312156200072557600080fd5b81518015158114620002de57600080fd5b600082516200074a8184602087016200051b565b9190910192915050565b6020815260008251806020840152620007758160408501602087016200051b565b601f01601f19169190910160400192915050565b600181811c908216806200079e57607f821691505b60208210811415620007c057634e487b7160e01b600052602260045260246000fd5b50919050565b60805160a05160c05160e05161010051611bb162000889600039600081816102a6015281816107480152818161089f0152818161093201528181610f43015281816110470152818161138c01528181611418015261148c0152600081816103ad015281816106f40152818161086301528181610ff9015281816110d2015261143e0152600081816101b1015281816106a00152818161082801528181610ef501528181610fce015261133e01526000610339015260006101f50152611bb16000f3fe608060405234801561001057600080fd5b50600436106101545760003560e01c806306fdde0314610159578063095ea7b31461017757806318160ddd1461019a57806322443c10146101ac57806323b872dd146101e0578063313ce567146101f357806339509351146102275780634be474181461023a5780636265bc851461024d57806369889d3a1461025657806370a08231146102695780637695caa21461027c5780638e37b2691461027e57806395d89b4114610286578063a457c2d71461028e578063a6ba93ec146102a1578063a9059cbb146102c8578063b286de76146102db578063b3f1c93d146102fc578063bed64c2f1461030f578063c1129b1b14610324578063c2d4160114610337578063c4f59f9b1461035d578063c6d6916c14610371578063c9c0c08214610382578063dd62ed3e14610395578063df776f76146103a8578063f65d6fc8146103cf575b600080fd5b6101616103d7565b60405161016e9190611811565b60405180910390f35b61018a610185366004611860565b610469565b604051901515815260200161016e565b6002545b60405190815260200161016e565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b60405161016e919061188a565b61018a6101ee36600461189e565b610483565b7f00000000000000000000000000000000000000000000000000000000000000005b60405160ff909116815260200161016e565b61018a610235366004611860565b6104a9565b61019e6102483660046118da565b6104e8565b61019e60065481565b61019e61026436600461189e565b61050a565b61019e61027736600461191c565b610585565b005b60065461019e565b6101616105a0565b61018a61029c366004611860565b6105af565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b61018a6102d6366004611860565b61064c565b6102ef6102e936600461191c565b50606090565b60405161016e9190611937565b61019e61030a3660046118da565b61065a565b61031761067c565b60405161016e919061197b565b61019e61033236600461189e565b61079d565b7f0000000000000000000000000000000000000000000000000000000000000000610215565b604080516000815260208101909152610317565b61027c61037f36600461191c565b50565b61018a61039036600461191c565b610824565b61019e6103a33660046119bc565b6108d8565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b61019e610903565b6060600380546103e6906119ef565b80601f0160208091040260200160405190810160405280929190818152602001828054610412906119ef565b801561045f5780601f106104345761010080835404028352916020019161045f565b820191906000526020600020905b81548152906001019060200180831161044257829003601f168201915b5050505050905090565b600033610477818585610abe565b60019150505b92915050565b600033610491858285610be3565b61049c858585610c57565b60019150505b9392505050565b3360008181526001602090815260408083206001600160a01b038716845290915281205490919061047790829086906104e3908790611a3a565b610abe565b60006104f5333085610483565b5061050185858461079d565b95945050505050565b600061051583610824565b61053a5760405162461bcd60e51b815260040161053190611a52565b60405180910390fd5b600061054584610e13565b90506105518482610ef1565b9150828210156105735760405162461bcd60e51b815260040161053190611a7e565b61057d85836110fc565b509392505050565b6001600160a01b031660009081526020819052604090205490565b6060600480546103e6906119ef565b3360008181526001602090815260408083206001600160a01b0387168452909152812054909190838110156106345760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610531565b6106418286868403610abe565b506001949350505050565b600033610477818585610c57565b60006106716001600160a01b0385163330866111c9565b61050185858461050a565b604080516003808252608082019092526060916020820183803683370190505090507f0000000000000000000000000000000000000000000000000000000000000000816000815181106106d2576106d2611aa8565b60200260200101906001600160a01b031690816001600160a01b0316815250507f00000000000000000000000000000000000000000000000000000000000000008160018151811061072657610726611aa8565b60200260200101906001600160a01b031690816001600160a01b0316815250507f00000000000000000000000000000000000000000000000000000000000000008160028151811061077a5761077a611aa8565b60200260200101906001600160a01b031690816001600160a01b03168152505090565b60006107a883610824565b6107c45760405162461bcd60e51b815260040161053190611a52565b60006107cf30610585565b90506107db3082611201565b6107e5848261133a565b9150828210156108075760405162461bcd60e51b815260040161053190611a7e565b61081b6001600160a01b03851686846114c3565b61057d846114e2565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316148061089757507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316145b8061047d57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b03161492915050565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b60065460405163d9f7e9a760e01b8152670de0b6b3a764000060048201526000916109b1916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d9f7e9a79060240160206040518083038186803b15801561097457600080fd5b505afa158015610988573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109ac9190611abe565b611593565b6006819055919050565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b158015610a0757600080fd5b505afa158015610a1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3f9190611abe565b610a499190611a3a565b9050610aa18463095ea7b360e01b8584604051602401610a6a929190611ad7565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526115a9565b50505050565b6060610ab6848460008561167b565b949350505050565b6001600160a01b038316610b205760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610531565b6001600160a01b038216610b815760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610531565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6000610bef84846108d8565b90506000198114610aa15781811015610c4a5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610531565b610aa18484848403610abe565b6001600160a01b038316610cbb5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610531565b6001600160a01b038216610d1d5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610531565b6001600160a01b03831660009081526020819052604090205481811015610d955760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610531565b6001600160a01b03808516600090815260208190526040808220858503905591851681529081208054849290610dcc908490611a3a565b92505081905550826001600160a01b0316846001600160a01b0316600080516020611b5c83398151915284604051610e0691815260200190565b60405180910390a3610aa1565b60006001600160a01b038216301415610e2e57610e2e611af0565b6040516370a0823160e01b81526000906001600160a01b038416906370a0823190610e5d90309060040161188a565b60206040518083038186803b158015610e7557600080fd5b505afa158015610e89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ead9190611abe565b6001600160a01b038416600090815260056020526040902054909150610ed39082611b06565b6001600160a01b039093166000908152600560205260409020555090565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b03161415610ff757604051630969ad2960e31b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634b4d694890602401602060405180830381600087803b158015610f8f57600080fd5b505af1158015610fa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc79190611abe565b9050610ff27f00000000000000000000000000000000000000000000000000000000000000006114e2565b61047d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b031614156110f657604051631077c0f960e11b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906320ef81f290602401602060405180830381600087803b15801561109357600080fd5b505af11580156110a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110cb9190611abe565b9050610ff27f00000000000000000000000000000000000000000000000000000000000000006114e2565b50919050565b6001600160a01b0382166111525760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610531565b80600260008282546111649190611a3a565b90915550506001600160a01b03821660009081526020819052604081208054839290611191908490611a3a565b90915550506040518181526001600160a01b03831690600090600080516020611b5c8339815191529060200160405180910390a35050565b6040516001600160a01b0380851660248301528316604482015260648101829052610aa19085906323b872dd60e01b90608401610a6a565b6001600160a01b0382166112615760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610531565b6001600160a01b038216600090815260208190526040902054818110156112d55760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610531565b6001600160a01b0383166000908152602081905260408120838303905560028054849290611304908490611b06565b90915550506040518281526000906001600160a01b03851690600080516020611b5c83398151915290602001610bd6565b505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b0316141561143c57604051634a97344b60e01b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634a97344b906024015b602060405180830381600087803b1580156113d957600080fd5b505af11580156113ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114119190611abe565b9050610ff27f00000000000000000000000000000000000000000000000000000000000000006114e2565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b031614156110f65760405163e09ae5f760e01b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e09ae5f7906024016113bf565b6113358363a9059cbb60e01b8484604051602401610a6a929190611ad7565b6001600160a01b0381163014156114fb576114fb611af0565b6040516370a0823160e01b81526001600160a01b038216906370a082319061152790309060040161188a565b60206040518083038186803b15801561153f57600080fd5b505afa158015611553573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115779190611abe565b6001600160a01b03909116600090815260056020526040902055565b60008183116115a257816104a2565b5090919050565b60006115fe826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316610aa79092919063ffffffff16565b805190915015611335578080602001905181019061161c9190611b1d565b6113355760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610531565b6060824710156116dc5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610531565b6001600160a01b0385163b6117335760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610531565b600080866001600160a01b0316858760405161174f9190611b3f565b60006040518083038185875af1925050503d806000811461178c576040519150601f19603f3d011682016040523d82523d6000602084013e611791565b606091505b50915091506117a18282866117ac565b979650505050505050565b606083156117bb5750816104a2565b8251156117cb5782518084602001fd5b8160405162461bcd60e51b81526004016105319190611811565b60005b838110156118005781810151838201526020016117e8565b83811115610aa15750506000910152565b60208152600082518060208401526118308160408501602087016117e5565b601f01601f19169190910160400192915050565b80356001600160a01b038116811461185b57600080fd5b919050565b6000806040838503121561187357600080fd5b61187c83611844565b946020939093013593505050565b6001600160a01b0391909116815260200190565b6000806000606084860312156118b357600080fd5b6118bc84611844565b92506118ca60208501611844565b9150604084013590509250925092565b600080600080608085870312156118f057600080fd5b6118f985611844565b935061190760208601611844565b93969395505050506040820135916060013590565b60006020828403121561192e57600080fd5b6104a282611844565b6020808252825182820181905260009190848201906040850190845b8181101561196f57835183529284019291840191600101611953565b50909695505050505050565b6020808252825182820181905260009190848201906040850190845b8181101561196f5783516001600160a01b031683529284019291840191600101611997565b600080604083850312156119cf57600080fd5b6119d883611844565b91506119e660208401611844565b90509250929050565b600181811c90821680611a0357607f821691505b602082108114156110f657634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60008219821115611a4d57611a4d611a24565b500190565b60208082526012908201527134b73b30b634b2103130b9b2903a37b5b2b760711b604082015260600190565b60208082526010908201526f1a5b9cdd59999a58da595b9d081bdd5d60821b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b600060208284031215611ad057600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b634e487b7160e01b600052600160045260246000fd5b600082821015611b1857611b18611a24565b500390565b600060208284031215611b2f57600080fd5b815180151581146104a257600080fd5b60008251611b518184602087016117e5565b919091019291505056feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa26469706673582212208e8626ff261c31c943b03fe4c93d548fdb4e4790a3048192a60a0b9e213f383164736f6c63430008090033";
653
+ "0x6101406040523480156200001257600080fd5b50604051620026143803806200261483398101604081905262000035916200065e565b87878787878484816003908051906020019062000054929190620004b3565b5080516200006a906004906020840190620004b3565b505060016005555060ff928316608052911660a05260c05250506001600160a01b038116620000cf5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064015b60405180910390fd5b6001600160a01b0383811660e0819052838216610100529082166101208190526200010a919060001962000145602090811b620009d517901c565b6200013761012051600019610100516001600160a01b03166200014560201b620009d5179092919060201c565b505050505050505062000824565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b1580156200019257600080fd5b505afa158015620001a7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001cd91906200072f565b620001d9919062000749565b604080516001600160a01b038616602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b0390811663095ea7b360e01b1790915291925062000235918691906200023b16565b50505050565b600062000297826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166200031e60201b62000ac1179092919060201c565b805190915015620003195780806020019051810190620002b8919062000770565b620003195760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401620000c6565b505050565b60606200032f848460008562000339565b90505b9392505050565b6060824710156200039c5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401620000c6565b6001600160a01b0385163b620003f55760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401620000c6565b600080866001600160a01b0316858760405162000413919062000794565b60006040518083038185875af1925050503d806000811462000452576040519150601f19603f3d011682016040523d82523d6000602084013e62000457565b606091505b5090925090506200046a82828662000475565b979650505050505050565b606083156200048657508162000332565b825115620004975782518084602001fd5b8160405162461bcd60e51b8152600401620000c69190620007b2565b828054620004c190620007e7565b90600052602060002090601f016020900481019282620004e5576000855562000530565b82601f106200050057805160ff191683800117855562000530565b8280016001018555821562000530579182015b828111156200053057825182559160200191906001019062000513565b506200053e92915062000542565b5090565b5b808211156200053e576000815560010162000543565b634e487b7160e01b600052604160045260246000fd5b60005b838110156200058c57818101518382015260200162000572565b83811115620002355750506000910152565b600082601f830112620005b057600080fd5b81516001600160401b0380821115620005cd57620005cd62000559565b604051601f8301601f19908116603f01168101908282118183101715620005f857620005f862000559565b816040528381528660208588010111156200061257600080fd5b620006258460208301602089016200056f565b9695505050505050565b805160ff811681146200064157600080fd5b919050565b80516001600160a01b03811681146200064157600080fd5b600080600080600080600080610100898b0312156200067c57600080fd5b88516001600160401b03808211156200069457600080fd5b620006a28c838d016200059e565b995060208b0151915080821115620006b957600080fd5b50620006c88b828c016200059e565b975050620006d960408a016200062f565b9550620006e960608a016200062f565b9450608089015193506200070060a08a0162000646565b92506200071060c08a0162000646565b91506200072060e08a0162000646565b90509295985092959890939650565b6000602082840312156200074257600080fd5b5051919050565b600082198211156200076b57634e487b7160e01b600052601160045260246000fd5b500190565b6000602082840312156200078357600080fd5b815180151581146200033257600080fd5b60008251620007a88184602087016200056f565b9190910192915050565b6020815260008251806020840152620007d38160408501602087016200056f565b601f01601f19169190910160400192915050565b600181811c90821680620007fc57607f821691505b602082108114156200081e57634e487b7160e01b600052602260045260246000fd5b50919050565b60805160a05160c05160e0516101005161012051611d1b620008f9600039600081816102c40152818161078b0152818161089001528181610914015281816112f30152818161137f015281816113f801528181611635015281816116e901526117630152600081816103cb0152818161073701528181610854015281816113aa0152818161171501526117ee0152600081816101b1015281816106e301528181610819015281816112a5015281816115e701526116c00152600061023c01526000610357015260006101f50152611d1b6000f3fe608060405234801561001057600080fd5b50600436106101545760003560e01c806306fdde0314610159578063095ea7b31461017757806318160ddd1461019a57806322443c10146101ac57806323b872dd146101e0578063313ce567146101f3578063395093511461022757806344de240a1461023a5780634be474181461026057806369889d3a1461027357806370a08231146102865780637695caa2146102995780638e37b2691461029b57806395d89b41146102a4578063a457c2d7146102ac578063a6ba93ec146102bf578063a9059cbb146102e6578063b286de76146102f9578063b3f1c93d1461031a578063bed64c2f1461032d578063c1129b1b14610342578063c2d4160114610355578063c4f59f9b1461037b578063c6d6916c1461038f578063c9c0c082146103a0578063dd62ed3e146103b3578063df776f76146103c6578063f65d6fc8146103ed575b600080fd5b6101616103f5565b60405161016e9190611944565b60405180910390f35b61018a610185366004611993565b610487565b604051901515815260200161016e565b6002545b60405190815260200161016e565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b60405161016e91906119bd565b61018a6101ee3660046119d1565b6104a1565b7f00000000000000000000000000000000000000000000000000000000000000005b60405160ff909116815260200161016e565b61018a610235366004611993565b6104c7565b7f000000000000000000000000000000000000000000000000000000000000000061019e565b61019e61026e366004611a0d565b610506565b61019e6102813660046119d1565b61055e565b61019e610294366004611a4f565b6105a0565b005b61019e60075481565b6101616105bb565b61018a6102ba366004611993565b6105ca565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b61018a6102f4366004611993565b610667565b61030d610307366004611a4f565b50606090565b60405161016e9190611a6a565b61019e610328366004611a0d565b610675565b6103356106bf565b60405161016e9190611aae565b61019e6103503660046119d1565b6107e0565b7f0000000000000000000000000000000000000000000000000000000000000000610215565b604080516000815260208101909152610335565b61029961039d366004611a4f565b50565b61018a6103ae366004611a4f565b610815565b61019e6103c1366004611aef565b6108c9565b6101d37f000000000000000000000000000000000000000000000000000000000000000081565b61019e6108f4565b60606003805461040490611b22565b80601f016020809104026020016040519081016040528092919081815260200182805461043090611b22565b801561047d5780601f106104525761010080835404028352916020019161047d565b820191906000526020600020905b81548152906001019060200180831161046057829003601f168201915b5050505050905090565b600033610495818585610ad8565b60019150505b92915050565b6000336104af858285610bfc565b6104ba858585610c70565b60019150505b9392505050565b3360008181526001602090815260408083206001600160a01b03871684529091528120549091906104959082908690610501908790611b6d565b610ad8565b6000600260055414156105345760405162461bcd60e51b815260040161052b90611b85565b60405180910390fd5b60026005556105443330856104a1565b50610550858584610e2c565b600160055595945050505050565b6000600260055414156105835760405162461bcd60e51b815260040161052b90611b85565b6002600555610593848484610ebb565b6001600555949350505050565b6001600160a01b031660009081526020819052604090205490565b60606004805461040490611b22565b3360008181526001602090815260408083206001600160a01b03871684529091528120549091908381101561064f5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b606482015260840161052b565b61065c8286868403610ad8565b506001949350505050565b600033610495818585610c70565b60006002600554141561069a5760405162461bcd60e51b815260040161052b90611b85565b60026005556106b46001600160a01b038516333086610f25565b610550858584610ebb565b604080516003808252608082019092526060916020820183803683370190505090507f00000000000000000000000000000000000000000000000000000000000000008160008151811061071557610715611bbc565b60200260200101906001600160a01b031690816001600160a01b0316815250507f00000000000000000000000000000000000000000000000000000000000000008160018151811061076957610769611bbc565b60200260200101906001600160a01b031690816001600160a01b0316815250507f0000000000000000000000000000000000000000000000000000000000000000816002815181106107bd576107bd611bbc565b60200260200101906001600160a01b031690816001600160a01b03168152505090565b6000600260055414156108055760405162461bcd60e51b815260040161052b90611b85565b6002600555610593848484610e2c565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316148061088857507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b0316145b8061049b57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316826001600160a01b03161492915050565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b60405163d9f7e9a760e01b8152670de0b6b3a764000060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d9f7e9a79060240160206040518083038186803b15801561095e57600080fd5b505afa158015610972573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109969190611bd2565b60078190556040519081527fbccccf411823b290c704d60c85a456e04528fff86811afd664d6ebf56347f5859060200160405180910390a15060075490565b604051636eb1769f60e11b81523060048201526001600160a01b038381166024830152600091839186169063dd62ed3e9060440160206040518083038186803b158015610a2157600080fd5b505afa158015610a35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a599190611bd2565b610a639190611b6d565b9050610abb8463095ea7b360e01b8584604051602401610a84929190611beb565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152610f5d565b50505050565b6060610ad08484600085611034565b949350505050565b6001600160a01b038316610b3a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b606482015260840161052b565b6001600160a01b038216610b9b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b606482015260840161052b565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6000610c0884846108c9565b90506000198114610abb5781811015610c635760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000604482015260640161052b565b610abb8484848403610ad8565b6001600160a01b038316610cd45760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b606482015260840161052b565b6001600160a01b038216610d365760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b606482015260840161052b565b6001600160a01b03831660009081526020819052604090205481811015610dae5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b606482015260840161052b565b6001600160a01b03808516600090815260208190526040808220858503905591851681529081208054849290610de5908490611b6d565b92505081905550826001600160a01b0316846001600160a01b0316600080516020611cc683398151915284604051610e1f91815260200190565b60405180910390a3610abb565b6000610e3783610815565b610e535760405162461bcd60e51b815260040161052b90611c04565b6000610e5e306105a0565b9050610e6a3082611165565b610e7484826112a1565b915082821015610e965760405162461bcd60e51b815260040161052b90611c30565b610eaa6001600160a01b0385168684611435565b610eb384611454565b509392505050565b6000610ec683610815565b610ee25760405162461bcd60e51b815260040161052b90611c04565b6000610eed84611505565b9050610ef984826115e3565b915082821015610f1b5760405162461bcd60e51b815260040161052b90611c30565b610eb38583611812565b6040516001600160a01b0380851660248301528316604482015260648101829052610abb9085906323b872dd60e01b90608401610a84565b6000610fb2826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316610ac19092919063ffffffff16565b80519091501561102f5780806020019051810190610fd09190611c5a565b61102f5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161052b565b505050565b6060824710156110955760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161052b565b6001600160a01b0385163b6110ec5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161052b565b600080866001600160a01b031685876040516111089190611c7c565b60006040518083038185875af1925050503d8060008114611145576040519150601f19603f3d011682016040523d82523d6000602084013e61114a565b606091505b509150915061115a8282866118df565b979650505050505050565b6001600160a01b0382166111c55760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b606482015260840161052b565b6001600160a01b038216600090815260208190526040902054818110156112395760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b606482015260840161052b565b6001600160a01b0383166000908152602081905260408120838303905560028054849290611268908490611c98565b90915550506040518281526000906001600160a01b03851690600080516020611cc68339815191529060200160405180910390a3505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b031614156113a857604051634a97344b60e01b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634a97344b906024015b602060405180830381600087803b15801561134057600080fd5b505af1158015611354573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113789190611bd2565b90506113a37f0000000000000000000000000000000000000000000000000000000000000000611454565b61049b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b0316141561142f5760405163e09ae5f760e01b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e09ae5f790602401611326565b50919050565b61102f8363a9059cbb60e01b8484604051602401610a84929190611beb565b6001600160a01b03811630141561146d5761146d611caf565b6040516370a0823160e01b81526001600160a01b038216906370a08231906114999030906004016119bd565b60206040518083038186803b1580156114b157600080fd5b505afa1580156114c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114e99190611bd2565b6001600160a01b03909116600090815260066020526040902055565b60006001600160a01b03821630141561152057611520611caf565b6040516370a0823160e01b81526000906001600160a01b038416906370a082319061154f9030906004016119bd565b60206040518083038186803b15801561156757600080fd5b505afa15801561157b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061159f9190611bd2565b6001600160a01b0384166000908152600660205260409020549091506115c59082611c98565b6001600160a01b039093166000908152600660205260409020555090565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b0316141561171357604051630969ad2960e31b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634b4d694890602401602060405180830381600087803b15801561168157600080fd5b505af1158015611695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116b99190611bd2565b90506116e47f0000000000000000000000000000000000000000000000000000000000000000611454565b61170d7f0000000000000000000000000000000000000000000000000000000000000000611505565b5061049b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316836001600160a01b0316141561142f57604051631077c0f960e11b8152600481018390527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906320ef81f290602401602060405180830381600087803b1580156117af57600080fd5b505af11580156117c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117e79190611bd2565b90506116e47f0000000000000000000000000000000000000000000000000000000000000000611454565b6001600160a01b0382166118685760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640161052b565b806002600082825461187a9190611b6d565b90915550506001600160a01b038216600090815260208190526040812080548392906118a7908490611b6d565b90915550506040518181526001600160a01b03831690600090600080516020611cc68339815191529060200160405180910390a35050565b606083156118ee5750816104c0565b8251156118fe5782518084602001fd5b8160405162461bcd60e51b815260040161052b9190611944565b60005b8381101561193357818101518382015260200161191b565b83811115610abb5750506000910152565b6020815260008251806020840152611963816040850160208701611918565b601f01601f19169190910160400192915050565b80356001600160a01b038116811461198e57600080fd5b919050565b600080604083850312156119a657600080fd5b6119af83611977565b946020939093013593505050565b6001600160a01b0391909116815260200190565b6000806000606084860312156119e657600080fd5b6119ef84611977565b92506119fd60208501611977565b9150604084013590509250925092565b60008060008060808587031215611a2357600080fd5b611a2c85611977565b9350611a3a60208601611977565b93969395505050506040820135916060013590565b600060208284031215611a6157600080fd5b6104c082611977565b6020808252825182820181905260009190848201906040850190845b81811015611aa257835183529284019291840191600101611a86565b50909695505050505050565b6020808252825182820181905260009190848201906040850190845b81811015611aa25783516001600160a01b031683529284019291840191600101611aca565b60008060408385031215611b0257600080fd5b611b0b83611977565b9150611b1960208401611977565b90509250929050565b600181811c90821680611b3657607f821691505b6020821081141561142f57634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60008219821115611b8057611b80611b57565b500190565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b634e487b7160e01b600052603260045260246000fd5b600060208284031215611be457600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60208082526012908201527134b73b30b634b2103130b9b2903a37b5b2b760711b604082015260600190565b60208082526010908201526f1a5b9cdd59999a58da595b9d081bdd5d60821b604082015260600190565b600060208284031215611c6c57600080fd5b815180151581146104c057600080fd5b60008251611c8e818460208701611918565b9190910192915050565b600082821015611caa57611caa611b57565b500390565b634e487b7160e01b600052600160045260246000fdfeddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220be8c813b24a6e9dcf546a5858423c6587ceb97e2418ed45d41deabcadbe9d1f064736f6c63430008090033";
635
654
 
636
655
  type PendleBtrflyScyConstructorParams =
637
656
  | [signer?: Signer]
@@ -656,6 +675,7 @@ export class PendleBtrflyScy__factory extends ContractFactory {
656
675
  _symbol: string,
657
676
  __scydecimals: BigNumberish,
658
677
  __assetDecimals: BigNumberish,
678
+ __assetId: BytesLike,
659
679
  _BTRFLY: string,
660
680
  _xBTRFLY: string,
661
681
  _wxBTRFLY: string,
@@ -666,6 +686,7 @@ export class PendleBtrflyScy__factory extends ContractFactory {
666
686
  _symbol,
667
687
  __scydecimals,
668
688
  __assetDecimals,
689
+ __assetId,
669
690
  _BTRFLY,
670
691
  _xBTRFLY,
671
692
  _wxBTRFLY,
@@ -677,6 +698,7 @@ export class PendleBtrflyScy__factory extends ContractFactory {
677
698
  _symbol: string,
678
699
  __scydecimals: BigNumberish,
679
700
  __assetDecimals: BigNumberish,
701
+ __assetId: BytesLike,
680
702
  _BTRFLY: string,
681
703
  _xBTRFLY: string,
682
704
  _wxBTRFLY: string,
@@ -687,6 +709,7 @@ export class PendleBtrflyScy__factory extends ContractFactory {
687
709
  _symbol,
688
710
  __scydecimals,
689
711
  __assetDecimals,
712
+ __assetId,
690
713
  _BTRFLY,
691
714
  _xBTRFLY,
692
715
  _wxBTRFLY,
package/typechain-types/factories/PendleGovernanceManager__factory.ts CHANGED
@@ -76,7 +76,7 @@ const _abi = [
76
76
  inputs: [
77
77
  {
78
78
  internalType: "address",
79
- name: "_governance",
79
+ name: "newGovernance",
80
80
  type: "address",
81
81
  },
82
82
  ],
@@ -88,7 +88,7 @@ const _abi = [
88
88
  ];
89
89
 
90
90
  const _bytecode =
91
- "0x608060405234801561001057600080fd5b506040516102d43803806102d483398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b610241806100936000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b6100886100983660046101db565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6000602082840312156101ed57600080fd5b81356001600160a01b038116811461020457600080fd5b939250505056fea264697066735822122043ee9a9a1d841065c5b3ba006317e0cd5696e44e052ee1c1c82b4034be8286e364736f6c63430008090033";
91
+ "0x608060405234801561001057600080fd5b5060405161036238038061036283398101604081905261002f9161009d565b6001600160a01b0381166100785760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b604482015260640160405180910390fd5b600080546001600160a01b0319166001600160a01b03929092169190911790556100cd565b6000602082840312156100af57600080fd5b81516001600160a01b03811681146100c657600080fd5b9392505050565b610286806100dc6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610220565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b6001600160a01b0381166101fe5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561023257600080fd5b81356001600160a01b038116811461024957600080fd5b939250505056fea26469706673582212206f1f89da0ff41dbbbfde6d0dfa49a4df25a83fe2d6df770c91bf6ad536504fd864736f6c63430008090033";
92
92
 
93
93
  type PendleGovernanceManagerConstructorParams =
94
94
  | [signer?: Signer]