removed remaining tx_rollup references (#2675)

* removed remaining tx_rollup references * fixed unit test * added back some types * removed docs for tx rollups, and added back previous version * removed txr1 address references
ecadlabs · Sep 29, 2023 · a0f22c3 · a0f22c3
1 parent 1253770
commit a0f22c3
Show file tree

Hide file tree

Showing 40 changed files with 34 additions and 3,716 deletions.
diff --git a/docs/tx_rollups.md b/docs/tx_rollups.md
diff --git a/integration-tests/data/contract-txr1-address.ts b/integration-tests/data/contract-txr1-address.ts
diff --git a/packages/taquito-local-forging/src/codec.ts b/packages/taquito-local-forging/src/codec.ts
@@ -469,27 +469,6 @@ export const entrypointNameDecoder = (val: Uint8ArrayConsumer) => {
   return Buffer.from(entry).toString('utf8');
 };
 
-export const txRollupOriginationParamEncoder = (_value: string) => {
-  return '';
-};
-
-export const txRollupOriginationParamDecoder = (_val: Uint8ArrayConsumer) => {
-  return {};
-};
-
-export const txRollupIdEncoder = prefixEncoder(Prefix.TXR1);
-
-export const txRollupIdDecoder = prefixDecoder(Prefix.TXR1);
-
-export const txRollupBatchContentEncoder = (value: string) => {
-  return `${pad(value.length / 2)}${value}`;
-};
-
-export const txRollupBatchContentDecoder = (val: Uint8ArrayConsumer) => {
-  const value = extractRequiredLen(val);
-  return Buffer.from(value).toString('hex');
-};
-
 export const burnLimitEncoder = (val: string) => {
   return !val ? '00' : `ff${zarithEncoder(val)}`;
 };

diff --git a/packages/taquito-local-forging/src/constants.ts b/packages/taquito-local-forging/src/constants.ts
@@ -48,12 +48,7 @@ export enum CODEC {
   OP_PROPOSALS = 'proposals',
   OP_REGISTER_GLOBAL_CONSTANT = 'register_global_constant',
   OP_TRANSFER_TICKET = 'transfer_ticket',
-  OP_TX_ROLLUP_ORIGINATION = 'tx_rollup_origination',
-  OP_TX_ROLLUP_SUBMIT_BATCH = 'tx_rollup_submit_batch',
   BURN_LIMIT = 'burn_limit',
-  TX_ROLLUP_ORIGINATION_PARAM = 'tx_rollup_origination_param',
-  TX_ROLLUP_ID = 'tx_rollup_id',
-  TX_ROLLUP_BATCH_CONTENT = 'tx_rollup_batch_content',
   OP_INCREASE_PAID_STORAGE = 'increase_paid_storage',
   OP_UPDATE_CONSENSUS_KEY = 'update_consensus_key',
   OP_DRAIN_DELEGATE = 'drain_delegate',
@@ -246,8 +241,6 @@ export const kindMapping: { [key: number]: string } = {
   0x01: 'seed_nonce_revelation',
   0x05: 'proposals',
   0x6f: 'register_global_constant',
-  0x96: 'tx_rollup_origination',
-  0x97: 'tx_rollup_submit_batch',
   0x9e: 'transfer_ticket',
   0x70: 'set_deposits_limit',
   0x71: 'increase_paid_storage',

diff --git a/packages/taquito-local-forging/src/decoder.ts b/packages/taquito-local-forging/src/decoder.ts
@@ -20,9 +20,6 @@ import {
   smartContractAddressDecoder,
   smartRollupAddressDecoder,
   smartRollupCommitmentHashDecoder,
-  txRollupBatchContentDecoder,
-  txRollupIdDecoder,
-  txRollupOriginationParamDecoder,
   tz1Decoder,
   valueParameterDecoder,
   zarithDecoder,
@@ -48,8 +45,6 @@ import {
   SeedNonceRevelationSchema,
   TransactionSchema,
   TransferTicketSchema,
-  TxRollupOriginationSchema,
-  TxRollupSubmitBatchSchema,
   SetDepositsLimitSchema,
   SmartRollupOriginateSchema,
   SmartRollupAddMessagesSchema,
@@ -84,9 +79,6 @@ export const decoders: { [key: string]: Decoder } = {
   [CODEC.INT16]: int16Decoder,
   [CODEC.BLOCK_PAYLOAD_HASH]: blockPayloadHashDecoder,
   [CODEC.ENTRYPOINT]: entrypointNameDecoder,
-  [CODEC.TX_ROLLUP_ORIGINATION_PARAM]: txRollupOriginationParamDecoder,
-  [CODEC.TX_ROLLUP_ID]: txRollupIdDecoder,
-  [CODEC.TX_ROLLUP_BATCH_CONTENT]: txRollupBatchContentDecoder,
   [CODEC.BURN_LIMIT]: burnLimitDecoder,
   [CODEC.DEPOSITS_LIMIT]: depositsLimitDecoder,
   [CODEC.PVM_KIND]: pvmKindDecoder,
@@ -119,10 +111,6 @@ decoders[CODEC.OP_REGISTER_GLOBAL_CONSTANT] = (val: Uint8ArrayConsumer) =>
   schemaDecoder(decoders)(RegisterGlobalConstantSchema)(val);
 decoders[CODEC.OP_TRANSFER_TICKET] = (val: Uint8ArrayConsumer) =>
   schemaDecoder(decoders)(TransferTicketSchema)(val);
-decoders[CODEC.OP_TX_ROLLUP_ORIGINATION] = (val: Uint8ArrayConsumer) =>
-  schemaDecoder(decoders)(TxRollupOriginationSchema)(val);
-decoders[CODEC.OP_TX_ROLLUP_SUBMIT_BATCH] = (val: Uint8ArrayConsumer) =>
-  schemaDecoder(decoders)(TxRollupSubmitBatchSchema)(val);
 decoders[CODEC.OP_INCREASE_PAID_STORAGE] = (val: Uint8ArrayConsumer) =>
   schemaDecoder(decoders)(IncreasePaidStorageSchema)(val);
 decoders[CODEC.OP_UPDATE_CONSENSUS_KEY] = (val: Uint8ArrayConsumer) =>

diff --git a/packages/taquito-local-forging/src/encoder.ts b/packages/taquito-local-forging/src/encoder.ts
@@ -19,9 +19,6 @@ import {
   smartContractAddressEncoder,
   smartRollupAddressEncoder,
   smartRollupCommitmentHashEncoder,
-  txRollupBatchContentEncoder,
-  txRollupIdEncoder,
-  txRollupOriginationParamEncoder,
   tz1Encoder,
   valueParameterEncoder,
   zarithEncoder,
@@ -47,8 +44,6 @@ import {
   SeedNonceRevelationSchema,
   TransactionSchema,
   TransferTicketSchema,
-  TxRollupOriginationSchema,
-  TxRollupSubmitBatchSchema,
   SmartRollupOriginateSchema,
   SmartRollupExecuteOutboxMessageSchema,
   SmartRollupAddMessagesSchema,
@@ -80,9 +75,6 @@ export const encoders: { [key: string]: Encoder<any> } = {
   [CODEC.INT16]: int16Encoder,
   [CODEC.BLOCK_PAYLOAD_HASH]: blockPayloadHashEncoder,
   [CODEC.ENTRYPOINT]: entrypointNameEncoder,
-  [CODEC.TX_ROLLUP_ORIGINATION_PARAM]: txRollupOriginationParamEncoder,
-  [CODEC.TX_ROLLUP_ID]: txRollupIdEncoder,
-  [CODEC.TX_ROLLUP_BATCH_CONTENT]: txRollupBatchContentEncoder,
   [CODEC.BURN_LIMIT]: burnLimitEncoder,
   [CODEC.PVM_KIND]: pvmKindEncoder,
   [CODEC.PADDED_BYTES]: paddedBytesEncoder,
@@ -105,10 +97,6 @@ encoders[CODEC.OP_REGISTER_GLOBAL_CONSTANT] = (val: any) =>
   schemaEncoder(encoders)(RegisterGlobalConstantSchema)(val);
 encoders[CODEC.OP_TRANSFER_TICKET] = (val: any) =>
   schemaEncoder(encoders)(TransferTicketSchema)(val);
-encoders[CODEC.OP_TX_ROLLUP_ORIGINATION] = (val: any) =>
-  schemaEncoder(encoders)(TxRollupOriginationSchema)(val);
-encoders[CODEC.OP_TX_ROLLUP_SUBMIT_BATCH] = (val: any) =>
-  schemaEncoder(encoders)(TxRollupSubmitBatchSchema)(val);
 encoders[CODEC.OP_INCREASE_PAID_STORAGE] = (val: any) =>
   schemaEncoder(encoders)(IncreasePaidStorageSchema)(val);
 encoders[CODEC.OP_UPDATE_CONSENSUS_KEY] = (val: any) =>

diff --git a/packages/taquito-local-forging/src/schema/operation.ts b/packages/taquito-local-forging/src/schema/operation.ts
@@ -113,26 +113,6 @@ export const TransferTicketSchema = {
   entrypoint: CODEC.ENTRYPOINT,
 };
 
-export const TxRollupOriginationSchema = {
-  source: CODEC.PKH,
-  fee: CODEC.ZARITH,
-  counter: CODEC.ZARITH,
-  gas_limit: CODEC.ZARITH,
-  storage_limit: CODEC.ZARITH,
-  tx_rollup_origination: CODEC.TX_ROLLUP_ORIGINATION_PARAM,
-};
-
-export const TxRollupSubmitBatchSchema = {
-  source: CODEC.PKH,
-  fee: CODEC.ZARITH,
-  counter: CODEC.ZARITH,
-  gas_limit: CODEC.ZARITH,
-  storage_limit: CODEC.ZARITH,
-  rollup: CODEC.TX_ROLLUP_ID,
-  content: CODEC.TX_ROLLUP_BATCH_CONTENT,
-  burn_limit: CODEC.BURN_LIMIT,
-};
-
 export const IncreasePaidStorageSchema = {
   source: CODEC.PKH,
   fee: CODEC.ZARITH,

diff --git a/packages/taquito-local-forging/src/taquito-local-forging.ts b/packages/taquito-local-forging/src/taquito-local-forging.ts
@@ -58,11 +58,6 @@ export class LocalForger implements Forger {
           continue;
         } else if (content.kind === 'transaction' && diff[0] === 'parameters') {
           continue;
-        } else if (
-          content.kind === ('tx_rollup_submit_batch' as unknown) &&
-          diff[0] === 'burn_limit'
-        ) {
-          continue;
         } else {
           throw new InvalidOperationSchemaError(content, `missing properties "${diff.join(', ')}"`);
         }

diff --git a/packages/taquito-local-forging/src/validator.ts b/packages/taquito-local-forging/src/validator.ts
@@ -13,8 +13,6 @@ import {
   AttestationSchema,
   EndorsementSchema,
   TransferTicketSchema,
-  TxRollupOriginationSchema,
-  TxRollupSubmitBatchSchema,
   IncreasePaidStorageSchema,
   UpdateConsensusKeySchema,
   DrainDelegateSchema,
@@ -38,8 +36,6 @@ type OperationKind =
   | OpKind.PROPOSALS
   | OpKind.REGISTER_GLOBAL_CONSTANT
   | OpKind.TRANSFER_TICKET
-  | OpKind.TX_ROLLUP_ORIGINATION
-  | OpKind.TX_ROLLUP_SUBMIT_BATCH
   | OpKind.INCREASE_PAID_STORAGE
   | OpKind.UPDATE_CONSENSUS_KEY
   | OpKind.DRAIN_DELEGATE
@@ -61,8 +57,6 @@ const OperationKindMapping = {
   proposals: ProposalsSchema,
   register_global_constant: RegisterGlobalConstantSchema,
   transfer_ticket: TransferTicketSchema,
-  tx_rollup_origination: TxRollupOriginationSchema,
-  tx_rollup_submit_batch: TxRollupSubmitBatchSchema,
   increase_paid_storage: IncreasePaidStorageSchema,
   update_consensus_key: UpdateConsensusKeySchema,
   drain_delegate: DrainDelegateSchema,

diff --git a/packages/taquito-michel-codec/src/michelson-typecheck.ts b/packages/taquito-michel-codec/src/michelson-typecheck.ts
@@ -410,7 +410,6 @@ function assertDataValidInternal(d: MichelsonData, t: MichelsonType, ctx: Contex
             'SECP256K1PublicKeyHash',
             'P256PublicKeyHash',
             'ContractHash',
-            'TxRollupL2Address',
             'RollupAddress'
           ) !== null
         ) {

diff --git a/packages/taquito-michel-codec/src/utils.ts b/packages/taquito-michel-codec/src/utils.ts
@@ -274,8 +274,7 @@ export type TezosIDType =
   | 'P256Signature'
   | 'GenericSignature'
   | 'ChainID'
-  | 'RollupAddress'
-  | 'TxRollupL2Address';
+  | 'RollupAddress';
 
 export type TezosIDPrefix = [number, number[]]; // payload length, prefix
 
@@ -309,7 +308,6 @@ export const tezosPrefix: Record<TezosIDType, TezosIDPrefix> = {
   GenericSignature: [64, [4, 130, 43]], // sig(96)
   ChainID: [4, [87, 82, 0]],
   RollupAddress: [20, [1, 128, 120, 31]],
-  TxRollupL2Address: [20, [6, 161, 166]],
 };
 
 export function checkDecodeTezosID<T extends TezosIDType[]>(

diff --git a/packages/taquito-michelson-encoder/src/schema/types.ts b/packages/taquito-michelson-encoder/src/schema/types.ts
@@ -21,8 +21,7 @@ export type BaseTokenSchema = {
     | 'chest'
     | 'chest_key'
     | 'signature'
-    | 'unit'
-    | 'tx_rollup_l2_address';
+    | 'unit';
   schema: string;
 };
 export type OrTokenSchema = { __michelsonType: 'or'; schema: Record<string, TokenSchema> };