@machinomy/contracts
Advanced tools
Comparing version 4.0.9 to 4.0.10
@@ -11,47 +11,15 @@ import * as BigNumber from 'bignumber.js'; | ||
}; | ||
settlementPeriod: { | ||
(): Promise<BigNumber.BigNumber>; | ||
call(): Promise<BigNumber.BigNumber>; | ||
state: { | ||
(): Promise<[string, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber]>; | ||
call(): Promise<[string, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber, BigNumber.BigNumber]>; | ||
}; | ||
nonce: { | ||
(): Promise<BigNumber.BigNumber>; | ||
call(): Promise<BigNumber.BigNumber>; | ||
}; | ||
lastUpdate: { | ||
(): Promise<BigNumber.BigNumber>; | ||
call(): Promise<BigNumber.BigNumber>; | ||
}; | ||
toReceiver: { | ||
(): Promise<BigNumber.BigNumber>; | ||
call(): Promise<BigNumber.BigNumber>; | ||
}; | ||
toSender: { | ||
(): Promise<BigNumber.BigNumber>; | ||
call(): Promise<BigNumber.BigNumber>; | ||
}; | ||
canUpdate: { | ||
(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
call(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
}; | ||
canClose: { | ||
(_toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
call(_toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
}; | ||
isSettling: { | ||
(): Promise<boolean>; | ||
call(): Promise<boolean>; | ||
}; | ||
paymentDigest: { | ||
(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
call(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
call(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
}; | ||
typeDigest: { | ||
(_type: string, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
call(_type: string, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber): Promise<string>; | ||
}; | ||
update: { | ||
(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<number>; | ||
request(_nonce: number | BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): { | ||
(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): Promise<number>; | ||
request(_nonce: BigNumber.BigNumber, _toSender: BigNumber.BigNumber, _toReceiver: BigNumber.BigNumber, _senderSig: string, _receiverSig: string): { | ||
method: string; | ||
@@ -58,0 +26,0 @@ params: [{ |
@@ -16,6 +16,6 @@ import * as BigNumber from 'bignumber.js'; | ||
execute: { | ||
(_registry: string, _sharedStateCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_registry: string, _sharedStateCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_registry: string, _sharedStateCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string): Promise<number>; | ||
request(_registry: string, _sharedStateCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string): { | ||
(_registry: string, _lineupCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_registry: string, _lineupCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_registry: string, _lineupCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string): Promise<number>; | ||
request(_registry: string, _lineupCF: string, _proof: string, _destination: string, _value: BigNumber.BigNumber, _data: string): { | ||
method: string; | ||
@@ -22,0 +22,0 @@ params: [{ |
@@ -12,6 +12,6 @@ import * as BigNumber from 'bignumber.js'; | ||
execute: { | ||
(sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber, options?: Web3.CallData): Promise<void>; | ||
estimateGas(sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber): Promise<number>; | ||
request(sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber): { | ||
(a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber, options?: Web3.CallData): Promise<void>; | ||
estimateGas(a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber): Promise<number>; | ||
request(a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber): { | ||
method: string; | ||
@@ -18,0 +18,0 @@ params: [{ |
@@ -12,6 +12,6 @@ import * as BigNumber from 'bignumber.js'; | ||
execute: { | ||
(_token: string, sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_token: string, sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_token: string, sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber): Promise<number>; | ||
request(_token: string, sender: string, receiver: string, toSender: BigNumber.BigNumber, toReceiver: BigNumber.BigNumber): { | ||
(_token: string, a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(_token: string, a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber, options?: Web3.CallData): Promise<void>; | ||
estimateGas(_token: string, a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber): Promise<number>; | ||
request(_token: string, a: string, b: string, amountA: BigNumber.BigNumber, amountB: BigNumber.BigNumber): { | ||
method: string; | ||
@@ -18,0 +18,0 @@ params: [{ |
@@ -15,3 +15,7 @@ import * as BigNumber from 'bignumber.js'; | ||
}; | ||
execute: { | ||
isUnanimous: { | ||
(_hash: string, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
call(_hash: string, _senderSig: string, _receiverSig: string): Promise<boolean>; | ||
}; | ||
doCall: { | ||
(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
@@ -28,7 +32,7 @@ call(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<void>; | ||
}; | ||
executeDelegate: { | ||
(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string): Promise<number>; | ||
request(destination: string, value: BigNumber.BigNumber, data: string, senderSig: string, receiverSig: string): { | ||
doDelegate: { | ||
(destination: string, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<truffle.TransactionResult>; | ||
call(destination: string, data: string, senderSig: string, receiverSig: string, options?: Web3.CallData): Promise<void>; | ||
estimateGas(destination: string, data: string, senderSig: string, receiverSig: string): Promise<number>; | ||
request(destination: string, data: string, senderSig: string, receiverSig: string): { | ||
method: string; | ||
@@ -35,0 +39,0 @@ params: [{ |
@@ -73,2 +73,31 @@ import * as BigNumber from 'bignumber.js'; | ||
}; | ||
DidOpen: { | ||
(filter?: { | ||
channelId?: string; | ||
sender?: string; | ||
receiver?: string; | ||
value?: BigNumber.BigNumber; | ||
}, options?: Web3.FilterObject): Web3.FilterResult; | ||
}; | ||
DidDeposit: { | ||
(filter?: { | ||
channelId?: string; | ||
deposit?: BigNumber.BigNumber; | ||
}, options?: Web3.FilterObject): Web3.FilterResult; | ||
}; | ||
DidClaim: { | ||
(filter?: { | ||
channelId?: string; | ||
}, options?: Web3.FilterObject): Web3.FilterResult; | ||
}; | ||
DidStartSettling: { | ||
(filter?: { | ||
channelId?: string; | ||
}, options?: Web3.FilterObject): Web3.FilterResult; | ||
}; | ||
DidSettle: { | ||
(filter?: { | ||
channelId?: string; | ||
}, options?: Web3.FilterObject): Web3.FilterResult; | ||
}; | ||
send: (value: BigNumber.BigNumber | number) => Promise<truffle.TransactionResult>; | ||
@@ -75,0 +104,0 @@ sendTransaction: (opts: Web3.CallData) => Promise<truffle.TransactionResult>; |
@@ -5,1 +5,8 @@ import * as BigNumber from 'bignumber.js'; | ||
export declare function txPrice(web3: Web3, log: truffle.TransactionResult): BigNumber.BigNumber; | ||
export declare class Gaser { | ||
web3: Web3; | ||
constructor(_web3: Web3); | ||
gasDiff<A>(name: string, account: string, fn: () => A, forceLog?: boolean): Promise<A>; | ||
logGas(name: string, promisedTx: Promise<truffle.TransactionResult>, forceLog?: boolean): Promise<truffle.TransactionResult>; | ||
private log(gasCost, name, forceLog?); | ||
} |
@@ -7,2 +7,28 @@ "use strict"; | ||
exports.txPrice = txPrice; | ||
const LOG_GAS_COST = true; // Boolean(process.env.LOG_GAS_COST) | ||
const GAS_COST_IN_USD = 0.000012; // 1 ETH = 600 USD | ||
class Gaser { | ||
constructor(_web3) { | ||
this.web3 = _web3; | ||
} | ||
async gasDiff(name, account, fn, forceLog = false) { | ||
let before = this.web3.eth.getBalance(account); | ||
let result = fn(); | ||
let after = this.web3.eth.getBalance(account); | ||
let gasCost = before.minus(after).div(this.web3.eth.gasPrice.div(0.2)).toNumber(); | ||
this.log(gasCost, name, forceLog); | ||
return result; | ||
} | ||
async logGas(name, promisedTx, forceLog = false) { | ||
let tx = await promisedTx; | ||
this.log(tx.receipt.gasUsed, name, forceLog); | ||
return tx; | ||
} | ||
log(gasCost, name, forceLog = false) { | ||
if (LOG_GAS_COST || forceLog) { | ||
console.log(`GAS: ${name}: ($${(gasCost * GAS_COST_IN_USD).toFixed(2)})`, gasCost); | ||
} | ||
} | ||
} | ||
exports.Gaser = Gaser; | ||
//# sourceMappingURL=index.js.map |
{ | ||
"name": "@machinomy/contracts", | ||
"version": "4.0.9", | ||
"version": "4.0.10", | ||
"description": "Machinomy contracts managed by Truffle", | ||
@@ -5,0 +5,0 @@ "license": "Apache-2.0", |
@@ -15,5 +15,5 @@ # Machinomy contracts [![Build Status][travis-img]][travis] [![Coverage Status][coveralls-img]][coveralls] | ||
## Workflow | ||
Use [testrpc](https://github.com/ethereumjs/testrpc) for fast development. Start testrpc by command: | ||
Use [ganache-cli](https://github.com/trufflesuite/ganache-cli) for fast development. Start it: | ||
``` | ||
$ testrpc | ||
$ ganache-cli | ||
``` | ||
@@ -20,0 +20,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
907531
82
21128