Skip to content

Commit 96bb599

Browse files
mirceahaseganmirceahasegan
committed
Merge branch 'conway-era' into chore/lw-10279-conway-era-to-master-merge
2 parents d68b015 + f916c0d commit 96bb599

File tree

8 files changed

+78
-71
lines changed

8 files changed

+78
-71
lines changed

‎packages/cardano-services/src/NetworkInfo/DbSyncNetworkInfoProvider/mappers.ts

+40-22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable complexity */
12
import { Cardano, Seconds, SupplySummary } from '@cardano-sdk/core';
23
import { CostModelsParamModel, ProtocolParamsModel } from './types';
34
import { GenesisData } from '../../types';
@@ -84,26 +85,37 @@ export const toProtocolParams = ({
8485
}: ProtocolParamsModel): Cardano.ProtocolParameters => ({
8586
coinsPerUtxoByte: Number(coins_per_utxo_size),
8687
collateralPercentage: collateral_percent,
87-
committeeTermLimit: Cardano.EpochNo(committee_max_term_length),
88+
...(committee_max_term_length && { committeeTermLimit: Cardano.EpochNo(committee_max_term_length) }),
8889
costModels: mapCostModels(costs),
8990
dRepDeposit: Number(drep_deposit),
9091
// CDDL represents it as `32: epoch ; DRep inactivity period`
91-
dRepInactivityPeriod: Cardano.EpochNo(drep_activity),
92-
dRepVotingThresholds: {
93-
committeeNoConfidence: Cardano.FractionUtils.toFraction(dvt_committee_no_confidence),
94-
committeeNormal: Cardano.FractionUtils.toFraction(dvt_committee_normal),
95-
hardForkInitiation: Cardano.FractionUtils.toFraction(dvt_hard_fork_initiation),
96-
motionNoConfidence: Cardano.FractionUtils.toFraction(dvt_motion_no_confidence),
97-
ppEconomicGroup: Cardano.FractionUtils.toFraction(dvt_p_p_economic_group),
98-
ppGovernanceGroup: Cardano.FractionUtils.toFraction(dvt_p_p_gov_group),
99-
ppNetworkGroup: Cardano.FractionUtils.toFraction(dvt_p_p_network_group),
100-
ppTechnicalGroup: Cardano.FractionUtils.toFraction(dvt_p_p_technical_group),
101-
treasuryWithdrawal: Cardano.FractionUtils.toFraction(dvt_treasury_withdrawal),
102-
updateConstitution: Cardano.FractionUtils.toFraction(dvt_update_to_constitution)
103-
},
92+
...(drep_activity && { dRepInactivityPeriod: Cardano.EpochNo(drep_activity) }),
93+
...(dvt_committee_no_confidence &&
94+
dvt_committee_normal &&
95+
dvt_hard_fork_initiation &&
96+
dvt_motion_no_confidence &&
97+
dvt_p_p_economic_group &&
98+
dvt_p_p_gov_group &&
99+
dvt_p_p_network_group &&
100+
dvt_p_p_technical_group &&
101+
dvt_treasury_withdrawal &&
102+
dvt_update_to_constitution && {
103+
dRepVotingThresholds: {
104+
committeeNoConfidence: Cardano.FractionUtils.toFraction(dvt_committee_no_confidence),
105+
committeeNormal: Cardano.FractionUtils.toFraction(dvt_committee_normal),
106+
hardForkInitiation: Cardano.FractionUtils.toFraction(dvt_hard_fork_initiation),
107+
motionNoConfidence: Cardano.FractionUtils.toFraction(dvt_motion_no_confidence),
108+
ppEconomicGroup: Cardano.FractionUtils.toFraction(dvt_p_p_economic_group),
109+
ppGovernanceGroup: Cardano.FractionUtils.toFraction(dvt_p_p_gov_group),
110+
ppNetworkGroup: Cardano.FractionUtils.toFraction(dvt_p_p_network_group),
111+
ppTechnicalGroup: Cardano.FractionUtils.toFraction(dvt_p_p_technical_group),
112+
treasuryWithdrawal: Cardano.FractionUtils.toFraction(dvt_treasury_withdrawal),
113+
updateConstitution: Cardano.FractionUtils.toFraction(dvt_update_to_constitution)
114+
}
115+
}),
104116
desiredNumberOfPools: optimal_pool_count,
105117
governanceActionDeposit: Number(gov_action_deposit),
106-
governanceActionValidityPeriod: Cardano.EpochNo(gov_action_lifetime),
118+
...(gov_action_lifetime && { governanceActionValidityPeriod: Cardano.EpochNo(gov_action_lifetime) }),
107119
maxBlockBodySize: max_block_size,
108120
maxBlockHeaderSize: max_bh_size,
109121
maxCollateralInputs: max_collateral_inputs,
@@ -126,13 +138,19 @@ export const toProtocolParams = ({
126138
poolDeposit: Number(pool_deposit),
127139
poolInfluence: String(influence),
128140
poolRetirementEpochBound: max_epoch,
129-
poolVotingThresholds: {
130-
committeeNoConfidence: Cardano.FractionUtils.toFraction(pvt_committee_no_confidence),
131-
committeeNormal: Cardano.FractionUtils.toFraction(pvt_committee_normal),
132-
hardForkInitiation: Cardano.FractionUtils.toFraction(pvt_hard_fork_initiation),
133-
motionNoConfidence: Cardano.FractionUtils.toFraction(pvt_motion_no_confidence),
134-
securityRelevantParamVotingThreshold: Cardano.FractionUtils.toFraction(pvtpp_security_group)
135-
},
141+
...(pvt_committee_no_confidence &&
142+
pvt_committee_normal &&
143+
pvt_hard_fork_initiation &&
144+
pvt_motion_no_confidence &&
145+
pvtpp_security_group && {
146+
poolVotingThresholds: {
147+
committeeNoConfidence: Cardano.FractionUtils.toFraction(pvt_committee_no_confidence),
148+
committeeNormal: Cardano.FractionUtils.toFraction(pvt_committee_normal),
149+
hardForkInitiation: Cardano.FractionUtils.toFraction(pvt_hard_fork_initiation),
150+
motionNoConfidence: Cardano.FractionUtils.toFraction(pvt_motion_no_confidence),
151+
securityRelevantParamVotingThreshold: Cardano.FractionUtils.toFraction(pvtpp_security_group)
152+
}
153+
}),
136154
prices: {
137155
memory: price_mem,
138156
steps: price_step

‎packages/cardano-services/src/NetworkInfo/DbSyncNetworkInfoProvider/types.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ export interface ProtocolParamsModel {
5555
max_block_ex_steps: string;
5656
max_epoch: number;
5757
costs: CostModelsParamModel | null;
58-
committee_min_size: number;
59-
committee_max_term_length: number;
60-
gov_action_lifetime: number;
61-
gov_action_deposit: number;
62-
drep_deposit: number;
63-
drep_activity: number;
64-
pvt_motion_no_confidence: number;
65-
pvt_committee_normal: number;
66-
pvt_committee_no_confidence: number;
67-
pvt_hard_fork_initiation: number;
68-
pvtpp_security_group: number;
69-
dvt_motion_no_confidence: number;
70-
dvt_committee_normal: number;
71-
dvt_committee_no_confidence: number;
72-
dvt_update_to_constitution: number;
73-
dvt_hard_fork_initiation: number;
74-
dvt_p_p_network_group: number;
75-
dvt_p_p_economic_group: number;
76-
dvt_p_p_technical_group: number;
77-
dvt_p_p_gov_group: number;
78-
dvt_treasury_withdrawal: number;
58+
committee_min_size: number | null;
59+
committee_max_term_length: number | null;
60+
gov_action_lifetime: number | null;
61+
gov_action_deposit: number | null;
62+
drep_deposit: number | null;
63+
drep_activity: number | null;
64+
pvt_motion_no_confidence: number | null;
65+
pvt_committee_normal: number | null;
66+
pvt_committee_no_confidence: number | null;
67+
pvt_hard_fork_initiation: number | null;
68+
pvtpp_security_group: number | null;
69+
dvt_motion_no_confidence: number | null;
70+
dvt_committee_normal: number | null;
71+
dvt_committee_no_confidence: number | null;
72+
dvt_update_to_constitution: number | null;
73+
dvt_hard_fork_initiation: number | null;
74+
dvt_p_p_network_group: number | null;
75+
dvt_p_p_economic_group: number | null;
76+
dvt_p_p_technical_group: number | null;
77+
dvt_p_p_gov_group: number | null;
78+
dvt_treasury_withdrawal: number | null;
7979
}

‎packages/core/src/Cardano/types/ProtocolParameters.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ type NewProtocolParamsInConway = {
140140
minFeeRefScriptCostPerByte: string;
141141
};
142142

143-
export type ProtocolParameters = BabbageProtocolParameters & NewProtocolParamsInConway;
143+
export type ProtocolParameters = BabbageProtocolParameters & Partial<NewProtocolParamsInConway>;
144144
export type ConwayProtocolParameters = Omit<ProtocolParameters, 'protocolVersion'>;
145145

146146
// Even tho extraEntropy was deprecated on babbage era, and protocolVersion was deprecated in conway era,

‎packages/core/test/Cardano/util/computeImplicitCoin.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ describe('Cardano.util.computeImplicitCoin', () => {
110110
const stakeKeyDepositCert = 10n;
111111
const stakeKeyReclaimCert = 20n;
112112
const poolDeposit = BigInt(protocolParameters.poolDeposit!);
113-
const drepDeposit = BigInt(protocolParameters.dRepDeposit);
113+
const drepDeposit = BigInt(protocolParameters.dRepDeposit!);
114114

115115
const certificates: Cardano.Certificate[] = [
116116
{ __typename: Cardano.CertificateType.StakeRegistration, stakeCredential },
@@ -201,7 +201,7 @@ describe('Cardano.util.computeImplicitCoin', () => {
201201

202202
it('sums certificates and proposal procedures for deposit', () => {
203203
const protocolParameters = { governanceActionDeposit: 4, stakeKeyDeposit: 2 } as Cardano.ProtocolParameters;
204-
const governanceActionDeposit = BigInt(protocolParameters.governanceActionDeposit);
204+
const governanceActionDeposit = BigInt(protocolParameters.governanceActionDeposit!);
205205
const stakeKeyDeposit = BigInt(protocolParameters.stakeKeyDeposit);
206206

207207
const anchor = {

‎packages/e2e/local-network/Dockerfile

+9-20
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ ENV DEBIAN_FRONTEND=nonintercative
66

77
WORKDIR /build
88
ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.0.0/cardano-node-9.0.0-linux.tar.gz
9-
ARG CARDANO_CLI_BUILD_URL=https://github.com/IntersectMBO/cardano-cli/releases/download/cardano-cli-9.0.0.1/cardano-cli-9.0.0.1-x86_64-linux.tar.gz
9+
# This is a temporary workaround for an issue with the cardnao-cli embedded in the cardano-node tarball. Doing it only for x86_64 because
10+
# the code will be removed once the issue is fixed.
11+
ARG CARDANO_CLI_BUILD_URL=https://github.com/IntersectMBO/cardano-cli/releases/download/cardano-cli-9.1.0.0/cardano-cli-9.1.0.0-x86_64-linux.tar.gz
1012
ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-9.0.0-aarch64-linux.tar.gz
1113

12-
# Use local cardano-cli until it is available in the official release
13-
COPY cardano-cli-x86_64-linux.zip cardano-cli-x86_64-linux.zip
14-
1514
RUN set -x && \
1615
apt-get update -y && \
1716
apt-get install -y wget tar curl unzip && \
@@ -22,22 +21,12 @@ RUN set -x && \
2221
fi && \
2322
mkdir -p cardano-node && \
2423
tar -xzf cardano-node.tar.gz -C cardano-node && \
25-
if [ "$(uname -m)" = "x86_64" ] ; then \
26-
echo "======== Check if we want a custom cardano-cli ========" &&\
27-
if [ -f cardano-cli-x86_64-linux.zip ] ; then \
28-
echo "======== Using local cardano-cli ========" && \
29-
unzip cardano-cli-x86_64-linux.zip ;\
30-
elif [ -n "$CARDANO_CLI_BUILD_URL" ] ; then \
31-
echo "======== Using released cardano-cli ========" && \
32-
curl -fsSL "$CARDANO_CLI_BUILD_URL" >cardano-cli.tar.gz && \
33-
tar -xzf cardano-cli.tar.gz ;\
34-
fi && \
35-
if [ -f cardano-cli-x86_64-linux ] ; then \
36-
echo "======== Using a custom Cardano Node cardano-cli ========" && \
37-
chown $(stat -c "%u:%g" cardano-node/bin/cardano-cli) cardano-cli-x86_64-linux && \
38-
chmod +x cardano-cli-x86_64-linux && \
39-
mv cardano-cli-x86_64-linux cardano-node/bin/cardano-cli ;\
40-
fi ;\
24+
if [ "$(uname -m)" = "x86_64" ] && [ -n "$CARDANO_CLI_BUILD_URL" ] ; then \
25+
curl -fsSL "$CARDANO_CLI_BUILD_URL" >cardano-cli.tar.gz && \
26+
tar -xzf cardano-cli.tar.gz && \
27+
chown $(stat -c "%u:%g" cardano-node/bin/cardano-cli) cardano-cli-x86_64-linux && \
28+
chmod +x cardano-cli-x86_64-linux && \
29+
mv cardano-cli-x86_64-linux cardano-node/bin/cardano-cli ;\
4130
fi
4231

4332

‎packages/e2e/local-network/cardano-cli-x86_64-linux.zip

-16.7 MB
Binary file not shown.

‎packages/e2e/local-network/scripts/install.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ clean() {
1616
}
1717
trap clean EXIT
1818

19-
VERSION="8.10.1"
19+
VERSION="9.0.0"
2020

2121
rm -rf bin
2222
mkdir -p bin
2323

2424
echo "Download binaries from IOG build"
2525
case $(uname) in
2626
Darwin)
27-
wget -O bin.tar.gz https://github.com/IntersectMBO/cardano-node/releases/download/${VERSION}-sancho/cardano-node-${VERSION}-macos.tar.gz
27+
wget -O bin.tar.gz https://github.com/IntersectMBO/cardano-node/releases/download/${VERSION}/cardano-node-${VERSION}-macos.tar.gz
2828
;;
2929
Linux)
30-
wget -O bin.tar.gz https://github.com/IntersectMBO/cardano-node/releases/download/${VERSION}-sancho/cardano-node-${VERSION}-linux.tar.gz
30+
wget -O bin.tar.gz https://github.com/IntersectMBO/cardano-node/releases/download/${VERSION}/cardano-node-${VERSION}-linux.tar.gz
3131
;;
3232
esac
3333

‎packages/e2e/test/wallet_epoch_3/PersonalWallet/conwayTransactions.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ describe('PersonalWallet/conwayTransactions', () => {
156156
const protocolParameters = await wallet.networkInfoProvider.protocolParameters();
157157

158158
return [
159-
BigInt(protocolParameters.dRepDeposit),
160-
BigInt(protocolParameters.governanceActionDeposit),
159+
BigInt(protocolParameters.dRepDeposit!),
160+
BigInt(protocolParameters.governanceActionDeposit!),
161161
BigInt(protocolParameters.stakeKeyDeposit)
162162
];
163163
};

0 commit comments

Comments
 (0)