Merge pull request #63 from cosmology-tech/trim-code-structure

Trim code structure

networks/ethereum/README.md

@@ -12,7 +12,6 @@
    <a href="https://github.com/cosmology-tech/interchainjs/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
 </p>
 
-
 Transaction codec and client to communicate with ethereum blockchain.
 
 ## Usage
@@ -23,7 +22,7 @@ npm install @interchainjs/ethereum
 
 ## Implementations
 
-- **eip712 signer** from `@interchainjs/ethereum/eip712` (Not fully implemented yet)
+- **eip712 signer** from `@interchainjs/ethereum/eip712`
 
 ## License
 

networks/injective/package.json

@@ -16,7 +16,6 @@
     "directory": "dist"
   },
   "scripts": {
-    "test": "jest --config ./jest.config.js --verbose --bail",
     "copy": "copyfiles -f ../../LICENSE-MIT ../../LICENSE-Apache README.md package.json dist",
     "clean": "rimraf dist/**",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",

networks/injective/src/defaults.ts

@@ -11,15 +11,18 @@ import { toDecoder } from '@interchainjs/cosmos/utils';
 import { BaseAccount } from '@interchainjs/cosmos-types/cosmos/auth/v1beta1/auth';
 import { PubKey as Secp256k1PubKey } from '@interchainjs/cosmos-types/cosmos/crypto/secp256k1/keys';
 import { EthAccount } from '@interchainjs/cosmos-types/injective/types/v1beta1/account';
-import { defaultSignerConfig as EthereumSignerConfig } from '@interchainjs/ethereum/defaults';
 import { Eip712Doc } from '@interchainjs/ethereum/types';
 import { IKey, SignerConfig } from '@interchainjs/types';
 
 import { DomainOptions, EthereumChainId } from './types';
+import { bytes as assertBytes } from '@noble/hashes/_assert';
+import { keccak_256 } from '@noble/hashes/sha3';
+import { computeAddress } from '@ethersproject/transactions';
+import { Key } from '@interchainjs/utils';
 
 export const defaultPublicKeyConfig: SignerConfig['publicKey'] = {
   isCompressed: CosmosSignerConfig.publicKey.isCompressed,
-  hash: EthereumSignerConfig.publicKey.hash,
+  hash: (publicKey: Key) => Key.fromHex(computeAddress(publicKey.value))
 };
 
 export const defaultEncodePublicKey = (key: IKey): EncodedMessage => {
@@ -50,15 +53,25 @@ export const defaultSignerOptions: Record<string, Required<SignerOptions>> = {
     ...CosmosSignerConfig,
     message: {
       ...CosmosSignerConfig.message,
-      hash: EthereumSignerConfig.message.hash,
+      hash: (message: Uint8Array) => {
+        const hashed = keccak_256(message);
+        assertBytes(hashed);
+        return hashed;
+      },
     },
     publicKey: defaultPublicKeyConfig,
     encodePublicKey: defaultEncodePublicKey,
     parseAccount: defaultAccountParser,
     prefix: 'inj',
   },
   Ethereum: {
-    ...EthereumSignerConfig,
+    message: {
+      hash: (message: Uint8Array) => {
+        const hashed = keccak_256(message);
+        assertBytes(hashed);
+        return hashed;
+      },
+    },
     publicKey: defaultPublicKeyConfig,
     encodePublicKey: defaultEncodePublicKey,
     parseAccount: defaultAccountParser,