Skip to content

Commit

Permalink
Merge pull request #164 from renproject/feat/init-minted-amount
Browse files Browse the repository at this point in the history
Initialise minted amount
  • Loading branch information
jazg committed May 21, 2021
2 parents 9601676 + 4fceb3c commit a967ea0
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 5 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ require (
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/renproject/aw v0.4.1-0.20210413051002-6234359989ab
github.com/renproject/darknode v0.5.3-0.20210519054954-5c72cca4c7bc
github.com/renproject/darknode v0.5.3-0.20210521020553-0980fbdd6c7e
github.com/renproject/id v0.4.2
github.com/renproject/kv v1.1.2
github.com/renproject/multichain v0.3.9
github.com/renproject/multichain v0.3.10
github.com/renproject/pack v0.2.10
github.com/renproject/phi v0.1.0
github.com/renproject/surge v1.2.6
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1497,6 +1497,10 @@ github.com/renproject/darknode v0.5.3-0.20210507062710-c7737570dd0e h1:eCU4upLra
github.com/renproject/darknode v0.5.3-0.20210507062710-c7737570dd0e/go.mod h1:3tOymp05zc9iSje4fGLRC2YBX4ak7xMByGx6hmpsSPM=
github.com/renproject/darknode v0.5.3-0.20210519054954-5c72cca4c7bc h1:mJ+/hG4ESJzo1bapm+0a5B2DvCMxoxCoFl4rNMyu150=
github.com/renproject/darknode v0.5.3-0.20210519054954-5c72cca4c7bc/go.mod h1:ej0mfoHqO/5Bgzv3+uZGs8TCpoklDp6R1fmsnlgCYp0=
github.com/renproject/darknode v0.5.3-0.20210520000055-d790e9e2c332 h1:h2xaPspoSymlACGHuQuirjVD/+ZybSD5ECs7Kp4LhsQ=
github.com/renproject/darknode v0.5.3-0.20210520000055-d790e9e2c332/go.mod h1:EcO9klhL6ErMQjBeMFuEdN/7WNXUdpEwjERTsNGIWWo=
github.com/renproject/darknode v0.5.3-0.20210521020553-0980fbdd6c7e h1:wT1tSTXWOXHabazkl6GGCR++tWPvjEmiisEmRv9HOQg=
github.com/renproject/darknode v0.5.3-0.20210521020553-0980fbdd6c7e/go.mod h1:EcO9klhL6ErMQjBeMFuEdN/7WNXUdpEwjERTsNGIWWo=
github.com/renproject/hyperdrive v0.4.5 h1:mBZk8c9zZOuQd/etJRK1EXyYaC/S+w8QxaDjjP/rbmI=
github.com/renproject/hyperdrive v0.4.5/go.mod h1:ck1cKJ0M95xwfO0vuEj7ifDjNVYFrPvat5INU70wbUc=
github.com/renproject/id v0.4.2 h1:XseNDPPCJtsZjIWR7Qgf+zxy0Gt5xsLrfwpQxJt5wFQ=
Expand All @@ -1509,6 +1513,8 @@ github.com/renproject/multichain v0.3.8 h1:5f2odqN5byJ0KHsMqExKq2NKuCxKnLkPnDkp9
github.com/renproject/multichain v0.3.8/go.mod h1:cYQKfs4YqlIfy0iZGLt8EAmWafQ72KMokpNOuBygS+c=
github.com/renproject/multichain v0.3.9 h1:1JDB4zjC+sUJqCSiBZxiqQJSaI4tXlN9cJxju+gJYQk=
github.com/renproject/multichain v0.3.9/go.mod h1:cYQKfs4YqlIfy0iZGLt8EAmWafQ72KMokpNOuBygS+c=
github.com/renproject/multichain v0.3.10 h1:Tj0suIdNEvpPZAOmk+8RFlskEhWPgdfXS5KesWosqIo=
github.com/renproject/multichain v0.3.10/go.mod h1:cYQKfs4YqlIfy0iZGLt8EAmWafQ72KMokpNOuBygS+c=
github.com/renproject/pack v0.2.5/go.mod h1:pzX3Hc04RoPft89LaZJVp0xgngVGi90V7GvyC3mOGg4=
github.com/renproject/pack v0.2.9 h1:tZzun5KH83CK5+ebn+jNWyoQV3k8ARjGEP6vK2x4VSQ=
github.com/renproject/pack v0.2.9/go.mod h1:pzX3Hc04RoPft89LaZJVp0xgngVGi90V7GvyC3mOGg4=
Expand Down
8 changes: 7 additions & 1 deletion lightnode.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,13 @@ func New(options Options, ctx context.Context, logger logrus.FieldLogger, sqlDB
cacher := cacher.New(dispatcher, logger, ttlCache, opts, db)

compatStore := v0.NewCompatStore(db, client)
verifier := resolver.NewVerifier(verifierBindings)
hostChains := map[multichain.Chain]bool{}
for _, selector := range options.Whitelist {
if selector.IsLock() && selector.IsMint() {
hostChains[selector.Destination()] = true
}
}
verifier := resolver.NewVerifier(hostChains, verifierBindings)
resolverI := resolver.New(logger, cacher, multiStore, db, serverOptions, compatStore, bindings, verifier)
server := jsonrpc.NewServer(serverOptions, resolverI, resolver.NewValidator(verifierBindings, options.DistPubKey, compatStore, logger))
confirmer := confirmer.New(
Expand Down
66 changes: 64 additions & 2 deletions resolver/txChecker.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package resolver
import (
"context"
"database/sql"
"fmt"
"runtime"
"sort"
"sync"
"time"

Expand All @@ -14,6 +16,8 @@ import (
"github.com/renproject/darknode/tx"
"github.com/renproject/lightnode/db"
"github.com/renproject/lightnode/http"
"github.com/renproject/multichain"
"github.com/renproject/pack"
"github.com/renproject/phi"
"github.com/sirupsen/logrus"
)
Expand All @@ -34,19 +38,77 @@ type Verifier interface {

type verifier struct {
bindings binding.Bindings
contract *chainstate.Contract
}

func NewVerifier(bindings binding.Bindings) Verifier {
func NewVerifier(hostChains map[multichain.Chain]bool, bindings binding.Bindings) Verifier {
// Convert host chains map to sorted list.
chains := make([]string, 0, len(hostChains))
for chain := range hostChains {
chains = append(chains, string(chain))
}
sort.Strings(chains)

// The verification for burn transactions uses the cross-chain contract to
// verify the minted amount. As we do not keep track of the latest block
// state inside the Lightnode, we assume the burned amount never exceeds the
// tracked minted amount by setting it to the maximum U256 value.
minted := make([]engine.XStateMinted, 0, len(chains))
for _, chain := range chains {
minted = append(minted, engine.XStateMinted{
Chain: multichain.Chain(chain),
Amount: pack.MaxU256,
})
}
shardState, err := pack.Encode(engine.XStateShardAccount{
Nonce: pack.NewU256([32]byte{}),
Gnonces: []engine.XStateShardGnonce{},
})
if err != nil {
panic(fmt.Sprintf("encoding shard state: %v", err))
}
contractState, err := pack.Encode(engine.XState{
LatestHeight: pack.NewU256([32]byte{}),
GasCap: pack.NewU256([32]byte{}),
GasLimit: pack.NewU256([32]byte{}),
GasPrice: pack.NewU256([32]byte{}),
MinimumAmount: pack.NewU256([32]byte{}),
DustAmount: pack.NewU256([32]byte{}),
MintFee: 0,
BurnFee: 0,
Shards: []engine.XStateShard{
{
Shard: pack.Bytes32{},
PubKey: pack.Bytes{},
Queue: []engine.XStateShardQueueItem{},
State: shardState,
},
},
Minted: minted,
Fees: engine.XStateFees{
Unassigned: pack.NewU256([32]byte{}),
Epochs: []engine.XStateFeesEpoch{},
Nodes: []engine.XStateFeesNode{},
},
})
if err != nil {
panic(fmt.Sprintf("encoding contract state: %v", err))
}
contract := chainstate.Contract{
Address: "",
State: pack.Typed(contractState.(pack.Struct)),
}
return verifier{
bindings: bindings,
contract: &contract,
}
}

func (v verifier) VerifyTx(ctx context.Context, tx tx.Tx) error {
err := engine.XValidateLockMintBurnReleaseExtrinsicTx(chainstate.CodeContext{
Context: ctx,
Bindings: v.bindings,
}, nil, tx)
}, v.contract, tx)
return err
}

Expand Down

0 comments on commit a967ea0

Please sign in to comment.