From 07926ded6ef194969ffe26e3879d6e86a0eb9c50 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Tue, 2 Oct 2018 17:32:28 +1000 Subject: Introduce Metamask Subprovider. MM has a number of inconsistencies with other providers when implementing the JSON RPC interface. This subprovider wraps those nuances so they do not leak into the rest of our code --- packages/types/src/index.ts | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'packages/types/src/index.ts') diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 3ae0536d5..2f148f0e6 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -143,16 +143,6 @@ export enum SignatureType { NSignatureTypes, } -/** - * The type of the Signer implementation. Some signer implementations use different message prefixes or implement different - * eth_sign behaviour (e.g Metamask). Default assumes a spec compliant `eth_sign`. - */ -export enum SignerType { - Default = 'DEFAULT', - Ledger = 'LEDGER', - Metamask = 'METAMASK', -} - export enum AssetProxyId { ERC20 = '0xf47261b0', ERC721 = '0x02571792', -- cgit v1.2.3 From 3e2fe40a11919f09f1f454c71f02aaa147b46b0c Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 4 Oct 2018 17:32:54 +1000 Subject: Add eth_signTypedData support to our wallet subproviders --- packages/types/src/index.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'packages/types/src/index.ts') diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 2f148f0e6..d57bdfb6f 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -589,3 +589,18 @@ export interface Metadata { externalTypeToLink: ExternalTypeToLink; externalExportToLink: ExternalExportToLink; } + +export interface EIP712Parameter { + name: string; + type: string; +} + +export interface EIP712Types { + [key: string]: EIP712Parameter[]; +} +export interface EIP712TypedData { + types: EIP712Types; + domain: any; + message: any; + primaryType: string; +} -- cgit v1.2.3 From 75d274f330dc0c18577e764ca77ffb36d5a3f27e Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 5 Oct 2018 11:45:53 +1000 Subject: Return SignedOrder from signing utils. Create a helper back in EIP712Utils for code cleanup. Moved constants in order-utils into the constants object --- packages/types/src/index.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'packages/types/src/index.ts') diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index d57bdfb6f..6bc966ba1 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -41,6 +41,15 @@ export interface SignedOrder extends Order { signature: string; } +/** + * ZeroExTransaction for use with 0x Exchange executeTransaction + */ +export interface ZeroExTransaction { + salt: BigNumber; + signerAddress: string; + data: string; +} + /** * Elliptic Curve signature */ @@ -598,9 +607,16 @@ export interface EIP712Parameter { export interface EIP712Types { [key: string]: EIP712Parameter[]; } + +export type EIP712ObjectValue = string | number | EIP712Object; + +export interface EIP712Object { + [key: string]: EIP712ObjectValue; +} + export interface EIP712TypedData { types: EIP712Types; - domain: any; - message: any; + domain: EIP712Object; + message: EIP712Object; primaryType: string; } -- cgit v1.2.3