diff --git a/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts b/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts index d2dbd49f93..c7ff6aa7a5 100644 --- a/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts +++ b/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts @@ -12,7 +12,6 @@ import { ENDING_SIGNAL_BYTE, EXTERNALLY_OWNED_ACCOUNT, EXTERNALLY_OWNED_ACCOUNT_TYPE_ID, - FORCE_OPEN_ACCOUNT, GAS_BUDGET, TRANSFER_ALLOWANCE, } from '@core/layer-2' @@ -26,7 +25,7 @@ export function getLayer2MetadataForTransfer(layer2Address: string): string { metadataStream.writeUInt64('gasBudget', GAS_BUDGET) const encodedAddress = encodeAddress(layer2Address.toLowerCase()) - const smartContractParameters = Object.entries({ a: encodedAddress, c: FORCE_OPEN_ACCOUNT }) + const smartContractParameters = Object.entries({ a: encodedAddress }) const parameters = encodeSmartContractParameters(smartContractParameters) metadataStream.writeBytes('smartContractParameters', parameters.length, parameters) diff --git a/packages/shared/lib/core/layer-2/actions/parseLayer2MetadataForTransfer.ts b/packages/shared/lib/core/layer-2/actions/parseLayer2MetadataForTransfer.ts index 22f2e7c89c..22da255a2c 100644 --- a/packages/shared/lib/core/layer-2/actions/parseLayer2MetadataForTransfer.ts +++ b/packages/shared/lib/core/layer-2/actions/parseLayer2MetadataForTransfer.ts @@ -1,12 +1,6 @@ import { Converter } from '@core/utils' import { ReadStream } from '@iota/util.js' -import { - Allowance, - CONTRACT_FUNCTIONS, - FORCE_OPEN_ACCOUNT, - ILayer2TransferAllowanceMetadata, - TARGET_CONTRACTS, -} from '@core/layer-2' +import { Allowance, CONTRACT_FUNCTIONS, ILayer2TransferAllowanceMetadata, TARGET_CONTRACTS } from '@core/layer-2' import { NativeTokenAmount, TOKEN_ID_BYTE_LENGTH } from '@core/token' import { ILayer2Allowance } from '@core/layer-2/interfaces/layer2-allowance.interface' @@ -20,7 +14,6 @@ export function parseLayer2MetadataForTransfer(metadata: Uint8Array): ILayer2Tra const smartContractParameters = parseSmartContractParameters(readStream) const ethereumAddress = '0x' + smartContractParameters['a'].substring(2) - const forceOpenAccount = smartContractParameters['c'] === FORCE_OPEN_ACCOUNT const allowance = parseAllowance(readStream) @@ -30,7 +23,6 @@ export function parseLayer2MetadataForTransfer(metadata: Uint8Array): ILayer2Tra contractFunction: CONTRACT_FUNCTIONS[contractFunction] ?? Converter.decimalToHex(contractFunction, true), gasBudget: gasBudget.toString(), ethereumAddress, - forceOpenAccount, baseTokenAmount: allowance?.baseTokenAmount, nativeTokens: allowance?.nativeTokens, } diff --git a/packages/shared/lib/core/layer-2/constants/force-open-account.constant.ts b/packages/shared/lib/core/layer-2/constants/force-open-account.constant.ts deleted file mode 100644 index a665be678c..0000000000 --- a/packages/shared/lib/core/layer-2/constants/force-open-account.constant.ts +++ /dev/null @@ -1 +0,0 @@ -export const FORCE_OPEN_ACCOUNT = 'ff' diff --git a/packages/shared/lib/core/layer-2/constants/index.ts b/packages/shared/lib/core/layer-2/constants/index.ts index 74fce0e282..c60aee2dc9 100644 --- a/packages/shared/lib/core/layer-2/constants/index.ts +++ b/packages/shared/lib/core/layer-2/constants/index.ts @@ -5,7 +5,6 @@ export * from './transfer-allowance.constant' export * from './empty-buffer.constants' export * from './gas-budget.constant' export * from './network-address.constant' -export * from './force-open-account.constant' export * from './externally-owned-account.constant' export * from './ending-signal-bytes.constant' export * from './accounts-contract.constant' diff --git a/packages/shared/lib/core/layer-2/constants/network-address.constant.ts b/packages/shared/lib/core/layer-2/constants/network-address.constant.ts index b3b948146e..e01b5439c5 100644 --- a/packages/shared/lib/core/layer-2/constants/network-address.constant.ts +++ b/packages/shared/lib/core/layer-2/constants/network-address.constant.ts @@ -8,7 +8,7 @@ export const NETWORK_ADDRESS: Readonly<{ [key in NetworkType]?: { [key in Destin }, [NetworkType.Devnet]: { [DestinationNetwork.Shimmer]: '-', - [DestinationNetwork.ShimmerTestnetEvm]: 'rms1pzewp89fyvxsxw80uaa0fuvypltvr93g2grzfxx9z7xex70yywa9k7vskka', + [DestinationNetwork.ShimmerTestnetEvm]: 'rms1pp4kmrl9n9yy9n049x7kk8h4atm0tu76redhj5wrc2jsskk2vukwxvtgk9u', }, [NetworkType.PrivateNet]: { [DestinationNetwork.Shimmer]: '-', diff --git a/packages/shared/lib/core/layer-2/interfaces/layer2-transfer-allowance-metadata.interface.ts b/packages/shared/lib/core/layer-2/interfaces/layer2-transfer-allowance-metadata.interface.ts index 48540420e3..0bb7c4760c 100644 --- a/packages/shared/lib/core/layer-2/interfaces/layer2-transfer-allowance-metadata.interface.ts +++ b/packages/shared/lib/core/layer-2/interfaces/layer2-transfer-allowance-metadata.interface.ts @@ -2,5 +2,4 @@ import { ILayer2SmartContractCallData } from '@core/layer-2/interfaces/layer2-sm export interface ILayer2TransferAllowanceMetadata extends ILayer2SmartContractCallData { ethereumAddress: string - forceOpenAccount: boolean } diff --git a/packages/shared/lib/core/layer-2/tests/parseLayer2MetadataForTransfer.test.ts b/packages/shared/lib/core/layer-2/tests/parseLayer2MetadataForTransfer.test.ts index 65d67f1f4f..9bc10f1487 100644 --- a/packages/shared/lib/core/layer-2/tests/parseLayer2MetadataForTransfer.test.ts +++ b/packages/shared/lib/core/layer-2/tests/parseLayer2MetadataForTransfer.test.ts @@ -11,7 +11,6 @@ describe('Function: parseLayer2MetadataForTransfer.ts', () => { targetContract: 'Accounts', contractFunction: 'transferAllowanceTo', gasBudget: '500000', - forceOpenAccount: true, ethereumAddress: '0x807d707f59f1345e1063dbb64f2495d1491283a0', baseTokenAmount: '1000000', nativeTokens: [], @@ -29,7 +28,6 @@ describe('Function: parseLayer2MetadataForTransfer.ts', () => { targetContract: 'Accounts', contractFunction: 'transferAllowanceTo', gasBudget: '18446744073709551615', - forceOpenAccount: true, ethereumAddress: '0x8cc8112290f8c350a60e1afdb8379c686e2a5bb3', baseTokenAmount: '0', nativeTokens: [ diff --git a/packages/shared/lib/core/layer-2/utils/parseLayer2Metadata.ts b/packages/shared/lib/core/layer-2/utils/parseLayer2Metadata.ts index 59747913e9..f5a676e97c 100644 --- a/packages/shared/lib/core/layer-2/utils/parseLayer2Metadata.ts +++ b/packages/shared/lib/core/layer-2/utils/parseLayer2Metadata.ts @@ -12,7 +12,6 @@ export function parseLayer2Metadata(metadata: string): Layer2Metadata { contractFunction: parsedData.contractFunction, gasBudget: parsedData.gasBudget, ethereumAddress: parsedData.ethereumAddress, - forceOpenAccount: parsedData.forceOpenAccount, } } @@ -44,8 +43,4 @@ function validate(data: Layer2Metadata): void { if (data.ethereumAddress && typeof data.ethereumAddress !== 'string') { throw new Error('Invalid ethereumAddress') } - - if (data.forceOpenAccount && typeof data.forceOpenAccount !== 'boolean') { - throw new Error('Invalid forceOpenAccount') - } }