Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update evm testnet address #5789

Merged
merged 3 commits into from Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -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'
Expand All @@ -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)

Expand Down
@@ -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'

Expand All @@ -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)

Expand All @@ -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,
}
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion packages/shared/lib/core/layer-2/constants/index.ts
Expand Up @@ -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'
Expand Up @@ -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]: '-',
Expand Down
Expand Up @@ -2,5 +2,4 @@ import { ILayer2SmartContractCallData } from '@core/layer-2/interfaces/layer2-sm

export interface ILayer2TransferAllowanceMetadata extends ILayer2SmartContractCallData {
ethereumAddress: string
forceOpenAccount: boolean
}
Expand Up @@ -11,7 +11,6 @@ describe('Function: parseLayer2MetadataForTransfer.ts', () => {
targetContract: 'Accounts',
contractFunction: 'transferAllowanceTo',
gasBudget: '500000',
forceOpenAccount: true,
ethereumAddress: '0x807d707f59f1345e1063dbb64f2495d1491283a0',
baseTokenAmount: '1000000',
nativeTokens: [],
Expand All @@ -29,7 +28,6 @@ describe('Function: parseLayer2MetadataForTransfer.ts', () => {
targetContract: 'Accounts',
contractFunction: 'transferAllowanceTo',
gasBudget: '18446744073709551615',
forceOpenAccount: true,
ethereumAddress: '0x8cc8112290f8c350a60e1afdb8379c686e2a5bb3',
baseTokenAmount: '0',
nativeTokens: [
Expand Down
5 changes: 0 additions & 5 deletions packages/shared/lib/core/layer-2/utils/parseLayer2Metadata.ts
Expand Up @@ -12,7 +12,6 @@ export function parseLayer2Metadata(metadata: string): Layer2Metadata {
contractFunction: parsedData.contractFunction,
gasBudget: parsedData.gasBudget,
ethereumAddress: parsedData.ethereumAddress,
forceOpenAccount: parsedData.forceOpenAccount,
}
}

Expand Down Expand Up @@ -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')
}
}