diff --git a/.gitignore b/.gitignore index 85198aa..482352c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Address +/app/contract_address.ts + # Compiler files cache/ out/ diff --git a/README.md b/README.md index 022211a..7f86c36 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ This is so time gets set on the local chain, otherwise you will start at 0 time #### 3. 2. Point Metamask to Anvil network for local dev +#### 3. 3. Change `app/contract_address.ts` to match your program address if needed + ### 4. Local development requires mining blocks by hand Call `cast rpc anvil_mine` to mine next block, otherwise it wont ever progress and time "stands still" as far as the game is concerned diff --git a/app/.gitignore b/app/.gitignore index 7d093c3..fffc862 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,4 +1,7 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files + +# address +contract_address.ts # dependencies /node_modules diff --git a/app/contract_address.ts b/app/contract_address.ts new file mode 100644 index 0000000..712d987 --- /dev/null +++ b/app/contract_address.ts @@ -0,0 +1,4 @@ +const contractAddress = "0xbd06B0878888bf4c6895704fa603a5ADf7e65c66"; + + +export default contractAddress diff --git a/app/src/components/Counter.tsx b/app/src/components/Counter.tsx index 2e1af64..5a85ce7 100644 --- a/app/src/components/Counter.tsx +++ b/app/src/components/Counter.tsx @@ -37,8 +37,6 @@ export const toReadable = (value: bigint, applyTokenDivision?: boolean) => { { value: BigInt('1000000000000000000000000000000000000000000000000000000'), suffix: 'septendecillion' }, ]; - console.log(value) - for (let i = 0; i < suffixes.length; i++) { if (value < suffixes[i].value) { if (i == 0) { diff --git a/app/src/components/Header.tsx b/app/src/components/Header.tsx index 09a407e..c283eaf 100644 --- a/app/src/components/Header.tsx +++ b/app/src/components/Header.tsx @@ -25,7 +25,6 @@ const Header = () => { const perSecondParagraph = useMemo(() => { const perSecond = toReadable(army?.profit_per_second ?? BigInt(0)) - console.log(perSecond, army?.profit_per_second) return (isRegistered) ?

per second: {perSecond}

: null diff --git a/app/src/pages/index.tsx b/app/src/pages/index.tsx index d161e2a..6af5fad 100644 --- a/app/src/pages/index.tsx +++ b/app/src/pages/index.tsx @@ -26,7 +26,7 @@ const Home: NextPage = () => { ); diff --git a/app/src/providers/PlayerProvider.tsx b/app/src/providers/PlayerProvider.tsx index 9c51174..c139b5c 100644 --- a/app/src/providers/PlayerProvider.tsx +++ b/app/src/providers/PlayerProvider.tsx @@ -2,8 +2,8 @@ import React, { createContext, ReactNode, useCallback, useContext, useEffect } f import { useAccount, useReadContract, useWriteContract } from 'wagmi' import contractAbi from "../../../out/RaidGeld.sol/RaidGeld.json" import { parseEther } from 'viem' +import contractAddress from '../../contract_address' -const contractAddress = "0xbd06B0878888bf4c6895704fa603a5ADf7e65c66" const abi = contractAbi.abi export interface Player { diff --git a/app/src/styles/Home.module.css b/app/src/styles/Home.module.css index b58b128..8223cef 100644 --- a/app/src/styles/Home.module.css +++ b/app/src/styles/Home.module.css @@ -21,19 +21,10 @@ } .footer { - display: flex; - flex: 1; + margin-top: 2rem; padding: 2rem 0; border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; -} - -.footer a { - display: flex; - justify-content: center; - align-items: center; - flex-grow: 1; + text-align: center; } .title a { diff --git a/broadcast/RaidGeld.s.sol/84532/run-1729773387.json b/broadcast/RaidGeld.s.sol/84532/run-1729773387.json new file mode 100644 index 0000000..76fb6d9 --- /dev/null +++ b/broadcast/RaidGeld.s.sol/84532/run-1729773387.json @@ -0,0 +1,68 @@ +{ + "transactions": [ + { + "hash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", + "transactionType": "CREATE", + "contractName": "RaidGeld", + "contractAddress": "0x3572a80eb8df722c98814290f86be29141859660", + "function": null, + "arguments": null, + "transaction": { + "from": "0x3295cca2d922c637d35b258fc6c9c7e471803b45", + "gas": "0x1c9543", + "value": "0x0", + "input": "0x608060405234801561001057600080fd5b50336040518060400160405280600981526020016814985a590811d95b1960ba1b8152506040518060400160405280600481526020016311d1531160e21b8152508160039081610060919061019e565b50600461006d828261019e565b5050506001600160a01b03811661009e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100a7816100ad565b5061025c565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b634e487b7160e01b600052604160045260246000fd5b600181811c9082168061012957607f821691505b60208210810361014957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111561019957806000526020600020601f840160051c810160208510156101765750805b601f840160051c820191505b818110156101965760008155600101610182565b50505b505050565b81516001600160401b038111156101b7576101b76100ff565b6101cb816101c58454610115565b8461014f565b6020601f8211600181146101ff57600083156101e75750848201515b600019600385901b1c1916600184901b178455610196565b600084815260208120601f198516915b8281101561022f578785015182556020948501946001909201910161020f565b508482101561024d5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6117b08061026b6000396000f3fe6080604052600436106101395760003560e01c806370a08231116100ab578063a7db742f1161006f578063a7db742f14610530578063a9059cbb14610545578063c3c5a54714610565578063c861dcb1146105a0578063dd62ed3e146105b5578063f2fde38b146105fb576101b1565b806370a0823114610488578063715018a6146104be57806385ed706d146104d35780638da5cb5b146104f357806395d89b411461051b576101b1565b806323b872dd116100fd57806323b872dd14610296578063313ce567146102b65780633ccfd60b146102d257806347d1e46e146102e757806353d7da60146103015780635c12cd4b14610446576101b1565b806306fdde03146101f9578063095ea7b31461022457806313820ba71461025457806318160ddd146102775780631aa3a0081461028c576101b1565b366101b15760405162461bcd60e51b815260206004820152603f60248201527f4e6f20706c61696e2045746865722061636365707465642c207573652072656760448201527f697374657228292066756e6374696f6e20746f20636865636b20696e203a290060648201526084015b60405180910390fd5b60405162461bcd60e51b815260206004820152601a60248201527f4e6f2066616c6c6261636b2063616c6c7320616363657074656400000000000060448201526064016101a8565b34801561020557600080fd5b5061020e61061b565b60405161021b91906113e6565b60405180910390f35b34801561023057600080fd5b5061024461023f366004611450565b6106ad565b604051901515815260200161021b565b34801561026057600080fd5b50610269600f81565b60405190815260200161021b565b34801561028357600080fd5b50600254610269565b6102946106c7565b005b3480156102a257600080fd5b506102446102b136600461147a565b6108ab565b3480156102c257600080fd5b506040516004815260200161021b565b3480156102de57600080fd5b506102946108cf565b3480156102f357600080fd5b50610269652d79883d200081565b34801561030d57600080fd5b506103f061031c3660046114b7565b6040805160c081018252600060a082018181528252825160208082018552828252808401919091528351808201855282815283850152835190810190935280835260608201929092526080810191909152506001600160a01b0316600090815260076020908152604091829020825160c081018452815461ffff90811660a08301908152825284518085018652600184015482168152828501528451808501865260028401548216815282860152845193840190945260038201549093168252606083019190915260040154608082015290565b60405161021b9190600060a08201905061ffff83515116825261ffff60208401515116602083015261ffff60408401515116604083015261ffff6060840151511660608301526080830151608083015292915050565b34801561045257600080fd5b506104666104613660046114b7565b610913565b604080518251815260208084015190820152918101519082015260600161021b565b34801561049457600080fd5b506102696104a33660046114b7565b6001600160a01b031660009081526020819052604090205490565b3480156104ca57600080fd5b50610294610979565b3480156104df57600080fd5b506102946104ee3660046114d9565b61098d565b3480156104ff57600080fd5b506005546040516001600160a01b03909116815260200161021b565b34801561052757600080fd5b5061020e610c83565b34801561053c57600080fd5b50610294610c92565b34801561055157600080fd5b50610244610560366004611450565b610d5d565b34801561057157600080fd5b506102446105803660046114b7565b6001600160a01b0316600090815260066020526040902060010154151590565b3480156105ac57600080fd5b50610269610d6b565b3480156105c157600080fd5b506102696105d036600461151f565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b34801561060757600080fd5b506102946106163660046114b7565b610d85565b60606003805461062a90611552565b80601f016020809104026020016040519081016040528092919081815260200182805461065690611552565b80156106a35780601f10610678576101008083540402835291602001916106a3565b820191906000526020600020905b81548152906001019060200180831161068657829003601f168201915b5050505050905090565b6000336106bb818585610dc0565b60019150505b92915050565b33600090815260066020526040902060010154156107275760405162461bcd60e51b815260206004820181905260248201527f57686f6f70732c20706c6179657220616c726561647920657869737473203a2960448201526064016101a8565b652d79883d2000341461077c5760405162461bcd60e51b815260206004820152601760248201527f496e636f72726563742062757920696e20616d6f756e7400000000000000000060448201526064016101a8565b61079c3361078c6004600a611689565b610797906032611698565b610dd2565b60405180606001604052806004600a6107b59190611689565b6107c0906032611698565b815242602080830182905260409283019190915233600081815260068352838120855181558584015160018083019190915595850151600291820155845160c08101865260a0810183815281528551808601875283815281860190815286518087018852848152828801908152875180880189528581526060840190815260808401868152968652600790975296909320905151815461ffff1990811661ffff92831617835593515197820180548516988216989098179097559451519085018054831691871691909117905591515160038401805490931694169390931790559051600490910155565b6000336108b9858285610e0c565b6108c4858585610e8a565b506001949350505050565b6108d7610ee9565b6005546040516001600160a01b03909116904780156108fc02916000818181858888f19350505050158015610910573d6000803e3d6000fd5b50565b61093760405180606001604052806000815260200160008152602001600081525090565b506001600160a01b0316600090815260066020908152604091829020825160608101845281548152600182015492810192909252600201549181019190915290565b610981610ee9565b61098b6000610f16565b565b3360009081526006602052604081206001015490036109e85760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b60038260ff161115610a2b5760405162461bcd60e51b815260206004820152600c60248201526b155b9adb9bdddb881d5b9a5d60a21b60448201526064016101a8565b3360009081526007602052604081209060ff84168103610a515750805461ffff16610a9b565b8360ff16600103610a6b5750600181015461ffff16610a9b565b8360ff16600203610a855750600281015461ffff16610a9b565b8360ff16600303610a9b5750600381015461ffff165b6000610aa96004600a611689565b610ab4868487610f68565b610abe9190611698565b336000908152602081905260409020549091508110610b1f5760405162461bcd60e51b815260206004820181905260248201527f4e6f7420656e6f7567682047454c4420746f206164642074686973206d75636860448201526064016101a8565b610b2833611033565b610b3233826110cc565b8460ff16600003610b7457825484908490600090610b5590849061ffff166116af565b92506101000a81548161ffff021916908361ffff160217905550610c01565b8460ff16600103610b9a57600183018054859190600090610b5590849061ffff166116af565b8460ff16600203610bc057600283018054859190600090610b5590849061ffff166116af565b8460ff16600303610c0157600383018054859190600090610be690849061ffff166116af565b92506101000a81548161ffff021916908361ffff1602179055505b6040805160c081018252845461ffff90811660a08301908152825282516020818101855260018801548316825280840191909152835180820185526002880154831681528385015283519081019093526003860154168252606081019190915260048401546080820152610c7490611102565b83600401819055505050505050565b60606004805461062a90611552565b336000908152600660205260408120600101549003610ced5760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b33600090815260066020526040902060020154610d0c90600f906116c9565b421015610d545760405162461bcd60e51b81526020600482015260166024820152752a3934b2b21036b4b73a34b733903a37b79039b7b7b760511b60448201526064016101a8565b61098b33611033565b6000336106bb818585610e8a565b610d776004600a611689565b610d82906032611698565b81565b610d8d610ee9565b6001600160a01b038116610db757604051631e4fbdf760e01b8152600060048201526024016101a8565b61091081610f16565b610dcd83838360016111e7565b505050565b6001600160a01b038216610dfc5760405163ec442f0560e01b8152600060048201526024016101a8565b610e08600083836112bc565b5050565b6001600160a01b038381166000908152600160209081526040808320938616835292905220546000198114610e845781811015610e7557604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064016101a8565b610e84848484840360006111e7565b50505050565b6001600160a01b038316610eb457604051634b637e8f60e11b8152600060048201526024016101a8565b6001600160a01b038216610ede5760405163ec442f0560e01b8152600060048201526024016101a8565b610dcd8383836112bc565b6005546001600160a01b0316331461098b5760405163118cdaa760e01b81523360048201526024016101a8565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600060038460ff161115610fb75760405162461bcd60e51b8152602060048201526016602482015275139bc81b585d18da1a5b99c81d5b9a5d08199bdd5b9960521b60448201526064016101a8565b6000610fc48560016116dc565b610fd29060ff166026611698565b905080607360015b610fe486886116af565b61ffff16811015611027576064610ffb8386611698565b611005919061170b565b93508661ffff16811061101f5761101c84846116c9565b92505b600101610fda565b50909695505050505050565b6001600160a01b038116600090815260066020526040812060020154611059904261171f565b905060006110696004600a611689565b6001600160a01b038416600090815260076020526040902060040154611090908490611698565b61109a9190611698565b90506110a68382610dd2565b6001600160a01b0390921660009081526006602052604090204260028201559190915550565b6001600160a01b0382166110f657604051634b637e8f60e11b8152600060048201526024016101a8565b610e08826000836112bc565b80515160208201515160009161ffff16908290600a9061112390603d611732565b61112d9190611756565b61ffff1690506000600a856040015160000151600661114c9190611732565b611157906040611732565b6111619190611756565b61ffff1690506000600a80600a886060015160000151603d6111839190611732565b61118d9190611756565b611198906040611732565b6111a29190611756565b6111ad906043611732565b6111b79190611756565b61ffff16905080826111c985876116c9565b6111d391906116c9565b6111dd91906116c9565b9695505050505050565b6001600160a01b0384166112115760405163e602df0560e01b8152600060048201526024016101a8565b6001600160a01b03831661123b57604051634a1406b160e11b8152600060048201526024016101a8565b6001600160a01b0380851660009081526001602090815260408083209387168352929052208290558015610e8457826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516112ae91815260200190565b60405180910390a350505050565b6001600160a01b0383166112e75780600260008282546112dc91906116c9565b909155506113599050565b6001600160a01b0383166000908152602081905260409020548181101561133a5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016101a8565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b03821661137557600280548290039055611394565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516113d991815260200190565b60405180910390a3505050565b602081526000825180602084015260005b8181101561141457602081860181015160408684010152016113f7565b506000604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b038116811461144b57600080fd5b919050565b6000806040838503121561146357600080fd5b61146c83611434565b946020939093013593505050565b60008060006060848603121561148f57600080fd5b61149884611434565b92506114a660208501611434565b929592945050506040919091013590565b6000602082840312156114c957600080fd5b6114d282611434565b9392505050565b600080604083850312156114ec57600080fd5b823560ff811681146114fd57600080fd5b9150602083013561ffff8116811461151457600080fd5b809150509250929050565b6000806040838503121561153257600080fd5b61153b83611434565b915061154960208401611434565b90509250929050565b600181811c9082168061156657607f821691505b60208210810361158657634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b6001815b60018411156115dd578085048111156115c1576115c161158c565b60018416156115cf57908102905b60019390931c9280026115a6565b935093915050565b6000826115f4575060016106c1565b81611601575060006106c1565b816001811461161757600281146116215761163d565b60019150506106c1565b60ff8411156116325761163261158c565b50506001821b6106c1565b5060208310610133831016604e8410600b8410161715611660575081810a6106c1565b61166d60001984846115a2565b80600019048211156116815761168161158c565b029392505050565b60006114d260ff8416836115e5565b80820281158282048414176106c1576106c161158c565b61ffff81811683821601908111156106c1576106c161158c565b808201808211156106c1576106c161158c565b60ff81811683821601908111156106c1576106c161158c565b634e487b7160e01b600052601260045260246000fd5b60008261171a5761171a6116f5565b500490565b818103818111156106c1576106c161158c565b61ffff818116838216029081169081811461174f5761174f61158c565b5092915050565b600061ffff83168061176a5761176a6116f5565b8061ffff8416049150509291505056fea2646970667358221220313cc1e5e86bbb7d3c3ded2bd7a034c1d5ffeb6733733567e3c8f6b4f041b55864736f6c634300081c0033", + "nonce": "0x7", + "chainId": "0x14a34" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x1f8453", + "logs": [ + { + "address": "0x3572a80eb8df722c98814290f86be29141859660", + "topics": [ + "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000003295cca2d922c637d35b258fc6c9c7e471803b45" + ], + "data": "0x", + "blockHash": "0x9708bb1125f0e43dc1ffc445a674ebbf03f5e0c95bf8f803027fe0b8a64492dd", + "blockNumber": "0x1037033", + "transactionHash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", + "transactionIndex": "0x7", + "logIndex": "0x7", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000200000000000000800000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000100000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000010000000000000001000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", + "transactionIndex": "0x7", + "blockHash": "0x9708bb1125f0e43dc1ffc445a674ebbf03f5e0c95bf8f803027fe0b8a64492dd", + "blockNumber": "0x1037033", + "gasUsed": "0x15fe4c", + "effectiveGasPrice": "0x13b3f9", + "from": "0x3295cca2d922c637d35b258fc6c9c7e471803b45", + "to": null, + "contractAddress": "0x3572a80eb8df722c98814290f86be29141859660", + "l1BaseFeeScalar": "0x44d", + "l1BlobBaseFee": "0x1", + "l1BlobBaseFeeScalar": "0xa118b", + "l1Fee": "0x664fcff1ad", + "l1GasPrice": "0x17fe2ef41", + "l1GasUsed": "0xf211" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1729773387, + "chain": 84532, + "commit": "cb12c77" +} \ No newline at end of file diff --git a/broadcast/RaidGeld.s.sol/84532/run-latest.json b/broadcast/RaidGeld.s.sol/84532/run-latest.json index 0a1ec0c..76fb6d9 100644 --- a/broadcast/RaidGeld.s.sol/84532/run-latest.json +++ b/broadcast/RaidGeld.s.sol/84532/run-latest.json @@ -1,18 +1,18 @@ { "transactions": [ { - "hash": "0x9d39df7a47137565fa4dfd579c92e4a90db9ae54490630585e878d7313ce15a7", + "hash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", "transactionType": "CREATE", "contractName": "RaidGeld", - "contractAddress": "0xbd06b0878888bf4c6895704fa603a5adf7e65c66", + "contractAddress": "0x3572a80eb8df722c98814290f86be29141859660", "function": null, "arguments": null, "transaction": { "from": "0x3295cca2d922c637d35b258fc6c9c7e471803b45", - "gas": "0x1c21ce", + "gas": "0x1c9543", "value": "0x0", - "input": "0x608060405234801561001057600080fd5b50336040518060400160405280600981526020016814985a590811d95b1960ba1b8152506040518060400160405280600481526020016311d1531160e21b8152508160039081610060919061019e565b50600461006d828261019e565b5050506001600160a01b03811661009e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100a7816100ad565b5061025c565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b634e487b7160e01b600052604160045260246000fd5b600181811c9082168061012957607f821691505b60208210810361014957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111561019957806000526020600020601f840160051c810160208510156101765750805b601f840160051c820191505b818110156101965760008155600101610182565b50505b505050565b81516001600160401b038111156101b7576101b76100ff565b6101cb816101c58454610115565b8461014f565b6020601f8211600181146101ff57600083156101e75750848201515b600019600385901b1c1916600184901b178455610196565b600084815260208120601f198516915b8281101561022f578785015182556020948501946001909201910161020f565b508482101561024d5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6117478061026b6000396000f3fe6080604052600436106101395760003560e01c806370a08231116100ab578063a7db742f1161006f578063a7db742f14610530578063a9059cbb14610545578063c3c5a54714610565578063c861dcb1146105a0578063dd62ed3e146105b5578063f2fde38b146105fb576101b1565b806370a0823114610488578063715018a6146104be57806385ed706d146104d35780638da5cb5b146104f357806395d89b411461051b576101b1565b806323b872dd116100fd57806323b872dd14610296578063313ce567146102b65780633ccfd60b146102d257806347d1e46e146102e757806353d7da60146103015780635c12cd4b14610446576101b1565b806306fdde03146101f9578063095ea7b31461022457806313820ba71461025457806318160ddd146102775780631aa3a0081461028c576101b1565b366101b15760405162461bcd60e51b815260206004820152603f60248201527f4e6f20706c61696e2045746865722061636365707465642c207573652072656760448201527f697374657228292066756e6374696f6e20746f20636865636b20696e203a290060648201526084015b60405180910390fd5b60405162461bcd60e51b815260206004820152601a60248201527f4e6f2066616c6c6261636b2063616c6c7320616363657074656400000000000060448201526064016101a8565b34801561020557600080fd5b5061020e61061b565b60405161021b9190611396565b60405180910390f35b34801561023057600080fd5b5061024461023f366004611400565b6106ad565b604051901515815260200161021b565b34801561026057600080fd5b50610269600f81565b60405190815260200161021b565b34801561028357600080fd5b50600254610269565b6102946106c7565b005b3480156102a257600080fd5b506102446102b136600461142a565b6108ab565b3480156102c257600080fd5b506040516004815260200161021b565b3480156102de57600080fd5b506102946108cf565b3480156102f357600080fd5b50610269652d79883d200081565b34801561030d57600080fd5b506103f061031c366004611467565b6040805160c081018252600060a082018181528252825160208082018552828252808401919091528351808201855282815283850152835190810190935280835260608201929092526080810191909152506001600160a01b0316600090815260076020908152604091829020825160c081018452815461ffff90811660a08301908152825284518085018652600184015482168152828501528451808501865260028401548216815282860152845193840190945260038201549093168252606083019190915260040154608082015290565b60405161021b9190600060a08201905061ffff83515116825261ffff60208401515116602083015261ffff60408401515116604083015261ffff6060840151511660608301526080830151608083015292915050565b34801561045257600080fd5b50610466610461366004611467565b610913565b604080518251815260208084015190820152918101519082015260600161021b565b34801561049457600080fd5b506102696104a3366004611467565b6001600160a01b031660009081526020819052604090205490565b3480156104ca57600080fd5b50610294610979565b3480156104df57600080fd5b506102946104ee366004611489565b61098d565b3480156104ff57600080fd5b506005546040516001600160a01b03909116815260200161021b565b34801561052757600080fd5b5061020e610c64565b34801561053c57600080fd5b50610294610c73565b34801561055157600080fd5b50610244610560366004611400565b610daf565b34801561057157600080fd5b50610244610580366004611467565b6001600160a01b0316600090815260066020526040902060010154151590565b3480156105ac57600080fd5b50610269610dbd565b3480156105c157600080fd5b506102696105d03660046114cf565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b34801561060757600080fd5b50610294610616366004611467565b610dd7565b60606003805461062a90611502565b80601f016020809104026020016040519081016040528092919081815260200182805461065690611502565b80156106a35780601f10610678576101008083540402835291602001916106a3565b820191906000526020600020905b81548152906001019060200180831161068657829003601f168201915b5050505050905090565b6000336106bb818585610e12565b60019150505b92915050565b33600090815260066020526040902060010154156107275760405162461bcd60e51b815260206004820181905260248201527f57686f6f70732c20706c6179657220616c726561647920657869737473203a2960448201526064016101a8565b652d79883d2000341461077c5760405162461bcd60e51b815260206004820152601760248201527f496e636f72726563742062757920696e20616d6f756e7400000000000000000060448201526064016101a8565b61079c3361078c6004600a611639565b610797906032611648565b610e24565b60405180606001604052806004600a6107b59190611639565b6107c0906032611648565b815242602080830182905260409283019190915233600081815260068352838120855181558584015160018083019190915595850151600291820155845160c08101865260a0810183815281528551808601875283815281860190815286518087018852848152828801908152875180880189528581526060840190815260808401868152968652600790975296909320905151815461ffff1990811661ffff92831617835593515197820180548516988216989098179097559451519085018054831691871691909117905591515160038401805490931694169390931790559051600490910155565b6000336108b9858285610e5e565b6108c4858585610edc565b506001949350505050565b6108d7610f3b565b6005546040516001600160a01b03909116904780156108fc02916000818181858888f19350505050158015610910573d6000803e3d6000fd5b50565b61093760405180606001604052806000815260200160008152602001600081525090565b506001600160a01b0316600090815260066020908152604091829020825160608101845281548152600182015492810192909252600201549181019190915290565b610981610f3b565b61098b6000610f68565b565b3360009081526006602052604081206001015490036109e85760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b60038260ff161115610a2b5760405162461bcd60e51b815260206004820152600c60248201526b155b9adb9bdddb881d5b9a5d60a21b60448201526064016101a8565b3360009081526007602052604081209060ff84168103610a515750805461ffff16610a9b565b8360ff16600103610a6b5750600181015461ffff16610a9b565b8360ff16600203610a855750600281015461ffff16610a9b565b8360ff16600303610a9b5750600381015461ffff165b6000610aa8858386610fba565b336000908152602081905260409020549091508110610b095760405162461bcd60e51b815260206004820181905260248201527f4e6f7420656e6f7567682047454c4420746f206164642074686973206d75636860448201526064016101a8565b610b13338261107c565b8460ff16600003610b5557825484908490600090610b3690849061ffff1661165f565b92506101000a81548161ffff021916908361ffff160217905550610be2565b8460ff16600103610b7b57600183018054859190600090610b3690849061ffff1661165f565b8460ff16600203610ba157600283018054859190600090610b3690849061ffff1661165f565b8460ff16600303610be257600383018054859190600090610bc790849061ffff1661165f565b92506101000a81548161ffff021916908361ffff1602179055505b6040805160c081018252845461ffff90811660a08301908152825282516020818101855260018801548316825280840191909152835180820185526002880154831681528385015283519081019093526003860154168252606081019190915260048401546080820152610c55906110b2565b83600401819055505050505050565b60606004805461062a90611502565b336000908152600660205260408120600101549003610cce5760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b33600090815260066020526040902060020154610ced90600f90611679565b421015610d355760405162461bcd60e51b81526020600482015260166024820152752a3934b2b21036b4b73a34b733903a37b79039b7b7b760511b60448201526064016101a8565b33600090815260066020526040812060020154610d52904261168c565b90506000610d626004600a611639565b33600090815260076020526040902060040154610d80908490611648565b610d8a9190611648565b9050610d963382610e24565b3360009081526006602052604090204260028201555550565b6000336106bb818585610edc565b610dc96004600a611639565b610dd4906032611648565b81565b610ddf610f3b565b6001600160a01b038116610e0957604051631e4fbdf760e01b8152600060048201526024016101a8565b61091081610f68565b610e1f8383836001611197565b505050565b6001600160a01b038216610e4e5760405163ec442f0560e01b8152600060048201526024016101a8565b610e5a6000838361126c565b5050565b6001600160a01b038381166000908152600160209081526040808320938616835292905220546000198114610ed65781811015610ec757604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064016101a8565b610ed684848484036000611197565b50505050565b6001600160a01b038316610f0657604051634b637e8f60e11b8152600060048201526024016101a8565b6001600160a01b038216610f305760405163ec442f0560e01b8152600060048201526024016101a8565b610e1f83838361126c565b6005546001600160a01b0316331461098b5760405163118cdaa760e01b81523360048201526024016101a8565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600060038460ff1611156110095760405162461bcd60e51b8152602060048201526016602482015275139bc81b585d18da1a5b99c81d5b9a5d08199bdd5b9960521b60448201526064016101a8565b600061101960ff86166026611648565b90506000607360015b61102c868861165f565b61ffff168110156110705760646110438386611648565b61104d91906116b5565b93508661ffff16811115611068576110658484611679565b92505b600101611022565b50909695505050505050565b6001600160a01b0382166110a657604051634b637e8f60e11b8152600060048201526024016101a8565b610e5a8260008361126c565b80515160208201515160009161ffff16908290600a906110d390603d6116c9565b6110dd91906116ed565b61ffff1690506000600a85604001516000015160066110fc91906116c9565b6111079060406116c9565b61111191906116ed565b61ffff1690506000600a80600a886060015160000151603d61113391906116c9565b61113d91906116ed565b6111489060406116c9565b61115291906116ed565b61115d9060436116c9565b61116791906116ed565b61ffff16905080826111798587611679565b6111839190611679565b61118d9190611679565b9695505050505050565b6001600160a01b0384166111c15760405163e602df0560e01b8152600060048201526024016101a8565b6001600160a01b0383166111eb57604051634a1406b160e11b8152600060048201526024016101a8565b6001600160a01b0380851660009081526001602090815260408083209387168352929052208290558015610ed657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161125e91815260200190565b60405180910390a350505050565b6001600160a01b03831661129757806002600082825461128c9190611679565b909155506113099050565b6001600160a01b038316600090815260208190526040902054818110156112ea5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016101a8565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b03821661132557600280548290039055611344565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161138991815260200190565b60405180910390a3505050565b602081526000825180602084015260005b818110156113c457602081860181015160408684010152016113a7565b506000604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146113fb57600080fd5b919050565b6000806040838503121561141357600080fd5b61141c836113e4565b946020939093013593505050565b60008060006060848603121561143f57600080fd5b611448846113e4565b9250611456602085016113e4565b929592945050506040919091013590565b60006020828403121561147957600080fd5b611482826113e4565b9392505050565b6000806040838503121561149c57600080fd5b823560ff811681146114ad57600080fd5b9150602083013561ffff811681146114c457600080fd5b809150509250929050565b600080604083850312156114e257600080fd5b6114eb836113e4565b91506114f9602084016113e4565b90509250929050565b600181811c9082168061151657607f821691505b60208210810361153657634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b6001815b600184111561158d578085048111156115715761157161153c565b600184161561157f57908102905b60019390931c928002611556565b935093915050565b6000826115a4575060016106c1565b816115b1575060006106c1565b81600181146115c757600281146115d1576115ed565b60019150506106c1565b60ff8411156115e2576115e261153c565b50506001821b6106c1565b5060208310610133831016604e8410600b8410161715611610575081810a6106c1565b61161d6000198484611552565b80600019048211156116315761163161153c565b029392505050565b600061148260ff841683611595565b80820281158282048414176106c1576106c161153c565b61ffff81811683821601908111156106c1576106c161153c565b808201808211156106c1576106c161153c565b818103818111156106c1576106c161153c565b634e487b7160e01b600052601260045260246000fd5b6000826116c4576116c461169f565b500490565b61ffff81811683821602908116908181146116e6576116e661153c565b5092915050565b600061ffff8316806117015761170161169f565b8061ffff8416049150509291505056fea2646970667358221220061f190eb2f6fddd15161a6db096edf6e4a5b06217867d89e6792c032ada56e764736f6c634300081c0033", - "nonce": "0x0", + "input": "0x608060405234801561001057600080fd5b50336040518060400160405280600981526020016814985a590811d95b1960ba1b8152506040518060400160405280600481526020016311d1531160e21b8152508160039081610060919061019e565b50600461006d828261019e565b5050506001600160a01b03811661009e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100a7816100ad565b5061025c565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b634e487b7160e01b600052604160045260246000fd5b600181811c9082168061012957607f821691505b60208210810361014957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111561019957806000526020600020601f840160051c810160208510156101765750805b601f840160051c820191505b818110156101965760008155600101610182565b50505b505050565b81516001600160401b038111156101b7576101b76100ff565b6101cb816101c58454610115565b8461014f565b6020601f8211600181146101ff57600083156101e75750848201515b600019600385901b1c1916600184901b178455610196565b600084815260208120601f198516915b8281101561022f578785015182556020948501946001909201910161020f565b508482101561024d5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6117b08061026b6000396000f3fe6080604052600436106101395760003560e01c806370a08231116100ab578063a7db742f1161006f578063a7db742f14610530578063a9059cbb14610545578063c3c5a54714610565578063c861dcb1146105a0578063dd62ed3e146105b5578063f2fde38b146105fb576101b1565b806370a0823114610488578063715018a6146104be57806385ed706d146104d35780638da5cb5b146104f357806395d89b411461051b576101b1565b806323b872dd116100fd57806323b872dd14610296578063313ce567146102b65780633ccfd60b146102d257806347d1e46e146102e757806353d7da60146103015780635c12cd4b14610446576101b1565b806306fdde03146101f9578063095ea7b31461022457806313820ba71461025457806318160ddd146102775780631aa3a0081461028c576101b1565b366101b15760405162461bcd60e51b815260206004820152603f60248201527f4e6f20706c61696e2045746865722061636365707465642c207573652072656760448201527f697374657228292066756e6374696f6e20746f20636865636b20696e203a290060648201526084015b60405180910390fd5b60405162461bcd60e51b815260206004820152601a60248201527f4e6f2066616c6c6261636b2063616c6c7320616363657074656400000000000060448201526064016101a8565b34801561020557600080fd5b5061020e61061b565b60405161021b91906113e6565b60405180910390f35b34801561023057600080fd5b5061024461023f366004611450565b6106ad565b604051901515815260200161021b565b34801561026057600080fd5b50610269600f81565b60405190815260200161021b565b34801561028357600080fd5b50600254610269565b6102946106c7565b005b3480156102a257600080fd5b506102446102b136600461147a565b6108ab565b3480156102c257600080fd5b506040516004815260200161021b565b3480156102de57600080fd5b506102946108cf565b3480156102f357600080fd5b50610269652d79883d200081565b34801561030d57600080fd5b506103f061031c3660046114b7565b6040805160c081018252600060a082018181528252825160208082018552828252808401919091528351808201855282815283850152835190810190935280835260608201929092526080810191909152506001600160a01b0316600090815260076020908152604091829020825160c081018452815461ffff90811660a08301908152825284518085018652600184015482168152828501528451808501865260028401548216815282860152845193840190945260038201549093168252606083019190915260040154608082015290565b60405161021b9190600060a08201905061ffff83515116825261ffff60208401515116602083015261ffff60408401515116604083015261ffff6060840151511660608301526080830151608083015292915050565b34801561045257600080fd5b506104666104613660046114b7565b610913565b604080518251815260208084015190820152918101519082015260600161021b565b34801561049457600080fd5b506102696104a33660046114b7565b6001600160a01b031660009081526020819052604090205490565b3480156104ca57600080fd5b50610294610979565b3480156104df57600080fd5b506102946104ee3660046114d9565b61098d565b3480156104ff57600080fd5b506005546040516001600160a01b03909116815260200161021b565b34801561052757600080fd5b5061020e610c83565b34801561053c57600080fd5b50610294610c92565b34801561055157600080fd5b50610244610560366004611450565b610d5d565b34801561057157600080fd5b506102446105803660046114b7565b6001600160a01b0316600090815260066020526040902060010154151590565b3480156105ac57600080fd5b50610269610d6b565b3480156105c157600080fd5b506102696105d036600461151f565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b34801561060757600080fd5b506102946106163660046114b7565b610d85565b60606003805461062a90611552565b80601f016020809104026020016040519081016040528092919081815260200182805461065690611552565b80156106a35780601f10610678576101008083540402835291602001916106a3565b820191906000526020600020905b81548152906001019060200180831161068657829003601f168201915b5050505050905090565b6000336106bb818585610dc0565b60019150505b92915050565b33600090815260066020526040902060010154156107275760405162461bcd60e51b815260206004820181905260248201527f57686f6f70732c20706c6179657220616c726561647920657869737473203a2960448201526064016101a8565b652d79883d2000341461077c5760405162461bcd60e51b815260206004820152601760248201527f496e636f72726563742062757920696e20616d6f756e7400000000000000000060448201526064016101a8565b61079c3361078c6004600a611689565b610797906032611698565b610dd2565b60405180606001604052806004600a6107b59190611689565b6107c0906032611698565b815242602080830182905260409283019190915233600081815260068352838120855181558584015160018083019190915595850151600291820155845160c08101865260a0810183815281528551808601875283815281860190815286518087018852848152828801908152875180880189528581526060840190815260808401868152968652600790975296909320905151815461ffff1990811661ffff92831617835593515197820180548516988216989098179097559451519085018054831691871691909117905591515160038401805490931694169390931790559051600490910155565b6000336108b9858285610e0c565b6108c4858585610e8a565b506001949350505050565b6108d7610ee9565b6005546040516001600160a01b03909116904780156108fc02916000818181858888f19350505050158015610910573d6000803e3d6000fd5b50565b61093760405180606001604052806000815260200160008152602001600081525090565b506001600160a01b0316600090815260066020908152604091829020825160608101845281548152600182015492810192909252600201549181019190915290565b610981610ee9565b61098b6000610f16565b565b3360009081526006602052604081206001015490036109e85760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b60038260ff161115610a2b5760405162461bcd60e51b815260206004820152600c60248201526b155b9adb9bdddb881d5b9a5d60a21b60448201526064016101a8565b3360009081526007602052604081209060ff84168103610a515750805461ffff16610a9b565b8360ff16600103610a6b5750600181015461ffff16610a9b565b8360ff16600203610a855750600281015461ffff16610a9b565b8360ff16600303610a9b5750600381015461ffff165b6000610aa96004600a611689565b610ab4868487610f68565b610abe9190611698565b336000908152602081905260409020549091508110610b1f5760405162461bcd60e51b815260206004820181905260248201527f4e6f7420656e6f7567682047454c4420746f206164642074686973206d75636860448201526064016101a8565b610b2833611033565b610b3233826110cc565b8460ff16600003610b7457825484908490600090610b5590849061ffff166116af565b92506101000a81548161ffff021916908361ffff160217905550610c01565b8460ff16600103610b9a57600183018054859190600090610b5590849061ffff166116af565b8460ff16600203610bc057600283018054859190600090610b5590849061ffff166116af565b8460ff16600303610c0157600383018054859190600090610be690849061ffff166116af565b92506101000a81548161ffff021916908361ffff1602179055505b6040805160c081018252845461ffff90811660a08301908152825282516020818101855260018801548316825280840191909152835180820185526002880154831681528385015283519081019093526003860154168252606081019190915260048401546080820152610c7490611102565b83600401819055505050505050565b60606004805461062a90611552565b336000908152600660205260408120600101549003610ced5760405162461bcd60e51b81526020600482015260176024820152762737ba1030b71034b734ba34b0ba32b210383630bcb2b960491b60448201526064016101a8565b33600090815260066020526040902060020154610d0c90600f906116c9565b421015610d545760405162461bcd60e51b81526020600482015260166024820152752a3934b2b21036b4b73a34b733903a37b79039b7b7b760511b60448201526064016101a8565b61098b33611033565b6000336106bb818585610e8a565b610d776004600a611689565b610d82906032611698565b81565b610d8d610ee9565b6001600160a01b038116610db757604051631e4fbdf760e01b8152600060048201526024016101a8565b61091081610f16565b610dcd83838360016111e7565b505050565b6001600160a01b038216610dfc5760405163ec442f0560e01b8152600060048201526024016101a8565b610e08600083836112bc565b5050565b6001600160a01b038381166000908152600160209081526040808320938616835292905220546000198114610e845781811015610e7557604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064016101a8565b610e84848484840360006111e7565b50505050565b6001600160a01b038316610eb457604051634b637e8f60e11b8152600060048201526024016101a8565b6001600160a01b038216610ede5760405163ec442f0560e01b8152600060048201526024016101a8565b610dcd8383836112bc565b6005546001600160a01b0316331461098b5760405163118cdaa760e01b81523360048201526024016101a8565b600580546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600060038460ff161115610fb75760405162461bcd60e51b8152602060048201526016602482015275139bc81b585d18da1a5b99c81d5b9a5d08199bdd5b9960521b60448201526064016101a8565b6000610fc48560016116dc565b610fd29060ff166026611698565b905080607360015b610fe486886116af565b61ffff16811015611027576064610ffb8386611698565b611005919061170b565b93508661ffff16811061101f5761101c84846116c9565b92505b600101610fda565b50909695505050505050565b6001600160a01b038116600090815260066020526040812060020154611059904261171f565b905060006110696004600a611689565b6001600160a01b038416600090815260076020526040902060040154611090908490611698565b61109a9190611698565b90506110a68382610dd2565b6001600160a01b0390921660009081526006602052604090204260028201559190915550565b6001600160a01b0382166110f657604051634b637e8f60e11b8152600060048201526024016101a8565b610e08826000836112bc565b80515160208201515160009161ffff16908290600a9061112390603d611732565b61112d9190611756565b61ffff1690506000600a856040015160000151600661114c9190611732565b611157906040611732565b6111619190611756565b61ffff1690506000600a80600a886060015160000151603d6111839190611732565b61118d9190611756565b611198906040611732565b6111a29190611756565b6111ad906043611732565b6111b79190611756565b61ffff16905080826111c985876116c9565b6111d391906116c9565b6111dd91906116c9565b9695505050505050565b6001600160a01b0384166112115760405163e602df0560e01b8152600060048201526024016101a8565b6001600160a01b03831661123b57604051634a1406b160e11b8152600060048201526024016101a8565b6001600160a01b0380851660009081526001602090815260408083209387168352929052208290558015610e8457826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516112ae91815260200190565b60405180910390a350505050565b6001600160a01b0383166112e75780600260008282546112dc91906116c9565b909155506113599050565b6001600160a01b0383166000908152602081905260409020548181101561133a5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016101a8565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b03821661137557600280548290039055611394565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516113d991815260200190565b60405180910390a3505050565b602081526000825180602084015260005b8181101561141457602081860181015160408684010152016113f7565b506000604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b038116811461144b57600080fd5b919050565b6000806040838503121561146357600080fd5b61146c83611434565b946020939093013593505050565b60008060006060848603121561148f57600080fd5b61149884611434565b92506114a660208501611434565b929592945050506040919091013590565b6000602082840312156114c957600080fd5b6114d282611434565b9392505050565b600080604083850312156114ec57600080fd5b823560ff811681146114fd57600080fd5b9150602083013561ffff8116811461151457600080fd5b809150509250929050565b6000806040838503121561153257600080fd5b61153b83611434565b915061154960208401611434565b90509250929050565b600181811c9082168061156657607f821691505b60208210810361158657634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b6001815b60018411156115dd578085048111156115c1576115c161158c565b60018416156115cf57908102905b60019390931c9280026115a6565b935093915050565b6000826115f4575060016106c1565b81611601575060006106c1565b816001811461161757600281146116215761163d565b60019150506106c1565b60ff8411156116325761163261158c565b50506001821b6106c1565b5060208310610133831016604e8410600b8410161715611660575081810a6106c1565b61166d60001984846115a2565b80600019048211156116815761168161158c565b029392505050565b60006114d260ff8416836115e5565b80820281158282048414176106c1576106c161158c565b61ffff81811683821601908111156106c1576106c161158c565b808201808211156106c1576106c161158c565b60ff81811683821601908111156106c1576106c161158c565b634e487b7160e01b600052601260045260246000fd5b60008261171a5761171a6116f5565b500490565b818103818111156106c1576106c161158c565b61ffff818116838216029081169081811461174f5761174f61158c565b5092915050565b600061ffff83168061176a5761176a6116f5565b8061ffff8416049150509291505056fea2646970667358221220313cc1e5e86bbb7d3c3ded2bd7a034c1d5ffeb6733733567e3c8f6b4f041b55864736f6c634300081c0033", + "nonce": "0x7", "chainId": "0x14a34" }, "additionalContracts": [], @@ -22,47 +22,47 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x3dfdcd", + "cumulativeGasUsed": "0x1f8453", "logs": [ { - "address": "0xbd06b0878888bf4c6895704fa603a5adf7e65c66", + "address": "0x3572a80eb8df722c98814290f86be29141859660", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000003295cca2d922c637d35b258fc6c9c7e471803b45" ], "data": "0x", - "blockHash": "0xe82c2fd01054c42c857cd623a9f0bd0486c97c47b55d8504798371063e4a1614", - "blockNumber": "0x102da20", - "transactionHash": "0x9d39df7a47137565fa4dfd579c92e4a90db9ae54490630585e878d7313ce15a7", - "transactionIndex": "0xe", - "logIndex": "0x19", + "blockHash": "0x9708bb1125f0e43dc1ffc445a674ebbf03f5e0c95bf8f803027fe0b8a64492dd", + "blockNumber": "0x1037033", + "transactionHash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", + "transactionIndex": "0x7", + "logIndex": "0x7", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000000000000000000800008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000100000000000000020000000000000000000800000000000004000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000010000000000000001000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", + "logsBloom": "0x00000000000000000000000000000000000200000000000000800000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000100000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000010000000000000001000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0x9d39df7a47137565fa4dfd579c92e4a90db9ae54490630585e878d7313ce15a7", - "transactionIndex": "0xe", - "blockHash": "0xe82c2fd01054c42c857cd623a9f0bd0486c97c47b55d8504798371063e4a1614", - "blockNumber": "0x102da20", - "gasUsed": "0x15a576", - "effectiveGasPrice": "0xa0f5edca", + "transactionHash": "0xd4fa77c04f44634b166b7ae80cabe097cf35d8d38ea569e499b73310623501d9", + "transactionIndex": "0x7", + "blockHash": "0x9708bb1125f0e43dc1ffc445a674ebbf03f5e0c95bf8f803027fe0b8a64492dd", + "blockNumber": "0x1037033", + "gasUsed": "0x15fe4c", + "effectiveGasPrice": "0x13b3f9", "from": "0x3295cca2d922c637d35b258fc6c9c7e471803b45", "to": null, - "contractAddress": "0xbd06b0878888bf4c6895704fa603a5adf7e65c66", + "contractAddress": "0x3572a80eb8df722c98814290f86be29141859660", "l1BaseFeeScalar": "0x44d", - "l1BlobBaseFee": "0x3", + "l1BlobBaseFee": "0x1", "l1BlobBaseFeeScalar": "0xa118b", - "l1Fee": "0x22c9f9127e", - "l1GasPrice": "0x84641d16", - "l1GasUsed": "0xeeab" + "l1Fee": "0x664fcff1ad", + "l1GasPrice": "0x17fe2ef41", + "l1GasUsed": "0xf211" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1729696549, + "timestamp": 1729773387, "chain": 84532, - "commit": "830beab" + "commit": "cb12c77" } \ No newline at end of file diff --git a/test/RaidGeldUtils.t.sol b/test/RaidGeldUtils.t.sol index 4ac0f19..88771fb 100644 --- a/test/RaidGeldUtils.t.sol +++ b/test/RaidGeldUtils.t.sol @@ -6,7 +6,7 @@ import {Army, Raider} from "../src/RaidGeld.sol"; import "../src/RaidGeldUtils.sol"; contract raid_geldTest is Test { - function test_0_unit_price() public { + function test_0_unit_price() pure public { // buying 1 unit of moloch_denier uint256 basePriceMolochDenier = RaidGeldUtils.calculateUnitPrice(0, 0, 1); assertEq(basePriceMolochDenier, RaidGeldUtils.BASE_PRICE);