refactor(crypto-block): remove amount

packages/api-database/source/migrations/1697617471901-CreateIndexes.ts

@@ -34,12 +34,11 @@
 
             CREATE INDEX blocks_transactions_count ON blocks(transactions_count);
             CREATE INDEX blocks_reward ON blocks(reward);
-            CREATE INDEX blocks_amount ON blocks(amount);
             CREATE INDEX blocks_fee ON blocks(fee);
             CREATE INDEX blocks_validator_round ON blocks(validator_round);
 
             CREATE INDEX receipts_block_height ON receipts(block_number);
-            CREATE INDEX receipts_contracts ON receipts(contract_address) 
+            CREATE INDEX receipts_contracts ON receipts(contract_address)
             WHERE contract_address IS NOT NULL;
 
             CREATE INDEX wallets_balance ON wallets(balance);
@@ -82,7 +81,6 @@
 
             DROP INDEX blocks_transactions_count;
             DROP INDEX blocks_reward;
-            DROP INDEX blocks_amount;
             DROP INDEX blocks_fee;
             DROP INDEX blocks_validator_round;
 

packages/api-database/source/models/block.ts

@@ -52,12 +52,6 @@ export class Block {
 	})
 	public readonly gasUsed!: number;
 
-	@Column({
-		nullable: false,
-		type: "numeric",
-	})
-	public readonly amount!: string;
-
 	@Column({
 		nullable: false,
 		type: "numeric",

packages/api-development/source/resources/block.ts

@@ -12,7 +12,6 @@ export class BlockResource implements Contracts.Api.Resource {
 
 		return {
 			forged: {
-				amount: blockData.amount.toFixed(),
 				fee: blockData.fee.toFixed(),
 				reward: blockData.reward.toFixed(),
 				total: blockData.reward.plus(blockData.fee).toFixed(),

packages/api-http/source/resources/block.ts

@@ -16,7 +16,6 @@ export class BlockResource implements Contracts.Api.Resource {
 
 	public transform(resource: EnrichedBlock): object {
 		return {
-			amount: BigNumber.make(resource.amount),
 			confirmations: +resource.state.blockNumber
 				? Number(resource.state.blockNumber) - Number(resource.number)
 				: 0,

packages/api-http/test/fixtures/blocks.response.json

@@ -1,7 +1,6 @@
 [
 	{
 		"confirmations": 0,
-		"amount": "12499999999999969",
 		"fee": "0",
 		"gasUsed": 0,
 		"reward": "0",
@@ -22,7 +21,6 @@
 	},
 	{
 		"confirmations": 0,
-		"amount": "0",
 		"fee": "0",
 		"gasUsed": 0,
 		"reward": "0",
@@ -43,7 +41,6 @@
 	},
 	{
 		"confirmations": 0,
-		"amount": "0",
 		"fee": "0",
 		"gasUsed": 0,
 		"reward": "0",

packages/api-http/test/fixtures/validator_blocks.response.json

@@ -1,7 +1,6 @@
 [
 	{
 		"confirmations": 0,
-		"amount": "0",
 		"fee": "0",
 		"gasUsed": 0,
 		"reward": "0",
@@ -23,7 +22,6 @@
 	},
 	{
 		"confirmations": 0,
-		"amount": "12499999999999969",
 		"fee": "0",
 		"gasUsed": 0,
 		"reward": "0",

packages/api-sync/source/restore.ts

@@ -236,7 +236,6 @@ export class Restore {
 
 			for await (const { proof, block } of commits) {
 				blocks.push({
-					amount: block.header.amount.toFixed(),
 					commitRound: proof.round,
 					fee: block.header.fee.toFixed(),
 					gasUsed: block.header.gasUsed,

packages/api-sync/source/service.ts

@@ -192,8 +192,8 @@
 					? {
 							// incrementally applied in UPSERT below
 							validatorForgedFees: header.fee.toFixed(),
-							validatorForgedRewards: header.amount.toFixed(),
-							validatorForgedTotal: header.fee.plus(header.amount).toFixed(),
+							validatorForgedRewards: header.reward.toFixed(),
+							validatorForgedTotal: header.fee.plus(header.reward).toFixed(),
 							validatorLastBlock: {
 								hash: header.hash,
 								number: header.number,
@@ -259,7 +259,6 @@
 
 		const deferredSync: DeferredSync = {
 			block: {
-				amount: header.amount.toFixed(),
 				commitRound: proof.round,
 				fee: header.fee.toFixed(),
 				gasUsed: header.gasUsed,
@@ -490,7 +489,7 @@
 			'validatorVotersCount',
 			COALESCE(EXCLUDED.attributes->'validatorVotersCount', "Wallet".attributes->'validatorVotersCount'),
 			'validatorFee',
-			COALESCE((EXCLUDED.attributes->>'validatorFee')::text, ("Wallet".attributes->>'validatorFee')::text),			
+			COALESCE((EXCLUDED.attributes->>'validatorFee')::text, ("Wallet".attributes->>'validatorFee')::text),
 			'validatorLastBlock',
 			COALESCE((EXCLUDED.attributes->>'validatorLastBlock')::jsonb, ("Wallet".attributes->>'validatorLastBlock')::jsonb),
 			'validatorForgedFees',

packages/configuration-generator/source/generators/genesis-block.ts

@@ -241,8 +241,7 @@ export class GenesisBlockGenerator extends Generator {
 		transactions: Contracts.Crypto.Transaction[],
 		options: Contracts.NetworkGenerator.InternalOptions,
 	): Promise<{ block: Contracts.Crypto.Block; transactions: Contracts.Crypto.TransactionData[] }> {
-		const totals: { amount: BigNumber; fee: BigNumber; gasUsed: number } = {
-			amount: BigNumber.ZERO,
+		const totals: { fee: BigNumber; gasUsed: number } = {
 			fee: BigNumber.ZERO,
 			gasUsed: 0,
 		};
@@ -292,7 +291,6 @@ export class GenesisBlockGenerator extends Generator {
 				value: transaction.data.value.toBigInt(),
 			});
 
-			totals.amount = totals.amount.plus(data.value);
 			totals.fee = totals.fee.plus(data.gasPrice);
 			totals.gasUsed += Number(receipt.gasUsed);
 
@@ -320,7 +318,6 @@ export class GenesisBlockGenerator extends Generator {
 		return {
 			block: await this.app.get<Contracts.Crypto.BlockFactory>(Identifiers.Cryptography.Block.Factory).make(
 				{
-					amount: options.snapshot ? BigNumber.make(options.premine) : totals.amount,
 					fee: totals.fee,
 					gasUsed: totals.gasUsed,
 					logsBloom: await this.evm.logsBloom(commitKey),

packages/contracts/source/contracts/crypto/block.ts

@@ -25,7 +25,6 @@ export interface BlockData {
 	readonly logsBloom: string;
 	readonly transactionsCount: number;
 	readonly gasUsed: number;
-	readonly amount: BigNumber;
 	readonly fee: BigNumber;
 	readonly reward: BigNumber;
 	readonly payloadSize: number;
@@ -49,7 +48,6 @@ export interface BlockJson {
 	readonly logsBloom: string;
 	readonly transactionsCount: number;
 	readonly gasUsed: number;
-	readonly amount: string;
 	readonly fee: string;
 	readonly reward: string;
 	readonly payloadSize: number;

packages/contracts/source/exceptions/processor.ts

@@ -63,12 +63,6 @@ export class DuplicatedTransaction extends ValidatorException {
 	}
 }
 
-export class InvalidAmount extends ValidatorException {
-	public constructor(block: Block, actualAmount: string) {
-		super(`Block ${block.data.hash} has invalid amount. Expected ${block.data.amount}, but got ${actualAmount}.`);
-	}
-}
-
 export class ExceededGasLimit extends ValidatorException {
 	public constructor(block: Block, maxGasLimit: number) {
 		super(`Block ${block.data.hash} with  gas used ${block.data.gasUsed} exceeds max gas limit of ${maxGasLimit}.`);