Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Goshimmer_without_tipselection
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
COLLET Ismael
Goshimmer_without_tipselection
Commits
97c6d957
Commit
97c6d957
authored
5 years ago
by
Hans Moog
Browse files
Options
Downloads
Patches
Plain Diff
Feat: ledgerstate now automatically books into the correct reality
parent
070f4c32
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
packages/ledgerstate/ledgerstate.go
+3
-10
3 additions, 10 deletions
packages/ledgerstate/ledgerstate.go
packages/ledgerstate/reality.go
+16
-4
16 additions, 4 deletions
packages/ledgerstate/reality.go
packages/ledgerstate/transfer_output.go
+14
-9
14 additions, 9 deletions
packages/ledgerstate/transfer_output.go
with
33 additions
and
23 deletions
packages/ledgerstate/ledgerstate.go
+
3
−
10
View file @
97c6d957
package
ledgerstate
import
(
"fmt"
"reflect"
"sort"
...
...
@@ -100,19 +99,13 @@ func (ledgerState *LedgerState) GetReality(id RealityId) *objectstorage.CachedOb
}
func
(
ledgerState
*
LedgerState
)
BookTransfer
(
transfer
*
Transfer
)
{
transferHash
:=
transfer
.
GetHash
()
inputs
:=
ledgerState
.
getTransferInputs
(
transfer
)
outputs
:=
transfer
.
GetOutputs
()
targetReality
:=
ledgerState
.
getTargetReality
(
inputs
)
targetReality
.
Get
()
.
(
*
Reality
)
.
bookTransfer
(
transfer
.
GetHash
(),
inputs
,
transfer
.
GetOutputs
())
targetReality
.
Persist
()
targetReality
.
Release
()
for
_
,
x
:=
range
inputs
{
x
.
Get
()
.
(
*
TransferOutput
)
.
addConsumer
(
transferHash
)
}
// mark inputs as consumed / changed spent/unspent booking
targetReality
.
Get
()
.
(
*
Reality
)
.
bookTransferOutputs
(
transferHash
,
outputs
)
fmt
.
Println
(
"BOOK TO: "
,
targetReality
.
Get
())
}
func
(
ledgerState
*
LedgerState
)
MergeRealities
(
realityIds
...
RealityId
)
*
objectstorage
.
CachedObject
{
...
...
This diff is collapsed.
Click to expand it.
packages/ledgerstate/reality.go
+
16
−
4
View file @
97c6d957
...
...
@@ -2,6 +2,7 @@ package ledgerstate
import
(
"encoding/binary"
"fmt"
"github.com/iotaledger/goshimmer/packages/errors"
...
...
@@ -114,17 +115,28 @@ func (reality *Reality) checkTransferBalances(inputs []*objectstorage.CachedObje
}
func
(
reality
*
Reality
)
BookTransfer
(
transfer
*
Transfer
)
error
{
transferHash
:=
transfer
.
GetHash
()
inputs
:=
reality
.
ledgerState
.
getTransferInputs
(
transfer
)
outputs
:=
transfer
.
GetOutputs
()
return
reality
.
bookTransfer
(
transfer
.
GetHash
(),
reality
.
ledgerState
.
getTransferInputs
(
transfer
),
transfer
.
GetOutputs
())
}
func
(
reality
*
Reality
)
bookTransfer
(
transferHash
TransferHash
,
inputs
[]
*
objectstorage
.
CachedObject
,
outputs
map
[
AddressHash
][]
*
ColoredBalance
)
error
{
if
err
:=
reality
.
checkTransferBalances
(
inputs
,
outputs
);
err
!=
nil
{
return
err
}
// process outputs
// 1. determine target reality
// 2. check if transfer is valid within target reality
// 3. book new transfer outputs into target reality
// 4. mark inputs as spent / trigger double spend detection
// 5. release objects
// register consumer
for
_
,
x
:=
range
inputs
{
x
.
Get
()
.
(
*
TransferOutput
)
.
addConsumer
(
transferHash
)
}
reality
.
bookTransferOutputs
(
transferHash
,
outputs
)
fmt
.
Println
(
"BOOK TO: "
,
reality
)
return
nil
}
...
...
This diff is collapsed.
Click to expand it.
packages/ledgerstate/transfer_output.go
+
14
−
9
View file @
97c6d957
...
...
@@ -4,6 +4,8 @@ import (
"encoding/binary"
"sync"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/objectstorage"
"github.com/iotaledger/goshimmer/packages/stringify"
)
...
...
@@ -53,26 +55,27 @@ func (transferOutput *TransferOutput) GetBalances() []*ColoredBalance {
return
transferOutput
.
balances
}
func
(
transferOutput
*
TransferOutput
)
addConsumer
(
consumer
TransferHash
)
bool
{
func
(
transferOutput
*
TransferOutput
)
addConsumer
(
consumer
TransferHash
)
error
{
transferOutput
.
consumersMutex
.
RLock
()
if
_
,
exist
:=
transferOutput
.
consumers
[
consumer
];
exist
{
transferOutput
.
consumersMutex
.
RUnlock
()
return
false
}
else
{
transferOutput
.
consumersMutex
.
RUnlock
()
transferOutput
.
consumersMutex
.
Lock
()
if
len
(
transferOutput
.
consumers
)
==
0
{
transferOutput
.
markAsSpent
()
if
err
:=
transferOutput
.
markAsSpent
();
err
!=
nil
{
return
err
}
}
else
{
panic
(
"DOUBLE SPEND DETECTED"
)
}
transferOutput
.
consumers
[
consumer
]
=
void
transferOutput
.
consumersMutex
.
Unlock
()
return
true
}
return
nil
}
func
(
transferOutput
*
TransferOutput
)
getConsumers
()
(
consumers
map
[
TransferHash
]
empty
)
{
...
...
@@ -83,13 +86,13 @@ func (transferOutput *TransferOutput) getConsumers() (consumers map[TransferHash
return
}
func
(
transferOutput
*
TransferOutput
)
markAsSpent
()
{
func
(
transferOutput
*
TransferOutput
)
markAsSpent
()
error
{
currentBookingKey
:=
generateTransferOutputBookingStorageKey
(
transferOutput
.
realityId
,
transferOutput
.
addressHash
,
false
,
transferOutput
.
transferHash
)
if
cachedTransferOutputBooking
,
err
:=
transferOutput
.
ledgerState
.
transferOutputBookings
.
Load
(
currentBookingKey
);
err
!=
nil
{
panic
(
err
)
return
err
}
else
if
!
cachedTransferOutputBooking
.
Exists
()
{
panic
(
"could not find TransferOutputBooking"
)
return
errors
.
New
(
"could not find TransferOutputBooking"
)
}
else
{
transferOutputBooking
:=
cachedTransferOutputBooking
.
Get
()
.
(
*
TransferOutputBooking
)
transferOutput
.
ledgerState
.
storeTransferOutputBooking
(
newTransferOutputBooking
(
transferOutputBooking
.
GetRealityId
(),
transferOutputBooking
.
GetAddressHash
(),
true
,
transferOutputBooking
.
GetTransferHash
()))
.
Release
()
...
...
@@ -97,6 +100,8 @@ func (transferOutput *TransferOutput) markAsSpent() {
cachedTransferOutputBooking
.
Delete
()
cachedTransferOutputBooking
.
Release
()
}
return
nil
}
func
(
transferOutput
*
TransferOutput
)
String
()
string
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment