Łukasz Magiera
e91ee9f62a
Fix lint
2020-09-09 12:18:02 +02:00
Łukasz Magiera
f695c0c164
gas: Add tests to median premium math
2020-09-09 12:14:46 +02:00
Łukasz Magiera
2aba16e2c9
gas: Fix median calc
2020-09-09 11:41:02 +02:00
Łukasz Magiera
38863d3025
build: Separate API versions per node type
2020-09-08 21:14:53 +02:00
Aayush Rajasekaran
6eea5dd109
Update to specs 0.9.7 and markets 0.6.0
2020-09-07 17:11:32 -04:00
hannahhoward
2db4b57013
feat(markets): upgrade markets 0.6.0
2020-09-07 15:48:42 -04:00
Aayush Rajasekaran
39755a294a
Update to specs v0.9.6
2020-09-07 15:48:41 -04:00
Aayush Rajasekaran
d0ccb54aba
Msig: Add RPC endpoints to propose, approve, or cancel adding signers
2020-09-06 01:52:30 -04:00
Aayush Rajasekaran
aaad01105e
Msig: Introduce an API & CLI to calculate amount that vests between 2 tipsets
2020-09-05 23:42:31 -04:00
Łukasz Magiera
c767e5ebed
Merge pull request #3547 from filecoin-project/feat/paych-status-addr
...
paych: get available funds by address or by from/to
2020-09-05 21:55:08 +02:00
Jakub Sztandera
2adb80729b
Add additional info about gas premium
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-09-05 15:17:55 +02:00
Jakub Sztandera
114c0ea85c
Fix GasPremium capping logic
...
Cap it just to FeeCap, there is no reason to cap it proportionally
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-09-04 15:42:12 +02:00
Dirk McCormick
51ef39592f
feat: paych - get available funds by address or by from/to
2020-09-04 13:44:09 +02:00
Łukasz Magiera
d81feb05d1
Merge pull request #3527 from filecoin-project/feat/watch-option-miner-storage-deals-list
...
Add watch option to storage-deals list
2020-09-04 04:13:01 +02:00
Łukasz Magiera
ce8bcf7932
Add agent flag to net peers
2020-09-04 02:00:53 +02:00
Whyrusleeping
021f4a881c
Merge pull request #3448 from filecoin-project/feat/paych-get-avail-funds
...
paych: Add PaychAvailableFunds API method
2020-09-03 15:26:25 -07:00
Łukasz Magiera
86cb865fdd
Make chain export ~1000x times faster
2020-09-03 21:56:35 +02:00
Ingar Shu
1608cd2d53
Add watch option to "lotus-miner storage-deals list"
2020-09-03 10:14:30 -07:00
Łukasz Magiera
10acc04ba5
Merge pull request #3497 from filecoin-project/feat/bandwidth-tracking
...
add apis and command to inspect bandwidth usage
2020-09-03 14:37:54 +02:00
Jakub Sztandera
d35b273dbf
Cap fees to reasonable level by default
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-09-03 13:49:50 +02:00
whyrusleeping
0e39d62c9d
Appease the CI overlords
2020-09-02 16:31:41 -07:00
whyrusleeping
a59dadccc9
add apis and command to inspect bandwidth usage
2020-09-02 15:25:53 -07:00
Łukasz Magiera
5aeabe39b5
Merge pull request #3456 from filecoin-project/misc/account-for-premium
...
Account for GasPremium in GasEstimateFeeCap
2020-09-02 18:20:32 +02:00
whyrusleeping
09ebd1a557
allow exporting a number of recent chain state trees
2020-09-02 17:15:10 +02:00
Dirk McCormick
2c98bf0cc7
feat: PaychAvailableFunds API method
2020-09-02 14:31:32 +02:00
Jakub Sztandera
72fb6afae2
Account for GasPremium in GasEstimateFeeCap
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-09-01 20:35:29 +02:00
Aayush Rajasekaran
cfe5134375
Use Sign() to check zero-equality
2020-08-31 18:53:14 -04:00
Jakub Sztandera
56235aee90
Fix GasEstimateGasPremium when there is only one message on chain
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-31 18:12:06 +02:00
Łukasz Magiera
953effcc43
Merge pull request #3350 from filecoin-project/fix/some-fsm-issues
...
Fix some fsm issues
2020-08-29 02:16:59 +02:00
Łukasz Magiera
16f0daab90
Merge pull request #3379 from filecoin-project/feat/add-list-deals-watch-option
...
Add watch option to list-deals
2020-08-28 22:33:48 +02:00
Łukasz Magiera
4bcc71c68f
Merge pull request #3197 from filecoin-project/fix/paych-spendable-submit-voucher
...
paych: fix issue where `voucher spendable` fails for submitted vouchers
2020-08-28 22:05:04 +02:00
Ingar Shu
a4ded8c2b9
Add watch option to list-deals
2020-08-28 10:40:27 -07:00
Łukasz Magiera
df635579c4
storagefsm: Handle sectors with expired deals better
2020-08-27 13:51:38 +02:00
Łukasz Magiera
99ecef89b8
gofmt
2020-08-27 12:41:24 +02:00
Łukasz Magiera
e236173417
miner: Print (pre)commit message cids in sector status
2020-08-27 12:40:19 +02:00
hannahhoward
1cd49cec39
fix(client): insure cancelled context avoids lock
2020-08-26 10:59:07 -07:00
hannahhoward
10c1399474
fix(retrieval): resolve retrieval close event panic
...
Refactor ClientRetrieve command to remove the possibility of a send on close channel race condition
2020-08-26 10:48:23 -07:00
frrist
0d61e0d717
refactor(ctx): update to latest go-jsonrpc
2020-08-25 15:20:41 -07:00
Dirk McCormick
340d11be38
fix: check voucher spendable should take into account submitted vouchers
2020-08-25 12:51:29 +02:00
Łukasz Magiera
2f6f978cd5
Merge pull request #3111 from filecoin-project/fix/paych-addvchr-chk
...
paych: check To address is owned by wallet for inbound channels
2020-08-24 23:02:10 +02:00
Łukasz Magiera
ae19b8ebfd
Merge pull request #3146 from filecoin-project/feat/paych-cli-voucher-tests
...
paych: modify `lotus paych voucher best-spendable` to output _all_ best vouchers
2020-08-24 22:59:20 +02:00
Łukasz Magiera
9bc48a8867
Merge pull request #3198 from filecoin-project/fix/retrieval-streaming-cleanup
...
Retrieval CLI fixes
2020-08-24 22:47:09 +02:00
Łukasz Magiera
a236957538
Merge pull request #3232 from filecoin-project/asr/marked-for-upgrade
...
Indicate whether a sector has been marked for upgrade
2020-08-22 21:48:45 +02:00
Łukasz Magiera
0806fd651a
Merge pull request #3183 from filecoin-project/steb/lint-all
...
Lint everything
2020-08-22 21:47:41 +02:00
vyzo
817358f1bb
better semantics for mpool clear local argument
...
local messages should be kept unless the parameter is true
2020-08-21 23:48:35 +03:00
vyzo
087955e927
add localonly option to MpoolClear
2020-08-21 23:32:41 +03:00
vyzo
3027283756
add MpoolClear api
2020-08-21 23:32:41 +03:00
Aayush Rajasekaran
984e52acbc
Indicate whether a sector has been marked for upgrade
2020-08-21 15:53:39 -04:00
Steven Allen
5733c71c50
Lint everything
...
We were ignoring quite a few error cases, and had one case where we weren't
actually updating state where we wanted to. Unfortunately, if the linter doesn't
pass, nobody has any reason to actually check lint failures in CI.
There are three remaining XXXs marked in the code for lint.
2020-08-20 20:46:36 -07:00
Jakub Sztandera
d08458a03c
s/From/To
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-21 00:16:48 +02:00
Whyrusleeping
af3fe206d6
Merge pull request #3122 from filecoin-project/feat/cmd-improvements
...
sorted deal listings
2020-08-20 13:29:01 -07:00
Jakub Sztandera
0ada762971
Compensate for DestoryActor in gas limit estimation
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-20 21:14:12 +02:00
Ingar Shu
c02c69a8d6
Check deal id when emitting events
...
Make sure to unsubscribe from retrieval events
2020-08-20 09:16:18 -07:00
hannahhoward
0086f76a90
feat(lotus-miner): add data transfer list cmd
...
add equivalent command to list data transfers on miner side, extract common functionality for reuse
2020-08-20 01:35:48 -07:00
Łukasz Magiera
71cf358ee3
Fix windowpost test
2020-08-20 01:18:01 +02:00
Łukasz Magiera
3ed3e4f5d7
Merge pull request #3162 from filecoin-project/feat/data-transfer-status
...
Find out what's up with data transfers!
2020-08-19 23:30:44 +02:00
whyrusleeping
621d675938
fixup tests
2020-08-19 13:32:53 -07:00
whyrusleeping
2ab202a03d
fixup ID allocation and a few other things
2020-08-19 12:54:33 -07:00
Sami Mäkelä
74f35c88ad
checking verifreg handling
2020-08-19 15:27:50 +03:00
hannahhoward
66ac7c195c
feat(cli): add updates to data transfer
...
Add an API to get data transfer updates and add modify the CLI to be an
ongoing monitoring plan
2020-08-18 17:36:29 -07:00
hannahhoward
f511cc188a
feat(cli): data transfer command
...
add command to monitor data transfers
2020-08-18 16:26:21 -07:00
Łukasz Magiera
19be380b53
Merge pull request #3152 from filecoin-project/fix/chainwatch/rpc-peer-id-bug
...
fix(api): Filter malformed peer ID before RPC marshaling
2020-08-18 23:07:55 +02:00
Mike Greenberg
8675ca561d
fix(api): Filter malformed peer ID before RPC marshaling
2020-08-18 16:29:21 -04:00
Łukasz Magiera
3fd4921ea3
Merge pull request #3147 from filecoin-project/feat/fsm-seal-limits
...
fsm: Config for limiting max sealing sectors
2020-08-18 21:54:41 +02:00
Łukasz Magiera
2570712a29
Merge pull request #3135 from filecoin-project/feat/genesis-block-linkage
...
proper genesis block history
2020-08-18 19:28:55 +02:00
Łukasz Magiera
65ffde9e4b
fsm: Config for max WaitDeals sectors
2020-08-18 16:20:31 +02:00
Łukasz Magiera
4cd56b3b99
impl: wait in ClientRetrieve
2020-08-18 15:27:56 +02:00
Aayush Rajasekaran
add56c8b81
Create eventless version of ClientRetrieve
2020-08-18 05:49:56 -04:00
whyrusleeping
13e5b72cdb
proper genesis block history
...
Commit hash originally stamped into the ethereum blockchain:
https://etherscan.io/tx/0xe8f51c9eefb682cd866f059462577b6dd3d2685ff4b6437f6c940ff4f4aaf067
2020-08-17 21:13:43 -07:00
Łukasz Magiera
127d6d0576
cli: Fix net reachability
2020-08-18 03:12:50 +02:00
whyrusleeping
f05cff478f
sorted deal listings
2020-08-17 14:48:49 -07:00
Ingar Shu
cb71386ed9
Don't send finishing event if there is no error
2020-08-17 14:39:08 -07:00
Ingar Shu
7fbbf23e5a
Initialize FundsSpent to zero in RetrievalEvent
2020-08-17 14:39:08 -07:00
Dirk McCormick
b25215e31b
fix: paych add voucher - for inbound voucher check channel To address is owned by wallet
2020-08-17 11:13:13 -04:00
Raúl Kripalani
862bafc63a
fix lint errors.
2020-08-17 14:39:33 +01:00
Raúl Kripalani
efdc428d5d
keep storage-fsm (renamed to storage-sealing) and sector-storage in extern.
2020-08-17 14:26:18 +01:00
Raúl Kripalani
3c17cd655e
integrate extern/sector-storage into lotus proper.
2020-08-16 11:09:58 +01:00
Raúl Kripalani
fb0ccc9260
integrate extern/storage-fsm into lotus proper.
2020-08-16 10:42:13 +01:00
Łukasz Magiera
45476a208e
Merge pull request #3053 from filecoin-project/feat/worker-addpiece2
...
Support AddPiece on workers
2020-08-14 23:50:17 +02:00
Aayush Rajasekaran
0359a458e4
Include more info in StateCirculatingSupply
2020-08-14 16:53:30 -04:00
Łukasz Magiera
0c75dd3865
Support AddPiece on workers
2020-08-14 16:06:53 +02:00
whyrusleeping
eb2879ca22
allow client to specify provider collateral
2020-08-13 21:47:36 -04:00
Jakub Sztandera
a6d79b26e4
Add comments
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-13 19:27:31 +02:00
Jakub Sztandera
ff7e441c82
Add noise to GasPremium calculation to help out message selection
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-13 18:57:06 +02:00
Jakub Sztandera
91b5ec1aba
Merge pull request #3032 from filecoin-project/feat/mpool-fix-capmaxfee
...
mpool: Fix capGasFee math again
2020-08-13 14:47:46 +02:00
Łukasz Magiera
47582c0bb3
mpool: Fix capGasFee math again
2020-08-13 14:16:29 +02:00
Łukasz Magiera
9a39bb4e78
api: Remove unused StatePledgeCollateral
2020-08-13 14:03:59 +02:00
Łukasz Magiera
069c39fc12
Add reachability info to miner info all
2020-08-13 13:44:03 +02:00
Łukasz Magiera
3f2a62b5e2
cli: net reachability command
2020-08-13 13:18:14 +02:00
Aayush Rajasekaran
c73d597d87
Merge pull request #2961 from filecoin-project/asr/genesis-premined
...
Revise TotalCircSupply
2020-08-12 17:12:54 -04:00
Łukasz Magiera
e83fa0dd04
Merge pull request #3009 from filecoin-project/feat/offline_commp_calculation
...
Stop requiring miner address / sector size for `lotus client commP`
2020-08-12 22:51:34 +02:00
Łukasz Magiera
73ad453748
Merge pull request #3010 from filecoin-project/fix/paych-sentinel-type
...
Use regular cid as paych sentinel type
2020-08-12 22:49:56 +02:00
Dirk McCormick
e689c305d2
fix: revert to using cid for paych wait sentinel
2020-08-12 16:29:44 -04:00
Łukasz Magiera
12f7e2d9bf
Use a struct for send metadata in MpoolPushMessage
2020-08-12 22:17:29 +02:00
Peter Rabbitson
fd49ef8de6
Stop requiring miner address / sector size for lotus client commP
...
At present, and at least for the medium term (even with the transition to NSE)
the structure of a piece (and thus commP) will remain identical for every size
of sector.
The offline deal flow would benefit greatly if the `lotus client commP`
interface is able to calculate commP without having access to a fully synced
sync, or without even being online.
This is particularly important for filecoin-discover, as we want to allow
miners to spot-check their purchased HDDs, way before they need to accept
the mainnet deal proposals.
See comment/links in node/impl/client/client.go for details on code flow
2020-08-12 22:03:00 +02:00
Łukasz Magiera
fd4d2067a9
mpool: Fix capGasFee math
2020-08-12 22:01:31 +02:00
Łukasz Magiera
e1a1b325bc
Merge remote-tracking branch 'origin/next' into feat/max-msg-fee-config
2020-08-12 21:55:03 +02:00
Łukasz Magiera
43586ed9a1
Merge pull request #3000 from filecoin-project/feat/mpool-add-semaphore
...
Add semaphore in push and friends to reduce lock contention
2020-08-12 21:53:59 +02:00
Aayush Rajasekaran
48ab706691
Subtract out genesis pledge and market funds when calculating circ supply
2020-08-12 15:32:11 -04:00
Aayush Rajasekaran
fe2da35a45
Move GetCircSupply out of the vm, and into stmgr
2020-08-12 15:32:07 -04:00
Łukasz Magiera
bfa0ae16b0
Merge pull request #2965 from filecoin-project/steb/update-actors
...
Update specs-actors & cbor-gen
2020-08-12 21:18:05 +02:00
Łukasz Magiera
fd41a16f84
Merge pull request #3007 from filecoin-project/fix/rbf-gaspremoim
...
Validate message pool config, validate GasPremium < GasFeeCap
2020-08-12 20:40:08 +02:00
Łukasz Magiera
491e24c90a
Merge pull request #2994 from filecoin-project/ingar/retrieval-logging
...
Generate more useful output during client retrieval
2020-08-12 20:36:14 +02:00
Jakub Sztandera
f7c222e42e
Validate message pool config, validate GasPremium < GasFeeCap
...
don't use configured RBF for mpool
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-12 20:31:34 +02:00
Ingar Shu
8f56814ffb
Change formatting, stringify errors before returning over JSONRPC
2020-08-12 10:54:15 -07:00
Steven Allen
e18904bff5
[WIP] fix post submission
2020-08-12 10:33:18 -07:00
vyzo
43b30a80c1
retry PushWithNonce if it fails with ErrTryAgain
2020-08-12 20:32:41 +03:00
Whyrusleeping
ed72aa1307
implement randomness distinction
2020-08-12 10:32:39 -07:00
Steven Allen
9248e5a572
Update specs-actors, cbor-gen, and go-address
2020-08-12 10:32:39 -07:00
Steven Allen
9135a5d048
Pass bitfields by-value
...
This ensures we can't end up decoding nil bitfields from clients when not
expecting them.
Part of https://github.com/filecoin-project/specs-actors/issues/895 . Please see
this issue for details and leave any comments there.
2020-08-12 10:32:39 -07:00
Łukasz Magiera
d0147aa50f
Add maxFee param to MpoolPushMessage
2020-08-12 19:06:16 +02:00
Jakub Sztandera
d6f9383528
Merge pull request #2979 from filecoin-project/feat/mpool-optimal-seletion
...
nearly optimal message pool seletion
2020-08-11 23:45:43 +02:00
Jakub Sztandera
f018e870dc
Address review
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-11 23:35:06 +02:00
Ingar Shu
53e06f358a
client retrieval logging
2020-08-11 13:04:00 -07:00
Jakub Sztandera
a45febc065
Fix MpoolLocker
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-11 19:32:31 +02:00
Łukasz Magiera
763074bb2d
Merge pull request #2986 from filecoin-project/refactor/paych-wait-sentinel
...
Paych manager: use special type for wait sentinel
2020-08-11 19:17:32 +02:00
Łukasz Magiera
0409c5a482
Merge pull request #2944 from filecoin-project/feat/stmgr-wait-ignore-gas
...
stmgr: Allow replacing gas values in WaitMsg
2020-08-11 17:51:28 +02:00
Dirk McCormick
a881e58cd6
refactor: use special type for paych wait sentinel
2020-08-11 10:45:45 -04:00
Jakub Sztandera
b309e80e41
Wire in Ticket Quality to MpoolSelect
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-11 16:14:27 +02:00
vyzo
28fe602a9b
pass a ticket quality to mpool.SelectMessages -- temporary
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-11 16:14:26 +02:00
Aayush Rajasekaran
5e54219be9
fix spelling
2020-08-11 01:10:12 -04:00
Dirk McCormick
a6100b7e46
refactor: move collect inside paych manager
2020-08-10 13:21:25 -04:00
Łukasz Magiera
bc381fc053
stmgr: Allow changing gas values in WaitMsg
2020-08-10 14:55:52 +02:00
Jakub Sztandera
ea92f5f1ff
Handle error
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-09 00:30:00 +02:00
Jakub Sztandera
46fd9d5e80
Quiet down pending messages, fix GasLimit estimation, reduce fee cap
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-09 00:29:59 +02:00
Jakub Sztandera
b41a0ea197
Print number of prioris
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-09 00:29:59 +02:00
Jakub Sztandera
ed2778f785
Make MpoolPushMessage message wait for the first message to be done
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-09 00:29:59 +02:00
Jakub Sztandera
5f157affdd
Add GasLimitOverestimation to mpool config
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-08 17:09:47 +02:00
Łukasz Magiera
af15273f71
gas: Corruntly do float math
2020-08-08 00:41:57 +02:00
whyrusleeping
fbe206f843
add command to view circulating supply
2020-08-07 12:57:03 -07:00
Jakub Sztandera
f809e478f4
Don't spend eveything on message fees
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 20:09:50 +02:00
Łukasz Magiera
54a6d58c2e
Merge pull request #2896 from filecoin-project/feat/mpool-config-priority
...
message pool config and priority addresses
2020-08-07 19:32:27 +02:00
vyzo
c4251912dd
mpool config api
2020-08-07 19:51:49 +03:00
Jakub Sztandera
1063908dd3
Update MinGasPremium for estimation to 10e3, improve estimation
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 18:48:05 +02:00
Łukasz Magiera
cad59b045b
More pond-related fixes
2020-08-07 16:07:48 +02:00
Łukasz Magiera
1101d4b66a
Fix testground build
2020-08-07 15:04:00 +02:00
Łukasz Magiera
0612c2eab9
Merge remote-tracking branch 'origin/next' into feat/dyn-base-fee
2020-08-07 04:15:42 +02:00
Jakub Sztandera
467172f437
Accually add tests
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 04:01:58 +02:00
Jakub Sztandera
927f355001
Remove MpoolEstimateGasPrice
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 02:19:21 +02:00
Jakub Sztandera
f45970a0d5
Fix FeeCap estimation
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 00:54:58 +02:00
Jakub Sztandera
e1de0e3408
Estimate FeeCap 20 blocks in the future
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-07 00:10:55 +02:00
Łukasz Magiera
07bf155295
Merge remote-tracking branch 'origin/next' into feat/dyn-base-fee
2020-08-06 23:41:54 +02:00
Jakub Sztandera
ab08858b45
Delete GasPrice from this world
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-06 23:08:42 +02:00
whyrusleeping
32a5c52105
add missing file
2020-08-06 16:54:16 -04:00
whyrusleeping
57d57e54a1
fix api inclusion
2020-08-06 16:54:16 -04:00
hannahhoward
75771d10d4
fix(markets): replicate unsealing bug
2020-08-06 13:17:16 -07:00
Jakub Sztandera
562a3f482e
Fix GasEstimateGasLimit
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-06 21:28:47 +02:00
Jakub Sztandera
6562b7a4bc
Fix some tests
...
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-06 21:14:55 +02:00
Łukasz Magiera
e54a87f91b
Merge pull request #2838 from filecoin-project/feat/message-pool-selection
...
New message pool selection logic
2020-08-06 20:19:35 +02:00
Dirk McCormick
fdfccf0466
WIP: fix payment channel locking
2020-08-06 12:04:10 -04:00