Skip to content

Commit 2227452

Browse files
CmdvCmdv
committed
fix rebase errors
1 parent 5eff0bd commit 2227452

File tree

5 files changed

+55
-69
lines changed

5 files changed

+55
-69
lines changed

‎cardano-chain-gen/src/Cardano/Mock/Query.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ queryStakeAddressCount = do
240240
queryCollateralTxOutCount :: MonadIO io => ReaderT SqlBackend io Word
241241
queryCollateralTxOutCount = do
242242
res <- selectOne $ do
243-
_ <- from (table @Db.CollateralTxOut)
243+
_ <- from (table @C.CollateralTxOut)
244244
pure countRows
245245
pure $ maybe 0 unValue res
246246

‎cardano-db-sync/src/Cardano/DbSync/Cache.hs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -356,25 +356,6 @@ queryMAWithCache cache policyId asset =
356356
let !policyBs = Generic.unScriptHash $ policyID policyId
357357
let !assetNameBs = Generic.unAssetName asset
358358
maybe (Left (policyBs, assetNameBs)) Right <$> DB.queryMultiAssetId policyBs assetNameBs
359-
ActiveCache ci -> do
360-
mp <- liftIO $ readTVarIO (cMultiAssets ci)
361-
case LRU.lookup (policyId, asset) mp of
362-
Just (maId, mp') -> do
363-
liftIO $ hitMAssets (cStats ci)
364-
liftIO $ atomically $ writeTVar (cMultiAssets ci) mp'
365-
pure $ Right maId
366-
Nothing -> do
367-
liftIO $ missMAssets (cStats ci)
368-
-- miss. The lookup doesn't change the cache on a miss.
369-
let !policyBs = Generic.unScriptHash $ policyID policyId
370-
let !assetNameBs = Generic.unAssetName asset
371-
maId <- maybe (Left (policyBs, assetNameBs)) Right <$> DB.queryMultiAssetId policyBs assetNameBs
372-
whenRight maId $
373-
liftIO
374-
. atomically
375-
. modifyTVar (cMultiAssets ci)
376-
. LRU.insert (policyId, asset)
377-
pure maId
378359

379360
queryPrevBlockWithCache ::
380361
MonadIO m =>

‎cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/GovAction.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ handleCommittee syncEnv govIds epochNo enactedState = do
498498
mGaId <- resolveGovActionProposal syncEnv $ unGovPurposeId prevId
499499
case mGaId of
500500
Nothing -> pure Nothing
501-
Just prevId ->
502-
fmap Just <$> resolveGovActionProposal cache $ unGovPurposeId prevId
501+
Just gaId -> do
502+
_nCommittee <- lift $ DB.updateGovActionEnacted gaId (unEpochNo epochNo)
503+
pure $ Just gaId
503504

504505
case (mCommitteeGaId, strictMaybeToMaybe (cgsCommittee enactedState)) of
505506
(Nothing, Nothing) -> pure (Nothing, Nothing)
@@ -548,8 +549,9 @@ handleConstitution syncEnv blkId govIds epochNo enactedState = do
548549
mGaId <- resolveGovActionProposal syncEnv $ unGovPurposeId prevId
549550
case mGaId of
550551
Nothing -> pure Nothing
551-
Just prevId ->
552-
fmap Just <$> resolveGovActionProposal cache $ unGovPurposeId prevId
552+
Just gaId -> do
553+
_nConstitution <- lift $ DB.updateGovActionEnacted gaId (unEpochNo epochNo)
554+
pure $ Just gaId
553555

554556
constitutionIds <- lift $ DB.queryProposalConstitution mConstitutionGaId
555557
case constitutionIds of

‎cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/LedgerEvent.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ insertNewEpochLedgerEvents syncEnv currentEpochNo@(EpochNo curEpoch) =
103103
let refunded = filter (\e -> Set.notMember (garGovActionId e) uncl) (enacted <> dropped <> expired)
104104
insertProposalRefunds syncEnv ntw (subFromCurrentEpoch 1) currentEpochNo cache refunded -- TODO: check if they are disjoint to avoid double entries.
105105
forM_ enacted $ \gar -> do
106-
gaId <- resolveGovActionProposal syncEnv (garGovActionId gar)
107-
lift $ void $ DB.updateGovActionEnacted gaId (unEpochNo currentEpochNo)
106+
mGaId <- resolveGovActionProposal syncEnv (garGovActionId gar)
107+
whenJust mGaId $ \gaId ->
108+
lift $ void $ DB.updateGovActionEnacted gaId (unEpochNo currentEpochNo)
108109
whenJust (garMTreasury gar) $ \treasuryMap -> do
109110
let rewards = Map.mapKeys Ledger.raCredential $ Map.map (Set.singleton . mkTreasuryReward) treasuryMap
110111
insertRewardRests syncEnv ntw (subFromCurrentEpoch 1) currentEpochNo cache (Map.toList rewards)

‎cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Tx.hs

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ insertTxOut syncEnv cache iopts (txId, txHash) (Generic.TxOut index addr value m
270270
addrId <- lift $ insertAddress addr vAddress
271271
pure $
272272
DB.VTxOutW
273-
(mkTxOutVariant addrId mDatumId mScriptId)
273+
(mkTxOutVariant mSaId addrId mDatumId mScriptId)
274274
Nothing
275275

276276
let !eutxo =
@@ -466,48 +466,50 @@ insertCollateralTxOut syncEnv cache (txId, _txHash) txout@(Generic.TxOut index a
466466

467467
insertColTxOutPart2 mDatumId mScriptId = do
468468
mSaId <- lift $ insertStakeAddressRefIfMissing syncEnv cache addr
469-
_ <- case ioTxOutTableType iopts of
470-
DB.TxOutCore -> do
471-
lift
472-
. DB.insertCollateralTxOut
473-
$ DB.CCollateralTxOutW
474-
$ C.CollateralTxOut
475-
{ C.collateralTxOutTxId = txId
476-
, C.collateralTxOutIndex = index
477-
, C.collateralTxOutAddress = Generic.renderAddress addr
478-
, C.collateralTxOutAddressHasScript = hasScript
479-
, C.collateralTxOutPaymentCred = Generic.maybePaymentCred addr
480-
, C.collateralTxOutStakeAddressId = mSaId
481-
, C.collateralTxOutValue = Generic.coinToDbLovelace value
482-
, C.collateralTxOutDataHash = Generic.dataHashToBytes <$> Generic.getTxOutDatumHash dt
483-
, C.collateralTxOutMultiAssetsDescr = textShow maMap
484-
, C.collateralTxOutInlineDatumId = mDatumId
485-
, C.collateralTxOutReferenceScriptId = mScriptId
486-
}
487-
DB.TxOutVariantAddress -> do
488-
let vAddress =
489-
V.Address
490-
{ V.addressAddress = Generic.renderAddress addr
491-
, V.addressRaw = Ledger.serialiseAddr addr
492-
, V.addressHasScript = hasScript
493-
, V.addressPaymentCred = Generic.maybePaymentCred addr
494-
, V.addressStakeAddressId = mSaId
495-
}
496-
addrId <- lift $ insertAddress addr vAddress
497-
lift
498-
. DB.insertCollateralTxOut
499-
$ DB.VCollateralTxOutW
500-
$ V.CollateralTxOut
501-
{ V.collateralTxOutTxId = txId
502-
, V.collateralTxOutIndex = index
503-
, V.collateralTxOutAddressId = addrId
504-
, V.collateralTxOutStakeAddressId = mSaId
505-
, V.collateralTxOutValue = Generic.coinToDbLovelace value
506-
, V.collateralTxOutDataHash = Generic.dataHashToBytes <$> Generic.getTxOutDatumHash dt
507-
, V.collateralTxOutMultiAssetsDescr = textShow maMap
508-
, V.collateralTxOutInlineDatumId = mDatumId
509-
, V.collateralTxOutReferenceScriptId = mScriptId
510-
}
469+
_ <-
470+
case ioTxOutTableType $ getInsertOptions syncEnv of
471+
DB.TxOutCore -> do
472+
lift . DB.insertCollateralTxOut
473+
$ DB.CCollateralTxOutW
474+
$ C.CollateralTxOut
475+
{ C.collateralTxOutTxId = txId
476+
, C.collateralTxOutIndex = index
477+
, C.collateralTxOutAddress = Generic.renderAddress addr
478+
, C.collateralTxOutAddressHasScript = hasScript
479+
, C.collateralTxOutPaymentCred = Generic.maybePaymentCred addr
480+
, C.collateralTxOutStakeAddressId = mSaId
481+
, C.collateralTxOutValue = Generic.coinToDbLovelace value
482+
, C.collateralTxOutDataHash = Generic.dataHashToBytes <$> Generic.getTxOutDatumHash dt
483+
, C.collateralTxOutMultiAssetsDescr = textShow maMap
484+
, C.collateralTxOutInlineDatumId = mDatumId
485+
, C.collateralTxOutReferenceScriptId = mScriptId
486+
}
487+
DB.TxOutVariantAddress -> do
488+
let vAddress =
489+
V.Address
490+
{ V.addressAddress = Generic.renderAddress addr
491+
, V.addressRaw = Ledger.serialiseAddr addr
492+
, V.addressHasScript = hasScript
493+
, V.addressPaymentCred = Generic.maybePaymentCred addr
494+
, V.addressStakeAddressId = mSaId
495+
}
496+
addrId <- lift $ insertAddress addr vAddress
497+
lift
498+
. DB.insertCollateralTxOut
499+
$ DB.VCollateralTxOutW
500+
$ V.CollateralTxOut
501+
{ V.collateralTxOutTxId = txId
502+
, V.collateralTxOutIndex = index
503+
, V.collateralTxOutAddressId = addrId
504+
, V.collateralTxOutStakeAddressId = mSaId
505+
, V.collateralTxOutValue = Generic.coinToDbLovelace value
506+
, V.collateralTxOutDataHash = Generic.dataHashToBytes <$> Generic.getTxOutDatumHash dt
507+
, V.collateralTxOutMultiAssetsDescr = textShow maMap
508+
, V.collateralTxOutInlineDatumId = mDatumId
509+
, V.collateralTxOutReferenceScriptId = mScriptId
510+
}
511+
512+
pure ()
511513
hasScript :: Bool
512514
hasScript = maybe False Generic.hasCredScript (Generic.getPaymentCred addr)
513515

0 commit comments

Comments
 (0)