Use beta ethers.js

packages/client/src/index.ts

@@ -12,11 +12,7 @@ import {
   fromWasmSync
 } from '@oasislabs/service';
 import { Deoxysii, encrypt, decrypt } from '@oasislabs/confidential';
-import {
-  Web3Gateway,
-  EthereumCoder,
-  EthereumWallet as Wallet
-} from '@oasislabs/ethereum';
+import { Web3Gateway, EthereumWallet as Wallet } from '@oasislabs/ethereum';
 import workspace from './workspace';
 
 const oasis = {
@@ -35,7 +31,6 @@ const oasis = {
     encrypt,
     decrypt,
     OasisCoder,
-    EthereumCoder,
     header,
     keccak256,
     idl: {

packages/ethereum/package.json

@@ -34,11 +34,11 @@
     ]
   },
   "dependencies": {
+    "@ethersproject/wallet": "^5.0.0-beta.129",
     "@oasislabs/common": "^1.0.0-rc.6",
     "@oasislabs/service": "^1.0.0-rc.9",
     "@oasislabs/test": "^1.0.0-rc.9",
     "axios": "^0.18.0",
-    "ethers": "^4.0.27",
     "eventemitter3": "^3.1.2",
     "js-sha3": "^0.8.0",
     "node-localstorage": "^1.3.1",

packages/ethereum/src/gateway/index.ts

@@ -90,7 +90,7 @@ export class Web3Gateway implements OasisGateway {
       data: bytes.toHex(request.data)
     });
     let tx = await this._inner.web3.provider.transactions!.create(txParams);
-    let rawTx = await this._inner.wallet!.sign(tx);
+    let rawTx = await this._inner.wallet!.signTransaction(tx);
     let txHash = await this.eth.sendRawTransaction(rawTx);
     let receipt = await this.eth.getTransactionReceipt(txHash);
 
@@ -129,7 +129,7 @@ export class Web3Gateway implements OasisGateway {
       to: bytes.toHex(request.address!)
     });
     let tx = await this._inner.web3.provider.transactions!.create(txParams);
-    let rawTx = await this._inner.wallet!.sign(tx);
+    let rawTx = await this._inner.wallet!.signTransaction(tx);
     let executionPayload = await this.oasis.invoke(rawTx);
 
     let error = undefined;
@@ -235,6 +235,6 @@ type Web3GatewayInner = {
 };
 
 export interface Wallet {
-  sign(tx: Transaction): Promise<string>;
+  signTransaction(tx: Transaction): Promise<string>;
   address: string;
 }

packages/ethereum/src/gateway/transaction.ts

@@ -12,6 +12,13 @@ export class TransactionFactory {
 
     if (!tx.value) {
       tx.value = '0x00';
+    } else {
+      let value = tx.value.replace(/^0x/, '');
+      // ethers.js requires an even-length hex string.
+      if (value.length % 2 === 1) {
+        value = '0' + value;
+      }
+      tx.value = '0x' + value;
     }
 
     let promises: Promise<any>[] = [];

packages/ethereum/src/gateway/web3/provider.ts

@@ -89,7 +89,7 @@ export default class Web3Provider {
     const tx = await this.transactions!.create(
       params[0] as UnpreparedTransaction
     );
-    const rawTx = await this.wallet!.sign(tx);
+    const rawTx = await this.wallet!.signTransaction(tx);
     return this.ws.request({
       method: 'eth_sendRawTransaction',
       params: [rawTx]

packages/ethereum/src/index.ts

@@ -1,6 +1,4 @@
-import { EthereumCoder } from './coder';
 import { Web3Gateway } from './gateway';
-import { ethers } from 'ethers';
+import { Wallet } from '@ethersproject/wallet';
 
-const EthereumWallet = ethers.Wallet;
-export { EthereumCoder, Web3Gateway, EthereumWallet };
+export { Web3Gateway, Wallet as EthereumWallet };