Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transfer workload include burns #2773

Merged
merged 2 commits into from
Mar 20, 2020
Merged

transfer workload include burns #2773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c42399
go/txsource/workload: extract "fund sign submit" into helper function
ptrus Mar 19, 2020
78fc3cb
go/txsource/transfer: inlcude burn transactions in transfer workload
ptrus Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/2773.feature.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
go/txsource/transfer: inlcude burn transactions in transfer workload
80 changes: 12 additions & 68 deletions go/oasis-node/cmd/debug/txsource/workload/delegation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,42 +80,14 @@ func (d *delegation) doEscrowTx(ctx context.Context, rng *rand.Rand, cnsc consen

tx := staking.NewAddEscrowTx(d.accounts[selectedIdx].reckonedNonce, &transaction.Fee{}, escrow)
d.accounts[selectedIdx].reckonedNonce++

// Estimate gas.
gas, err := cnsc.EstimateGas(ctx, &consensus.EstimateGasRequest{
Caller: d.accounts[selectedIdx].signer.Public(),
Transaction: tx,
})
if err != nil {
return fmt.Errorf("failed to estimate gas: %w", err)
}
tx.Fee.Gas = gas
feeAmount := int64(gas) * gasPrice
if err = tx.Fee.Amount.FromInt64(feeAmount); err != nil {
return fmt.Errorf("fee amount from int64: %w", err)
}

// Fund account to cover Escrow fees.
// We only do one escrow per account at a time, so `delegateAmount`
// funds (that are Escrowed) should already be in the balance.
fundAmount := int64(gas) * gasPrice // transaction costs
if err = transferFunds(ctx, d.logger, cnsc, d.fundingAccount, d.accounts[selectedIdx].signer.Public(), fundAmount); err != nil {
return fmt.Errorf("account funding failure: %w", err)
}

// Sign transaction.
signedTx, err := transaction.Sign(d.accounts[selectedIdx].signer, tx)
if err != nil {
return fmt.Errorf("transaction.Sign: %w", err)
}
d.logger.Debug("submitting escrow transaction",
"from", d.accounts[selectedIdx].signer.Public(),
"to", d.accounts[selectedIdx].delegatedTo,
)

// Submit transaction.
if err = cnsc.SubmitTx(ctx, signedTx); err != nil {
return fmt.Errorf("cnsc.SubmitTx: %w", err)
if err := fundSignAndSubmitTx(ctx, d.logger, cnsc, d.accounts[selectedIdx].signer, tx, d.fundingAccount); err != nil {
d.logger.Error("failed to sign and submit escrow transaction",
"tx", tx,
"signer", d.accounts[selectedIdx].signer,
)
return fmt.Errorf("failed to sign and submit tx: %w", err)
}

return nil
Expand Down Expand Up @@ -166,40 +138,12 @@ func (d *delegation) doReclaimEscrowTx(ctx context.Context, rng *rand.Rand, cnsc
}
tx := staking.NewReclaimEscrowTx(d.accounts[selectedIdx].reckonedNonce, &transaction.Fee{}, reclaim)
d.accounts[selectedIdx].reckonedNonce++

// Estimate gas.
gas, err := cnsc.EstimateGas(ctx, &consensus.EstimateGasRequest{
Caller: d.accounts[selectedIdx].signer.Public(),
Transaction: tx,
})
if err != nil {
return fmt.Errorf("failed to estimate gas: %w", err)
}
tx.Fee.Gas = gas
feeAmount := int64(gas) * gasPrice
if err = tx.Fee.Amount.FromInt64(feeAmount); err != nil {
return fmt.Errorf("fee amount from int64: %w", err)
}

// Fund account to cover reclaim escrow fees.
fundAmount := int64(gas) * gasPrice // transaction costs
if err = transferFunds(ctx, d.logger, cnsc, d.fundingAccount, d.accounts[selectedIdx].signer.Public(), fundAmount); err != nil {
return fmt.Errorf("account funding failure: %w", err)
}

signedTx, err := transaction.Sign(d.accounts[selectedIdx].signer, tx)
if err != nil {
return fmt.Errorf("transaction.Sign: %w", err)
}

d.logger.Debug("submitting reclaim escrow transaction",
"reclaim_from", d.accounts[selectedIdx].delegatedTo,
"account", d.accounts[selectedIdx].signer.Public(),
)

// Submit transaction.
if err = cnsc.SubmitTx(ctx, signedTx); err != nil {
return fmt.Errorf("cnsc.SubmitTx: %w", err)
if err = fundSignAndSubmitTx(ctx, d.logger, cnsc, d.accounts[selectedIdx].signer, tx, d.fundingAccount); err != nil {
d.logger.Error("failed to sign and submit reclaim escrow transaction",
"tx", tx,
"signer", d.accounts[selectedIdx].signer,
)
return fmt.Errorf("failed to sign and submit tx: %w", err)
}

// Query debonding end epoch for the account.
Expand Down
94 changes: 19 additions & 75 deletions go/oasis-node/cmd/debug/txsource/workload/registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,30 +243,12 @@ func (r *registration) Run( // nolint: gocyclo
// Estimate gas and submit transaction.
tx := registry.NewRegisterEntityTx(entityAccs[i].reckonedNonce, &transaction.Fee{}, sigEntity)
entityAccs[i].reckonedNonce++
gas, err := cnsc.EstimateGas(ctx, &consensus.EstimateGasRequest{
Caller: entityAccs[i].signer.Public(),
Transaction: tx,
})
if err != nil {
return fmt.Errorf("failed to estimate gas: %w", err)
}
tx.Fee.Gas = gas
feeAmount := int64(gas) * gasPrice
if err = tx.Fee.Amount.FromInt64(feeAmount); err != nil {
return fmt.Errorf("fee amount from int64: %w", err)
}

// Fund entity account to cover registration fees.
if err = transferFunds(ctx, registrationLogger, cnsc, fundingAccount, entityAccs[i].signer.Public(), feeAmount); err != nil {
return fmt.Errorf("account funding failure: %w", err)
}

signedTx, err := transaction.Sign(entityAccs[i].signer, tx)
if err != nil {
return fmt.Errorf("transaction.Sign: %w", err)
}
if err = cnsc.SubmitTx(ctx, signedTx); err != nil {
return fmt.Errorf("cnsc.SubmitTx: %w", err)
if err := fundSignAndSubmitTx(ctx, registrationLogger, cnsc, entityAccs[i].signer, tx, fundingAccount); err != nil {
registrationLogger.Error("failed to sign and submit regsiter entity transaction",
"tx", tx,
"signer", entityAccs[i].signer,
)
return fmt.Errorf("failed to sign and submit tx: %w", err)
}

// Register runtime.
Expand All @@ -280,31 +262,13 @@ func (r *registration) Run( // nolint: gocyclo
}

tx := registry.NewRegisterRuntimeTx(entityAccs[i].reckonedNonce, &transaction.Fee{}, sigRuntime)
gas, err := cnsc.EstimateGas(ctx, &consensus.EstimateGasRequest{
Caller: entityAccs[i].signer.Public(),
Transaction: tx,
})
if err != nil {
return fmt.Errorf("failed to estimate gas: %w", err)
}
tx.Fee.Gas = gas
feeAmount := int64(gas) * gasPrice
if err = tx.Fee.Amount.FromInt64(feeAmount); err != nil {
return fmt.Errorf("fee amount from uint64: %w", err)
}

// Fund entity account to cover entity registration fees.
if err = transferFunds(ctx, registrationLogger, cnsc, fundingAccount, entityAccs[i].signer.Public(), feeAmount); err != nil {
return fmt.Errorf("account funding failure: %w", err)
}

entityAccs[i].reckonedNonce++
signedTx, err := transaction.Sign(entityAccs[i].signer, tx)
if err != nil {
return fmt.Errorf("transaction.Sign: %w", err)
}
if err = cnsc.SubmitTx(ctx, signedTx); err != nil {
return fmt.Errorf("cnsc.SubmitTx: %w", err)
if err := fundSignAndSubmitTx(ctx, registrationLogger, cnsc, entityAccs[i].signer, tx, fundingAccount); err != nil {
registrationLogger.Error("failed to sign and submit register runtime transaction",
"tx", tx,
"signer", entityAccs[i].signer,
)
return fmt.Errorf("failed to sign and submit tx: %w", err)
}
}
}
Expand All @@ -331,35 +295,15 @@ func (r *registration) Run( // nolint: gocyclo

// Register node.
tx := registry.NewRegisterNodeTx(selectedNode.reckonedNonce, &transaction.Fee{}, sigNode)
gas, err := cnsc.EstimateGas(ctx, &consensus.EstimateGasRequest{
Caller: selectedNode.id.NodeSigner.Public(),
Transaction: tx,
})
if err != nil {
return fmt.Errorf("failed to estimate gas: %w", err)
}
tx.Fee.Gas = gas
feeAmount := gas * gasPrice
if err = tx.Fee.Amount.FromUint64(uint64(feeAmount)); err != nil {
return fmt.Errorf("fee amount from uint64: %w", err)
}

// Fund node account to cover registration fees.
if err = transferFunds(ctx, registrationLogger, cnsc, fundingAccount, selectedNode.id.NodeSigner.Public(), int64(feeAmount)); err != nil {
return fmt.Errorf("account funding failure: %w", err)
}
selectedNode.reckonedNonce++

signedTx, err := transaction.Sign(selectedNode.id.NodeSigner, tx)
if err != nil {
return fmt.Errorf("transaction.Sign: %w", err)
}
registrationLogger.Debug("submitting registration",
"node", selectedNode.nodeDesc,
)
if err = cnsc.SubmitTx(ctx, signedTx); err != nil {
return fmt.Errorf("cnsc.SubmitTx: %w", err)
if err := fundSignAndSubmitTx(ctx, registrationLogger, cnsc, selectedNode.id.NodeSigner, tx, fundingAccount); err != nil {
registrationLogger.Error("failed to sign and submit register node transaction",
"tx", tx,
"signer", selectedNode.id.NodeSigner,
)
return fmt.Errorf("failed to sign and submit tx: %w", err)
}

registrationLogger.Debug("registered node",
"node", selectedNode.nodeDesc,
)
Expand Down
Loading