Skip to content

Commit

Permalink
v.0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gagarin55 committed May 10, 2016
1 parent d8aa7fa commit 9778e07
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/waves.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
app {
product = "Scorex"
release = "Waves"
version = "0.1.3-RC1"
version = "0.1.3"
consensusAlgo = "nxt"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ import scorex.utils.NTP
class WavesTransactionModule(implicit override val settings: TransactionSettings with Settings, application: Application)
extends SimpleTransactionModule() {

//TODO: remove
override def createPayment(sender: PrivateKeyAccount, recipient: Account, amount: Long, fee: Long): PaymentTransaction = {
val time = NTP.correctedTime()
val sig = PaymentTransaction.generateSignature(sender, recipient, amount, fee, time)

val senderPubKey = Base58.encode(sender.publicKey)
val signature = Base58.encode(sig)

val payment = new PaymentTransaction(new PublicKeyAccount(sender.publicKey), recipient, amount, fee, time, sig)
if (blockStorage.state.isValid(payment)) onNewOffchainTransaction(payment)
payment
}

/**
* Publish signed payment transaction which generated outside node
*/
Expand Down
4 changes: 2 additions & 2 deletions waves-testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"dataDir": "/tmp/scorex/waves/data",
"rpcPort": 6869,
"rpcAllowed": [],
"blockGenerationDelay": 10000,
"blockGenerationDelay": 15000,
"cors": true,
"maxRollback": 100,
"history": "blockchain",
"offlineGeneration": true
"offlineGeneration": false
}

0 comments on commit 9778e07

Please sign in to comment.