Merge pull request #111 from BitGo/WIN-1013-add-wallet-contracts-arbe…

…th-and-opeth

feat(eth-multisig-v4): add arbeth and opeth wallet contract

contracts/coins/ArbethWalletSimple.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.20;
+import '../Forwarder.sol';
+import '../ERC20Interface.sol';
+import '../WalletSimple.sol';
+
+/**
+ *
+ * WalletSimple
+ * ============
+ *
+ * Basic multi-signer wallet designed for use in a co-signing environment where 2 signatures are required to move funds.
+ * Typically used in a 2-of-3 signing configuration. Uses ecrecover to allow for 2 signatures in a single transaction.
+ *
+ * The first signature is created on the operation hash (see Data Formats) and passed to sendMultiSig/sendMultiSigToken
+ * The signer is determined by verifyMultiSig().
+ *
+ * The second signature is created by the submitter of the transaction and determined by msg.signer.
+ *
+ * Data Formats
+ * ============
+ *
+ * The signature is created with ethereumjs-util.ecsign(operationHash).
+ * Like the eth_sign RPC call, it packs the values as a 65-byte array of [r, s, v].
+ * Unlike eth_sign, the message is not prefixed.
+ *
+ * The operationHash the result of keccak256(prefix, toAddress, value, data, expireTime).
+ * For ether transactions, `prefix` is "ARBETH".
+ * For token transaction, `prefix` is "ARBETH-ERC20" and `data` is the tokenContractAddress.
+ *
+ *
+ */
+contract ArbethWalletSimple is WalletSimple {
+  /**
+   * Get the network identifier that signers must sign over
+   * This provides protection signatures being replayed on other chains
+   */
+  function getNetworkId() internal override pure returns (string memory) {
+    return 'ARBETH';
+  }
+
+  /**
+   * Get the network identifier that signers must sign over for token transfers
+   * This provides protection signatures being replayed on other chains
+   */
+  function getTokenNetworkId() internal override pure returns (string memory) {
+    return 'ARBETH-ERC20';
+  }
+
+  /**
+   * Get the network identifier that signers must sign over for batch transfers
+   * This provides protection signatures being replayed on other chains
+   */
+  function getBatchNetworkId() internal override pure returns (string memory) {
+    return 'ARBETH-Batch';
+  }
+}

contracts/coins/OpethWalletSimple.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.20;
+import '../Forwarder.sol';
+import '../ERC20Interface.sol';
+import '../WalletSimple.sol';
+
+/**
+ *
+ * WalletSimple
+ * ============
+ *
+ * Basic multi-signer wallet designed for use in a co-signing environment where 2 signatures are required to move funds.
+ * Typically used in a 2-of-3 signing configuration. Uses ecrecover to allow for 2 signatures in a single transaction.
+ *
+ * The first signature is created on the operation hash (see Data Formats) and passed to sendMultiSig/sendMultiSigToken
+ * The signer is determined by verifyMultiSig().
+ *
+ * The second signature is created by the submitter of the transaction and determined by msg.signer.
+ *
+ * Data Formats
+ * ============
+ *
+ * The signature is created with ethereumjs-util.ecsign(operationHash).
+ * Like the eth_sign RPC call, it packs the values as a 65-byte array of [r, s, v].
+ * Unlike eth_sign, the message is not prefixed.
+ *
+ * The operationHash the result of keccak256(prefix, toAddress, value, data, expireTime).
+ * For ether transactions, `prefix` is "OPETH".
+ * For token transaction, `prefix` is "OPETH-ERC20" and `data` is the tokenContractAddress.
+ *
+ *
+ */
+contract OpethWalletSimple is WalletSimple {
+  /**
+   * Get the network identifier that signers must sign over
+   * This provides protection signatures being replayed on other chains
+   */
+  function getNetworkId() internal override pure returns (string memory) {
+    return 'OPETH';
+  }
+
+  /**
+   * Get the network identifier that signers must sign over for token transfers
+   * This provides protection signatures being replayed on other chains
+   */
+  function getTokenNetworkId() internal override pure returns (string memory) {
+    return 'OPETH-ERC20';
+  }
+
+  /**
+   * Get the network identifier that signers must sign over for batch transfers
+   * This provides protection signatures being replayed on other chains
+   */
+  function getBatchNetworkId() internal override pure returns (string memory) {
+    return 'OPETH-Batch';
+  }
+}

test/gas.js

@@ -178,7 +178,7 @@ describe(`Wallet Operations Gas Usage`, function () {
 
   it('WalletSimple send batch [ @skip-on-coverage ]', async function () {
     const gasUsageByBatchSize = [
-      101810, 113113, 124451, 135753, 147126, 158442, 169709, 181023, 192397,
+      101810, 113113, 124451, 135753, 147126, 158442, 169709, 181023, 192338,
       203641
     ];
 

test/walletSimple.js

@@ -29,6 +29,8 @@ const RskWalletSimple = artifacts.require('./RskWalletSimple.sol');
 const EtcWalletSimple = artifacts.require('./EtcWalletSimple.sol');
 const CeloWalletSimple = artifacts.require('./CeloWalletSimple.sol');
 const PolygonWalletSimple = artifacts.require('./PolygonWalletSimple.sol');
+const ArbethWalletSimple = artifacts.require('./ArbethWalletSimple.sol');
+const OpethWalletSimple = artifacts.require('./OpethWalletSimple.sol');
 const Fail = artifacts.require('./Fail.sol');
 const GasGuzzler = artifacts.require('./GasGuzzler.sol');
 const GasHeavy = artifacts.require('./GasHeavy.sol');
@@ -79,6 +81,20 @@ const coins = [
     nativeBatchPrefix: 'POLYGON-Batch',
     tokenPrefix: 'POLYGON-ERC20',
     WalletSimple: PolygonWalletSimple
+  },
+  {
+    name: 'Arbeth',
+    nativePrefix: 'ARBETH',
+    nativeBatchPrefix: 'ARBETH-Batch',
+    tokenPrefix: 'ARBETH-ERC20',
+    WalletSimple: ArbethWalletSimple
+  },
+  {
+    name: 'Opeth',
+    nativePrefix: 'OPETH',
+    nativeBatchPrefix: 'OPETH-Batch',
+    tokenPrefix: 'OPETH-ERC20',
+    WalletSimple: OpethWalletSimple
   }
 ];