Add ability to use LoomProvider with the /eth endpoint

e2e_support/genesis.json

@@ -1,12 +1,5 @@
 {
   "contracts": [
-    {	
-      "vm": "plugin",	
-      "format": "plugin",	
-      "name": "BluePrint",	
-      "location": "blueprint:0.0.1",	
-      "init": {}	
-    },
     {
       "vm": "plugin",
       "format": "plugin",
@@ -99,4 +92,4 @@
       }
     }
   ]
-}
+}

e2e_tests.sh

@@ -47,8 +47,8 @@ setup_dappchain() {
   $LOOM_BIN init -f
   cp -R $REPO_ROOT/e2e_support/* .
   cp -R $REPO_ROOT/e2e_support/tm-config/* chaindata/config/
-  mkdir -p contracts
-  cp $LOOM_BLUEPRINT_DIR/build/contracts/* contracts
+  #mkdir -p contracts
+  #cp $LOOM_BLUEPRINT_DIR/build/contracts/* contracts
 }
 
 start_chains() {
@@ -72,7 +72,7 @@ stop_chains() {
     kill -9 $LOOM_PID
     LOOM_PID=""
   fi
-  pkill -f "${LOOM_DIR}/contracts/blueprint.0.0.1" || true
+  #pkill -f "${LOOM_DIR}/contracts/blueprint.0.0.1" || true
 }
 
 run_tests() {
@@ -90,8 +90,8 @@ cleanup() {
 if [ "${TRAVIS:-}" ]; then
   mkdir -p $LOOM_DIR
 
-  setup_weave_blueprint
-  download_dappchain
+  #setup_weave_blueprint
+  #download_dappchain
 fi
 
 setup_dappchain

src/client.ts

@@ -21,7 +21,7 @@ import {
 } from './crypto-utils'
 import { Address, LocalAddress } from './address'
 import { WSRPCClient, IJSONRPCEvent } from './internal/ws-rpc-client'
-import { RPCClientEvent, IJSONRPCClient } from './internal/json-rpc-client'
+import { RPCClientEvent, IJSONRPCClient, IJSONRPCResponse } from './internal/json-rpc-client'
 import { sleep, parseUrl } from './helpers'
 
 export interface ITxHandlerResult {
@@ -81,7 +81,7 @@ export enum ClientEvent {
   /**
    * Exclusively used by loom-provider
    */
-  EVMEvent = 'evmEvent',
+  EVMEvent = 'message', // 'evmEvent',
   /**
    * Emitted when an error occurs that can't be relayed by other means.
    * Listener will receive IClientErrorEventArgs.
@@ -242,6 +242,7 @@ export class Client extends EventEmitter {
 
   private _writeClient: IJSONRPCClient
   private _readClient!: IJSONRPCClient
+  readonly isLegacy: boolean
 
   /** Broadcaster to use to send txs & receive results. */
   txBroadcaster: ITxBroadcaster
@@ -315,6 +316,8 @@ export class Client extends EventEmitter {
       )
     }
 
+    this.isLegacy = false === /eth$/.test(this._readClient.url)
+
     const emitContractEvent = (url: string, event: IJSONRPCEvent) =>
       this._emitContractEvent(url, event)
 
@@ -416,8 +419,8 @@ export class Client extends EventEmitter {
     const emitContractEvent = (url: string, event: IJSONRPCEvent) => {
       this._emitContractEvent(url, event, true)
     }
-
-    this._readClient.on(RPCClientEvent.EVMMessage, emitContractEvent)
+    const eventType = this.isLegacy ? RPCClientEvent.EVMMessage : RPCClientEvent.Message
+    this._readClient.on(eventType, emitContractEvent)
   }
 
   /**
@@ -442,6 +445,17 @@ export class Client extends EventEmitter {
     }
   }
 
+  /**
+   * Sends a JSON-RPC message.
+   * @param method RPC method name.
+   * @param params Parameter object or array.
+   * @returns A promise that will be resolved with the value of the result field (if any) in the
+   *          JSON-RPC response message.
+   */
+  async sendWeb3MsgAsync<T>(method: string, params: object | any[]): Promise<IJSONRPCResponse<T>> {
+    return this._readClient.sendAsync<IJSONRPCResponse<T>>(method, params)
+  }
+
   /**
    * Queries the receipt corresponding to a transaction hash
    *
@@ -555,7 +569,6 @@ export class Client extends EventEmitter {
       const envelope: EthFilterEnvelope = EthFilterEnvelope.deserializeBinary(
         bufferToProtobufBytes(result)
       )
-
       switch (envelope.getMessageCase()) {
         case EthFilterEnvelope.MessageCase.ETH_BLOCK_HASH_LIST:
           return envelope.getEthBlockHashList() as EthBlockHashList
@@ -675,12 +688,15 @@ export class Client extends EventEmitter {
    * @param method Method selected to the filter, can be "newHeads" or "logs"
    * @param filter JSON string of the filter
    */
