Skip to content

Commit 1032e06

Browse files
authored
chore: revert updates, prevent backcompat problems in config parser (#123)
1 parent 5deac43 commit 1032e06

File tree

5 files changed

+91
-453
lines changed

5 files changed

+91
-453
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"webpack": "^5.51.2"
4141
},
4242
"dependencies": {
43-
"axios": "^1.12.0",
43+
"axios": "^1.6.7",
4444
"dataloader": "^2.0.0",
4545
"symbol.inspect": "1.0.1",
4646
"teslabot": "^1.3.0",

src/config/ConfigParser.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ describe('ConfigContract', () => {
282282

283283
});
284284

285-
it('should not reise error when loading full config', async () => {
285+
it('should not raise error when loading full config', async () => {
286286
const serializedConfigsCell = (await client.getConfig(BLOCK_AT_31_10_25)).config.cell;
287287
parseFullConfig(loadConfigParamsAsSlice(serializedConfigsCell));
288288
});

src/config/ConfigParser.ts

Lines changed: 44 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,100 +1203,51 @@ export function loadConfigParamsAsSlice(configBase64: string): Map<number, Slice
12031203
return params
12041204
}
12051205

1206-
export type FullNetworkConfig = {
1207-
configAddress: Address
1208-
electorAddress: Address
1209-
minterAddress: Address | null
1210-
feeCollectorAddress: Address | null
1211-
dnsRootAddress: Address | null
1212-
burningConfig: {
1213-
blackholeAddr: Address | null;
1214-
feeBurnNominator: number;
1215-
feeBurnDenominator: number;
1216-
}
1217-
extraCurrenciesMintPrices: {
1218-
mintNewPrice: bigint;
1219-
mintAddPrice: bigint;
1220-
} | null
1221-
extraCurrencies: {
1222-
toMint: ExtraCurrency;
1223-
}
1224-
globalVersion: {
1225-
version: number;
1226-
capabilities: bigint;
1227-
}
1228-
configMandatoryParams: Set<number>
1229-
configCriticalParams: Set<number>
1230-
voting: VotingSetup
1231-
workchains: Dictionary<number, WorkchainDescriptor>
1232-
complaintCost: {
1233-
deposit: bigint;
1234-
bitPrice: bigint;
1235-
cellPrice: bigint;
1236-
}
1237-
blockCreationRewards: {
1238-
masterchainBlockFee: bigint;
1239-
workchainBlockFee: bigint;
1240-
}
1241-
validators: {
1242-
minStake: bigint
1243-
maxStake: bigint
1244-
minTotalStake: bigint
1245-
maxStakeFactor: number
1246-
maxValidators: number
1247-
maxMainValidators: number
1248-
minValidators: number
1249-
validatorsElectedFor: number
1250-
electorsStartBefore: number
1251-
electorsEndBefore: number
1252-
stakeHeldFor: number
1253-
}
1254-
storagePrices: StoragePrices[]
1255-
gasPrices: {
1256-
masterchain: GasLimitsPrices
1257-
workchain: GasLimitsPrices
1258-
}
1259-
blockLimits: {
1260-
masterchain: BlockLimits
1261-
workchain: BlockLimits
1262-
}
1263-
msgPrices: {
1264-
masterchain: MsgPrices
1265-
workchain: MsgPrices
1266-
},
1267-
catchain: CatchainConfig
1268-
consensus: ConsensusConfig
1269-
fundamentalSmcAddr: Address[]
1270-
validatorSets: {
1271-
prevValidators: ValidatorSet | null
1272-
prevTempValidators: ValidatorSet | null
1273-
currentValidators: ValidatorSet | null
1274-
currentTempValidators: ValidatorSet | null
1275-
nextValidators: ValidatorSet | null
1276-
nextTempValidators: ValidatorSet | null
1277-
},
1278-
validatorsPunish: ValidatorsPunishmentConfig | null
1279-
suspended: {
1280-
addresses: Address[];
1281-
suspendedUntil: number;
1282-
}
1283-
precompiledContracts: {
1284-
hash: Buffer;
1285-
gasUsed: bigint;
1286-
}[]
1287-
bridges: {
1288-
ethereum: BridgeParams | null
1289-
binance: BridgeParams | null
1290-
polygon: BridgeParams | null
1291-
},
1292-
tokenBridges: {
1293-
ethereum: JettonBridgeParams | null
1294-
binance: JettonBridgeParams | null
1295-
polygon: JettonBridgeParams | null
1296-
}
1297-
};
1206+
export function parseFullConfig(configs: Map<number, Slice>) {
1207+
return {
1208+
configAddress: configParseMasterAddressRequired(configs.get(0)),
1209+
electorAddress: configParseMasterAddressRequired(configs.get(1)),
1210+
minterAddress: configParseMasterAddress(configs.get(2)),
1211+
feeCollectorAddress: configParseMasterAddress(configs.get(3)),
1212+
dnsRootAddress: configParseMasterAddress(configs.get(4)),
1213+
burningConfig: configParse5(configs.get(5)),
1214+
globalVersion: configParse8(configs.get(8)),
1215+
workchains: configParse12(configs.get(12)),
1216+
voting: parseVotingSetup(configs.get(11)),
1217+
validators: {
1218+
...configParse15(configs.get(15)),
1219+
...configParse16(configs.get(16)),
1220+
...configParse17(configs.get(17))
1221+
},
1222+
storagePrices: configParse18(configs.get(18)),
1223+
gasPrices: {
1224+
masterchain: configParseGasLimitsPrices(configs.get(20)),
1225+
workchain: configParseGasLimitsPrices(configs.get(21)),
1226+
},
1227+
msgPrices: {
1228+
masterchain: configParseMsgPrices(configs.get(24)),
1229+
workchain: configParseMsgPrices(configs.get(25)),
1230+
},
1231+
validatorSets: {
1232+
prevValidators: configParseValidatorSet(configs.get(32)),
1233+
prevTempValidators: configParseValidatorSet(configs.get(33)),
1234+
currentValidators: configParseValidatorSet(configs.get(34)),
1235+
currentTempValidators: configParseValidatorSet(configs.get(35)),
1236+
nextValidators: configParseValidatorSet(configs.get(36)),
1237+
nextTempValidators: configParseValidatorSet(configs.get(37))
1238+
},
1239+
validatorsPunish: configParse40(configs.get(40)),
1240+
bridges: {
1241+
ethereum: configParseBridge(configs.get(71)),
1242+
binance: configParseBridge(configs.get(72)),
1243+
polygon: configParseBridge(configs.get(73))
1244+
},
1245+
catchain: configParse28(configs.get(28)),
1246+
consensus: configParse29(configs.get(29))
1247+
};
1248+
}
12981249

1299-
export function parseFullConfig(configs: Map<number, Slice>): FullNetworkConfig {
1250+
export function parseFullerConfig(configs: Map<number, Slice>) {
13001251
return {
13011252
configAddress: configParseMasterAddressRequired(configs.get(0)),
13021253
electorAddress: configParseMasterAddressRequired(configs.get(1)),

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export { GasLimitsPrices, StoragePrices, MsgPrices, WorkchainDescriptor,
7272
configParseMasterAddressRequired, configParseMsgPrices,
7373
configParseValidatorSet, configParseWorkchainDescriptor,
7474
parseBridge, parseProposalSetup, parseValidatorSet, parseVotingSetup,
75-
parseFullConfig,
75+
parseFullConfig, parseFullerConfig,
7676
loadConfigParamById, loadConfigParamsAsSlice } from './config/ConfigParser'
7777

7878
//

0 commit comments

Comments
 (0)