remove minerBrockerRegistry in context

LoopringSecondary · Sep 28, 2018 · 44c837b · 44c837b
1 parent 2aedf2d
commit 44c837b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 18 deletions.
diff --git a/abi/IMinerInterceptor.abi → abi/Errors.abi b/abi/IMinerInterceptor.abi → abi/Errors.abi
diff --git a/abi/IExchange.abi b/abi/IExchange.abi
diff --git a/abi/IFeeHolder.abi b/abi/IFeeHolder.abi
@@ -1 +1 @@
-[{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"feeBalances","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"batch","type":"bytes32[]"}],"name":"batchAddFeeBalances","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawToken","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawBurned","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"token","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"TokenWithdrawn","type":"event"}]
+[{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"feeBalances","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"batch","type":"bytes32[]"}],"name":"batchAddFeeBalances","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawBurned","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawToken","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"token","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"TokenWithdrawn","type":"event"}]
diff --git a/abi/IMinerRegistry.abi b/abi/IMinerRegistry.abi
diff --git a/abi/IOrderInterceptor.abi b/abi/IOrderInterceptor.abi
diff --git a/abi/IRingInterceptor.abi b/abi/IRingInterceptor.abi
diff --git a/abi/IRingSubmitter.abi b/abi/IRingSubmitter.abi
@@ -1 +1 @@
-[{"constant":false,"inputs":[{"name":"data","type":"bytes"}],"name":"submitRings","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"FEE_PERCENTAGE_BASE","outputs":[{"name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_ringIndex","type":"uint256"},{"indexed":true,"name":"_broker","type":"address"},{"indexed":true,"name":"_feeRecipient","type":"address"},{"components":[{"name":"orderHash","type":"bytes32"},{"name":"owner","type":"address"},{"name":"tokenS","type":"address"},{"name":"amountS","type":"uint256"},{"name":"split","type":"uint256"},{"name":"feeAmount","type":"uint256"}],"indexed":false,"name":"_fills","type":"tuple[]"}],"name":"RingMined","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"ringHash","type":"bytes32"}],"name":"InvalidRing","type":"event"}]
+[{"constant":false,"inputs":[{"name":"data","type":"bytes"}],"name":"submitRings","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"FEE_PERCENTAGE_BASE","outputs":[{"name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_ringIndex","type":"uint256"},{"indexed":true,"name":"_ringHash","type":"bytes32"},{"indexed":true,"name":"_feeRecipient","type":"address"},{"components":[{"name":"orderHash","type":"bytes32"},{"name":"owner","type":"address"},{"name":"tokenS","type":"address"},{"name":"amountS","type":"uint256"},{"name":"split","type":"uint256"},{"name":"feeAmount","type":"uint256"}],"indexed":false,"name":"_fills","type":"tuple[]"}],"name":"RingMined","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"ringHash","type":"bytes32"}],"name":"InvalidRing","type":"event"}]
diff --git a/abi/MultihashUtil.abi b/abi/MultihashUtil.abi
@@ -1 +1 @@
-[{"constant":true,"inputs":[],"name":"SIG_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"}]
+[{"constant":true,"inputs":[],"name":"SIG_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"SIG_712_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"}]
diff --git a/abi/TradeDelegateData.abi b/abi/TradeDelegateData.abi
diff --git a/src/context.ts b/src/context.ts
@@ -30,7 +30,6 @@ export class Context {
               blockTimestamp: number,
               tradeDelegateAddress: string,
               orderBrokerRegistryAddress: string,
-              minerBrokerRegistryAddress: string,
               orderRegistryAddress: string,
               feeHolderAddress: string,
               orderBookAddress: string,
@@ -67,7 +66,6 @@ export class Context {
 
     this.tradeDelegate = this.TradeDelegateContract.at(tradeDelegateAddress);
     this.orderBrokerRegistry = this.BrokerRegistryContract.at(orderBrokerRegistryAddress);
-    this.minerBrokerRegistry = this.BrokerRegistryContract.at(minerBrokerRegistryAddress);
     this.orderRegistry = this.OrderRegistryContract.at(orderRegistryAddress);
     this.feeHolder = this.FeeHolderContract.at(feeHolderAddress);
     this.orderBook = this.OrderBookContract.at(orderBookAddress);

diff --git a/src/mining.ts b/src/mining.ts
@@ -32,14 +32,14 @@ export class Mining {
     if (!this.miner) {
       this.miner = this.feeRecipient;
     } else {
-      const [registered, interceptor] = await this.context.minerBrokerRegistry.getBroker(
-        this.feeRecipient,
-        this.miner,
-      );
-      // assert(registered, "miner unregistered");
-      if (registered) {
-        this.interceptor = interceptor;
-      }
+      // const [registered, interceptor] = await this.context.minerBrokerRegistry.getBroker(
+      //   this.feeRecipient,
+      //   this.miner,
+      // );
+      // // assert(registered, "miner unregistered");
+      // if (registered) {
+      //   this.interceptor = interceptor;
+      // }
     }
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"feeBalances","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"batch","type":"bytes32[]"}],"name":"batchAddFeeBalances","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawToken","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawBurned","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"token","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"TokenWithdrawn","type":"event"}]
		[{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"feeBalances","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"batch","type":"bytes32[]"}],"name":"batchAddFeeBalances","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawBurned","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"value","type":"uint256"}],"name":"withdrawToken","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"token","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"TokenWithdrawn","type":"event"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"constant":false,"inputs":[{"name":"data","type":"bytes"}],"name":"submitRings","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"FEE_PERCENTAGE_BASE","outputs":[{"name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_ringIndex","type":"uint256"},{"indexed":true,"name":"_broker","type":"address"},{"indexed":true,"name":"_feeRecipient","type":"address"},{"components":[{"name":"orderHash","type":"bytes32"},{"name":"owner","type":"address"},{"name":"tokenS","type":"address"},{"name":"amountS","type":"uint256"},{"name":"split","type":"uint256"},{"name":"feeAmount","type":"uint256"}],"indexed":false,"name":"_fills","type":"tuple[]"}],"name":"RingMined","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"ringHash","type":"bytes32"}],"name":"InvalidRing","type":"event"}]
		[{"constant":false,"inputs":[{"name":"data","type":"bytes"}],"name":"submitRings","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"FEE_PERCENTAGE_BASE","outputs":[{"name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_ringIndex","type":"uint256"},{"indexed":true,"name":"_ringHash","type":"bytes32"},{"indexed":true,"name":"_feeRecipient","type":"address"},{"components":[{"name":"orderHash","type":"bytes32"},{"name":"owner","type":"address"},{"name":"tokenS","type":"address"},{"name":"amountS","type":"uint256"},{"name":"split","type":"uint256"},{"name":"feeAmount","type":"uint256"}],"indexed":false,"name":"_fills","type":"tuple[]"}],"name":"RingMined","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"ringHash","type":"bytes32"}],"name":"InvalidRing","type":"event"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"constant":true,"inputs":[],"name":"SIG_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"}]
		[{"constant":true,"inputs":[],"name":"SIG_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"SIG_712_PREFIX","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"}]