-  evmSubscribeAsync(method: string, filterObject: Object): Promise<string> {
-    const filter = JSON.stringify(filterObject)
-    return this._readClient.sendAsync<string>('evmsubscribe', {
-      method,
-      filter
-    })
+  evmSubscribeAsync(method: string, params: Object | any[]): Promise<string> {
+    if (this.isLegacy) {
+      const filter = JSON.stringify(params)
+      return this._readClient.sendAsync<string>('evmsubscribe', {
+        method,
+        filter
+      })
+    }
+    return this._readClient.sendAsync<string>('eth_subscribe', params)
   }
 
   /**
@@ -691,9 +707,10 @@ export class Client extends EventEmitter {
    * @return boolean If true the subscription is removed with success
    */
   evmUnsubscribeAsync(id: string): Promise<boolean> {
-    return this._readClient.sendAsync<boolean>('evmunsubscribe', {
-      id
-    })
+    if (this.isLegacy) {
+      return this._readClient.sendAsync<boolean>('evmunsubscribe', { id })
+    }
+    return this._readClient.sendAsync<boolean>('eth_unsubscribe', [id])
   }
 
   /**
@@ -755,6 +772,12 @@ export class Client extends EventEmitter {
     } else if (result) {
       debugLog('Event', event.id, result)
 
+      // emit evm events as is (jsonrpc/ethereum)
+      if (!this.isLegacy && isEVM) {
+        this.emit(ClientEvent.EVMEvent, event)
+        return
+      }
+
       // Ugh, no built-in JSON->Protobuf marshaller apparently
       // https://github.com/google/protobuf/issues/1591 so gotta do this manually
       const eventArgs: IChainEventArgs = {

src/helpers.ts

@@ -131,7 +131,7 @@ export function setupProtocolsFromEndpoint(
 ): { writer: IJSONRPCClient; reader: IJSONRPCClient } {
   const protocol = selectProtocol(endpoint)
   const writerSuffix = protocol === JSONRPCProtocol.HTTP ? '/rpc' : '/websocket'
-  const readerSuffix = protocol === JSONRPCProtocol.HTTP ? '/query' : '/queryws'
+  const readerSuffix = protocol === JSONRPCProtocol.HTTP ? '/eth' : '/eth'
 
   const writer = createJSONRPCClient({
     protocols: [{ url: endpoint + writerSuffix }]

src/internal/ws-rpc-client.ts

@@ -35,14 +35,23 @@ export class WSRPCClient extends EventEmitter {
   private _isSubcribed: boolean = false
 
   protected _rpcId: number = 0
-  protected _getNextRequestId = () => (++this._rpcId).toString()
+
+  protected _getNextRequestId(): string {
+    const id = ++this._rpcId
+    // @ts-ignore
+    return this.isLegacy ? id.toString() : id
+  }
 
   requestTimeout: number
 
   get isSubscribed(): boolean {
     return this._isSubcribed
   }
 
+  get isLegacy() {
+    return /eth$/.test(this.url) === false
+  }
+
   /**
    *
    * @param url
@@ -206,16 +215,22 @@ export class WSRPCClient extends EventEmitter {
     const msgStr = message instanceof ArrayBuffer ? Buffer.from(message).toString() : message
     const msg = JSON.parse(msgStr)
 
-    // Events from native loomchain have the id equals 0
-    if (msg.id === '0') {
-      log('Loom Event arrived', msg)
-      this.emit(RPCClientEvent.Message, this.url, msg)
-    }
-
-    // Events from EVM have the id from the evmsubscribe command
-    if (/^0x.+$/.test(msg.id)) {
-      log('EVM Event arrived', msg)
-      this.emit(RPCClientEvent.EVMMessage, this.url, msg)
+    if (this.isLegacy) {
+      // Events from native loomchain have the id equals 0
+      if (msg.id === '0') {
+        log('Loom Event arrived', msg)
+        this.emit(RPCClientEvent.Message, this.url, msg)
+      }
+      // EVM Event old endpoint
+      else if (/^0x.+$/.test(msg.id)) {
+        this.emit(RPCClientEvent.EVMMessage, this.url, msg)
+      }
+    } else {
+      // EVM Event eth endpoint
+      if (msg.method === 'eth_subscription') {
+        log('EVM Event arrived', msg)
+        this.emit(RPCClientEvent.EVMMessage, msg)
+      }
     }
   }
 }