diff --git a/.travis.yml b/.travis.yml index ce6079f8df..5d376fc033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ dist: trusty node_js: - "lts/*" - - "8" env: - TEST_DIR=cothority diff --git a/README.md b/README.md index c6cdb65244..2a79cb0b09 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ The source code for this stable branch is [here](https://github.com/dedis/cothority/tree/v2). During 2018, we hope to bring you the following new pieces: -- Cross platform mobile application to interact with the cisc and pop services -- Omniledger implementation using key/value pair storage and protected by darcs +- Cross platform mobile application to interact with the pop service +- ByzCoin implementation using key/value pair storage and protected by darcs Other pieces we hope to achieve in 2018: - Distributed internet archival functionality @@ -89,7 +89,7 @@ it up as follows: +--------------------------+------------+--------------------------+ | Onchain-Secrets |APPLICATIONS| | | +------------+ Proof of Personhood | -| Omniledger | +| ByzCoin | | Status E-voting | | CISC Identity SkipChain | +------------------------+---------------+-------------------------+ diff --git a/byzcoin/ByzCoin.png b/byzcoin/ByzCoin.png new file mode 100644 index 0000000000..905e450fab Binary files /dev/null and b/byzcoin/ByzCoin.png differ diff --git a/byzcoin/ByzCoin.svg b/byzcoin/ByzCoin.svg new file mode 100644 index 0000000000..ffd23ef1d4 --- /dev/null +++ b/byzcoin/ByzCoin.svg @@ -0,0 +1,3 @@ + + +


























Loops over all instructions

[Not supported by viewer]
SkipBlock n-1
SkipBlock n-1
SkipBlock n-2
SkipBlock n-2
SkipBlock n-3
SkipBlock n-3
SkipBlock n
SkipBlock n
Backward-links: hash of previous blocks, added at block-creation time.
[Not supported by viewer]
Forward-links: signed 
  SkipBlockID_from,   SkipBlockID_to
 newRoster
by the nodes of from block.
[Not supported by viewer]
Sharding
Authenticate
Batch
Order
Consensus



[Not supported by viewer]
Forward Link+ From: SkipBlockID+ To : SkipBlockID+ NewRoster : Roster+ Signature: BFTSignatureSkipBlockHeader+ Previous Blocks: []SkipBlockID+ Global State: Merkle-root+ Client Transactions: Hash+ State Changes: HashPayload+ Transactions: []TxResult+ Forward Links: []ForwardLink
Sha256
Sha256
Sha256
Sha256
Instance+ InstanceID: [32]byte+ ContractID: string+ Value: []byteStateChange+ StateAction: {Create,Update,Remove}+ InstanceID: [32]byte+ ContractID: string+ Value: []byte
Clients
Clients
ByzCoin
ByzCoin
Global State
Global State
Contracts
Contracts
Go
[Not supported by viewer]
Java
[Not supported by viewer]
JS
[Not supported by viewer]
Transactions
[Not supported by viewer]
Node
[Not supported by viewer]
Node
[Not supported by viewer]
Node
[Not supported by viewer]
Darc1
[Not supported by viewer]
Coin1
[Not supported by viewer]
Coin2
[Not supported by viewer]
OCS1
[Not supported by viewer]
Darc2
[Not supported by viewer]
Coin3
[Not supported by viewer]
OCS3
[Not supported by viewer]
OCS2
[Not supported by viewer]
Darc
[Not supported by viewer]
OCS
[Not supported by viewer]
Coin
[Not supported by viewer]
Instructions
[Not supported by viewer]
Execute
Create / Update / Remove

[Not supported by viewer]
Client Transaction+ Instructions: []InstructionInstruction+ InstanceID: [32]byte+ Nonce: [32]byte+ Length: int+ Position: int+ Spawn+ Invoke+ Delete+ Signature: []DarcSigSpawn+ ContractID: string+ Arguments: []ArgumentInvoke+ Command: string+ Arguments: []ArgumentDelete
Instructions are sent to an existing instance and can be one of Spawn to create a new instance, Invoke to call a method of that instance, or Delete to remove that instance.
[Not supported by viewer]
Transactions are a list of Instructions that are applied as a whole. If any of the instructions fails, the whole transaction is rejected. Every Instruction must be signed by the appropriate signers.
[Not supported by viewer]
When an instance receives an instruction, the corresponding contract is called with a pointer to the instance. The contract will emit a set of StateChanges that define how the Global state should be evolved.
[Not supported by viewer]
Contract code can read the global state and emit StateChanges according to the Instruction received.
[Not supported by viewer]
Instruction
Can be one of Spawn, Invoke, or Delete.
[Not supported by viewer]
Coins
A list of different coins available to that contract.
[Not supported by viewer]
Coins
An output of coins available, might be more or less than the input.
[Not supported by viewer]
StateChange
Every StateChange is either Create, Update, or Remove and directly affects the global state.
[Not supported by viewer]
0..n
0..n
To Contract
To Contract
The global state holds all instances and is split by Darcs that control the access to the connected instances. Every instruction sent to an instance must resolve a rule in the responsible Darc.
[Not supported by viewer]
Clients connect to the ByzCoin service through a protobuf-over-websockets interface. Currently we have Go, Java and JavaScript APIs, but others like Python are easy to implement.
[Not supported by viewer]
Implementations of contracts are built into conodes. The execution of a contract produces a set of state changes. A quorum of conodes must execute the contract and produce agreeing sets of state changes before they are applied to the global state.
[Not supported by viewer]
Darc+ Version: int+ BaseID: DarcID+ Rules: []RuleRule+ Action: string+ Expression: and, or
Public Key
Public Key
A Darc has a set of Rules/Expressions that describe how a rule (like Invoke:SendCoin) can be verified.
An expression is composed of and, or, and public keys and/or links to other Darcs.
[Not supported by viewer]
From Instruction
From Instruction

ByzCoin

This is an overview of our project, inspired by the awesome Ethereum Blockchain Mechanism by Lee Thomas. Code and documentation can be found at:

https://github.com/dedis/cothority

(c) 2018 by Linus.Gasser@epfl.ch

[Not supported by viewer]
\ No newline at end of file diff --git a/omniledger/Contracts.md b/byzcoin/Contracts.md similarity index 84% rename from omniledger/Contracts.md rename to byzcoin/Contracts.md index e57f9e73fb..6e08512bc8 100644 --- a/omniledger/Contracts.md +++ b/byzcoin/Contracts.md @@ -1,19 +1,19 @@ Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) :: [Cothority](https://github.com/dedis/cothority/tree/master/README.md) :: [Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) :: -[OmniLedger](README.md) :: +[ByzCoin](README.md) :: Contracts and Instances # Contracts and Instances -A contract in OmniLedger is similar to a smart contract in Ethereum, except that +A contract in ByzCoin is similar to a smart contract in Ethereum, except that it is pre-compiled in the code and all nodes need to have the same version of the contract available in order to reach consensus. Or, if there are variations in the implementation of the contract, the output of the various implementations must be equal. A contract can spawn new instances that are tied to another contract type. All -instances are stored in the global state of OmniLedger. Every instance points +instances are stored in the global state of ByzCoin. Every instance points to exactly one contract. An easy interpretation is to think of a contract as a class and the instance as an object instantiated from that class. Or, in Go, as the instance being the values of the `struct` and the contract being all @@ -37,7 +37,7 @@ clarity): - `Args`: `{"Roster": NewRoster}` - `Signatures`: `[Sig1]` -OmniLedger will do the following: +ByzCoin will do the following: 1. find the Darc instance using the `InstanceID`. 2. create a `DarcRequest` using the `InstanceID` and the `Args` @@ -50,7 +50,7 @@ A contract is always pre-compiled into every node and has the following method signature: ```go -type OmniLedgerContract func(coll CollectionView, tx Instruction, inCoins []Coin) (sc []StateChange, outCoins []Coin, err error) +type ByzCoinContract func(coll CollectionView, tx Instruction, inCoins []Coin) (sc []StateChange, outCoins []Coin, err error) ``` Input: @@ -84,7 +84,7 @@ in the second `ClientTransaction` will see all changes applied from the first ## Instance Structure -Every instance in OmniLedger is stored with the following information in the +Every instance in ByzCoin is stored with the following information in the global state: - `InstanceID` is a globally unique identifier of that instance, composed @@ -97,7 +97,7 @@ receives an instruction from the client ## Interaction between Instructions and Instances Every instruction sent by a client indicates the `InstanceID` it is sent to. -OmniLedger will start by verifying the authorization as described above, then +ByzCoin will start by verifying the authorization as described above, then use the `InstanceID` to look up the responsible contract for this instance and then send the instruction to that contract. A client can call an instance with one of the following three basic instructions: @@ -110,21 +110,21 @@ spawn new instances. # Existing Contracts -In the OmniLedger service, the following contracts are pre-defined: +In the ByzCoin service, the following contracts are pre-defined: - `GenesisReference` - points to the genesis configuration -- `Config` - holds the configuration of OmniLedger +- `Config` - holds the configuration of ByzCoin - `Darc` - defines the access control -To extend OmniLedger, you will have to create a new service that defines new -contracts that will have to be registered with OmniLedger. An example is +To extend ByzCoin, you will have to create a new service that defines new +contracts that will have to be registered with ByzCoin. An example is [EventLog](../../eventlog) that defines a contract. ## Genesis Configuration The special `InstanceID` with 64 x 0x00 bytes is the genesis configuration pointer that has as the data the `DarcID` of the genesis Darc. This instance -is unique as it defines the basic running configuration of OmniLedger. The +is unique as it defines the basic running configuration of ByzCoin. The Darc it points to will delegate authorizations to spawn new instances to other Darcs, who can themselves delegate further. @@ -132,13 +132,13 @@ The following two contracts can only be instantiated once in the whole system: - `GenesisReference`, which has the `InstanceID` of 64 x 0x00 and points to the genesis Darc -- `Config`, which defines the basic configuration of OmniLedger: +- `Config`, which defines the basic configuration of ByzCoin: - `Roster` is the list of all nodes participating in the consensus ### Spawn The `Config` contract can spawn new Darcs or any other type of instances that -are available to OmniLedger. +are available to ByzCoin. ### Invoke @@ -146,8 +146,8 @@ are available to OmniLedger. ## Darc Contract -The most basic contract in OmniLedger is the `Darc` contract that defines the -access rules for all clients. When creating a new OmniLedger blockchain, a +The most basic contract in ByzCoin is the `Darc` contract that defines the +access rules for all clients. When creating a new ByzCoin blockchain, a genesis Darc instance is created, which indicates what instructions need which signatures to be accepted. @@ -165,7 +165,7 @@ to invoke methods on it later. ### Invoke The only method that a client can invoke on a Darc instance is `Evolve`, which -asks OmniLedger to store a new version of the Darc in the global state. +asks ByzCoin to store a new version of the Darc in the global state. ### Delete @@ -177,7 +177,7 @@ global state. Here is a short list of possible future contracts that are imaginable. But your coding skills set the limits: -- OmniLedger Configuration +- ByzCoin Configuration - create new configuration - Add or remove nodes - Change the block interval time diff --git a/omniledger/DataStructures.md b/byzcoin/DataStructures.md similarity index 95% rename from omniledger/DataStructures.md rename to byzcoin/DataStructures.md index 2fe08b8733..0754edcb3e 100644 --- a/omniledger/DataStructures.md +++ b/byzcoin/DataStructures.md @@ -1,28 +1,28 @@ Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) :: [Cothority](https://github.com/dedis/cothority/tree/master/README.md) :: [Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) :: -[OmniLedger](README.md) :: +[ByzCoin](README.md) :: Data Structures # Data Structures -This document gives an overview of the basic data structures used in OmniLedger: +This document gives an overview of the basic data structures used in ByzCoin: - [ClientTransaction](#clienttransaction) is sent by a client to one or more nodes and holds one or more Instructions: - [Instruction](#instruction) is a basic building block that will be executed -in OmniLedger. It has either a `Spawn`, `Invoke`, or a `Delete` command. Once +in ByzCoin. It has either a `Spawn`, `Invoke`, or a `Delete` command. Once accepted, every instruction creates zero or more `StateChanges`: - [StateChange](#statechange) are collected and define how the global state will change. - [Darc](#darc) control access to executing Instructions. The signers of an Instruction must satisfy one of the rules in the associated Darc. - [Proof](#proof) shows to a client that his instruction has been accepted by -OmniLedger. +ByzCoin. ## ClientTransaction -If a client needs a set of instructions to be applied atomically by OmniLedger, +If a client needs a set of instructions to be applied atomically by ByzCoin, it can send more than one instruction in a ClientTransaction. This structure has the following format: @@ -96,7 +96,7 @@ instructions to the corresponding contracts and/or objects. Each call to a contract/object will return 0 or more StateChanges that define how to update the state of the collection. -OmniLedger will take care that the following instruction/StateChanges are +ByzCoin will take care that the following instruction/StateChanges are respected. *This might be too restrictive*: - Spawn: only Create-Actions - Invoke: only Update-Action on the invoked object @@ -120,8 +120,8 @@ message StateChange { ## Proof -The proof in OmniLedger proves the absence or the presence of a key in the state -of the given OmniLedger. If the key is present, the proof also contains the value +The proof in ByzCoin proves the absence or the presence of a key in the state +of the given ByzCoin. If the key is present, the proof also contains the value of the key, as well as the contract that wrote it, and the DarcID of the Darc that controls access to it. diff --git a/omniledger/README.md b/byzcoin/README.md similarity index 86% rename from omniledger/README.md rename to byzcoin/README.md index a25373e1ad..7da4325f78 100644 --- a/omniledger/README.md +++ b/byzcoin/README.md @@ -1,17 +1,17 @@ Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) :: [Cothority](https://github.com/dedis/cothority/tree/master/README.md) :: [Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) :: -OmniLedger +ByzCoin -# OmniLedger +# ByzCoin -This implementation of OmniLedger has its goal to implement the protocol -described in the [OmniLedger Paper](https://eprint.iacr.org/2017/406.pdf). +This implementation of ByzCoin has its goal to implement the protocol +described in the [ByzCoin Paper](https://eprint.iacr.org/2017/406.pdf). As the paper is only describing the network interaction and very few of the details of how the transactions themselves are handled, we will include them as seem fit. -This document describes the part of OmniLedger that are implemented and how to +This document describes the part of ByzCoin that are implemented and how to use them. It should grow over time as more parts of the system are implemented. ## Overview @@ -19,11 +19,11 @@ use them. It should grow over time as more parts of the system are implemented. Here is a graphical overview of the current implementation in the cothority framework: -![OmniLedger Implementation](Omniledger.png?raw=true "OmniLedger") -As an svg: [OmniLedger Implementation](Omniledger.svg). This image has been +![ByzCoin Implementation](ByzCoin.png?raw=true "ByzCoin") +As an svg: [ByzCoin Implementation](ByzCoin.svg). This image has been created with https://draw.io and can be imported there. -Our OmniLedger service currently implements: +Our ByzCoin service currently implements: 1. multiple transactions per block 2. queuing of transactions at each node and periodic creation of a new @@ -36,13 +36,13 @@ The following points are scheduled to be done before end of '18: 5. sharding of the nodes 6. inter-shard transactions -Items 5 and 6 are the 'real' OmniLedger improvements as described in the -[OmniLedger Paper](https://eprint.iacr.org/2017/406.pdf). +Items 5 and 6 are the 'real' ByzCoin improvements as described in the +[ByzCoin Paper](https://eprint.iacr.org/2017/406.pdf). ## Transaction collection and View Change Transactions can be submitted by end-users to any conode in the roster for -the Skipchain that is holding the OmniLedger. +the Skipchain that is holding the ByzCoin. At the beginning of each block creation, the leader launches a protocol to contact all the followers in parallel and to request the outstanding @@ -71,13 +71,13 @@ synchronise and replay blocks to compute the most up-to-date leader. # Structure Definitions -Following is an overview of the most important structures defined in OmniLedger. +Following is an overview of the most important structures defined in ByzCoin. For a more programmatic description of these structures, go to the [DataStructures](DataStructures.md) file. ## Skipchain Block -Whenever OmniLedger stores a new Skipchain Block, the header will only contain +Whenever ByzCoin stores a new Skipchain Block, the header will only contain hashes, while the ClientTransactions will be stored in the body. This allows for a reduced proof size. @@ -89,7 +89,7 @@ Block header: Block body: - List of all ClientTransactions -## Smart Contracts in OmniLedger +## Smart Contracts in ByzCoin A contract defines how to interpret the methods sent by the client. It is identified by the contractID which is a string pointing to a given contract. @@ -115,13 +115,13 @@ The contracts are compiled into the conode binary. A set of conodes making up a cothority may have differing implementations of a given contract, but if they do not create the same output StateChanges, the cothority might not be able to reach the threshold of agreeing conodes in order to commit the -transactions onto the OmniLedger. If one conode is creating differing contract outputs +transactions onto the ByzCoin. If one conode is creating differing contract outputs (for example, it is cheating), it's output will not be integrated into the global shared state. ## From Client to the Collection -In OmniLedger we define the following path from client instructions to +In ByzCoin we define the following path from client instructions to global state changes: * _Instruction_ is one of Spawn, Invoke or Delete that is called upon an @@ -130,7 +130,7 @@ existing object * _StateChange_ is calculated at the leader and verified by every node. It contains the new key/contractID/value triplets to create/update/delete. -A block in OmniLedger contains zero or more OmniLedgerTransactions. Every +A block in ByzCoin contains zero or more ByzCoinTransactions. Every one of these transactions can be valid or not and will be marked as such by the leader. Every node has to verify whether it accepts or refuses the decisions made by the leader. diff --git a/omniledger/service/api.go b/byzcoin/api.go similarity index 92% rename from omniledger/service/api.go rename to byzcoin/api.go index f50684c38e..66c9e29f78 100644 --- a/omniledger/service/api.go +++ b/byzcoin/api.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" @@ -9,23 +9,23 @@ import ( "github.com/dedis/protobuf" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/cothority/skipchain" "github.com/dedis/onet" ) // ServiceName is used for registration on the onet. -const ServiceName = "OmniLedger" +const ServiceName = "ByzCoin" -// Client is a structure to communicate with the OmniLedger service. +// Client is a structure to communicate with the ByzCoin service. type Client struct { *onet.Client ID skipchain.SkipBlockID Roster onet.Roster } -// NewClient instantiates a new Omniledger client. +// NewClient instantiates a new ByzCoin client. func NewClient(ID skipchain.SkipBlockID, Roster onet.Roster) *Client { return &Client{ Client: onet.NewClient(cothority.Suite, ServiceName), @@ -44,8 +44,8 @@ func NewClientKeep(ID skipchain.SkipBlockID, Roster onet.Roster) *Client { } } -// NewOmniledger sets up a new OmniLedger instance. -func NewOmniledger(msg *CreateGenesisBlock, keep bool) (*Client, *CreateGenesisBlockResponse, error) { +// NewLedger sets up a new ByzCoin ledger. +func NewLedger(msg *CreateGenesisBlock, keep bool) (*Client, *CreateGenesisBlockResponse, error) { var c *Client if keep { c = NewClientKeep(nil, msg.Roster) @@ -69,7 +69,7 @@ func (c *Client) AddTransaction(tx ClientTransaction) (*AddTxResponse, error) { } // AddTransactionAndWait adds a transaction and will wait for it to be included -// in omniledger, up to a maximum of wait block intervals. It does not return +// in the ledger, up to a maximum of wait block intervals. It does not return // any feedback on the transaction. The Client's Roster and ID should be // initialized before calling this method (see NewClientFromConfig). func (c *Client) AddTransactionAndWait(tx ClientTransaction, wait int) (*AddTxResponse, error) { @@ -105,7 +105,7 @@ func (c *Client) GetProof(key []byte) (*GetProofResponse, error) { } // GetGenDarc uses the GetProof method to fetch the latest version of the -// Genesis Darc from OmniLedger and parses it. +// Genesis Darc from ByzCoin and parses it. func (c *Client) GetGenDarc() (*darc.Darc, error) { p, err := c.GetProof(NewInstanceID(nil).Slice()) if err != nil { @@ -154,7 +154,7 @@ func (c *Client) GetGenDarc() (*darc.Darc, error) { } // GetChainConfig uses the GetProof method to fetch the chain config -// from OmniLedger. +// from ByzCoin. func (c *Client) GetChainConfig() (*ChainConfig, error) { p, err := c.GetProof(NewInstanceID(nil).Slice()) if err != nil { @@ -180,7 +180,7 @@ func (c *Client) GetChainConfig() (*ChainConfig, error) { return config, nil } -// WaitProof will poll OmniLedger until a given instanceID exists. +// WaitProof will poll ByzCoin until a given instanceID exists. // It will return the proof of the instance created. If value is // non-nil, it will wait for the value of the proof to be equal to // the value. diff --git a/omniledger/service/api_test.go b/byzcoin/api_test.go similarity index 93% rename from omniledger/service/api_test.go rename to byzcoin/api_test.go index 4ce21fd3e4..3e9c511fae 100644 --- a/omniledger/service/api_test.go +++ b/byzcoin/api_test.go @@ -1,11 +1,11 @@ -package service +package byzcoin import ( "testing" "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet" "github.com/stretchr/testify/require" ) @@ -26,7 +26,7 @@ func TestClient_GetProof(t *testing.T) { d := msg.GenesisDarc require.Nil(t, d.Verify(true)) - c, csr, err := NewOmniledger(msg, false) + c, csr, err := NewLedger(msg, false) require.Nil(t, err) // Create a new transaction. diff --git a/byzcoin/bcadmin/.gitignore b/byzcoin/bcadmin/.gitignore new file mode 100644 index 0000000000..48276b121f --- /dev/null +++ b/byzcoin/bcadmin/.gitignore @@ -0,0 +1 @@ +bcadmin diff --git a/byzcoin/bcadmin/README.md b/byzcoin/bcadmin/README.md new file mode 100644 index 0000000000..67f3071a12 --- /dev/null +++ b/byzcoin/bcadmin/README.md @@ -0,0 +1,42 @@ +# bcadmin - the CLI to configure ByzCoin ledgers + +## Create a new ByzCoin, saving the config + +``` +$ bcadmin create -roster roster.toml +``` + +The `roster.toml` file is a list of servers what form the cothority that will +maintain the ledger. After running `run_conode.sh local 3` for example, the file +`public.toml` will have the 3 conodes in it. For a larger production deployment, +you will construct the `roster.toml` file by collecting the `public.toml` files +from each of the servers. + +The ByzCoin config info (the skipchain ID and the roster for the cothority) +are stored in the local config directory (~/.config/bcadmin or ~/Library/Application +Support/bcadmin) and the filename is printed on stdout. The ByzCoin config file +will be used by other tools to know where to send their transactions. + +The secret key is saved in a file named after the public key. It must not be +shared! + +To see the config you just made, use `bcadmin show -bc $file`. + +## Granting access to contracts + +The user who wants to use ByzCoin generates a private key and shares the +public key with you, the ByzCoin admin. You grant access to a given contract +for instructions signed by the given secret key like this: + +``` +$ bcadmin add -bc $file spawn:eventlog -identity ed25519:dd6419b01b49e3ffd18696c93884dc244b4688d95f55d6c2a4639f2b0ce40710 +``` + +Using the ByzCoin config file you give them and their private key to sign +transactions, they will now be able to use their application to send +transactions. + +## Environmnet variables + +You can set the environment variable BC to the config file for the ByzCoin +you are currently working with. (Client apps should follow this same standard.) diff --git a/omniledger/ol/lib/config.go b/byzcoin/bcadmin/lib/config.go similarity index 82% rename from omniledger/ol/lib/config.go rename to byzcoin/bcadmin/lib/config.go index 80396fb19b..dfbca0a482 100644 --- a/omniledger/ol/lib/config.go +++ b/byzcoin/bcadmin/lib/config.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/skipchain" "github.com/dedis/onet" "github.com/dedis/onet/network" @@ -19,11 +19,11 @@ import ( var ConfigPath = "." // Config is the structure used by ol to save its configuration. It holds everything -// necessary to talk to an omniledger instance. The GenesisDarc and AdminIdentity -// can change over the time of an omniledger. +// necessary to talk to a ByzCoin instance. The GenesisDarc and AdminIdentity +// can change over the lifetime of a ledger. type Config struct { Roster onet.Roster - OmniledgerID skipchain.SkipBlockID + ByzCoinID skipchain.SkipBlockID GenesisDarc darc.Darc AdminIdentity darc.Identity } @@ -78,7 +78,7 @@ func SaveKey(signer darc.Signer) error { func SaveConfig(cfg Config) (string, error) { os.MkdirAll(ConfigPath, 0755) - fn := fmt.Sprintf("ol-%x.cfg", cfg.OmniledgerID) + fn := fmt.Sprintf("ol-%x.cfg", cfg.ByzCoinID) fn = filepath.Join(ConfigPath, fn) buf, err := protobuf.Encode(&cfg) @@ -93,9 +93,9 @@ func SaveConfig(cfg Config) (string, error) { return fn, nil } -// LoadConfig returns a config read from the file and an initialized omniledger -// Client that can be used to communicate with omniledger. -func LoadConfig(file string) (cfg Config, cl *ol.Client, err error) { +// LoadConfig returns a config read from the file and an initialized +// Client that can be used to communicate with ByzCoin. +func LoadConfig(file string) (cfg Config, cl *byzcoin.Client, err error) { var cfgBuf []byte cfgBuf, err = ioutil.ReadFile(file) if err != nil { @@ -106,6 +106,6 @@ func LoadConfig(file string) (cfg Config, cl *ol.Client, err error) { if err != nil { return } - cl = ol.NewClient(cfg.OmniledgerID, cfg.Roster) + cl = byzcoin.NewClient(cfg.ByzCoinID, cfg.Roster) return } diff --git a/omniledger/ol/main.go b/byzcoin/bcadmin/main.go similarity index 76% rename from omniledger/ol/main.go rename to byzcoin/bcadmin/main.go index 04954113d2..3072766d5e 100644 --- a/omniledger/ol/main.go +++ b/byzcoin/bcadmin/main.go @@ -9,9 +9,9 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/ol/lib" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/bcadmin/lib" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet" "github.com/dedis/onet/app" "github.com/dedis/onet/cfgpath" @@ -44,13 +44,13 @@ var cmds = cli.Commands{ }, { Name: "show", - Usage: "show the config, contact OmniLedger to get Genesis Darc ID", + Usage: "show the config, contact ByzCoin to get Genesis Darc ID", Aliases: []string{"s"}, Flags: []cli.Flag{ cli.StringFlag{ - Name: "ol", - EnvVar: "OL", - Usage: "the OmniLedger config to use", + Name: "bc", + EnvVar: "BC", + Usage: "the ByzCoin config to use", }, }, Action: show, @@ -61,9 +61,9 @@ var cmds = cli.Commands{ Aliases: []string{"a"}, Flags: []cli.Flag{ cli.StringFlag{ - Name: "ol", - EnvVar: "OL", - Usage: "the OmniLedger config to use", + Name: "bc", + EnvVar: "BC", + Usage: "the ByzCoin config to use", }, cli.StringFlag{ Name: "identity", @@ -80,8 +80,8 @@ var cliApp = cli.NewApp() var getDataPath = cfgpath.GetDataPath func init() { - cliApp.Name = "ol" - cliApp.Usage = "Create OmniLedger ledgers and grant access to them." + cliApp.Name = "bc" + cliApp.Usage = "Create ByzCoin ledgers and grant access to them." cliApp.Version = "0.1" cliApp.Commands = cmds cliApp.Flags = []cli.Flag{ @@ -129,22 +129,22 @@ func create(c *cli.Context) error { owner := darc.NewSignerEd25519(nil, nil) - req, err := ol.DefaultGenesisMsg(ol.CurrentVersion, r, []string{"spawn:darc"}, owner.Identity()) + req, err := byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, r, []string{"spawn:darc"}, owner.Identity()) if err != nil { return err } req.BlockInterval = interval - cl := onet.NewClient(cothority.Suite, ol.ServiceName) + cl := onet.NewClient(cothority.Suite, byzcoin.ServiceName) - var resp ol.CreateGenesisBlockResponse + var resp byzcoin.CreateGenesisBlockResponse err = cl.SendProtobuf(r.List[0], req, &resp) if err != nil { return err } cfg := lib.Config{ - OmniledgerID: resp.Skipblock.SkipChainID(), + ByzCoinID: resp.Skipblock.SkipChainID(), Roster: *r, GenesisDarc: req.GenesisDarc, AdminIdentity: owner.Identity(), @@ -159,29 +159,27 @@ func create(c *cli.Context) error { return err } - fmt.Fprintf(c.App.Writer, "Created OmniLedger with ID %x.\n", cfg.OmniledgerID) - fmt.Fprintf(c.App.Writer, "export OL=\"%v\"\n", fn) + fmt.Fprintf(c.App.Writer, "Created ByzCoin with ID %x.\n", cfg.ByzCoinID) + fmt.Fprintf(c.App.Writer, "export BC=\"%v\"\n", fn) // For the tests to use. - c.App.Metadata["OL"] = fn + c.App.Metadata["BC"] = fn return nil } func show(c *cli.Context) error { - olArg := c.String("ol") - if olArg == "" { - return errors.New("--ol flag is required") + bcArg := c.String("bc") + if bcArg == "" { + return errors.New("--bc flag is required") } - cfg, cl, err := lib.LoadConfig(olArg) + cfg, cl, err := lib.LoadConfig(bcArg) if err != nil { return err } - fmt.Fprintln(c.App.Writer, cfg) - - fmt.Fprintln(c.App.Writer) + fmt.Fprintln(c.App.Writer, "ByzCoinID:", fmt.Sprintf("%x", cfg.ByzCoinID)) fmt.Fprintln(c.App.Writer, "Genesis Darc:") var roster []string for _, s := range cfg.Roster.List { @@ -200,12 +198,12 @@ func show(c *cli.Context) error { } func add(c *cli.Context) error { - olArg := c.String("ol") - if olArg == "" { - return errors.New("--ol flag is required") + bcArg := c.String("bc") + if bcArg == "" { + return errors.New("--bc flag is required") } - cfg, cl, err := lib.LoadConfig(olArg) + cfg, cl, err := lib.LoadConfig(bcArg) if err != nil { return err } @@ -241,17 +239,17 @@ func add(c *cli.Context) error { return err } - invoke := ol.Invoke{ + invoke := byzcoin.Invoke{ Command: "evolve", - Args: []ol.Argument{ - ol.Argument{ + Args: []byzcoin.Argument{ + byzcoin.Argument{ Name: "darc", Value: d2Buf, }, }, } - instr := ol.Instruction{ - InstanceID: ol.NewInstanceID(d2.GetBaseID()), + instr := byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(d2.GetBaseID()), Index: 0, Length: 1, Invoke: &invoke, @@ -264,8 +262,8 @@ func add(c *cli.Context) error { return err } - _, err = cl.AddTransactionAndWait(ol.ClientTransaction{ - Instructions: []ol.Instruction{instr}, + _, err = cl.AddTransactionAndWait(byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{instr}, }, 10) if err != nil { return err diff --git a/omniledger/ol/main_test.go b/byzcoin/bcadmin/main_test.go similarity index 87% rename from omniledger/ol/main_test.go rename to byzcoin/bcadmin/main_test.go index 400d5340cb..eb2fc59c0f 100644 --- a/omniledger/ol/main_test.go +++ b/byzcoin/bcadmin/main_test.go @@ -57,22 +57,22 @@ func TestCli(t *testing.T) { b := &bytes.Buffer{} cliApp.Writer = b cliApp.ErrWriter = b - args := []string{"ol", "create", "-roster", rf, "--interval", interval.String()} + args := []string{"bcadmin", "create", "-roster", rf, "--interval", interval.String()} err = cliApp.Run(args) require.NoError(t, err) require.Contains(t, string(b.Bytes()), "Created") // Collect the OL config filename that create() left for us, // and make it available for the next tests. - ol := cliApp.Metadata["OL"] + ol := cliApp.Metadata["BC"] require.IsType(t, "", ol) - os.Setenv("OL", ol.(string)) + os.Setenv("BC", ol.(string)) log.Lvl1("show: ") b = &bytes.Buffer{} cliApp.Writer = b cliApp.ErrWriter = b - args = []string{"ol", "show"} + args = []string{"bcadmin", "show"} err = cliApp.Run(args) require.NoError(t, err) require.Contains(t, string(b.Bytes()), "Roster: tcp://127.0.0.1") @@ -82,7 +82,7 @@ func TestCli(t *testing.T) { b = &bytes.Buffer{} cliApp.Writer = b cliApp.ErrWriter = b - args = []string{"ol", "add", "--identity", "ed25519:XXX", "spawn:xxx"} + args = []string{"bcadmin", "add", "--identity", "ed25519:XXX", "spawn:xxx"} err = cliApp.Run(args) require.NoError(t, err) @@ -92,7 +92,7 @@ func TestCli(t *testing.T) { b = &bytes.Buffer{} cliApp.Writer = b cliApp.ErrWriter = b - args = []string{"ol", "show"} + args = []string{"bcadmin", "show"} err = cliApp.Run(args) require.NoError(t, err) require.Contains(t, string(b.Bytes()), "Roster: tcp://127.0.0.1") diff --git a/omniledger/ol/test.sh b/byzcoin/bcadmin/test.sh similarity index 69% rename from omniledger/ol/test.sh rename to byzcoin/bcadmin/test.sh index 5e3811759f..64d5a7e952 100755 --- a/omniledger/ol/test.sh +++ b/byzcoin/bcadmin/test.sh @@ -7,16 +7,16 @@ DBG_SRV=0 main(){ startTest - buildConode github.com/dedis/cothority/omniledger/service + buildConode github.com/dedis/cothority/byzcoin run testCreateStoreRead stopTest } testCreateStoreRead(){ runCoBG 1 2 3 - runGrepSed "export OL=" "" ./"$APP" create --roster public.toml --interval .5s + runGrepSed "export BC=" "" ./"$APP" create --roster public.toml --interval .5s eval $SED - [ -z "$OL" ] && exit 1 + [ -z "$BC" ] && exit 1 testOK ./"$APP" add spawn:xxx -identity ed25519:foo testGrep "ed25519:foo" ./"$APP" show } diff --git a/omniledger/service/collect_tx.go b/byzcoin/collect_tx.go similarity index 99% rename from omniledger/service/collect_tx.go rename to byzcoin/collect_tx.go index 5f85455876..5c83142794 100644 --- a/omniledger/service/collect_tx.go +++ b/byzcoin/collect_tx.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "errors" diff --git a/omniledger/service/collect_tx_test.go b/byzcoin/collect_tx_test.go similarity index 98% rename from omniledger/service/collect_tx_test.go rename to byzcoin/collect_tx_test.go index 34867256e7..5166856a83 100644 --- a/omniledger/service/collect_tx_test.go +++ b/byzcoin/collect_tx_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "fmt" diff --git a/omniledger/collection/.gitignore b/byzcoin/collection/.gitignore similarity index 100% rename from omniledger/collection/.gitignore rename to byzcoin/collection/.gitignore diff --git a/omniledger/collection/.travis.yml b/byzcoin/collection/.travis.yml similarity index 100% rename from omniledger/collection/.travis.yml rename to byzcoin/collection/.travis.yml diff --git a/omniledger/collection/LICENSE b/byzcoin/collection/LICENSE similarity index 100% rename from omniledger/collection/LICENSE rename to byzcoin/collection/LICENSE diff --git a/omniledger/collection/README.md b/byzcoin/collection/README.md similarity index 100% rename from omniledger/collection/README.md rename to byzcoin/collection/README.md diff --git a/omniledger/collection/TODO.md b/byzcoin/collection/TODO.md similarity index 100% rename from omniledger/collection/TODO.md rename to byzcoin/collection/TODO.md diff --git a/omniledger/collection/assets/images/collection.gif b/byzcoin/collection/assets/images/collection.gif similarity index 100% rename from omniledger/collection/assets/images/collection.gif rename to byzcoin/collection/assets/images/collection.gif diff --git a/omniledger/collection/assets/images/example/0.gif b/byzcoin/collection/assets/images/example/0.gif similarity index 100% rename from omniledger/collection/assets/images/example/0.gif rename to byzcoin/collection/assets/images/example/0.gif diff --git a/omniledger/collection/assets/images/example/1.gif b/byzcoin/collection/assets/images/example/1.gif similarity index 100% rename from omniledger/collection/assets/images/example/1.gif rename to byzcoin/collection/assets/images/example/1.gif diff --git a/omniledger/collection/assets/images/example/10.gif b/byzcoin/collection/assets/images/example/10.gif similarity index 100% rename from omniledger/collection/assets/images/example/10.gif rename to byzcoin/collection/assets/images/example/10.gif diff --git a/omniledger/collection/assets/images/example/11.gif b/byzcoin/collection/assets/images/example/11.gif similarity index 100% rename from omniledger/collection/assets/images/example/11.gif rename to byzcoin/collection/assets/images/example/11.gif diff --git a/omniledger/collection/assets/images/example/12.gif b/byzcoin/collection/assets/images/example/12.gif similarity index 100% rename from omniledger/collection/assets/images/example/12.gif rename to byzcoin/collection/assets/images/example/12.gif diff --git a/omniledger/collection/assets/images/example/13.gif b/byzcoin/collection/assets/images/example/13.gif similarity index 100% rename from omniledger/collection/assets/images/example/13.gif rename to byzcoin/collection/assets/images/example/13.gif diff --git a/omniledger/collection/assets/images/example/14.gif b/byzcoin/collection/assets/images/example/14.gif similarity index 100% rename from omniledger/collection/assets/images/example/14.gif rename to byzcoin/collection/assets/images/example/14.gif diff --git a/omniledger/collection/assets/images/example/15.gif b/byzcoin/collection/assets/images/example/15.gif similarity index 100% rename from omniledger/collection/assets/images/example/15.gif rename to byzcoin/collection/assets/images/example/15.gif diff --git a/omniledger/collection/assets/images/example/16.gif b/byzcoin/collection/assets/images/example/16.gif similarity index 100% rename from omniledger/collection/assets/images/example/16.gif rename to byzcoin/collection/assets/images/example/16.gif diff --git a/omniledger/collection/assets/images/example/17.gif b/byzcoin/collection/assets/images/example/17.gif similarity index 100% rename from omniledger/collection/assets/images/example/17.gif rename to byzcoin/collection/assets/images/example/17.gif diff --git a/omniledger/collection/assets/images/example/18.gif b/byzcoin/collection/assets/images/example/18.gif similarity index 100% rename from omniledger/collection/assets/images/example/18.gif rename to byzcoin/collection/assets/images/example/18.gif diff --git a/omniledger/collection/assets/images/example/19.gif b/byzcoin/collection/assets/images/example/19.gif similarity index 100% rename from omniledger/collection/assets/images/example/19.gif rename to byzcoin/collection/assets/images/example/19.gif diff --git a/omniledger/collection/assets/images/example/2.gif b/byzcoin/collection/assets/images/example/2.gif similarity index 100% rename from omniledger/collection/assets/images/example/2.gif rename to byzcoin/collection/assets/images/example/2.gif diff --git a/omniledger/collection/assets/images/example/20.gif b/byzcoin/collection/assets/images/example/20.gif similarity index 100% rename from omniledger/collection/assets/images/example/20.gif rename to byzcoin/collection/assets/images/example/20.gif diff --git a/omniledger/collection/assets/images/example/21.gif b/byzcoin/collection/assets/images/example/21.gif similarity index 100% rename from omniledger/collection/assets/images/example/21.gif rename to byzcoin/collection/assets/images/example/21.gif diff --git a/omniledger/collection/assets/images/example/22.gif b/byzcoin/collection/assets/images/example/22.gif similarity index 100% rename from omniledger/collection/assets/images/example/22.gif rename to byzcoin/collection/assets/images/example/22.gif diff --git a/omniledger/collection/assets/images/example/23.gif b/byzcoin/collection/assets/images/example/23.gif similarity index 100% rename from omniledger/collection/assets/images/example/23.gif rename to byzcoin/collection/assets/images/example/23.gif diff --git a/omniledger/collection/assets/images/example/3.gif b/byzcoin/collection/assets/images/example/3.gif similarity index 100% rename from omniledger/collection/assets/images/example/3.gif rename to byzcoin/collection/assets/images/example/3.gif diff --git a/omniledger/collection/assets/images/example/4.gif b/byzcoin/collection/assets/images/example/4.gif similarity index 100% rename from omniledger/collection/assets/images/example/4.gif rename to byzcoin/collection/assets/images/example/4.gif diff --git a/omniledger/collection/assets/images/example/5.gif b/byzcoin/collection/assets/images/example/5.gif similarity index 100% rename from omniledger/collection/assets/images/example/5.gif rename to byzcoin/collection/assets/images/example/5.gif diff --git a/omniledger/collection/assets/images/example/6.gif b/byzcoin/collection/assets/images/example/6.gif similarity index 100% rename from omniledger/collection/assets/images/example/6.gif rename to byzcoin/collection/assets/images/example/6.gif diff --git a/omniledger/collection/assets/images/example/7.gif b/byzcoin/collection/assets/images/example/7.gif similarity index 100% rename from omniledger/collection/assets/images/example/7.gif rename to byzcoin/collection/assets/images/example/7.gif diff --git a/omniledger/collection/assets/images/example/8.gif b/byzcoin/collection/assets/images/example/8.gif similarity index 100% rename from omniledger/collection/assets/images/example/8.gif rename to byzcoin/collection/assets/images/example/8.gif diff --git a/omniledger/collection/assets/images/example/9.gif b/byzcoin/collection/assets/images/example/9.gif similarity index 100% rename from omniledger/collection/assets/images/example/9.gif rename to byzcoin/collection/assets/images/example/9.gif diff --git a/omniledger/collection/assets/images/naivetree.png b/byzcoin/collection/assets/images/naivetree.png similarity index 100% rename from omniledger/collection/assets/images/naivetree.png rename to byzcoin/collection/assets/images/naivetree.png diff --git a/omniledger/collection/assets/images/navigation.gif b/byzcoin/collection/assets/images/navigation.gif similarity index 100% rename from omniledger/collection/assets/images/navigation.gif rename to byzcoin/collection/assets/images/navigation.gif diff --git a/omniledger/collection/assets/images/nonexistingnavigation.gif b/byzcoin/collection/assets/images/nonexistingnavigation.gif similarity index 100% rename from omniledger/collection/assets/images/nonexistingnavigation.gif rename to byzcoin/collection/assets/images/nonexistingnavigation.gif diff --git a/omniledger/collection/assets/images/tree.png b/byzcoin/collection/assets/images/tree.png similarity index 100% rename from omniledger/collection/assets/images/tree.png rename to byzcoin/collection/assets/images/tree.png diff --git a/omniledger/collection/assets/images/unknown.png b/byzcoin/collection/assets/images/unknown.png similarity index 100% rename from omniledger/collection/assets/images/unknown.png rename to byzcoin/collection/assets/images/unknown.png diff --git a/omniledger/collection/assets/images/unknownroot.png b/byzcoin/collection/assets/images/unknownroot.png similarity index 100% rename from omniledger/collection/assets/images/unknownroot.png rename to byzcoin/collection/assets/images/unknownroot.png diff --git a/omniledger/collection/byteslice.go b/byzcoin/collection/byteslice.go similarity index 100% rename from omniledger/collection/byteslice.go rename to byzcoin/collection/byteslice.go diff --git a/omniledger/collection/byteslice_test.go b/byzcoin/collection/byteslice_test.go similarity index 100% rename from omniledger/collection/byteslice_test.go rename to byzcoin/collection/byteslice_test.go diff --git a/omniledger/collection/codecov.yml b/byzcoin/collection/codecov.yml similarity index 100% rename from omniledger/collection/codecov.yml rename to byzcoin/collection/codecov.yml diff --git a/omniledger/collection/collection.go b/byzcoin/collection/collection.go similarity index 100% rename from omniledger/collection/collection.go rename to byzcoin/collection/collection.go diff --git a/omniledger/collection/collection_test.go b/byzcoin/collection/collection_test.go similarity index 100% rename from omniledger/collection/collection_test.go rename to byzcoin/collection/collection_test.go diff --git a/omniledger/collection/context_test.go b/byzcoin/collection/context_test.go similarity index 100% rename from omniledger/collection/context_test.go rename to byzcoin/collection/context_test.go diff --git a/omniledger/collection/example.md b/byzcoin/collection/example.md similarity index 100% rename from omniledger/collection/example.md rename to byzcoin/collection/example.md diff --git a/omniledger/collection/field.go b/byzcoin/collection/field.go similarity index 100% rename from omniledger/collection/field.go rename to byzcoin/collection/field.go diff --git a/omniledger/collection/field_test.go b/byzcoin/collection/field_test.go similarity index 100% rename from omniledger/collection/field_test.go rename to byzcoin/collection/field_test.go diff --git a/omniledger/collection/flag.go b/byzcoin/collection/flag.go similarity index 100% rename from omniledger/collection/flag.go rename to byzcoin/collection/flag.go diff --git a/omniledger/collection/flag_test.go b/byzcoin/collection/flag_test.go similarity index 100% rename from omniledger/collection/flag_test.go rename to byzcoin/collection/flag_test.go diff --git a/omniledger/collection/getters.go b/byzcoin/collection/getters.go similarity index 100% rename from omniledger/collection/getters.go rename to byzcoin/collection/getters.go diff --git a/omniledger/collection/getters_test.go b/byzcoin/collection/getters_test.go similarity index 100% rename from omniledger/collection/getters_test.go rename to byzcoin/collection/getters_test.go diff --git a/omniledger/collection/manipulators.go b/byzcoin/collection/manipulators.go similarity index 100% rename from omniledger/collection/manipulators.go rename to byzcoin/collection/manipulators.go diff --git a/omniledger/collection/manipulators_test.go b/byzcoin/collection/manipulators_test.go similarity index 100% rename from omniledger/collection/manipulators_test.go rename to byzcoin/collection/manipulators_test.go diff --git a/omniledger/collection/navigators.go b/byzcoin/collection/navigators.go similarity index 100% rename from omniledger/collection/navigators.go rename to byzcoin/collection/navigators.go diff --git a/omniledger/collection/navigators_test.go b/byzcoin/collection/navigators_test.go similarity index 100% rename from omniledger/collection/navigators_test.go rename to byzcoin/collection/navigators_test.go diff --git a/omniledger/collection/node.go b/byzcoin/collection/node.go similarity index 100% rename from omniledger/collection/node.go rename to byzcoin/collection/node.go diff --git a/omniledger/collection/node_test.go b/byzcoin/collection/node_test.go similarity index 100% rename from omniledger/collection/node_test.go rename to byzcoin/collection/node_test.go diff --git a/omniledger/collection/proof.go b/byzcoin/collection/proof.go similarity index 100% rename from omniledger/collection/proof.go rename to byzcoin/collection/proof.go diff --git a/omniledger/collection/proof_test.go b/byzcoin/collection/proof_test.go similarity index 100% rename from omniledger/collection/proof_test.go rename to byzcoin/collection/proof_test.go diff --git a/omniledger/collection/proto.go b/byzcoin/collection/proto.go similarity index 100% rename from omniledger/collection/proto.go rename to byzcoin/collection/proto.go diff --git a/omniledger/collection/record.go b/byzcoin/collection/record.go similarity index 100% rename from omniledger/collection/record.go rename to byzcoin/collection/record.go diff --git a/omniledger/collection/record_test.go b/byzcoin/collection/record_test.go similarity index 100% rename from omniledger/collection/record_test.go rename to byzcoin/collection/record_test.go diff --git a/omniledger/collection/scope.go b/byzcoin/collection/scope.go similarity index 100% rename from omniledger/collection/scope.go rename to byzcoin/collection/scope.go diff --git a/omniledger/collection/scope_test.go b/byzcoin/collection/scope_test.go similarity index 100% rename from omniledger/collection/scope_test.go rename to byzcoin/collection/scope_test.go diff --git a/omniledger/collection/singlenode.go b/byzcoin/collection/singlenode.go similarity index 100% rename from omniledger/collection/singlenode.go rename to byzcoin/collection/singlenode.go diff --git a/omniledger/collection/singlenode_test.go b/byzcoin/collection/singlenode_test.go similarity index 100% rename from omniledger/collection/singlenode_test.go rename to byzcoin/collection/singlenode_test.go diff --git a/omniledger/collection/transaction.go b/byzcoin/collection/transaction.go similarity index 100% rename from omniledger/collection/transaction.go rename to byzcoin/collection/transaction.go diff --git a/omniledger/collection/transaction_test.go b/byzcoin/collection/transaction_test.go similarity index 100% rename from omniledger/collection/transaction_test.go rename to byzcoin/collection/transaction_test.go diff --git a/omniledger/collection/update.go b/byzcoin/collection/update.go similarity index 100% rename from omniledger/collection/update.go rename to byzcoin/collection/update.go diff --git a/omniledger/collection/update_test.go b/byzcoin/collection/update_test.go similarity index 100% rename from omniledger/collection/update_test.go rename to byzcoin/collection/update_test.go diff --git a/omniledger/collection/verifiers.go b/byzcoin/collection/verifiers.go similarity index 100% rename from omniledger/collection/verifiers.go rename to byzcoin/collection/verifiers.go diff --git a/omniledger/collection/verifiers_test.go b/byzcoin/collection/verifiers_test.go similarity index 100% rename from omniledger/collection/verifiers_test.go rename to byzcoin/collection/verifiers_test.go diff --git a/omniledger/service/contracts.go b/byzcoin/contracts.go similarity index 98% rename from omniledger/service/contracts.go rename to byzcoin/contracts.go index 48c15d5487..fb758d9fa1 100644 --- a/omniledger/service/contracts.go +++ b/byzcoin/contracts.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "encoding/binary" @@ -6,8 +6,8 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/viewchange" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/viewchange" "github.com/dedis/kyber/sign/cosi" "github.com/dedis/onet" "github.com/dedis/onet/log" diff --git a/omniledger/contracts/coins.go b/byzcoin/contracts/coins.go similarity index 82% rename from omniledger/contracts/coins.go rename to byzcoin/contracts/coins.go index e52ce31184..0a83390fdf 100644 --- a/omniledger/contracts/coins.go +++ b/byzcoin/contracts/coins.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "errors" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet/log" "github.com/dedis/protobuf" ) @@ -32,7 +32,7 @@ var CoinName = iid("olCoin") // parameter for the next instruction to interpret. // - store puts the coins given to the instance back into the account. // You can only delete a contractCoin instance if the account is empty. -func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc []ol.StateChange, cOut []ol.Coin, err error) { +func ContractCoin(cdb byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) (sc []byzcoin.StateChange, cOut []byzcoin.Coin, err error) { cOut = c err = inst.VerifyDarcSignature(cdb) @@ -46,7 +46,7 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ if err != nil { return } - var ci ol.Coin + var ci byzcoin.Coin if inst.Spawn == nil { // Only if its NOT a spawn instruction is there data in the instance if value != nil { @@ -58,15 +58,15 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ } switch inst.GetType() { - case ol.SpawnType: + case byzcoin.SpawnType: // Spawn creates a new coin account as a separate instance. ca := inst.DeriveID("") log.Lvlf3("Spawning coin to %x", ca.Slice()) if t := inst.Spawn.Args.Search("type"); t != nil { - if len(t) != len(ol.InstanceID{}) { + if len(t) != len(byzcoin.InstanceID{}) { return nil, nil, errors.New("type needs to be an InstanceID") } - ci.Name = ol.NewInstanceID(t) + ci.Name = byzcoin.NewInstanceID(t) } else { ci.Name = CoinName } @@ -75,11 +75,11 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ if err != nil { return nil, nil, errors.New("couldn't encode CoinInstance: " + err.Error()) } - sc = []ol.StateChange{ - ol.NewStateChange(ol.Create, ca, ContractCoinID, ciBuf, darcID), + sc = []byzcoin.StateChange{ + byzcoin.NewStateChange(byzcoin.Create, ca, ContractCoinID, ciBuf, darcID), } return - case ol.InvokeType: + case byzcoin.InvokeType: // Invoke is one of "mint", "transfer", "fetch", or "store". var coinsArg uint64 @@ -115,7 +115,7 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ return } - var targetCI ol.Coin + var targetCI byzcoin.Coin err = protobuf.Decode(v, &targetCI) if err != nil { return nil, nil, errors.New("couldn't unmarshal target account: " + err.Error()) @@ -134,7 +134,7 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ } log.Lvlf1("transferring %d to %x", coinsArg, target) - sc = append(sc, ol.NewStateChange(ol.Update, ol.NewInstanceID(target), + sc = append(sc, byzcoin.NewStateChange(byzcoin.Update, byzcoin.NewInstanceID(target), ContractCoinID, targetBuf, did)) case "fetch": // fetch removes coins from the account and passes it on to the next @@ -143,10 +143,10 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ if err != nil { return } - cOut = append(cOut, ol.Coin{Name: ci.Name, Value: coinsArg}) + cOut = append(cOut, byzcoin.Coin{Name: ci.Name, Value: coinsArg}) case "store": // store moves all coins from this instruction into the account. - cOut = []ol.Coin{} + cOut = []byzcoin.Coin{} for _, co := range c { if ci.Name.Equal(co.Name) { err = ci.SafeAdd(co.Value) @@ -164,17 +164,17 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ // Finally update the coin value. var ciBuf []byte ciBuf, err = protobuf.Encode(&ci) - sc = append(sc, ol.NewStateChange(ol.Update, inst.InstanceID, + sc = append(sc, byzcoin.NewStateChange(byzcoin.Update, inst.InstanceID, ContractCoinID, ciBuf, darcID)) return - case ol.DeleteType: + case byzcoin.DeleteType: // Delete our coin address, but only if the current coin is empty. if ci.Value > 0 { err = errors.New("cannot destroy a coinInstance that still has coins in it") return } - sc = ol.StateChanges{ - ol.NewStateChange(ol.Remove, inst.InstanceID, ContractCoinID, nil, darcID), + sc = byzcoin.StateChanges{ + byzcoin.NewStateChange(byzcoin.Remove, inst.InstanceID, ContractCoinID, nil, darcID), } return } @@ -186,8 +186,8 @@ func ContractCoin(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc [ // thereby handling the case where len(in) != 32. // // TODO: Find a nicer way to make well-known instance IDs. -func iid(in string) ol.InstanceID { +func iid(in string) byzcoin.InstanceID { h := sha256.New() h.Write([]byte(in)) - return ol.NewInstanceID(h.Sum(nil)) + return byzcoin.NewInstanceID(h.Sum(nil)) } diff --git a/omniledger/contracts/coins_test.go b/byzcoin/contracts/coins_test.go similarity index 68% rename from omniledger/contracts/coins_test.go rename to byzcoin/contracts/coins_test.go index 22ec469eb6..69a9056358 100644 --- a/omniledger/contracts/coins_test.go +++ b/byzcoin/contracts/coins_test.go @@ -3,10 +3,10 @@ package contracts import ( "testing" - "github.com/dedis/cothority/omniledger/collection" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/collection" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/onet/log" "github.com/dedis/protobuf" "github.com/stretchr/testify/require" @@ -16,7 +16,7 @@ var ciZero, ciOne, ciTwo []byte var coinZero, coinOne, coinTwo []byte func init() { - ci := ol.Coin{ + ci := byzcoin.Coin{ Name: CoinName, } var err error @@ -39,21 +39,21 @@ func init() { func TestCoin_Spawn(t *testing.T) { // Testing spawning of a new coin and checking it has zero coins in it. ct := newCT("spawn:coin") - inst := ol.Instruction{ - InstanceID: ol.NewInstanceID(gdarc.GetBaseID()), - Spawn: &ol.Spawn{ + inst := byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(gdarc.GetBaseID()), + Spawn: &byzcoin.Spawn{ ContractID: ContractCoinID, }, } err := inst.SignBy(gdarc.GetBaseID(), gsigner) require.Nil(t, err) - c := []ol.Coin{} + c := []byzcoin.Coin{} sc, co, err := ContractCoin(ct, inst, c) require.Nil(t, err) require.Equal(t, 1, len(sc)) ca := inst.DeriveID("") - require.Equal(t, ol.NewStateChange(ol.Create, ca, + require.Equal(t, byzcoin.NewStateChange(byzcoin.Create, ca, ContractCoinID, ciZero, gdarc.GetBaseID()), sc[0]) require.Equal(t, 0, len(co)) } @@ -61,47 +61,47 @@ func TestCoin_Spawn(t *testing.T) { func TestCoin_InvokeMint(t *testing.T) { // Test that a coin can be minted ct := newCT("invoke:mint") - coAddr := ol.InstanceID{} + coAddr := byzcoin.InstanceID{} ct.Store(coAddr, ciZero, ContractCoinID, gdarc.GetBaseID()) - inst := ol.Instruction{ + inst := byzcoin.Instruction{ InstanceID: coAddr, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "mint", - Args: ol.Arguments{{Name: "coins", Value: coinOne}}, + Args: byzcoin.Arguments{{Name: "coins", Value: coinOne}}, }, } err := inst.SignBy(gdarc.GetBaseID(), gsigner) require.Nil(t, err) - sc, co, err := ContractCoin(ct, inst, []ol.Coin{}) + sc, co, err := ContractCoin(ct, inst, []byzcoin.Coin{}) require.Nil(t, err) require.Equal(t, 0, len(co)) require.Equal(t, 1, len(sc)) - require.Equal(t, ol.NewStateChange(ol.Update, coAddr, ContractCoinID, ciOne, gdarc.GetBaseID()), + require.Equal(t, byzcoin.NewStateChange(byzcoin.Update, coAddr, ContractCoinID, ciOne, gdarc.GetBaseID()), sc[0]) } func TestCoin_InvokeOverflow(t *testing.T) { - ci := ol.Coin{ + ci := byzcoin.Coin{ Value: ^uint64(0), } ciBuf, err := protobuf.Encode(&ci) require.Nil(t, err) ct := newCT("invoke:mint") - coAddr := ol.InstanceID{} + coAddr := byzcoin.InstanceID{} ct.Store(coAddr, ciBuf, ContractCoinID, gdarc.GetBaseID()) - inst := ol.Instruction{ + inst := byzcoin.Instruction{ InstanceID: coAddr, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "mint", - Args: ol.Arguments{{Name: "coins", Value: coinOne}}, + Args: byzcoin.Arguments{{Name: "coins", Value: coinOne}}, }, } require.Nil(t, inst.SignBy(gdarc.GetBaseID(), gsigner)) - sc, co, err := ContractCoin(ct, inst, []ol.Coin{}) + sc, co, err := ContractCoin(ct, inst, []byzcoin.Coin{}) require.Error(t, err) require.Contains(t, err.Error(), "overflow") require.Equal(t, 0, len(co)) @@ -110,35 +110,35 @@ func TestCoin_InvokeOverflow(t *testing.T) { func TestCoin_InvokeStoreFetch(t *testing.T) { ct := newCT("invoke:store", "invoke:fetch") - coAddr := ol.InstanceID{} + coAddr := byzcoin.InstanceID{} ct.Store(coAddr, ciZero, ContractCoinID, gdarc.GetBaseID()) - inst := ol.Instruction{ + inst := byzcoin.Instruction{ InstanceID: coAddr, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "store", Args: nil, }, } require.Nil(t, inst.SignBy(gdarc.GetBaseID(), gsigner)) - c1 := ol.Coin{Name: CoinName, Value: 1} + c1 := byzcoin.Coin{Name: CoinName, Value: 1} notOlCoin := iid("notOlCoin") - c2 := ol.Coin{Name: notOlCoin, Value: 1} + c2 := byzcoin.Coin{Name: notOlCoin, Value: 1} - sc, co, err := ContractCoin(ct, inst, []ol.Coin{c1, c2}) + sc, co, err := ContractCoin(ct, inst, []byzcoin.Coin{c1, c2}) require.Nil(t, err) require.Equal(t, 1, len(co)) require.Equal(t, co[0].Name, notOlCoin) require.Equal(t, 1, len(sc)) - require.Equal(t, ol.NewStateChange(ol.Update, coAddr, ContractCoinID, ciOne, gdarc.GetBaseID()), + require.Equal(t, byzcoin.NewStateChange(byzcoin.Update, coAddr, ContractCoinID, ciOne, gdarc.GetBaseID()), sc[0]) - inst = ol.Instruction{ + inst = byzcoin.Instruction{ InstanceID: coAddr, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "fetch", - Args: ol.Arguments{{Name: "coins", Value: coinOne}}, + Args: byzcoin.Arguments{{Name: "coins", Value: coinOne}}, }, } require.Nil(t, inst.SignBy(gdarc.GetBaseID(), gsigner)) @@ -156,53 +156,53 @@ func TestCoin_InvokeStoreFetch(t *testing.T) { require.Equal(t, co[0].Name, CoinName) require.Equal(t, uint64(1), co[0].Value) require.Equal(t, 1, len(sc)) - require.Equal(t, ol.NewStateChange(ol.Update, coAddr, ContractCoinID, ciZero, gdarc.GetBaseID()), + require.Equal(t, byzcoin.NewStateChange(byzcoin.Update, coAddr, ContractCoinID, ciZero, gdarc.GetBaseID()), sc[0]) } func TestCoin_InvokeTransfer(t *testing.T) { // Test that a coin can be transferred ct := newCT("invoke:transfer") - coAddr1 := ol.InstanceID{} + coAddr1 := byzcoin.InstanceID{} one := make([]byte, 32) one[31] = 1 - coAddr2 := ol.NewInstanceID(one) + coAddr2 := byzcoin.NewInstanceID(one) ct.Store(coAddr1, ciOne, ContractCoinID, gdarc.GetBaseID()) ct.Store(coAddr2, ciZero, ContractCoinID, gdarc.GetBaseID()) // First create an instruction where the transfer should fail - inst := ol.Instruction{ + inst := byzcoin.Instruction{ InstanceID: coAddr2, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: ol.Arguments{ + Args: byzcoin.Arguments{ {Name: "coins", Value: coinOne}, {Name: "destination", Value: coAddr1.Slice()}, }, }, } require.Nil(t, inst.SignBy(gdarc.GetBaseID(), gsigner)) - sc, co, err := ContractCoin(ct, inst, []ol.Coin{}) + sc, co, err := ContractCoin(ct, inst, []byzcoin.Coin{}) require.Error(t, err) - inst = ol.Instruction{ + inst = byzcoin.Instruction{ InstanceID: coAddr1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: ol.Arguments{ + Args: byzcoin.Arguments{ {Name: "coins", Value: coinOne}, {Name: "destination", Value: coAddr2.Slice()}, }, }, } require.Nil(t, inst.SignBy(gdarc.GetBaseID(), gsigner)) - sc, co, err = ContractCoin(ct, inst, []ol.Coin{}) + sc, co, err = ContractCoin(ct, inst, []byzcoin.Coin{}) require.Nil(t, err) require.Equal(t, 0, len(co)) require.Equal(t, 2, len(sc)) - require.Equal(t, ol.NewStateChange(ol.Update, coAddr2, ContractCoinID, ciOne, gdarc.GetBaseID()), sc[0]) - require.Equal(t, ol.NewStateChange(ol.Update, coAddr1, ContractCoinID, ciZero, gdarc.GetBaseID()), sc[1]) + require.Equal(t, byzcoin.NewStateChange(byzcoin.Update, coAddr2, ContractCoinID, ciOne, gdarc.GetBaseID()), sc[0]) + require.Equal(t, byzcoin.NewStateChange(byzcoin.Update, coAddr1, ContractCoinID, ciZero, gdarc.GetBaseID()), sc[1]) } type cvTest struct { @@ -229,14 +229,14 @@ func newCT(rStr ...string) *cvTest { gdarc = darc.NewDarc(rules, []byte{}) dBuf, err := gdarc.ToProto() log.ErrFatal(err) - ct.Store(ol.NewInstanceID(gdarc.GetBaseID()), dBuf, "darc", gdarc.GetBaseID()) + ct.Store(byzcoin.NewInstanceID(gdarc.GetBaseID()), dBuf, "darc", gdarc.GetBaseID()) return ct } func (ct cvTest) Get(key []byte) collection.Getter { panic("not implemented") } -func (ct *cvTest) Store(key ol.InstanceID, value []byte, contractID string, darcID darc.ID) { +func (ct *cvTest) Store(key byzcoin.InstanceID, value []byte, contractID string, darcID darc.ID) { k := string(key.Slice()) ct.values[k] = value ct.contractIDs[k] = contractID diff --git a/omniledger/contracts/service.go b/byzcoin/contracts/service.go similarity index 73% rename from omniledger/contracts/service.go rename to byzcoin/contracts/service.go index 28bacb4962..d70dc81daf 100644 --- a/omniledger/contracts/service.go +++ b/byzcoin/contracts/service.go @@ -1,13 +1,13 @@ package contracts import ( - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/onet" "github.com/dedis/onet/log" ) // This service is only used because we need to register our contracts to -// the omniledger service. So we create this stub and add contracts to it +// the ByzCoin service. So we create this stub and add contracts to it // from the `contracts` directory. func init() { @@ -26,7 +26,7 @@ func newService(c *onet.Context) (onet.Service, error) { s := &Service{ ServiceProcessor: onet.NewServiceProcessor(c), } - ol.RegisterContract(c, ContractValueID, ContractValue) - ol.RegisterContract(c, ContractCoinID, ContractCoin) + byzcoin.RegisterContract(c, ContractValueID, ContractValue) + byzcoin.RegisterContract(c, ContractCoinID, ContractCoin) return s, nil } diff --git a/omniledger/contracts/service_test.go b/byzcoin/contracts/service_test.go similarity index 100% rename from omniledger/contracts/service_test.go rename to byzcoin/contracts/service_test.go diff --git a/omniledger/contracts/value.go b/byzcoin/contracts/value.go similarity index 65% rename from omniledger/contracts/value.go rename to byzcoin/contracts/value.go index 60d8c2b8ea..81eb356c79 100644 --- a/omniledger/contracts/value.go +++ b/byzcoin/contracts/value.go @@ -3,8 +3,8 @@ package contracts import ( "errors" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" ) // The value contract can simply store a value in an instance and serves @@ -20,7 +20,7 @@ var ContractValueID = "value" // It can spawn new value instances and will store the "value" argument in these // new instances. // Existing value instances can be "update"d and deleted. -func ContractValue(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc []ol.StateChange, cOut []ol.Coin, err error) { +func ContractValue(cdb byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) (sc []byzcoin.StateChange, cOut []byzcoin.Coin, err error) { cOut = c err = inst.VerifyDarcSignature(cdb) @@ -35,22 +35,22 @@ func ContractValue(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) (sc } switch inst.GetType() { - case ol.SpawnType: - return []ol.StateChange{ - ol.NewStateChange(ol.Create, inst.DeriveID(""), + case byzcoin.SpawnType: + return []byzcoin.StateChange{ + byzcoin.NewStateChange(byzcoin.Create, inst.DeriveID(""), ContractValueID, inst.Spawn.Args.Search("value"), darcID), }, c, nil - case ol.InvokeType: + case byzcoin.InvokeType: if inst.Invoke.Command != "update" { return nil, nil, errors.New("Value contract can only update") } - return []ol.StateChange{ - ol.NewStateChange(ol.Update, inst.InstanceID, + return []byzcoin.StateChange{ + byzcoin.NewStateChange(byzcoin.Update, inst.InstanceID, ContractValueID, inst.Invoke.Args.Search("value"), darcID), }, c, nil - case ol.DeleteType: - return ol.StateChanges{ - ol.NewStateChange(ol.Remove, inst.InstanceID, ContractValueID, nil, darcID), + case byzcoin.DeleteType: + return byzcoin.StateChanges{ + byzcoin.NewStateChange(byzcoin.Remove, inst.InstanceID, ContractValueID, nil, darcID), }, c, nil } return nil, nil, errors.New("didn't find any instruction") diff --git a/omniledger/contracts/value_test.go b/byzcoin/contracts/value_test.go similarity index 64% rename from omniledger/contracts/value_test.go rename to byzcoin/contracts/value_test.go index 9b1d65a248..e9e5ec81ed 100644 --- a/omniledger/contracts/value_test.go +++ b/byzcoin/contracts/value_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet" "github.com/stretchr/testify/require" ) @@ -18,26 +18,26 @@ func TestValue_Spawn(t *testing.T) { signer := darc.NewSignerEd25519(nil, nil) _, roster, _ := local.GenTree(2, true) - genesisMsg, err := ol.DefaultGenesisMsg(ol.CurrentVersion, roster, + genesisMsg, err := byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, roster, []string{"spawn:value", "spawn:darc"}, signer.Identity()) require.Nil(t, err) gDarc := &genesisMsg.GenesisDarc genesisMsg.BlockInterval = time.Second - cl, _, err := ol.NewOmniledger(genesisMsg, false) + cl, _, err := byzcoin.NewLedger(genesisMsg, false) require.Nil(t, err) myvalue := []byte("1234") - ctx := ol.ClientTransaction{ - Instructions: []ol.Instruction{{ - InstanceID: ol.NewInstanceID(gDarc.GetBaseID()), - Nonce: ol.Nonce{}, + ctx := byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{{ + InstanceID: byzcoin.NewInstanceID(gDarc.GetBaseID()), + Nonce: byzcoin.Nonce{}, Index: 0, Length: 1, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: ContractValueID, - Args: []ol.Argument{{ + Args: []byzcoin.Argument{{ Name: "value", Value: myvalue, }}, @@ -48,7 +48,7 @@ func TestValue_Spawn(t *testing.T) { _, err = cl.AddTransaction(ctx) require.Nil(t, err) - pr, err := cl.WaitProof(ol.NewInstanceID(ctx.Instructions[0].DeriveID("").Slice()), genesisMsg.BlockInterval, myvalue) + pr, err := cl.WaitProof(byzcoin.NewInstanceID(ctx.Instructions[0].DeriveID("").Slice()), genesisMsg.BlockInterval, myvalue) require.Nil(t, err) require.True(t, pr.InclusionProof.Match()) values, err := pr.InclusionProof.RawValues() diff --git a/omniledger/darc/README.md b/byzcoin/darc/README.md similarity index 99% rename from omniledger/darc/README.md rename to byzcoin/darc/README.md index 3eaf2e1753..c34bc31d7c 100644 --- a/omniledger/darc/README.md +++ b/byzcoin/darc/README.md @@ -1,7 +1,7 @@ Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) :: [Cothority](https://github.com/dedis/cothority/tree/master/README.md) :: [Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) :: -[OmniLedger](../README.md) +[ByzCoin](../README.md) Distributed Access Right Controls # Distributed Access Right Controls diff --git a/omniledger/darc/darc.go b/byzcoin/darc/darc.go similarity index 99% rename from omniledger/darc/darc.go rename to byzcoin/darc/darc.go index cd35034f56..f44ae11d0e 100644 --- a/omniledger/darc/darc.go +++ b/byzcoin/darc/darc.go @@ -44,7 +44,7 @@ import ( "strings" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/kyber" "github.com/dedis/kyber/sign/schnorr" "github.com/dedis/kyber/util/key" @@ -326,7 +326,7 @@ func (d *Darc) EvolveFrom(prev *Darc) error { // evolution. It returns a request, and the actual serialisation of the darc. // We do not put the actual Msg in the request because requests should be kept // small and the actual payload should be managed by the user of darcs. For -// example the payload could be in an OmniLedger transaction. +// example the payload could be in a ByzCoin transaction. func (d *Darc) MakeEvolveRequest(prevSigners ...Signer) (*Request, []byte, error) { if d == nil { return nil, nil, errors.New("darc is nil") diff --git a/omniledger/darc/darc_example_test.go b/byzcoin/darc/darc_example_test.go similarity index 96% rename from omniledger/darc/darc_example_test.go rename to byzcoin/darc/darc_example_test.go index be704b4c4a..8f4db1e18b 100644 --- a/omniledger/darc/darc_example_test.go +++ b/byzcoin/darc/darc_example_test.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" ) func Example() { diff --git a/omniledger/darc/darc_test.go b/byzcoin/darc/darc_test.go similarity index 99% rename from omniledger/darc/darc_test.go rename to byzcoin/darc/darc_test.go index 2e9954e9a4..ad7b8e5444 100644 --- a/omniledger/darc/darc_test.go +++ b/byzcoin/darc/darc_test.go @@ -3,7 +3,7 @@ package darc import ( "testing" - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/stretchr/testify/require" ) diff --git a/omniledger/darc/expression/expression.go b/byzcoin/darc/expression/expression.go similarity index 100% rename from omniledger/darc/expression/expression.go rename to byzcoin/darc/expression/expression.go diff --git a/omniledger/darc/expression/expression_test.go b/byzcoin/darc/expression/expression_test.go similarity index 100% rename from omniledger/darc/expression/expression_test.go rename to byzcoin/darc/expression/expression_test.go diff --git a/omniledger/darc/proto.go b/byzcoin/darc/proto.go similarity index 98% rename from omniledger/darc/proto.go rename to byzcoin/darc/proto.go index 7ace8291c3..e2dc0f64ee 100644 --- a/omniledger/darc/proto.go +++ b/byzcoin/darc/proto.go @@ -1,7 +1,7 @@ package darc import ( - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/kyber" "github.com/dedis/onet/network" ) diff --git a/omniledger/darc/struct.go b/byzcoin/darc/struct.go similarity index 100% rename from omniledger/darc/struct.go rename to byzcoin/darc/struct.go diff --git a/omniledger/service/doc.go b/byzcoin/doc.go similarity index 94% rename from omniledger/service/doc.go rename to byzcoin/doc.go index fa56ff4fe2..935a327057 100644 --- a/omniledger/service/doc.go +++ b/byzcoin/doc.go @@ -1,4 +1,4 @@ -package service +package byzcoin /* A service interacts with the outer world through an API that defines the diff --git a/omniledger/service/heartbeat.go b/byzcoin/heartbeat.go similarity index 99% rename from omniledger/service/heartbeat.go rename to byzcoin/heartbeat.go index bced3b7ca7..983d81d1e5 100644 --- a/omniledger/service/heartbeat.go +++ b/byzcoin/heartbeat.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "errors" diff --git a/omniledger/service/heartbeat_test.go b/byzcoin/heartbeat_test.go similarity index 98% rename from omniledger/service/heartbeat_test.go rename to byzcoin/heartbeat_test.go index 9b69005800..f3f21167ff 100644 --- a/omniledger/service/heartbeat_test.go +++ b/byzcoin/heartbeat_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "testing" diff --git a/omniledger/service/messages.go b/byzcoin/messages.go similarity index 97% rename from omniledger/service/messages.go rename to byzcoin/messages.go index c90c64215a..579cf901d9 100644 --- a/omniledger/service/messages.go +++ b/byzcoin/messages.go @@ -1,4 +1,4 @@ -package service +package byzcoin /* This holds the messages used to communicate with the service over the network. diff --git a/omniledger/service/proof.go b/byzcoin/proof.go similarity index 99% rename from omniledger/service/proof.go rename to byzcoin/proof.go index fd56cd93a0..dc93e9de45 100644 --- a/omniledger/service/proof.go +++ b/byzcoin/proof.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" diff --git a/omniledger/service/proof_test.go b/byzcoin/proof_test.go similarity index 98% rename from omniledger/service/proof_test.go rename to byzcoin/proof_test.go index c2fbd32133..025c9e6650 100644 --- a/omniledger/service/proof_test.go +++ b/byzcoin/proof_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "crypto/sha256" @@ -82,7 +82,7 @@ func createSC(t *testing.T) (s sc) { require.Nil(t, err) s.s = skipchain.NewSkipBlockDB(db, bnsc) - bnol := []byte("omniledger-test") + bnol := []byte("a testing string") err = db.Update(func(tx *bolt.Tx) error { _, err := tx.CreateBucket(bnol) return err diff --git a/omniledger/service/proto.go b/byzcoin/proto.go similarity index 97% rename from omniledger/service/proto.go rename to byzcoin/proto.go index 8b05421595..30af97a715 100644 --- a/omniledger/service/proto.go +++ b/byzcoin/proto.go @@ -1,15 +1,16 @@ -package service +package byzcoin import ( "time" - "github.com/dedis/cothority/omniledger/collection" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/collection" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/skipchain" "github.com/dedis/onet" ) // PROTOSTART +// package byzcoin; // type :skipchain.SkipBlockID:bytes // type :darc.ID:bytes // type :Arguments:[]Argument @@ -17,14 +18,13 @@ import ( // type :TxResults:[]TxResult // type :InstanceID:bytes // type :Version:sint32 -// package omniledger; // import "skipchain.proto"; // import "onet.proto"; // import "darc.proto"; // import "collection.proto"; // // option java_package = "ch.epfl.dedis.proto"; -// option java_outer_classname = "OmniLedgerProto"; +// option java_outer_classname = "ByzCoinProto"; // DataHeader is the data passed to the Skipchain type DataHeader struct { diff --git a/omniledger/service/service.go b/byzcoin/service.go similarity index 97% rename from omniledger/service/service.go rename to byzcoin/service.go index b35bf7ee0c..15f345054d 100644 --- a/omniledger/service/service.go +++ b/byzcoin/service.go @@ -1,5 +1,5 @@ -// Package service implements the OmniLedger service. -package service +// Package byzcoin implements the ByzCoin ledger. +package byzcoin import ( "bytes" @@ -12,11 +12,11 @@ import ( "time" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin/collection" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/viewchange" cosiprotocol "github.com/dedis/cothority/ftcosi/protocol" "github.com/dedis/cothority/messaging" - "github.com/dedis/cothority/omniledger/collection" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/viewchange" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber" "github.com/dedis/kyber/util/random" @@ -28,7 +28,7 @@ import ( ) // This is to boost the acceptable timestamp window when dealing with -// very short block intervals, like in testing. If a production OmniLedger +// very short block intervals, like in testing. If a production ByzCoin // had a block interval of 30 seconds, for example, this minimum will // not trigger, and the acceptable window would be ± 30 sec. var minTimestampWindow = 10 * time.Second @@ -46,14 +46,14 @@ const viewChangeFtCosi = "viewchange_ftcosi" var viewChangeMsgID network.MessageTypeID -// OmniledgerID can be used to refer to this service -var OmniledgerID onet.ServiceID +// ByzCoinID can be used to refer to this service +var ByzCoinID onet.ServiceID -var verifyOmniLedger = skipchain.VerifierID(uuid.NewV5(uuid.NamespaceURL, "OmniLedger")) +var verifyByzCoin = skipchain.VerifierID(uuid.NewV5(uuid.NamespaceURL, "ByzCoin")) func init() { var err error - OmniledgerID, err = onet.RegisterNewService(ServiceName, newService) + ByzCoinID, err = onet.RegisterNewService(ServiceName, newService) log.ErrFatal(err) network.RegisterMessages(&omniStorage{}, &DataHeader{}, &DataBody{}) viewChangeMsgID = network.RegisterMessage(&viewchange.InitReq{}) @@ -65,7 +65,7 @@ func GenNonce() (n Nonce) { return n } -// Service is our OmniLedger-service +// Service is our ByzCoin-service type Service struct { // We need to embed the ServiceProcessor, so that incoming messages // are correctly handled. @@ -73,10 +73,10 @@ type Service struct { // collections cannot be stored, so they will be re-created whenever the // service reloads. collectionDB map[string]*collectionDB - // holds a link for every omniledger to the latest block that is included in + // holds a link for every ByzCoin to the latest block that is included in // the collection. // TODO: merge collectionDB and pollChan into olState structure. - state olState + state bcState // pollChan maintains a map of channels that can be used to stop the // polling go-routing. @@ -95,7 +95,7 @@ type Service struct { closeLeaderMonitorChan chan bool // contracts map kinds to kind specific verification functions - contracts map[string]OmniLedgerContract + contracts map[string]ContractFn // propagate the new transactions propagateTransactions messaging.PropagationFunc @@ -116,7 +116,7 @@ type Service struct { // storageID reflects the data we're storing - we could store more // than one structure. -var storageID = []byte("OmniLedger") +var storageID = []byte("ByzCoin") // defaultInterval is used if the BlockInterval field in the genesis // transaction is not set. @@ -354,7 +354,7 @@ func (s *Service) createNewBlock(scID skipchain.SkipBlockID, r *onet.Roster, tx sb.MaximumHeight = 10 sb.BaseHeight = 10 // We have to register the verification functions in the genesis block - sb.VerifierIDs = []skipchain.VerifierID{skipchain.VerifyBase, verifyOmniLedger} + sb.VerifierIDs = []skipchain.VerifierID{skipchain.VerifyBase, verifyByzCoin} coll = collection.New(&collection.Data{}, &collection.Data{}, &collection.Data{}) } else { @@ -771,7 +771,7 @@ func (s *Service) startPolling(scID skipchain.SkipBlockID, interval time.Duratio return closeSignal } -// We use the OmniLedger as a receiver (as is done in the identity service), +// We use the ByzCoin as a receiver (as is done in the identity service), // so we can access e.g. the collectionDBs of the service. func (s *Service) verifySkipBlock(newID []byte, newSB *skipchain.SkipBlock) bool { start := time.Now() @@ -1252,7 +1252,7 @@ func (s *Service) withinInterval(genesisDarcID darc.ID, targetPk kyber.Point) er // registerContract stores the contract in a map and will // call it whenever a contract needs to be done. -func (s *Service) registerContract(contractID string, c OmniLedgerContract) error { +func (s *Service) registerContract(contractID string, c ContractFn) error { s.contracts[contractID] = c return nil } @@ -1274,7 +1274,7 @@ func (s *Service) startAllChains() error { } } s.collectionDB = map[string]*collectionDB{} - s.state = olState{ + s.state = bcState{ waitChannels: make(map[string]chan bool), } @@ -1366,7 +1366,7 @@ func (s *Service) isOurChain(gen skipchain.SkipBlockID) bool { return false } for _, x := range sb.VerifierIDs { - if x.Equal(verifyOmniLedger) { + if x.Equal(verifyByzCoin) { return true } } @@ -1418,7 +1418,7 @@ func (s *Service) trySyncAll() { func newService(c *onet.Context) (onet.Service, error) { s := &Service{ ServiceProcessor: onet.NewServiceProcessor(c), - contracts: make(map[string]OmniLedgerContract), + contracts: make(map[string]ContractFn), txBuffer: newTxBuffer(), storage: &omniStorage{}, darcToSc: make(map[string]skipchain.SkipBlockID), @@ -1436,7 +1436,7 @@ func newService(c *onet.Context) (onet.Service, error) { s.registerContract(ContractConfigID, s.ContractConfig) s.registerContract(ContractDarcID, s.ContractDarc) - skipchain.RegisterVerification(c, verifyOmniLedger, s.verifySkipBlock) + skipchain.RegisterVerification(c, verifyByzCoin, s.verifySkipBlock) if _, err := s.ProtocolRegister(collectTxProtocol, NewCollectTxProtocol(s.getTxs)); err != nil { return nil, err } diff --git a/omniledger/service/service_test.go b/byzcoin/service_test.go similarity index 99% rename from omniledger/service/service_test.go rename to byzcoin/service_test.go index c71085cc9b..a4f853459d 100644 --- a/omniledger/service/service_test.go +++ b/byzcoin/service_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" @@ -9,8 +9,8 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber/suites" "github.com/dedis/kyber/util/random" @@ -341,7 +341,7 @@ func TestService_LateBlock(t *testing.T) { // Hook the verifier in order delay the arrival and test timestamp checking. ser := s.services[0] c := ser.Context - skipchain.RegisterVerification(c, verifyOmniLedger, func(newID []byte, newSB *skipchain.SkipBlock) bool { + skipchain.RegisterVerification(c, verifyByzCoin, func(newID []byte, newSB *skipchain.SkipBlock) bool { // Make this block arrive late compared to it's timestamp. The window will be // 1000ms, so sleep 1200 more, just to be sure. time.Sleep(2200 * time.Millisecond) @@ -366,7 +366,7 @@ func TestService_BadDataHeader(t *testing.T) { ser := s.services[0] c := ser.Context - skipchain.RegisterVerification(c, verifyOmniLedger, func(newID []byte, newSB *skipchain.SkipBlock) bool { + skipchain.RegisterVerification(c, verifyByzCoin, func(newID []byte, newSB *skipchain.SkipBlock) bool { // Hack up the DataHeader to make the CollectionRoot the wrong size. var header DataHeader err := protobuf.DecodeWithConstructors(newSB.Data, &header, network.DefaultConstructors(cothority.Suite)) @@ -1330,7 +1330,7 @@ func newSerN(t *testing.T, step int, interval time.Duration, n int, viewchange b signer: darc.NewSignerEd25519(nil, nil), } s.hosts, s.roster, _ = s.local.GenTree(n, true) - for _, sv := range s.local.GetServices(s.hosts, OmniledgerID) { + for _, sv := range s.local.GetServices(s.hosts, ByzCoinID) { service := sv.(*Service) s.services = append(s.services, service) } diff --git a/omniledger/simulation/.gitignore b/byzcoin/simulation/.gitignore similarity index 100% rename from omniledger/simulation/.gitignore rename to byzcoin/simulation/.gitignore diff --git a/omniledger/simulation/coins.go b/byzcoin/simulation/coins.go similarity index 82% rename from omniledger/simulation/coins.go rename to byzcoin/simulation/coins.go index 09274e498b..6303b5cce1 100644 --- a/omniledger/simulation/coins.go +++ b/byzcoin/simulation/coins.go @@ -5,9 +5,9 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/dedis/cothority/omniledger/contracts" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/contracts" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet" "github.com/dedis/onet/log" "github.com/dedis/onet/simul/monitor" @@ -71,8 +71,8 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { log.Lvl2("Size is:", size, "rounds:", s.Rounds, "transactions:", s.Transactions) signer := darc.NewSignerEd25519(nil, nil) - // Create omniledger - gm, err := ol.DefaultGenesisMsg(ol.CurrentVersion, config.Roster, + // Create the ledger + gm, err := byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, config.Roster, []string{"spawn:coin", "invoke:mint", "invoke:transfer"}, signer.Identity()) if err != nil { return errors.New("couldn't setup genesis message: " + err.Error()) @@ -85,8 +85,7 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { } gm.BlockInterval = blockInterval - // Create the OmniLedger instance. - c, _, err := ol.NewOmniledger(gm, s.Keep) + c, _, err := byzcoin.NewLedger(gm, s.Keep) if err != nil { return errors.New("couldn't create genesis block: " + err.Error()) } @@ -94,23 +93,23 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { // Create two accounts and mint 'Transaction' coins on first account. coins := make([]byte, 8) coins[7] = byte(1) - tx := ol.ClientTransaction{ - Instructions: []ol.Instruction{ + tx := byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{ { - InstanceID: ol.NewInstanceID(gm.GenesisDarc.GetBaseID()), - Nonce: ol.GenNonce(), + InstanceID: byzcoin.NewInstanceID(gm.GenesisDarc.GetBaseID()), + Nonce: byzcoin.GenNonce(), Index: 0, Length: 2, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: contracts.ContractCoinID, }, }, { - InstanceID: ol.NewInstanceID(gm.GenesisDarc.GetBaseID()), - Nonce: ol.GenNonce(), + InstanceID: byzcoin.NewInstanceID(gm.GenesisDarc.GetBaseID()), + Nonce: byzcoin.GenNonce(), Index: 1, Length: 2, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: contracts.ContractCoinID, }, }, @@ -119,14 +118,14 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { // Now sign all the instructions for i := range tx.Instructions { - if err = ol.SignInstruction(&tx.Instructions[i], gm.GenesisDarc.GetBaseID(), signer); err != nil { + if err = byzcoin.SignInstruction(&tx.Instructions[i], gm.GenesisDarc.GetBaseID(), signer); err != nil { return errors.New("signing of instruction failed: " + err.Error()) } } coinAddr1 := tx.Instructions[0].DeriveID("") coinAddr2 := tx.Instructions[1].DeriveID("") - // And send the instructions to omniledger + // Send the instructions. _, err = c.AddTransactionAndWait(tx, 2) if err != nil { return errors.New("couldn't initialize accounts: " + err.Error()) @@ -134,23 +133,23 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { // Because of issue #1379, we need to do this in a separate tx, once we know // the spawn is done. - tx = ol.ClientTransaction{ - Instructions: []ol.Instruction{ + tx = byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{ { InstanceID: coinAddr1, - Nonce: ol.GenNonce(), + Nonce: byzcoin.GenNonce(), Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "mint", - Args: ol.Arguments{{ + Args: byzcoin.Arguments{{ Name: "coins", Value: coins}}, }, }, }, } - if err = ol.SignInstruction(&tx.Instructions[0], gm.GenesisDarc.GetBaseID(), signer); err != nil { + if err = byzcoin.SignInstruction(&tx.Instructions[0], gm.GenesisDarc.GetBaseID(), signer); err != nil { return errors.New("signing of instruction failed: " + err.Error()) } _, err = c.AddTransactionAndWait(tx, 2) @@ -173,7 +172,7 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { txs := s.Transactions / s.BatchSize insts := s.BatchSize log.Lvlf1("Sending %d transactions with %d instructions each", txs, insts) - tx := ol.ClientTransaction{} + tx := byzcoin.ClientTransaction{} // Inverse the prepare/send loop, so that the last transaction is not sent, // but can be sent in the 'confirm' phase using 'AddTransactionAndWait'. for t := 0; t < txs; t++ { @@ -185,19 +184,19 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { return errors.New("couldn't add transfer transaction: " + err.Error()) } send.Record() - tx.Instructions = ol.Instructions{} + tx.Instructions = byzcoin.Instructions{} } prepare := monitor.NewTimeMeasure("prepare") for i := 0; i < insts; i++ { - tx.Instructions = append(tx.Instructions, ol.Instruction{ + tx.Instructions = append(tx.Instructions, byzcoin.Instruction{ InstanceID: coinAddr1, - Nonce: ol.GenNonce(), + Nonce: byzcoin.GenNonce(), Index: i, Length: insts, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: ol.Arguments{ + Args: byzcoin.Arguments{ { Name: "coins", Value: coinOne, @@ -208,7 +207,7 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { }}, }, }) - err = ol.SignInstruction(&tx.Instructions[i], gm.GenesisDarc.GetBaseID(), signer) + err = byzcoin.SignInstruction(&tx.Instructions[i], gm.GenesisDarc.GetBaseID(), signer) if err != nil { return errors.New("signature error: " + err.Error()) } @@ -233,7 +232,7 @@ func (s *SimulationService) Run(config *onet.SimulationConfig) error { if err != nil { return errors.New("proof doesn't hold transaction: " + err.Error()) } - var account ol.Coin + var account byzcoin.Coin err = protobuf.Decode(v[0], &account) if err != nil { return errors.New("couldn't decode account: " + err.Error()) diff --git a/omniledger/simulation/coins.toml b/byzcoin/simulation/coins.toml similarity index 100% rename from omniledger/simulation/coins.toml rename to byzcoin/simulation/coins.toml diff --git a/omniledger/simulation/plot_sim.py b/byzcoin/simulation/plot_sim.py similarity index 100% rename from omniledger/simulation/plot_sim.py rename to byzcoin/simulation/plot_sim.py diff --git a/omniledger/simulation/simul.go b/byzcoin/simulation/simul.go similarity index 100% rename from omniledger/simulation/simul.go rename to byzcoin/simulation/simul.go diff --git a/omniledger/simulation/simul_test.go b/byzcoin/simulation/simul_test.go similarity index 100% rename from omniledger/simulation/simul_test.go rename to byzcoin/simulation/simul_test.go diff --git a/omniledger/service/statechange_cache.go b/byzcoin/statechange_cache.go similarity index 99% rename from omniledger/service/statechange_cache.go rename to byzcoin/statechange_cache.go index 7176d636ee..ecd39d17f1 100644 --- a/omniledger/service/statechange_cache.go +++ b/byzcoin/statechange_cache.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" diff --git a/omniledger/service/statechange_cache_test.go b/byzcoin/statechange_cache_test.go similarity index 97% rename from omniledger/service/statechange_cache_test.go rename to byzcoin/statechange_cache_test.go index f160bac18e..cad654d387 100644 --- a/omniledger/service/statechange_cache_test.go +++ b/byzcoin/statechange_cache_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "testing" diff --git a/omniledger/service/struct.go b/byzcoin/struct.go similarity index 87% rename from omniledger/service/struct.go rename to byzcoin/struct.go index d40a083ae5..0b1aeb8e2c 100644 --- a/omniledger/service/struct.go +++ b/byzcoin/struct.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "encoding/binary" @@ -7,8 +7,8 @@ import ( "sync" bolt "github.com/coreos/bbolt" - "github.com/dedis/cothority/omniledger/collection" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/collection" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/skipchain" "github.com/dedis/onet/log" "github.com/dedis/onet/network" @@ -58,11 +58,9 @@ func (r *roCollection) GetValues(key []byte) (value []byte, contractID string, d return getValueContract(r, key) } -// OmniLedgerContract is the type signature of the class functions -// which can be registered with the OmniLedger service. -// Since the outcome of the verification depends on the state of the collection -// which is to be modified, we pass it as a pointer here. -type OmniLedgerContract func(coll CollectionView, inst Instruction, inCoins []Coin) (sc []StateChange, outCoins []Coin, err error) +// ContractFn is the type signature of the class functions +// which can be registered with the ByzCoin service. +type ContractFn func(coll CollectionView, inst Instruction, inCoins []Coin) (sc []StateChange, outCoins []Coin, err error) // newCollectionDB initialises a structure and reads all key/value pairs to store // it in the collection. @@ -345,7 +343,7 @@ func getInstanceDarc(c CollectionView, iid InstanceID) (*darc.Darc, error) { // call it whenever a contract needs to be done. // GetService makes it possible to give either an `onet.Context` or // `onet.Server` to `RegisterContract`. -func RegisterContract(s skipchain.GetService, kind string, f OmniLedgerContract) error { +func RegisterContract(s skipchain.GetService, kind string, f ContractFn) error { scs := s.Service(ServiceName) if scs == nil { return errors.New("Didn't find our service: " + ServiceName) @@ -374,7 +372,7 @@ func (c *Coin) SafeSub(a uint64) error { return errors.New("uint64 underflow") } -type olState struct { +type bcState struct { sync.Mutex // waitChannels will be informed by Service.updateCollection that a // given ClientTransaction has been included. updateCollection will @@ -387,60 +385,60 @@ type olState struct { blockListeners []chan skipchain.SkipBlockID } -func (ol *olState) createWaitChannel(ctxHash []byte) chan bool { - ol.Lock() - defer ol.Unlock() +func (bc *bcState) createWaitChannel(ctxHash []byte) chan bool { + bc.Lock() + defer bc.Unlock() ch := make(chan bool, 1) - ol.waitChannels[string(ctxHash)] = ch + bc.waitChannels[string(ctxHash)] = ch return ch } -func (ol *olState) informWaitChannel(ctxHash []byte, valid bool) { - ol.Lock() - defer ol.Unlock() - ch := ol.waitChannels[string(ctxHash)] +func (bc *bcState) informWaitChannel(ctxHash []byte, valid bool) { + bc.Lock() + defer bc.Unlock() + ch := bc.waitChannels[string(ctxHash)] if ch != nil { ch <- valid } } -func (ol *olState) deleteWaitChannel(ctxHash []byte) { - ol.Lock() - defer ol.Unlock() - delete(ol.waitChannels, string(ctxHash)) +func (bc *bcState) deleteWaitChannel(ctxHash []byte) { + bc.Lock() + defer bc.Unlock() + delete(bc.waitChannels, string(ctxHash)) } -func (ol *olState) informBlock(id skipchain.SkipBlockID) { - ol.Lock() - defer ol.Unlock() - for _, x := range ol.blockListeners { +func (bc *bcState) informBlock(id skipchain.SkipBlockID) { + bc.Lock() + defer bc.Unlock() + for _, x := range bc.blockListeners { if x != nil { x <- id } } } -func (ol *olState) registerForBlocks(ch chan skipchain.SkipBlockID) int { - ol.Lock() - defer ol.Unlock() +func (bc *bcState) registerForBlocks(ch chan skipchain.SkipBlockID) int { + bc.Lock() + defer bc.Unlock() - for i := 0; i < len(ol.blockListeners); i++ { - if ol.blockListeners[i] == nil { - ol.blockListeners[i] = ch + for i := 0; i < len(bc.blockListeners); i++ { + if bc.blockListeners[i] == nil { + bc.blockListeners[i] = ch return i } } // If we got here, no empty spots left, append and return the position of the // new element (on startup: after append(nil, ch), len == 1, so len-1 = index 0. - ol.blockListeners = append(ol.blockListeners, ch) - return len(ol.blockListeners) - 1 + bc.blockListeners = append(bc.blockListeners, ch) + return len(bc.blockListeners) - 1 } -func (ol *olState) unregisterForBlocks(i int) { - ol.Lock() - defer ol.Unlock() - ol.blockListeners[i] = nil +func (bc *bcState) unregisterForBlocks(i int) { + bc.Lock() + defer bc.Unlock() + bc.blockListeners[i] = nil } func (c ChainConfig) sanityCheck() error { diff --git a/omniledger/service/struct_test.go b/byzcoin/struct_test.go similarity index 99% rename from omniledger/service/struct_test.go rename to byzcoin/struct_test.go index 1d227133cc..5d4d2e508c 100644 --- a/omniledger/service/struct_test.go +++ b/byzcoin/struct_test.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "fmt" diff --git a/omniledger/service/transaction.go b/byzcoin/transaction.go similarity index 98% rename from omniledger/service/transaction.go rename to byzcoin/transaction.go index 61ee6085dd..a210447aa4 100644 --- a/omniledger/service/transaction.go +++ b/byzcoin/transaction.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" @@ -12,8 +12,8 @@ import ( "github.com/dedis/onet/log" "github.com/dedis/onet/network" - "github.com/dedis/cothority/omniledger/collection" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/collection" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/protobuf" ) @@ -44,7 +44,7 @@ func NewNonce(buf []byte) Nonce { // NewInstanceID converts the first 32 bytes of in into an InstanceID. // Giving nil as in results in the zero InstanceID, which is the special -// key that holds the OmniLedger config. +// key that holds the ledger config. func NewInstanceID(in []byte) InstanceID { var i InstanceID copy(i[:], in) diff --git a/omniledger/service/transaction_test.go b/byzcoin/transaction_test.go similarity index 95% rename from omniledger/service/transaction_test.go rename to byzcoin/transaction_test.go index 2a1ca09bbd..dc925d8a0e 100644 --- a/omniledger/service/transaction_test.go +++ b/byzcoin/transaction_test.go @@ -1,9 +1,9 @@ -package service +package byzcoin import ( "testing" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/darc" "github.com/stretchr/testify/require" ) diff --git a/omniledger/service/viewchange.go b/byzcoin/viewchange.go similarity index 98% rename from omniledger/service/viewchange.go rename to byzcoin/viewchange.go index 888d616ce6..aff0d07a49 100644 --- a/omniledger/service/viewchange.go +++ b/byzcoin/viewchange.go @@ -1,4 +1,4 @@ -package service +package byzcoin import ( "bytes" @@ -8,9 +8,9 @@ import ( "time" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/viewchange" cosiprotocol "github.com/dedis/cothority/ftcosi/protocol" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/viewchange" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber/sign/schnorr" "github.com/dedis/onet" diff --git a/omniledger/viewchange/viewchange.go b/byzcoin/viewchange/viewchange.go similarity index 100% rename from omniledger/viewchange/viewchange.go rename to byzcoin/viewchange/viewchange.go diff --git a/omniledger/viewchange/viewchange_test.go b/byzcoin/viewchange/viewchange_test.go similarity index 100% rename from omniledger/viewchange/viewchange_test.go rename to byzcoin/viewchange/viewchange_test.go diff --git a/calypso/CalypsoOmniLedger.png b/calypso/CalypsoByzCoin.png similarity index 100% rename from calypso/CalypsoOmniLedger.png rename to calypso/CalypsoByzCoin.png diff --git a/calypso/README.md b/calypso/README.md index fb611f96be..23f4301710 100644 --- a/calypso/README.md +++ b/calypso/README.md @@ -9,13 +9,13 @@ Calypso is the implementation of the upcoming "Calypso - Auditable Sharing of Private Data over Blockchains". The paper can be found [here](https://eprint.iacr.org/2018/209). -In short, Calypso allows to store symmetric keys in OmniLedger, protected by a +In short, Calypso allows to store symmetric keys in ByzCoin, protected by a sharded key, and controls access to this symmetric keys using Darcs, Distributed Access Rights Control. It implements both the access-control cothority and the secret-management cothority: -- The access-control cothority is implemented using OmniLedger with two +- The access-control cothority is implemented using ByzCoin with two contracts, `calypsoWrite` and `calypsoRead` - The secret-management cothority uses an onet service with methods to set up a Long Term Secret (LTS) distributed key and to request a re-encryption @@ -32,26 +32,26 @@ The workflow is the following: 6. secret-management: Reader requests a re-encryption to the `DecryptKey` service endpoint. -![Workflow Overview](CalypsoOmniLedger.png?raw=true "Workflow Overview") +![Workflow Overview](CalypsoByzCoin.png?raw=true "Workflow Overview") ## Darcs, Instances, Instructions and Contracts Here is a very short overview of the three most important elements of -OmniLedger. For a more thorough documentation, refer to -[OmniLedger](../omniledger/README.md) documentation. +ByzCoin. For a more thorough documentation, refer to +[ByzCoin](../byzcoin/README.md) documentation. -The current OmniLedger service is a batching implementation of the previous +The current ByzCoin service is a batching implementation of the previous skipchain service. It has a global state that holds _Instances_, where every instance is tied to a _Contract_ and holds a blob of data. The contract defines how the data is to be interpreted and allows different _Instructions_ sent from the user. Access control is done using _Darcs_, which define what public keys can verify -an action. Each instruction received by OmniLedger is mapped to an action and +an action. Each instruction received by ByzCoin is mapped to an action and then verified if the given signature is correct. Also, every instance is linked to one darc that defines what actions are allowed to be done to that instance. -All instructions sent to OmniLedger are batched in a new block that is created +All instructions sent to ByzCoin are batched in a new block that is created every `blockInterval` seconds. ## CreateLTS @@ -73,7 +73,7 @@ that no malicious writer can send an encrypted key without knowing the secret. It then creates a new write-instance that contains the write request. A read request must also be sent to the write contract, which will forward it -to the read contract. This is so that every instruction sent to omniledger has +to the read contract. This is so that every instruction sent to ByzCoin has as a target an existing instance. ## Read Contract diff --git a/calypso/contracts.go b/calypso/contracts.go index 87f8b351dc..534c2c2f43 100644 --- a/calypso/contracts.go +++ b/calypso/contracts.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet/log" "github.com/dedis/onet/network" "github.com/dedis/protobuf" @@ -14,13 +14,13 @@ import ( // ContractWriteID references a write contract system-wide. var ContractWriteID = "calypsoWrite" -// ContractWrite is used to store a secret in OmniLedger, so that an +// ContractWrite is used to store a secret in the ledger, so that an // authorized reader can retrieve it by creating a Read-instance. // // Accepted Instructions: // - spawn:calypsoWrite creates a new write-request. TODO: verify the LTS exists // - spawn:calypsoRead creates a new read-request for this write-request. -func (s *Service) ContractWrite(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) ([]ol.StateChange, []ol.Coin, error) { +func (s *Service) ContractWrite(cdb byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) ([]byzcoin.StateChange, []byzcoin.Coin, error) { err := inst.VerifyDarcSignature(cdb) if err != nil { return nil, nil, err @@ -33,8 +33,8 @@ func (s *Service) ContractWrite(cdb ol.CollectionView, inst ol.Instruction, c [] } switch inst.GetType() { - case ol.SpawnType: - var sc ol.StateChanges + case byzcoin.SpawnType: + var sc byzcoin.StateChanges nc := c switch inst.Spawn.ContractID { case ContractWriteID: @@ -52,9 +52,9 @@ func (s *Service) ContractWrite(cdb ol.CollectionView, inst ol.Instruction, c [] } instID := inst.DeriveID("") log.Lvlf3("Successfully verified write request and will store in %x", instID) - sc = append(sc, ol.NewStateChange(ol.Create, instID, ContractWriteID, w, darcID)) + sc = append(sc, byzcoin.NewStateChange(byzcoin.Create, instID, ContractWriteID, w, darcID)) case ContractReadID: - var scs ol.StateChanges + var scs byzcoin.StateChanges var err error scs, nc, err = s.ContractRead(cdb, inst, c) if err != nil { @@ -82,7 +82,7 @@ var ContractReadID = "calypsoRead" // TODO: correctly handle multi signatures for read requests: to whom should the // secret be re-encrypted to? Perhaps for multi signatures we only want to have // ephemeral keys. -func (s *Service) ContractRead(cdb ol.CollectionView, inst ol.Instruction, c []ol.Coin) ([]ol.StateChange, []ol.Coin, error) { +func (s *Service) ContractRead(cdb byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) ([]byzcoin.StateChange, []byzcoin.Coin, error) { err := inst.VerifyDarcSignature(cdb) if err != nil { return nil, nil, err @@ -95,7 +95,7 @@ func (s *Service) ContractRead(cdb ol.CollectionView, inst ol.Instruction, c []o } switch inst.GetType() { - case ol.SpawnType: + case byzcoin.SpawnType: if inst.Spawn.ContractID != ContractReadID { return nil, nil, errors.New("can only spawn read instances") } @@ -115,7 +115,7 @@ func (s *Service) ContractRead(cdb ol.CollectionView, inst ol.Instruction, c []o if cid != ContractWriteID { return nil, nil, errors.New("referenced write-id is not a write instance, got " + cid) } - return ol.StateChanges{ol.NewStateChange(ol.Create, inst.DeriveID(""), ContractReadID, r, darcID)}, c, nil + return byzcoin.StateChanges{byzcoin.NewStateChange(byzcoin.Create, inst.DeriveID(""), ContractReadID, r, darcID)}, c, nil default: return nil, nil, errors.New("not a spawn instruction") } diff --git a/calypso/proto.go b/calypso/proto.go index a4254a4160..5e84fa0376 100644 --- a/calypso/proto.go +++ b/calypso/proto.go @@ -1,9 +1,7 @@ package calypso import ( - // We need to use the omniledger import alias because it's the - // namespace used by protobuf is omniledger. - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber" "github.com/dedis/onet" @@ -12,7 +10,7 @@ import ( // PROTOSTART // type :skipchain.SkipBlockID:bytes // package calypso; -// import "omniledger.proto"; +// import "byzcoin.proto"; // import "onet.proto"; // // option java_package = "ch.epfl.dedis.proto"; @@ -51,7 +49,7 @@ type Write struct { // Read is the data stored in a read instance. It has a pointer to the write // instance and the public key used to create the read instance. type Read struct { - Write omniledger.InstanceID + Write byzcoin.InstanceID Xc kyber.Point } @@ -63,8 +61,8 @@ type Read struct { type CreateLTS struct { // Roster is the list of nodes that should participate in the DKG. Roster onet.Roster - // OLID is the ID of the OmniLedger that can use this LTS. - OLID skipchain.SkipBlockID + // BCID is the ID of the ByzCoin ledger that can use this LTS. + BCID skipchain.SkipBlockID } // CreateLTSReply is returned upon successfully setting up the distributed @@ -79,12 +77,12 @@ type CreateLTSReply struct { } // DecryptKey is sent by a reader after he successfully stored a 'Read' request -// in omniledger. +// in byzcoin. type DecryptKey struct { // Read is the proof that he has been accepted to read the secret. - Read omniledger.Proof + Read byzcoin.Proof // Write is the proof containing the write request. - Write omniledger.Proof + Write byzcoin.Proof } // DecryptKeyReply is returned if the service verified successfully that the diff --git a/calypso/service.go b/calypso/service.go index 27c2400ebf..d8bf6f772d 100644 --- a/calypso/service.go +++ b/calypso/service.go @@ -1,6 +1,6 @@ // Package calypso implements the LTS functionality of the Calypso paper. It // implements both the access-control cothority and the secret management -// cothority. (1) The access-control cothority is implemented using OmniLedger +// cothority. (1) The access-control cothority is implemented using ByzCoin // with two contracts, `Write` and `Read` (2) The secret-management cothority // uses an onet service with methods to set up a Long Term Secret (LTS) // distributed key and to request a re-encryption @@ -15,10 +15,10 @@ import ( "time" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" dkgprotocol "github.com/dedis/cothority/dkg" "github.com/dedis/cothority/ocs/protocol" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" "github.com/dedis/kyber" "github.com/dedis/kyber/share" "github.com/dedis/kyber/util/random" @@ -60,7 +60,7 @@ type pubPoly struct { // is non-nil, Signature needs to hold a valid signature from the reader // in the Proof. type vData struct { - Proof ol.Proof + Proof byzcoin.Proof Ephemeral kyber.Point Signature *darc.Signature } @@ -98,7 +98,7 @@ func (s *Service) CreateLTS(cl *CreateLTS) (reply *CreateLTSReply, err error) { } s.storage.Polys[string(reply.LTSID)] = &pubPoly{s.Suite().Point().Base(), dks.Commits} s.storage.Rosters[string(reply.LTSID)] = &cl.Roster - s.storage.OLIDs[string(reply.LTSID)] = cl.OLID + s.storage.OLIDs[string(reply.LTSID)] = cl.BCID s.storage.Unlock() reply.X = shared.X case <-time.After(propagationTimeout): @@ -109,7 +109,7 @@ func (s *Service) CreateLTS(cl *CreateLTS) (reply *CreateLTSReply, err error) { // DecryptKey takes as an input a Read- and a Write-proof. Proofs contain // everything necessary to verify that a given instance is correct and -// stored in omniledger. +// stored in ByzCoin. // Using the Read and the Write-instance, this method verifies that the // requests match and then re-encrypts the secret to the public key given // in the Read-instance. @@ -126,7 +126,7 @@ func (s *Service) DecryptKey(dkr *DecryptKey) (reply *DecryptKeyReply, err error if err := dkr.Write.ContractValue(cothority.Suite, ContractWriteID, &write); err != nil { return nil, errors.New("didn't get a write instance: " + err.Error()) } - if !read.Write.Equal(ol.NewInstanceID(dkr.Write.InclusionProof.Key)) { + if !read.Write.Equal(byzcoin.NewInstanceID(dkr.Write.InclusionProof.Key)) { return nil, errors.New("read doesn't point to passed write") } s.storage.Lock() @@ -299,8 +299,8 @@ func newService(c *onet.Context) (onet.Service, error) { if err := s.RegisterHandlers(s.CreateLTS, s.DecryptKey); err != nil { return nil, errors.New("couldn't register messages") } - ol.RegisterContract(c, ContractWriteID, s.ContractWrite) - ol.RegisterContract(c, ContractReadID, s.ContractRead) + byzcoin.RegisterContract(c, ContractWriteID, s.ContractWrite) + byzcoin.RegisterContract(c, ContractReadID, s.ContractRead) if err := s.tryLoad(); err != nil { log.Error(err) return nil, err diff --git a/calypso/service_test.go b/calypso/service_test.go index 25a4e9facb..f15f075977 100644 --- a/calypso/service_test.go +++ b/calypso/service_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/onet" "github.com/dedis/onet/log" "github.com/dedis/protobuf" @@ -57,19 +57,19 @@ func TestContract_Write_Benchmark(t *testing.T) { var times []time.Duration for i := 0; i < 50; i++ { - iids := make([]ol.InstanceID, totalTrans) + iids := make([]byzcoin.InstanceID, totalTrans) start := time.Now() for i := 0; i < totalTrans; i++ { iids[i] = s.addWrite(t, []byte("secret key")) } timeSend := time.Now().Sub(start) - log.Lvlf1("Time to send %d writes to OmniLedger: %s", totalTrans, timeSend) + log.Lvlf1("Time to send %d writes to the ledger: %s", totalTrans, timeSend) start = time.Now() for i := 0; i < totalTrans; i++ { s.waitInstID(t, iids[i]) } timeWait := time.Now().Sub(start) - log.Lvlf1("Time to wait for %d writes in OmniLedger: %s", totalTrans, timeWait) + log.Lvlf1("Time to wait for %d writes in the ledger: %s", totalTrans, timeWait) times = append(times, timeSend+timeWait) for _, ti := range times { log.Lvlf1("Total time: %s - tps: %f", ti, @@ -129,30 +129,30 @@ type ts struct { roster *onet.Roster ltsReply *CreateLTSReply signer darc.Signer - cl *ol.Client - gbReply *ol.CreateGenesisBlockResponse - genesisMsg *ol.CreateGenesisBlock + cl *byzcoin.Client + gbReply *byzcoin.CreateGenesisBlockResponse + genesisMsg *byzcoin.CreateGenesisBlock gDarc *darc.Darc } -func (s *ts) addRead(t *testing.T, write *ol.Proof) ol.InstanceID { +func (s *ts) addRead(t *testing.T, write *byzcoin.Proof) byzcoin.InstanceID { var readBuf []byte read := &Read{ - Write: ol.NewInstanceID(write.InclusionProof.Key), + Write: byzcoin.NewInstanceID(write.InclusionProof.Key), Xc: s.signer.Ed25519.Point, } var err error readBuf, err = protobuf.Encode(read) require.Nil(t, err) - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{{ - InstanceID: ol.NewInstanceID(write.InclusionProof.Key), - Nonce: ol.Nonce{}, + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{{ + InstanceID: byzcoin.NewInstanceID(write.InclusionProof.Key), + Nonce: byzcoin.Nonce{}, Index: 0, Length: 1, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: ContractReadID, - Args: ol.Arguments{{Name: "read", Value: readBuf}}, + Args: byzcoin.Arguments{{Name: "read", Value: readBuf}}, }, }}, } @@ -162,7 +162,7 @@ func (s *ts) addRead(t *testing.T, write *ol.Proof) ol.InstanceID { return ctx.Instructions[0].DeriveID("") } -func (s *ts) addReadAndWait(t *testing.T, write *ol.Proof) *ol.Proof { +func (s *ts) addReadAndWait(t *testing.T, write *byzcoin.Proof) *byzcoin.Proof { instID := s.addRead(t, write) return s.waitInstID(t, instID) } @@ -184,7 +184,7 @@ func newTS(t *testing.T, nodes int) ts { // Start DKG var err error - s.ltsReply, err = s.services[0].CreateLTS(&CreateLTS{Roster: *s.roster, OLID: s.gbReply.Skipblock.Hash}) + s.ltsReply, err = s.services[0].CreateLTS(&CreateLTS{Roster: *s.roster, BCID: s.gbReply.Skipblock.Hash}) require.Nil(t, err) return s @@ -192,19 +192,19 @@ func newTS(t *testing.T, nodes int) ts { func (s *ts) createGenesis(t *testing.T) { var err error - s.genesisMsg, err = ol.DefaultGenesisMsg(ol.CurrentVersion, s.roster, + s.genesisMsg, err = byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, s.roster, []string{"spawn:" + ContractWriteID, "spawn:" + ContractReadID}, s.signer.Identity()) require.Nil(t, err) s.gDarc = &s.genesisMsg.GenesisDarc s.genesisMsg.BlockInterval = time.Second - s.cl, s.gbReply, err = ol.NewOmniledger(s.genesisMsg, false) + s.cl, s.gbReply, err = byzcoin.NewLedger(s.genesisMsg, false) require.Nil(t, err) } -func (s *ts) waitInstID(t *testing.T, instID ol.InstanceID) *ol.Proof { +func (s *ts) waitInstID(t *testing.T, instID byzcoin.InstanceID) *byzcoin.Proof { var err error - var pr *ol.Proof + var pr *byzcoin.Proof for i := 0; i < 10; i++ { pr, err = s.cl.WaitProof(instID, s.genesisMsg.BlockInterval, nil) if err == nil { @@ -218,25 +218,25 @@ func (s *ts) waitInstID(t *testing.T, instID ol.InstanceID) *ol.Proof { return pr } -func (s *ts) addWriteAndWait(t *testing.T, key []byte) *ol.Proof { +func (s *ts) addWriteAndWait(t *testing.T, key []byte) *byzcoin.Proof { instID := s.addWrite(t, key) return s.waitInstID(t, instID) } -func (s *ts) addWrite(t *testing.T, key []byte) ol.InstanceID { +func (s *ts) addWrite(t *testing.T, key []byte) byzcoin.InstanceID { write := NewWrite(cothority.Suite, s.ltsReply.LTSID, s.gDarc.GetBaseID(), s.ltsReply.X, key) writeBuf, err := protobuf.Encode(write) require.Nil(t, err) - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{{ - InstanceID: ol.NewInstanceID(s.gDarc.GetBaseID()), - Nonce: ol.Nonce{}, + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{{ + InstanceID: byzcoin.NewInstanceID(s.gDarc.GetBaseID()), + Nonce: byzcoin.Nonce{}, Index: 0, Length: 1, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: ContractWriteID, - Args: ol.Arguments{{Name: "write", Value: writeBuf}}, + Args: byzcoin.Arguments{{Name: "write", Value: writeBuf}}, }, }}, } diff --git a/calypso/struct.go b/calypso/struct.go index f019c4e825..031a228afc 100644 --- a/calypso/struct.go +++ b/calypso/struct.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "errors" - "github.com/dedis/cothority/omniledger/darc" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/kyber" "github.com/dedis/kyber/suites" "github.com/dedis/onet/log" @@ -21,7 +21,7 @@ type suite interface { kyber.XOFFactory } -// NewWrite is used by the writer to OmniLedger to encode his symmetric key +// NewWrite is used by the writer to ByzCoin to encode his symmetric key // under the collective public key created by the DKG. As this method uses // `Embed` to encode the key, depending on the key-length more than one point // is needed to encode the data. @@ -105,7 +105,7 @@ func (wr *Write) CheckProof(suite suite, writeID darc.ID) error { return errors.New("recreated proof is not equal to stored proof") } -// EncodeKey can be used by the writer to OmniLedger to encode his symmetric +// EncodeKey can be used by the writer to ByzCoin to encode his symmetric // key under the collective public key created by the DKG. // As this method uses `Pick` to encode the key, depending on the key-length // more than one point is needed to encode the data. @@ -137,7 +137,7 @@ func EncodeKey(suite suites.Suite, X kyber.Point, key []byte) (U kyber.Point, Cs return } -// DecodeKey can be used by the reader of OmniLedger to convert the +// DecodeKey can be used by the reader of ByzCoin to convert the // re-encrypted secret back to a symmetric key that can be used later to decode // the document. // diff --git a/conode/experimental.go b/conode/experimental.go index 46b05e6f75..ab0a8644ec 100644 --- a/conode/experimental.go +++ b/conode/experimental.go @@ -6,12 +6,12 @@ stable branch. */ import ( + _ "github.com/dedis/cothority/byzcoin" + _ "github.com/dedis/cothority/byzcoin/contracts" _ "github.com/dedis/cothority/calypso" _ "github.com/dedis/cothority/eventlog" _ "github.com/dedis/cothority/evoting/service" _ "github.com/dedis/cothority/identity" _ "github.com/dedis/cothority/ocs/service" - _ "github.com/dedis/cothority/omniledger/contracts" - _ "github.com/dedis/cothority/omniledger/service" _ "github.com/dedis/cothority/personhood" ) diff --git a/doc/Applications.md b/doc/Applications.md index 3caddaa5cd..f8507557a3 100644 --- a/doc/Applications.md +++ b/doc/Applications.md @@ -24,11 +24,14 @@ an access control to it cryptographic tokens to physical people - [E-voting](../evoting/README.md) following Helios to store votes on a blockchain, shuffle them and decrypt all votes -- [Omniledger](../omniledger/README.md) has the first steps of implementing -an omniledger service, starting with batching transactions in a block and -precompiled smart contracts +- [Eventlog](../eventlog) is an event logging system built on top of ByzCoin. -Another block that is on the very edge of application and building block is the -[skipchain](../skipchain/README.md). It's more than a building block, because it +# Building Blocks + +These two pieces of technology support those above: + +- [ByzCoin](../byzcoin/README.md) has a distributed ledger holding keys and +values. It implements pre-compiled smart contracts. +- [skipchain](../skipchain/README.md). It's more than a building block, because it already has some functionality. But it's not an application, because you cannot do anything useful with it as-is. diff --git a/doc/BuildingBlocks.md b/doc/BuildingBlocks.md index 2ae033df44..f0aaea679c 100644 --- a/doc/BuildingBlocks.md +++ b/doc/BuildingBlocks.md @@ -23,7 +23,7 @@ a more fault tolerant version of the CoSi protocol with only a 3-level tree - [Byzantine Fault Tolerant CoSi](../bftcosi/README.md) is an implementation inspired by PBFT using two rounds of CoSi - [ByzCoinX](../byzcoinx/README.md) -the implementation of the basic consensus protocol in the Omniledger paper +the implementation of the basic consensus protocol in the OmniLedger paper ## Key Sharding diff --git a/doc/Protocols.md b/doc/Protocols.md index 448abdf8f0..b84ed1d32b 100644 --- a/doc/Protocols.md +++ b/doc/Protocols.md @@ -16,7 +16,7 @@ Describe more: implementation of a Byzantine Fault Tolerant protocol based on PBFT, but using two rounds of collective signing (cosi) to generate the consensus. - [byzcoinx](../byzcoinx/README.md) implements -the consensus protocol described in the [Omniledger paper](https://eprint.iacr.org/2017/406.pdf). +the consensus protocol described in the [OmniLedger paper](https://eprint.iacr.org/2017/406.pdf). - [cosi](../cosi/protocol/README.md) collective signing, where you can submit a hash of a document and get a collective signature on it diff --git a/eventlog/README.md b/eventlog/README.md index 7d18de736b..a14b50993c 100644 --- a/eventlog/README.md +++ b/eventlog/README.md @@ -1,20 +1,20 @@ # EventLog The EventLog (EL) service is for logging events into -[OmniLedger](../omniledger/README.md). +[ByzCoin](../byzcoin/README.md). Contrary to ordinary event logging services, we offer better security and auditability. Below are some of the main features that sets us apart. -- Collective witness - a collection of nodes, or conodes, indepdently observe +- Collective witness - a collection of nodes, or conodes, independently observe the logging of an event. The event will only be accepted if a 2/3-majority think it is valid, e.g., the timestamp is reasonable, the client is authorised and so on. - Distributed access control - fine-grained client access control with - delegation support is configured using [DARC](../omniledger/README.md#darc). + delegation support is configured using [DARC](../byzcoin/README.md#darc). - Configurable acceptance criteria - we execute a smart-contract on all nodes, nodes only accept the event if the smart-contract returns a positive result. - Existance proof - once an event is logged, an authorised client can request - a cryptographic proof (powered by [collection](../omniledger/collection/README.md)) + a cryptographic proof (powered by [collection](../byzcoin/collection/README.md)) that the event is indeed stored in the blockchain and has not been tampered. ## Running the service @@ -24,7 +24,7 @@ not a part of the `cothority.v2` release, please use the `master` branch. ## Client API We offer three ways for clients to connect to the event log service. All the -APIs expect an existing OmniLedger object that has a darc with "spawn:eventlog" +APIs expect an existing ByzCoin object that has a Darc with "spawn:eventlog" and "invoke:eventlog" in its rules. The eventlog signer (which we will create below) *must* be authorised to use these rules. @@ -50,18 +50,18 @@ The detailed API can be found on ### Java API In java, you need to construct a `EventLogInstance` class. There are two ways to initialise it, the first for when you do not have an existing eventlog -instance on omniledger to connect to, the other when you do. +instance on ByzCoin to connect to, the other when you do. ```java -// Create the eventlog instance. It expects an omniledger RPC, a list of +// Create the eventlog instance. It expects an ByzCoin RPC, a list of // signers that have the "spawn:eventlog" permission and the darcID for where // the permission is stored. -EventLogInstance el = new EventLogInstance(olRPC, admins, darcID); +EventLogInstance el = new EventLogInstance(bcRPC, admins, darcID); ``` If you would like to connect to the same instance, you need to save the result -of `el.getInstanceId()` and of course the omniledger RPC. The constructor -`EventLogInstance(OmniledgerRPC ol, InstanceId id)` connects to an existing +of `el.getInstanceId()` and of course the ByzCoin RPC. The constructor +`EventLogInstance(ByzCoinRPC bc, InstanceId id)` connects to an existing instance. It's straightforward to log events, as long as the event is correctly signed. @@ -83,7 +83,7 @@ SearchResponse resp = el.search("", now - 1000, now + 1000); Please refer to the javadocs for more information. The javadocs are not hosted anywhere unfortunately, but it is possible to generate them from the -[source](https://github.com/dedis/cothority/blob/master/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstance.java). +[source](https://github.com/dedis/cothority/blob/master/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/EventLogInstance.java). ### CLI Please see the `el` documentation [here](el/README.md). diff --git a/eventlog/api.go b/eventlog/api.go index 7ef819b9d3..8048592c23 100644 --- a/eventlog/api.go +++ b/eventlog/api.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" - "github.com/dedis/cothority/omniledger/darc" - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/protobuf" "github.com/dedis/cothority" @@ -14,41 +14,41 @@ import ( // Client is a structure to communicate with the eventlog service type Client struct { - OmniLedger *omniledger.Client + ByzCoin *byzcoin.Client // The DarcID with "invoke:eventlog" permission on it. DarcID darc.ID // Signers are the Darc signers that will sign transactions sent with this client. Signers []darc.Signer - Instance omniledger.InstanceID + Instance byzcoin.InstanceID c *onet.Client } // NewClient creates a new client to talk to the eventlog service. // Fields DarcID, Instance, and Signers must be filled in before use. -func NewClient(ol *omniledger.Client) *Client { +func NewClient(ol *byzcoin.Client) *Client { return &Client{ - OmniLedger: ol, - c: onet.NewClient(cothority.Suite, ServiceName), + ByzCoin: ol, + c: onet.NewClient(cothority.Suite, ServiceName), } } // Create creates a new event log. This method is synchronous: it will only -// return once the new eventlog has been committed into the OmniLedger (or after +// return once the new eventlog has been committed into the ledger (or after // a timeout). Upon non-error return, c.Instance will be correctly set. func (c *Client) Create() error { - instr := omniledger.Instruction{ - InstanceID: omniledger.NewInstanceID(c.DarcID), + instr := byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(c.DarcID), Index: 0, Length: 1, - Spawn: &omniledger.Spawn{ContractID: contractName}, + Spawn: &byzcoin.Spawn{ContractID: contractName}, } if err := instr.SignBy(c.DarcID, c.Signers...); err != nil { return err } - tx := omniledger.ClientTransaction{ - Instructions: []omniledger.Instruction{instr}, + tx := byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{instr}, } - if _, err := c.OmniLedger.AddTransactionAndWait(tx, 2); err != nil { + if _, err := c.ByzCoin.AddTransactionAndWait(tx, 2); err != nil { return err } @@ -66,7 +66,7 @@ func (c *Client) Log(ev ...Event) ([]LogID, error) { if err != nil { return nil, err } - if _, err := c.OmniLedger.AddTransaction(*tx); err != nil { + if _, err := c.ByzCoin.AddTransaction(*tx); err != nil { return nil, err } return keys, nil @@ -74,7 +74,7 @@ func (c *Client) Log(ev ...Event) ([]LogID, error) { // GetEvent asks the service to retrieve an event. func (c *Client) GetEvent(key []byte) (*Event, error) { - reply, err := c.OmniLedger.GetProof(key) + reply, err := c.ByzCoin.GetProof(key) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func (c *Client) GetEvent(key []byte) (*Event, error) { return &e, nil } -func makeTx(darcID darc.ID, id omniledger.InstanceID, msgs []Event, signers []darc.Signer) (*omniledger.ClientTransaction, []LogID, error) { +func makeTx(darcID darc.ID, id byzcoin.InstanceID, msgs []Event, signers []darc.Signer) (*byzcoin.ClientTransaction, []LogID, error) { // We need the identity part of the signatures before // calling ToDarcRequest() below, because the identities // go into the message digest. @@ -110,27 +110,27 @@ func makeTx(darcID darc.ID, id omniledger.InstanceID, msgs []Event, signers []da keys := make([]LogID, len(msgs)) - instrNonce := omniledger.GenNonce() - tx := omniledger.ClientTransaction{ - Instructions: make([]omniledger.Instruction, len(msgs)), + instrNonce := byzcoin.GenNonce() + tx := byzcoin.ClientTransaction{ + Instructions: make([]byzcoin.Instruction, len(msgs)), } for i, msg := range msgs { eventBuf, err := protobuf.Encode(&msg) if err != nil { return nil, nil, err } - argEvent := omniledger.Argument{ + argEvent := byzcoin.Argument{ Name: "event", Value: eventBuf, } - tx.Instructions[i] = omniledger.Instruction{ + tx.Instructions[i] = byzcoin.Instruction{ InstanceID: id, Nonce: instrNonce, Index: i, Length: len(msgs), - Invoke: &omniledger.Invoke{ + Invoke: &byzcoin.Invoke{ Command: contractName, - Args: []omniledger.Argument{argEvent}, + Args: []byzcoin.Argument{argEvent}, }, Signatures: append([]darc.Signature{}, sigs...), } @@ -162,11 +162,11 @@ func makeTx(darcID darc.ID, id omniledger.InstanceID, msgs []Event, signers []da // type SearchRequest for additional details about how the filter is interpreted. // The ID and Instance fields of the SearchRequest will be filled in from c. func (c *Client) Search(req *SearchRequest) (*SearchResponse, error) { - req.ID = c.OmniLedger.ID + req.ID = c.ByzCoin.ID req.Instance = c.Instance reply := &SearchResponse{} - if err := c.c.SendProtobuf(c.OmniLedger.Roster.List[0], req, reply); err != nil { + if err := c.c.SendProtobuf(c.ByzCoin.Roster.List[0], req, reply); err != nil { return nil, err } return reply, nil diff --git a/eventlog/api_test.go b/eventlog/api_test.go index d8129197f5..b77fe2e8ce 100644 --- a/eventlog/api_test.go +++ b/eventlog/api_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber/suites" "github.com/dedis/onet" @@ -36,7 +36,7 @@ func TestClient_Log(t *testing.T) { require.Nil(t, err) require.NotNil(t, c.Instance) - waitForKey(t, leader.omni, c.OmniLedger.ID, c.Instance.Slice(), testBlockInterval) + waitForKey(t, leader.omni, c.ByzCoin.ID, c.Instance.Slice(), testBlockInterval) ids, err := c.Log(NewEvent("auth", "user alice logged out"), NewEvent("auth", "user bob logged out"), @@ -46,30 +46,30 @@ func TestClient_Log(t *testing.T) { require.Equal(t, 32, len(ids[2])) // Loop while we wait for the next block to be created. - waitForKey(t, leader.omni, c.OmniLedger.ID, ids[2], testBlockInterval) + waitForKey(t, leader.omni, c.ByzCoin.ID, ids[2], testBlockInterval) // Check consistency and # of events. for i := 0; i < 10; i++ { - leader.waitForBlock(c.OmniLedger.ID) - if err = leader.checkBuckets(c.Instance, c.OmniLedger.ID, 3); err == nil { + leader.waitForBlock(c.ByzCoin.ID) + if err = leader.checkBuckets(c.Instance, c.ByzCoin.ID, 3); err == nil { break } } // Fetch index, and check its length. - idx := checkProof(t, leader.omni, c.Instance.Slice(), c.OmniLedger.ID) + idx := checkProof(t, leader.omni, c.Instance.Slice(), c.ByzCoin.ID) expected := len(c.Instance) require.Equal(t, len(idx), expected, fmt.Sprintf("index key content is %v, expected %v", len(idx), expected)) // Fetch the bucket and check its length. - bucketBuf := checkProof(t, leader.omni, idx, c.OmniLedger.ID) + bucketBuf := checkProof(t, leader.omni, idx, c.ByzCoin.ID) var b bucket require.Nil(t, protobuf.Decode(bucketBuf, &b)) // The lead bucket's prev should point to the catch-all bucket. require.Equal(t, len(c.Instance), len(b.Prev)) // Check the catch-all bucket. - bucketBuf = checkProof(t, leader.omni, b.Prev, c.OmniLedger.ID) + bucketBuf = checkProof(t, leader.omni, b.Prev, c.ByzCoin.ID) var b2 bucket require.Nil(t, protobuf.Decode(bucketBuf, &b2)) require.Equal(t, int64(0), b2.Start) @@ -93,7 +93,7 @@ func TestClient_Log200(t *testing.T) { err := c.Create() require.Nil(t, err) - waitForKey(t, leader.omni, c.OmniLedger.ID, c.Instance.Slice(), time.Second) + waitForKey(t, leader.omni, c.ByzCoin.ID, c.Instance.Slice(), time.Second) logCount := 100 // Write the logs in chunks to make sure that the verification @@ -128,15 +128,15 @@ func TestClient_Log200(t *testing.T) { // Apparently leader.waitForBlock isn't enough for jenkins, so // wait a bit longer. time.Sleep(s.req.BlockInterval) - leader.waitForBlock(c.OmniLedger.ID) - if err = leader.checkBuckets(c.Instance, c.OmniLedger.ID, 2*logCount); err == nil { + leader.waitForBlock(c.ByzCoin.ID) + if err = leader.checkBuckets(c.Instance, c.ByzCoin.ID, 2*logCount); err == nil { break } } require.Nil(t, err) // Fetch index, and check its length. - idx := checkProof(t, leader.omni, c.Instance.Slice(), c.OmniLedger.ID) + idx := checkProof(t, leader.omni, c.Instance.Slice(), c.ByzCoin.ID) expected := len(c.Instance) require.Equal(t, len(idx), expected, fmt.Sprintf("index key content is %v, expected %v", len(idx), expected)) @@ -149,7 +149,7 @@ func TestClient_Log200(t *testing.T) { err = nil break } - bucketBuf := checkProof(t, leader.omni, bucketID, c.OmniLedger.ID) + bucketBuf := checkProof(t, leader.omni, bucketID, c.ByzCoin.ID) var b bucket require.Nil(t, protobuf.Decode(bucketBuf, &b)) require.NotEqual(t, bucketID, b.Prev) @@ -161,16 +161,16 @@ func TestClient_Log200(t *testing.T) { require.Nil(t, err) for _, eventID := range eventIDs { - eventBuf := checkProof(t, leader.omni, eventID, c.OmniLedger.ID) + eventBuf := checkProof(t, leader.omni, eventID, c.ByzCoin.ID) var e Event require.Nil(t, protobuf.Decode(eventBuf, &e)) } require.Nil(t, s.local.WaitDone(10*time.Second)) } -func checkProof(t *testing.T, omni *omniledger.Service, key []byte, scID skipchain.SkipBlockID) []byte { - req := &omniledger.GetProof{ - Version: omniledger.CurrentVersion, +func checkProof(t *testing.T, omni *byzcoin.Service, key []byte, scID skipchain.SkipBlockID) []byte { + req := &byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: key, ID: scID, } @@ -193,7 +193,7 @@ func TestClient_Search(t *testing.T) { err := c.Create() require.Nil(t, err) - waitForKey(t, leader.omni, c.OmniLedger.ID, c.Instance.Slice(), testBlockInterval) + waitForKey(t, leader.omni, c.ByzCoin.ID, c.Instance.Slice(), testBlockInterval) // Search before any events are logged. req := &SearchRequest{} @@ -221,8 +221,8 @@ func TestClient_Search(t *testing.T) { require.Nil(t, err) } for i := 0; i < 10; i++ { - leader.waitForBlock(c.OmniLedger.ID) - if err = leader.checkBuckets(c.Instance, c.OmniLedger.ID, logCount); err == nil { + leader.waitForBlock(c.ByzCoin.ID) + if err = leader.checkBuckets(c.Instance, c.ByzCoin.ID, logCount); err == nil { break } } @@ -235,7 +235,7 @@ func TestClient_Search(t *testing.T) { require.Equal(t, 20, len(resp.Events)) // Search by time range. - req = &SearchRequest{Instance: c.Instance, ID: c.OmniLedger.ID, From: tm0 + 3, To: tm0 + 8} + req = &SearchRequest{Instance: c.Instance, ID: c.ByzCoin.ID, From: tm0 + 3, To: tm0 + 8} resp, err = c.Search(req) require.Nil(t, err) require.NotNil(t, resp) @@ -243,7 +243,7 @@ func TestClient_Search(t *testing.T) { require.Equal(t, 5, len(resp.Events)) // Search by topic, should find half of them. - req = &SearchRequest{Instance: c.Instance, ID: c.OmniLedger.ID, Topic: "a"} + req = &SearchRequest{Instance: c.Instance, ID: c.ByzCoin.ID, Topic: "a"} resp, err = c.Search(req) require.Nil(t, err) require.NotNil(t, resp) @@ -251,7 +251,7 @@ func TestClient_Search(t *testing.T) { require.Equal(t, 10, len(resp.Events)) // Search by time range and topic. - req = &SearchRequest{Instance: c.Instance, ID: c.OmniLedger.ID, Topic: "a", From: tm0 + 3, To: tm0 + 8} + req = &SearchRequest{Instance: c.Instance, ID: c.ByzCoin.ID, Topic: "a", From: tm0 + 3, To: tm0 + 8} resp, err = c.Search(req) require.Nil(t, err) require.NotNil(t, resp) @@ -261,7 +261,7 @@ func TestClient_Search(t *testing.T) { // Cause truncation. sm := searchMax searchMax = 5 - req = &SearchRequest{Instance: c.Instance, ID: c.OmniLedger.ID} + req = &SearchRequest{Instance: c.Instance, ID: c.ByzCoin.ID} resp, err = c.Search(req) require.Nil(t, err) require.NotNil(t, resp) @@ -273,11 +273,11 @@ func TestClient_Search(t *testing.T) { tm := time.Now().UnixNano() _, err = c.Log(Event{Topic: "none", Content: "one more", When: tm}) require.Nil(t, err) - leader.waitForBlock(c.OmniLedger.ID) - leader.waitForBlock(c.OmniLedger.ID) + leader.waitForBlock(c.ByzCoin.ID) + leader.waitForBlock(c.ByzCoin.ID) // Search from the last event, expect only it, not previous ones. - req = &SearchRequest{Instance: c.Instance, ID: c.OmniLedger.ID, From: tm} + req = &SearchRequest{Instance: c.Instance, ID: c.ByzCoin.ID, From: tm} resp, err = c.Search(req) require.Nil(t, err) require.NotNil(t, resp) @@ -285,15 +285,15 @@ func TestClient_Search(t *testing.T) { require.False(t, resp.Truncated) } -func waitForKey(t *testing.T, s *omniledger.Service, scID skipchain.SkipBlockID, key []byte, interval time.Duration) [][]byte { +func waitForKey(t *testing.T, s *byzcoin.Service, scID skipchain.SkipBlockID, key []byte, interval time.Duration) [][]byte { if len(key) == 0 { t.Fatal("key len", len(key)) } var found bool - var resp *omniledger.GetProofResponse + var resp *byzcoin.GetProofResponse for ct := 0; ct < 10; ct++ { - req := &omniledger.GetProof{ - Version: omniledger.CurrentVersion, + req := &byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: key, ID: scID, } @@ -325,7 +325,7 @@ type ser struct { services []*Service id skipchain.SkipBlockID owner darc.Signer - req *omniledger.CreateGenesisBlock + req *byzcoin.CreateGenesisBlock gen darc.Darc // the genesis darc } @@ -345,25 +345,24 @@ func newSer(t *testing.T) (*ser, *Client) { s.services = append(s.services, service) } - // And create an Omniledger to write to. var err error - s.req, err = omniledger.DefaultGenesisMsg(omniledger.CurrentVersion, s.roster, + s.req, err = byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, s.roster, []string{"spawn:darc", "spawn:eventlog", "invoke:eventlog"}, s.owner.Identity()) if err != nil { t.Fatal(err) } s.gen = s.req.GenesisDarc s.req.BlockInterval = testBlockInterval - cl := onet.NewClient(cothority.Suite, omniledger.ServiceName) + cl := onet.NewClient(cothority.Suite, byzcoin.ServiceName) - var resp omniledger.CreateGenesisBlockResponse + var resp byzcoin.CreateGenesisBlockResponse err = cl.SendProtobuf(s.roster.List[0], s.req, &resp) if err != nil { t.Fatal(err) } s.id = resp.Skipblock.Hash - ol := omniledger.NewClient(s.id, *s.roster) + ol := byzcoin.NewClient(s.id, *s.roster) c := NewClient(ol) c.DarcID = s.gen.GetBaseID() @@ -393,7 +392,7 @@ func (s *ser) waitNextBlock(t *testing.T, current skipchain.SkipBlockID) { // checkBuckets walks all the buckets for a given eventlog and returns an error // if an event is in the wrong bucket. This function is useful to check the // correctness of buckets. -func (s *Service) checkBuckets(inst omniledger.InstanceID, id skipchain.SkipBlockID, ct0 int) error { +func (s *Service) checkBuckets(inst byzcoin.InstanceID, id skipchain.SkipBlockID, ct0 int) error { v := s.omni.GetCollectionView(id) el := eventLog{Instance: inst, v: v} diff --git a/eventlog/buckets.go b/eventlog/buckets.go index 102966844d..903fd5455a 100644 --- a/eventlog/buckets.go +++ b/eventlog/buckets.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/protobuf" ) @@ -21,8 +21,8 @@ func (b bucket) isFirst() bool { } type eventLog struct { - Instance omniledger.InstanceID - v omniledger.CollectionView + Instance byzcoin.InstanceID + v byzcoin.CollectionView } func (e eventLog) getLatestBucket() ([]byte, *bucket, error) { diff --git a/eventlog/el/README.md b/eventlog/el/README.md index 6602b27e17..fc711b044f 100644 --- a/eventlog/el/README.md +++ b/eventlog/el/README.md @@ -9,17 +9,17 @@ $ el create -keys ``` The keys are printed on the stdout. You will give the public key to the -OmniLedger administrator to use with the "ol add" command to give your +ByzCoin administrator to use with the "ol add" command to give your private key the right to make new event logs. ``` $ PRIVATE_KEY=$priv el create -ol $file ``` -The OmniLedger admin will give you an OmniLedger config file, which you will -use with the -ol argument, or you can set the OL environment -variable to the name of the OmniLedger config file. A new event log will be spawned, -and the evnet log ID will be printed. Set the EL environment variable to +The ByzCoin admin will give you an ByzCoin config file, which you will +use with the -bc argument, or you can set the BC environment +variable to the name of the ByzCoin config file. A new event log will be spawned, +and the event log ID will be printed. Set the EL environment variable to communicate it to future calls to the `el` program. You need to give the private key from above, using the PRIVATE_KEY environment diff --git a/eventlog/el/main.go b/eventlog/el/main.go index 7e4d400b02..9c49bb2886 100644 --- a/eventlog/el/main.go +++ b/eventlog/el/main.go @@ -11,9 +11,9 @@ import ( "time" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/eventlog" - "github.com/dedis/cothority/omniledger/darc" - omniledger "github.com/dedis/cothority/omniledger/service" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber/util/encoding" "github.com/dedis/onet" @@ -25,12 +25,12 @@ import ( type config struct { Name string - EventLogID omniledger.InstanceID + EventLogID byzcoin.InstanceID } -type olConfig struct { - Roster onet.Roster - OmniledgerID skipchain.SkipBlockID +type bcConfig struct { + Roster onet.Roster + ByzCoinID skipchain.SkipBlockID } var cmds = cli.Commands{ @@ -49,9 +49,9 @@ var cmds = cli.Commands{ Usage: "the ed25519 private key that will sign the create transaction", }, cli.StringFlag{ - Name: "ol", - EnvVar: "OL", - Usage: "the OmniLedger config", + Name: "bc", + EnvVar: "BC", + Usage: "the ByzCoin config", }, }, Action: create, @@ -67,9 +67,9 @@ var cmds = cli.Commands{ Usage: "the ed25519 private key that will sign transactions", }, cli.StringFlag{ - Name: "ol", - EnvVar: "OL", - Usage: "the OmniLedger config", + Name: "bc", + EnvVar: "BC", + Usage: "the ByzCoin config", }, cli.StringFlag{ Name: "el", @@ -93,9 +93,9 @@ var cmds = cli.Commands{ Aliases: []string{"s"}, Flags: []cli.Flag{ cli.StringFlag{ - Name: "ol", - EnvVar: "OL", - Usage: "the OmniLedger config", + Name: "bc", + EnvVar: "BC", + Usage: "the ByzCoin config", }, cli.StringFlag{ Name: "el", @@ -131,7 +131,7 @@ var cliApp = cli.NewApp() func init() { cliApp.Name = "el" - cliApp.Usage = "Create and work with OmniLedger event logs." + cliApp.Usage = "Create and work with event logs." cliApp.Version = "0.1" cliApp.Commands = cmds cliApp.Flags = []cli.Flag{ @@ -157,25 +157,25 @@ func main() { // searching, which does not require having a private key available // because it does not submit transactions.) func getClient(c *cli.Context, priv bool) (*eventlog.Client, error) { - fn := c.String("ol") + fn := c.String("bc") if fn == "" { - return nil, errors.New("--ol is required") + return nil, errors.New("--bc flag is required") } cfgBuf, err := ioutil.ReadFile(fn) if err != nil { return nil, err } - var cfg olConfig + var cfg bcConfig err = protobuf.DecodeWithConstructors(cfgBuf, &cfg, network.DefaultConstructors(cothority.Suite)) if err != nil { return nil, err } - cl := eventlog.NewClient(omniledger.NewClient(cfg.OmniledgerID, cfg.Roster)) + cl := eventlog.NewClient(byzcoin.NewClient(cfg.ByzCoinID, cfg.Roster)) - d, err := cl.OmniLedger.GetGenDarc() + d, err := cl.ByzCoin.GetGenDarc() if err != nil { return nil, err } @@ -210,7 +210,7 @@ func create(c *cli.Context) error { return err } - genDarc, err := cl.OmniLedger.GetGenDarc() + genDarc, err := cl.ByzCoin.GetGenDarc() if err != nil { return err } @@ -238,7 +238,7 @@ func doLog(c *cli.Context) error { if err != nil { return err } - cl.Instance = omniledger.NewInstanceID(eb) + cl.Instance = byzcoin.NewInstanceID(eb) t := c.String("topic") content := c.String("content") @@ -321,7 +321,7 @@ func search(c *cli.Context) error { if err != nil { return err } - cl.Instance = omniledger.NewInstanceID(eb) + cl.Instance = byzcoin.NewInstanceID(eb) resp, err := cl.Search(req) if err != nil { diff --git a/eventlog/el/test.sh b/eventlog/el/test.sh index 2f11597b91..58f1ce7d2f 100755 --- a/eventlog/el/test.sh +++ b/eventlog/el/test.sh @@ -6,7 +6,7 @@ DBG_SRV=0 . "$(go env GOPATH)/src/github.com/dedis/cothority/libtest.sh" main(){ - build $APPDIR/../../omniledger/ol + build $APPDIR/../../byzcoin/bcadmin startTest buildConode github.com/dedis/cothority/eventlog @@ -44,13 +44,13 @@ testCreate(){ [ -z "$ID" ] && exit 1 runCoBG 1 2 3 - runGrepSed "export OL=" "" ./ol create --roster public.toml --interval 0.5s + runGrepSed "export BC=" "" ./bcadmin create --roster public.toml --interval 0.5s eval $SED - [ -z "$OL" ] && exit 1 + [ -z "$BC" ] && exit 1 - testOK ./ol add spawn:eventlog -identity $ID - testOK ./ol add invoke:eventlog -identity $ID - testGrep $ID ./ol show + testOK ./bcadmin add spawn:eventlog -identity $ID + testOK ./bcadmin add invoke:eventlog -identity $ID + testGrep $ID ./bcadmin show runGrepSed "export EL=" "" ./el create eval $SED diff --git a/eventlog/proto.go b/eventlog/proto.go index 6824395ec2..8b038898ef 100644 --- a/eventlog/proto.go +++ b/eventlog/proto.go @@ -3,7 +3,7 @@ package eventlog import ( "time" - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/cothority/skipchain" "github.com/dedis/onet/network" ) @@ -27,7 +27,7 @@ func NewEvent(topic, content string) Event { // PROTOSTART // type :skipchain.SkipBlockID:bytes -// type :omniledger.InstanceID:bytes +// type :byzcoin.InstanceID:bytes // // package eventlog; // @@ -43,7 +43,7 @@ func NewEvent(topic, content string) Event { // event", and To == 0 means "until now". From and To should be set using the // UnixNano() method in package time. type SearchRequest struct { - Instance omniledger.InstanceID + Instance byzcoin.InstanceID ID skipchain.SkipBlockID // Return events where Event.Topic == Topic, if Topic != "". Topic string diff --git a/eventlog/service.go b/eventlog/service.go index 2fb3592f16..2f2d78a779 100644 --- a/eventlog/service.go +++ b/eventlog/service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/onet" "github.com/dedis/onet/log" "github.com/dedis/protobuf" @@ -27,7 +27,7 @@ func init() { // Service is the EventLog service. type Service struct { *onet.ServiceProcessor - omni *omniledger.Service + omni *byzcoin.Service bucketMaxAge time.Duration } @@ -128,7 +128,7 @@ filter: const contractName = "eventlog" -func (s *Service) decodeAndCheckEvent(coll omniledger.CollectionView, eventBuf []byte) (*Event, error) { +func (s *Service) decodeAndCheckEvent(coll byzcoin.CollectionView, eventBuf []byte) (*Event, error) { // Check the timestamp of the event: it should never be in the future, // and it should not be more than 30 seconds in the past. (Why 30 sec // and not something more auto-scaling like blockInterval * 30? @@ -154,7 +154,7 @@ func (s *Service) decodeAndCheckEvent(coll omniledger.CollectionView, eventBuf [ } // invoke will add an event and update the corresponding indices. -func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instruction, c []omniledger.Coin) (sc []omniledger.StateChange, cOut []omniledger.Coin, err error) { +func (s *Service) invoke(v byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) (sc []byzcoin.StateChange, cOut []byzcoin.Coin, err error) { cOut = c _, cid, darcID, err := v.GetValues(inst.InstanceID.Slice()) @@ -179,7 +179,7 @@ func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instructio // since the new event is essentially being spawned on this eventlog. eventID := inst.DeriveID("") - sc = append(sc, omniledger.NewStateChange(omniledger.Create, eventID, cid, eventBuf, darcID)) + sc = append(sc, byzcoin.NewStateChange(byzcoin.Create, eventID, cid, eventBuf, darcID)) // Walk from latest bucket back towards beginning looking for the right bucket. // @@ -234,7 +234,7 @@ func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instructio if err != nil { return nil, nil, err } - sc = append(sc, omniledger.NewStateChange(omniledger.Create, catchID, cid, buf, darcID)) + sc = append(sc, byzcoin.NewStateChange(byzcoin.Create, catchID, cid, buf, darcID)) bID = catchID.Slice() } @@ -250,10 +250,10 @@ func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instructio if err != nil { return nil, nil, err } - sc = append(sc, omniledger.NewStateChange(omniledger.Create, newBid, cid, buf, darcID)) + sc = append(sc, byzcoin.NewStateChange(byzcoin.Create, newBid, cid, buf, darcID)) // Update the pointer to the latest bucket. - sc = append(sc, omniledger.NewStateChange(omniledger.Update, inst.InstanceID, cid, newBid.Slice(), darcID)) + sc = append(sc, byzcoin.NewStateChange(byzcoin.Update, inst.InstanceID, cid, newBid.Slice(), darcID)) } else { // Otherwise just add into whatever bucket we found, no matter how // many are already there. (Splitting buckets is hard and not important to us.) @@ -263,8 +263,8 @@ func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instructio return nil, nil, err } sc = append(sc, - omniledger.StateChange{ - StateAction: omniledger.Update, + byzcoin.StateChange{ + StateAction: byzcoin.Update, InstanceID: bID, ContractID: []byte(contractName), Value: bucketBuf, @@ -273,7 +273,7 @@ func (s *Service) invoke(v omniledger.CollectionView, inst omniledger.Instructio return } -func (s *Service) spawn(v omniledger.CollectionView, inst omniledger.Instruction, c []omniledger.Coin) ([]omniledger.StateChange, []omniledger.Coin, error) { +func (s *Service) spawn(v byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) ([]byzcoin.StateChange, []byzcoin.Coin, error) { _, _, darcID, err := v.GetValues(inst.InstanceID.Slice()) if err != nil { return nil, nil, err @@ -286,14 +286,14 @@ func (s *Service) spawn(v omniledger.CollectionView, inst omniledger.Instruction // Store zeros as the pointer to the first bucket because there are not yet // any events in this event log. - return []omniledger.StateChange{ - omniledger.NewStateChange(omniledger.Create, inst.DeriveID(""), cid, make([]byte, 32), darcID), + return []byzcoin.StateChange{ + byzcoin.NewStateChange(byzcoin.Create, inst.DeriveID(""), cid, make([]byte, 32), darcID), }, nil, nil } // contractFunction is the function that runs to process a transaction of // type "eventlog" -func (s *Service) contractFunction(v omniledger.CollectionView, inst omniledger.Instruction, c []omniledger.Coin) ([]omniledger.StateChange, []omniledger.Coin, error) { +func (s *Service) contractFunction(v byzcoin.CollectionView, inst byzcoin.Instruction, c []byzcoin.Coin) ([]byzcoin.StateChange, []byzcoin.Coin, error) { err := inst.VerifyDarcSignature(v) if err != nil { @@ -301,9 +301,9 @@ func (s *Service) contractFunction(v omniledger.CollectionView, inst omniledger. } switch inst.GetType() { - case omniledger.InvokeType: + case byzcoin.InvokeType: return s.invoke(v, inst, c) - case omniledger.SpawnType: + case byzcoin.SpawnType: return s.spawn(v, inst, c) default: return nil, nil, errors.New("invalid type") @@ -317,7 +317,7 @@ func (s *Service) contractFunction(v omniledger.CollectionView, inst omniledger. func newService(c *onet.Context) (onet.Service, error) { s := &Service{ ServiceProcessor: onet.NewServiceProcessor(c), - omni: c.Service(omniledger.ServiceName).(*omniledger.Service), + omni: c.Service(byzcoin.ServiceName).(*byzcoin.Service), // Set a relatively low time for bucketMaxAge: during peak message arrival // this will pretect the buckets from getting too big. During low message // arrival (< 1 per 5 sec) it does not create extra buckets, because time @@ -328,11 +328,11 @@ func newService(c *onet.Context) (onet.Service, error) { log.ErrFatal(err, "Couldn't register messages") } - omniledger.RegisterContract(s, contractName, s.contractFunction) + byzcoin.RegisterContract(s, contractName, s.contractFunction) return s, nil } -func getEventByID(view omniledger.CollectionView, eid []byte) (*Event, error) { +func getEventByID(view byzcoin.CollectionView, eid []byte) (*Event, error) { r, err := view.Get(eid).Record() if err != nil { return nil, err diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Argument.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Argument.java similarity index 82% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Argument.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Argument.java index 71fe916546..82b75af001 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Argument.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Argument.java @@ -1,13 +1,13 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.List; /** - * Argument is used in an Instruction. It will end up as the input argument of the OmniLedger smart contract. + * Argument is used in an Instruction. It will end up as the input argument of the smart contract. */ public class Argument { private String name; @@ -27,7 +27,7 @@ public Argument(String name, byte[] value) { * Constructor from protobuf. * @param proto */ - public Argument(OmniLedgerProto.Argument proto) { + public Argument(ByzCoinProto.Argument proto) { name = proto.getName(); value = proto.getValue().toByteArray(); } @@ -52,8 +52,8 @@ public byte[] getValue() { * Converts this object to the protobuf representation. * @return The protobuf representation. */ - public OmniLedgerProto.Argument toProto() { - OmniLedgerProto.Argument.Builder b = OmniLedgerProto.Argument.newBuilder(); + public ByzCoinProto.Argument toProto() { + ByzCoinProto.Argument.Builder b = ByzCoinProto.Argument.newBuilder(); b.setName(this.name); b.setValue(ByteString.copyFrom(this.value)); return b.build(); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniBlock.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Block.java similarity index 78% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniBlock.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Block.java index 2bed16933a..c3f584d8ed 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniBlock.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Block.java @@ -1,22 +1,22 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.Sha256id; import ch.epfl.dedis.lib.SkipBlock; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.InvalidProtocolBufferException; import java.time.Instant; import java.util.List; /** - * OmniBlock represents the data stored in a skipblock that is relevant to OmniLedger. This data is split in + * OmniBlock represents the data stored in a skipblock that is relevant to ByzCoin. This data is split in * two parts: * - header, which contains hashes of the current state and which is hashed in the block - * - body, which contains the actual data (currently ClientTransactions) and which is not directly hashed in the block + * - body, which contains the actual transactions and which is not directly hashed in the block */ -public class OmniBlock { - private OmniLedgerProto.DataHeader dataHeader; +public class Block { + private ByzCoinProto.DataHeader dataHeader; private DataBody dataBody; /** @@ -25,11 +25,11 @@ public class OmniBlock { * @param sb skipblock holding data for an OmniBLock. * @throws CothorityCryptoException */ - public OmniBlock(SkipBlock sb) throws CothorityCryptoException { + public Block(SkipBlock sb) throws CothorityCryptoException { try { // TODO: check that it is actually an OmniBlock by looking at the verifiers - dataHeader = OmniLedgerProto.DataHeader.parseFrom(sb.getData()); - dataBody = new DataBody(OmniLedgerProto.DataBody.parseFrom(sb.getPayload())); + dataHeader = ByzCoinProto.DataHeader.parseFrom(sb.getData()); + dataBody = new DataBody(ByzCoinProto.DataBody.parseFrom(sb.getPayload())); } catch (InvalidProtocolBufferException e) { throw new CothorityCryptoException(e.getMessage()); } @@ -40,14 +40,14 @@ public OmniBlock(SkipBlock sb) throws CothorityCryptoException { * @param p * @throws CothorityCryptoException */ - public OmniBlock(Proof p) throws CothorityCryptoException { + public Block(Proof p) throws CothorityCryptoException { // TODO: How do we know that the block in the proof legitimately links back to the // skipchain we think it does? SkipBlock sb = p.getLatest(); try { // TODO: check that it is actually an OmniBlock by looking at the verifiers - dataHeader = OmniLedgerProto.DataHeader.parseFrom(sb.getData()); - dataBody = new DataBody(OmniLedgerProto.DataBody.parseFrom(sb.getPayload())); + dataHeader = ByzCoinProto.DataHeader.parseFrom(sb.getData()); + dataBody = new DataBody(ByzCoinProto.DataBody.parseFrom(sb.getPayload())); } catch (InvalidProtocolBufferException e) { throw new CothorityCryptoException(e.getMessage()); } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPC.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPC.java similarity index 66% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPC.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPC.java index 222b9b2296..f2ba73978c 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPC.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPC.java @@ -1,17 +1,17 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.Roster; import ch.epfl.dedis.lib.ServerIdentity; import ch.epfl.dedis.lib.SkipBlock; import ch.epfl.dedis.lib.SkipblockId; +import ch.epfl.dedis.lib.byzcoin.contracts.DarcInstance; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.contracts.DarcInstance; -import ch.epfl.dedis.lib.omniledger.darc.Darc; import ch.epfl.dedis.lib.skipchain.SkipchainRPC; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.slf4j.Logger; @@ -22,14 +22,14 @@ import static java.time.temporal.ChronoUnit.NANOS; /** - * Class OmniledgerRPC interacts with the omniledger service of a conode. It can either start a new omniledger service - * (this needs to be secured somehow) or link to an existing omniledger instance. + * Class ByzCoinRPC interacts with the byzcoin service of a conode. It can either start a new byzcoin service + * (this needs to be secured somehow) or link to an existing byzcoin instance. *

- * OmniledgerRPC is the new skipchain service of the cothority that allows batching of transactions and simplified proofs. + * ByzCoinRPC is the new skipchain service of the cothority that allows batching of transactions and simplified proofs. * It is a permissioned blockchain with high throughput (100-1000 transactions) and a byzantine-tolerant consensus * algorithm. */ -public class OmniledgerRPC { +public class ByzCoinRPC { private Config config; private Roster roster; private Darc genesisDarc; @@ -38,35 +38,35 @@ public class OmniledgerRPC { private SkipchainRPC skipchain; public static final int currentVersion = 1; - private final Logger logger = LoggerFactory.getLogger(OmniledgerRPC.class); + private final Logger logger = LoggerFactory.getLogger(ByzCoinRPC.class); /** - * This instantiates a new omniledger object by asking the cothority to set up a new omniledger. + * This instantiates a new byzcoin object by asking the cothority to set up a new byzcoin. * * @param r is the roster to be used * @param d is the genesis darc * @param blockInterval is the block interval between two blocks */ - public OmniledgerRPC(Roster r, Darc d, Duration blockInterval) throws CothorityException { - OmniLedgerProto.CreateGenesisBlock.Builder request = - OmniLedgerProto.CreateGenesisBlock.newBuilder(); + public ByzCoinRPC(Roster r, Darc d, Duration blockInterval) throws CothorityException { + ByzCoinProto.CreateGenesisBlock.Builder request = + ByzCoinProto.CreateGenesisBlock.newBuilder(); request.setVersion(currentVersion); request.setRoster(r.toProto()); request.setGenesisdarc(d.toProto()); request.setBlockinterval(blockInterval.get(NANOS)); - ByteString msg = r.sendMessage("OmniLedger/CreateGenesisBlock", + ByteString msg = r.sendMessage("ByzCoin/CreateGenesisBlock", request.build()); try { - OmniLedgerProto.CreateGenesisBlockResponse reply = - OmniLedgerProto.CreateGenesisBlockResponse.parseFrom(msg); + ByzCoinProto.CreateGenesisBlockResponse reply = + ByzCoinProto.CreateGenesisBlockResponse.parseFrom(msg); genesis = new SkipBlock(reply.getSkipblock()); } catch (InvalidProtocolBufferException e) { throw new CothorityCommunicationException(e); } latest = genesis; - logger.info("Created new OmniLedger: {}", genesis.getId().toString()); + logger.info("Created new ByzCoin ledger with ID: {}", genesis.getId().toString()); skipchain = new SkipchainRPC(r, genesis.getId()); config = new Config(blockInterval); roster = r; @@ -74,21 +74,21 @@ public OmniledgerRPC(Roster r, Darc d, Duration blockInterval) throws CothorityE } /** - * Constructs an OmniLedgerRPC from known configuration. The constructor will communicate with the service to + * Constructs an ByzCoinRPC from a known configuration. The constructor will communicate with the service to * populate other fields and perform verification. * * @param roster the roster to talk to * @param skipchainId the ID of the genesis skipblock, aka skipchain ID * @throws CothorityException */ - public OmniledgerRPC(Roster roster, SkipblockId skipchainId) throws CothorityException, InvalidProtocolBufferException { - Proof proof = OmniledgerRPC.getProof(roster, skipchainId, InstanceId.zero()); + public ByzCoinRPC(Roster roster, SkipblockId skipchainId) throws CothorityException, InvalidProtocolBufferException { + Proof proof = ByzCoinRPC.getProof(roster, skipchainId, InstanceId.zero()); if (!proof.isContract("config", skipchainId)){ throw new CothorityNotFoundException("couldn't verify proof for genesisConfiguration"); } config = new Config(proof.getValue()); - Proof proof2 = OmniledgerRPC.getProof(roster, skipchainId, new InstanceId(proof.getDarcID().getId())); + Proof proof2 = ByzCoinRPC.getProof(roster, skipchainId, new InstanceId(proof.getDarcID().getId())); if (!proof2.isContract(DarcInstance.ContractId, skipchainId)){ throw new CothorityNotFoundException("couldn't verify proof for genesisConfiguration"); } @@ -102,47 +102,47 @@ public OmniledgerRPC(Roster roster, SkipblockId skipchainId) throws CothorityExc } /** - * Instantiates an omniledger object given the byte representation. The omniledger must already have been + * Instantiates an byzcoin object given the byte representation. The byzcoin must already have been * initialized on the cothority. * - * @param buf is the representation of the basic omniledger parameters, it should have a Roster and a skipchain ID. + * @param buf is the representation of the basic byzcoin parameters, it should have a Roster and a skipchain ID. */ - public OmniledgerRPC(byte[] buf) { + public ByzCoinRPC(byte[] buf) { throw new RuntimeException("Not implemented yet"); } /** - * Sends a transaction to omniledger, but doesn't wait for the inclusion of this transaction in a block. + * Sends a transaction to byzcoin, but doesn't wait for the inclusion of this transaction in a block. * Once the transaction has been sent, you need to poll to verify if it has been included or not. * - * @param t is the client transaction holding one or more instructions to be sent to omniledger. + * @param t is the client transaction holding one or more instructions to be sent to byzcoin. */ public ClientTransactionId sendTransaction(ClientTransaction t) throws CothorityException { return sendTransactionAndWait(t, 0); } /** - * Sends a transaction to omniledger and waits for up to 'wait' blocks for the transaction to be + * Sends a transaction to byzcoin and waits for up to 'wait' blocks for the transaction to be * included in the global state. If more than 'wait' blocks are created and the transaction is not * included, an exception will be raised. * - * @param t is the client transaction holding one or more instructions to be sent to omniledger. + * @param t is the client transaction holding one or more instructions to be sent to byzcoin. * @param wait indicates the number of blocks to wait for the transaction to be included. * @return ClientTransactionID the transaction ID * @throws CothorityException if the transaction has not been included within 'wait' blocks. */ public ClientTransactionId sendTransactionAndWait(ClientTransaction t, int wait) throws CothorityException { - OmniLedgerProto.AddTxRequest.Builder request = - OmniLedgerProto.AddTxRequest.newBuilder(); + ByzCoinProto.AddTxRequest.Builder request = + ByzCoinProto.AddTxRequest.newBuilder(); request.setVersion(currentVersion); request.setSkipchainid(ByteString.copyFrom(skipchain.getID().getId())); request.setTransaction(t.toProto()); request.setInclusionwait(wait); - ByteString msg = roster.sendMessage("OmniLedger/AddTxRequest", request.build()); + ByteString msg = roster.sendMessage("ByzCoin/AddTxRequest", request.build()); try { - OmniLedgerProto.AddTxResponse reply = - OmniLedgerProto.AddTxResponse.parseFrom(msg); + ByzCoinProto.AddTxResponse reply = + ByzCoinProto.AddTxResponse.parseFrom(msg); // TODO do something with the reply? logger.info("Successfully stored request - waiting for inclusion"); } catch (InvalidProtocolBufferException e) { @@ -152,23 +152,23 @@ public ClientTransactionId sendTransactionAndWait(ClientTransaction t, int wait) } /** - * Gets a proof from omniledger to show that a given instance is in the + * Gets a proof from byzcoin to show that a given instance is in the * global state. * * @param id is the id of the instance to be fetched * @throws CothorityException */ public Proof getProof(InstanceId id) throws CothorityException { - OmniLedgerProto.GetProof.Builder request = - OmniLedgerProto.GetProof.newBuilder(); + ByzCoinProto.GetProof.Builder request = + ByzCoinProto.GetProof.newBuilder(); request.setVersion(currentVersion); request.setId(skipchain.getID().toProto()); request.setKey(id.toByteString()); - ByteString msg = roster.sendMessage("OmniLedger/GetProof", request.build()); + ByteString msg = roster.sendMessage("ByzCoin/GetProof", request.build()); try { - OmniLedgerProto.GetProofResponse reply = - OmniLedgerProto.GetProofResponse.parseFrom(msg); + ByzCoinProto.GetProofResponse reply = + ByzCoinProto.GetProofResponse.parseFrom(msg); logger.info("Successfully received proof"); return new Proof(reply.getProof()); } catch (InvalidProtocolBufferException e) { @@ -177,7 +177,7 @@ public Proof getProof(InstanceId id) throws CothorityException { } /** - * Fetches the latest configuration and genesis darc from omniledger. + * Fetches the latest configuration and genesis darc from byzcoin. * * @throws CothorityException */ @@ -208,7 +208,7 @@ public boolean checkLiveness() throws CothorityException { } /** - * @return a byte representation of this omniledger object. + * @return a byte representation of this byzcoin object. */ public byte[] toBytes() { return null; @@ -229,47 +229,44 @@ public Darc getGenesisDarc() { } /** - * @return the genesis block of OmniLedger. + * @return the genesis block of the ledger. */ public SkipBlock getGenesis() { return genesis; } /** - * @return the roster responsible for OmniLedger. + * @return the roster responsible for the ledger */ public Roster getRoster() { return roster; } /** - * Fetches a given block from the skipchain and returns the corresponding OmniBlock that allows direct - * access to all relevant fields for OmniLedger. + * Fetches a given block from the skipchain and returns the corresponding Block. * * @param id hash of the skipblock to fetch - * @return an OmniBlock representation of the skipblock + * @return a Block representation of the skipblock * @throws CothorityCommunicationException if it couldn't contact the nodes * @throws CothorityCryptoException if the omniblock is invalid */ - public OmniBlock getOmniBlock(SkipblockId id) throws CothorityCommunicationException, CothorityCryptoException{ + public Block getBlock(SkipblockId id) throws CothorityCommunicationException, CothorityCryptoException{ SkipBlock sb = skipchain.getSkipblock(id); - return new OmniBlock(sb); + return new Block(sb); } /** - * Fetches the latest block from the Skipchain and returns the corresponding OmniBlock that allows direct - * access to all relevant fields for OmniLedger. + * Fetches the latest block from the Skipchain and returns the corresponding Block. * - * @return an OmniBlock representation of the skipblock + * @return an Block representation of the skipblock * @throws CothorityCommunicationException if it couldn't contact the nodes * @throws CothorityCryptoException if the omniblock is invalid */ - public OmniBlock getLatestOmniBlock() throws CothorityCommunicationException, CothorityException{ + public Block getLatestBlock() throws CothorityCommunicationException, CothorityException{ this.update(); - return new OmniBlock(latest); + return new Block(latest); } - /** * This should be used with caution. Every time you use this, please open an issue in github and tell us * why you think you need this. We'll try to fix it then! @@ -282,7 +279,7 @@ public SkipchainRPC getSkipchain() { } /** - * Static method to request a proof from OmniLedger. This is used in the instantiation method. + * Static method to request a proof from ByzCoin. This is used in the instantiation method. * * @param roster where to contact the cothority * @param skipchainId the id of the underlying skipchain @@ -291,15 +288,15 @@ public SkipchainRPC getSkipchain() { * @throws CothorityCommunicationException */ private static Proof getProof(Roster roster, SkipblockId skipchainId, InstanceId key) throws CothorityCommunicationException { - OmniLedgerProto.GetProof.Builder configBuilder = OmniLedgerProto.GetProof.newBuilder(); + ByzCoinProto.GetProof.Builder configBuilder = ByzCoinProto.GetProof.newBuilder(); configBuilder.setVersion(currentVersion); configBuilder.setId(skipchainId.toProto()); configBuilder.setKey(key.toByteString()); - ByteString msg = roster.sendMessage("OmniLedger/GetProof", configBuilder.build()); + ByteString msg = roster.sendMessage("ByzCoin/GetProof", configBuilder.build()); try { - OmniLedgerProto.GetProofResponse reply = OmniLedgerProto.GetProofResponse.parseFrom(msg); + ByzCoinProto.GetProofResponse reply = ByzCoinProto.GetProofResponse.parseFrom(msg); return new Proof(reply.getProof()); } catch (InvalidProtocolBufferException e) { throw new CothorityCommunicationException(e); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransaction.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransaction.java similarity index 73% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransaction.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransaction.java index 3911fbf5cc..f556bcf409 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransaction.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransaction.java @@ -1,7 +1,7 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -9,7 +9,7 @@ import java.util.List; /** - * ClientTransaction is a set of instructions are will be executed atomically by OmniLedger. + * ClientTransaction is a set of instructions are will be executed atomically by ByzCoin. */ public class ClientTransaction { private List instructions; @@ -22,9 +22,9 @@ public ClientTransaction(List instructions) { this.instructions = instructions; } - public ClientTransaction(OmniLedgerProto.ClientTransaction proto) { + public ClientTransaction(ByzCoinProto.ClientTransaction proto) { instructions = new ArrayList(); - for (OmniLedgerProto.Instruction i : proto.getInstructionsList()) { + for (ByzCoinProto.Instruction i : proto.getInstructionsList()) { instructions.add(new Instruction(i)); } } @@ -41,8 +41,8 @@ public List getInstructions() { * Converts this object to the protobuf representation. * @return The protobuf representation. */ - public OmniLedgerProto.ClientTransaction toProto() { - OmniLedgerProto.ClientTransaction.Builder b = OmniLedgerProto.ClientTransaction.newBuilder(); + public ByzCoinProto.ClientTransaction toProto() { + ByzCoinProto.ClientTransaction.Builder b = ByzCoinProto.ClientTransaction.newBuilder(); for (Instruction instr : this.instructions) { b.addInstructions(instr.toProto()); } @@ -56,9 +56,7 @@ public ClientTransactionId getId() { digest.update(instr.hash()); } return new ClientTransactionId(digest.digest()); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } catch (CothorityCryptoException e) { + } catch (NoSuchAlgorithmException | CothorityCryptoException e) { throw new RuntimeException(e); } } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransactionId.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransactionId.java similarity index 97% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransactionId.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransactionId.java index fa3c6f7465..843481eadc 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/ClientTransactionId.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/ClientTransactionId.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.HashId; import ch.epfl.dedis.lib.crypto.Hex; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Config.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Config.java similarity index 77% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Config.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Config.java index df76ab758c..d0fd83e94d 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Config.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Config.java @@ -1,8 +1,8 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.InvalidProtocolBufferException; import java.time.Duration; @@ -10,15 +10,15 @@ import static java.time.temporal.ChronoUnit.NANOS; /** - * Config is the genesis configuration of an omniledger instance. It can be stored only once in omniledger - * and defines the basic running parameters of omniledger. + * Config is the genesis configuration of an byzcoin instance. It can be stored only once in byzcoin + * and defines the basic running parameters of byzcoin. */ public class Config { private Duration blockInterval; private int maxBlockSize; /** - * This instantiates a new configuration to be used in the omniledger constructor. + * This instantiates a new configuration to be used in the byzcoin constructor. * * @param blockInterval - how often the blocks should be created */ @@ -29,13 +29,13 @@ public Config(Duration blockInterval){ /** * Instantiates from an existing protobuf representation. */ - public Config(OmniLedgerProto.ChainConfig config) { + public Config(ByzCoinProto.ChainConfig config) { this.blockInterval = Duration.of(config.getBlockinterval(), NANOS); } public Config(byte[] buf) throws CothorityCommunicationException { try { - OmniLedgerProto.ChainConfig config = OmniLedgerProto.ChainConfig.parseFrom(buf); + ByzCoinProto.ChainConfig config = ByzCoinProto.ChainConfig.parseFrom(buf); this.blockInterval = Duration.of(config.getBlockinterval(), NANOS); if (! config.hasMaxblocksize()) { throw new RuntimeException("no max block size"); @@ -66,8 +66,8 @@ public int getMaxBlockSize() { /** * @return the protobuf representation of the configuration. */ - public OmniLedgerProto.ChainConfig toProto(){ - OmniLedgerProto.ChainConfig.Builder b = OmniLedgerProto.ChainConfig.newBuilder(); + public ByzCoinProto.ChainConfig toProto(){ + ByzCoinProto.ChainConfig.Builder b = ByzCoinProto.ChainConfig.newBuilder(); b.setBlockinterval(blockInterval.get(NANOS)); b.setMaxblocksize(maxBlockSize); return b.build(); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/DataBody.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/DataBody.java similarity index 64% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/DataBody.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/DataBody.java index 282ab835df..f048785c1f 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/DataBody.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/DataBody.java @@ -1,6 +1,6 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.InvalidProtocolBufferException; import java.util.ArrayList; @@ -14,9 +14,9 @@ public class DataBody { * @param proto * @throws InvalidProtocolBufferException */ - public DataBody(OmniLedgerProto.DataBody proto) throws InvalidProtocolBufferException { + public DataBody(ByzCoinProto.DataBody proto) throws InvalidProtocolBufferException { txResults = new ArrayList(proto.getTxresultsCount()); - for (OmniLedgerProto.TxResult t : proto.getTxresultsList()) { + for (ByzCoinProto.TxResult t : proto.getTxresultsList()) { txResults.add(new TxResult(t)); } } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Delete.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Delete.java similarity index 58% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Delete.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Delete.java index c1d91c0cf0..469f9e5f44 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Delete.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Delete.java @@ -1,6 +1,6 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; /** * Delete is an operation that an Instruction can take, it should be used for deleting an object. @@ -10,8 +10,8 @@ public class Delete { * Converts this object to the protobuf representation. * @return The protobuf representation. */ - public OmniLedgerProto.Delete toProto() { - OmniLedgerProto.Delete.Builder b = OmniLedgerProto.Delete.newBuilder(); + public ByzCoinProto.Delete toProto() { + ByzCoinProto.Delete.Builder b = ByzCoinProto.Delete.newBuilder(); return b.build(); } @@ -19,6 +19,6 @@ public OmniLedgerProto.Delete toProto() { * Constructor from protobuf. * @param proto */ - public Delete(OmniLedgerProto.Delete proto) { + public Delete(ByzCoinProto.Delete proto) { } } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instance.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instance.java similarity index 89% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instance.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instance.java index c86d9baa1e..30775a38cc 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instance.java @@ -1,8 +1,8 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; import java.util.List; @@ -17,7 +17,7 @@ public class Instance { private byte[] data; /** - * Instantiates an instance given a proof sent by omniledger. + * Instantiates an instance given a proof sent by byzcoin. * @param p * @throws CothorityException */ diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/InstanceId.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/InstanceId.java similarity index 96% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/InstanceId.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/InstanceId.java index e85d842b68..382da543d2 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/InstanceId.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/InstanceId.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.HashId; import ch.epfl.dedis.lib.crypto.Hex; @@ -52,7 +52,7 @@ public ByteString toByteString(){ } /** - * Creates an instance ID of all zeros, which is the place where the OmniLedger + * Creates an instance ID of all zeros, which is the place where the ByzCoin * config is stored. * * @return the zero instance ID diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instruction.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instruction.java similarity index 95% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instruction.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instruction.java index dad4b46e4e..5f546b1722 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Instruction.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Instruction.java @@ -1,8 +1,8 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; +import ch.epfl.dedis.lib.byzcoin.darc.*; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.lib.omniledger.darc.*; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.ByteString; import java.nio.ByteBuffer; @@ -14,7 +14,7 @@ import java.util.List; /** - * An instruction is sent and executed by OmniLedger. + * An instruction is sent and executed by ByzCoin. */ public class Instruction { private InstanceId instId; @@ -76,7 +76,7 @@ public Instruction(InstanceId instId, byte[] nonce, int index, int length, Delet this.delete = delete; } - public Instruction(OmniLedgerProto.Instruction inst) { + public Instruction(ByzCoinProto.Instruction inst) { this.instId = new InstanceId(inst.getInstanceid()); this.nonce = inst.getNonce().toByteArray(); this.index = inst.getIndex(); @@ -144,8 +144,8 @@ public byte[] hash() { * * @return The protobuf representation. */ - public OmniLedgerProto.Instruction toProto() { - OmniLedgerProto.Instruction.Builder b = OmniLedgerProto.Instruction.newBuilder(); + public ByzCoinProto.Instruction toProto() { + ByzCoinProto.Instruction.Builder b = ByzCoinProto.Instruction.newBuilder(); b.setInstanceid(ByteString.copyFrom(this.instId.getId())); b.setNonce(ByteString.copyFrom(this.nonce)); b.setIndex(this.index); @@ -197,7 +197,7 @@ public Request toDarcRequest(DarcId darcId) { } /** - * Have a list of signers sign the instruction. The instruction will *not* be accepted by omniledger if it is not + * Have a list of signers sign the instruction. The instruction will *not* be accepted by byzcoin if it is not * signed. The signature will not be valid if the instruction is modified after signing. * * @param signers - the list of signers. diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Invoke.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Invoke.java similarity index 83% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Invoke.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Invoke.java index 782acb6d06..53bf2e4866 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Invoke.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Invoke.java @@ -1,6 +1,6 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import java.util.ArrayList; import java.util.Arrays; @@ -37,10 +37,10 @@ public Invoke(String command, String name, byte[] value){ * Constructo from protobuf. * @param proto */ - public Invoke(OmniLedgerProto.Invoke proto) { + public Invoke(ByzCoinProto.Invoke proto) { command = proto.getCommand(); arguments = new ArrayList(); - for (OmniLedgerProto.Argument a : proto.getArgsList()) { + for (ByzCoinProto.Argument a : proto.getArgsList()) { arguments.add(new Argument(a)); } } @@ -65,8 +65,8 @@ public List getArguments() { * Converts this object to the protobuf representation. * @return The protobuf representation. */ - public OmniLedgerProto.Invoke toProto() { - OmniLedgerProto.Invoke.Builder b = OmniLedgerProto.Invoke.newBuilder(); + public ByzCoinProto.Invoke toProto() { + ByzCoinProto.Invoke.Builder b = ByzCoinProto.Invoke.newBuilder(); b.setCommand(this.command); for (Argument a : this.arguments) { b.addArgs(a.toProto()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Proof.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Proof.java similarity index 88% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Proof.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Proof.java index fba375a0f6..99a2209eb3 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Proof.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Proof.java @@ -1,13 +1,13 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.lib.SkipBlock; import ch.epfl.dedis.lib.SkipblockId; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.lib.exception.CothorityException; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; import ch.epfl.dedis.lib.skipchain.ForwardLink; +import ch.epfl.dedis.proto.ByzCoinProto; import ch.epfl.dedis.proto.CollectionProto; -import ch.epfl.dedis.proto.OmniLedgerProto; import ch.epfl.dedis.proto.SkipchainProto; import com.google.protobuf.ByteString; @@ -20,7 +20,7 @@ * root node. */ public class Proof { - private OmniLedgerProto.Proof proof; + private ByzCoinProto.Proof proof; private CollectionProto.Dump leaf; private List links; @@ -29,7 +29,7 @@ public class Proof { * * @param p */ - public Proof(OmniLedgerProto.Proof p) { + public Proof(ByzCoinProto.Proof p) { proof = p; List steps = p.getInclusionproof().getStepsList(); CollectionProto.Dump left = steps.get(steps.size() - 1).getLeft(); @@ -48,7 +48,7 @@ public Proof(OmniLedgerProto.Proof p) { /** * Get the protobuf representation of the proof. */ - public OmniLedgerProto.Proof toProto() { + public ByzCoinProto.Proof toProto() { return this.proof; } @@ -71,7 +71,7 @@ public SkipBlock getLatest() { * @throws CothorityException */ public boolean verify(SkipblockId id) throws CothorityException { - if (!isOmniledgerProof()){ + if (!isByzCoinProof()){ return false; } // TODO: more verifications @@ -127,9 +127,9 @@ public DarcId getDarcID() throws CothorityCryptoException{ } /** - * @return true if this looks like a matching proof for omniledger. + * @return true if this looks like a matching proof for byzcoin. */ - public boolean isOmniledgerProof(){ + public boolean isByzCoinProof(){ if (!matches()) { return false; } @@ -141,10 +141,10 @@ public boolean isOmniledgerProof(){ /** * @param expected the string of the expected contract. - * @return true if this is a matching omniledger proof for an instance of the given contract. + * @return true if this is a matching byzcoin proof for an instance of the given contract. */ public boolean isContract(String expected){ - if (!isOmniledgerProof()){ + if (!isByzCoinProof()){ return false; } String contract = new String(getValues().get(1)); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Spawn.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Spawn.java similarity index 80% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Spawn.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Spawn.java index 75c10af290..4fee73fcd1 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/Spawn.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/Spawn.java @@ -1,6 +1,6 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import java.util.ArrayList; import java.util.List; @@ -22,10 +22,10 @@ public Spawn(String contractId, List arguments) { this.arguments = arguments; } - public Spawn(OmniLedgerProto.Spawn proto) { + public Spawn(ByzCoinProto.Spawn proto) { contractId = proto.getContractid(); arguments = new ArrayList(); - for (OmniLedgerProto.Argument a : proto.getArgsList()) { + for (ByzCoinProto.Argument a : proto.getArgsList()) { arguments.add(new Argument(a)); } } @@ -50,8 +50,8 @@ public List getArguments() { * Converts this object to the protobuf representation. * @return The protobuf representation. */ - public OmniLedgerProto.Spawn toProto() { - OmniLedgerProto.Spawn.Builder b = OmniLedgerProto.Spawn.newBuilder(); + public ByzCoinProto.Spawn toProto() { + ByzCoinProto.Spawn.Builder b = ByzCoinProto.Spawn.newBuilder(); b.setContractid(this.contractId); for (Argument a : this.arguments) { b.addArgs(a.toProto()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/TxResult.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/TxResult.java similarity index 80% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/TxResult.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/TxResult.java index 7f00572d22..d2778a1b20 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/TxResult.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/TxResult.java @@ -1,6 +1,6 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; -import ch.epfl.dedis.proto.OmniLedgerProto; +import ch.epfl.dedis.proto.ByzCoinProto; import com.google.protobuf.InvalidProtocolBufferException; public class TxResult { @@ -12,7 +12,7 @@ public class TxResult { * @param proto * @throws InvalidProtocolBufferException */ - public TxResult(OmniLedgerProto.TxResult proto) throws InvalidProtocolBufferException { + public TxResult(ByzCoinProto.TxResult proto) throws InvalidProtocolBufferException { ct = new ClientTransaction(proto.getClienttransaction()); accepted = proto.getAccepted(); } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/DarcInstance.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/DarcInstance.java similarity index 85% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/DarcInstance.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/DarcInstance.java index 4255cdaad1..40e26480b0 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/DarcInstance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/DarcInstance.java @@ -1,12 +1,12 @@ -package ch.epfl.dedis.lib.omniledger.contracts; +package ch.epfl.dedis.lib.byzcoin.contracts; +import ch.epfl.dedis.lib.byzcoin.*; +import ch.epfl.dedis.lib.byzcoin.darc.*; import ch.epfl.dedis.lib.crypto.Hex; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.*; -import ch.epfl.dedis.lib.omniledger.darc.*; import com.google.protobuf.InvalidProtocolBufferException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,8 +15,8 @@ import java.util.List; /** - * DarcInstance represents an instance of a darc on Omniledger. It is self- - * sufficient, meaning it has a link to the omniledger instance it runs on. + * DarcInstance represents an instance of a darc on ByzCoin. It is self- + * sufficient, meaning it has a link to the byzcoin instance it runs on. * If you evolve the DarcInstance, it will update its internal darc. */ public class DarcInstance { @@ -25,23 +25,23 @@ public class DarcInstance { private Instance instance; private Darc darc; - private OmniledgerRPC ol; + private ByzCoinRPC bc; private final static Logger logger = LoggerFactory.getLogger(DarcInstance.class); /** - * Instantiates a new DarcInstance given a working omniledger instance and - * an instanceId. This instantiator will contact omniledger and try to get + * Instantiates a new DarcInstance given a working byzcoin instance and + * an instanceId. This instantiator will contact byzcoin and try to get * the current darcInstance. If the instance is not found, or is not of * contractId "darc", an exception will be thrown. * - * @param ol is a link to an omniledger instance that is running + * @param bc is a link to an byzcoin instance that is running * @param id of the darc-instance to connect to * @throws CothorityException */ - public DarcInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException { - this.ol = ol; - Proof p = ol.getProof(id); + public DarcInstance(ByzCoinRPC bc, InstanceId id) throws CothorityException { + this.bc = bc; + Proof p = bc.getProof(id); instance = new Instance(p); if (!instance.getContractId().equals(ContractId)) { logger.error("wrong instance: {}", instance.getContractId()); @@ -54,12 +54,12 @@ public DarcInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException { } } - public DarcInstance(OmniledgerRPC ol, Darc d) throws CothorityException { - this(ol, new InstanceId(d.getBaseId().getId())); + public DarcInstance(ByzCoinRPC bc, Darc d) throws CothorityException { + this(bc, new InstanceId(d.getBaseId().getId())); } public void update() throws CothorityException { - instance = new Instance(ol.getProof(instance.getId())); + instance = new Instance(bc.getProof(instance.getId())); try { darc = new Darc(instance.getData()); } catch (InvalidProtocolBufferException e) { @@ -68,7 +68,7 @@ public void update() throws CothorityException { } /** - * Creates an instruction to evolve the darc in omniledger. The signer must have its identity in the current + * Creates an instruction to evolve the darc in byzcoin. The signer must have its identity in the current * darc as "Invoke_Evolve" rule. *

* TODO: allow for evolution if the expression has more than one identity. @@ -77,7 +77,7 @@ public void update() throws CothorityException { * @param owner must have its identity in the "Invoke_Evolve" rule * @param pos position of the instruction in the ClientTransaction * @param len total number of instructions in the ClientTransaction - * @return Instruction to be sent to omniledger + * @return Instruction to be sent to byzcoin * @throws CothorityCryptoException */ public Instruction evolveDarcInstruction(Darc newDarc, Signer owner, int pos, int len) throws CothorityCryptoException { @@ -106,11 +106,11 @@ public Instruction evolveDarcInstruction(Darc newDarc, Signer owner, int pos, in public void evolveDarc(Darc newDarc, Signer owner) throws CothorityException { Instruction inst = evolveDarcInstruction(newDarc, owner, 0, 1); ClientTransaction ct = new ClientTransaction(Arrays.asList(inst)); - ol.sendTransaction(ct); + bc.sendTransaction(ct); } /** - * Asks omniledger to evolve the darc and waits until the new darc has + * Asks byzcoin to evolve the darc and waits until the new darc has * been stored in the global state. * TODO: check if there has been an error in the transaction! * @@ -121,14 +121,14 @@ public void evolveDarc(Darc newDarc, Signer owner) throws CothorityException { public void evolveDarcAndWait(Darc newDarc, Signer owner) throws CothorityException { evolveDarc(newDarc, owner); for (int i = 0; i < 10; i++) { - Proof p = ol.getProof(instance.getId()); + Proof p = bc.getProof(instance.getId()); Instance inst = new Instance(p); try { darc = new Darc(inst.getData()); if (darc.getVersion() == newDarc.getVersion()) { return; } - Thread.sleep(ol.getConfig().getBlockInterval().toMillis()); + Thread.sleep(bc.getConfig().getBlockInterval().toMillis()); } catch (InvalidProtocolBufferException e) { continue; } catch (InterruptedException e) { @@ -169,7 +169,7 @@ public Instruction spawnContractInstruction(String contractID, Signer s, List args) throws CothorityException { Instruction inst = spawnContractInstruction(contractID, s, args, 0, 1); ClientTransaction ct = new ClientTransaction(Arrays.asList(inst)); - return ol.sendTransaction(ct); + return bc.sendTransaction(ct); } /** - * Like spawnContract but waits for the instance to be stored in omniledger. + * Like spawnContract but waits for the instance to be stored in byzcoin. * * @param contractID the id of the contract to create * @param s the signer that is authorized to spawn this contract @@ -193,7 +193,7 @@ public ClientTransactionId spawnContract(String contractID, Signer s, List args, int wait) throws CothorityException { Instruction inst = spawnContractInstruction(contractID, s, args, 0, 1); ClientTransaction ct = new ClientTransaction(Arrays.asList(inst)); - ol.sendTransactionAndWait(ct, wait); + bc.sendTransactionAndWait(ct, wait); InstanceId iid = inst.deriveId(""); if (contractID.equals(ContractId)) { // Special case for a darc, then the resulting instanceId is based @@ -206,7 +206,7 @@ public Proof spawnContractAndWait(String contractID, Signer s, List ar } } logger.info("waiting on iid {}", iid); - return ol.getProof(iid); + return bc.getProof(iid); } /** diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstance.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/EventLogInstance.java similarity index 87% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstance.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/EventLogInstance.java index 55dfafd71c..c100dcfaa6 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/EventLogInstance.java @@ -1,14 +1,14 @@ -package ch.epfl.dedis.lib.omniledger.contracts; +package ch.epfl.dedis.lib.byzcoin.contracts; +import ch.epfl.dedis.lib.byzcoin.*; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; import ch.epfl.dedis.lib.eventlog.Event; import ch.epfl.dedis.lib.eventlog.SearchResponse; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.*; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; -import ch.epfl.dedis.lib.omniledger.darc.Signer; import ch.epfl.dedis.proto.EventLogProto; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -20,14 +20,14 @@ import java.util.List; /** - * EventLogInstance is for interacting with the eventlog contract on OmniLedger. + * EventLogInstance is for interacting with the eventlog contract on ByzCoin. *

* Contrary to ordinary event logging services, we offer better security and auditability. Below are some of the main * features that sets us apart. *

*

*/ public class EventLogInstance { - // ContractId is how this contract is represented in OmniLedger; public static String ContractId = "eventlog"; private Instance instance; - private OmniledgerRPC ol; + private ByzCoinRPC bc; private final static Logger logger = LoggerFactory.getLogger(EventLogInstance.class); /** * Constructor for when do you not know the eventlog instance, use this constructor when constructing for the first - * time. This constructor expects the omniledger RPC to be initialised with a darc that contains "spawn:eventlog". - * @param ol the omniledger RPC + * time. This constructor expects the byzcoin RPC to be initialised with a darc that contains "spawn:eventlog". + * @param bc the byzcoin RPC * @param signers a list of signers that has the "spawn:eventlog" permission * @param darcId the darc ID that has the "spawn:eventlog" permission * @throws CothorityException */ - public EventLogInstance(OmniledgerRPC ol, List signers, DarcId darcId) throws CothorityException { - this.ol = ol; + public EventLogInstance(ByzCoinRPC bc, List signers, DarcId darcId) throws CothorityException { + this.bc = bc; InstanceId id = this.initEventlogInstance(darcId, signers); - // wait for omniledger to commit the transaction in block + // wait for byzcoin to commit the transaction in block try { - Thread.sleep(5 * ol.getConfig().getBlockInterval().toMillis()); + Thread.sleep(5 * bc.getConfig().getBlockInterval().toMillis()); } catch (InterruptedException e) { throw new CothorityException(e); } @@ -77,12 +76,12 @@ public EventLogInstance(OmniledgerRPC ol, List signers, DarcId darcId) t /** * Constructor for when the caller already knows the eventlog instance. - * @param ol the omniledger RPC - * @param id the instance ID, it must be already initialised and stored on omniledger + * @param bc the byzcoin RPC + * @param id the instance ID, it must be already initialised and stored on byzcoin * @throws CothorityException */ - public EventLogInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException { - this.ol = ol; + public EventLogInstance(ByzCoinRPC bc, InstanceId id) throws CothorityException { + this.bc = bc; this.setInstance(id); } @@ -97,7 +96,7 @@ public EventLogInstance(OmniledgerRPC ol, InstanceId id) throws CothorityExcepti */ public List log(List events, DarcId darcId, List signers) throws CothorityException { Pair> txAndKeys = makeTx(events, darcId, signers); - ol.sendTransaction(txAndKeys._1); + bc.sendTransaction(txAndKeys._1); return txAndKeys._2; } @@ -121,7 +120,7 @@ public InstanceId log(Event event, DarcId darcId, List signers) throws C * @throws CothorityException */ public Event get(InstanceId key) throws CothorityException { - Proof p = ol.getProof(key); + Proof p = bc.getProof(key); if (!p.matches()) { throw new CothorityCryptoException("key does not exist"); } @@ -151,15 +150,15 @@ public Event get(InstanceId key) throws CothorityException { */ public SearchResponse search(String topic, long from, long to) throws CothorityException { // Note: this method is a bit different from the others, we directly use the raw sendMessage instead of via - // OmniLedgerRPC. + // ByzCoinRPC. EventLogProto.SearchRequest.Builder b = EventLogProto.SearchRequest.newBuilder(); b.setInstance(ByteString.copyFrom(this.instance.getId().getId())); - b.setId(this.ol.getGenesis().getId().toProto()); + b.setId(this.bc.getGenesis().getId().toProto()); b.setTopic(topic); b.setFrom(from); b.setTo(to); - ByteString msg = this.ol.getRoster().sendMessage("EventLog/SearchRequest", b.build()); + ByteString msg = this.bc.getRoster().sendMessage("EventLog/SearchRequest", b.build()); try { EventLogProto.SearchResponse resp = EventLogProto.SearchResponse.parseFrom(msg); @@ -186,14 +185,14 @@ private InstanceId initEventlogInstance( DarcId darcId, List signers) th instr.signBy(darcId, signers); ClientTransaction tx = new ClientTransaction(Arrays.asList(instr)); - ol.sendTransaction(tx); + bc.sendTransaction(tx); return instr.deriveId(""); } private void setInstance(InstanceId id) throws CothorityException { - Proof p = ol.getProof(id); + Proof p = bc.getProof(id); Instance inst = new Instance(p); if (!inst.getContractId().equals(ContractId)) { logger.error("wrong instance: {}", inst.getContractId()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/ValueInstance.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/ValueInstance.java similarity index 76% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/ValueInstance.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/ValueInstance.java index f93fc1343b..ddfaf4ff3d 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/contracts/ValueInstance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/contracts/ValueInstance.java @@ -1,44 +1,43 @@ -package ch.epfl.dedis.lib.omniledger.contracts; +package ch.epfl.dedis.lib.byzcoin.contracts; +import ch.epfl.dedis.lib.byzcoin.*; +import ch.epfl.dedis.lib.byzcoin.darc.Request; +import ch.epfl.dedis.lib.byzcoin.darc.Signature; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; import ch.epfl.dedis.lib.crypto.Hex; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.*; -import ch.epfl.dedis.lib.omniledger.darc.Request; -import ch.epfl.dedis.lib.omniledger.darc.Signature; -import ch.epfl.dedis.lib.omniledger.darc.Signer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Arrays; /** - * ValueInstance represents a simple value store on omniledger. + * ValueInstance represents a simple value store on byzcoin. */ public class ValueInstance { - // ContractId is how a valueInstance is represented in OmniLedger. public static String ContractId = "value"; private Instance instance; - private OmniledgerRPC ol; + private ByzCoinRPC bc; private byte[] value; private final static Logger logger = LoggerFactory.getLogger(ValueInstance.class); /** - * Instantiates a new ValueInstance given a working omniledger instance and - * an instanceId. This instantiator will contact omniledger and try to get + * Instantiates a new ValueInstance given a working byzcoin instance and + * an instanceId. This instantiator will contact byzcoin and try to get * the current valueInstance. If the instance is not found, or is not of * contractId "Value", an exception will be thrown. * - * @param ol is a link to an omniledger instance that is running + * @param bc is a link to an byzcoin instance that is running * @param id of the value-instance to connect to * @throws CothorityException */ - public ValueInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException { - this.ol = ol; - Proof p = ol.getProof(id); + public ValueInstance(ByzCoinRPC bc, InstanceId id) throws CothorityException { + this.bc = bc; + Proof p = bc.getProof(id); instance = new Instance(p); if (!instance.getContractId().equals(ContractId)) { logger.error("wrong instance: {}", instance.getContractId()); @@ -47,17 +46,17 @@ public ValueInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException value = instance.getData(); } - public ValueInstance(OmniledgerRPC ol, Proof p) throws CothorityException { - this(ol, new InstanceId(p.getKey())); + public ValueInstance(ByzCoinRPC bc, Proof p) throws CothorityException { + this(bc, new InstanceId(p.getKey())); } public void update() throws CothorityException { - instance = new Instance(ol.getProof(instance.getId())); + instance = new Instance(bc.getProof(instance.getId())); value = instance.getData(); } /** - * Creates an instruction to evolve the value in omniledger. The signer must have its identity in the current + * Creates an instruction to evolve the value in byzcoin. The signer must have its identity in the current * darc as "invoke:update" rule. *

* TODO: allow for evolution if the expression has more than one identity. @@ -66,7 +65,7 @@ public void update() throws CothorityException { * @param owner must have its identity in the "invoke:update" rule * @param pos position of the instruction in the ClientTransaction * @param len total number of instructions in the ClientTransaction - * @return Instruction to be sent to omniledger + * @return Instruction to be sent to byzcoin * @throws CothorityCryptoException */ public Instruction evolveValueInstruction(byte[] newValue, Signer owner, int pos, int len) throws CothorityCryptoException { @@ -87,11 +86,11 @@ public Instruction evolveValueInstruction(byte[] newValue, Signer owner, int pos public void evolveValue(byte[] newValue, Signer owner) throws CothorityException { Instruction inst = evolveValueInstruction(newValue, owner, 0, 1); ClientTransaction ct = new ClientTransaction(Arrays.asList(inst)); - ol.sendTransaction(ct); + bc.sendTransaction(ct); } /** - * Asks omniledger to update the value and waits until the new value has + * Asks byzcoin to update the value and waits until the new value has * been stored in the global state. * TODO: check if there has been an error in the transaction! * @@ -102,7 +101,7 @@ public void evolveValue(byte[] newValue, Signer owner) throws CothorityException public void evolveValueAndWait(byte[] newValue, Signer owner) throws CothorityException { evolveValue(newValue, owner); for (int i = 0; i < 10; i++) { - Proof p = ol.getProof(instance.getId()); + Proof p = bc.getProof(instance.getId()); Instance inst = new Instance(p); logger.info("Values are: {} - {}", Hex.printHexBinary(inst.getData()), Hex.printHexBinary(newValue)); @@ -111,7 +110,7 @@ public void evolveValueAndWait(byte[] newValue, Signer owner) throws CothorityEx return; } try{ - Thread.sleep(ol.getConfig().getBlockInterval().toMillis()); + Thread.sleep(bc.getConfig().getBlockInterval().toMillis()); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Darc.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Darc.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Darc.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Darc.java index dd3768406d..ce8a95f0e9 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Darc.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Darc.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Hex; import ch.epfl.dedis.lib.exception.CothorityAlreadyExistsException; @@ -23,7 +23,7 @@ /** * Darc stands for distributed access right control. It provides a powerful access control policy that supports logical * expressions, delegation of rights, offline verification and so on. Please refer to - * https://github.com/dedis/cothority/omniledger/README.md#darc for more information. + * https://github.com/dedis/cothority/byzcoin/README.md#darc for more information. */ public class Darc { private long version; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/DarcId.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/DarcId.java similarity index 95% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/DarcId.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/DarcId.java index 0ed7891ffd..c6588dcf38 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/DarcId.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/DarcId.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.Sha256id; import ch.epfl.dedis.lib.exception.CothorityCryptoException; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Identity.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Identity.java similarity index 93% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Identity.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Identity.java index 46d85333c6..8bc0bf3e72 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Identity.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Identity.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.proto.DarcProto; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityDarc.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityDarc.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityDarc.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityDarc.java index 4eecf96f9e..d6d30ddcef 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityDarc.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityDarc.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Hex; import ch.epfl.dedis.lib.exception.CothorityCryptoException; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityEd25519.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityEd25519.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityEd25519.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityEd25519.java index 1657b7e914..c5e57e0f0a 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityEd25519.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityEd25519.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Ed25519Point; import ch.epfl.dedis.lib.crypto.Point; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityFactory.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityFactory.java similarity index 97% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityFactory.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityFactory.java index ab05e116ed..a8b9ad00af 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityFactory.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityFactory.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.proto.DarcProto; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityX509EC.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityX509EC.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityX509EC.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityX509EC.java index 0f500ce0be..c28e6b72b1 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/IdentityX509EC.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/IdentityX509EC.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Hex; import ch.epfl.dedis.lib.exception.CothorityCryptoException; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Request.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Request.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Request.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Request.java index e5b4a89144..e1357b6197 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Request.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Request.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.proto.DarcProto; import com.google.protobuf.ByteString; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rule.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rule.java similarity index 95% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rule.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rule.java index 1f635b69f3..26f11c660c 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rule.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rule.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.proto.DarcProto; import com.google.protobuf.ByteString; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rules.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rules.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rules.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rules.java index e7e1d39670..5e088a7a40 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Rules.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Rules.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.exception.CothorityAlreadyExistsException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signature.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signature.java similarity index 95% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signature.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signature.java index 9c58208b9b..25f9fc5f41 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signature.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signature.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.exception.CothorityCryptoException; import ch.epfl.dedis.proto.DarcProto; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signer.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signer.java similarity index 97% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signer.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signer.java index 7f70b095fb..853eaa0f2f 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/Signer.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/Signer.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Point; import ch.epfl.dedis.lib.crypto.Scalar; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerEd25519.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerEd25519.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerEd25519.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerEd25519.java index 1f96020a9b..4de11d9423 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerEd25519.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerEd25519.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.*; import ch.epfl.dedis.lib.exception.CothorityCryptoException; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerFactory.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerFactory.java similarity index 94% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerFactory.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerFactory.java index 7e1567c5a0..8524dd0370 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerFactory.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerFactory.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import java.util.Arrays; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerX509EC.java b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerX509EC.java similarity index 98% rename from external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerX509EC.java rename to external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerX509EC.java index 4f2ffec987..957ea04a17 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/omniledger/darc/SignerX509EC.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/byzcoin/darc/SignerX509EC.java @@ -1,4 +1,4 @@ -package ch.epfl.dedis.lib.omniledger.darc; +package ch.epfl.dedis.lib.byzcoin.darc; import ch.epfl.dedis.lib.crypto.Point; import ch.epfl.dedis.lib.crypto.Scalar; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/CalypsoRPC.java b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/CalypsoRPC.java index e7d41cbdd7..2b498451ac 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/CalypsoRPC.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/CalypsoRPC.java @@ -2,8 +2,8 @@ import ch.epfl.dedis.lib.Roster; import ch.epfl.dedis.lib.SkipblockId; +import ch.epfl.dedis.lib.byzcoin.Proof; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.lib.omniledger.Proof; import ch.epfl.dedis.proto.Calypso; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -23,7 +23,7 @@ public class CalypsoRPC { public static CreateLTSReply createLTS(Roster roster, SkipblockId genesis) throws CothorityCommunicationException { Calypso.CreateLTS.Builder b = Calypso.CreateLTS.newBuilder(); b.setRoster(roster.toProto()); - b.setOlid(ByteString.copyFrom(genesis.getId())); + b.setBcid(ByteString.copyFrom(genesis.getId())); ByteString msg = roster.sendMessage("calypso/CreateLTS", b.build()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReadRequest.java b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReadRequest.java index 689f38ebb6..af7881f7cb 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReadRequest.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReadRequest.java @@ -1,11 +1,11 @@ package ch.epfl.dedis.lib.calypso; +import ch.epfl.dedis.lib.byzcoin.InstanceId; import ch.epfl.dedis.lib.crypto.Point; -import ch.epfl.dedis.lib.omniledger.InstanceId; import ch.epfl.dedis.proto.Calypso; /** - * A ReadRequest is the data that is sent to the calypsoRead contract in OmniLedger. It is used to log a read request + * A ReadRequest is the data that is sent to the calypsoRead contract. It is used to log a read request * and must be linked to a corresponding write request. */ public class ReadRequest { diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReaderInstance.java b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReaderInstance.java index 88beb1cfe1..ebec9b0f7d 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReaderInstance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/ReaderInstance.java @@ -2,9 +2,9 @@ import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.*; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; -import ch.epfl.dedis.lib.omniledger.darc.Signer; +import ch.epfl.dedis.lib.byzcoin.*; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,20 +17,20 @@ public class ReaderInstance { private static String ContractId = "calypsoRead"; private Instance instance; - private OmniledgerRPC ol; + private ByzCoinRPC bc; private final static Logger logger = LoggerFactory.getLogger(ReaderInstance.class); /** * Constructor used for when a new instance is needed. * - * @param ol The OmniLedger RPC object. + * @param bc The ByzCoinRPC object. * @param signers Signers who are allowed to spawn this instance. * @param darcId The darc ID that has the signers. * @param rr The ReadRequest that is sent to the contract. * @throws CothorityException */ - public ReaderInstance(OmniledgerRPC ol, List signers, DarcId darcId, ReadRequest rr) throws CothorityException { - this.ol = ol; + public ReaderInstance(ByzCoinRPC bc, List signers, DarcId darcId, ReadRequest rr) throws CothorityException { + this.bc = bc; InstanceId id = this.read(rr, darcId, signers); this.setInstance(id); } @@ -38,12 +38,12 @@ public ReaderInstance(OmniledgerRPC ol, List signers, DarcId darcId, Rea /** * Constructor used to connect to an existing instance. * - * @param ol The OmniLedger RPC object. + * @param bc The ByzCoinRPC object. * @param id The identity of the instance. * @throws CothorityException */ - public ReaderInstance(OmniledgerRPC ol, InstanceId id) throws CothorityException { - this.ol = ol; + public ReaderInstance(ByzCoinRPC bc, InstanceId id) throws CothorityException { + this.bc = bc; this.setInstance(id); } @@ -55,7 +55,7 @@ public Instance getInstance() { } /** - * Create a spawn instruction with a read request and send it to OmniLedger. + * Create a spawn instruction with a read request and send it to the ledger. */ private InstanceId read(ReadRequest rr, DarcId darcID, List signers) throws CothorityException { Argument arg = new Argument("read", rr.toProto().toByteArray()); @@ -65,14 +65,14 @@ private InstanceId read(ReadRequest rr, DarcId darcID, List signers) thr instr.signBy(darcID, signers); ClientTransaction tx = new ClientTransaction(Arrays.asList(instr)); - ol.sendTransactionAndWait(tx, 5); + bc.sendTransactionAndWait(tx, 5); return instr.deriveId(""); } // TODO same as what's in EventLogInstance, make a super class? private void setInstance(InstanceId id) throws CothorityException { - Proof p = ol.getProof(id); + Proof p = bc.getProof(id); Instance inst = new Instance(p); if (!inst.getContractId().equals(ContractId)) { logger.error("wrong instance: {}", inst.getContractId()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriteRequest.java b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriteRequest.java index 58c5b7b5be..78b82cc069 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriteRequest.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriteRequest.java @@ -1,8 +1,9 @@ package ch.epfl.dedis.lib.calypso; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; import ch.epfl.dedis.lib.crypto.*; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; +import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.proto.Calypso; import com.google.protobuf.ByteString; @@ -41,13 +42,16 @@ public WriteRequest(WriteRequest wr) { * Creates a new document from data, creates a new Darc, a symmetric symmetricKey and encrypts the data using * CBC-RSA. * - * @param data Plain text data that will be stored encrypted on OmniLedger. There is a 10MB-limit on how much + * @param data Plain text data that will be stored encrypted on the ledger. There is a 8 MB limit on how much * data can be stored. If you need more, this must be a pointer to an off-chain storage. * @param keylen The length of the symmetric key in bytes. We recommend using 32 bytes. * @param writerID The darc ID where this write request will be stored. * @throws CothorityCryptoException in the case the encryption doesn't work */ - public WriteRequest(byte[] data, int keylen, DarcId writerID) throws CothorityCryptoException { + public WriteRequest(byte[] data, int keylen, DarcId writerID) throws CothorityException { + if (data.length > 8000000) { + throw new CothorityException("data length too long"); + } Encryption.keyIv key = new Encryption.keyIv(keylen); this.keyMaterial = key.getKeyMaterial(); this.dataEnc = encryptData(data, keyMaterial); @@ -63,7 +67,7 @@ public WriteRequest(byte[] data, int keylen, DarcId writerID) throws CothorityCr * @param keylen The key length - 32 bytes is recommended. * @param writerID The darc ID where this write request will be stored. */ - public WriteRequest(String data, int keylen, DarcId writerID) throws CothorityCryptoException { + public WriteRequest(String data, int keylen, DarcId writerID) throws CothorityException { this(data.getBytes(), keylen, writerID); } @@ -76,7 +80,7 @@ public WriteRequest(String data, int keylen, DarcId writerID) throws CothorityCr * @param keyMaterial The symmetric key plus eventually an IV. This will be encrypted under the shared symmetricKey * of the cothority. * @param writerID The darc ID where this write request will be stored. - * @param extraData data that will _not be encrypted_ but will be visible in cleartext on OmniLedger. + * @param extraData data that will _not be encrypted_ but will be visible in cleartext on ByzCoin. */ public WriteRequest(byte[] dataEnc, byte[] keyMaterial, DarcId writerID, byte[] extraData) { diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriterInstance.java b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriterInstance.java index 19e5453f8b..d79481e494 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriterInstance.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/calypso/WriterInstance.java @@ -1,10 +1,10 @@ package ch.epfl.dedis.lib.calypso; +import ch.epfl.dedis.lib.byzcoin.*; +import ch.epfl.dedis.lib.byzcoin.darc.DarcId; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; import ch.epfl.dedis.lib.exception.CothorityException; import ch.epfl.dedis.lib.exception.CothorityNotFoundException; -import ch.epfl.dedis.lib.omniledger.*; -import ch.epfl.dedis.lib.omniledger.darc.DarcId; -import ch.epfl.dedis.lib.omniledger.darc.Signer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,12 +13,12 @@ /** * WriteInstance holds the data related to a write request. It is a representation of what is - * stored in OmniLedger. You can create it from an instanceID + * stored in ByzCoin. You can create it from an instanceID */ public class WriterInstance { private static String ContractId = "calypsoWrite"; private Instance instance; - private OmniledgerRPC ol; + private ByzCoinRPC bc; private CreateLTSReply ltsData; private final static Logger logger = LoggerFactory.getLogger(WriterInstance.class); @@ -26,15 +26,15 @@ public class WriterInstance { /** * Constructor for creating a new instance. * - * @param ol The OmniLedger RPC object which should be already running. + * @param bc The ByzCoinRPC object which should be already running. * @param signers The list of signers that are authorised to create the instance. * @param darcId The darc ID for which the signers belong. * @param ltsData The LTS data, must be created via the Calypso RPC call if it does not exist yet. * @param wr The WriteRequest object, to be stored in the instance. * @throws CothorityException */ - public WriterInstance(OmniledgerRPC ol, List signers, DarcId darcId, CreateLTSReply ltsData, WriteRequest wr) throws CothorityException { - this.ol = ol; + public WriterInstance(ByzCoinRPC bc, List signers, DarcId darcId, CreateLTSReply ltsData, WriteRequest wr) throws CothorityException { + this.bc = bc; this.ltsData = ltsData; InstanceId id = this.write(wr, darcId, signers); this.setInstance(id); @@ -43,13 +43,13 @@ public WriterInstance(OmniledgerRPC ol, List signers, DarcId darcId, Cre /** * Constructor to connect to an existing instance. * - * @param ol The OmniLedger RPC object which should be already running. + * @param bc The ByzCoinRPC object which should be already running. * @param id The ID of the instance to connect. * @param ltsData The LTS configuration. * @throws CothorityException */ - public WriterInstance(OmniledgerRPC ol, InstanceId id, CreateLTSReply ltsData) throws CothorityException { - this.ol = ol; + public WriterInstance(ByzCoinRPC bc, InstanceId id, CreateLTSReply ltsData) throws CothorityException { + this.bc = bc; this.setInstance(id); this.ltsData = new CreateLTSReply(ltsData); } @@ -69,7 +69,7 @@ public Instance getInstance() { } /** - * Create a spawn instruction with a write request and send it to OmniLedger. + * Create a spawn instruction with a write request and send it to the ledger. */ private InstanceId write(WriteRequest req, DarcId darcID, List signers) throws CothorityException { Argument arg = new Argument("write", req.toProto(this.ltsData.getX(), this.ltsData.getLtsID()).toByteArray()); @@ -79,14 +79,14 @@ private InstanceId write(WriteRequest req, DarcId darcID, List signers) instr.signBy(darcID, signers); ClientTransaction tx = new ClientTransaction(Arrays.asList(instr)); - ol.sendTransactionAndWait(tx, 5); + bc.sendTransactionAndWait(tx, 5); return instr.deriveId(""); } // TODO same as what's in EventLogInstance, make a super class? private void setInstance(InstanceId id) throws CothorityException { - Proof p = ol.getProof(id); + Proof p = bc.getProof(id); Instance inst = new Instance(p); if (!inst.getContractId().equals(ContractId)) { logger.error("wrong instance: {}", inst.getContractId()); diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/crypto/KeyPair.java b/external/java/src/main/java/ch/epfl/dedis/lib/crypto/KeyPair.java index 40b3e50a41..f3522ead1c 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/crypto/KeyPair.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/crypto/KeyPair.java @@ -1,7 +1,6 @@ package ch.epfl.dedis.lib.crypto; import java.security.SecureRandom; -import java.util.Random; public class KeyPair { public Scalar scalar; diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/eventlog/Event.java b/external/java/src/main/java/ch/epfl/dedis/lib/eventlog/Event.java index b9c2e86c71..af8f800833 100644 --- a/external/java/src/main/java/ch/epfl/dedis/lib/eventlog/Event.java +++ b/external/java/src/main/java/ch/epfl/dedis/lib/eventlog/Event.java @@ -3,7 +3,7 @@ import ch.epfl.dedis.proto.EventLogProto; /** - * An instance of an Event can be sent and stored by OmniLedger. + * An instance of an Event can be sent and stored by ByzCoin. */ public final class Event { private final long when; // in nano seconds diff --git a/external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerProto.java b/external/java/src/main/java/ch/epfl/dedis/proto/ByzCoinProto.java similarity index 81% rename from external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerProto.java rename to external/java/src/main/java/ch/epfl/dedis/proto/ByzCoinProto.java index 3a3a5c5bd7..17657dbd5b 100644 --- a/external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerProto.java +++ b/external/java/src/main/java/ch/epfl/dedis/proto/ByzCoinProto.java @@ -1,10 +1,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: omniledger.proto +// source: byzcoin.proto package ch.epfl.dedis.proto; -public final class OmniLedgerProto { - private OmniLedgerProto() {} +public final class ByzCoinProto { + private ByzCoinProto() {} public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -15,7 +15,7 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } public interface DataHeaderOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.DataHeader) + // @@protoc_insertion_point(interface_extends:byzcoin.DataHeader) com.google.protobuf.MessageOrBuilder { /** @@ -95,11 +95,11 @@ public interface DataHeaderOrBuilder extends * DataHeader is the data passed to the Skipchain * * - * Protobuf type {@code omniledger.DataHeader} + * Protobuf type {@code byzcoin.DataHeader} */ public static final class DataHeader extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.DataHeader) + // @@protoc_insertion_point(message_implements:byzcoin.DataHeader) DataHeaderOrBuilder { private static final long serialVersionUID = 0L; // Use DataHeader.newBuilder() to construct. @@ -178,14 +178,14 @@ private DataHeader( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataHeader_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataHeader_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataHeader_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataHeader_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.class, ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.DataHeader.class, ch.epfl.dedis.proto.ByzCoinProto.DataHeader.Builder.class); } private int bitField0_; @@ -359,10 +359,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.DataHeader)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.DataHeader)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader other = (ch.epfl.dedis.proto.OmniLedgerProto.DataHeader) obj; + ch.epfl.dedis.proto.ByzCoinProto.DataHeader other = (ch.epfl.dedis.proto.ByzCoinProto.DataHeader) obj; boolean result = true; result = result && (hasCollectionroot() == other.hasCollectionroot()); @@ -418,69 +418,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -492,7 +492,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.DataHeader prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.DataHeader prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -511,25 +511,25 @@ protected Builder newBuilderForType( * DataHeader is the data passed to the Skipchain * * - * Protobuf type {@code omniledger.DataHeader} + * Protobuf type {@code byzcoin.DataHeader} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.DataHeader) - ch.epfl.dedis.proto.OmniLedgerProto.DataHeaderOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.DataHeader) + ch.epfl.dedis.proto.ByzCoinProto.DataHeaderOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataHeader_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataHeader_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataHeader_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataHeader_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.class, ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.DataHeader.class, ch.epfl.dedis.proto.ByzCoinProto.DataHeader.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.DataHeader.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -559,23 +559,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataHeader_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataHeader_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataHeader getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.DataHeader getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.DataHeader.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.DataHeader build() { - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.DataHeader build() { + ch.epfl.dedis.proto.ByzCoinProto.DataHeader result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataHeader buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader result = new ch.epfl.dedis.proto.OmniLedgerProto.DataHeader(this); + public ch.epfl.dedis.proto.ByzCoinProto.DataHeader buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.DataHeader result = new ch.epfl.dedis.proto.ByzCoinProto.DataHeader(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -626,16 +626,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.DataHeader) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.DataHeader)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.DataHeader) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.DataHeader)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.DataHeader other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.DataHeader.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.DataHeader other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.DataHeader.getDefaultInstance()) return this; if (other.hasCollectionroot()) { setCollectionroot(other.getCollectionroot()); } @@ -673,11 +673,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.DataHeader parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.DataHeader parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.DataHeader) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.DataHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -907,16 +907,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.DataHeader) + // @@protoc_insertion_point(builder_scope:byzcoin.DataHeader) } - // @@protoc_insertion_point(class_scope:omniledger.DataHeader) - private static final ch.epfl.dedis.proto.OmniLedgerProto.DataHeader DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.DataHeader) + private static final ch.epfl.dedis.proto.ByzCoinProto.DataHeader DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.DataHeader(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.DataHeader(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataHeader getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.DataHeader getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -939,38 +939,38 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataHeader getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.DataHeader getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface DataBodyOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.DataBody) + // @@protoc_insertion_point(interface_extends:byzcoin.DataBody) com.google.protobuf.MessageOrBuilder { /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - java.util.List + java.util.List getTxresultsList(); /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.TxResult getTxresults(int index); + ch.epfl.dedis.proto.ByzCoinProto.TxResult getTxresults(int index); /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ int getTxresultsCount(); /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - java.util.List + java.util.List getTxresultsOrBuilderList(); /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuilder( + ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder getTxresultsOrBuilder( int index); } /** @@ -979,11 +979,11 @@ ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuilder( * in the DataHeader. * * - * Protobuf type {@code omniledger.DataBody} + * Protobuf type {@code byzcoin.DataBody} */ public static final class DataBody extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.DataBody) + // @@protoc_insertion_point(message_implements:byzcoin.DataBody) DataBodyOrBuilder { private static final long serialVersionUID = 0L; // Use DataBody.newBuilder() to construct. @@ -1027,11 +1027,11 @@ private DataBody( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - txresults_ = new java.util.ArrayList(); + txresults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } txresults_.add( - input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.TxResult.PARSER, extensionRegistry)); + input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.TxResult.PARSER, extensionRegistry)); break; } } @@ -1051,47 +1051,47 @@ private DataBody( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataBody_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataBody_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataBody_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataBody_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.DataBody.class, ch.epfl.dedis.proto.OmniLedgerProto.DataBody.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.DataBody.class, ch.epfl.dedis.proto.ByzCoinProto.DataBody.Builder.class); } public static final int TXRESULTS_FIELD_NUMBER = 1; - private java.util.List txresults_; + private java.util.List txresults_; /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public java.util.List getTxresultsList() { + public java.util.List getTxresultsList() { return txresults_; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public java.util.List + public java.util.List getTxresultsOrBuilderList() { return txresults_; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public int getTxresultsCount() { return txresults_.size(); } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult getTxresults(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.TxResult getTxresults(int index) { return txresults_.get(index); } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder getTxresultsOrBuilder( int index) { return txresults_.get(index); } @@ -1139,10 +1139,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.DataBody)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.DataBody)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.DataBody other = (ch.epfl.dedis.proto.OmniLedgerProto.DataBody) obj; + ch.epfl.dedis.proto.ByzCoinProto.DataBody other = (ch.epfl.dedis.proto.ByzCoinProto.DataBody) obj; boolean result = true; result = result && getTxresultsList() @@ -1167,69 +1167,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1241,7 +1241,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.DataBody prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.DataBody prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -1261,25 +1261,25 @@ protected Builder newBuilderForType( * in the DataHeader. * * - * Protobuf type {@code omniledger.DataBody} + * Protobuf type {@code byzcoin.DataBody} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.DataBody) - ch.epfl.dedis.proto.OmniLedgerProto.DataBodyOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.DataBody) + ch.epfl.dedis.proto.ByzCoinProto.DataBodyOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataBody_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataBody_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataBody_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataBody_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.DataBody.class, ch.epfl.dedis.proto.OmniLedgerProto.DataBody.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.DataBody.class, ch.epfl.dedis.proto.ByzCoinProto.DataBody.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.DataBody.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.DataBody.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1308,23 +1308,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_DataBody_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_DataBody_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataBody getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.DataBody.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.DataBody getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.DataBody.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.DataBody build() { - ch.epfl.dedis.proto.OmniLedgerProto.DataBody result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.DataBody build() { + ch.epfl.dedis.proto.ByzCoinProto.DataBody result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataBody buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.DataBody result = new ch.epfl.dedis.proto.OmniLedgerProto.DataBody(this); + public ch.epfl.dedis.proto.ByzCoinProto.DataBody buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.DataBody result = new ch.epfl.dedis.proto.ByzCoinProto.DataBody(this); int from_bitField0_ = bitField0_; if (txresultsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1366,16 +1366,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.DataBody) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.DataBody)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.DataBody) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.DataBody)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.DataBody other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.DataBody.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.DataBody other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.DataBody.getDefaultInstance()) return this; if (txresultsBuilder_ == null) { if (!other.txresults_.isEmpty()) { if (txresults_.isEmpty()) { @@ -1420,11 +1420,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.DataBody parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.DataBody parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.DataBody) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.DataBody) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -1435,22 +1435,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List txresults_ = + private java.util.List txresults_ = java.util.Collections.emptyList(); private void ensureTxresultsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - txresults_ = new java.util.ArrayList(txresults_); + txresults_ = new java.util.ArrayList(txresults_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.TxResult, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder, ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder> txresultsBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.TxResult, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder, ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder> txresultsBuilder_; /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public java.util.List getTxresultsList() { + public java.util.List getTxresultsList() { if (txresultsBuilder_ == null) { return java.util.Collections.unmodifiableList(txresults_); } else { @@ -1458,7 +1458,7 @@ public java.util.List getTxresults } } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public int getTxresultsCount() { if (txresultsBuilder_ == null) { @@ -1468,9 +1468,9 @@ public int getTxresultsCount() { } } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult getTxresults(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.TxResult getTxresults(int index) { if (txresultsBuilder_ == null) { return txresults_.get(index); } else { @@ -1478,10 +1478,10 @@ public ch.epfl.dedis.proto.OmniLedgerProto.TxResult getTxresults(int index) { } } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder setTxresults( - int index, ch.epfl.dedis.proto.OmniLedgerProto.TxResult value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.TxResult value) { if (txresultsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1495,10 +1495,10 @@ public Builder setTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder setTxresults( - int index, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder builderForValue) { if (txresultsBuilder_ == null) { ensureTxresultsIsMutable(); txresults_.set(index, builderForValue.build()); @@ -1509,9 +1509,9 @@ public Builder setTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public Builder addTxresults(ch.epfl.dedis.proto.OmniLedgerProto.TxResult value) { + public Builder addTxresults(ch.epfl.dedis.proto.ByzCoinProto.TxResult value) { if (txresultsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1525,10 +1525,10 @@ public Builder addTxresults(ch.epfl.dedis.proto.OmniLedgerProto.TxResult value) return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder addTxresults( - int index, ch.epfl.dedis.proto.OmniLedgerProto.TxResult value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.TxResult value) { if (txresultsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1542,10 +1542,10 @@ public Builder addTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder addTxresults( - ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder builderForValue) { if (txresultsBuilder_ == null) { ensureTxresultsIsMutable(); txresults_.add(builderForValue.build()); @@ -1556,10 +1556,10 @@ public Builder addTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder addTxresults( - int index, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder builderForValue) { if (txresultsBuilder_ == null) { ensureTxresultsIsMutable(); txresults_.add(index, builderForValue.build()); @@ -1570,10 +1570,10 @@ public Builder addTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder addAllTxresults( - java.lang.Iterable values) { + java.lang.Iterable values) { if (txresultsBuilder_ == null) { ensureTxresultsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1585,7 +1585,7 @@ public Builder addAllTxresults( return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder clearTxresults() { if (txresultsBuilder_ == null) { @@ -1598,7 +1598,7 @@ public Builder clearTxresults() { return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ public Builder removeTxresults(int index) { if (txresultsBuilder_ == null) { @@ -1611,16 +1611,16 @@ public Builder removeTxresults(int index) { return this; } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder getTxresultsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder getTxresultsBuilder( int index) { return getTxresultsFieldBuilder().getBuilder(index); } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder getTxresultsOrBuilder( int index) { if (txresultsBuilder_ == null) { return txresults_.get(index); } else { @@ -1628,9 +1628,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuild } } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public java.util.List + public java.util.List getTxresultsOrBuilderList() { if (txresultsBuilder_ != null) { return txresultsBuilder_.getMessageOrBuilderList(); @@ -1639,33 +1639,33 @@ public ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder getTxresultsOrBuild } } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder addTxresultsBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder addTxresultsBuilder() { return getTxresultsFieldBuilder().addBuilder( - ch.epfl.dedis.proto.OmniLedgerProto.TxResult.getDefaultInstance()); + ch.epfl.dedis.proto.ByzCoinProto.TxResult.getDefaultInstance()); } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder addTxresultsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder addTxresultsBuilder( int index) { return getTxresultsFieldBuilder().addBuilder( - index, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.getDefaultInstance()); + index, ch.epfl.dedis.proto.ByzCoinProto.TxResult.getDefaultInstance()); } /** - * repeated .omniledger.TxResult txresults = 1; + * repeated .byzcoin.TxResult txresults = 1; */ - public java.util.List + public java.util.List getTxresultsBuilderList() { return getTxresultsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.TxResult, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder, ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.TxResult, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder, ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder> getTxresultsFieldBuilder() { if (txresultsBuilder_ == null) { txresultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.TxResult, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder, ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.TxResult, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder, ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder>( txresults_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -1685,16 +1685,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.DataBody) + // @@protoc_insertion_point(builder_scope:byzcoin.DataBody) } - // @@protoc_insertion_point(class_scope:omniledger.DataBody) - private static final ch.epfl.dedis.proto.OmniLedgerProto.DataBody DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.DataBody) + private static final ch.epfl.dedis.proto.ByzCoinProto.DataBody DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.DataBody(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.DataBody(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.DataBody getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.DataBody getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1717,14 +1717,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.DataBody getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.DataBody getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface CreateGenesisBlockOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.CreateGenesisBlock) + // @@protoc_insertion_point(interface_extends:byzcoin.CreateGenesisBlock) com.google.protobuf.MessageOrBuilder { /** @@ -1833,11 +1833,11 @@ public interface CreateGenesisBlockOrBuilder extends * CreateGenesisBlock asks the cisc-service to set up a new skipchain. * * - * Protobuf type {@code omniledger.CreateGenesisBlock} + * Protobuf type {@code byzcoin.CreateGenesisBlock} */ public static final class CreateGenesisBlock extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.CreateGenesisBlock) + // @@protoc_insertion_point(message_implements:byzcoin.CreateGenesisBlock) CreateGenesisBlockOrBuilder { private static final long serialVersionUID = 0L; // Use CreateGenesisBlock.newBuilder() to construct. @@ -1936,14 +1936,14 @@ private CreateGenesisBlock( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlock_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlock_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlock_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlock_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.class, ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.class, ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.Builder.class); } private int bitField0_; @@ -2171,10 +2171,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock other = (ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock) obj; + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock other = (ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -2239,69 +2239,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2313,7 +2313,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -2332,25 +2332,25 @@ protected Builder newBuilderForType( * CreateGenesisBlock asks the cisc-service to set up a new skipchain. * * - * Protobuf type {@code omniledger.CreateGenesisBlock} + * Protobuf type {@code byzcoin.CreateGenesisBlock} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.CreateGenesisBlock) - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.CreateGenesisBlock) + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlock_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlock_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlock_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlock_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.class, ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.class, ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2392,23 +2392,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlock_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlock_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock build() { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock build() { + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock result = new ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock(this); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock result = new ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2471,16 +2471,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -2527,11 +2527,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -3004,16 +3004,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.CreateGenesisBlock) + // @@protoc_insertion_point(builder_scope:byzcoin.CreateGenesisBlock) } - // @@protoc_insertion_point(class_scope:omniledger.CreateGenesisBlock) - private static final ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.CreateGenesisBlock) + private static final ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3036,14 +3036,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlock getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlock getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface CreateGenesisBlockResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.CreateGenesisBlockResponse) + // @@protoc_insertion_point(interface_extends:byzcoin.CreateGenesisBlockResponse) com.google.protobuf.MessageOrBuilder { /** @@ -3093,11 +3093,11 @@ public interface CreateGenesisBlockResponseOrBuilder extends * CreateGenesisBlockResponse holds the genesis-block of the new skipchain. * * - * Protobuf type {@code omniledger.CreateGenesisBlockResponse} + * Protobuf type {@code byzcoin.CreateGenesisBlockResponse} */ public static final class CreateGenesisBlockResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.CreateGenesisBlockResponse) + // @@protoc_insertion_point(message_implements:byzcoin.CreateGenesisBlockResponse) CreateGenesisBlockResponseOrBuilder { private static final long serialVersionUID = 0L; // Use CreateGenesisBlockResponse.newBuilder() to construct. @@ -3171,14 +3171,14 @@ private CreateGenesisBlockResponse( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlockResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlockResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlockResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlockResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.class, ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.Builder.class); } private int bitField0_; @@ -3292,10 +3292,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse other = (ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse) obj; + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse other = (ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -3332,69 +3332,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3406,7 +3406,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse par public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -3425,25 +3425,25 @@ protected Builder newBuilderForType( * CreateGenesisBlockResponse holds the genesis-block of the new skipchain. * * - * Protobuf type {@code omniledger.CreateGenesisBlockResponse} + * Protobuf type {@code byzcoin.CreateGenesisBlockResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.CreateGenesisBlockResponse) - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.CreateGenesisBlockResponse) + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlockResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlockResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlockResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlockResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.class, ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3474,23 +3474,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_CreateGenesisBlockResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_CreateGenesisBlockResponse_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse build() { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse build() { + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse result = new ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse(this); + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse result = new ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3537,16 +3537,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -3574,11 +3574,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -3801,16 +3801,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.CreateGenesisBlockResponse) + // @@protoc_insertion_point(builder_scope:byzcoin.CreateGenesisBlockResponse) } - // @@protoc_insertion_point(class_scope:omniledger.CreateGenesisBlockResponse) - private static final ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.CreateGenesisBlockResponse) + private static final ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3833,14 +3833,14 @@ public com.google.protobuf.Parser getParserForType() return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.CreateGenesisBlockResponse getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.CreateGenesisBlockResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface AddTxRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.AddTxRequest) + // @@protoc_insertion_point(interface_extends:byzcoin.AddTxRequest) com.google.protobuf.MessageOrBuilder { /** @@ -3882,7 +3882,7 @@ public interface AddTxRequestOrBuilder extends * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ boolean hasTransaction(); /** @@ -3890,17 +3890,17 @@ public interface AddTxRequestOrBuilder extends * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getTransaction(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getTransaction(); /** *

      * Transaction to be applied to the kv-store
      * 
* - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getTransactionOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getTransactionOrBuilder(); /** *
@@ -3926,11 +3926,11 @@ public interface AddTxRequestOrBuilder extends
    * AddTxRequest requests to apply a new transaction to the ledger.
    * 
* - * Protobuf type {@code omniledger.AddTxRequest} + * Protobuf type {@code byzcoin.AddTxRequest} */ public static final class AddTxRequest extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.AddTxRequest) + // @@protoc_insertion_point(message_implements:byzcoin.AddTxRequest) AddTxRequestOrBuilder { private static final long serialVersionUID = 0L; // Use AddTxRequest.newBuilder() to construct. @@ -3985,11 +3985,11 @@ private AddTxRequest( break; } case 26: { - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = transaction_.toBuilder(); } - transaction_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.PARSER, extensionRegistry); + transaction_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(transaction_); transaction_ = subBuilder.buildPartial(); @@ -4016,14 +4016,14 @@ private AddTxRequest( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxRequest_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxRequest_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxRequest_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.class, ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.class, ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.Builder.class); } private int bitField0_; @@ -4074,13 +4074,13 @@ public com.google.protobuf.ByteString getSkipchainid() { } public static final int TRANSACTION_FIELD_NUMBER = 3; - private ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction transaction_; + private ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction transaction_; /** *
      * Transaction to be applied to the kv-store
      * 
* - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ public boolean hasTransaction() { return ((bitField0_ & 0x00000004) == 0x00000004); @@ -4090,20 +4090,20 @@ public boolean hasTransaction() { * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getTransaction() { - return transaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : transaction_; + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getTransaction() { + return transaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : transaction_; } /** *
      * Transaction to be applied to the kv-store
      * 
* - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getTransactionOrBuilder() { - return transaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : transaction_; + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getTransactionOrBuilder() { + return transaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : transaction_; } public static final int INCLUSIONWAIT_FIELD_NUMBER = 4; @@ -4205,10 +4205,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest other = (ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest) obj; + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest other = (ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -4263,69 +4263,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4337,7 +4337,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -4356,25 +4356,25 @@ protected Builder newBuilderForType( * AddTxRequest requests to apply a new transaction to the ledger. * * - * Protobuf type {@code omniledger.AddTxRequest} + * Protobuf type {@code byzcoin.AddTxRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.AddTxRequest) - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.AddTxRequest) + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxRequest_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxRequest_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxRequest_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.class, ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.class, ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4409,23 +4409,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxRequest_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxRequest_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest build() { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest build() { + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest result = new ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest(this); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest result = new ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4480,16 +4480,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -4527,11 +4527,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4641,15 +4641,15 @@ public Builder clearSkipchainid() { return this; } - private ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction transaction_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction transaction_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder> transactionBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder> transactionBuilder_; /** *
        * Transaction to be applied to the kv-store
        * 
* - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ public boolean hasTransaction() { return ((bitField0_ & 0x00000004) == 0x00000004); @@ -4659,11 +4659,11 @@ public boolean hasTransaction() { * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getTransaction() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getTransaction() { if (transactionBuilder_ == null) { - return transaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : transaction_; + return transaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : transaction_; } else { return transactionBuilder_.getMessage(); } @@ -4673,9 +4673,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getTransaction() { * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public Builder setTransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction value) { + public Builder setTransaction(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction value) { if (transactionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4693,10 +4693,10 @@ public Builder setTransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransact * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ public Builder setTransaction( - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder builderForValue) { if (transactionBuilder_ == null) { transaction_ = builderForValue.build(); onChanged(); @@ -4711,15 +4711,15 @@ public Builder setTransaction( * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public Builder mergeTransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction value) { + public Builder mergeTransaction(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction value) { if (transactionBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && transaction_ != null && - transaction_ != ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance()) { + transaction_ != ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance()) { transaction_ = - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.newBuilder(transaction_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.newBuilder(transaction_).mergeFrom(value).buildPartial(); } else { transaction_ = value; } @@ -4735,7 +4735,7 @@ public Builder mergeTransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransa * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ public Builder clearTransaction() { if (transactionBuilder_ == null) { @@ -4752,9 +4752,9 @@ public Builder clearTransaction() { * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder getTransactionBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder getTransactionBuilder() { bitField0_ |= 0x00000004; onChanged(); return getTransactionFieldBuilder().getBuilder(); @@ -4764,14 +4764,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder getTransact * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getTransactionOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getTransactionOrBuilder() { if (transactionBuilder_ != null) { return transactionBuilder_.getMessageOrBuilder(); } else { return transaction_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : transaction_; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : transaction_; } } /** @@ -4779,14 +4779,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getTransac * Transaction to be applied to the kv-store * * - * required .omniledger.ClientTransaction transaction = 3; + * required .byzcoin.ClientTransaction transaction = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder> getTransactionFieldBuilder() { if (transactionBuilder_ == null) { transactionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder>( getTransaction(), getParentForChildren(), isClean()); @@ -4857,16 +4857,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.AddTxRequest) + // @@protoc_insertion_point(builder_scope:byzcoin.AddTxRequest) } - // @@protoc_insertion_point(class_scope:omniledger.AddTxRequest) - private static final ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.AddTxRequest) + private static final ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -4889,14 +4889,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxRequest getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.AddTxRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface AddTxResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.AddTxResponse) + // @@protoc_insertion_point(interface_extends:byzcoin.AddTxResponse) com.google.protobuf.MessageOrBuilder { /** @@ -4921,11 +4921,11 @@ public interface AddTxResponseOrBuilder extends * AddTxResponse is the reply after an AddTxRequest is finished. * * - * Protobuf type {@code omniledger.AddTxResponse} + * Protobuf type {@code byzcoin.AddTxResponse} */ public static final class AddTxResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.AddTxResponse) + // @@protoc_insertion_point(message_implements:byzcoin.AddTxResponse) AddTxResponseOrBuilder { private static final long serialVersionUID = 0L; // Use AddTxResponse.newBuilder() to construct. @@ -4986,14 +4986,14 @@ private AddTxResponse( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.class, ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.Builder.class); } private int bitField0_; @@ -5061,10 +5061,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse other = (ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse) obj; + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse other = (ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -5092,69 +5092,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5166,7 +5166,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -5185,25 +5185,25 @@ protected Builder newBuilderForType( * AddTxResponse is the reply after an AddTxRequest is finished. * * - * Protobuf type {@code omniledger.AddTxResponse} + * Protobuf type {@code byzcoin.AddTxResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.AddTxResponse) - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.AddTxResponse) + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.class, ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5227,23 +5227,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_AddTxResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_AddTxResponse_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse build() { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse build() { + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse result = new ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse(this); + public ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse result = new ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5282,16 +5282,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -5311,11 +5311,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -5384,16 +5384,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.AddTxResponse) + // @@protoc_insertion_point(builder_scope:byzcoin.AddTxResponse) } - // @@protoc_insertion_point(class_scope:omniledger.AddTxResponse) - private static final ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.AddTxResponse) + private static final ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -5416,14 +5416,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.AddTxResponse getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.AddTxResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface GetProofOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.GetProof) + // @@protoc_insertion_point(interface_extends:byzcoin.GetProof) com.google.protobuf.MessageOrBuilder { /** @@ -5484,11 +5484,11 @@ public interface GetProofOrBuilder extends * GetProof returns the proof that the given key is in the collection. * * - * Protobuf type {@code omniledger.GetProof} + * Protobuf type {@code byzcoin.GetProof} */ public static final class GetProof extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.GetProof) + // @@protoc_insertion_point(message_implements:byzcoin.GetProof) GetProofOrBuilder { private static final long serialVersionUID = 0L; // Use GetProof.newBuilder() to construct. @@ -5561,14 +5561,14 @@ private GetProof( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProof_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProof_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProof_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.GetProof.class, ch.epfl.dedis.proto.OmniLedgerProto.GetProof.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.GetProof.class, ch.epfl.dedis.proto.ByzCoinProto.GetProof.Builder.class); } private int bitField0_; @@ -5706,10 +5706,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.GetProof)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.GetProof)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.GetProof other = (ch.epfl.dedis.proto.OmniLedgerProto.GetProof) obj; + ch.epfl.dedis.proto.ByzCoinProto.GetProof other = (ch.epfl.dedis.proto.ByzCoinProto.GetProof) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -5755,69 +5755,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5829,7 +5829,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.GetProof prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.GetProof prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -5848,25 +5848,25 @@ protected Builder newBuilderForType( * GetProof returns the proof that the given key is in the collection. * * - * Protobuf type {@code omniledger.GetProof} + * Protobuf type {@code byzcoin.GetProof} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.GetProof) - ch.epfl.dedis.proto.OmniLedgerProto.GetProofOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.GetProof) + ch.epfl.dedis.proto.ByzCoinProto.GetProofOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProof_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProof_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProof_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.GetProof.class, ch.epfl.dedis.proto.OmniLedgerProto.GetProof.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.GetProof.class, ch.epfl.dedis.proto.ByzCoinProto.GetProof.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.GetProof.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.GetProof.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5894,23 +5894,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProof_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProof getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.GetProof.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.GetProof getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.GetProof.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProof build() { - ch.epfl.dedis.proto.OmniLedgerProto.GetProof result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.GetProof build() { + ch.epfl.dedis.proto.ByzCoinProto.GetProof result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProof buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.GetProof result = new ch.epfl.dedis.proto.OmniLedgerProto.GetProof(this); + public ch.epfl.dedis.proto.ByzCoinProto.GetProof buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.GetProof result = new ch.epfl.dedis.proto.ByzCoinProto.GetProof(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5957,16 +5957,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.GetProof) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.GetProof)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.GetProof) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.GetProof)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.GetProof other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.GetProof.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.GetProof other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.GetProof.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -5998,11 +5998,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.GetProof parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.GetProof parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.GetProof) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.GetProof) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -6177,16 +6177,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.GetProof) + // @@protoc_insertion_point(builder_scope:byzcoin.GetProof) } - // @@protoc_insertion_point(class_scope:omniledger.GetProof) - private static final ch.epfl.dedis.proto.OmniLedgerProto.GetProof DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.GetProof) + private static final ch.epfl.dedis.proto.ByzCoinProto.GetProof DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.GetProof(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.GetProof(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProof getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.GetProof getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -6209,14 +6209,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProof getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.GetProof getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface GetProofResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.GetProofResponse) + // @@protoc_insertion_point(interface_extends:byzcoin.GetProofResponse) com.google.protobuf.MessageOrBuilder { /** @@ -6242,7 +6242,7 @@ public interface GetProofResponseOrBuilder extends * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ boolean hasProof(); /** @@ -6251,18 +6251,18 @@ public interface GetProofResponseOrBuilder extends * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.Proof getProof(); + ch.epfl.dedis.proto.ByzCoinProto.Proof getProof(); /** *
      * Proof contains everything necessary to prove the inclusion
      * of the included key/value pair given a genesis skipblock.
      * 
* - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getProofOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getProofOrBuilder(); } /** *
@@ -6270,11 +6270,11 @@ public interface GetProofResponseOrBuilder extends
    * the returned key/value pair is in the collection.
    * 
* - * Protobuf type {@code omniledger.GetProofResponse} + * Protobuf type {@code byzcoin.GetProofResponse} */ public static final class GetProofResponse extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.GetProofResponse) + // @@protoc_insertion_point(message_implements:byzcoin.GetProofResponse) GetProofResponseOrBuilder { private static final long serialVersionUID = 0L; // Use GetProofResponse.newBuilder() to construct. @@ -6322,11 +6322,11 @@ private GetProofResponse( break; } case 18: { - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = proof_.toBuilder(); } - proof_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Proof.PARSER, extensionRegistry); + proof_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Proof.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(proof_); proof_ = subBuilder.buildPartial(); @@ -6348,14 +6348,14 @@ private GetProofResponse( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProofResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProofResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProofResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProofResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.class, ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.Builder.class); } private int bitField0_; @@ -6383,14 +6383,14 @@ public int getVersion() { } public static final int PROOF_FIELD_NUMBER = 2; - private ch.epfl.dedis.proto.OmniLedgerProto.Proof proof_; + private ch.epfl.dedis.proto.ByzCoinProto.Proof proof_; /** *
      * Proof contains everything necessary to prove the inclusion
      * of the included key/value pair given a genesis skipblock.
      * 
* - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ public boolean hasProof() { return ((bitField0_ & 0x00000002) == 0x00000002); @@ -6401,10 +6401,10 @@ public boolean hasProof() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getProof() { - return proof_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : proof_; + public ch.epfl.dedis.proto.ByzCoinProto.Proof getProof() { + return proof_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : proof_; } /** *
@@ -6412,10 +6412,10 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof getProof() {
      * of the included key/value pair given a genesis skipblock.
      * 
* - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getProofOrBuilder() { - return proof_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : proof_; + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getProofOrBuilder() { + return proof_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : proof_; } private byte memoizedIsInitialized = -1; @@ -6474,10 +6474,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse other = (ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse) obj; + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse other = (ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse) obj; boolean result = true; result = result && (hasVersion() == other.hasVersion()); @@ -6514,69 +6514,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6588,7 +6588,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -6608,25 +6608,25 @@ protected Builder newBuilderForType( * the returned key/value pair is in the collection. * * - * Protobuf type {@code omniledger.GetProofResponse} + * Protobuf type {@code byzcoin.GetProofResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.GetProofResponse) - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.GetProofResponse) + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProofResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProofResponse_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProofResponse_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProofResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.class, ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.class, ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6657,23 +6657,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_GetProofResponse_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_GetProofResponse_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse build() { - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse build() { + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse result = new ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse(this); + public ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse result = new ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6720,16 +6720,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse.getDefaultInstance()) return this; if (other.hasVersion()) { setVersion(other.getVersion()); } @@ -6758,11 +6758,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -6821,16 +6821,16 @@ public Builder clearVersion() { return this; } - private ch.epfl.dedis.proto.OmniLedgerProto.Proof proof_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Proof proof_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> proofBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> proofBuilder_; /** *
        * Proof contains everything necessary to prove the inclusion
        * of the included key/value pair given a genesis skipblock.
        * 
* - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ public boolean hasProof() { return ((bitField0_ & 0x00000002) == 0x00000002); @@ -6841,11 +6841,11 @@ public boolean hasProof() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getProof() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof getProof() { if (proofBuilder_ == null) { - return proof_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : proof_; + return proof_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : proof_; } else { return proofBuilder_.getMessage(); } @@ -6856,9 +6856,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof getProof() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public Builder setProof(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder setProof(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (proofBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6877,10 +6877,10 @@ public Builder setProof(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ public Builder setProof( - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder builderForValue) { if (proofBuilder_ == null) { proof_ = builderForValue.build(); onChanged(); @@ -6896,15 +6896,15 @@ public Builder setProof( * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public Builder mergeProof(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder mergeProof(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (proofBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && proof_ != null && - proof_ != ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance()) { + proof_ != ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance()) { proof_ = - ch.epfl.dedis.proto.OmniLedgerProto.Proof.newBuilder(proof_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Proof.newBuilder(proof_).mergeFrom(value).buildPartial(); } else { proof_ = value; } @@ -6921,7 +6921,7 @@ public Builder mergeProof(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ public Builder clearProof() { if (proofBuilder_ == null) { @@ -6939,9 +6939,9 @@ public Builder clearProof() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getProofBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder getProofBuilder() { bitField0_ |= 0x00000002; onChanged(); return getProofFieldBuilder().getBuilder(); @@ -6952,14 +6952,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getProofBuilder() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getProofOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getProofOrBuilder() { if (proofBuilder_ != null) { return proofBuilder_.getMessageOrBuilder(); } else { return proof_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : proof_; + ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : proof_; } } /** @@ -6968,14 +6968,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getProofOrBuilder() { * of the included key/value pair given a genesis skipblock. * * - * required .omniledger.Proof proof = 2; + * required .byzcoin.Proof proof = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> getProofFieldBuilder() { if (proofBuilder_ == null) { proofBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder>( getProof(), getParentForChildren(), isClean()); @@ -6994,16 +6994,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.GetProofResponse) + // @@protoc_insertion_point(builder_scope:byzcoin.GetProofResponse) } - // @@protoc_insertion_point(class_scope:omniledger.GetProofResponse) - private static final ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.GetProofResponse) + private static final ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -7026,14 +7026,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.GetProofResponse getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.GetProofResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ChainConfigOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.ChainConfig) + // @@protoc_insertion_point(interface_extends:byzcoin.ChainConfig) com.google.protobuf.MessageOrBuilder { /** @@ -7074,11 +7074,11 @@ public interface ChainConfigOrBuilder extends * GenesisDarcID is the value of GenesisReferenceID. * * - * Protobuf type {@code omniledger.ChainConfig} + * Protobuf type {@code byzcoin.ChainConfig} */ public static final class ChainConfig extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.ChainConfig) + // @@protoc_insertion_point(message_implements:byzcoin.ChainConfig) ChainConfigOrBuilder { private static final long serialVersionUID = 0L; // Use ChainConfig.newBuilder() to construct. @@ -7158,14 +7158,14 @@ private ChainConfig( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ChainConfig_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ChainConfig_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ChainConfig_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ChainConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.class, ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.class, ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.Builder.class); } private int bitField0_; @@ -7287,10 +7287,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.ChainConfig)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig other = (ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig) obj; + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig other = (ch.epfl.dedis.proto.ByzCoinProto.ChainConfig) obj; boolean result = true; result = result && (hasBlockinterval() == other.hasBlockinterval()); @@ -7337,69 +7337,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7411,7 +7411,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.ChainConfig prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -7432,25 +7432,25 @@ protected Builder newBuilderForType( * GenesisDarcID is the value of GenesisReferenceID. * * - * Protobuf type {@code omniledger.ChainConfig} + * Protobuf type {@code byzcoin.ChainConfig} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.ChainConfig) - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfigOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.ChainConfig) + ch.epfl.dedis.proto.ByzCoinProto.ChainConfigOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ChainConfig_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ChainConfig_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ChainConfig_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ChainConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.class, ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.class, ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7483,23 +7483,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ChainConfig_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ChainConfig_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.ChainConfig getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig build() { - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.ChainConfig build() { + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig result = new ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig(this); + public ch.epfl.dedis.proto.ByzCoinProto.ChainConfig buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig result = new ch.epfl.dedis.proto.ByzCoinProto.ChainConfig(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7550,16 +7550,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.ChainConfig) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.ChainConfig)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.ChainConfig other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.ChainConfig.getDefaultInstance()) return this; if (other.hasBlockinterval()) { setBlockinterval(other.getBlockinterval()); } @@ -7594,11 +7594,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.ChainConfig parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.ChainConfig) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -7801,16 +7801,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.ChainConfig) + // @@protoc_insertion_point(builder_scope:byzcoin.ChainConfig) } - // @@protoc_insertion_point(class_scope:omniledger.ChainConfig) - private static final ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.ChainConfig) + private static final ch.epfl.dedis.proto.ByzCoinProto.ChainConfig DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.ChainConfig(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.ChainConfig getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -7833,14 +7833,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.ChainConfig getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.ChainConfig getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ProofOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Proof) + // @@protoc_insertion_point(interface_extends:byzcoin.Proof) com.google.protobuf.MessageOrBuilder { /** @@ -7959,11 +7959,11 @@ ch.epfl.dedis.proto.SkipchainProto.ForwardLinkOrBuilder getLinksOrBuilder( * This Structure could later be moved to cothority/skipchain. * * - * Protobuf type {@code omniledger.Proof} + * Protobuf type {@code byzcoin.Proof} */ public static final class Proof extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Proof) + // @@protoc_insertion_point(message_implements:byzcoin.Proof) ProofOrBuilder { private static final long serialVersionUID = 0L; // Use Proof.newBuilder() to construct. @@ -8057,14 +8057,14 @@ private Proof( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Proof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Proof_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Proof_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Proof_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Proof.class, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Proof.class, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder.class); } private int bitField0_; @@ -8272,10 +8272,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Proof)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Proof)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Proof other = (ch.epfl.dedis.proto.OmniLedgerProto.Proof) obj; + ch.epfl.dedis.proto.ByzCoinProto.Proof other = (ch.epfl.dedis.proto.ByzCoinProto.Proof) obj; boolean result = true; result = result && (hasInclusionproof() == other.hasInclusionproof()); @@ -8318,69 +8318,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Proof parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8392,7 +8392,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Proof parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Proof prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Proof prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -8418,25 +8418,25 @@ protected Builder newBuilderForType( * This Structure could later be moved to cothority/skipchain. * * - * Protobuf type {@code omniledger.Proof} + * Protobuf type {@code byzcoin.Proof} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Proof) - ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Proof) + ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Proof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Proof_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Proof_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Proof_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Proof.class, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Proof.class, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Proof.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Proof.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8479,23 +8479,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Proof_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Proof_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Proof getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Proof build() { - ch.epfl.dedis.proto.OmniLedgerProto.Proof result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Proof build() { + ch.epfl.dedis.proto.ByzCoinProto.Proof result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Proof buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Proof result = new ch.epfl.dedis.proto.OmniLedgerProto.Proof(this); + public ch.epfl.dedis.proto.ByzCoinProto.Proof buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Proof result = new ch.epfl.dedis.proto.ByzCoinProto.Proof(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8555,16 +8555,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Proof) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Proof)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Proof) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Proof)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Proof other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Proof other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance()) return this; if (other.hasInclusionproof()) { mergeInclusionproof(other.getInclusionproof()); } @@ -8627,11 +8627,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Proof parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Proof parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Proof) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Proof) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -9308,16 +9308,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Proof) + // @@protoc_insertion_point(builder_scope:byzcoin.Proof) } - // @@protoc_insertion_point(class_scope:omniledger.Proof) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Proof DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Proof) + private static final ch.epfl.dedis.proto.ByzCoinProto.Proof DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Proof(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Proof(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Proof getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Proof getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -9340,14 +9340,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface InstructionOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Instruction) + // @@protoc_insertion_point(interface_extends:byzcoin.Instruction) com.google.protobuf.MessageOrBuilder { /** @@ -9433,7 +9433,7 @@ public interface InstructionOrBuilder extends * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ boolean hasSpawn(); /** @@ -9441,24 +9441,24 @@ public interface InstructionOrBuilder extends * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - ch.epfl.dedis.proto.OmniLedgerProto.Spawn getSpawn(); + ch.epfl.dedis.proto.ByzCoinProto.Spawn getSpawn(); /** *
      * Spawn creates a new instance.
      * 
* - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder getSpawnOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder getSpawnOrBuilder(); /** *
      * Invoke calls a method of an existing instance.
      * 
* - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ boolean hasInvoke(); /** @@ -9466,24 +9466,24 @@ public interface InstructionOrBuilder extends * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - ch.epfl.dedis.proto.OmniLedgerProto.Invoke getInvoke(); + ch.epfl.dedis.proto.ByzCoinProto.Invoke getInvoke(); /** *
      * Invoke calls a method of an existing instance.
      * 
* - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder getInvokeOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder getInvokeOrBuilder(); /** *
      * Delete removes the given instance.
      * 
* - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ boolean hasDelete(); /** @@ -9491,17 +9491,17 @@ public interface InstructionOrBuilder extends * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - ch.epfl.dedis.proto.OmniLedgerProto.Delete getDelete(); + ch.epfl.dedis.proto.ByzCoinProto.Delete getDelete(); /** *
      * Delete removes the given instance.
      * 
* - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder getDeleteOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder getDeleteOrBuilder(); /** *
@@ -9552,11 +9552,11 @@ ch.epfl.dedis.proto.DarcProto.SignatureOrBuilder getSignaturesOrBuilder(
    * Instruction holds only one of Spawn, Invoke, or Delete
    * 
* - * Protobuf type {@code omniledger.Instruction} + * Protobuf type {@code byzcoin.Instruction} */ public static final class Instruction extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Instruction) + // @@protoc_insertion_point(message_implements:byzcoin.Instruction) InstructionOrBuilder { private static final long serialVersionUID = 0L; // Use Instruction.newBuilder() to construct. @@ -9623,11 +9623,11 @@ private Instruction( break; } case 42: { - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = spawn_.toBuilder(); } - spawn_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Spawn.PARSER, extensionRegistry); + spawn_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Spawn.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(spawn_); spawn_ = subBuilder.buildPartial(); @@ -9636,11 +9636,11 @@ private Instruction( break; } case 50: { - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder subBuilder = null; if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = invoke_.toBuilder(); } - invoke_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Invoke.PARSER, extensionRegistry); + invoke_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Invoke.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(invoke_); invoke_ = subBuilder.buildPartial(); @@ -9649,11 +9649,11 @@ private Instruction( break; } case 58: { - ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = delete_.toBuilder(); } - delete_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Delete.PARSER, extensionRegistry); + delete_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Delete.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(delete_); delete_ = subBuilder.buildPartial(); @@ -9687,14 +9687,14 @@ private Instruction( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Instruction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Instruction_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Instruction_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Instruction_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Instruction.class, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Instruction.class, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder.class); } private int bitField0_; @@ -9801,13 +9801,13 @@ public int getLength() { } public static final int SPAWN_FIELD_NUMBER = 5; - private ch.epfl.dedis.proto.OmniLedgerProto.Spawn spawn_; + private ch.epfl.dedis.proto.ByzCoinProto.Spawn spawn_; /** *
      * Spawn creates a new instance.
      * 
* - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ public boolean hasSpawn() { return ((bitField0_ & 0x00000010) == 0x00000010); @@ -9817,30 +9817,30 @@ public boolean hasSpawn() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn getSpawn() { - return spawn_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance() : spawn_; + public ch.epfl.dedis.proto.ByzCoinProto.Spawn getSpawn() { + return spawn_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance() : spawn_; } /** *
      * Spawn creates a new instance.
      * 
* - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder getSpawnOrBuilder() { - return spawn_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance() : spawn_; + public ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder getSpawnOrBuilder() { + return spawn_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance() : spawn_; } public static final int INVOKE_FIELD_NUMBER = 6; - private ch.epfl.dedis.proto.OmniLedgerProto.Invoke invoke_; + private ch.epfl.dedis.proto.ByzCoinProto.Invoke invoke_; /** *
      * Invoke calls a method of an existing instance.
      * 
* - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ public boolean hasInvoke() { return ((bitField0_ & 0x00000020) == 0x00000020); @@ -9850,30 +9850,30 @@ public boolean hasInvoke() { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke getInvoke() { - return invoke_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance() : invoke_; + public ch.epfl.dedis.proto.ByzCoinProto.Invoke getInvoke() { + return invoke_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance() : invoke_; } /** *
      * Invoke calls a method of an existing instance.
      * 
* - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder getInvokeOrBuilder() { - return invoke_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance() : invoke_; + public ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder getInvokeOrBuilder() { + return invoke_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance() : invoke_; } public static final int DELETE_FIELD_NUMBER = 7; - private ch.epfl.dedis.proto.OmniLedgerProto.Delete delete_; + private ch.epfl.dedis.proto.ByzCoinProto.Delete delete_; /** *
      * Delete removes the given instance.
      * 
* - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ public boolean hasDelete() { return ((bitField0_ & 0x00000040) == 0x00000040); @@ -9883,20 +9883,20 @@ public boolean hasDelete() { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Delete getDelete() { - return delete_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance() : delete_; + public ch.epfl.dedis.proto.ByzCoinProto.Delete getDelete() { + return delete_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance() : delete_; } /** *
      * Delete removes the given instance.
      * 
* - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder getDeleteOrBuilder() { - return delete_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance() : delete_; + public ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder getDeleteOrBuilder() { + return delete_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance() : delete_; } public static final int SIGNATURES_FIELD_NUMBER = 8; @@ -10074,10 +10074,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Instruction)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Instruction)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Instruction other = (ch.epfl.dedis.proto.OmniLedgerProto.Instruction) obj; + ch.epfl.dedis.proto.ByzCoinProto.Instruction other = (ch.epfl.dedis.proto.ByzCoinProto.Instruction) obj; boolean result = true; result = result && (hasInstanceid() == other.hasInstanceid()); @@ -10165,69 +10165,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10239,7 +10239,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Instruction prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Instruction prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -10258,25 +10258,25 @@ protected Builder newBuilderForType( * Instruction holds only one of Spawn, Invoke, or Delete * * - * Protobuf type {@code omniledger.Instruction} + * Protobuf type {@code byzcoin.Instruction} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Instruction) - ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Instruction) + ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Instruction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Instruction_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Instruction_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Instruction_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Instruction.class, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Instruction.class, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Instruction.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Instruction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -10334,23 +10334,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Instruction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Instruction_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Instruction.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Instruction getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Instruction.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction build() { - ch.epfl.dedis.proto.OmniLedgerProto.Instruction result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Instruction build() { + ch.epfl.dedis.proto.ByzCoinProto.Instruction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Instruction result = new ch.epfl.dedis.proto.OmniLedgerProto.Instruction(this); + public ch.epfl.dedis.proto.ByzCoinProto.Instruction buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Instruction result = new ch.epfl.dedis.proto.ByzCoinProto.Instruction(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -10434,16 +10434,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Instruction) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Instruction)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Instruction) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Instruction)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Instruction other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Instruction.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Instruction other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Instruction.getDefaultInstance()) return this; if (other.hasInstanceid()) { setInstanceid(other.getInstanceid()); } @@ -10531,11 +10531,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Instruction parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Instruction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Instruction) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Instruction) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -10764,15 +10764,15 @@ public Builder clearLength() { return this; } - private ch.epfl.dedis.proto.OmniLedgerProto.Spawn spawn_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Spawn spawn_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Spawn, ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder, ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder> spawnBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Spawn, ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder, ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder> spawnBuilder_; /** *
        * Spawn creates a new instance.
        * 
* - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ public boolean hasSpawn() { return ((bitField0_ & 0x00000010) == 0x00000010); @@ -10782,11 +10782,11 @@ public boolean hasSpawn() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn getSpawn() { + public ch.epfl.dedis.proto.ByzCoinProto.Spawn getSpawn() { if (spawnBuilder_ == null) { - return spawn_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance() : spawn_; + return spawn_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance() : spawn_; } else { return spawnBuilder_.getMessage(); } @@ -10796,9 +10796,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Spawn getSpawn() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public Builder setSpawn(ch.epfl.dedis.proto.OmniLedgerProto.Spawn value) { + public Builder setSpawn(ch.epfl.dedis.proto.ByzCoinProto.Spawn value) { if (spawnBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10816,10 +10816,10 @@ public Builder setSpawn(ch.epfl.dedis.proto.OmniLedgerProto.Spawn value) { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ public Builder setSpawn( - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder builderForValue) { if (spawnBuilder_ == null) { spawn_ = builderForValue.build(); onChanged(); @@ -10834,15 +10834,15 @@ public Builder setSpawn( * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public Builder mergeSpawn(ch.epfl.dedis.proto.OmniLedgerProto.Spawn value) { + public Builder mergeSpawn(ch.epfl.dedis.proto.ByzCoinProto.Spawn value) { if (spawnBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && spawn_ != null && - spawn_ != ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance()) { + spawn_ != ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance()) { spawn_ = - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.newBuilder(spawn_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Spawn.newBuilder(spawn_).mergeFrom(value).buildPartial(); } else { spawn_ = value; } @@ -10858,7 +10858,7 @@ public Builder mergeSpawn(ch.epfl.dedis.proto.OmniLedgerProto.Spawn value) { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ public Builder clearSpawn() { if (spawnBuilder_ == null) { @@ -10875,9 +10875,9 @@ public Builder clearSpawn() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder getSpawnBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder getSpawnBuilder() { bitField0_ |= 0x00000010; onChanged(); return getSpawnFieldBuilder().getBuilder(); @@ -10887,14 +10887,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder getSpawnBuilder() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ - public ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder getSpawnOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder getSpawnOrBuilder() { if (spawnBuilder_ != null) { return spawnBuilder_.getMessageOrBuilder(); } else { return spawn_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance() : spawn_; + ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance() : spawn_; } } /** @@ -10902,14 +10902,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder getSpawnOrBuilder() { * Spawn creates a new instance. * * - * optional .omniledger.Spawn spawn = 5; + * optional .byzcoin.Spawn spawn = 5; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Spawn, ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder, ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Spawn, ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder, ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder> getSpawnFieldBuilder() { if (spawnBuilder_ == null) { spawnBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Spawn, ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder, ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Spawn, ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder, ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder>( getSpawn(), getParentForChildren(), isClean()); @@ -10918,15 +10918,15 @@ public ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder getSpawnOrBuilder() { return spawnBuilder_; } - private ch.epfl.dedis.proto.OmniLedgerProto.Invoke invoke_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Invoke invoke_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Invoke, ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder> invokeBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Invoke, ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder, ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder> invokeBuilder_; /** *
        * Invoke calls a method of an existing instance.
        * 
* - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ public boolean hasInvoke() { return ((bitField0_ & 0x00000020) == 0x00000020); @@ -10936,11 +10936,11 @@ public boolean hasInvoke() { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke getInvoke() { + public ch.epfl.dedis.proto.ByzCoinProto.Invoke getInvoke() { if (invokeBuilder_ == null) { - return invoke_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance() : invoke_; + return invoke_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance() : invoke_; } else { return invokeBuilder_.getMessage(); } @@ -10950,9 +10950,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Invoke getInvoke() { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public Builder setInvoke(ch.epfl.dedis.proto.OmniLedgerProto.Invoke value) { + public Builder setInvoke(ch.epfl.dedis.proto.ByzCoinProto.Invoke value) { if (invokeBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10970,10 +10970,10 @@ public Builder setInvoke(ch.epfl.dedis.proto.OmniLedgerProto.Invoke value) { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ public Builder setInvoke( - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder builderForValue) { if (invokeBuilder_ == null) { invoke_ = builderForValue.build(); onChanged(); @@ -10988,15 +10988,15 @@ public Builder setInvoke( * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public Builder mergeInvoke(ch.epfl.dedis.proto.OmniLedgerProto.Invoke value) { + public Builder mergeInvoke(ch.epfl.dedis.proto.ByzCoinProto.Invoke value) { if (invokeBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && invoke_ != null && - invoke_ != ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance()) { + invoke_ != ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance()) { invoke_ = - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.newBuilder(invoke_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Invoke.newBuilder(invoke_).mergeFrom(value).buildPartial(); } else { invoke_ = value; } @@ -11012,7 +11012,7 @@ public Builder mergeInvoke(ch.epfl.dedis.proto.OmniLedgerProto.Invoke value) { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ public Builder clearInvoke() { if (invokeBuilder_ == null) { @@ -11029,9 +11029,9 @@ public Builder clearInvoke() { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder getInvokeBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder getInvokeBuilder() { bitField0_ |= 0x00000020; onChanged(); return getInvokeFieldBuilder().getBuilder(); @@ -11041,14 +11041,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder getInvokeBuilder() { * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ - public ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder getInvokeOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder getInvokeOrBuilder() { if (invokeBuilder_ != null) { return invokeBuilder_.getMessageOrBuilder(); } else { return invoke_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance() : invoke_; + ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance() : invoke_; } } /** @@ -11056,14 +11056,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder getInvokeOrBuilder() * Invoke calls a method of an existing instance. * * - * optional .omniledger.Invoke invoke = 6; + * optional .byzcoin.Invoke invoke = 6; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Invoke, ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Invoke, ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder, ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder> getInvokeFieldBuilder() { if (invokeBuilder_ == null) { invokeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Invoke, ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Invoke, ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder, ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder>( getInvoke(), getParentForChildren(), isClean()); @@ -11072,15 +11072,15 @@ public ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder getInvokeOrBuilder() return invokeBuilder_; } - private ch.epfl.dedis.proto.OmniLedgerProto.Delete delete_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Delete delete_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Delete, ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder, ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder> deleteBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Delete, ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder, ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder> deleteBuilder_; /** *
        * Delete removes the given instance.
        * 
* - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ public boolean hasDelete() { return ((bitField0_ & 0x00000040) == 0x00000040); @@ -11090,11 +11090,11 @@ public boolean hasDelete() { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Delete getDelete() { + public ch.epfl.dedis.proto.ByzCoinProto.Delete getDelete() { if (deleteBuilder_ == null) { - return delete_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance() : delete_; + return delete_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance() : delete_; } else { return deleteBuilder_.getMessage(); } @@ -11104,9 +11104,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Delete getDelete() { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public Builder setDelete(ch.epfl.dedis.proto.OmniLedgerProto.Delete value) { + public Builder setDelete(ch.epfl.dedis.proto.ByzCoinProto.Delete value) { if (deleteBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11124,10 +11124,10 @@ public Builder setDelete(ch.epfl.dedis.proto.OmniLedgerProto.Delete value) { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ public Builder setDelete( - ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder builderForValue) { if (deleteBuilder_ == null) { delete_ = builderForValue.build(); onChanged(); @@ -11142,15 +11142,15 @@ public Builder setDelete( * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public Builder mergeDelete(ch.epfl.dedis.proto.OmniLedgerProto.Delete value) { + public Builder mergeDelete(ch.epfl.dedis.proto.ByzCoinProto.Delete value) { if (deleteBuilder_ == null) { if (((bitField0_ & 0x00000040) == 0x00000040) && delete_ != null && - delete_ != ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance()) { + delete_ != ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance()) { delete_ = - ch.epfl.dedis.proto.OmniLedgerProto.Delete.newBuilder(delete_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Delete.newBuilder(delete_).mergeFrom(value).buildPartial(); } else { delete_ = value; } @@ -11166,7 +11166,7 @@ public Builder mergeDelete(ch.epfl.dedis.proto.OmniLedgerProto.Delete value) { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ public Builder clearDelete() { if (deleteBuilder_ == null) { @@ -11183,9 +11183,9 @@ public Builder clearDelete() { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder getDeleteBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder getDeleteBuilder() { bitField0_ |= 0x00000040; onChanged(); return getDeleteFieldBuilder().getBuilder(); @@ -11195,14 +11195,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder getDeleteBuilder() { * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ - public ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder getDeleteOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder getDeleteOrBuilder() { if (deleteBuilder_ != null) { return deleteBuilder_.getMessageOrBuilder(); } else { return delete_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance() : delete_; + ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance() : delete_; } } /** @@ -11210,14 +11210,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder getDeleteOrBuilder() * Delete removes the given instance. * * - * optional .omniledger.Delete delete = 7; + * optional .byzcoin.Delete delete = 7; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Delete, ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder, ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Delete, ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder, ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder> getDeleteFieldBuilder() { if (deleteBuilder_ == null) { deleteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Delete, ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder, ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Delete, ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder, ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder>( getDelete(), getParentForChildren(), isClean()); @@ -11548,16 +11548,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Instruction) + // @@protoc_insertion_point(builder_scope:byzcoin.Instruction) } - // @@protoc_insertion_point(class_scope:omniledger.Instruction) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Instruction DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Instruction) + private static final ch.epfl.dedis.proto.ByzCoinProto.Instruction DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Instruction(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Instruction(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Instruction getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Instruction getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -11580,14 +11580,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Instruction getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface SpawnOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Spawn) + // @@protoc_insertion_point(interface_extends:byzcoin.Spawn) com.google.protobuf.MessageOrBuilder { /** @@ -11621,24 +11621,24 @@ public interface SpawnOrBuilder extends * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - java.util.List + java.util.List getArgsList(); /** *
      * Args holds all data necessary to spawn the new instance.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index); + ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index); /** *
      * Args holds all data necessary to spawn the new instance.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ int getArgsCount(); /** @@ -11646,18 +11646,18 @@ public interface SpawnOrBuilder extends * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** *
      * Args holds all data necessary to spawn the new instance.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index); } /** @@ -11665,11 +11665,11 @@ ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * Spawn is called upon an existing instance that will spawn a new instance. * * - * Protobuf type {@code omniledger.Spawn} + * Protobuf type {@code byzcoin.Spawn} */ public static final class Spawn extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Spawn) + // @@protoc_insertion_point(message_implements:byzcoin.Spawn) SpawnOrBuilder { private static final long serialVersionUID = 0L; // Use Spawn.newBuilder() to construct. @@ -11720,11 +11720,11 @@ private Spawn( } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } args_.add( - input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Argument.PARSER, extensionRegistry)); + input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Argument.PARSER, extensionRegistry)); break; } } @@ -11744,14 +11744,14 @@ private Spawn( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Spawn_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Spawn_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Spawn_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Spawn_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.class, ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Spawn.class, ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder.class); } private int bitField0_; @@ -11810,15 +11810,15 @@ public java.lang.String getContractid() { } public static final int ARGS_FIELD_NUMBER = 2; - private java.util.List args_; + private java.util.List args_; /** *
      * Args holds all data necessary to spawn the new instance.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** @@ -11826,9 +11826,9 @@ public java.util.List getArgsList( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -11837,7 +11837,7 @@ public java.util.List getArgsList( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public int getArgsCount() { return args_.size(); @@ -11847,9 +11847,9 @@ public int getArgsCount() { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index) { return args_.get(index); } /** @@ -11857,9 +11857,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } @@ -11917,10 +11917,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Spawn)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Spawn)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Spawn other = (ch.epfl.dedis.proto.OmniLedgerProto.Spawn) obj; + ch.epfl.dedis.proto.ByzCoinProto.Spawn other = (ch.epfl.dedis.proto.ByzCoinProto.Spawn) obj; boolean result = true; result = result && (hasContractid() == other.hasContractid()); @@ -11954,69 +11954,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -12028,7 +12028,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Spawn prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Spawn prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -12047,25 +12047,25 @@ protected Builder newBuilderForType( * Spawn is called upon an existing instance that will spawn a new instance. * * - * Protobuf type {@code omniledger.Spawn} + * Protobuf type {@code byzcoin.Spawn} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Spawn) - ch.epfl.dedis.proto.OmniLedgerProto.SpawnOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Spawn) + ch.epfl.dedis.proto.ByzCoinProto.SpawnOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Spawn_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Spawn_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Spawn_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Spawn_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Spawn.class, ch.epfl.dedis.proto.OmniLedgerProto.Spawn.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Spawn.class, ch.epfl.dedis.proto.ByzCoinProto.Spawn.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Spawn.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Spawn.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -12096,23 +12096,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Spawn_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Spawn_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Spawn getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn build() { - ch.epfl.dedis.proto.OmniLedgerProto.Spawn result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Spawn build() { + ch.epfl.dedis.proto.ByzCoinProto.Spawn result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Spawn result = new ch.epfl.dedis.proto.OmniLedgerProto.Spawn(this); + public ch.epfl.dedis.proto.ByzCoinProto.Spawn buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Spawn result = new ch.epfl.dedis.proto.ByzCoinProto.Spawn(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -12160,16 +12160,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Spawn) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Spawn)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Spawn) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Spawn)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Spawn other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Spawn.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Spawn other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Spawn.getDefaultInstance()) return this; if (other.hasContractid()) { bitField0_ |= 0x00000001; contractid_ = other.contractid_; @@ -12222,11 +12222,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Spawn parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Spawn parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Spawn) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Spawn) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -12337,26 +12337,26 @@ public Builder setContractidBytes( return this; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder> argsBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder> argsBuilder_; /** *
        * Args holds all data necessary to spawn the new instance.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -12368,7 +12368,7 @@ public java.util.List getArgsList( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public int getArgsCount() { if (argsBuilder_ == null) { @@ -12382,9 +12382,9 @@ public int getArgsCount() { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -12396,10 +12396,10 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder setArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12417,10 +12417,10 @@ public Builder setArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder setArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -12435,9 +12435,9 @@ public Builder setArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public Builder addArgs(ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + public Builder addArgs(ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12455,10 +12455,10 @@ public Builder addArgs(ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12476,10 +12476,10 @@ public Builder addArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -12494,10 +12494,10 @@ public Builder addArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -12512,10 +12512,10 @@ public Builder addArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -12531,7 +12531,7 @@ public Builder addAllArgs( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder clearArgs() { if (argsBuilder_ == null) { @@ -12548,7 +12548,7 @@ public Builder clearArgs() { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder removeArgs(int index) { if (argsBuilder_ == null) { @@ -12565,9 +12565,9 @@ public Builder removeArgs(int index) { * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder getArgsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } @@ -12576,9 +12576,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder getArgsBuilder( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -12590,9 +12590,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -12605,41 +12605,41 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * Args holds all data necessary to spawn the new instance. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder addArgsBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance()); + ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance()); } /** *
        * Args holds all data necessary to spawn the new instance.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder addArgsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance()); + index, ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance()); } /** *
        * Args holds all data necessary to spawn the new instance.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder>( args_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -12659,16 +12659,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Spawn) + // @@protoc_insertion_point(builder_scope:byzcoin.Spawn) } - // @@protoc_insertion_point(class_scope:omniledger.Spawn) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Spawn DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Spawn) + private static final ch.epfl.dedis.proto.ByzCoinProto.Spawn DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Spawn(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Spawn(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Spawn getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Spawn getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -12691,14 +12691,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Spawn getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Spawn getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface InvokeOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Invoke) + // @@protoc_insertion_point(interface_extends:byzcoin.Invoke) com.google.protobuf.MessageOrBuilder { /** @@ -12732,24 +12732,24 @@ public interface InvokeOrBuilder extends * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - java.util.List + java.util.List getArgsList(); /** *
      * Args holds all data necessary for the successful execution of the command.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index); + ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index); /** *
      * Args holds all data necessary for the successful execution of the command.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ int getArgsCount(); /** @@ -12757,18 +12757,18 @@ public interface InvokeOrBuilder extends * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - java.util.List + java.util.List getArgsOrBuilderList(); /** *
      * Args holds all data necessary for the successful execution of the command.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index); } /** @@ -12777,11 +12777,11 @@ ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * state. * * - * Protobuf type {@code omniledger.Invoke} + * Protobuf type {@code byzcoin.Invoke} */ public static final class Invoke extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Invoke) + // @@protoc_insertion_point(message_implements:byzcoin.Invoke) InvokeOrBuilder { private static final long serialVersionUID = 0L; // Use Invoke.newBuilder() to construct. @@ -12832,11 +12832,11 @@ private Invoke( } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - args_ = new java.util.ArrayList(); + args_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } args_.add( - input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Argument.PARSER, extensionRegistry)); + input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Argument.PARSER, extensionRegistry)); break; } } @@ -12856,14 +12856,14 @@ private Invoke( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Invoke_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Invoke_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Invoke_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Invoke_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.class, ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Invoke.class, ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder.class); } private int bitField0_; @@ -12922,15 +12922,15 @@ public java.lang.String getCommand() { } public static final int ARGS_FIELD_NUMBER = 2; - private java.util.List args_; + private java.util.List args_; /** *
      * Args holds all data necessary for the successful execution of the command.
      * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { return args_; } /** @@ -12938,9 +12938,9 @@ public java.util.List getArgsList( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { return args_; } @@ -12949,7 +12949,7 @@ public java.util.List getArgsList( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public int getArgsCount() { return args_.size(); @@ -12959,9 +12959,9 @@ public int getArgsCount() { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index) { return args_.get(index); } /** @@ -12969,9 +12969,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index) { return args_.get(index); } @@ -13029,10 +13029,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Invoke)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Invoke)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Invoke other = (ch.epfl.dedis.proto.OmniLedgerProto.Invoke) obj; + ch.epfl.dedis.proto.ByzCoinProto.Invoke other = (ch.epfl.dedis.proto.ByzCoinProto.Invoke) obj; boolean result = true; result = result && (hasCommand() == other.hasCommand()); @@ -13066,69 +13066,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -13140,7 +13140,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Invoke prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Invoke prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -13160,25 +13160,25 @@ protected Builder newBuilderForType( * state. * * - * Protobuf type {@code omniledger.Invoke} + * Protobuf type {@code byzcoin.Invoke} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Invoke) - ch.epfl.dedis.proto.OmniLedgerProto.InvokeOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Invoke) + ch.epfl.dedis.proto.ByzCoinProto.InvokeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Invoke_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Invoke_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Invoke_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Invoke_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Invoke.class, ch.epfl.dedis.proto.OmniLedgerProto.Invoke.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Invoke.class, ch.epfl.dedis.proto.ByzCoinProto.Invoke.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Invoke.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Invoke.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -13209,23 +13209,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Invoke_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Invoke_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Invoke getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke build() { - ch.epfl.dedis.proto.OmniLedgerProto.Invoke result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Invoke build() { + ch.epfl.dedis.proto.ByzCoinProto.Invoke result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Invoke result = new ch.epfl.dedis.proto.OmniLedgerProto.Invoke(this); + public ch.epfl.dedis.proto.ByzCoinProto.Invoke buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Invoke result = new ch.epfl.dedis.proto.ByzCoinProto.Invoke(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -13273,16 +13273,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Invoke) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Invoke)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Invoke) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Invoke)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Invoke other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Invoke.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Invoke other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Invoke.getDefaultInstance()) return this; if (other.hasCommand()) { bitField0_ |= 0x00000001; command_ = other.command_; @@ -13335,11 +13335,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Invoke parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Invoke parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Invoke) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Invoke) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -13450,26 +13450,26 @@ public Builder setCommandBytes( return this; } - private java.util.List args_ = + private java.util.List args_ = java.util.Collections.emptyList(); private void ensureArgsIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - args_ = new java.util.ArrayList(args_); + args_ = new java.util.ArrayList(args_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder> argsBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder> argsBuilder_; /** *
        * Args holds all data necessary for the successful execution of the command.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List getArgsList() { + public java.util.List getArgsList() { if (argsBuilder_ == null) { return java.util.Collections.unmodifiableList(args_); } else { @@ -13481,7 +13481,7 @@ public java.util.List getArgsList( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public int getArgsCount() { if (argsBuilder_ == null) { @@ -13495,9 +13495,9 @@ public int getArgsCount() { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Argument getArgs(int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -13509,10 +13509,10 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument getArgs(int index) { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder setArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13530,10 +13530,10 @@ public Builder setArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder setArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.set(index, builderForValue.build()); @@ -13548,9 +13548,9 @@ public Builder setArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public Builder addArgs(ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + public Builder addArgs(ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13568,10 +13568,10 @@ public Builder addArgs(ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument value) { if (argsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13589,10 +13589,10 @@ public Builder addArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(builderForValue.build()); @@ -13607,10 +13607,10 @@ public Builder addArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addArgs( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder builderForValue) { if (argsBuilder_ == null) { ensureArgsIsMutable(); args_.add(index, builderForValue.build()); @@ -13625,10 +13625,10 @@ public Builder addArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder addAllArgs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (argsBuilder_ == null) { ensureArgsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -13644,7 +13644,7 @@ public Builder addAllArgs( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder clearArgs() { if (argsBuilder_ == null) { @@ -13661,7 +13661,7 @@ public Builder clearArgs() { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ public Builder removeArgs(int index) { if (argsBuilder_ == null) { @@ -13678,9 +13678,9 @@ public Builder removeArgs(int index) { * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder getArgsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder getArgsBuilder( int index) { return getArgsFieldBuilder().getBuilder(index); } @@ -13689,9 +13689,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder getArgsBuilder( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder getArgsOrBuilder( int index) { if (argsBuilder_ == null) { return args_.get(index); } else { @@ -13703,9 +13703,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsOrBuilderList() { if (argsBuilder_ != null) { return argsBuilder_.getMessageOrBuilderList(); @@ -13718,41 +13718,41 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder getArgsOrBuilder( * Args holds all data necessary for the successful execution of the command. * * - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder addArgsBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder addArgsBuilder() { return getArgsFieldBuilder().addBuilder( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance()); + ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance()); } /** *
        * Args holds all data necessary for the successful execution of the command.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder addArgsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder addArgsBuilder( int index) { return getArgsFieldBuilder().addBuilder( - index, ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance()); + index, ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance()); } /** *
        * Args holds all data necessary for the successful execution of the command.
        * 
* - * repeated .omniledger.Argument args = 2; + * repeated .byzcoin.Argument args = 2; */ - public java.util.List + public java.util.List getArgsBuilderList() { return getArgsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder> getArgsFieldBuilder() { if (argsBuilder_ == null) { argsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Argument, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Argument, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder, ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder>( args_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -13772,16 +13772,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Invoke) + // @@protoc_insertion_point(builder_scope:byzcoin.Invoke) } - // @@protoc_insertion_point(class_scope:omniledger.Invoke) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Invoke DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Invoke) + private static final ch.epfl.dedis.proto.ByzCoinProto.Invoke DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Invoke(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Invoke(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Invoke getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Invoke getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -13804,14 +13804,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Invoke getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Invoke getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface DeleteOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Delete) + // @@protoc_insertion_point(interface_extends:byzcoin.Delete) com.google.protobuf.MessageOrBuilder { } /** @@ -13820,11 +13820,11 @@ public interface DeleteOrBuilder extends * must be true before a Delete is executed. * * - * Protobuf type {@code omniledger.Delete} + * Protobuf type {@code byzcoin.Delete} */ public static final class Delete extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Delete) + // @@protoc_insertion_point(message_implements:byzcoin.Delete) DeleteOrBuilder { private static final long serialVersionUID = 0L; // Use Delete.newBuilder() to construct. @@ -13878,14 +13878,14 @@ private Delete( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Delete_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Delete_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Delete_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Delete_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Delete.class, ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Delete.class, ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder.class); } private byte memoizedIsInitialized = -1; @@ -13918,10 +13918,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Delete)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Delete)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Delete other = (ch.epfl.dedis.proto.OmniLedgerProto.Delete) obj; + ch.epfl.dedis.proto.ByzCoinProto.Delete other = (ch.epfl.dedis.proto.ByzCoinProto.Delete) obj; boolean result = true; result = result && unknownFields.equals(other.unknownFields); @@ -13940,69 +13940,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Delete parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14014,7 +14014,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Delete parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Delete prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Delete prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -14034,25 +14034,25 @@ protected Builder newBuilderForType( * must be true before a Delete is executed. * * - * Protobuf type {@code omniledger.Delete} + * Protobuf type {@code byzcoin.Delete} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Delete) - ch.epfl.dedis.proto.OmniLedgerProto.DeleteOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Delete) + ch.epfl.dedis.proto.ByzCoinProto.DeleteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Delete_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Delete_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Delete_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Delete_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Delete.class, ch.epfl.dedis.proto.OmniLedgerProto.Delete.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Delete.class, ch.epfl.dedis.proto.ByzCoinProto.Delete.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Delete.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Delete.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14074,23 +14074,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Delete_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Delete_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Delete getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Delete getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Delete build() { - ch.epfl.dedis.proto.OmniLedgerProto.Delete result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Delete build() { + ch.epfl.dedis.proto.ByzCoinProto.Delete result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Delete buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Delete result = new ch.epfl.dedis.proto.OmniLedgerProto.Delete(this); + public ch.epfl.dedis.proto.ByzCoinProto.Delete buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Delete result = new ch.epfl.dedis.proto.ByzCoinProto.Delete(this); onBuilt(); return result; } @@ -14122,16 +14122,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Delete) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Delete)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Delete) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Delete)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Delete other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Delete.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Delete other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Delete.getDefaultInstance()) return this; this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -14145,11 +14145,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Delete parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Delete parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Delete) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Delete) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -14169,16 +14169,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Delete) + // @@protoc_insertion_point(builder_scope:byzcoin.Delete) } - // @@protoc_insertion_point(class_scope:omniledger.Delete) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Delete DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Delete) + private static final ch.epfl.dedis.proto.ByzCoinProto.Delete DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Delete(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Delete(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Delete getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Delete getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -14201,14 +14201,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Delete getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Delete getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ArgumentOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Argument) + // @@protoc_insertion_point(interface_extends:byzcoin.Argument) com.google.protobuf.MessageOrBuilder { /** @@ -14259,11 +14259,11 @@ public interface ArgumentOrBuilder extends * Argument is a name/value pair that will be passed to the contract. * * - * Protobuf type {@code omniledger.Argument} + * Protobuf type {@code byzcoin.Argument} */ public static final class Argument extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Argument) + // @@protoc_insertion_point(message_implements:byzcoin.Argument) ArgumentOrBuilder { private static final long serialVersionUID = 0L; // Use Argument.newBuilder() to construct. @@ -14331,14 +14331,14 @@ private Argument( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Argument_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Argument_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Argument_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Argument_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.class, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Argument.class, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder.class); } private int bitField0_; @@ -14470,10 +14470,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Argument)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Argument)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Argument other = (ch.epfl.dedis.proto.OmniLedgerProto.Argument) obj; + ch.epfl.dedis.proto.ByzCoinProto.Argument other = (ch.epfl.dedis.proto.ByzCoinProto.Argument) obj; boolean result = true; result = result && (hasName() == other.hasName()); @@ -14510,69 +14510,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Argument parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14584,7 +14584,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Argument parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Argument prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Argument prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -14603,25 +14603,25 @@ protected Builder newBuilderForType( * Argument is a name/value pair that will be passed to the contract. * * - * Protobuf type {@code omniledger.Argument} + * Protobuf type {@code byzcoin.Argument} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Argument) - ch.epfl.dedis.proto.OmniLedgerProto.ArgumentOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Argument) + ch.epfl.dedis.proto.ByzCoinProto.ArgumentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Argument_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Argument_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Argument_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Argument_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Argument.class, ch.epfl.dedis.proto.OmniLedgerProto.Argument.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Argument.class, ch.epfl.dedis.proto.ByzCoinProto.Argument.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Argument.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Argument.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14647,23 +14647,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Argument_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Argument_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Argument getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Argument build() { - ch.epfl.dedis.proto.OmniLedgerProto.Argument result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Argument build() { + ch.epfl.dedis.proto.ByzCoinProto.Argument result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Argument buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Argument result = new ch.epfl.dedis.proto.OmniLedgerProto.Argument(this); + public ch.epfl.dedis.proto.ByzCoinProto.Argument buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Argument result = new ch.epfl.dedis.proto.ByzCoinProto.Argument(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -14706,16 +14706,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Argument) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Argument)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Argument) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Argument)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Argument other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Argument.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Argument other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Argument.getDefaultInstance()) return this; if (other.hasName()) { bitField0_ |= 0x00000001; name_ = other.name_; @@ -14743,11 +14743,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Argument parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Argument parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Argument) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Argument) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -14919,16 +14919,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Argument) + // @@protoc_insertion_point(builder_scope:byzcoin.Argument) } - // @@protoc_insertion_point(class_scope:omniledger.Argument) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Argument DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Argument) + private static final ch.epfl.dedis.proto.ByzCoinProto.Argument DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Argument(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Argument(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Argument getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Argument getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -14951,38 +14951,38 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Argument getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Argument getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ClientTransactionOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.ClientTransaction) + // @@protoc_insertion_point(interface_extends:byzcoin.ClientTransaction) com.google.protobuf.MessageOrBuilder { /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - java.util.List + java.util.List getInstructionsList(); /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.Instruction getInstructions(int index); + ch.epfl.dedis.proto.ByzCoinProto.Instruction getInstructions(int index); /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ int getInstructionsCount(); /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - java.util.List + java.util.List getInstructionsOrBuilderList(); /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsOrBuilder( + ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder getInstructionsOrBuilder( int index); } /** @@ -14991,11 +14991,11 @@ ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsOrBuilde * If any of the instructions fails, none of them will be applied. * * - * Protobuf type {@code omniledger.ClientTransaction} + * Protobuf type {@code byzcoin.ClientTransaction} */ public static final class ClientTransaction extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.ClientTransaction) + // @@protoc_insertion_point(message_implements:byzcoin.ClientTransaction) ClientTransactionOrBuilder { private static final long serialVersionUID = 0L; // Use ClientTransaction.newBuilder() to construct. @@ -15039,11 +15039,11 @@ private ClientTransaction( } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instructions_ = new java.util.ArrayList(); + instructions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } instructions_.add( - input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Instruction.PARSER, extensionRegistry)); + input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Instruction.PARSER, extensionRegistry)); break; } } @@ -15063,47 +15063,47 @@ private ClientTransaction( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ClientTransaction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ClientTransaction_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ClientTransaction_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ClientTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.class, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.class, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder.class); } public static final int INSTRUCTIONS_FIELD_NUMBER = 1; - private java.util.List instructions_; + private java.util.List instructions_; /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public java.util.List getInstructionsList() { + public java.util.List getInstructionsList() { return instructions_; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public java.util.List + public java.util.List getInstructionsOrBuilderList() { return instructions_; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public int getInstructionsCount() { return instructions_.size(); } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction getInstructions(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Instruction getInstructions(int index) { return instructions_.get(index); } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder getInstructionsOrBuilder( int index) { return instructions_.get(index); } @@ -15151,10 +15151,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction other = (ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction) obj; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction other = (ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction) obj; boolean result = true; result = result && getInstructionsList() @@ -15179,69 +15179,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -15253,7 +15253,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -15273,25 +15273,25 @@ protected Builder newBuilderForType( * If any of the instructions fails, none of them will be applied. * * - * Protobuf type {@code omniledger.ClientTransaction} + * Protobuf type {@code byzcoin.ClientTransaction} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.ClientTransaction) - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.ClientTransaction) + ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ClientTransaction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ClientTransaction_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ClientTransaction_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ClientTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.class, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.class, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -15320,23 +15320,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_ClientTransaction_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_ClientTransaction_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction build() { - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction build() { + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction result = new ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction(this); + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction result = new ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction(this); int from_bitField0_ = bitField0_; if (instructionsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -15378,16 +15378,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance()) return this; if (instructionsBuilder_ == null) { if (!other.instructions_.isEmpty()) { if (instructions_.isEmpty()) { @@ -15432,11 +15432,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -15447,22 +15447,22 @@ public Builder mergeFrom( } private int bitField0_; - private java.util.List instructions_ = + private java.util.List instructions_ = java.util.Collections.emptyList(); private void ensureInstructionsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - instructions_ = new java.util.ArrayList(instructions_); + instructions_ = new java.util.ArrayList(instructions_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Instruction, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder> instructionsBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Instruction, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder, ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder> instructionsBuilder_; /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public java.util.List getInstructionsList() { + public java.util.List getInstructionsList() { if (instructionsBuilder_ == null) { return java.util.Collections.unmodifiableList(instructions_); } else { @@ -15470,7 +15470,7 @@ public java.util.List getInstru } } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public int getInstructionsCount() { if (instructionsBuilder_ == null) { @@ -15480,9 +15480,9 @@ public int getInstructionsCount() { } } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction getInstructions(int index) { + public ch.epfl.dedis.proto.ByzCoinProto.Instruction getInstructions(int index) { if (instructionsBuilder_ == null) { return instructions_.get(index); } else { @@ -15490,10 +15490,10 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Instruction getInstructions(int index } } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder setInstructions( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Instruction value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Instruction value) { if (instructionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -15507,10 +15507,10 @@ public Builder setInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder setInstructions( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder builderForValue) { if (instructionsBuilder_ == null) { ensureInstructionsIsMutable(); instructions_.set(index, builderForValue.build()); @@ -15521,9 +15521,9 @@ public Builder setInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public Builder addInstructions(ch.epfl.dedis.proto.OmniLedgerProto.Instruction value) { + public Builder addInstructions(ch.epfl.dedis.proto.ByzCoinProto.Instruction value) { if (instructionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -15537,10 +15537,10 @@ public Builder addInstructions(ch.epfl.dedis.proto.OmniLedgerProto.Instruction v return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder addInstructions( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Instruction value) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Instruction value) { if (instructionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -15554,10 +15554,10 @@ public Builder addInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder addInstructions( - ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder builderForValue) { if (instructionsBuilder_ == null) { ensureInstructionsIsMutable(); instructions_.add(builderForValue.build()); @@ -15568,10 +15568,10 @@ public Builder addInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder addInstructions( - int index, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder builderForValue) { + int index, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder builderForValue) { if (instructionsBuilder_ == null) { ensureInstructionsIsMutable(); instructions_.add(index, builderForValue.build()); @@ -15582,10 +15582,10 @@ public Builder addInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder addAllInstructions( - java.lang.Iterable values) { + java.lang.Iterable values) { if (instructionsBuilder_ == null) { ensureInstructionsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -15597,7 +15597,7 @@ public Builder addAllInstructions( return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder clearInstructions() { if (instructionsBuilder_ == null) { @@ -15610,7 +15610,7 @@ public Builder clearInstructions() { return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ public Builder removeInstructions(int index) { if (instructionsBuilder_ == null) { @@ -15623,16 +15623,16 @@ public Builder removeInstructions(int index) { return this; } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder getInstructionsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder getInstructionsBuilder( int index) { return getInstructionsFieldBuilder().getBuilder(index); } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsOrBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder getInstructionsOrBuilder( int index) { if (instructionsBuilder_ == null) { return instructions_.get(index); } else { @@ -15640,9 +15640,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsO } } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public java.util.List + public java.util.List getInstructionsOrBuilderList() { if (instructionsBuilder_ != null) { return instructionsBuilder_.getMessageOrBuilderList(); @@ -15651,33 +15651,33 @@ public ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder getInstructionsO } } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder addInstructionsBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder addInstructionsBuilder() { return getInstructionsFieldBuilder().addBuilder( - ch.epfl.dedis.proto.OmniLedgerProto.Instruction.getDefaultInstance()); + ch.epfl.dedis.proto.ByzCoinProto.Instruction.getDefaultInstance()); } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder addInstructionsBuilder( + public ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder addInstructionsBuilder( int index) { return getInstructionsFieldBuilder().addBuilder( - index, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.getDefaultInstance()); + index, ch.epfl.dedis.proto.ByzCoinProto.Instruction.getDefaultInstance()); } /** - * repeated .omniledger.Instruction instructions = 1; + * repeated .byzcoin.Instruction instructions = 1; */ - public java.util.List + public java.util.List getInstructionsBuilderList() { return getInstructionsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Instruction, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Instruction, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder, ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder> getInstructionsFieldBuilder() { if (instructionsBuilder_ == null) { instructionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Instruction, ch.epfl.dedis.proto.OmniLedgerProto.Instruction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.InstructionOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Instruction, ch.epfl.dedis.proto.ByzCoinProto.Instruction.Builder, ch.epfl.dedis.proto.ByzCoinProto.InstructionOrBuilder>( instructions_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -15697,16 +15697,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.ClientTransaction) + // @@protoc_insertion_point(builder_scope:byzcoin.ClientTransaction) } - // @@protoc_insertion_point(class_scope:omniledger.ClientTransaction) - private static final ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.ClientTransaction) + private static final ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -15729,28 +15729,28 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface TxResultOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.TxResult) + // @@protoc_insertion_point(interface_extends:byzcoin.TxResult) com.google.protobuf.MessageOrBuilder { /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ boolean hasClienttransaction(); /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getClienttransaction(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getClienttransaction(); /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getClienttransactionOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getClienttransactionOrBuilder(); /** * required bool accepted = 2; @@ -15766,11 +15766,11 @@ public interface TxResultOrBuilder extends * TxResult holds a transaction and the result of running it. * * - * Protobuf type {@code omniledger.TxResult} + * Protobuf type {@code byzcoin.TxResult} */ public static final class TxResult extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.TxResult) + // @@protoc_insertion_point(message_implements:byzcoin.TxResult) TxResultOrBuilder { private static final long serialVersionUID = 0L; // Use TxResult.newBuilder() to construct. @@ -15813,11 +15813,11 @@ private TxResult( break; } case 10: { - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = clienttransaction_.toBuilder(); } - clienttransaction_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.PARSER, extensionRegistry); + clienttransaction_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(clienttransaction_); clienttransaction_ = subBuilder.buildPartial(); @@ -15844,36 +15844,36 @@ private TxResult( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_TxResult_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_TxResult_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_TxResult_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_TxResult_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.TxResult.class, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.TxResult.class, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder.class); } private int bitField0_; public static final int CLIENTTRANSACTION_FIELD_NUMBER = 1; - private ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction clienttransaction_; + private ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction clienttransaction_; /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ public boolean hasClienttransaction() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getClienttransaction() { - return clienttransaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : clienttransaction_; + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getClienttransaction() { + return clienttransaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : clienttransaction_; } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getClienttransactionOrBuilder() { - return clienttransaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : clienttransaction_; + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getClienttransactionOrBuilder() { + return clienttransaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : clienttransaction_; } public static final int ACCEPTED_FIELD_NUMBER = 2; @@ -15947,10 +15947,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.TxResult)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.TxResult)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.TxResult other = (ch.epfl.dedis.proto.OmniLedgerProto.TxResult) obj; + ch.epfl.dedis.proto.ByzCoinProto.TxResult other = (ch.epfl.dedis.proto.ByzCoinProto.TxResult) obj; boolean result = true; result = result && (hasClienttransaction() == other.hasClienttransaction()); @@ -15988,69 +15988,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16062,7 +16062,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.TxResult prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.TxResult prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -16081,25 +16081,25 @@ protected Builder newBuilderForType( * TxResult holds a transaction and the result of running it. * * - * Protobuf type {@code omniledger.TxResult} + * Protobuf type {@code byzcoin.TxResult} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.TxResult) - ch.epfl.dedis.proto.OmniLedgerProto.TxResultOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.TxResult) + ch.epfl.dedis.proto.ByzCoinProto.TxResultOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_TxResult_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_TxResult_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_TxResult_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_TxResult_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.TxResult.class, ch.epfl.dedis.proto.OmniLedgerProto.TxResult.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.TxResult.class, ch.epfl.dedis.proto.ByzCoinProto.TxResult.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.TxResult.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.TxResult.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -16130,23 +16130,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_TxResult_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_TxResult_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.TxResult.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.TxResult getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.TxResult.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult build() { - ch.epfl.dedis.proto.OmniLedgerProto.TxResult result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.TxResult build() { + ch.epfl.dedis.proto.ByzCoinProto.TxResult result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.TxResult result = new ch.epfl.dedis.proto.OmniLedgerProto.TxResult(this); + public ch.epfl.dedis.proto.ByzCoinProto.TxResult buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.TxResult result = new ch.epfl.dedis.proto.ByzCoinProto.TxResult(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -16193,16 +16193,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.TxResult) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.TxResult)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.TxResult) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.TxResult)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.TxResult other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.TxResult.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.TxResult other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.TxResult.getDefaultInstance()) return this; if (other.hasClienttransaction()) { mergeClienttransaction(other.getClienttransaction()); } @@ -16231,11 +16231,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.TxResult parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.TxResult parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.TxResult) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.TxResult) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -16246,29 +16246,29 @@ public Builder mergeFrom( } private int bitField0_; - private ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction clienttransaction_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction clienttransaction_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder> clienttransactionBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder> clienttransactionBuilder_; /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ public boolean hasClienttransaction() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction getClienttransaction() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction getClienttransaction() { if (clienttransactionBuilder_ == null) { - return clienttransaction_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : clienttransaction_; + return clienttransaction_ == null ? ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : clienttransaction_; } else { return clienttransactionBuilder_.getMessage(); } } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public Builder setClienttransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction value) { + public Builder setClienttransaction(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction value) { if (clienttransactionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16282,10 +16282,10 @@ public Builder setClienttransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTr return this; } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ public Builder setClienttransaction( - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder builderForValue) { if (clienttransactionBuilder_ == null) { clienttransaction_ = builderForValue.build(); onChanged(); @@ -16296,15 +16296,15 @@ public Builder setClienttransaction( return this; } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public Builder mergeClienttransaction(ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction value) { + public Builder mergeClienttransaction(ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction value) { if (clienttransactionBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && clienttransaction_ != null && - clienttransaction_ != ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance()) { + clienttransaction_ != ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance()) { clienttransaction_ = - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.newBuilder(clienttransaction_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.newBuilder(clienttransaction_).mergeFrom(value).buildPartial(); } else { clienttransaction_ = value; } @@ -16316,7 +16316,7 @@ public Builder mergeClienttransaction(ch.epfl.dedis.proto.OmniLedgerProto.Client return this; } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ public Builder clearClienttransaction() { if (clienttransactionBuilder_ == null) { @@ -16329,33 +16329,33 @@ public Builder clearClienttransaction() { return this; } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder getClienttransactionBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder getClienttransactionBuilder() { bitField0_ |= 0x00000001; onChanged(); return getClienttransactionFieldBuilder().getBuilder(); } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder getClienttransactionOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder getClienttransactionOrBuilder() { if (clienttransactionBuilder_ != null) { return clienttransactionBuilder_.getMessageOrBuilder(); } else { return clienttransaction_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.getDefaultInstance() : clienttransaction_; + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.getDefaultInstance() : clienttransaction_; } } /** - * required .omniledger.ClientTransaction clienttransaction = 1; + * required .byzcoin.ClientTransaction clienttransaction = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder> getClienttransactionFieldBuilder() { if (clienttransactionBuilder_ == null) { clienttransactionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransaction.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ClientTransactionOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction, ch.epfl.dedis.proto.ByzCoinProto.ClientTransaction.Builder, ch.epfl.dedis.proto.ByzCoinProto.ClientTransactionOrBuilder>( getClienttransaction(), getParentForChildren(), isClean()); @@ -16406,16 +16406,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.TxResult) + // @@protoc_insertion_point(builder_scope:byzcoin.TxResult) } - // @@protoc_insertion_point(class_scope:omniledger.TxResult) - private static final ch.epfl.dedis.proto.OmniLedgerProto.TxResult DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.TxResult) + private static final ch.epfl.dedis.proto.ByzCoinProto.TxResult DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.TxResult(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.TxResult(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.TxResult getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.TxResult getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -16438,14 +16438,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.TxResult getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.TxResult getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface StateChangeOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.StateChange) + // @@protoc_insertion_point(interface_extends:byzcoin.StateChange) com.google.protobuf.MessageOrBuilder { /** @@ -16538,11 +16538,11 @@ public interface StateChangeOrBuilder extends * StateChange is one new state that will be applied to the collection. * * - * Protobuf type {@code omniledger.StateChange} + * Protobuf type {@code byzcoin.StateChange} */ public static final class StateChange extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.StateChange) + // @@protoc_insertion_point(message_implements:byzcoin.StateChange) StateChangeOrBuilder { private static final long serialVersionUID = 0L; // Use StateChange.newBuilder() to construct. @@ -16627,14 +16627,14 @@ private StateChange( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_StateChange_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_StateChange_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_StateChange_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_StateChange_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.StateChange.class, ch.epfl.dedis.proto.OmniLedgerProto.StateChange.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.StateChange.class, ch.epfl.dedis.proto.ByzCoinProto.StateChange.Builder.class); } private int bitField0_; @@ -16838,10 +16838,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.StateChange)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.StateChange)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.StateChange other = (ch.epfl.dedis.proto.OmniLedgerProto.StateChange) obj; + ch.epfl.dedis.proto.ByzCoinProto.StateChange other = (ch.epfl.dedis.proto.ByzCoinProto.StateChange) obj; boolean result = true; result = result && (hasStateaction() == other.hasStateaction()); @@ -16905,69 +16905,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16979,7 +16979,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.StateChange prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.StateChange prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -16998,25 +16998,25 @@ protected Builder newBuilderForType( * StateChange is one new state that will be applied to the collection. * * - * Protobuf type {@code omniledger.StateChange} + * Protobuf type {@code byzcoin.StateChange} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.StateChange) - ch.epfl.dedis.proto.OmniLedgerProto.StateChangeOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.StateChange) + ch.epfl.dedis.proto.ByzCoinProto.StateChangeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_StateChange_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_StateChange_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_StateChange_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_StateChange_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.StateChange.class, ch.epfl.dedis.proto.OmniLedgerProto.StateChange.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.StateChange.class, ch.epfl.dedis.proto.ByzCoinProto.StateChange.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.StateChange.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.StateChange.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -17048,23 +17048,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_StateChange_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_StateChange_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.StateChange getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.StateChange.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.StateChange getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.StateChange.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.StateChange build() { - ch.epfl.dedis.proto.OmniLedgerProto.StateChange result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.StateChange build() { + ch.epfl.dedis.proto.ByzCoinProto.StateChange result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.StateChange buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.StateChange result = new ch.epfl.dedis.proto.OmniLedgerProto.StateChange(this); + public ch.epfl.dedis.proto.ByzCoinProto.StateChange buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.StateChange result = new ch.epfl.dedis.proto.ByzCoinProto.StateChange(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -17119,16 +17119,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.StateChange) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.StateChange)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.StateChange) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.StateChange)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.StateChange other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.StateChange.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.StateChange other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.StateChange.getDefaultInstance()) return this; if (other.hasStateaction()) { setStateaction(other.getStateaction()); } @@ -17172,11 +17172,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.StateChange parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.StateChange parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.StateChange) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.StateChange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -17449,16 +17449,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.StateChange) + // @@protoc_insertion_point(builder_scope:byzcoin.StateChange) } - // @@protoc_insertion_point(class_scope:omniledger.StateChange) - private static final ch.epfl.dedis.proto.OmniLedgerProto.StateChange DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.StateChange) + private static final ch.epfl.dedis.proto.ByzCoinProto.StateChange DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.StateChange(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.StateChange(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.StateChange getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.StateChange getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -17481,14 +17481,14 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.StateChange getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.StateChange getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface CoinOrBuilder extends - // @@protoc_insertion_point(interface_extends:omniledger.Coin) + // @@protoc_insertion_point(interface_extends:byzcoin.Coin) com.google.protobuf.MessageOrBuilder { /** @@ -17531,11 +17531,11 @@ public interface CoinOrBuilder extends * by a genesis coin instance that is unique for each type of coin. * * - * Protobuf type {@code omniledger.Coin} + * Protobuf type {@code byzcoin.Coin} */ public static final class Coin extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omniledger.Coin) + // @@protoc_insertion_point(message_implements:byzcoin.Coin) CoinOrBuilder { private static final long serialVersionUID = 0L; // Use Coin.newBuilder() to construct. @@ -17602,14 +17602,14 @@ private Coin( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Coin_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Coin_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Coin_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Coin_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Coin.class, ch.epfl.dedis.proto.OmniLedgerProto.Coin.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Coin.class, ch.epfl.dedis.proto.ByzCoinProto.Coin.Builder.class); } private int bitField0_; @@ -17711,10 +17711,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerProto.Coin)) { + if (!(obj instanceof ch.epfl.dedis.proto.ByzCoinProto.Coin)) { return super.equals(obj); } - ch.epfl.dedis.proto.OmniLedgerProto.Coin other = (ch.epfl.dedis.proto.OmniLedgerProto.Coin) obj; + ch.epfl.dedis.proto.ByzCoinProto.Coin other = (ch.epfl.dedis.proto.ByzCoinProto.Coin) obj; boolean result = true; result = result && (hasName() == other.hasName()); @@ -17752,69 +17752,69 @@ public int hashCode() { return hash; } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom(byte[] data) + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseDelimitedFrom(java.io.InputStream input) + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseDelimitedFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( + public static ch.epfl.dedis.proto.ByzCoinProto.Coin parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -17826,7 +17826,7 @@ public static ch.epfl.dedis.proto.OmniLedgerProto.Coin parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerProto.Coin prototype) { + public static Builder newBuilder(ch.epfl.dedis.proto.ByzCoinProto.Coin prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -17846,25 +17846,25 @@ protected Builder newBuilderForType( * by a genesis coin instance that is unique for each type of coin. * * - * Protobuf type {@code omniledger.Coin} + * Protobuf type {@code byzcoin.Coin} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omniledger.Coin) - ch.epfl.dedis.proto.OmniLedgerProto.CoinOrBuilder { + // @@protoc_insertion_point(builder_implements:byzcoin.Coin) + ch.epfl.dedis.proto.ByzCoinProto.CoinOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Coin_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Coin_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Coin_fieldAccessorTable + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Coin_fieldAccessorTable .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerProto.Coin.class, ch.epfl.dedis.proto.OmniLedgerProto.Coin.Builder.class); + ch.epfl.dedis.proto.ByzCoinProto.Coin.class, ch.epfl.dedis.proto.ByzCoinProto.Coin.Builder.class); } - // Construct using ch.epfl.dedis.proto.OmniLedgerProto.Coin.newBuilder() + // Construct using ch.epfl.dedis.proto.ByzCoinProto.Coin.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -17890,23 +17890,23 @@ public Builder clear() { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.internal_static_omniledger_Coin_descriptor; + return ch.epfl.dedis.proto.ByzCoinProto.internal_static_byzcoin_Coin_descriptor; } - public ch.epfl.dedis.proto.OmniLedgerProto.Coin getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerProto.Coin.getDefaultInstance(); + public ch.epfl.dedis.proto.ByzCoinProto.Coin getDefaultInstanceForType() { + return ch.epfl.dedis.proto.ByzCoinProto.Coin.getDefaultInstance(); } - public ch.epfl.dedis.proto.OmniLedgerProto.Coin build() { - ch.epfl.dedis.proto.OmniLedgerProto.Coin result = buildPartial(); + public ch.epfl.dedis.proto.ByzCoinProto.Coin build() { + ch.epfl.dedis.proto.ByzCoinProto.Coin result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public ch.epfl.dedis.proto.OmniLedgerProto.Coin buildPartial() { - ch.epfl.dedis.proto.OmniLedgerProto.Coin result = new ch.epfl.dedis.proto.OmniLedgerProto.Coin(this); + public ch.epfl.dedis.proto.ByzCoinProto.Coin buildPartial() { + ch.epfl.dedis.proto.ByzCoinProto.Coin result = new ch.epfl.dedis.proto.ByzCoinProto.Coin(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -17949,16 +17949,16 @@ public Builder addRepeatedField( return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerProto.Coin) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerProto.Coin)other); + if (other instanceof ch.epfl.dedis.proto.ByzCoinProto.Coin) { + return mergeFrom((ch.epfl.dedis.proto.ByzCoinProto.Coin)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerProto.Coin other) { - if (other == ch.epfl.dedis.proto.OmniLedgerProto.Coin.getDefaultInstance()) return this; + public Builder mergeFrom(ch.epfl.dedis.proto.ByzCoinProto.Coin other) { + if (other == ch.epfl.dedis.proto.ByzCoinProto.Coin.getDefaultInstance()) return this; if (other.hasName()) { setName(other.getName()); } @@ -17984,11 +17984,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerProto.Coin parsedMessage = null; + ch.epfl.dedis.proto.ByzCoinProto.Coin parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerProto.Coin) e.getUnfinishedMessage(); + parsedMessage = (ch.epfl.dedis.proto.ByzCoinProto.Coin) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -18108,16 +18108,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:omniledger.Coin) + // @@protoc_insertion_point(builder_scope:byzcoin.Coin) } - // @@protoc_insertion_point(class_scope:omniledger.Coin) - private static final ch.epfl.dedis.proto.OmniLedgerProto.Coin DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:byzcoin.Coin) + private static final ch.epfl.dedis.proto.ByzCoinProto.Coin DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerProto.Coin(); + DEFAULT_INSTANCE = new ch.epfl.dedis.proto.ByzCoinProto.Coin(); } - public static ch.epfl.dedis.proto.OmniLedgerProto.Coin getDefaultInstance() { + public static ch.epfl.dedis.proto.ByzCoinProto.Coin getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -18140,107 +18140,107 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - public ch.epfl.dedis.proto.OmniLedgerProto.Coin getDefaultInstanceForType() { + public ch.epfl.dedis.proto.ByzCoinProto.Coin getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_DataHeader_descriptor; + internal_static_byzcoin_DataHeader_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_DataHeader_fieldAccessorTable; + internal_static_byzcoin_DataHeader_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_DataBody_descriptor; + internal_static_byzcoin_DataBody_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_DataBody_fieldAccessorTable; + internal_static_byzcoin_DataBody_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_CreateGenesisBlock_descriptor; + internal_static_byzcoin_CreateGenesisBlock_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_CreateGenesisBlock_fieldAccessorTable; + internal_static_byzcoin_CreateGenesisBlock_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_CreateGenesisBlockResponse_descriptor; + internal_static_byzcoin_CreateGenesisBlockResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_CreateGenesisBlockResponse_fieldAccessorTable; + internal_static_byzcoin_CreateGenesisBlockResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_AddTxRequest_descriptor; + internal_static_byzcoin_AddTxRequest_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_AddTxRequest_fieldAccessorTable; + internal_static_byzcoin_AddTxRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_AddTxResponse_descriptor; + internal_static_byzcoin_AddTxResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_AddTxResponse_fieldAccessorTable; + internal_static_byzcoin_AddTxResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_GetProof_descriptor; + internal_static_byzcoin_GetProof_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_GetProof_fieldAccessorTable; + internal_static_byzcoin_GetProof_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_GetProofResponse_descriptor; + internal_static_byzcoin_GetProofResponse_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_GetProofResponse_fieldAccessorTable; + internal_static_byzcoin_GetProofResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_ChainConfig_descriptor; + internal_static_byzcoin_ChainConfig_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_ChainConfig_fieldAccessorTable; + internal_static_byzcoin_ChainConfig_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Proof_descriptor; + internal_static_byzcoin_Proof_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Proof_fieldAccessorTable; + internal_static_byzcoin_Proof_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Instruction_descriptor; + internal_static_byzcoin_Instruction_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Instruction_fieldAccessorTable; + internal_static_byzcoin_Instruction_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Spawn_descriptor; + internal_static_byzcoin_Spawn_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Spawn_fieldAccessorTable; + internal_static_byzcoin_Spawn_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Invoke_descriptor; + internal_static_byzcoin_Invoke_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Invoke_fieldAccessorTable; + internal_static_byzcoin_Invoke_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Delete_descriptor; + internal_static_byzcoin_Delete_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Delete_fieldAccessorTable; + internal_static_byzcoin_Delete_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Argument_descriptor; + internal_static_byzcoin_Argument_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Argument_fieldAccessorTable; + internal_static_byzcoin_Argument_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_ClientTransaction_descriptor; + internal_static_byzcoin_ClientTransaction_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_ClientTransaction_fieldAccessorTable; + internal_static_byzcoin_ClientTransaction_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_TxResult_descriptor; + internal_static_byzcoin_TxResult_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_TxResult_fieldAccessorTable; + internal_static_byzcoin_TxResult_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_StateChange_descriptor; + internal_static_byzcoin_StateChange_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_StateChange_fieldAccessorTable; + internal_static_byzcoin_StateChange_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omniledger_Coin_descriptor; + internal_static_byzcoin_Coin_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omniledger_Coin_fieldAccessorTable; + internal_static_byzcoin_Coin_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -18250,50 +18250,49 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Coin getDefaultInstanceForType() { descriptor; static { java.lang.String[] descriptorData = { - "\n\020omniledger.proto\022\nomniledger\032\017skipchai" + - "n.proto\032\nonet.proto\032\ndarc.proto\032\020collect" + - "ion.proto\"p\n\nDataHeader\022\026\n\016collectionroo" + - "t\030\001 \002(\014\022\035\n\025clienttransactionhash\030\002 \002(\014\022\030" + - "\n\020statechangeshash\030\003 \002(\014\022\021\n\ttimestamp\030\004 " + - "\002(\022\"3\n\010DataBody\022\'\n\ttxresults\030\001 \003(\0132\024.omn" + - "iledger.TxResult\"\221\001\n\022CreateGenesisBlock\022" + - "\017\n\007version\030\001 \002(\021\022\034\n\006roster\030\002 \002(\0132\014.onet." + - "Roster\022\037\n\013genesisdarc\030\003 \002(\0132\n.darc.Darc\022" + - "\025\n\rblockinterval\030\004 \002(\022\022\024\n\014maxblocksize\030\005" + - " \001(\021\"V\n\032CreateGenesisBlockResponse\022\017\n\007ve" + - "rsion\030\001 \002(\021\022\'\n\tskipblock\030\002 \001(\0132\024.skipcha" + - "in.SkipBlock\"\177\n\014AddTxRequest\022\017\n\007version\030" + - "\001 \002(\021\022\023\n\013skipchainid\030\002 \002(\014\0222\n\013transactio" + - "n\030\003 \002(\0132\035.omniledger.ClientTransaction\022\025" + - "\n\rinclusionwait\030\004 \001(\021\" \n\rAddTxResponse\022\017" + - "\n\007version\030\001 \002(\021\"4\n\010GetProof\022\017\n\007version\030\001" + - " \002(\021\022\013\n\003key\030\002 \002(\014\022\n\n\002id\030\003 \002(\014\"E\n\020GetProo" + - "fResponse\022\017\n\007version\030\001 \002(\021\022 \n\005proof\030\002 \002(" + - "\0132\021.omniledger.Proof\"X\n\013ChainConfig\022\025\n\rb" + - "lockinterval\030\001 \002(\022\022\034\n\006roster\030\002 \002(\0132\014.one" + - "t.Roster\022\024\n\014maxblocksize\030\003 \002(\021\"\177\n\005Proof\022" + - ")\n\016inclusionproof\030\001 \002(\0132\021.collection.Pro" + - "of\022$\n\006latest\030\002 \002(\0132\024.skipchain.SkipBlock" + - "\022%\n\005links\030\003 \003(\0132\026.skipchain.ForwardLink\"" + - "\336\001\n\013Instruction\022\022\n\ninstanceid\030\001 \002(\014\022\r\n\005n" + - "once\030\002 \002(\014\022\r\n\005index\030\003 \002(\021\022\016\n\006length\030\004 \002(" + - "\021\022 \n\005spawn\030\005 \001(\0132\021.omniledger.Spawn\022\"\n\006i" + - "nvoke\030\006 \001(\0132\022.omniledger.Invoke\022\"\n\006delet" + - "e\030\007 \001(\0132\022.omniledger.Delete\022#\n\nsignature" + - "s\030\010 \003(\0132\017.darc.Signature\"?\n\005Spawn\022\022\n\ncon" + - "tractid\030\001 \002(\t\022\"\n\004args\030\002 \003(\0132\024.omniledger" + - ".Argument\"=\n\006Invoke\022\017\n\007command\030\001 \002(\t\022\"\n\004" + - "args\030\002 \003(\0132\024.omniledger.Argument\"\010\n\006Dele" + - "te\"\'\n\010Argument\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030\002 " + - "\002(\014\"B\n\021ClientTransaction\022-\n\014instructions" + - "\030\001 \003(\0132\027.omniledger.Instruction\"V\n\010TxRes" + - "ult\0228\n\021clienttransaction\030\001 \002(\0132\035.omniled" + - "ger.ClientTransaction\022\020\n\010accepted\030\002 \002(\010\"" + - "i\n\013StateChange\022\023\n\013stateaction\030\001 \002(\021\022\022\n\ni" + - "nstanceid\030\002 \002(\014\022\022\n\ncontractid\030\003 \002(\014\022\r\n\005v" + - "alue\030\004 \002(\014\022\016\n\006darcid\030\005 \002(\014\"#\n\004Coin\022\014\n\004na" + - "me\030\001 \002(\014\022\r\n\005value\030\002 \002(\004B&\n\023ch.epfl.dedis" + - ".protoB\017OmniLedgerProto" + "\n\rbyzcoin.proto\022\007byzcoin\032\017skipchain.prot" + + "o\032\nonet.proto\032\ndarc.proto\032\020collection.pr" + + "oto\"p\n\nDataHeader\022\026\n\016collectionroot\030\001 \002(" + + "\014\022\035\n\025clienttransactionhash\030\002 \002(\014\022\030\n\020stat" + + "echangeshash\030\003 \002(\014\022\021\n\ttimestamp\030\004 \002(\022\"0\n" + + "\010DataBody\022$\n\ttxresults\030\001 \003(\0132\021.byzcoin.T" + + "xResult\"\221\001\n\022CreateGenesisBlock\022\017\n\007versio" + + "n\030\001 \002(\021\022\034\n\006roster\030\002 \002(\0132\014.onet.Roster\022\037\n" + + "\013genesisdarc\030\003 \002(\0132\n.darc.Darc\022\025\n\rblocki" + + "nterval\030\004 \002(\022\022\024\n\014maxblocksize\030\005 \001(\021\"V\n\032C" + + "reateGenesisBlockResponse\022\017\n\007version\030\001 \002" + + "(\021\022\'\n\tskipblock\030\002 \001(\0132\024.skipchain.SkipBl" + + "ock\"|\n\014AddTxRequest\022\017\n\007version\030\001 \002(\021\022\023\n\013" + + "skipchainid\030\002 \002(\014\022/\n\013transaction\030\003 \002(\0132\032" + + ".byzcoin.ClientTransaction\022\025\n\rinclusionw" + + "ait\030\004 \001(\021\" \n\rAddTxResponse\022\017\n\007version\030\001 " + + "\002(\021\"4\n\010GetProof\022\017\n\007version\030\001 \002(\021\022\013\n\003key\030" + + "\002 \002(\014\022\n\n\002id\030\003 \002(\014\"B\n\020GetProofResponse\022\017\n" + + "\007version\030\001 \002(\021\022\035\n\005proof\030\002 \002(\0132\016.byzcoin." + + "Proof\"X\n\013ChainConfig\022\025\n\rblockinterval\030\001 " + + "\002(\022\022\034\n\006roster\030\002 \002(\0132\014.onet.Roster\022\024\n\014max" + + "blocksize\030\003 \002(\021\"\177\n\005Proof\022)\n\016inclusionpro" + + "of\030\001 \002(\0132\021.collection.Proof\022$\n\006latest\030\002 " + + "\002(\0132\024.skipchain.SkipBlock\022%\n\005links\030\003 \003(\013" + + "2\026.skipchain.ForwardLink\"\325\001\n\013Instruction" + + "\022\022\n\ninstanceid\030\001 \002(\014\022\r\n\005nonce\030\002 \002(\014\022\r\n\005i" + + "ndex\030\003 \002(\021\022\016\n\006length\030\004 \002(\021\022\035\n\005spawn\030\005 \001(" + + "\0132\016.byzcoin.Spawn\022\037\n\006invoke\030\006 \001(\0132\017.byzc" + + "oin.Invoke\022\037\n\006delete\030\007 \001(\0132\017.byzcoin.Del" + + "ete\022#\n\nsignatures\030\010 \003(\0132\017.darc.Signature" + + "\"<\n\005Spawn\022\022\n\ncontractid\030\001 \002(\t\022\037\n\004args\030\002 " + + "\003(\0132\021.byzcoin.Argument\":\n\006Invoke\022\017\n\007comm" + + "and\030\001 \002(\t\022\037\n\004args\030\002 \003(\0132\021.byzcoin.Argume" + + "nt\"\010\n\006Delete\"\'\n\010Argument\022\014\n\004name\030\001 \002(\t\022\r" + + "\n\005value\030\002 \002(\014\"?\n\021ClientTransaction\022*\n\014in" + + "structions\030\001 \003(\0132\024.byzcoin.Instruction\"S" + + "\n\010TxResult\0225\n\021clienttransaction\030\001 \002(\0132\032." + + "byzcoin.ClientTransaction\022\020\n\010accepted\030\002 " + + "\002(\010\"i\n\013StateChange\022\023\n\013stateaction\030\001 \002(\021\022" + + "\022\n\ninstanceid\030\002 \002(\014\022\022\n\ncontractid\030\003 \002(\014\022" + + "\r\n\005value\030\004 \002(\014\022\016\n\006darcid\030\005 \002(\014\"#\n\004Coin\022\014" + + "\n\004name\030\001 \002(\014\022\r\n\005value\030\002 \002(\004B#\n\023ch.epfl.d" + + "edis.protoB\014ByzCoinProto" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -18311,119 +18310,119 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( ch.epfl.dedis.proto.DarcProto.getDescriptor(), ch.epfl.dedis.proto.CollectionProto.getDescriptor(), }, assigner); - internal_static_omniledger_DataHeader_descriptor = + internal_static_byzcoin_DataHeader_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_omniledger_DataHeader_fieldAccessorTable = new + internal_static_byzcoin_DataHeader_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_DataHeader_descriptor, + internal_static_byzcoin_DataHeader_descriptor, new java.lang.String[] { "Collectionroot", "Clienttransactionhash", "Statechangeshash", "Timestamp", }); - internal_static_omniledger_DataBody_descriptor = + internal_static_byzcoin_DataBody_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_omniledger_DataBody_fieldAccessorTable = new + internal_static_byzcoin_DataBody_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_DataBody_descriptor, + internal_static_byzcoin_DataBody_descriptor, new java.lang.String[] { "Txresults", }); - internal_static_omniledger_CreateGenesisBlock_descriptor = + internal_static_byzcoin_CreateGenesisBlock_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_omniledger_CreateGenesisBlock_fieldAccessorTable = new + internal_static_byzcoin_CreateGenesisBlock_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_CreateGenesisBlock_descriptor, + internal_static_byzcoin_CreateGenesisBlock_descriptor, new java.lang.String[] { "Version", "Roster", "Genesisdarc", "Blockinterval", "Maxblocksize", }); - internal_static_omniledger_CreateGenesisBlockResponse_descriptor = + internal_static_byzcoin_CreateGenesisBlockResponse_descriptor = getDescriptor().getMessageTypes().get(3); - internal_static_omniledger_CreateGenesisBlockResponse_fieldAccessorTable = new + internal_static_byzcoin_CreateGenesisBlockResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_CreateGenesisBlockResponse_descriptor, + internal_static_byzcoin_CreateGenesisBlockResponse_descriptor, new java.lang.String[] { "Version", "Skipblock", }); - internal_static_omniledger_AddTxRequest_descriptor = + internal_static_byzcoin_AddTxRequest_descriptor = getDescriptor().getMessageTypes().get(4); - internal_static_omniledger_AddTxRequest_fieldAccessorTable = new + internal_static_byzcoin_AddTxRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_AddTxRequest_descriptor, + internal_static_byzcoin_AddTxRequest_descriptor, new java.lang.String[] { "Version", "Skipchainid", "Transaction", "Inclusionwait", }); - internal_static_omniledger_AddTxResponse_descriptor = + internal_static_byzcoin_AddTxResponse_descriptor = getDescriptor().getMessageTypes().get(5); - internal_static_omniledger_AddTxResponse_fieldAccessorTable = new + internal_static_byzcoin_AddTxResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_AddTxResponse_descriptor, + internal_static_byzcoin_AddTxResponse_descriptor, new java.lang.String[] { "Version", }); - internal_static_omniledger_GetProof_descriptor = + internal_static_byzcoin_GetProof_descriptor = getDescriptor().getMessageTypes().get(6); - internal_static_omniledger_GetProof_fieldAccessorTable = new + internal_static_byzcoin_GetProof_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_GetProof_descriptor, + internal_static_byzcoin_GetProof_descriptor, new java.lang.String[] { "Version", "Key", "Id", }); - internal_static_omniledger_GetProofResponse_descriptor = + internal_static_byzcoin_GetProofResponse_descriptor = getDescriptor().getMessageTypes().get(7); - internal_static_omniledger_GetProofResponse_fieldAccessorTable = new + internal_static_byzcoin_GetProofResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_GetProofResponse_descriptor, + internal_static_byzcoin_GetProofResponse_descriptor, new java.lang.String[] { "Version", "Proof", }); - internal_static_omniledger_ChainConfig_descriptor = + internal_static_byzcoin_ChainConfig_descriptor = getDescriptor().getMessageTypes().get(8); - internal_static_omniledger_ChainConfig_fieldAccessorTable = new + internal_static_byzcoin_ChainConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_ChainConfig_descriptor, + internal_static_byzcoin_ChainConfig_descriptor, new java.lang.String[] { "Blockinterval", "Roster", "Maxblocksize", }); - internal_static_omniledger_Proof_descriptor = + internal_static_byzcoin_Proof_descriptor = getDescriptor().getMessageTypes().get(9); - internal_static_omniledger_Proof_fieldAccessorTable = new + internal_static_byzcoin_Proof_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Proof_descriptor, + internal_static_byzcoin_Proof_descriptor, new java.lang.String[] { "Inclusionproof", "Latest", "Links", }); - internal_static_omniledger_Instruction_descriptor = + internal_static_byzcoin_Instruction_descriptor = getDescriptor().getMessageTypes().get(10); - internal_static_omniledger_Instruction_fieldAccessorTable = new + internal_static_byzcoin_Instruction_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Instruction_descriptor, + internal_static_byzcoin_Instruction_descriptor, new java.lang.String[] { "Instanceid", "Nonce", "Index", "Length", "Spawn", "Invoke", "Delete", "Signatures", }); - internal_static_omniledger_Spawn_descriptor = + internal_static_byzcoin_Spawn_descriptor = getDescriptor().getMessageTypes().get(11); - internal_static_omniledger_Spawn_fieldAccessorTable = new + internal_static_byzcoin_Spawn_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Spawn_descriptor, + internal_static_byzcoin_Spawn_descriptor, new java.lang.String[] { "Contractid", "Args", }); - internal_static_omniledger_Invoke_descriptor = + internal_static_byzcoin_Invoke_descriptor = getDescriptor().getMessageTypes().get(12); - internal_static_omniledger_Invoke_fieldAccessorTable = new + internal_static_byzcoin_Invoke_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Invoke_descriptor, + internal_static_byzcoin_Invoke_descriptor, new java.lang.String[] { "Command", "Args", }); - internal_static_omniledger_Delete_descriptor = + internal_static_byzcoin_Delete_descriptor = getDescriptor().getMessageTypes().get(13); - internal_static_omniledger_Delete_fieldAccessorTable = new + internal_static_byzcoin_Delete_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Delete_descriptor, + internal_static_byzcoin_Delete_descriptor, new java.lang.String[] { }); - internal_static_omniledger_Argument_descriptor = + internal_static_byzcoin_Argument_descriptor = getDescriptor().getMessageTypes().get(14); - internal_static_omniledger_Argument_fieldAccessorTable = new + internal_static_byzcoin_Argument_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Argument_descriptor, + internal_static_byzcoin_Argument_descriptor, new java.lang.String[] { "Name", "Value", }); - internal_static_omniledger_ClientTransaction_descriptor = + internal_static_byzcoin_ClientTransaction_descriptor = getDescriptor().getMessageTypes().get(15); - internal_static_omniledger_ClientTransaction_fieldAccessorTable = new + internal_static_byzcoin_ClientTransaction_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_ClientTransaction_descriptor, + internal_static_byzcoin_ClientTransaction_descriptor, new java.lang.String[] { "Instructions", }); - internal_static_omniledger_TxResult_descriptor = + internal_static_byzcoin_TxResult_descriptor = getDescriptor().getMessageTypes().get(16); - internal_static_omniledger_TxResult_fieldAccessorTable = new + internal_static_byzcoin_TxResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_TxResult_descriptor, + internal_static_byzcoin_TxResult_descriptor, new java.lang.String[] { "Clienttransaction", "Accepted", }); - internal_static_omniledger_StateChange_descriptor = + internal_static_byzcoin_StateChange_descriptor = getDescriptor().getMessageTypes().get(17); - internal_static_omniledger_StateChange_fieldAccessorTable = new + internal_static_byzcoin_StateChange_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_StateChange_descriptor, + internal_static_byzcoin_StateChange_descriptor, new java.lang.String[] { "Stateaction", "Instanceid", "Contractid", "Value", "Darcid", }); - internal_static_omniledger_Coin_descriptor = + internal_static_byzcoin_Coin_descriptor = getDescriptor().getMessageTypes().get(18); - internal_static_omniledger_Coin_fieldAccessorTable = new + internal_static_byzcoin_Coin_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omniledger_Coin_descriptor, + internal_static_byzcoin_Coin_descriptor, new java.lang.String[] { "Name", "Value", }); ch.epfl.dedis.proto.SkipchainProto.getDescriptor(); ch.epfl.dedis.proto.OnetProto.getDescriptor(); diff --git a/external/java/src/main/java/ch/epfl/dedis/proto/Calypso.java b/external/java/src/main/java/ch/epfl/dedis/proto/Calypso.java index d7cc1fa16b..7fbe5de1af 100644 --- a/external/java/src/main/java/ch/epfl/dedis/proto/Calypso.java +++ b/external/java/src/main/java/ch/epfl/dedis/proto/Calypso.java @@ -2192,20 +2192,20 @@ public interface CreateLTSOrBuilder extends /** *
-     * OLID is the ID of the OmniLedger that can use this LTS.
+     * BCID is the ID of the ByzCoin ledger that can use this LTS.
      * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - boolean hasOlid(); + boolean hasBcid(); /** *
-     * OLID is the ID of the OmniLedger that can use this LTS.
+     * BCID is the ID of the ByzCoin ledger that can use this LTS.
      * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - com.google.protobuf.ByteString getOlid(); + com.google.protobuf.ByteString getBcid(); } /** *
@@ -2224,7 +2224,7 @@ private CreateLTS(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
     private CreateLTS() {
-      olid_ = com.google.protobuf.ByteString.EMPTY;
+      bcid_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -2273,7 +2273,7 @@ private CreateLTS(
             }
             case 18: {
               bitField0_ |= 0x00000002;
-              olid_ = input.readBytes();
+              bcid_ = input.readBytes();
               break;
             }
           }
@@ -2334,27 +2334,27 @@ public ch.epfl.dedis.proto.OnetProto.RosterOrBuilder getRosterOrBuilder() {
       return roster_ == null ? ch.epfl.dedis.proto.OnetProto.Roster.getDefaultInstance() : roster_;
     }
 
-    public static final int OLID_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString olid_;
+    public static final int BCID_FIELD_NUMBER = 2;
+    private com.google.protobuf.ByteString bcid_;
     /**
      * 
-     * OLID is the ID of the OmniLedger that can use this LTS.
+     * BCID is the ID of the ByzCoin ledger that can use this LTS.
      * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public boolean hasOlid() { + public boolean hasBcid() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** *
-     * OLID is the ID of the OmniLedger that can use this LTS.
+     * BCID is the ID of the ByzCoin ledger that can use this LTS.
      * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public com.google.protobuf.ByteString getOlid() { - return olid_; + public com.google.protobuf.ByteString getBcid() { + return bcid_; } private byte memoizedIsInitialized = -1; @@ -2367,7 +2367,7 @@ public final boolean isInitialized() { memoizedIsInitialized = 0; return false; } - if (!hasOlid()) { + if (!hasBcid()) { memoizedIsInitialized = 0; return false; } @@ -2385,7 +2385,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(1, getRoster()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, olid_); + output.writeBytes(2, bcid_); } unknownFields.writeTo(output); } @@ -2401,7 +2401,7 @@ public int getSerializedSize() { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, olid_); + .computeBytesSize(2, bcid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2424,10 +2424,10 @@ public boolean equals(final java.lang.Object obj) { result = result && getRoster() .equals(other.getRoster()); } - result = result && (hasOlid() == other.hasOlid()); - if (hasOlid()) { - result = result && getOlid() - .equals(other.getOlid()); + result = result && (hasBcid() == other.hasBcid()); + if (hasBcid()) { + result = result && getBcid() + .equals(other.getBcid()); } result = result && unknownFields.equals(other.unknownFields); return result; @@ -2444,9 +2444,9 @@ public int hashCode() { hash = (37 * hash) + ROSTER_FIELD_NUMBER; hash = (53 * hash) + getRoster().hashCode(); } - if (hasOlid()) { - hash = (37 * hash) + OLID_FIELD_NUMBER; - hash = (53 * hash) + getOlid().hashCode(); + if (hasBcid()) { + hash = (37 * hash) + BCID_FIELD_NUMBER; + hash = (53 * hash) + getBcid().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -2588,7 +2588,7 @@ public Builder clear() { rosterBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - olid_ = com.google.protobuf.ByteString.EMPTY; + bcid_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -2625,7 +2625,7 @@ public ch.epfl.dedis.proto.Calypso.CreateLTS buildPartial() { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.olid_ = olid_; + result.bcid_ = bcid_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2671,8 +2671,8 @@ public Builder mergeFrom(ch.epfl.dedis.proto.Calypso.CreateLTS other) { if (other.hasRoster()) { mergeRoster(other.getRoster()); } - if (other.hasOlid()) { - setOlid(other.getOlid()); + if (other.hasBcid()) { + setBcid(other.getBcid()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -2683,7 +2683,7 @@ public final boolean isInitialized() { if (!hasRoster()) { return false; } - if (!hasOlid()) { + if (!hasBcid()) { return false; } if (!getRoster().isInitialized()) { @@ -2865,53 +2865,53 @@ public ch.epfl.dedis.proto.OnetProto.RosterOrBuilder getRosterOrBuilder() { return rosterBuilder_; } - private com.google.protobuf.ByteString olid_ = com.google.protobuf.ByteString.EMPTY; + private com.google.protobuf.ByteString bcid_ = com.google.protobuf.ByteString.EMPTY; /** *
-       * OLID is the ID of the OmniLedger that can use this LTS.
+       * BCID is the ID of the ByzCoin ledger that can use this LTS.
        * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public boolean hasOlid() { + public boolean hasBcid() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** *
-       * OLID is the ID of the OmniLedger that can use this LTS.
+       * BCID is the ID of the ByzCoin ledger that can use this LTS.
        * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public com.google.protobuf.ByteString getOlid() { - return olid_; + public com.google.protobuf.ByteString getBcid() { + return bcid_; } /** *
-       * OLID is the ID of the OmniLedger that can use this LTS.
+       * BCID is the ID of the ByzCoin ledger that can use this LTS.
        * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public Builder setOlid(com.google.protobuf.ByteString value) { + public Builder setBcid(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; - olid_ = value; + bcid_ = value; onChanged(); return this; } /** *
-       * OLID is the ID of the OmniLedger that can use this LTS.
+       * BCID is the ID of the ByzCoin ledger that can use this LTS.
        * 
* - * required bytes olid = 2; + * required bytes bcid = 2; */ - public Builder clearOlid() { + public Builder clearBcid() { bitField0_ = (bitField0_ & ~0x00000002); - olid_ = getDefaultInstance().getOlid(); + bcid_ = getDefaultInstance().getBcid(); onChanged(); return this; } @@ -3634,7 +3634,7 @@ public interface DecryptKeyOrBuilder extends * Read is the proof that he has been accepted to read the secret. *
* - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ boolean hasRead(); /** @@ -3642,24 +3642,24 @@ public interface DecryptKeyOrBuilder extends * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.Proof getRead(); + ch.epfl.dedis.proto.ByzCoinProto.Proof getRead(); /** *
      * Read is the proof that he has been accepted to read the secret.
      * 
* - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getReadOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getReadOrBuilder(); /** *
      * Write is the proof containing the write request.
      * 
* - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ boolean hasWrite(); /** @@ -3667,22 +3667,22 @@ public interface DecryptKeyOrBuilder extends * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.Proof getWrite(); + ch.epfl.dedis.proto.ByzCoinProto.Proof getWrite(); /** *
      * Write is the proof containing the write request.
      * 
* - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getWriteOrBuilder(); + ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getWriteOrBuilder(); } /** *
    * DecryptKey is sent by a reader after he successfully stored a 'Read' request
-   * in omniledger.
+   * in byzcoin.
    * 
* * Protobuf type {@code calypso.DecryptKey} @@ -3731,11 +3731,11 @@ private DecryptKey( break; } case 10: { - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = read_.toBuilder(); } - read_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Proof.PARSER, extensionRegistry); + read_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Proof.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(read_); read_ = subBuilder.buildPartial(); @@ -3744,11 +3744,11 @@ private DecryptKey( break; } case 18: { - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder subBuilder = null; + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = write_.toBuilder(); } - write_ = input.readMessage(ch.epfl.dedis.proto.OmniLedgerProto.Proof.PARSER, extensionRegistry); + write_ = input.readMessage(ch.epfl.dedis.proto.ByzCoinProto.Proof.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(write_); write_ = subBuilder.buildPartial(); @@ -3782,13 +3782,13 @@ private DecryptKey( private int bitField0_; public static final int READ_FIELD_NUMBER = 1; - private ch.epfl.dedis.proto.OmniLedgerProto.Proof read_; + private ch.epfl.dedis.proto.ByzCoinProto.Proof read_; /** *
      * Read is the proof that he has been accepted to read the secret.
      * 
* - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ public boolean hasRead() { return ((bitField0_ & 0x00000001) == 0x00000001); @@ -3798,30 +3798,30 @@ public boolean hasRead() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getRead() { - return read_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : read_; + public ch.epfl.dedis.proto.ByzCoinProto.Proof getRead() { + return read_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : read_; } /** *
      * Read is the proof that he has been accepted to read the secret.
      * 
* - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getReadOrBuilder() { - return read_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : read_; + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getReadOrBuilder() { + return read_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : read_; } public static final int WRITE_FIELD_NUMBER = 2; - private ch.epfl.dedis.proto.OmniLedgerProto.Proof write_; + private ch.epfl.dedis.proto.ByzCoinProto.Proof write_; /** *
      * Write is the proof containing the write request.
      * 
* - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ public boolean hasWrite() { return ((bitField0_ & 0x00000002) == 0x00000002); @@ -3831,20 +3831,20 @@ public boolean hasWrite() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getWrite() { - return write_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : write_; + public ch.epfl.dedis.proto.ByzCoinProto.Proof getWrite() { + return write_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : write_; } /** *
      * Write is the proof containing the write request.
      * 
* - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getWriteOrBuilder() { - return write_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : write_; + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getWriteOrBuilder() { + return write_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : write_; } private byte memoizedIsInitialized = -1; @@ -4038,7 +4038,7 @@ protected Builder newBuilderForType( /** *
      * DecryptKey is sent by a reader after he successfully stored a 'Read' request
-     * in omniledger.
+     * in byzcoin.
      * 
* * Protobuf type {@code calypso.DecryptKey} @@ -4218,15 +4218,15 @@ public Builder mergeFrom( } private int bitField0_; - private ch.epfl.dedis.proto.OmniLedgerProto.Proof read_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Proof read_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> readBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> readBuilder_; /** *
        * Read is the proof that he has been accepted to read the secret.
        * 
* - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ public boolean hasRead() { return ((bitField0_ & 0x00000001) == 0x00000001); @@ -4236,11 +4236,11 @@ public boolean hasRead() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getRead() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof getRead() { if (readBuilder_ == null) { - return read_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : read_; + return read_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : read_; } else { return readBuilder_.getMessage(); } @@ -4250,9 +4250,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof getRead() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public Builder setRead(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder setRead(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (readBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4270,10 +4270,10 @@ public Builder setRead(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ public Builder setRead( - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder builderForValue) { if (readBuilder_ == null) { read_ = builderForValue.build(); onChanged(); @@ -4288,15 +4288,15 @@ public Builder setRead( * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public Builder mergeRead(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder mergeRead(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (readBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && read_ != null && - read_ != ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance()) { + read_ != ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance()) { read_ = - ch.epfl.dedis.proto.OmniLedgerProto.Proof.newBuilder(read_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Proof.newBuilder(read_).mergeFrom(value).buildPartial(); } else { read_ = value; } @@ -4312,7 +4312,7 @@ public Builder mergeRead(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ public Builder clearRead() { if (readBuilder_ == null) { @@ -4329,9 +4329,9 @@ public Builder clearRead() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getReadBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder getReadBuilder() { bitField0_ |= 0x00000001; onChanged(); return getReadFieldBuilder().getBuilder(); @@ -4341,14 +4341,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getReadBuilder() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getReadOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getReadOrBuilder() { if (readBuilder_ != null) { return readBuilder_.getMessageOrBuilder(); } else { return read_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : read_; + ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : read_; } } /** @@ -4356,14 +4356,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getReadOrBuilder() { * Read is the proof that he has been accepted to read the secret. * * - * required .omniledger.Proof read = 1; + * required .byzcoin.Proof read = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> getReadFieldBuilder() { if (readBuilder_ == null) { readBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder>( getRead(), getParentForChildren(), isClean()); @@ -4372,15 +4372,15 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getReadOrBuilder() { return readBuilder_; } - private ch.epfl.dedis.proto.OmniLedgerProto.Proof write_ = null; + private ch.epfl.dedis.proto.ByzCoinProto.Proof write_ = null; private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> writeBuilder_; + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> writeBuilder_; /** *
        * Write is the proof containing the write request.
        * 
* - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ public boolean hasWrite() { return ((bitField0_ & 0x00000002) == 0x00000002); @@ -4390,11 +4390,11 @@ public boolean hasWrite() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof getWrite() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof getWrite() { if (writeBuilder_ == null) { - return write_ == null ? ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : write_; + return write_ == null ? ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : write_; } else { return writeBuilder_.getMessage(); } @@ -4404,9 +4404,9 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof getWrite() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public Builder setWrite(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder setWrite(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (writeBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4424,10 +4424,10 @@ public Builder setWrite(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ public Builder setWrite( - ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder builderForValue) { + ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder builderForValue) { if (writeBuilder_ == null) { write_ = builderForValue.build(); onChanged(); @@ -4442,15 +4442,15 @@ public Builder setWrite( * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public Builder mergeWrite(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { + public Builder mergeWrite(ch.epfl.dedis.proto.ByzCoinProto.Proof value) { if (writeBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && write_ != null && - write_ != ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance()) { + write_ != ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance()) { write_ = - ch.epfl.dedis.proto.OmniLedgerProto.Proof.newBuilder(write_).mergeFrom(value).buildPartial(); + ch.epfl.dedis.proto.ByzCoinProto.Proof.newBuilder(write_).mergeFrom(value).buildPartial(); } else { write_ = value; } @@ -4466,7 +4466,7 @@ public Builder mergeWrite(ch.epfl.dedis.proto.OmniLedgerProto.Proof value) { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ public Builder clearWrite() { if (writeBuilder_ == null) { @@ -4483,9 +4483,9 @@ public Builder clearWrite() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getWriteBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder getWriteBuilder() { bitField0_ |= 0x00000002; onChanged(); return getWriteFieldBuilder().getBuilder(); @@ -4495,14 +4495,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder getWriteBuilder() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ - public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getWriteOrBuilder() { + public ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder getWriteOrBuilder() { if (writeBuilder_ != null) { return writeBuilder_.getMessageOrBuilder(); } else { return write_ == null ? - ch.epfl.dedis.proto.OmniLedgerProto.Proof.getDefaultInstance() : write_; + ch.epfl.dedis.proto.ByzCoinProto.Proof.getDefaultInstance() : write_; } } /** @@ -4510,14 +4510,14 @@ public ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder getWriteOrBuilder() { * Write is the proof containing the write request. * * - * required .omniledger.Proof write = 2; + * required .byzcoin.Proof write = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder> + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder> getWriteFieldBuilder() { if (writeBuilder_ == null) { writeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - ch.epfl.dedis.proto.OmniLedgerProto.Proof, ch.epfl.dedis.proto.OmniLedgerProto.Proof.Builder, ch.epfl.dedis.proto.OmniLedgerProto.ProofOrBuilder>( + ch.epfl.dedis.proto.ByzCoinProto.Proof, ch.epfl.dedis.proto.ByzCoinProto.Proof.Builder, ch.epfl.dedis.proto.ByzCoinProto.ProofOrBuilder>( getWrite(), getParentForChildren(), isClean()); @@ -6550,20 +6550,20 @@ public ch.epfl.dedis.proto.Calypso.SharedPublicReply getDefaultInstanceForType() descriptor; static { java.lang.String[] descriptorData = { - "\n\rcalypso.proto\022\007calypso\032\020omniledger.pro" + - "to\032\nonet.proto\"r\n\005Write\022\014\n\004data\030\001 \002(\014\022\t\n" + - "\001u\030\002 \002(\014\022\014\n\004ubar\030\003 \002(\014\022\t\n\001e\030\004 \002(\014\022\t\n\001f\030\005" + - " \002(\014\022\n\n\002cs\030\006 \003(\014\022\021\n\textradata\030\007 \001(\014\022\r\n\005l" + - "tsid\030\010 \002(\014\"!\n\004Read\022\r\n\005write\030\001 \002(\014\022\n\n\002xc\030" + - "\002 \002(\014\"7\n\tCreateLTS\022\034\n\006roster\030\001 \002(\0132\014.one" + - "t.Roster\022\014\n\004olid\030\002 \002(\014\"*\n\016CreateLTSReply" + - "\022\r\n\005ltsid\030\001 \002(\014\022\t\n\001x\030\002 \002(\014\"O\n\nDecryptKey" + - "\022\037\n\004read\030\001 \002(\0132\021.omniledger.Proof\022 \n\005wri" + - "te\030\002 \002(\0132\021.omniledger.Proof\"9\n\017DecryptKe" + - "yReply\022\n\n\002cs\030\001 \003(\014\022\017\n\007xhatenc\030\002 \002(\014\022\t\n\001x" + - "\030\003 \002(\014\"\035\n\014SharedPublic\022\r\n\005ltsid\030\001 \002(\014\"\036\n" + - "\021SharedPublicReply\022\t\n\001x\030\001 \002(\014B\036\n\023ch.epfl" + - ".dedis.protoB\007Calypso" + "\n\rcalypso.proto\022\007calypso\032\rbyzcoin.proto\032" + + "\nonet.proto\"r\n\005Write\022\014\n\004data\030\001 \002(\014\022\t\n\001u\030" + + "\002 \002(\014\022\014\n\004ubar\030\003 \002(\014\022\t\n\001e\030\004 \002(\014\022\t\n\001f\030\005 \002(" + + "\014\022\n\n\002cs\030\006 \003(\014\022\021\n\textradata\030\007 \001(\014\022\r\n\005ltsi" + + "d\030\010 \002(\014\"!\n\004Read\022\r\n\005write\030\001 \002(\014\022\n\n\002xc\030\002 \002" + + "(\014\"7\n\tCreateLTS\022\034\n\006roster\030\001 \002(\0132\014.onet.R" + + "oster\022\014\n\004bcid\030\002 \002(\014\"*\n\016CreateLTSReply\022\r\n" + + "\005ltsid\030\001 \002(\014\022\t\n\001x\030\002 \002(\014\"I\n\nDecryptKey\022\034\n" + + "\004read\030\001 \002(\0132\016.byzcoin.Proof\022\035\n\005write\030\002 \002" + + "(\0132\016.byzcoin.Proof\"9\n\017DecryptKeyReply\022\n\n" + + "\002cs\030\001 \003(\014\022\017\n\007xhatenc\030\002 \002(\014\022\t\n\001x\030\003 \002(\014\"\035\n" + + "\014SharedPublic\022\r\n\005ltsid\030\001 \002(\014\"\036\n\021SharedPu" + + "blicReply\022\t\n\001x\030\001 \002(\014B\036\n\023ch.epfl.dedis.pr" + + "otoB\007Calypso" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -6576,7 +6576,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - ch.epfl.dedis.proto.OmniLedgerProto.getDescriptor(), + ch.epfl.dedis.proto.ByzCoinProto.getDescriptor(), ch.epfl.dedis.proto.OnetProto.getDescriptor(), }, assigner); internal_static_calypso_Write_descriptor = @@ -6596,7 +6596,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_calypso_CreateLTS_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_calypso_CreateLTS_descriptor, - new java.lang.String[] { "Roster", "Olid", }); + new java.lang.String[] { "Roster", "Bcid", }); internal_static_calypso_CreateLTSReply_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_calypso_CreateLTSReply_fieldAccessorTable = new @@ -6627,7 +6627,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_calypso_SharedPublicReply_descriptor, new java.lang.String[] { "X", }); - ch.epfl.dedis.proto.OmniLedgerProto.getDescriptor(); + ch.epfl.dedis.proto.ByzCoinProto.getDescriptor(); ch.epfl.dedis.proto.OnetProto.getDescriptor(); } diff --git a/external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerContracts.java b/external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerContracts.java deleted file mode 100644 index c6ef8684d6..0000000000 --- a/external/java/src/main/java/ch/epfl/dedis/proto/OmniLedgerContracts.java +++ /dev/null @@ -1,737 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: omnicontracts.proto - -package ch.epfl.dedis.proto; - -public final class OmniLedgerContracts { - private OmniLedgerContracts() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { - } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } - public interface CoinInstanceOrBuilder extends - // @@protoc_insertion_point(interface_extends:omnicontracts.CoinInstance) - com.google.protobuf.MessageOrBuilder { - - /** - *
-     * Type denotes what coin this is. Every coin can have a type, and only
-     * compatible coins can be directly transferred. For incompatible coins,
-     * you need an exchange (not yet implemented).
-     * 
- * - * required bytes type = 1; - */ - boolean hasType(); - /** - *
-     * Type denotes what coin this is. Every coin can have a type, and only
-     * compatible coins can be directly transferred. For incompatible coins,
-     * you need an exchange (not yet implemented).
-     * 
- * - * required bytes type = 1; - */ - com.google.protobuf.ByteString getType(); - - /** - *
-     * Balance holds how many coins are stored in this account. It can only
-     * be positive.
-     * 
- * - * required uint64 balance = 2; - */ - boolean hasBalance(); - /** - *
-     * Balance holds how many coins are stored in this account. It can only
-     * be positive.
-     * 
- * - * required uint64 balance = 2; - */ - long getBalance(); - } - /** - *
-   * CoinInstance represents the data stored for a coin-account. It holds the
-   * type of the coin and the actual balance, which is always positive.
-   * 
- * - * Protobuf type {@code omnicontracts.CoinInstance} - */ - public static final class CoinInstance extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:omnicontracts.CoinInstance) - CoinInstanceOrBuilder { - private static final long serialVersionUID = 0L; - // Use CoinInstance.newBuilder() to construct. - private CoinInstance(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private CoinInstance() { - type_ = com.google.protobuf.ByteString.EMPTY; - balance_ = 0L; - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CoinInstance( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - type_ = input.readBytes(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - balance_ = input.readUInt64(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerContracts.internal_static_omnicontracts_CoinInstance_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerContracts.internal_static_omnicontracts_CoinInstance_fieldAccessorTable - .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.class, ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.Builder.class); - } - - private int bitField0_; - public static final int TYPE_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString type_; - /** - *
-     * Type denotes what coin this is. Every coin can have a type, and only
-     * compatible coins can be directly transferred. For incompatible coins,
-     * you need an exchange (not yet implemented).
-     * 
- * - * required bytes type = 1; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - *
-     * Type denotes what coin this is. Every coin can have a type, and only
-     * compatible coins can be directly transferred. For incompatible coins,
-     * you need an exchange (not yet implemented).
-     * 
- * - * required bytes type = 1; - */ - public com.google.protobuf.ByteString getType() { - return type_; - } - - public static final int BALANCE_FIELD_NUMBER = 2; - private long balance_; - /** - *
-     * Balance holds how many coins are stored in this account. It can only
-     * be positive.
-     * 
- * - * required uint64 balance = 2; - */ - public boolean hasBalance() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - *
-     * Balance holds how many coins are stored in this account. It can only
-     * be positive.
-     * 
- * - * required uint64 balance = 2; - */ - public long getBalance() { - return balance_; - } - - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasBalance()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, type_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt64(2, balance_); - } - unknownFields.writeTo(output); - } - - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, type_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(2, balance_); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance)) { - return super.equals(obj); - } - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance other = (ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance) obj; - - boolean result = true; - result = result && (hasType() == other.hasType()); - if (hasType()) { - result = result && getType() - .equals(other.getType()); - } - result = result && (hasBalance() == other.hasBalance()); - if (hasBalance()) { - result = result && (getBalance() - == other.getBalance()); - } - result = result && unknownFields.equals(other.unknownFields); - return result; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasType()) { - hash = (37 * hash) + TYPE_FIELD_NUMBER; - hash = (53 * hash) + getType().hashCode(); - } - if (hasBalance()) { - hash = (37 * hash) + BALANCE_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getBalance()); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - *
-     * CoinInstance represents the data stored for a coin-account. It holds the
-     * type of the coin and the actual balance, which is always positive.
-     * 
- * - * Protobuf type {@code omnicontracts.CoinInstance} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:omnicontracts.CoinInstance) - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstanceOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return ch.epfl.dedis.proto.OmniLedgerContracts.internal_static_omnicontracts_CoinInstance_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return ch.epfl.dedis.proto.OmniLedgerContracts.internal_static_omnicontracts_CoinInstance_fieldAccessorTable - .ensureFieldAccessorsInitialized( - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.class, ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.Builder.class); - } - - // Construct using ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - public Builder clear() { - super.clear(); - type_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - balance_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return ch.epfl.dedis.proto.OmniLedgerContracts.internal_static_omnicontracts_CoinInstance_descriptor; - } - - public ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance getDefaultInstanceForType() { - return ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.getDefaultInstance(); - } - - public ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance build() { - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance buildPartial() { - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance result = new ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.type_ = type_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.balance_ = balance_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder clone() { - return (Builder) super.clone(); - } - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return (Builder) super.setField(field, value); - } - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); - } - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); - } - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); - } - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); - } - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance) { - return mergeFrom((ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance other) { - if (other == ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance.getDefaultInstance()) return this; - if (other.hasType()) { - setType(other.getType()); - } - if (other.hasBalance()) { - setBalance(other.getBalance()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - public final boolean isInitialized() { - if (!hasType()) { - return false; - } - if (!hasBalance()) { - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private com.google.protobuf.ByteString type_ = com.google.protobuf.ByteString.EMPTY; - /** - *
-       * Type denotes what coin this is. Every coin can have a type, and only
-       * compatible coins can be directly transferred. For incompatible coins,
-       * you need an exchange (not yet implemented).
-       * 
- * - * required bytes type = 1; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - *
-       * Type denotes what coin this is. Every coin can have a type, and only
-       * compatible coins can be directly transferred. For incompatible coins,
-       * you need an exchange (not yet implemented).
-       * 
- * - * required bytes type = 1; - */ - public com.google.protobuf.ByteString getType() { - return type_; - } - /** - *
-       * Type denotes what coin this is. Every coin can have a type, and only
-       * compatible coins can be directly transferred. For incompatible coins,
-       * you need an exchange (not yet implemented).
-       * 
- * - * required bytes type = 1; - */ - public Builder setType(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - type_ = value; - onChanged(); - return this; - } - /** - *
-       * Type denotes what coin this is. Every coin can have a type, and only
-       * compatible coins can be directly transferred. For incompatible coins,
-       * you need an exchange (not yet implemented).
-       * 
- * - * required bytes type = 1; - */ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000001); - type_ = getDefaultInstance().getType(); - onChanged(); - return this; - } - - private long balance_ ; - /** - *
-       * Balance holds how many coins are stored in this account. It can only
-       * be positive.
-       * 
- * - * required uint64 balance = 2; - */ - public boolean hasBalance() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - *
-       * Balance holds how many coins are stored in this account. It can only
-       * be positive.
-       * 
- * - * required uint64 balance = 2; - */ - public long getBalance() { - return balance_; - } - /** - *
-       * Balance holds how many coins are stored in this account. It can only
-       * be positive.
-       * 
- * - * required uint64 balance = 2; - */ - public Builder setBalance(long value) { - bitField0_ |= 0x00000002; - balance_ = value; - onChanged(); - return this; - } - /** - *
-       * Balance holds how many coins are stored in this account. It can only
-       * be positive.
-       * 
- * - * required uint64 balance = 2; - */ - public Builder clearBalance() { - bitField0_ = (bitField0_ & ~0x00000002); - balance_ = 0L; - onChanged(); - return this; - } - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:omnicontracts.CoinInstance) - } - - // @@protoc_insertion_point(class_scope:omnicontracts.CoinInstance) - private static final ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance(); - } - - public static ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - @java.lang.Deprecated public static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - public CoinInstance parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CoinInstance(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public ch.epfl.dedis.proto.OmniLedgerContracts.CoinInstance getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_omnicontracts_CoinInstance_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_omnicontracts_CoinInstance_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n\023omnicontracts.proto\022\romnicontracts\"-\n\014" + - "CoinInstance\022\014\n\004type\030\001 \002(\014\022\017\n\007balance\030\002 " + - "\002(\004B*\n\023ch.epfl.dedis.protoB\023OmniLedgerCo" + - "ntracts" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - internal_static_omnicontracts_CoinInstance_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_omnicontracts_CoinInstance_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_omnicontracts_CoinInstance_descriptor, - new java.lang.String[] { "Type", "Balance", }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/external/java/src/main/java/ch/epfl/dedis/proto/Personhood.java b/external/java/src/main/java/ch/epfl/dedis/proto/Personhood.java index bcfe202d5f..1c99bb7f9b 100644 --- a/external/java/src/main/java/ch/epfl/dedis/proto/Personhood.java +++ b/external/java/src/main/java/ch/epfl/dedis/proto/Personhood.java @@ -636,24 +636,24 @@ public interface PartyOrBuilder extends /** *
-     * OmniLedgerID represents the omniledger where the pop-party is stored.
+     * ByzCoinID represents the ledger where the pop-party is stored.
      * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - boolean hasOmniledgerid(); + boolean hasByzcoinid(); /** *
-     * OmniLedgerID represents the omniledger where the pop-party is stored.
+     * ByzCoinID represents the ledger where the pop-party is stored.
      * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - com.google.protobuf.ByteString getOmniledgerid(); + com.google.protobuf.ByteString getByzcoinid(); /** *
-     * InstanceID is where to find the party on OmniLedger
+     * InstanceID is where to find the party in the ledger.
      * 
* * required bytes instanceid = 2; @@ -661,7 +661,7 @@ public interface PartyOrBuilder extends boolean hasInstanceid(); /** *
-     * InstanceID is where to find the party on OmniLedger
+     * InstanceID is where to find the party in the ledger.
      * 
* * required bytes instanceid = 2; @@ -745,7 +745,7 @@ public interface PartyOrBuilder extends } /** *
-   * Party represents everything necessary to find a party on omniledger.
+   * Party represents everything necessary to find a party in the ledger.
    * 
* * Protobuf type {@code personhood.Party} @@ -760,7 +760,7 @@ private Party(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private Party() { - omniledgerid_ = com.google.protobuf.ByteString.EMPTY; + byzcoinid_ = com.google.protobuf.ByteString.EMPTY; instanceid_ = com.google.protobuf.ByteString.EMPTY; } @@ -797,7 +797,7 @@ private Party( } case 10: { bitField0_ |= 0x00000001; - omniledgerid_ = input.readBytes(); + byzcoinid_ = input.readBytes(); break; } case 18: { @@ -869,34 +869,34 @@ private Party( } private int bitField0_; - public static final int OMNILEDGERID_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString omniledgerid_; + public static final int BYZCOINID_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString byzcoinid_; /** *
-     * OmniLedgerID represents the omniledger where the pop-party is stored.
+     * ByzCoinID represents the ledger where the pop-party is stored.
      * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public boolean hasOmniledgerid() { + public boolean hasByzcoinid() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** *
-     * OmniLedgerID represents the omniledger where the pop-party is stored.
+     * ByzCoinID represents the ledger where the pop-party is stored.
      * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public com.google.protobuf.ByteString getOmniledgerid() { - return omniledgerid_; + public com.google.protobuf.ByteString getByzcoinid() { + return byzcoinid_; } public static final int INSTANCEID_FIELD_NUMBER = 2; private com.google.protobuf.ByteString instanceid_; /** *
-     * InstanceID is where to find the party on OmniLedger
+     * InstanceID is where to find the party in the ledger.
      * 
* * required bytes instanceid = 2; @@ -906,7 +906,7 @@ public boolean hasInstanceid() { } /** *
-     * InstanceID is where to find the party on OmniLedger
+     * InstanceID is where to find the party in the ledger.
      * 
* * required bytes instanceid = 2; @@ -1020,7 +1020,7 @@ public final boolean isInitialized() { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasOmniledgerid()) { + if (!hasByzcoinid()) { memoizedIsInitialized = 0; return false; } @@ -1059,7 +1059,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, omniledgerid_); + output.writeBytes(1, byzcoinid_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeBytes(2, instanceid_); @@ -1083,7 +1083,7 @@ public int getSerializedSize() { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, omniledgerid_); + .computeBytesSize(1, byzcoinid_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream @@ -1117,10 +1117,10 @@ public boolean equals(final java.lang.Object obj) { ch.epfl.dedis.proto.Personhood.Party other = (ch.epfl.dedis.proto.Personhood.Party) obj; boolean result = true; - result = result && (hasOmniledgerid() == other.hasOmniledgerid()); - if (hasOmniledgerid()) { - result = result && getOmniledgerid() - .equals(other.getOmniledgerid()); + result = result && (hasByzcoinid() == other.hasByzcoinid()); + if (hasByzcoinid()) { + result = result && getByzcoinid() + .equals(other.getByzcoinid()); } result = result && (hasInstanceid() == other.hasInstanceid()); if (hasInstanceid()) { @@ -1153,9 +1153,9 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasOmniledgerid()) { - hash = (37 * hash) + OMNILEDGERID_FIELD_NUMBER; - hash = (53 * hash) + getOmniledgerid().hashCode(); + if (hasByzcoinid()) { + hash = (37 * hash) + BYZCOINID_FIELD_NUMBER; + hash = (53 * hash) + getByzcoinid().hashCode(); } if (hasInstanceid()) { hash = (37 * hash) + INSTANCEID_FIELD_NUMBER; @@ -1268,7 +1268,7 @@ protected Builder newBuilderForType( } /** *
-     * Party represents everything necessary to find a party on omniledger.
+     * Party represents everything necessary to find a party in the ledger.
      * 
* * Protobuf type {@code personhood.Party} @@ -1309,7 +1309,7 @@ private void maybeForceBuilderInitialization() { } public Builder clear() { super.clear(); - omniledgerid_ = com.google.protobuf.ByteString.EMPTY; + byzcoinid_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); instanceid_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); @@ -1358,7 +1358,7 @@ public ch.epfl.dedis.proto.Personhood.Party buildPartial() { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.omniledgerid_ = omniledgerid_; + result.byzcoinid_ = byzcoinid_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -1429,8 +1429,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(ch.epfl.dedis.proto.Personhood.Party other) { if (other == ch.epfl.dedis.proto.Personhood.Party.getDefaultInstance()) return this; - if (other.hasOmniledgerid()) { - setOmniledgerid(other.getOmniledgerid()); + if (other.hasByzcoinid()) { + setByzcoinid(other.getByzcoinid()); } if (other.hasInstanceid()) { setInstanceid(other.getInstanceid()); @@ -1450,7 +1450,7 @@ public Builder mergeFrom(ch.epfl.dedis.proto.Personhood.Party other) { } public final boolean isInitialized() { - if (!hasOmniledgerid()) { + if (!hasByzcoinid()) { return false; } if (!hasInstanceid()) { @@ -1496,53 +1496,53 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.ByteString omniledgerid_ = com.google.protobuf.ByteString.EMPTY; + private com.google.protobuf.ByteString byzcoinid_ = com.google.protobuf.ByteString.EMPTY; /** *
-       * OmniLedgerID represents the omniledger where the pop-party is stored.
+       * ByzCoinID represents the ledger where the pop-party is stored.
        * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public boolean hasOmniledgerid() { + public boolean hasByzcoinid() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** *
-       * OmniLedgerID represents the omniledger where the pop-party is stored.
+       * ByzCoinID represents the ledger where the pop-party is stored.
        * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public com.google.protobuf.ByteString getOmniledgerid() { - return omniledgerid_; + public com.google.protobuf.ByteString getByzcoinid() { + return byzcoinid_; } /** *
-       * OmniLedgerID represents the omniledger where the pop-party is stored.
+       * ByzCoinID represents the ledger where the pop-party is stored.
        * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public Builder setOmniledgerid(com.google.protobuf.ByteString value) { + public Builder setByzcoinid(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000001; - omniledgerid_ = value; + byzcoinid_ = value; onChanged(); return this; } /** *
-       * OmniLedgerID represents the omniledger where the pop-party is stored.
+       * ByzCoinID represents the ledger where the pop-party is stored.
        * 
* - * required bytes omniledgerid = 1; + * required bytes byzcoinid = 1; */ - public Builder clearOmniledgerid() { + public Builder clearByzcoinid() { bitField0_ = (bitField0_ & ~0x00000001); - omniledgerid_ = getDefaultInstance().getOmniledgerid(); + byzcoinid_ = getDefaultInstance().getByzcoinid(); onChanged(); return this; } @@ -1550,7 +1550,7 @@ public Builder clearOmniledgerid() { private com.google.protobuf.ByteString instanceid_ = com.google.protobuf.ByteString.EMPTY; /** *
-       * InstanceID is where to find the party on OmniLedger
+       * InstanceID is where to find the party in the ledger.
        * 
* * required bytes instanceid = 2; @@ -1560,7 +1560,7 @@ public boolean hasInstanceid() { } /** *
-       * InstanceID is where to find the party on OmniLedger
+       * InstanceID is where to find the party in the ledger.
        * 
* * required bytes instanceid = 2; @@ -1570,7 +1570,7 @@ public com.google.protobuf.ByteString getInstanceid() { } /** *
-       * InstanceID is where to find the party on OmniLedger
+       * InstanceID is where to find the party in the ledger.
        * 
* * required bytes instanceid = 2; @@ -1586,7 +1586,7 @@ public Builder setInstanceid(com.google.protobuf.ByteString value) { } /** *
-       * InstanceID is where to find the party on OmniLedger
+       * InstanceID is where to find the party in the ledger.
        * 
* * required bytes instanceid = 2; @@ -14962,36 +14962,36 @@ public ch.epfl.dedis.proto.Personhood.TopupMessage getDefaultInstanceForType() { java.lang.String[] descriptorData = { "\n\020personhood.proto\022\npersonhood\032\ndarc.pro" + "to\032\tpop.proto\"+\n\007LinkPoP\022 \n\005party\030\001 \002(\0132" + - "\021.personhood.Party\"\226\001\n\005Party\022\024\n\014omniledg" + - "erid\030\001 \002(\014\022\022\n\ninstanceid\030\002 \002(\014\022+\n\016finals" + - "tatement\030\003 \002(\0132\023.pop.FinalStatement\022\030\n\004d" + - "arc\030\004 \002(\0132\n.darc.Darc\022\034\n\006signer\030\005 \002(\0132\014." + - "darc.Signer\"\034\n\013StringReply\022\r\n\005reply\030\001 \002(" + - "\t\"o\n\rQuestionnaire\022\r\n\005title\030\001 \002(\t\022\021\n\tque" + - "stions\030\002 \003(\t\022\017\n\007replies\030\003 \002(\021\022\017\n\007balance" + - "\030\004 \002(\004\022\016\n\006reward\030\005 \002(\004\022\n\n\002id\030\006 \002(\014\"#\n\005Re" + - "ply\022\013\n\003sum\030\001 \003(\021\022\r\n\005users\030\002 \003(\014\"I\n\025Regis" + - "terQuestionnaire\0220\n\rquestionnaire\030\001 \002(\0132" + - "\031.personhood.Questionnaire\"3\n\022ListQuesti" + - "onnaires\022\r\n\005start\030\001 \002(\021\022\016\n\006number\030\002 \002(\021\"" + - "L\n\027ListQuestionnairesReply\0221\n\016questionna" + - "ires\030\001 \003(\0132\031.personhood.Questionnaire\"H\n" + - "\023AnswerQuestionnaire\022\017\n\007questid\030\001 \002(\014\022\017\n" + - "\007replies\030\002 \003(\021\022\017\n\007account\030\003 \002(\014\"4\n\022Topup" + - "Questionnaire\022\017\n\007questid\030\001 \002(\014\022\r\n\005topup\030" + - "\002 \002(\004\"s\n\007Message\022\017\n\007subject\030\001 \002(\t\022\014\n\004dat" + - "e\030\002 \002(\004\022\014\n\004text\030\003 \002(\t\022\016\n\006author\030\004 \002(\014\022\017\n" + - "\007balance\030\005 \002(\004\022\016\n\006reward\030\006 \002(\004\022\n\n\002id\030\007 \002" + - "(\014\"3\n\013SendMessage\022$\n\007message\030\001 \002(\0132\023.per" + - "sonhood.Message\"-\n\014ListMessages\022\r\n\005start" + - "\030\001 \002(\021\022\016\n\006number\030\002 \002(\021\"X\n\021ListMessagesRe" + - "ply\022\020\n\010subjects\030\001 \003(\t\022\016\n\006msgids\030\002 \003(\014\022\020\n" + - "\010balances\030\003 \003(\004\022\017\n\007rewards\030\004 \003(\004\">\n\013Read" + - "Message\022\r\n\005msgid\030\001 \002(\014\022\020\n\010partyiid\030\002 \002(\014" + - "\022\016\n\006reader\030\003 \002(\014\"8\n\020ReadMessageReply\022$\n\007" + - "message\030\001 \002(\0132\023.personhood.Message\"-\n\014To" + - "pupMessage\022\r\n\005msgid\030\001 \002(\014\022\016\n\006amount\030\002 \002(" + - "\004B!\n\023ch.epfl.dedis.protoB\nPersonhood" + "\021.personhood.Party\"\223\001\n\005Party\022\021\n\tbyzcoini" + + "d\030\001 \002(\014\022\022\n\ninstanceid\030\002 \002(\014\022+\n\016finalstat" + + "ement\030\003 \002(\0132\023.pop.FinalStatement\022\030\n\004darc" + + "\030\004 \002(\0132\n.darc.Darc\022\034\n\006signer\030\005 \002(\0132\014.dar" + + "c.Signer\"\034\n\013StringReply\022\r\n\005reply\030\001 \002(\t\"o" + + "\n\rQuestionnaire\022\r\n\005title\030\001 \002(\t\022\021\n\tquesti" + + "ons\030\002 \003(\t\022\017\n\007replies\030\003 \002(\021\022\017\n\007balance\030\004 " + + "\002(\004\022\016\n\006reward\030\005 \002(\004\022\n\n\002id\030\006 \002(\014\"#\n\005Reply" + + "\022\013\n\003sum\030\001 \003(\021\022\r\n\005users\030\002 \003(\014\"I\n\025Register" + + "Questionnaire\0220\n\rquestionnaire\030\001 \002(\0132\031.p" + + "ersonhood.Questionnaire\"3\n\022ListQuestionn" + + "aires\022\r\n\005start\030\001 \002(\021\022\016\n\006number\030\002 \002(\021\"L\n\027" + + "ListQuestionnairesReply\0221\n\016questionnaire" + + "s\030\001 \003(\0132\031.personhood.Questionnaire\"H\n\023An" + + "swerQuestionnaire\022\017\n\007questid\030\001 \002(\014\022\017\n\007re" + + "plies\030\002 \003(\021\022\017\n\007account\030\003 \002(\014\"4\n\022TopupQue" + + "stionnaire\022\017\n\007questid\030\001 \002(\014\022\r\n\005topup\030\002 \002" + + "(\004\"s\n\007Message\022\017\n\007subject\030\001 \002(\t\022\014\n\004date\030\002" + + " \002(\004\022\014\n\004text\030\003 \002(\t\022\016\n\006author\030\004 \002(\014\022\017\n\007ba" + + "lance\030\005 \002(\004\022\016\n\006reward\030\006 \002(\004\022\n\n\002id\030\007 \002(\014\"" + + "3\n\013SendMessage\022$\n\007message\030\001 \002(\0132\023.person" + + "hood.Message\"-\n\014ListMessages\022\r\n\005start\030\001 " + + "\002(\021\022\016\n\006number\030\002 \002(\021\"X\n\021ListMessagesReply" + + "\022\020\n\010subjects\030\001 \003(\t\022\016\n\006msgids\030\002 \003(\014\022\020\n\010ba" + + "lances\030\003 \003(\004\022\017\n\007rewards\030\004 \003(\004\">\n\013ReadMes" + + "sage\022\r\n\005msgid\030\001 \002(\014\022\020\n\010partyiid\030\002 \002(\014\022\016\n" + + "\006reader\030\003 \002(\014\"8\n\020ReadMessageReply\022$\n\007mes" + + "sage\030\001 \002(\0132\023.personhood.Message\"-\n\014Topup" + + "Message\022\r\n\005msgid\030\001 \002(\014\022\016\n\006amount\030\002 \002(\004B!" + + "\n\023ch.epfl.dedis.protoB\nPersonhood" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -15018,7 +15018,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_personhood_Party_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_personhood_Party_descriptor, - new java.lang.String[] { "Omniledgerid", "Instanceid", "Finalstatement", "Darc", "Signer", }); + new java.lang.String[] { "Byzcoinid", "Instanceid", "Finalstatement", "Darc", "Signer", }); internal_static_personhood_StringReply_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_personhood_StringReply_fieldAccessorTable = new diff --git a/external/java/src/main/java/ch/epfl/dedis/proto/PoPProto.java b/external/java/src/main/java/ch/epfl/dedis/proto/PoPProto.java index f065ff5c69..240a458525 100644 --- a/external/java/src/main/java/ch/epfl/dedis/proto/PoPProto.java +++ b/external/java/src/main/java/ch/epfl/dedis/proto/PoPProto.java @@ -15522,7 +15522,7 @@ public interface StoreInstanceIDOrBuilder extends } /** *
-   * StoreInstanceID writes an InstanceID from OmniLedger to a FinalStatement.
+   * StoreInstanceID writes an InstanceID from ByzCoin to a FinalStatement.
    * 
* * Protobuf type {@code pop.StoreInstanceID} @@ -15819,7 +15819,7 @@ protected Builder newBuilderForType( } /** *
-     * StoreInstanceID writes an InstanceID from OmniLedger to a FinalStatement.
+     * StoreInstanceID writes an InstanceID from ByzCoin to a FinalStatement.
      * 
* * Protobuf type {@code pop.StoreInstanceID} @@ -16503,7 +16503,7 @@ public interface GetInstanceIDOrBuilder extends } /** *
-   * GetInstanceID requests an InstanceID from OmniLedger to a FinalStatement.
+   * GetInstanceID requests an InstanceID from ByzCoin to a FinalStatement.
    * 
* * Protobuf type {@code pop.GetInstanceID} @@ -16759,7 +16759,7 @@ protected Builder newBuilderForType( } /** *
-     * GetInstanceID requests an InstanceID from OmniLedger to a FinalStatement.
+     * GetInstanceID requests an InstanceID from ByzCoin to a FinalStatement.
      * 
* * Protobuf type {@code pop.GetInstanceID} @@ -17512,7 +17512,7 @@ public interface StoreSignerOrBuilder extends } /** *
-   * StoreSigner writes an Signer from OmniLedger to a FinalStatement.
+   * StoreSigner writes an Signer from ByzCoin to a FinalStatement.
    * 
* * Protobuf type {@code pop.StoreSigner} @@ -17826,7 +17826,7 @@ protected Builder newBuilderForType( } /** *
-     * StoreSigner writes an Signer from OmniLedger to a FinalStatement.
+     * StoreSigner writes an Signer from ByzCoin to a FinalStatement.
      * 
* * Protobuf type {@code pop.StoreSigner} @@ -18605,7 +18605,7 @@ public interface GetSignerOrBuilder extends } /** *
-   * GetSigner requests an Signer from OmniLedger to a FinalStatement.
+   * GetSigner requests an Signer from ByzCoin to a FinalStatement.
    * 
* * Protobuf type {@code pop.GetSigner} @@ -18861,7 +18861,7 @@ protected Builder newBuilderForType( } /** *
-     * GetSigner requests an Signer from OmniLedger to a FinalStatement.
+     * GetSigner requests an Signer from ByzCoin to a FinalStatement.
      * 
* * Protobuf type {@code pop.GetSigner} @@ -22190,7 +22190,7 @@ public interface PopPartyInstanceOrBuilder extends /** *
-     * Next is a link to the omniledger instanceID of the next party. It can be
+     * Next is a link to the instanceID of the next party. It can be
      * nil if there is no next party.
      * 
* @@ -22199,7 +22199,7 @@ public interface PopPartyInstanceOrBuilder extends boolean hasNext(); /** *
-     * Next is a link to the omniledger instanceID of the next party. It can be
+     * Next is a link to the instanceID of the next party. It can be
      * nil if there is no next party.
      * 
* @@ -22428,7 +22428,7 @@ public com.google.protobuf.ByteString getPrevious() { private com.google.protobuf.ByteString next_; /** *
-     * Next is a link to the omniledger instanceID of the next party. It can be
+     * Next is a link to the instanceID of the next party. It can be
      * nil if there is no next party.
      * 
* @@ -22439,7 +22439,7 @@ public boolean hasNext() { } /** *
-     * Next is a link to the omniledger instanceID of the next party. It can be
+     * Next is a link to the instanceID of the next party. It can be
      * nil if there is no next party.
      * 
* @@ -23189,7 +23189,7 @@ public Builder clearPrevious() { private com.google.protobuf.ByteString next_ = com.google.protobuf.ByteString.EMPTY; /** *
-       * Next is a link to the omniledger instanceID of the next party. It can be
+       * Next is a link to the instanceID of the next party. It can be
        * nil if there is no next party.
        * 
* @@ -23200,7 +23200,7 @@ public boolean hasNext() { } /** *
-       * Next is a link to the omniledger instanceID of the next party. It can be
+       * Next is a link to the instanceID of the next party. It can be
        * nil if there is no next party.
        * 
* @@ -23211,7 +23211,7 @@ public com.google.protobuf.ByteString getNext() { } /** *
-       * Next is a link to the omniledger instanceID of the next party. It can be
+       * Next is a link to the instanceID of the next party. It can be
        * nil if there is no next party.
        * 
* @@ -23228,7 +23228,7 @@ public Builder setNext(com.google.protobuf.ByteString value) { } /** *
-       * Next is a link to the omniledger instanceID of the next party. It can be
+       * Next is a link to the instanceID of the next party. It can be
        * nil if there is no next party.
        * 
* diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPCTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPCTest.java similarity index 81% rename from external/java/src/test/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPCTest.java rename to external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPCTest.java index ff13eaec7d..175b4ee646 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/OmniledgerRPCTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/ByzCoinRPCTest.java @@ -1,13 +1,13 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; import ch.epfl.dedis.integration.TestServerController; import ch.epfl.dedis.integration.TestServerInit; import ch.epfl.dedis.lib.SkipBlock; import ch.epfl.dedis.lib.SkipblockId; +import ch.epfl.dedis.lib.byzcoin.contracts.DarcInstance; +import ch.epfl.dedis.lib.byzcoin.contracts.ValueInstance; +import ch.epfl.dedis.lib.byzcoin.darc.*; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.lib.omniledger.contracts.DarcInstance; -import ch.epfl.dedis.lib.omniledger.contracts.ValueInstance; -import ch.epfl.dedis.lib.omniledger.darc.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -20,13 +20,13 @@ import static java.time.temporal.ChronoUnit.MILLIS; import static org.junit.jupiter.api.Assertions.*; -public class OmniledgerRPCTest { - static OmniledgerRPC ol; +public class ByzCoinRPCTest { + static ByzCoinRPC bc; static Signer admin; static Darc genesisDarc; - private final static Logger logger = LoggerFactory.getLogger(OmniledgerRPCTest.class); + private final static Logger logger = LoggerFactory.getLogger(ByzCoinRPCTest.class); private TestServerController testInstanceController; @BeforeEach @@ -37,27 +37,27 @@ void initAll() throws Exception { Arrays.asList(admin.getIdentity())); genesisDarc = new Darc(rules, "genesis".getBytes()); - ol = new OmniledgerRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(100, MILLIS)); - if (!ol.checkLiveness()){ + bc = new ByzCoinRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(100, MILLIS)); + if (!bc.checkLiveness()){ throw new CothorityCommunicationException("liveness check failed"); } } @Test void ping() throws Exception{ - assertTrue(ol.checkLiveness()); + assertTrue(bc.checkLiveness()); } @Test void updateDarc() throws Exception { - DarcInstance dc = new DarcInstance(ol, genesisDarc); + DarcInstance dc = new DarcInstance(bc, genesisDarc); logger.info("DC is: {}", dc.getId()); logger.info("genesisDarc is: {}", genesisDarc.getId()); Darc newDarc = genesisDarc.copy(); newDarc.setRule("spawn:darc", "all".getBytes()); Instruction instr = dc.evolveDarcInstruction(newDarc, admin, 0, 1); logger.info("DC is: {}", dc.getId()); - ol.sendTransactionAndWait(new ClientTransaction(Arrays.asList(instr)), 10); + bc.sendTransactionAndWait(new ClientTransaction(Arrays.asList(instr)), 10); dc.update(); logger.info("darc-version is: {}", dc.getDarc().getVersion()); @@ -66,7 +66,7 @@ void updateDarc() throws Exception { @Test void spawnDarc() throws Exception{ - DarcInstance dc = new DarcInstance(ol, genesisDarc); + DarcInstance dc = new DarcInstance(bc, genesisDarc); Darc darc2 = genesisDarc.copy(); darc2.setRule("spawn:darc", admin.getIdentity().toString().getBytes()); dc.evolveDarcAndWait(darc2, admin); @@ -79,7 +79,7 @@ void spawnDarc() throws Exception{ assertTrue(p.matches()); logger.info("creating DarcInstance"); - DarcInstance dc2 = new DarcInstance(ol, newDarc); + DarcInstance dc2 = new DarcInstance(bc, newDarc); logger.info("ids: {} - {}", dc2.getDarc().getId(), newDarc.getId()); logger.info("ids: {} - {}", dc2.getDarc().getBaseId(), newDarc.getBaseId()); logger.info("darcs:\n{}\n{}", dc2.getDarc(), newDarc); @@ -88,7 +88,7 @@ void spawnDarc() throws Exception{ @Test void spawnValue() throws Exception{ - DarcInstance dc = new DarcInstance(ol, genesisDarc); + DarcInstance dc = new DarcInstance(bc, genesisDarc); Darc darc2 = genesisDarc.copy(); darc2.setRule("spawn:value", admin.getIdentity().toString().getBytes()); darc2.setRule("invoke:update", admin.getIdentity().toString().getBytes()); @@ -98,7 +98,7 @@ void spawnValue() throws Exception{ Proof p = dc.spawnContractAndWait("value", admin, Argument.NewList("value", myvalue), 10); assertTrue(p.matches()); - ValueInstance vi = new ValueInstance(ol, p); + ValueInstance vi = new ValueInstance(bc, p); assertArrayEquals(vi.getValue(), myvalue); myvalue = "27".getBytes(); vi.evolveValueAndWait(myvalue, admin); @@ -112,7 +112,7 @@ void failToSpawnValue() throws Exception{ // list in the next block. We then use spawnContractAndWait on one we know is // going to succeed in order to sync the test to the creation of the new // block. - DarcInstance dc = new DarcInstance(ol, genesisDarc); + DarcInstance dc = new DarcInstance(bc, genesisDarc); Darc darc2 = genesisDarc.copy(); darc2.setRule("spawn:value", admin.getIdentity().toString().getBytes()); darc2.setRule("invoke:update", admin.getIdentity().toString().getBytes()); @@ -130,7 +130,7 @@ void failToSpawnValue() throws Exception{ // failed tx. If we don't find it, we walk backwards one and look. We need to check back because OL could // decide to try one block with our failed tx, commit it, and then try another block with the success tx. - OmniBlock ob = new OmniBlock(p); + Block ob = new Block(p); List txr = ob.getTxResults(); // If there are extra tx's we were not expecting, then abort. @@ -157,8 +157,8 @@ void failToSpawnValue() throws Exception{ // Look back one block for the expected failed tx. assertEquals(1, p.getLatest().getProto().getBacklinksCount()); SkipblockId back = new SkipblockId(p.getLatest().getProto().getBacklinks(0)); - SkipBlock b = ol.getSkipchain().getSkipblock(back); - ob = new OmniBlock(b); + SkipBlock b = bc.getSkipchain().getSkipblock(back); + ob = new Block(b); txr = ob.getTxResults(); assertEquals(1, txr.size()); assertFalse(txr.get(0).isAccepted()); @@ -173,12 +173,12 @@ void failToSpawnValue() throws Exception{ */ @Test void reconnect() throws Exception { - OmniledgerRPC ol2 = new OmniledgerRPC(ol.getRoster(), ol.getGenesis().getSkipchainId()); - assertEquals(ol.getConfig().getBlockInterval(), ol2.getConfig().getBlockInterval()); + ByzCoinRPC bc = new ByzCoinRPC(ByzCoinRPCTest.bc.getRoster(), ByzCoinRPCTest.bc.getGenesis().getSkipchainId()); + assertEquals(ByzCoinRPCTest.bc.getConfig().getBlockInterval(), bc.getConfig().getBlockInterval()); // check that getMaxBlockSize returned what we expect (from defaultMaxBlockSize in Go). - assertEquals(4000000, ol2.getConfig().getMaxBlockSize()); - assertEquals(ol.getLatestOmniBlock().getTimestampNano(), ol2.getLatestOmniBlock().getTimestampNano()); - assertEquals(ol.getGenesisDarc().getBaseId(), ol2.getGenesisDarc().getBaseId()); + assertEquals(4000000, bc.getConfig().getMaxBlockSize()); + assertEquals(ByzCoinRPCTest.bc.getLatestBlock().getTimestampNano(), bc.getLatestBlock().getTimestampNano()); + assertEquals(ByzCoinRPCTest.bc.getGenesisDarc().getBaseId(), bc.getGenesisDarc().getBaseId()); } } diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/DarcTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/DarcTest.java similarity index 91% rename from external/java/src/test/java/ch/epfl/dedis/lib/omniledger/DarcTest.java rename to external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/DarcTest.java index 123eb67f26..cf7bb3bb38 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/DarcTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/DarcTest.java @@ -1,8 +1,8 @@ -package ch.epfl.dedis.lib.omniledger; +package ch.epfl.dedis.lib.byzcoin; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; +import ch.epfl.dedis.lib.byzcoin.darc.SignerEd25519; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.lib.omniledger.darc.Darc; -import ch.epfl.dedis.lib.omniledger.darc.SignerEd25519; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstanceTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/contracts/EventlogTest.java similarity index 78% rename from external/java/src/test/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstanceTest.java rename to external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/contracts/EventlogTest.java index 98f93d0ccd..75114843b7 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/omniledger/contracts/EventLogInstanceTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/byzcoin/contracts/EventlogTest.java @@ -1,17 +1,17 @@ -package ch.epfl.dedis.lib.omniledger.contracts; +package ch.epfl.dedis.lib.byzcoin.contracts; import ch.epfl.dedis.integration.TestServerController; import ch.epfl.dedis.integration.TestServerInit; +import ch.epfl.dedis.lib.byzcoin.ByzCoinRPC; +import ch.epfl.dedis.lib.byzcoin.InstanceId; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; +import ch.epfl.dedis.lib.byzcoin.darc.Rules; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; +import ch.epfl.dedis.lib.byzcoin.darc.SignerEd25519; import ch.epfl.dedis.lib.eventlog.Event; import ch.epfl.dedis.lib.eventlog.SearchResponse; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; import ch.epfl.dedis.lib.exception.CothorityCryptoException; -import ch.epfl.dedis.lib.omniledger.InstanceId; -import ch.epfl.dedis.lib.omniledger.OmniledgerRPC; -import ch.epfl.dedis.lib.omniledger.darc.Darc; -import ch.epfl.dedis.lib.omniledger.darc.Rules; -import ch.epfl.dedis.lib.omniledger.darc.Signer; -import ch.epfl.dedis.lib.omniledger.darc.SignerEd25519; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -26,12 +26,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class EventLogInstanceTest { - private static OmniledgerRPC ol; +class EventlogTest { + private static ByzCoinRPC bc; private static EventLogInstance el; private static Signer admin; - private final static Logger logger = LoggerFactory.getLogger(EventLogInstanceTest.class); + private final static Logger logger = LoggerFactory.getLogger(EventlogTest.class); private TestServerController testInstanceController; @BeforeEach @@ -44,19 +44,19 @@ void initAll() throws Exception { rules.addRule("invoke:eventlog", admin.getIdentity().toString().getBytes()); Darc genesisDarc = new Darc(rules, "genesis".getBytes()); - ol = new OmniledgerRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); - if (!ol.checkLiveness()) { + bc = new ByzCoinRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); + if (!bc.checkLiveness()) { throw new CothorityCommunicationException("liveness check failed"); } - el = new EventLogInstance(ol, Arrays.asList(admin), genesisDarc.getId()); + el = new EventLogInstance(bc, Arrays.asList(admin), genesisDarc.getId()); } @Test void log() throws Exception { Event e = new Event("hello", "goodbye"); - InstanceId key = el.log(e, ol.getGenesisDarc().getBaseId(), Arrays.asList(admin)); - Thread.sleep(5 * ol.getConfig().getBlockInterval().toMillis()); + InstanceId key = el.log(e, bc.getGenesisDarc().getBaseId(), Arrays.asList(admin)); + Thread.sleep(5 * bc.getConfig().getBlockInterval().toMillis()); Event loggedEvent = el.get(key); assertEquals(loggedEvent, e); } @@ -69,12 +69,12 @@ void testLogMore() throws Exception { for (int i = 0; i < n; i++) { // The timestamps in these event are all the same, but doing el.log takes time and it may not be possible to // add all the events. So we have to limit the number of events that we add. - keys.add(el.log(event, ol.getGenesisDarc().getBaseId(), Arrays.asList(admin))); + keys.add(el.log(event, bc.getGenesisDarc().getBaseId(), Arrays.asList(admin))); } boolean allOK = true; for (int i = 0; i < 4; i++) { allOK = true; - Thread.sleep(5 * ol.getConfig().getBlockInterval().toMillis()); + Thread.sleep(5 * bc.getConfig().getBlockInterval().toMillis()); for (InstanceId key : keys) { try { logger.info("ok"); @@ -97,9 +97,9 @@ void testLogMore() throws Exception { void testSearch() throws Exception { long now = System.currentTimeMillis() * 1000 * 1000; Event event = new Event(now, "login", "alice"); - el.log(event, ol.getGenesisDarc().getBaseId(), Arrays.asList(admin)); + el.log(event, bc.getGenesisDarc().getBaseId(), Arrays.asList(admin)); - Thread.sleep(5 * ol.getConfig().getBlockInterval().toMillis()); + Thread.sleep(5 * bc.getConfig().getBlockInterval().toMillis()); // finds the event under any topic SearchResponse resp = el.search("", now - 1000, now + 1000); diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/CalypsoTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/CalypsoTest.java index 67077cf3dd..9b53e6ed2a 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/CalypsoTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/CalypsoTest.java @@ -2,18 +2,18 @@ import ch.epfl.dedis.integration.TestServerController; import ch.epfl.dedis.integration.TestServerInit; +import ch.epfl.dedis.lib.byzcoin.Argument; +import ch.epfl.dedis.lib.byzcoin.ByzCoinRPC; +import ch.epfl.dedis.lib.byzcoin.InstanceId; +import ch.epfl.dedis.lib.byzcoin.Proof; +import ch.epfl.dedis.lib.byzcoin.contracts.DarcInstance; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; +import ch.epfl.dedis.lib.byzcoin.darc.Rules; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; +import ch.epfl.dedis.lib.byzcoin.darc.SignerEd25519; import ch.epfl.dedis.lib.crypto.Encryption; import ch.epfl.dedis.lib.crypto.Scalar; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.lib.omniledger.Argument; -import ch.epfl.dedis.lib.omniledger.InstanceId; -import ch.epfl.dedis.lib.omniledger.OmniledgerRPC; -import ch.epfl.dedis.lib.omniledger.Proof; -import ch.epfl.dedis.lib.omniledger.contracts.DarcInstance; -import ch.epfl.dedis.lib.omniledger.darc.Darc; -import ch.epfl.dedis.lib.omniledger.darc.Rules; -import ch.epfl.dedis.lib.omniledger.darc.Signer; -import ch.epfl.dedis.lib.omniledger.darc.SignerEd25519; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -36,7 +36,7 @@ class Pair { } } - private OmniledgerRPC ol; + private ByzCoinRPC bc; private CreateLTSReply ltsReply; private Darc testDarc; private Signer testSigner; @@ -52,13 +52,13 @@ void initAll() throws Exception { Arrays.asList(admin.getIdentity())); rules.addRule("spawn:darc", admin.getIdentity().toString().getBytes()); Darc genesisDarc = new Darc(rules, "genesis".getBytes()); - ol = new OmniledgerRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); - if (!ol.checkLiveness()) { + bc = new ByzCoinRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); + if (!bc.checkLiveness()) { throw new CothorityCommunicationException("liveness check failed"); } // Spawn a new darc with the calypso read/write rules for a new signer. - DarcInstance dc = new DarcInstance(ol, genesisDarc); + DarcInstance dc = new DarcInstance(bc, genesisDarc); testSigner = new SignerEd25519(); testDarc = new Darc(Arrays.asList(testSigner.getIdentity()), Arrays.asList(testSigner.getIdentity()), "calypso darc".getBytes()); testDarc.setRule("spawn:calypsoWrite", testSigner.getIdentity().toString().getBytes()); @@ -66,7 +66,7 @@ void initAll() throws Exception { dc.spawnContractAndWait("darc", admin, Argument.NewList("darc", testDarc.toProto().toByteArray()), 10); // Run the DKG. - ltsReply = CalypsoRPC.createLTS(ol.getRoster(), ol.getGenesis().getId()); + ltsReply = CalypsoRPC.createLTS(bc.getRoster(), bc.getGenesis().getId()); } @Test @@ -74,23 +74,23 @@ void testDecryptKey() throws Exception { String secret1 = "this is secret 1"; Pair w1 = createWriterInstance(secret1); Pair r1 = createReaderInstance(w1.b.getInstance().getId()); - Proof pw1 = ol.getProof(w1.b.getInstance().getId()); - Proof pr1 = ol.getProof(r1.b.getInstance().getId()); + Proof pw1 = bc.getProof(w1.b.getInstance().getId()); + Proof pr1 = bc.getProof(r1.b.getInstance().getId()); String secret2 = "this is secret 2"; Pair w2 = createWriterInstance(secret2); Pair r2 = createReaderInstance(w2.b.getInstance().getId()); - Proof pw2 = ol.getProof(w2.b.getInstance().getId()); - Proof pr2 = ol.getProof(r2.b.getInstance().getId()); + Proof pw2 = bc.getProof(w2.b.getInstance().getId()); + Proof pr2 = bc.getProof(r2.b.getInstance().getId()); try { - CalypsoRPC.tryDecrypt(pr1, pw2, ol.getRoster()); + CalypsoRPC.tryDecrypt(pr1, pw2, bc.getRoster()); } catch (CothorityCommunicationException e) { assertTrue(e.getMessage().contains("read doesn't point to passed write")); } try { - CalypsoRPC.tryDecrypt(pr2, pw1, ol.getRoster()); + CalypsoRPC.tryDecrypt(pr2, pw1, bc.getRoster()); } catch (CothorityCommunicationException e) { assertTrue(e.getMessage().contains("read doesn't point to passed write")); } @@ -106,9 +106,9 @@ void testDecryptKey() throws Exception { Pair createWriterInstance(String secret) throws Exception { WriteRequest wr = new WriteRequest(secret, 16, testDarc.getId()); - WriterInstance w = new WriterInstance(ol, Arrays.asList(testSigner), testDarc.getId(), ltsReply, wr); + WriterInstance w = new WriterInstance(bc, Arrays.asList(testSigner), testDarc.getId(), ltsReply, wr); - Proof p = ol.getProof(w.getInstance().getId()); + Proof p = bc.getProof(w.getInstance().getId()); assertTrue(p.matches()); return new Pair(wr, w); @@ -116,13 +116,13 @@ Pair createWriterInstance(String secret) throws Ex Pair createReaderInstance(InstanceId writerId) throws Exception { ReadRequest rr = new ReadRequest(writerId, testSigner.getPublic()); - ReaderInstance r = new ReaderInstance(ol, Arrays.asList(testSigner), testDarc.getId(), rr); - assertTrue(ol.getProof(r.getInstance().getId()).matches()); + ReaderInstance r = new ReaderInstance(bc, Arrays.asList(testSigner), testDarc.getId(), rr); + assertTrue(bc.getProof(r.getInstance().getId()).matches()); return new Pair(rr, r); } byte[] getKeyMaterial(Proof readProof, Proof writeProof, Scalar secret) throws Exception { - DecryptKeyReply dkr = CalypsoRPC.tryDecrypt(readProof, writeProof, ol.getRoster()); + DecryptKeyReply dkr = CalypsoRPC.tryDecrypt(readProof, writeProof, bc.getRoster()); return dkr.getKeyMaterial(secret); } } \ No newline at end of file diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/ReaderInstanceTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/ReaderInstanceTest.java index 328148a57b..a30bd8b326 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/ReaderInstanceTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/ReaderInstanceTest.java @@ -2,12 +2,12 @@ import ch.epfl.dedis.integration.TestServerController; import ch.epfl.dedis.integration.TestServerInit; +import ch.epfl.dedis.lib.byzcoin.ByzCoinRPC; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; +import ch.epfl.dedis.lib.byzcoin.darc.Rules; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; +import ch.epfl.dedis.lib.byzcoin.darc.SignerEd25519; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.lib.omniledger.OmniledgerRPC; -import ch.epfl.dedis.lib.omniledger.darc.Darc; -import ch.epfl.dedis.lib.omniledger.darc.Rules; -import ch.epfl.dedis.lib.omniledger.darc.Signer; -import ch.epfl.dedis.lib.omniledger.darc.SignerEd25519; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class ReaderInstanceTest { - private OmniledgerRPC ol; + private ByzCoinRPC bc; private WriterInstance w; private ReaderInstance r; private Signer admin; @@ -39,26 +39,26 @@ void initAll() throws Exception { rules.addRule("spawn:calypsoRead", admin.getIdentity().toString().getBytes()); genesisDarc = new Darc(rules, "genesis".getBytes()); - ol = new OmniledgerRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); - if (!ol.checkLiveness()) { + bc = new ByzCoinRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); + if (!bc.checkLiveness()) { throw new CothorityCommunicationException("liveness check failed"); } - CreateLTSReply ltsReply = CalypsoRPC.createLTS(ol.getRoster(), ol.getGenesis().getId()); + CreateLTSReply ltsReply = CalypsoRPC.createLTS(bc.getRoster(), bc.getGenesis().getId()); String secret = "this is a secret"; WriteRequest wr = new WriteRequest(secret, 16, genesisDarc.getId()); - w = new WriterInstance(ol, Arrays.asList(admin), genesisDarc.getId(), ltsReply, wr); - assertTrue(ol.getProof(w.getInstance().getId()).matches()); + w = new WriterInstance(bc, Arrays.asList(admin), genesisDarc.getId(), ltsReply, wr); + assertTrue(bc.getProof(w.getInstance().getId()).matches()); ReadRequest rr = new ReadRequest(w.getInstance().getId(), admin.getPublic()); - r = new ReaderInstance(ol, Arrays.asList(admin), genesisDarc.getId(), rr); - assertTrue(ol.getProof(r.getInstance().getId()).matches()); + r = new ReaderInstance(bc, Arrays.asList(admin), genesisDarc.getId(), rr); + assertTrue(bc.getProof(r.getInstance().getId()).matches()); } @Test void testCopyReader() throws Exception { - ReaderInstance r2 = new ReaderInstance(ol, r.getInstance().getId()); - assertTrue(ol.getProof(r2.getInstance().getId()).matches()); + ReaderInstance r2 = new ReaderInstance(bc, r.getInstance().getId()); + assertTrue(bc.getProof(r2.getInstance().getId()).matches()); } } \ No newline at end of file diff --git a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/WriterInstanceTest.java b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/WriterInstanceTest.java index 3b750813bc..f802d33db9 100644 --- a/external/java/src/test/java/ch/epfl/dedis/lib/calypso/WriterInstanceTest.java +++ b/external/java/src/test/java/ch/epfl/dedis/lib/calypso/WriterInstanceTest.java @@ -2,13 +2,13 @@ import ch.epfl.dedis.integration.TestServerController; import ch.epfl.dedis.integration.TestServerInit; +import ch.epfl.dedis.lib.byzcoin.ByzCoinRPC; +import ch.epfl.dedis.lib.byzcoin.Proof; +import ch.epfl.dedis.lib.byzcoin.darc.Darc; +import ch.epfl.dedis.lib.byzcoin.darc.Rules; +import ch.epfl.dedis.lib.byzcoin.darc.Signer; +import ch.epfl.dedis.lib.byzcoin.darc.SignerEd25519; import ch.epfl.dedis.lib.exception.CothorityCommunicationException; -import ch.epfl.dedis.lib.omniledger.OmniledgerRPC; -import ch.epfl.dedis.lib.omniledger.Proof; -import ch.epfl.dedis.lib.omniledger.darc.Darc; -import ch.epfl.dedis.lib.omniledger.darc.Rules; -import ch.epfl.dedis.lib.omniledger.darc.Signer; -import ch.epfl.dedis.lib.omniledger.darc.SignerEd25519; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class WriterInstanceTest { - private OmniledgerRPC ol; + private ByzCoinRPC bc; private WriterInstance w; private Signer admin; private Darc genesisDarc; @@ -38,23 +38,23 @@ void initAll() throws Exception { rules.addRule("spawn:calypsoWrite", admin.getIdentity().toString().getBytes()); genesisDarc = new Darc(rules, "genesis".getBytes()); - ol = new OmniledgerRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); - if (!ol.checkLiveness()) { + bc = new ByzCoinRPC(testInstanceController.getRoster(), genesisDarc, Duration.of(500, MILLIS)); + if (!bc.checkLiveness()) { throw new CothorityCommunicationException("liveness check failed"); } - CreateLTSReply ltsReply = CalypsoRPC.createLTS(ol.getRoster(), ol.getGenesis().getId()); + CreateLTSReply ltsReply = CalypsoRPC.createLTS(bc.getRoster(), bc.getGenesis().getId()); String secret = "this is a secret"; WriteRequest wr = new WriteRequest(secret, 16, genesisDarc.getId()); - w = new WriterInstance(ol, Arrays.asList(admin), genesisDarc.getId(), ltsReply, wr); + w = new WriterInstance(bc, Arrays.asList(admin), genesisDarc.getId(), ltsReply, wr); - Proof p = ol.getProof(w.getInstance().getId()); + Proof p = bc.getProof(w.getInstance().getId()); assertTrue(p.matches()); } @Test void testCopyWriter() throws Exception { - WriterInstance w2 = new WriterInstance(ol, w.getInstance().getId(), w.getLtsData()); - assertTrue(ol.getProof(w2.getInstance().getId()).matches()); + WriterInstance w2 = new WriterInstance(bc, w.getInstance().getId(), w.getLtsData()); + assertTrue(bc.getProof(w2.getInstance().getId()).matches()); } } \ No newline at end of file diff --git a/external/js/cothority/.gitignore b/external/js/cothority/.gitignore index b947077876..6e78480a0b 100644 --- a/external/js/cothority/.gitignore +++ b/external/js/cothority/.gitignore @@ -1,2 +1,4 @@ +package-lock.json node_modules/ dist/ +.idea/ diff --git a/external/js/cothority/lib/omniledger/Argument.js b/external/js/cothority/lib/byzcoin/Argument.js similarity index 95% rename from external/js/cothority/lib/omniledger/Argument.js rename to external/js/cothority/lib/byzcoin/Argument.js index bfe0bbd7ce..0217110f02 100644 --- a/external/js/cothority/lib/omniledger/Argument.js +++ b/external/js/cothority/lib/byzcoin/Argument.js @@ -1,7 +1,7 @@ class Argument { /** * Argument is used in an Instruction. It will end up as the input argument - * of the OmniLedger smart contract. + * of the smart contract. * @param {string} name - The name of the argument * @param {Uint8Array} value - The value of the argument */ diff --git a/external/js/cothority/lib/omniledger/OmniledgerRPC.js b/external/js/cothority/lib/byzcoin/ByzCoinRPC.js similarity index 79% rename from external/js/cothority/lib/omniledger/OmniledgerRPC.js rename to external/js/cothority/lib/byzcoin/ByzCoinRPC.js index 4bc8fce8ed..6a2b166387 100644 --- a/external/js/cothority/lib/omniledger/OmniledgerRPC.js +++ b/external/js/cothority/lib/byzcoin/ByzCoinRPC.js @@ -1,5 +1,3 @@ -const identity = require("../identity"); -const net = require("../net"); const Proof = require("./Proof"); const Config = require("./Config"); const Darc = require("./darc/Darc"); @@ -9,15 +7,15 @@ const misc = require("../misc"); const protobuf = require("protobufjs"); /** - * OmniledgerRPC interacts with the omniledger service of a conode. - * It can link to an existing omniledger instance. + * ByzCoinRPC interacts with the byzcoin service of a conode. + * It can link to an existing byzcoin instance. */ -class OmniledgerRPC { +class ByzCoinRPC { /** - * Constructs an OmniLedgerRPC when the complete configuration is known + * Constructs an ByzCoinRPC when the complete configuration is known * - * @param {Config} config - the configuration of the OmniLedger - * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the OmniLedger + * @param {Config} config - the configuration of the ByzCoin + * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the ByzCoin ledger * @param {Darc} genesisDarc - the genesis Darc * @param {Object} genesis - the first block of the skipchain, in Protobuf literral JS object * @param {Object} latest - the last block of the skipchain, in Protobuf literral JS object @@ -44,7 +42,7 @@ class OmniledgerRPC { } /** - * Return the current config of the OmniLedger + * Return the current config of the ledger. * @return {Config} */ get config() { @@ -61,7 +59,7 @@ class OmniledgerRPC { /** * - * @return {Roster} roster - the roster that hosts the omniledger + * @return {Roster} roster - the roster that hosts the byzcoin */ get roster() { return this.config.roster; @@ -75,19 +73,19 @@ class OmniledgerRPC { } /** - * Sends a transaction to omniledger and waits for up to 'wait' blocks for the + * Sends a transaction to byzcoin and waits for up to 'wait' blocks for the * transaction to be included in the global state. If more than 'wait' blocks * are created and the transaction is not included, an exception will be raised. * * @param {ClientTransaction} transaction - is the client transaction holding - * one or more instructions to be sent to omniledger. + * one or more instructions to be sent to byzcoin. * @param {number} wait - indicates the number of blocks to wait for the * transaction to be included * @return {Promise} - a promise that gets resolved if the block has been included */ sendTransactionAndWait(transaction, wait) { let addTxRequest = { - version: OmniledgerRPC.currentVersion, + version: ByzCoinRPC.currentVersion, skipchainid: this.skipchainID, transaction: transaction.toProtobufValidMessage(), inclusionwait: wait @@ -109,28 +107,28 @@ class OmniledgerRPC { } /** - * Gets a proof from omniledger to show that a given instance is in the + * Gets a proof from byzcoin to show that a given instance is in the * global state. * @param {Uint8Array} id - the instance key * @return {Promise} */ getProof(id) { - return OmniledgerRPC.getProof(this._socket, this._skipchainID, id); + return ByzCoinRPC.getProof(this._socket, this._skipchainID, id); } /** - * Gets a proof from omniledger to show that a given instance is in the + * Gets a proof from byzcoin to show that a given instance is in the * global state. * - * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the OmniLedger + * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the conode * @param {Uint8Array} skipchainId - the skipchain ID (the ID of it's genesis block) * @param {Uint8Array} key - the instance key * @return {Promise} */ static getProof(socket, skipchainId, key) { const getProofMessage = { - version: OmniledgerRPC.currentVersion, + version: ByzCoinRPC.currentVersion, id: skipchainId, key: key }; @@ -169,13 +167,13 @@ class OmniledgerRPC { } /** - * Constructs an OmniLedgerRPC from known configuration. The constructor will communicate with the service to + * Constructs an ByzGenRPC from a known configuration. The constructor will communicate with the service to * populate other fields and perform verification. * - * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the OmniLedger + * @param {Socket|LeaderSocket|RosterSocket} socket - the socket to communicate with the conode * @param skipchainId - the ID of the skipchain (aka the * ID of the genesis skipblock) - * @return {Promise} - a promise that gets resolved once the RPC + * @return {Promise} - a promise that gets resolved once the RPC * has been created */ static fromKnownConfiguration(socket, skipchainId) { @@ -189,13 +187,13 @@ class OmniledgerRPC { let genesisDarc = undefined; return this.getProof(socket, skipchainId, new Uint8Array(32)) .then(proof => { - OmniledgerRPC.checkProof(proof, "config"); + ByzCoinRPC.checkProof(proof, "config"); config = Config.fromByteBuffer(proof.values[0]); - return OmniledgerRPC.getProof(socket, skipchainId, proof.values[2]); + return ByzCoinRPC.getProof(socket, skipchainId, proof.values[2]); }) .then(proof2 => { - OmniledgerRPC.checkProof(proof2, "darc"); + ByzCoinRPC.checkProof(proof2, "darc"); genesisDarc = Darc.fromByteBuffer(proof2.values[0]); let skipchain = new SkipchainClient( Kyber.curve.newCurve("edwards25519"), @@ -212,7 +210,7 @@ class OmniledgerRPC { }) .then(latest => { return Promise.resolve( - new OmniledgerRPC( + new ByzCoinRPC( config, socket, genesisDarc, @@ -227,4 +225,4 @@ class OmniledgerRPC { } } -module.exports = OmniledgerRPC; +module.exports = ByzCoinRPC; diff --git a/external/js/cothority/lib/omniledger/ClientTransaction.js b/external/js/cothority/lib/byzcoin/ClientTransaction.js similarity index 97% rename from external/js/cothority/lib/omniledger/ClientTransaction.js rename to external/js/cothority/lib/byzcoin/ClientTransaction.js index dd14d16493..c63050739e 100644 --- a/external/js/cothority/lib/omniledger/ClientTransaction.js +++ b/external/js/cothority/lib/byzcoin/ClientTransaction.js @@ -1,6 +1,6 @@ /** * ClientTransaction is a set of instructions are will be executed atomically - * by OmniLedger. + * by ByzCoin. */ class ClientTransaction { /** diff --git a/external/js/cothority/lib/omniledger/Config.js b/external/js/cothority/lib/byzcoin/Config.js similarity index 82% rename from external/js/cothority/lib/omniledger/Config.js rename to external/js/cothority/lib/byzcoin/Config.js index ccf952d851..8aa1959577 100644 --- a/external/js/cothority/lib/omniledger/Config.js +++ b/external/js/cothority/lib/byzcoin/Config.js @@ -2,14 +2,14 @@ const root = require("../protobuf/index.js").root; const identity = require("../identity"); /** - * Config is the genesis configuration of an omniledger instance. It can be stored only once in omniledger - * and defines the basic running parameters of omniledger. + * Config is the genesis configuration of an byzcoin instance. It can be stored only once in byzcoin + * and defines the basic running parameters of byzcoin. */ class Config { /** * Creates a config from knwon informations * @param {number} blockInterval - * @param {Roster} roster that hosts the OMniLedger + * @param {Roster} roster that hosts the ByzCoin ledger */ constructor(blockInterval, roster) { this._blockInterval = blockInterval; @@ -24,7 +24,7 @@ class Config { } /** - * @return {Roster} - the roster of the omniledger + * @return {Roster} - the roster of the byzcoin */ get roster() { return this._roster; diff --git a/external/js/cothority/lib/omniledger/Delete.js b/external/js/cothority/lib/byzcoin/Delete.js similarity index 100% rename from external/js/cothority/lib/omniledger/Delete.js rename to external/js/cothority/lib/byzcoin/Delete.js diff --git a/external/js/cothority/lib/omniledger/Instance.js b/external/js/cothority/lib/byzcoin/Instance.js similarity index 100% rename from external/js/cothority/lib/omniledger/Instance.js rename to external/js/cothority/lib/byzcoin/Instance.js diff --git a/external/js/cothority/lib/omniledger/Instruction.js b/external/js/cothority/lib/byzcoin/Instruction.js similarity index 98% rename from external/js/cothority/lib/omniledger/Instruction.js rename to external/js/cothority/lib/byzcoin/Instruction.js index 3f30e12ee2..d6d8b30c12 100644 --- a/external/js/cothority/lib/omniledger/Instruction.js +++ b/external/js/cothority/lib/byzcoin/Instruction.js @@ -4,7 +4,7 @@ const Signer = require("./darc/Signer"); const Signature = require("./darc/Signature"); /** - * An instruction is sent and executed by OmniLedger. + * An instruction is sent and executed by ByzCoin. */ class Instruction { /** @@ -197,7 +197,7 @@ class Instruction { } /** - * Have a list of signers sign the instruction. The instruction will *not* be accepted by omniledger if it is not + * Have a list of signers sign the instruction. The instruction will *not* be accepted by byzcoin if it is not * signed. The signature will not be valid if the instruction is modified after signing. * * @param {Uint8Array} darcId diff --git a/external/js/cothority/lib/omniledger/Invoke.js b/external/js/cothority/lib/byzcoin/Invoke.js similarity index 100% rename from external/js/cothority/lib/omniledger/Invoke.js rename to external/js/cothority/lib/byzcoin/Invoke.js diff --git a/external/js/cothority/lib/omniledger/Proof.js b/external/js/cothority/lib/byzcoin/Proof.js similarity index 100% rename from external/js/cothority/lib/omniledger/Proof.js rename to external/js/cothority/lib/byzcoin/Proof.js diff --git a/external/js/cothority/lib/omniledger/Spawn.js b/external/js/cothority/lib/byzcoin/Spawn.js similarity index 100% rename from external/js/cothority/lib/omniledger/Spawn.js rename to external/js/cothority/lib/byzcoin/Spawn.js diff --git a/external/js/cothority/lib/omniledger/contracts/CoinsInstance.js b/external/js/cothority/lib/byzcoin/contracts/CoinsInstance.js similarity index 83% rename from external/js/cothority/lib/omniledger/contracts/CoinsInstance.js rename to external/js/cothority/lib/byzcoin/contracts/CoinsInstance.js index 190827a973..00143967d4 100644 --- a/external/js/cothority/lib/omniledger/contracts/CoinsInstance.js +++ b/external/js/cothority/lib/byzcoin/contracts/CoinsInstance.js @@ -8,14 +8,14 @@ const ClientTransaction = require("../ClientTransaction"); class CoinsInstance { /** * Creates a new CoinsInstance - * @param {OmniledgerRPC} ol - the OmniLedger instance + * @param {ByzCoinRPC} bc - the ByzCoinRPC instance * @param {Uint8Array} instanceId - id of the instance * @param {Instance} [instance] - the complete instance * @param {string} [type] - the type of coin * @param {number} [balance] - the current balance of the account */ - constructor(ol, instanceId, instance, type, balance) { - this._ol = ol; + constructor(bc, instanceId, instance, type, balance) { + this._bc = bc; this._instanceId = instanceId; this._instance = instance; this._type = type; @@ -39,16 +39,16 @@ class CoinsInstance { } /** - * Creates a new instance of CoinsInstance and contact the omniledger to try + * Creates a new instance of CoinsInstance and contact the byzcoin to try * to update the data * - * @param {OmniledgerRPC} ol - the omniledger instance + * @param {ByzCoinRPC} bc - the byzcoin instance * @param {Uint8Array} instanceId - the instance ID of the contract instance * @return {Promise} - a promise that complete when the data * have been updated */ - static fromInstanceId(ol, instanceId) { - return new CoinsInstance(ol, instanceId).update(); + static fromInstanceId(bc, instanceId) { + return new CoinsInstance(bc, instanceId).update(); } /** @@ -58,7 +58,7 @@ class CoinsInstance { * @param {Uint8Array} to - the destination account (must be a coin contract instace id) * @param {Signer} signer - the signer (of the giver account) * @return {Promise} - a promisse that completes once the transaction has been - * included in the OmniLedger. + * included in the ledger. */ transfer(coins, to, signer) { let args = []; @@ -80,7 +80,7 @@ class CoinsInstance { inst.signBy(this._instance.darcId, [signer]); const trans = new ClientTransaction([inst]); - return this._ol.sendTransactionAndWait(trans, 10); + return this._bc.sendTransactionAndWait(trans, 10); } /** @@ -90,7 +90,7 @@ class CoinsInstance { * are up-to-date */ update() { - return this._ol.getProof(this._instanceId).then(proof => { + return this._bc.getProof(this._instanceId).then(proof => { this._instance = Instance.fromProof(proof); const model = root.lookup("CoinInstance"); const protoObject = model.decode(this._instance.data); diff --git a/external/js/cothority/lib/omniledger/contracts/PopPartyInstance.js b/external/js/cothority/lib/byzcoin/contracts/PopPartyInstance.js similarity index 84% rename from external/js/cothority/lib/omniledger/contracts/PopPartyInstance.js rename to external/js/cothority/lib/byzcoin/contracts/PopPartyInstance.js index 9053eca5cf..8522210315 100644 --- a/external/js/cothority/lib/omniledger/contracts/PopPartyInstance.js +++ b/external/js/cothority/lib/byzcoin/contracts/PopPartyInstance.js @@ -6,11 +6,11 @@ const ClientTransaction = require("../ClientTransaction"); const crypto = require("crypto"); /** - * Represents a PoP Party stored on the OmniLedger + * Represents a PoP Party stored on the ledger. */ class PopPartyInstance { /** - * @param {OmniledgerRPC} ol - the omniledger instance + * @param {ByzCoinRPC} bc - the byzcoin instance * @param {Uint8Array} instanceId - the contract instance id * @param {Instance} [instance] - the complete instance * @param {number} [state] - the state of the party (see the state getter for more information) @@ -19,8 +19,8 @@ class PopPartyInstance { * @param {Uint8Array} [next] - a link to the next pop-party, if available * @param {Uint8Array} [service] - the public key of the service, if available */ - constructor(ol, instanceId, instance, state, finalStatement, previous, next, service) { - this._ol = ol; + constructor(bc, instanceId, instance, state, finalStatement, previous, next, service) { + this._bc = bc; this._instanceId = instanceId; this._instance = instance; this._state = state; @@ -50,17 +50,17 @@ class PopPartyInstance { /** * Creates a new PopPartyInstance from an instance ID and try to contact the - * omniledger to get the last data + * byzcoin to get the last data * - * @param {OmniledgerRPC} ol - the omniledger instance + * @param {ByzCoinRPC} bc - the byzcoin instance * @param {Uint8Array} instanceId - the contract instance id */ - static fromInstanceId(ol, instanceId) { - return new PopPartyInstance(ol, instanceId).update(); + static fromInstanceId(bc, instanceId) { + return new PopPartyInstance(bc, instanceId).update(); } /** - * Store the final statement on the OmniLedger. This happens after the + * Store the final statement on the ledger. This happens after the * party description has been published an the party finalized * * @param {Object} finalStatement - the final statement @@ -86,16 +86,16 @@ class PopPartyInstance { inst.signBy(this._instance.darcId, [signer]); const clientTransaction = new ClientTransaction([inst]); - return this._ol.sendTransactionAndWait(clientTransaction, 10); + return this._bc.sendTransactionAndWait(clientTransaction, 10); } /** - * Contact the OmniLedger to try getting the last data + * Contact the ledger to try getting the last data * * @return {Promise} */ update() { - return this._ol.getProof(this._instanceId).then(proof => { + return this._bc.getProof(this._instanceId).then(proof => { this._instance = Instance.fromProof(proof); const model = root.lookup("PopPartyInstance"); const protoObject = model.decode(this._instance.data); diff --git a/external/js/cothority/lib/omniledger/contracts/index.js b/external/js/cothority/lib/byzcoin/contracts/index.js similarity index 100% rename from external/js/cothority/lib/omniledger/contracts/index.js rename to external/js/cothority/lib/byzcoin/contracts/index.js diff --git a/external/js/cothority/lib/omniledger/darc/Darc.js b/external/js/cothority/lib/byzcoin/darc/Darc.js similarity index 96% rename from external/js/cothority/lib/omniledger/darc/Darc.js rename to external/js/cothority/lib/byzcoin/darc/Darc.js index 73ee0ce495..05a2014553 100644 --- a/external/js/cothority/lib/omniledger/darc/Darc.js +++ b/external/js/cothority/lib/byzcoin/darc/Darc.js @@ -3,7 +3,7 @@ const root = require("../../protobuf/index.js").root; /** * Darc stands for distributed access right control. It provides a powerful access control policy that supports logical * expressions, delegation of rights, offline verification and so on. Please refer to - * https://github.com/dedis/cothority/omniledger/README.md#darc for more information. + * https://github.com/dedis/cothority/byzgen/README.md#darc for more information. */ class Darc { /** diff --git a/external/js/cothority/lib/omniledger/darc/Identity.js b/external/js/cothority/lib/byzcoin/darc/Identity.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/Identity.js rename to external/js/cothority/lib/byzcoin/darc/Identity.js diff --git a/external/js/cothority/lib/omniledger/darc/IdentityEd25519.js b/external/js/cothority/lib/byzcoin/darc/IdentityEd25519.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/IdentityEd25519.js rename to external/js/cothority/lib/byzcoin/darc/IdentityEd25519.js diff --git a/external/js/cothority/lib/omniledger/darc/Request.js b/external/js/cothority/lib/byzcoin/darc/Request.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/Request.js rename to external/js/cothority/lib/byzcoin/darc/Request.js diff --git a/external/js/cothority/lib/omniledger/darc/Signature.js b/external/js/cothority/lib/byzcoin/darc/Signature.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/Signature.js rename to external/js/cothority/lib/byzcoin/darc/Signature.js diff --git a/external/js/cothority/lib/omniledger/darc/Signer.js b/external/js/cothority/lib/byzcoin/darc/Signer.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/Signer.js rename to external/js/cothority/lib/byzcoin/darc/Signer.js diff --git a/external/js/cothority/lib/omniledger/darc/SignerEd25519.js b/external/js/cothority/lib/byzcoin/darc/SignerEd25519.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/SignerEd25519.js rename to external/js/cothority/lib/byzcoin/darc/SignerEd25519.js diff --git a/external/js/cothority/lib/omniledger/darc/index.js b/external/js/cothority/lib/byzcoin/darc/index.js similarity index 100% rename from external/js/cothority/lib/omniledger/darc/index.js rename to external/js/cothority/lib/byzcoin/darc/index.js diff --git a/external/js/cothority/lib/omniledger/index.js b/external/js/cothority/lib/byzcoin/index.js similarity index 58% rename from external/js/cothority/lib/omniledger/index.js rename to external/js/cothority/lib/byzcoin/index.js index accdd47903..10cc9407d1 100644 --- a/external/js/cothority/lib/omniledger/index.js +++ b/external/js/cothority/lib/byzcoin/index.js @@ -1,4 +1,4 @@ -const OmniledgerRPC = require("./OmniledgerRPC"); +const ByzCoinRPC = require("./ByzCoinRPC"); const contracts = require("./contracts"); const darc = require("./darc"); @@ -8,4 +8,4 @@ module.exports = { darc: darc }; -module.exports.OmniledgerRPC = OmniledgerRPC; +module.exports.ByzCoinRPC = ByzCoinRPC; diff --git a/external/js/cothority/lib/index.js b/external/js/cothority/lib/index.js index d8ad5d7f9a..541daf3535 100644 --- a/external/js/cothority/lib/index.js +++ b/external/js/cothority/lib/index.js @@ -4,15 +4,15 @@ const net = require("./net"); const protobuf = require("./protobuf"); const misc = require("./misc"); const skipchain = require("./skipchain"); -const omniledger = require("./omniledger"); +const byzcoin = require("./byzcoin"); const identity = require("./identity.js"); module.exports = { - net, - misc, - skipchain, - omniledger, - protobuf, + net, + misc, + skipchain, + byzcoin, + protobuf }; module.exports.Roster = identity.Roster; diff --git a/external/js/cothority/lib/net/net.js b/external/js/cothority/lib/net/net.js index 79e4d3b489..23227eaf43 100644 --- a/external/js/cothority/lib/net/net.js +++ b/external/js/cothority/lib/net/net.js @@ -154,7 +154,7 @@ class LeaderSocket { this.roster = roster; if (this.roster.identities.length === 0) { - throw new Error("Roster should have atleast one node"); + throw new Error("Roster should have at least one node"); } } diff --git a/external/js/cothority/lib/protobuf/models.json b/external/js/cothority/lib/protobuf/models.json index 1589223fa3..34f172b855 100644 --- a/external/js/cothority/lib/protobuf/models.json +++ b/external/js/cothority/lib/protobuf/models.json @@ -1 +1 @@ -{"nested":{"cothority":{},"calypso":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"Calypso"},"nested":{"Write":{"fields":{"data":{"rule":"required","type":"bytes","id":1},"u":{"rule":"required","type":"bytes","id":2},"ubar":{"rule":"required","type":"bytes","id":3},"e":{"rule":"required","type":"bytes","id":4},"f":{"rule":"required","type":"bytes","id":5},"cs":{"rule":"repeated","type":"bytes","id":6},"extradata":{"type":"bytes","id":7},"ltsid":{"rule":"required","type":"bytes","id":8}}},"Read":{"fields":{"write":{"rule":"required","type":"bytes","id":1},"xc":{"rule":"required","type":"bytes","id":2}}},"CreateLTS":{"fields":{"roster":{"rule":"required","type":"onet.Roster","id":1},"olid":{"rule":"required","type":"bytes","id":2}}},"CreateLTSReply":{"fields":{"ltsid":{"rule":"required","type":"bytes","id":1},"x":{"rule":"required","type":"bytes","id":2}}},"DecryptKey":{"fields":{"read":{"rule":"required","type":"omniledger.Proof","id":1},"write":{"rule":"required","type":"omniledger.Proof","id":2}}},"DecryptKeyReply":{"fields":{"cs":{"rule":"repeated","type":"bytes","id":1},"xhatenc":{"rule":"required","type":"bytes","id":2},"x":{"rule":"required","type":"bytes","id":3}}},"SharedPublic":{"fields":{"ltsid":{"rule":"required","type":"bytes","id":1}}},"SharedPublicReply":{"fields":{"x":{"rule":"required","type":"bytes","id":1}}}}},"omniledger":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"OmniLedgerProto"},"nested":{"DataHeader":{"fields":{"collectionroot":{"rule":"required","type":"bytes","id":1},"clienttransactionhash":{"rule":"required","type":"bytes","id":2},"statechangeshash":{"rule":"required","type":"bytes","id":3},"timestamp":{"rule":"required","type":"sint64","id":4}}},"DataBody":{"fields":{"txresults":{"rule":"repeated","type":"TxResult","id":1,"options":{"packed":false}}}},"CreateGenesisBlock":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"roster":{"rule":"required","type":"onet.Roster","id":2},"genesisdarc":{"rule":"required","type":"darc.Darc","id":3},"blockinterval":{"rule":"required","type":"sint64","id":4},"maxblocksize":{"type":"sint32","id":5}}},"CreateGenesisBlockResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"skipblock":{"type":"skipchain.SkipBlock","id":2}}},"AddTxRequest":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"skipchainid":{"rule":"required","type":"bytes","id":2},"transaction":{"rule":"required","type":"ClientTransaction","id":3},"inclusionwait":{"type":"sint32","id":4}}},"AddTxResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1}}},"GetProof":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"key":{"rule":"required","type":"bytes","id":2},"id":{"rule":"required","type":"bytes","id":3}}},"GetProofResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"proof":{"rule":"required","type":"Proof","id":2}}},"ChainConfig":{"fields":{"blockinterval":{"rule":"required","type":"sint64","id":1},"roster":{"rule":"required","type":"onet.Roster","id":2},"maxblocksize":{"rule":"required","type":"sint32","id":3}}},"Proof":{"fields":{"inclusionproof":{"rule":"required","type":"collection.Proof","id":1},"latest":{"rule":"required","type":"skipchain.SkipBlock","id":2},"links":{"rule":"repeated","type":"skipchain.ForwardLink","id":3,"options":{"packed":false}}}},"Instruction":{"fields":{"instanceid":{"rule":"required","type":"bytes","id":1},"nonce":{"rule":"required","type":"bytes","id":2},"index":{"rule":"required","type":"sint32","id":3},"length":{"rule":"required","type":"sint32","id":4},"spawn":{"type":"Spawn","id":5},"invoke":{"type":"Invoke","id":6},"delete":{"type":"Delete","id":7},"signatures":{"rule":"repeated","type":"darc.Signature","id":8,"options":{"packed":false}}}},"Spawn":{"fields":{"contractid":{"rule":"required","type":"string","id":1},"args":{"rule":"repeated","type":"Argument","id":2,"options":{"packed":false}}}},"Invoke":{"fields":{"command":{"rule":"required","type":"string","id":1},"args":{"rule":"repeated","type":"Argument","id":2,"options":{"packed":false}}}},"Delete":{"fields":{}},"Argument":{"fields":{"name":{"rule":"required","type":"string","id":1},"value":{"rule":"required","type":"bytes","id":2}}},"ClientTransaction":{"fields":{"instructions":{"rule":"repeated","type":"Instruction","id":1,"options":{"packed":false}}}},"TxResult":{"fields":{"clienttransaction":{"rule":"required","type":"ClientTransaction","id":1},"accepted":{"rule":"required","type":"bool","id":2}}},"StateChange":{"fields":{"stateaction":{"rule":"required","type":"sint32","id":1},"instanceid":{"rule":"required","type":"bytes","id":2},"contractid":{"rule":"required","type":"bytes","id":3},"value":{"rule":"required","type":"bytes","id":4},"darcid":{"rule":"required","type":"bytes","id":5}}},"Coin":{"fields":{"name":{"rule":"required","type":"bytes","id":1},"value":{"rule":"required","type":"uint64","id":2}}}}},"skipchain":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"SkipchainProto"},"nested":{"GetSingleBlock":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"GetUpdateChain":{"fields":{"latestID":{"rule":"required","type":"bytes","id":1}}},"GetUpdateChainReply":{"fields":{"update":{"rule":"repeated","type":"SkipBlock","id":1,"options":{"packed":false}}}},"SkipBlock":{"fields":{"index":{"rule":"required","type":"int32","id":1},"height":{"rule":"required","type":"int32","id":2},"maxHeight":{"rule":"required","type":"int32","id":3},"baseHeight":{"rule":"required","type":"int32","id":4},"backlinks":{"rule":"repeated","type":"bytes","id":5},"verifiers":{"rule":"repeated","type":"bytes","id":6},"parent":{"type":"bytes","id":7},"genesis":{"rule":"required","type":"bytes","id":8},"data":{"rule":"required","type":"bytes","id":9},"roster":{"rule":"required","type":"onet.Roster","id":10},"hash":{"rule":"required","type":"bytes","id":11},"forward":{"rule":"repeated","type":"ForwardLink","id":12,"options":{"packed":false}},"children":{"rule":"repeated","type":"bytes","id":13},"payload":{"type":"bytes","id":14}}},"ForwardLink":{"fields":{"from":{"rule":"required","type":"bytes","id":1},"to":{"rule":"required","type":"bytes","id":2},"newRoster":{"type":"onet.Roster","id":3},"signature":{"rule":"required","type":"ByzcoinSig","id":4}}},"ByzcoinSig":{"fields":{"msg":{"rule":"required","type":"bytes","id":1},"sig":{"rule":"required","type":"bytes","id":2}}},"SchnorrSig":{"fields":{"challenge":{"rule":"required","type":"bytes","id":1},"response":{"rule":"required","type":"bytes","id":2}}},"Exception":{"fields":{"index":{"rule":"required","type":"int32","id":1},"commitment":{"rule":"required","type":"bytes","id":2}}}}},"onet":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"OnetProto"},"nested":{"Roster":{"fields":{"id":{"type":"bytes","id":1},"list":{"rule":"repeated","type":"network.ServerIdentity","id":2,"options":{"packed":false}},"aggregate":{"rule":"required","type":"bytes","id":3}}},"Status":{"fields":{"field":{"keyType":"string","type":"string","id":1}}}}},"network":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"NetworkProto"},"nested":{"ServerIdentity":{"fields":{"public":{"rule":"required","type":"bytes","id":1},"id":{"rule":"required","type":"bytes","id":2},"address":{"rule":"required","type":"string","id":3},"description":{"rule":"required","type":"string","id":4}}}}},"darc":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"DarcProto"},"nested":{"Darc":{"fields":{"version":{"rule":"required","type":"uint64","id":1},"description":{"rule":"required","type":"bytes","id":2},"baseid":{"type":"bytes","id":3},"previd":{"rule":"required","type":"bytes","id":4},"rules":{"rule":"required","type":"Rules","id":5},"signatures":{"rule":"repeated","type":"Signature","id":6,"options":{"packed":false}},"verificationdarcs":{"rule":"repeated","type":"Darc","id":7,"options":{"packed":false}}}},"Identity":{"fields":{"darc":{"type":"IdentityDarc","id":1},"ed25519":{"type":"IdentityEd25519","id":2},"x509ec":{"type":"IdentityX509EC","id":3}}},"IdentityEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"IdentityX509EC":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"IdentityDarc":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"Signature":{"fields":{"signature":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"Identity","id":2}}},"Signer":{"fields":{"ed25519":{"type":"SignerEd25519","id":1},"x509ec":{"type":"SignerX509EC","id":2}}},"SignerEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1},"secret":{"rule":"required","type":"bytes","id":2}}},"SignerX509EC":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"Request":{"fields":{"baseid":{"rule":"required","type":"bytes","id":1},"action":{"rule":"required","type":"string","id":2},"msg":{"rule":"required","type":"bytes","id":3},"identities":{"rule":"repeated","type":"Identity","id":4,"options":{"packed":false}},"signatures":{"rule":"repeated","type":"bytes","id":5}}},"Rules":{"fields":{"list":{"rule":"repeated","type":"Rule","id":1,"options":{"packed":false}}}},"Rule":{"fields":{"action":{"rule":"required","type":"string","id":1},"expr":{"rule":"required","type":"bytes","id":2}}}}},"collection":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"CollectionProto"},"nested":{"Dump":{"fields":{"key":{"rule":"required","type":"bytes","id":1},"values":{"rule":"repeated","type":"bytes","id":2},"children":{"rule":"required","type":"Children","id":3},"label":{"rule":"required","type":"bytes","id":4}}},"Children":{"fields":{"left":{"rule":"required","type":"bytes","id":1},"right":{"rule":"required","type":"bytes","id":2}}},"Step":{"fields":{"left":{"rule":"required","type":"Dump","id":1},"right":{"rule":"required","type":"Dump","id":2}}},"Proof":{"fields":{"key":{"rule":"required","type":"bytes","id":1},"root":{"rule":"required","type":"Dump","id":2},"steps":{"rule":"repeated","type":"Step","id":3,"options":{"packed":false}}}}}},"cisc":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"CiscProto"},"nested":{"IDBlock":{"fields":{"latest":{"type":"Data","id":1},"proposed":{"type":"Data","id":2},"latestskipblock":{"type":"skipchain.SkipBlock","id":3}}},"Data":{"fields":{"threshold":{"rule":"required","type":"sint32","id":1},"device":{"keyType":"string","type":"Device","id":2},"storage":{"keyType":"string","type":"string","id":3},"roster":{"type":"onet.Roster","id":4},"votes":{"keyType":"string","type":"bytes","id":5}}},"Device":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"PinRequest":{"fields":{"pin":{"rule":"required","type":"string","id":1},"public":{"rule":"required","type":"bytes","id":2}}},"StoreKeys":{"fields":{"type":{"rule":"required","type":"sint32","id":1},"final":{"type":"pop.FinalStatement","id":2},"publics":{"rule":"repeated","type":"bytes","id":3},"sig":{"rule":"required","type":"bytes","id":4}}},"CreateIdentity":{"fields":{"data":{"type":"Data","id":1},"type":{"rule":"required","type":"sint32","id":2},"schnsig":{"type":"bytes","id":3},"sig":{"rule":"required","type":"bytes","id":4},"nonce":{"rule":"required","type":"bytes","id":5}}},"CreateIdentityReply":{"fields":{"genesis":{"type":"skipchain.SkipBlock","id":1}}},"DataUpdate":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"DataUpdateReply":{"fields":{"data":{"type":"Data","id":1}}},"ProposeSend":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"propose":{"type":"Data","id":2}}},"ProposeUpdate":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"ProposeUpdateReply":{"fields":{"propose":{"type":"Data","id":1}}},"ProposeVote":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"string","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"ProposeVoteReply":{"fields":{"data":{"type":"skipchain.SkipBlock","id":1}}},"PropagateIdentity":{"fields":{"idblock":{"type":"IDBlock","id":1},"tag":{"rule":"required","type":"string","id":2},"pubstr":{"rule":"required","type":"string","id":3}}},"UpdateSkipBlock":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"latest":{"type":"skipchain.SkipBlock","id":2}}},"Authenticate":{"fields":{"nonce":{"rule":"required","type":"bytes","id":1},"ctx":{"rule":"required","type":"bytes","id":2}}}}},"pop":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"PoPProto"},"nested":{"ShortDesc":{"fields":{"location":{"rule":"required","type":"string","id":1},"roster":{"type":"onet.Roster","id":2}}},"PopDesc":{"fields":{"name":{"rule":"required","type":"string","id":1},"datetime":{"rule":"required","type":"string","id":2},"location":{"rule":"required","type":"string","id":3},"roster":{"type":"onet.Roster","id":4},"parties":{"rule":"repeated","type":"ShortDesc","id":5,"options":{"packed":false}}}},"FinalStatement":{"fields":{"desc":{"type":"PopDesc","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3},"merged":{"rule":"required","type":"bool","id":4}}},"CheckConfig":{"fields":{"pophash":{"rule":"required","type":"bytes","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2}}},"CheckConfigReply":{"fields":{"popstatus":{"rule":"required","type":"sint32","id":1},"pophash":{"rule":"required","type":"bytes","id":2},"attendees":{"rule":"repeated","type":"bytes","id":3}}},"MergeConfig":{"fields":{"final":{"type":"FinalStatement","id":1},"id":{"rule":"required","type":"bytes","id":2}}},"MergeConfigReply":{"fields":{"popstatus":{"rule":"required","type":"sint32","id":1},"pophash":{"rule":"required","type":"bytes","id":2},"final":{"type":"FinalStatement","id":3}}},"PinRequest":{"fields":{"pin":{"rule":"required","type":"string","id":1},"public":{"rule":"required","type":"bytes","id":2}}},"StoreConfig":{"fields":{"desc":{"type":"PopDesc","id":1},"signature":{"rule":"required","type":"bytes","id":2}}},"StoreConfigReply":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"FinalizeRequest":{"fields":{"descid":{"rule":"required","type":"bytes","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"FinalizeResponse":{"fields":{"final":{"type":"FinalStatement","id":1}}},"FetchRequest":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"returnuncomplete":{"type":"bool","id":2}}},"MergeRequest":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"signature":{"rule":"required","type":"bytes","id":2}}},"GetProposals":{"fields":{}},"GetProposalsReply":{"fields":{"proposals":{"rule":"repeated","type":"PopDesc","id":1,"options":{"packed":false}}}},"VerifyLink":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"VerifyLinkReply":{"fields":{"exists":{"rule":"required","type":"bool","id":1}}},"GetLink":{"fields":{}},"GetLinkReply":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"GetFinalStatements":{"fields":{}},"GetFinalStatementsReply":{"fields":{"finalstatements":{"keyType":"string","type":"FinalStatement","id":1}}},"StoreInstanceID":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1},"instanceid":{"rule":"required","type":"bytes","id":2}}},"StoreInstanceIDReply":{"fields":{}},"GetInstanceID":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1}}},"GetInstanceIDReply":{"fields":{"instanceid":{"rule":"required","type":"bytes","id":1}}},"StoreSigner":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"darc.Signer","id":2}}},"StoreSignerReply":{"fields":{}},"GetSigner":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1}}},"GetSignerReply":{"fields":{"signer":{"rule":"required","type":"darc.Signer","id":1}}},"StoreKeys":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"keys":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"StoreKeysReply":{"fields":{}},"GetKeys":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"GetKeysReply":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"keys":{"rule":"repeated","type":"bytes","id":2}}},"PopPartyInstance":{"fields":{"state":{"rule":"required","type":"sint32","id":1},"finalstatement":{"type":"FinalStatement","id":2},"previous":{"rule":"required","type":"bytes","id":3},"next":{"rule":"required","type":"bytes","id":4},"service":{"type":"bytes","id":5}}}}},"darcOCS":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"DarcOCSProto"},"nested":{"Darc":{"fields":{"owners":{"rule":"repeated","type":"Identity","id":1,"options":{"packed":false}},"users":{"rule":"repeated","type":"Identity","id":2,"options":{"packed":false}},"version":{"rule":"required","type":"sint32","id":3},"description":{"type":"bytes","id":4},"baseid":{"type":"bytes","id":5},"signature":{"type":"Signature","id":6}}},"Identity":{"fields":{"darc":{"type":"IdentityDarc","id":1},"ed25519":{"type":"IdentityEd25519","id":2},"x509ec":{"type":"IdentityX509EC","id":3}}},"IdentityEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"IdentityX509EC":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"IdentityDarc":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"Signature":{"fields":{"signature":{"rule":"required","type":"bytes","id":1},"signaturepath":{"rule":"required","type":"SignaturePath","id":2}}},"SignaturePath":{"fields":{"darcs":{"rule":"repeated","type":"Darc","id":1,"options":{"packed":false}},"signer":{"rule":"required","type":"Identity","id":2},"role":{"rule":"required","type":"sint32","id":3}}},"Signer":{"fields":{"ed25519":{"type":"SignerEd25519","id":1},"x509ec":{"type":"SignerX509EC","id":2}}},"SignerEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1},"secret":{"rule":"required","type":"bytes","id":2}}},"SignerX509EC":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}}}},"eventlog":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"EventLogProto"},"nested":{"SearchRequest":{"fields":{"instance":{"rule":"required","type":"bytes","id":1},"id":{"rule":"required","type":"bytes","id":2},"topic":{"rule":"required","type":"string","id":3},"from":{"rule":"required","type":"sint64","id":4},"to":{"rule":"required","type":"sint64","id":5}}},"SearchResponse":{"fields":{"events":{"rule":"repeated","type":"Event","id":1,"options":{"packed":false}},"truncated":{"rule":"required","type":"bool","id":2}}},"Event":{"fields":{"when":{"rule":"required","type":"sint64","id":1},"topic":{"rule":"required","type":"string","id":2},"content":{"rule":"required","type":"string","id":3}}}}},"ocs":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"OCSProto"},"nested":{"Transaction":{"fields":{"write":{"type":"Write","id":1},"read":{"type":"Read","id":2},"darc":{"type":"darcOCS.Darc","id":3},"meta":{"type":"bytes","id":4},"timestamp":{"rule":"required","type":"sint64","id":5}}},"Write":{"fields":{"data":{"rule":"required","type":"bytes","id":1},"u":{"rule":"required","type":"bytes","id":2},"ubar":{"rule":"required","type":"bytes","id":3},"e":{"rule":"required","type":"bytes","id":4},"f":{"rule":"required","type":"bytes","id":5},"cs":{"rule":"repeated","type":"bytes","id":6},"extradata":{"type":"bytes","id":7},"reader":{"rule":"required","type":"darcOCS.Darc","id":8},"signature":{"type":"darcOCS.Signature","id":9}}},"Read":{"fields":{"dataid":{"rule":"required","type":"bytes","id":1},"signature":{"rule":"required","type":"darcOCS.Signature","id":2}}},"ReadDoc":{"fields":{"reader":{"rule":"required","type":"darcOCS.Identity","id":1},"readid":{"rule":"required","type":"bytes","id":2},"dataid":{"rule":"required","type":"bytes","id":3}}},"CreateSkipchainsRequest":{"fields":{"roster":{"rule":"required","type":"onet.Roster","id":1},"writers":{"rule":"required","type":"darcOCS.Darc","id":2}}},"CreateSkipchainsReply":{"fields":{"ocs":{"type":"skipchain.SkipBlock","id":1},"x":{"rule":"required","type":"bytes","id":2}}},"GetDarcPath":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"basedarcid":{"rule":"required","type":"bytes","id":2},"identity":{"rule":"required","type":"darcOCS.Identity","id":3},"role":{"rule":"required","type":"sint32","id":4}}},"GetDarcPathReply":{"fields":{"path":{"rule":"repeated","type":"darcOCS.Darc","id":1,"options":{"packed":false}}}},"UpdateDarc":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"darc":{"rule":"required","type":"darcOCS.Darc","id":2}}},"UpdateDarcReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"WriteRequest":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"write":{"rule":"required","type":"Write","id":2},"signature":{"rule":"required","type":"darcOCS.Signature","id":3},"readers":{"type":"darcOCS.Darc","id":4}}},"WriteReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"ReadRequest":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"read":{"rule":"required","type":"Read","id":2}}},"ReadReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"SharedPublicRequest":{"fields":{"genesis":{"rule":"required","type":"bytes","id":1}}},"SharedPublicReply":{"fields":{"x":{"rule":"required","type":"bytes","id":1}}},"DecryptKeyRequest":{"fields":{"read":{"rule":"required","type":"bytes","id":1},"ephemeral":{"type":"bytes","id":2},"signature":{"type":"darcOCS.Signature","id":3}}},"DecryptKeyReply":{"fields":{"cs":{"rule":"repeated","type":"bytes","id":1},"xhatenc":{"rule":"required","type":"bytes","id":2},"x":{"rule":"required","type":"bytes","id":3}}},"GetReadRequests":{"fields":{"start":{"rule":"required","type":"bytes","id":1},"count":{"rule":"required","type":"sint32","id":2}}},"GetReadRequestsReply":{"fields":{"documents":{"rule":"repeated","type":"ReadDoc","id":1,"options":{"packed":false}}}},"GetBunchRequest":{"fields":{}},"GetBunchReply":{"fields":{"bunches":{"rule":"repeated","type":"skipchain.SkipBlock","id":1,"options":{"packed":false}}}},"GetLatestDarc":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"darcid":{"rule":"required","type":"bytes","id":2}}},"GetLatestDarcReply":{"fields":{"darcs":{"rule":"repeated","type":"darcOCS.Darc","id":1,"options":{"packed":false}}}}}},"personhood":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"Personhood"},"nested":{"LinkPoP":{"fields":{"party":{"rule":"required","type":"Party","id":1}}},"Party":{"fields":{"omniledgerid":{"rule":"required","type":"bytes","id":1},"instanceid":{"rule":"required","type":"bytes","id":2},"finalstatement":{"rule":"required","type":"pop.FinalStatement","id":3},"darc":{"rule":"required","type":"darc.Darc","id":4},"signer":{"rule":"required","type":"darc.Signer","id":5}}},"StringReply":{"fields":{"reply":{"rule":"required","type":"string","id":1}}},"Questionnaire":{"fields":{"title":{"rule":"required","type":"string","id":1},"questions":{"rule":"repeated","type":"string","id":2},"replies":{"rule":"required","type":"sint32","id":3},"balance":{"rule":"required","type":"uint64","id":4},"reward":{"rule":"required","type":"uint64","id":5},"id":{"rule":"required","type":"bytes","id":6}}},"Reply":{"fields":{"sum":{"rule":"repeated","type":"sint32","id":1,"options":{"packed":false}},"users":{"rule":"repeated","type":"bytes","id":2}}},"RegisterQuestionnaire":{"fields":{"questionnaire":{"rule":"required","type":"Questionnaire","id":1}}},"ListQuestionnaires":{"fields":{"start":{"rule":"required","type":"sint32","id":1},"number":{"rule":"required","type":"sint32","id":2}}},"ListQuestionnairesReply":{"fields":{"questionnaires":{"rule":"repeated","type":"Questionnaire","id":1,"options":{"packed":false}}}},"AnswerQuestionnaire":{"fields":{"questid":{"rule":"required","type":"bytes","id":1},"replies":{"rule":"repeated","type":"sint32","id":2,"options":{"packed":false}},"account":{"rule":"required","type":"bytes","id":3}}},"TopupQuestionnaire":{"fields":{"questid":{"rule":"required","type":"bytes","id":1},"topup":{"rule":"required","type":"uint64","id":2}}},"Message":{"fields":{"subject":{"rule":"required","type":"string","id":1},"date":{"rule":"required","type":"uint64","id":2},"text":{"rule":"required","type":"string","id":3},"author":{"rule":"required","type":"bytes","id":4},"balance":{"rule":"required","type":"uint64","id":5},"reward":{"rule":"required","type":"uint64","id":6},"id":{"rule":"required","type":"bytes","id":7}}},"SendMessage":{"fields":{"message":{"rule":"required","type":"Message","id":1}}},"ListMessages":{"fields":{"start":{"rule":"required","type":"sint32","id":1},"number":{"rule":"required","type":"sint32","id":2}}},"ListMessagesReply":{"fields":{"subjects":{"rule":"repeated","type":"string","id":1},"msgids":{"rule":"repeated","type":"bytes","id":2},"balances":{"rule":"repeated","type":"uint64","id":3,"options":{"packed":false}},"rewards":{"rule":"repeated","type":"uint64","id":4,"options":{"packed":false}}}},"ReadMessage":{"fields":{"msgid":{"rule":"required","type":"bytes","id":1},"partyiid":{"rule":"required","type":"bytes","id":2},"reader":{"rule":"required","type":"bytes","id":3}}},"ReadMessageReply":{"fields":{"message":{"rule":"required","type":"Message","id":1}}},"TopupMessage":{"fields":{"msgid":{"rule":"required","type":"bytes","id":1},"amount":{"rule":"required","type":"uint64","id":2}}}}},"status":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"StatusProto"},"nested":{"Request":{"fields":{}},"Response":{"fields":{"status":{"keyType":"string","type":"onet.Status","id":1},"serveridentity":{"type":"network.ServerIdentity","id":2}}}}}}} \ No newline at end of file +{"nested":{"cothority":{},"byzcoin":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"ByzCoinProto"},"nested":{"DataHeader":{"fields":{"collectionroot":{"rule":"required","type":"bytes","id":1},"clienttransactionhash":{"rule":"required","type":"bytes","id":2},"statechangeshash":{"rule":"required","type":"bytes","id":3},"timestamp":{"rule":"required","type":"sint64","id":4}}},"DataBody":{"fields":{"txresults":{"rule":"repeated","type":"TxResult","id":1,"options":{"packed":false}}}},"CreateGenesisBlock":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"roster":{"rule":"required","type":"onet.Roster","id":2},"genesisdarc":{"rule":"required","type":"darc.Darc","id":3},"blockinterval":{"rule":"required","type":"sint64","id":4},"maxblocksize":{"type":"sint32","id":5}}},"CreateGenesisBlockResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"skipblock":{"type":"skipchain.SkipBlock","id":2}}},"AddTxRequest":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"skipchainid":{"rule":"required","type":"bytes","id":2},"transaction":{"rule":"required","type":"ClientTransaction","id":3},"inclusionwait":{"type":"sint32","id":4}}},"AddTxResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1}}},"GetProof":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"key":{"rule":"required","type":"bytes","id":2},"id":{"rule":"required","type":"bytes","id":3}}},"GetProofResponse":{"fields":{"version":{"rule":"required","type":"sint32","id":1},"proof":{"rule":"required","type":"Proof","id":2}}},"ChainConfig":{"fields":{"blockinterval":{"rule":"required","type":"sint64","id":1},"roster":{"rule":"required","type":"onet.Roster","id":2},"maxblocksize":{"rule":"required","type":"sint32","id":3}}},"Proof":{"fields":{"inclusionproof":{"rule":"required","type":"collection.Proof","id":1},"latest":{"rule":"required","type":"skipchain.SkipBlock","id":2},"links":{"rule":"repeated","type":"skipchain.ForwardLink","id":3,"options":{"packed":false}}}},"Instruction":{"fields":{"instanceid":{"rule":"required","type":"bytes","id":1},"nonce":{"rule":"required","type":"bytes","id":2},"index":{"rule":"required","type":"sint32","id":3},"length":{"rule":"required","type":"sint32","id":4},"spawn":{"type":"Spawn","id":5},"invoke":{"type":"Invoke","id":6},"delete":{"type":"Delete","id":7},"signatures":{"rule":"repeated","type":"darc.Signature","id":8,"options":{"packed":false}}}},"Spawn":{"fields":{"contractid":{"rule":"required","type":"string","id":1},"args":{"rule":"repeated","type":"Argument","id":2,"options":{"packed":false}}}},"Invoke":{"fields":{"command":{"rule":"required","type":"string","id":1},"args":{"rule":"repeated","type":"Argument","id":2,"options":{"packed":false}}}},"Delete":{"fields":{}},"Argument":{"fields":{"name":{"rule":"required","type":"string","id":1},"value":{"rule":"required","type":"bytes","id":2}}},"ClientTransaction":{"fields":{"instructions":{"rule":"repeated","type":"Instruction","id":1,"options":{"packed":false}}}},"TxResult":{"fields":{"clienttransaction":{"rule":"required","type":"ClientTransaction","id":1},"accepted":{"rule":"required","type":"bool","id":2}}},"StateChange":{"fields":{"stateaction":{"rule":"required","type":"sint32","id":1},"instanceid":{"rule":"required","type":"bytes","id":2},"contractid":{"rule":"required","type":"bytes","id":3},"value":{"rule":"required","type":"bytes","id":4},"darcid":{"rule":"required","type":"bytes","id":5}}},"Coin":{"fields":{"name":{"rule":"required","type":"bytes","id":1},"value":{"rule":"required","type":"uint64","id":2}}}}},"skipchain":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"SkipchainProto"},"nested":{"GetSingleBlock":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"GetUpdateChain":{"fields":{"latestID":{"rule":"required","type":"bytes","id":1}}},"GetUpdateChainReply":{"fields":{"update":{"rule":"repeated","type":"SkipBlock","id":1,"options":{"packed":false}}}},"SkipBlock":{"fields":{"index":{"rule":"required","type":"int32","id":1},"height":{"rule":"required","type":"int32","id":2},"maxHeight":{"rule":"required","type":"int32","id":3},"baseHeight":{"rule":"required","type":"int32","id":4},"backlinks":{"rule":"repeated","type":"bytes","id":5},"verifiers":{"rule":"repeated","type":"bytes","id":6},"parent":{"type":"bytes","id":7},"genesis":{"rule":"required","type":"bytes","id":8},"data":{"rule":"required","type":"bytes","id":9},"roster":{"rule":"required","type":"onet.Roster","id":10},"hash":{"rule":"required","type":"bytes","id":11},"forward":{"rule":"repeated","type":"ForwardLink","id":12,"options":{"packed":false}},"children":{"rule":"repeated","type":"bytes","id":13},"payload":{"type":"bytes","id":14}}},"ForwardLink":{"fields":{"from":{"rule":"required","type":"bytes","id":1},"to":{"rule":"required","type":"bytes","id":2},"newRoster":{"type":"onet.Roster","id":3},"signature":{"rule":"required","type":"ByzcoinSig","id":4}}},"ByzcoinSig":{"fields":{"msg":{"rule":"required","type":"bytes","id":1},"sig":{"rule":"required","type":"bytes","id":2}}},"SchnorrSig":{"fields":{"challenge":{"rule":"required","type":"bytes","id":1},"response":{"rule":"required","type":"bytes","id":2}}},"Exception":{"fields":{"index":{"rule":"required","type":"int32","id":1},"commitment":{"rule":"required","type":"bytes","id":2}}}}},"onet":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"OnetProto"},"nested":{"Roster":{"fields":{"id":{"type":"bytes","id":1},"list":{"rule":"repeated","type":"network.ServerIdentity","id":2,"options":{"packed":false}},"aggregate":{"rule":"required","type":"bytes","id":3}}},"Status":{"fields":{"field":{"keyType":"string","type":"string","id":1}}}}},"network":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"NetworkProto"},"nested":{"ServerIdentity":{"fields":{"public":{"rule":"required","type":"bytes","id":1},"id":{"rule":"required","type":"bytes","id":2},"address":{"rule":"required","type":"string","id":3},"description":{"rule":"required","type":"string","id":4}}}}},"darc":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"DarcProto"},"nested":{"Darc":{"fields":{"version":{"rule":"required","type":"uint64","id":1},"description":{"rule":"required","type":"bytes","id":2},"baseid":{"type":"bytes","id":3},"previd":{"rule":"required","type":"bytes","id":4},"rules":{"rule":"required","type":"Rules","id":5},"signatures":{"rule":"repeated","type":"Signature","id":6,"options":{"packed":false}},"verificationdarcs":{"rule":"repeated","type":"Darc","id":7,"options":{"packed":false}}}},"Identity":{"fields":{"darc":{"type":"IdentityDarc","id":1},"ed25519":{"type":"IdentityEd25519","id":2},"x509ec":{"type":"IdentityX509EC","id":3}}},"IdentityEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"IdentityX509EC":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"IdentityDarc":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"Signature":{"fields":{"signature":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"Identity","id":2}}},"Signer":{"fields":{"ed25519":{"type":"SignerEd25519","id":1},"x509ec":{"type":"SignerX509EC","id":2}}},"SignerEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1},"secret":{"rule":"required","type":"bytes","id":2}}},"SignerX509EC":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"Request":{"fields":{"baseid":{"rule":"required","type":"bytes","id":1},"action":{"rule":"required","type":"string","id":2},"msg":{"rule":"required","type":"bytes","id":3},"identities":{"rule":"repeated","type":"Identity","id":4,"options":{"packed":false}},"signatures":{"rule":"repeated","type":"bytes","id":5}}},"Rules":{"fields":{"list":{"rule":"repeated","type":"Rule","id":1,"options":{"packed":false}}}},"Rule":{"fields":{"action":{"rule":"required","type":"string","id":1},"expr":{"rule":"required","type":"bytes","id":2}}}}},"collection":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"CollectionProto"},"nested":{"Dump":{"fields":{"key":{"rule":"required","type":"bytes","id":1},"values":{"rule":"repeated","type":"bytes","id":2},"children":{"rule":"required","type":"Children","id":3},"label":{"rule":"required","type":"bytes","id":4}}},"Children":{"fields":{"left":{"rule":"required","type":"bytes","id":1},"right":{"rule":"required","type":"bytes","id":2}}},"Step":{"fields":{"left":{"rule":"required","type":"Dump","id":1},"right":{"rule":"required","type":"Dump","id":2}}},"Proof":{"fields":{"key":{"rule":"required","type":"bytes","id":1},"root":{"rule":"required","type":"Dump","id":2},"steps":{"rule":"repeated","type":"Step","id":3,"options":{"packed":false}}}}}},"calypso":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"Calypso"},"nested":{"Write":{"fields":{"data":{"rule":"required","type":"bytes","id":1},"u":{"rule":"required","type":"bytes","id":2},"ubar":{"rule":"required","type":"bytes","id":3},"e":{"rule":"required","type":"bytes","id":4},"f":{"rule":"required","type":"bytes","id":5},"cs":{"rule":"repeated","type":"bytes","id":6},"extradata":{"type":"bytes","id":7},"ltsid":{"rule":"required","type":"bytes","id":8}}},"Read":{"fields":{"write":{"rule":"required","type":"bytes","id":1},"xc":{"rule":"required","type":"bytes","id":2}}},"CreateLTS":{"fields":{"roster":{"rule":"required","type":"onet.Roster","id":1},"bcid":{"rule":"required","type":"bytes","id":2}}},"CreateLTSReply":{"fields":{"ltsid":{"rule":"required","type":"bytes","id":1},"x":{"rule":"required","type":"bytes","id":2}}},"DecryptKey":{"fields":{"read":{"rule":"required","type":"byzcoin.Proof","id":1},"write":{"rule":"required","type":"byzcoin.Proof","id":2}}},"DecryptKeyReply":{"fields":{"cs":{"rule":"repeated","type":"bytes","id":1},"xhatenc":{"rule":"required","type":"bytes","id":2},"x":{"rule":"required","type":"bytes","id":3}}},"SharedPublic":{"fields":{"ltsid":{"rule":"required","type":"bytes","id":1}}},"SharedPublicReply":{"fields":{"x":{"rule":"required","type":"bytes","id":1}}}}},"cisc":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"CiscProto"},"nested":{"IDBlock":{"fields":{"latest":{"type":"Data","id":1},"proposed":{"type":"Data","id":2},"latestskipblock":{"type":"skipchain.SkipBlock","id":3}}},"Data":{"fields":{"threshold":{"rule":"required","type":"sint32","id":1},"device":{"keyType":"string","type":"Device","id":2},"storage":{"keyType":"string","type":"string","id":3},"roster":{"type":"onet.Roster","id":4},"votes":{"keyType":"string","type":"bytes","id":5}}},"Device":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"PinRequest":{"fields":{"pin":{"rule":"required","type":"string","id":1},"public":{"rule":"required","type":"bytes","id":2}}},"StoreKeys":{"fields":{"type":{"rule":"required","type":"sint32","id":1},"final":{"type":"pop.FinalStatement","id":2},"publics":{"rule":"repeated","type":"bytes","id":3},"sig":{"rule":"required","type":"bytes","id":4}}},"CreateIdentity":{"fields":{"data":{"type":"Data","id":1},"type":{"rule":"required","type":"sint32","id":2},"schnsig":{"type":"bytes","id":3},"sig":{"rule":"required","type":"bytes","id":4},"nonce":{"rule":"required","type":"bytes","id":5}}},"CreateIdentityReply":{"fields":{"genesis":{"type":"skipchain.SkipBlock","id":1}}},"DataUpdate":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"DataUpdateReply":{"fields":{"data":{"type":"Data","id":1}}},"ProposeSend":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"propose":{"type":"Data","id":2}}},"ProposeUpdate":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"ProposeUpdateReply":{"fields":{"propose":{"type":"Data","id":1}}},"ProposeVote":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"string","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"ProposeVoteReply":{"fields":{"data":{"type":"skipchain.SkipBlock","id":1}}},"PropagateIdentity":{"fields":{"idblock":{"type":"IDBlock","id":1},"tag":{"rule":"required","type":"string","id":2},"pubstr":{"rule":"required","type":"string","id":3}}},"UpdateSkipBlock":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"latest":{"type":"skipchain.SkipBlock","id":2}}},"Authenticate":{"fields":{"nonce":{"rule":"required","type":"bytes","id":1},"ctx":{"rule":"required","type":"bytes","id":2}}}}},"pop":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"PoPProto"},"nested":{"ShortDesc":{"fields":{"location":{"rule":"required","type":"string","id":1},"roster":{"type":"onet.Roster","id":2}}},"PopDesc":{"fields":{"name":{"rule":"required","type":"string","id":1},"datetime":{"rule":"required","type":"string","id":2},"location":{"rule":"required","type":"string","id":3},"roster":{"type":"onet.Roster","id":4},"parties":{"rule":"repeated","type":"ShortDesc","id":5,"options":{"packed":false}}}},"FinalStatement":{"fields":{"desc":{"type":"PopDesc","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3},"merged":{"rule":"required","type":"bool","id":4}}},"CheckConfig":{"fields":{"pophash":{"rule":"required","type":"bytes","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2}}},"CheckConfigReply":{"fields":{"popstatus":{"rule":"required","type":"sint32","id":1},"pophash":{"rule":"required","type":"bytes","id":2},"attendees":{"rule":"repeated","type":"bytes","id":3}}},"MergeConfig":{"fields":{"final":{"type":"FinalStatement","id":1},"id":{"rule":"required","type":"bytes","id":2}}},"MergeConfigReply":{"fields":{"popstatus":{"rule":"required","type":"sint32","id":1},"pophash":{"rule":"required","type":"bytes","id":2},"final":{"type":"FinalStatement","id":3}}},"PinRequest":{"fields":{"pin":{"rule":"required","type":"string","id":1},"public":{"rule":"required","type":"bytes","id":2}}},"StoreConfig":{"fields":{"desc":{"type":"PopDesc","id":1},"signature":{"rule":"required","type":"bytes","id":2}}},"StoreConfigReply":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"FinalizeRequest":{"fields":{"descid":{"rule":"required","type":"bytes","id":1},"attendees":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"FinalizeResponse":{"fields":{"final":{"type":"FinalStatement","id":1}}},"FetchRequest":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"returnuncomplete":{"type":"bool","id":2}}},"MergeRequest":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"signature":{"rule":"required","type":"bytes","id":2}}},"GetProposals":{"fields":{}},"GetProposalsReply":{"fields":{"proposals":{"rule":"repeated","type":"PopDesc","id":1,"options":{"packed":false}}}},"VerifyLink":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"VerifyLinkReply":{"fields":{"exists":{"rule":"required","type":"bool","id":1}}},"GetLink":{"fields":{}},"GetLinkReply":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"GetFinalStatements":{"fields":{}},"GetFinalStatementsReply":{"fields":{"finalstatements":{"keyType":"string","type":"FinalStatement","id":1}}},"StoreInstanceID":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1},"instanceid":{"rule":"required","type":"bytes","id":2}}},"StoreInstanceIDReply":{"fields":{}},"GetInstanceID":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1}}},"GetInstanceIDReply":{"fields":{"instanceid":{"rule":"required","type":"bytes","id":1}}},"StoreSigner":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1},"signer":{"rule":"required","type":"darc.Signer","id":2}}},"StoreSignerReply":{"fields":{}},"GetSigner":{"fields":{"partyid":{"rule":"required","type":"bytes","id":1}}},"GetSignerReply":{"fields":{"signer":{"rule":"required","type":"darc.Signer","id":1}}},"StoreKeys":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"keys":{"rule":"repeated","type":"bytes","id":2},"signature":{"rule":"required","type":"bytes","id":3}}},"StoreKeysReply":{"fields":{}},"GetKeys":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"GetKeysReply":{"fields":{"id":{"rule":"required","type":"bytes","id":1},"keys":{"rule":"repeated","type":"bytes","id":2}}},"PopPartyInstance":{"fields":{"state":{"rule":"required","type":"sint32","id":1},"finalstatement":{"type":"FinalStatement","id":2},"previous":{"rule":"required","type":"bytes","id":3},"next":{"rule":"required","type":"bytes","id":4},"service":{"type":"bytes","id":5}}}}},"darcOCS":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"DarcOCSProto"},"nested":{"Darc":{"fields":{"owners":{"rule":"repeated","type":"Identity","id":1,"options":{"packed":false}},"users":{"rule":"repeated","type":"Identity","id":2,"options":{"packed":false}},"version":{"rule":"required","type":"sint32","id":3},"description":{"type":"bytes","id":4},"baseid":{"type":"bytes","id":5},"signature":{"type":"Signature","id":6}}},"Identity":{"fields":{"darc":{"type":"IdentityDarc","id":1},"ed25519":{"type":"IdentityEd25519","id":2},"x509ec":{"type":"IdentityX509EC","id":3}}},"IdentityEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}},"IdentityX509EC":{"fields":{"public":{"rule":"required","type":"bytes","id":1}}},"IdentityDarc":{"fields":{"id":{"rule":"required","type":"bytes","id":1}}},"Signature":{"fields":{"signature":{"rule":"required","type":"bytes","id":1},"signaturepath":{"rule":"required","type":"SignaturePath","id":2}}},"SignaturePath":{"fields":{"darcs":{"rule":"repeated","type":"Darc","id":1,"options":{"packed":false}},"signer":{"rule":"required","type":"Identity","id":2},"role":{"rule":"required","type":"sint32","id":3}}},"Signer":{"fields":{"ed25519":{"type":"SignerEd25519","id":1},"x509ec":{"type":"SignerX509EC","id":2}}},"SignerEd25519":{"fields":{"point":{"rule":"required","type":"bytes","id":1},"secret":{"rule":"required","type":"bytes","id":2}}},"SignerX509EC":{"fields":{"point":{"rule":"required","type":"bytes","id":1}}}}},"eventlog":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"EventLogProto"},"nested":{"SearchRequest":{"fields":{"instance":{"rule":"required","type":"bytes","id":1},"id":{"rule":"required","type":"bytes","id":2},"topic":{"rule":"required","type":"string","id":3},"from":{"rule":"required","type":"sint64","id":4},"to":{"rule":"required","type":"sint64","id":5}}},"SearchResponse":{"fields":{"events":{"rule":"repeated","type":"Event","id":1,"options":{"packed":false}},"truncated":{"rule":"required","type":"bool","id":2}}},"Event":{"fields":{"when":{"rule":"required","type":"sint64","id":1},"topic":{"rule":"required","type":"string","id":2},"content":{"rule":"required","type":"string","id":3}}}}},"ocs":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"OCSProto"},"nested":{"Transaction":{"fields":{"write":{"type":"Write","id":1},"read":{"type":"Read","id":2},"darc":{"type":"darcOCS.Darc","id":3},"meta":{"type":"bytes","id":4},"timestamp":{"rule":"required","type":"sint64","id":5}}},"Write":{"fields":{"data":{"rule":"required","type":"bytes","id":1},"u":{"rule":"required","type":"bytes","id":2},"ubar":{"rule":"required","type":"bytes","id":3},"e":{"rule":"required","type":"bytes","id":4},"f":{"rule":"required","type":"bytes","id":5},"cs":{"rule":"repeated","type":"bytes","id":6},"extradata":{"type":"bytes","id":7},"reader":{"rule":"required","type":"darcOCS.Darc","id":8},"signature":{"type":"darcOCS.Signature","id":9}}},"Read":{"fields":{"dataid":{"rule":"required","type":"bytes","id":1},"signature":{"rule":"required","type":"darcOCS.Signature","id":2}}},"ReadDoc":{"fields":{"reader":{"rule":"required","type":"darcOCS.Identity","id":1},"readid":{"rule":"required","type":"bytes","id":2},"dataid":{"rule":"required","type":"bytes","id":3}}},"CreateSkipchainsRequest":{"fields":{"roster":{"rule":"required","type":"onet.Roster","id":1},"writers":{"rule":"required","type":"darcOCS.Darc","id":2}}},"CreateSkipchainsReply":{"fields":{"ocs":{"type":"skipchain.SkipBlock","id":1},"x":{"rule":"required","type":"bytes","id":2}}},"GetDarcPath":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"basedarcid":{"rule":"required","type":"bytes","id":2},"identity":{"rule":"required","type":"darcOCS.Identity","id":3},"role":{"rule":"required","type":"sint32","id":4}}},"GetDarcPathReply":{"fields":{"path":{"rule":"repeated","type":"darcOCS.Darc","id":1,"options":{"packed":false}}}},"UpdateDarc":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"darc":{"rule":"required","type":"darcOCS.Darc","id":2}}},"UpdateDarcReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"WriteRequest":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"write":{"rule":"required","type":"Write","id":2},"signature":{"rule":"required","type":"darcOCS.Signature","id":3},"readers":{"type":"darcOCS.Darc","id":4}}},"WriteReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"ReadRequest":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"read":{"rule":"required","type":"Read","id":2}}},"ReadReply":{"fields":{"sb":{"type":"skipchain.SkipBlock","id":1}}},"SharedPublicRequest":{"fields":{"genesis":{"rule":"required","type":"bytes","id":1}}},"SharedPublicReply":{"fields":{"x":{"rule":"required","type":"bytes","id":1}}},"DecryptKeyRequest":{"fields":{"read":{"rule":"required","type":"bytes","id":1},"ephemeral":{"type":"bytes","id":2},"signature":{"type":"darcOCS.Signature","id":3}}},"DecryptKeyReply":{"fields":{"cs":{"rule":"repeated","type":"bytes","id":1},"xhatenc":{"rule":"required","type":"bytes","id":2},"x":{"rule":"required","type":"bytes","id":3}}},"GetReadRequests":{"fields":{"start":{"rule":"required","type":"bytes","id":1},"count":{"rule":"required","type":"sint32","id":2}}},"GetReadRequestsReply":{"fields":{"documents":{"rule":"repeated","type":"ReadDoc","id":1,"options":{"packed":false}}}},"GetBunchRequest":{"fields":{}},"GetBunchReply":{"fields":{"bunches":{"rule":"repeated","type":"skipchain.SkipBlock","id":1,"options":{"packed":false}}}},"GetLatestDarc":{"fields":{"ocs":{"rule":"required","type":"bytes","id":1},"darcid":{"rule":"required","type":"bytes","id":2}}},"GetLatestDarcReply":{"fields":{"darcs":{"rule":"repeated","type":"darcOCS.Darc","id":1,"options":{"packed":false}}}}}},"personhood":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"Personhood"},"nested":{"LinkPoP":{"fields":{"party":{"rule":"required","type":"Party","id":1}}},"Party":{"fields":{"byzcoinid":{"rule":"required","type":"bytes","id":1},"instanceid":{"rule":"required","type":"bytes","id":2},"finalstatement":{"rule":"required","type":"pop.FinalStatement","id":3},"darc":{"rule":"required","type":"darc.Darc","id":4},"signer":{"rule":"required","type":"darc.Signer","id":5}}},"StringReply":{"fields":{"reply":{"rule":"required","type":"string","id":1}}},"Questionnaire":{"fields":{"title":{"rule":"required","type":"string","id":1},"questions":{"rule":"repeated","type":"string","id":2},"replies":{"rule":"required","type":"sint32","id":3},"balance":{"rule":"required","type":"uint64","id":4},"reward":{"rule":"required","type":"uint64","id":5},"id":{"rule":"required","type":"bytes","id":6}}},"Reply":{"fields":{"sum":{"rule":"repeated","type":"sint32","id":1,"options":{"packed":false}},"users":{"rule":"repeated","type":"bytes","id":2}}},"RegisterQuestionnaire":{"fields":{"questionnaire":{"rule":"required","type":"Questionnaire","id":1}}},"ListQuestionnaires":{"fields":{"start":{"rule":"required","type":"sint32","id":1},"number":{"rule":"required","type":"sint32","id":2}}},"ListQuestionnairesReply":{"fields":{"questionnaires":{"rule":"repeated","type":"Questionnaire","id":1,"options":{"packed":false}}}},"AnswerQuestionnaire":{"fields":{"questid":{"rule":"required","type":"bytes","id":1},"replies":{"rule":"repeated","type":"sint32","id":2,"options":{"packed":false}},"account":{"rule":"required","type":"bytes","id":3}}},"TopupQuestionnaire":{"fields":{"questid":{"rule":"required","type":"bytes","id":1},"topup":{"rule":"required","type":"uint64","id":2}}},"Message":{"fields":{"subject":{"rule":"required","type":"string","id":1},"date":{"rule":"required","type":"uint64","id":2},"text":{"rule":"required","type":"string","id":3},"author":{"rule":"required","type":"bytes","id":4},"balance":{"rule":"required","type":"uint64","id":5},"reward":{"rule":"required","type":"uint64","id":6},"id":{"rule":"required","type":"bytes","id":7}}},"SendMessage":{"fields":{"message":{"rule":"required","type":"Message","id":1}}},"ListMessages":{"fields":{"start":{"rule":"required","type":"sint32","id":1},"number":{"rule":"required","type":"sint32","id":2}}},"ListMessagesReply":{"fields":{"subjects":{"rule":"repeated","type":"string","id":1},"msgids":{"rule":"repeated","type":"bytes","id":2},"balances":{"rule":"repeated","type":"uint64","id":3,"options":{"packed":false}},"rewards":{"rule":"repeated","type":"uint64","id":4,"options":{"packed":false}}}},"ReadMessage":{"fields":{"msgid":{"rule":"required","type":"bytes","id":1},"partyiid":{"rule":"required","type":"bytes","id":2},"reader":{"rule":"required","type":"bytes","id":3}}},"ReadMessageReply":{"fields":{"message":{"rule":"required","type":"Message","id":1}}},"TopupMessage":{"fields":{"msgid":{"rule":"required","type":"bytes","id":1},"amount":{"rule":"required","type":"uint64","id":2}}}}},"status":{"options":{"java_package":"ch.epfl.dedis.proto","java_outer_classname":"StatusProto"},"nested":{"Request":{"fields":{}},"Response":{"fields":{"status":{"keyType":"string","type":"onet.Status","id":1},"serveridentity":{"type":"network.ServerIdentity","id":2}}}}}}} \ No newline at end of file diff --git a/external/js/cothority/package-lock.json b/external/js/cothority/package-lock.json deleted file mode 100644 index f3f08050e3..0000000000 --- a/external/js/cothority/package-lock.json +++ /dev/null @@ -1,5984 +0,0 @@ -{ - "name": "@dedis/cothority", - "version": "1.1.16", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@dedis/kyber-js": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@dedis/kyber-js/-/kyber-js-0.0.10.tgz", - "integrity": "sha512-vRCBFllH4tPPNMkSctuKUJwmsQGts14t/UqtmxUN6RZILwigrRIjLroLrpflY15knvGPkbDhzPJw1azIC7FIyQ==", - "requires": { - "bn.js": "^4.11.8", - "elliptic": "^6.4.0", - "hash.js": "^1.1.3" - } - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" - }, - "@types/node": { - "version": "8.10.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.18.tgz", - "integrity": "sha512-WoepSz+wJlU5Bjq5oK6cO1oXe2FgPcjMtQPgKPS8fVaTAD0lxkScMCCbMimdkVCsykqaA4lvHWz3cmj28yimhA==" - }, - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "acorn": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz", - "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", - "dev": true, - "requires": { - "acorn": "^4.0.3" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", - "dev": true - } - } - }, - "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "requires": { - "acorn": "^3.0.4" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } - } - }, - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" - }, - "dependencies": { - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } - } - }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-escape-sequences": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.0.0.tgz", - "integrity": "sha512-v+0wW9Wezwsyb0uF4aBVCjmSqit3Ru7PZFziGF0o2KwTvN2zWfTi3BRLq9EkJFdg3eBbyERXGTntVpBxH1J68Q==", - "dev": true, - "requires": { - "array-back": "^2.0.0" - } - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "argv-tools": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/argv-tools/-/argv-tools-0.1.1.tgz", - "integrity": "sha512-Cc0dBvx4dvrjjKpyDA6w8RlNAw8Su30NvZbWl/Tv9ZALEVlLVkWQiHMi84Q0xNfpVuSaiQbYkdmWK8g1PLGhKw==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "find-replace": "^2.0.1" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "array-back": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", - "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==", - "dev": true, - "requires": { - "typical": "^2.6.1" - } - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, - "requires": { - "util": "0.10.3" - } - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, - "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==" - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-loader": { - "version": "7.1.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz", - "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==", - "dev": true, - "requires": { - "find-cache-dir": "^1.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-async-generators": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", - "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-generator-functions": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", - "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-generators": "^6.5.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-object-rest-spread": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", - "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", - "dev": true, - "requires": { - "babel-plugin-syntax-object-rest-spread": "^6.8.0", - "babel-runtime": "^6.26.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "dev": true, - "requires": { - "regenerator-transform": "^0.10.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, - "babel-preset-stage-3": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", - "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", - "dev": true, - "requires": { - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-generator-functions": "^6.24.1", - "babel-plugin-transform-async-to-generator": "^6.24.1", - "babel-plugin-transform-exponentiation-operator": "^6.24.1", - "babel-plugin-transform-object-rest-spread": "^6.22.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base64-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", - "dev": true - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browserify-aes": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", - "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", - "dev": true, - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", - "dev": true, - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "~1.0.5" - } - }, - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", - "dev": true, - "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" - }, - "dependencies": { - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - } - } - }, - "cache-point": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-0.4.1.tgz", - "integrity": "sha512-4TgWfe9SF+bUy5cCql8gWHqKNrviufNwSYxLjf2utB0pY4+bdcuFwMmY1hDB+67Gz/L1vmhFNhePAjJTFBtV+Q==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "fs-then-native": "^2.0.0", - "mkdirp2": "^1.0.3" - } - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "^0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30000847", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000847.tgz", - "integrity": "sha512-Weo+tRtVWcN2da782Ebx/27hFNEb+KP+uP6tdqAa+2S5bp1zOJhVH9tEpDygagrfvU4QjeuPwi/5VGsgT4SLaA==", - "dev": true - }, - "catharsis": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", - "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", - "dev": true, - "requires": { - "underscore-contrib": "~0.3.0" - } - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "chai": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", - "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", - "dev": true, - "requires": { - "assertion-error": "^1.0.1", - "check-error": "^1.0.1", - "deep-eql": "^3.0.0", - "get-func-name": "^2.0.0", - "pathval": "^1.0.0", - "type-detect": "^4.0.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - } - }, - "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true - } - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "collect-all": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz", - "integrity": "sha512-0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA==", - "dev": true, - "requires": { - "stream-connect": "^1.0.2", - "stream-via": "^1.0.4" - } - }, - "color-convert": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", - "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", - "dev": true, - "requires": { - "color-name": "1.1.1" - } - }, - "color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", - "dev": true - }, - "command-line-args": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.0.1.tgz", - "integrity": "sha512-gRJDcIjFSzMcmG/GrJlgL0wWoAxr11mVzCq32bjka0endupm9meLwvoJUKc4HDeFiEIB2X3GvNrhF5cKO4Bd4A==", - "dev": true, - "requires": { - "argv-tools": "^0.1.1", - "array-back": "^2.0.0", - "find-replace": "^2.0.1", - "lodash.camelcase": "^4.3.0", - "typical": "^2.6.1" - } - }, - "command-line-tool": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz", - "integrity": "sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g==", - "dev": true, - "requires": { - "ansi-escape-sequences": "^4.0.0", - "array-back": "^2.0.0", - "command-line-args": "^5.0.0", - "command-line-usage": "^4.1.0", - "typical": "^2.6.1" - } - }, - "command-line-usage": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz", - "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==", - "dev": true, - "requires": { - "ansi-escape-sequences": "^4.0.0", - "array-back": "^2.0.0", - "table-layout": "^0.4.2", - "typical": "^2.6.1" - } - }, - "common-sequence": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-1.0.2.tgz", - "integrity": "sha1-MOB/P49vf5s97oVPILLTnu4Ibeg=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "config-master": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz", - "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=", - "dev": true, - "requires": { - "walk-back": "^2.0.1" - }, - "dependencies": { - "walk-back": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz", - "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=", - "dev": true - } - } - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "^0.1.4" - } - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "create-ecdh": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } - }, - "create-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", - "dev": true, - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "^0.10.9" - } - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - } - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "diffie-hellman": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "dmd": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/dmd/-/dmd-3.0.10.tgz", - "integrity": "sha512-+tRZIFV9fII538XFZSoRP1abtIy55RYa4waGvtKB36LD97NRorWsYT3V3HEURmnXpA4eGIFQph1E2f+51hWrTg==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "cache-point": "^0.4.1", - "common-sequence": "^1.0.2", - "file-set": "^1.1.1", - "handlebars": "^4.0.11", - "marked": "^0.3.12", - "object-get": "^2.1.0", - "reduce-flatten": "^1.0.1", - "reduce-unique": "^1.0.0", - "reduce-without": "^1.0.1", - "test-value": "^3.0.0", - "walk-back": "^3.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true - }, - "duplexify": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", - "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "electron-to-chromium": { - "version": "1.3.48", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", - "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "object-assign": "^4.0.1", - "tapable": "^0.2.7" - } - }, - "errno": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz", - "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es5-ext": { - "version": "0.10.38", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz", - "integrity": "sha512-jCMyePo7AXbUESwbl8Qi01VSH2piY9s/a3rSU/5w/MlTIx8HPL1xn2InGN8ejt/xulcJgnTO7vqNtOAxzYd2Kg==", - "dev": true, - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" - } - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } - } - }, - "eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", - "dev": true, - "requires": { - "ajv": "^5.3.0", - "babel-code-frame": "^6.22.0", - "chalk": "^2.1.0", - "concat-stream": "^1.6.0", - "cross-spawn": "^5.1.0", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^3.7.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^3.5.4", - "esquery": "^1.0.0", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.0.1", - "ignore": "^3.3.3", - "imurmurhash": "^0.1.4", - "inquirer": "^3.0.6", - "is-resolvable": "^1.0.0", - "js-yaml": "^3.9.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.4", - "minimatch": "^3.0.2", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.3.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "~2.0.1", - "table": "4.0.2", - "text-table": "~0.2.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - } - } - }, - "eslint-config-prettier": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", - "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", - "dev": true, - "requires": { - "get-stdin": "^5.0.1" - } - }, - "eslint-plugin-prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz", - "integrity": "sha512-tGek5clmW5swrAx1mdPYM8oThrBE83ePh7LeseZHBWfHVGrHPhKn7Y5zgRMbU/9D5Td9K4CEmUPjGxA7iw98Og==", - "dev": true, - "requires": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" - } - }, - "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", - "dev": true, - "requires": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.1.tgz", - "integrity": "sha512-XH4o5BK5jmw9PzSGK7mNf+/xV+mPxQxGZoeC36OVsJZYV77JAG9NnI7T90hoUpI/C1TOfXWTvugRdZ9ZR3iE2Q==", - "dev": true - } - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } - } - }, - "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", - "dev": true, - "requires": { - "estraverse": "^4.1.0", - "object-assign": "^4.0.1" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } - } - }, - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "^2.1.0" - } - }, - "external-editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", - "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", - "dev": true, - "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/file/-/file-0.2.2.tgz", - "integrity": "sha1-w9/Y+M81Na5FXCtCPC5SY112tNM=", - "dev": true - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - } - }, - "file-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/file-set/-/file-set-1.1.1.tgz", - "integrity": "sha1-0+xwwIDsjxjyBLod4QZ4DJBWkms=", - "dev": true, - "requires": { - "array-back": "^1.0.3", - "glob": "^7.1.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "randomatic": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", - "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", - "dev": true, - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - } - } - } - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" - }, - "dependencies": { - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - } - } - }, - "find-replace": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-2.0.1.tgz", - "integrity": "sha512-LzDo3Fpa30FLIBsh6DCDnMN1KW2g4QKkqKmejlImgWY67dDFPX/x9Kh/op/GK522DchQXEvDi/wD48HKW49XOQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "test-value": "^3.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", - "dev": true, - "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" - } - }, - "flush-write-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", - "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-then-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz", - "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=", - "dev": true - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "^2.1.0" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "get-stdin": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", - "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "globals": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", - "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", - "dev": true - }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "hash-base": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", - "dev": true, - "requires": { - "inherits": "^2.0.1" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", - "dev": true - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true - }, - "ignore": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", - "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==", - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.0.4", - "figures": "^2.0.0", - "lodash": "^4.3.0", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rx-lite": "^4.0.8", - "rx-lite-aggregates": "^4.0.8", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" - } - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", - "dev": true - }, - "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, - "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "dependencies": { - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - } - } - }, - "js2xmlparser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", - "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", - "dev": true, - "requires": { - "xmlcreate": "^1.0.1" - } - }, - "jsdoc": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", - "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", - "dev": true, - "requires": { - "babylon": "7.0.0-beta.19", - "bluebird": "~3.5.0", - "catharsis": "~0.8.9", - "escape-string-regexp": "~1.0.5", - "js2xmlparser": "~3.0.0", - "klaw": "~2.0.0", - "marked": "~0.3.6", - "mkdirp": "~0.5.1", - "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", - "taffydb": "2.6.2", - "underscore": "~1.8.3" - }, - "dependencies": { - "babylon": { - "version": "7.0.0-beta.19", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", - "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", - "dev": true - } - } - }, - "jsdoc-api": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-4.0.1.tgz", - "integrity": "sha512-qCzHGQxfd9toMRjQft9E44Y40zWDPgf13pt3n+xExk8+wmVd7aueW6cTSQOHyjQG1v07INunQD8AcCAPxhZVmw==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "cache-point": "^0.4.1", - "collect-all": "^1.0.3", - "file-set": "^1.1.1", - "fs-then-native": "^2.0.0", - "jsdoc": "~3.5.5", - "object-to-spawn-args": "^1.1.1", - "temp-path": "^1.0.0", - "walk-back": "^3.0.0" - } - }, - "jsdoc-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-3.0.1.tgz", - "integrity": "sha512-btZLp4wYl90vcAfgk4hoGQbO17iBVrhh3LJRMKZNtZgniO3F8H2CjxXld0owBIB1XxN+j3bAcWZnZKMnSj3iMA==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "lodash.omit": "^4.5.0", - "lodash.pick": "^4.4.0", - "reduce-extract": "^1.0.0", - "sort-array": "^2.0.0", - "test-value": "^3.0.0" - } - }, - "jsdoc-to-markdown": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-4.0.1.tgz", - "integrity": "sha512-LHJRoLoLyDdxNcColgkLoB/rFG5iRP+PNJjMILI0x+95IdEAtyjSt0wJ6ZlKxRpkhBYtQXTQQ119hMqPIUZzTQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "command-line-tool": "^0.8.0", - "config-master": "^3.1.0", - "dmd": "^3.0.10", - "jsdoc-api": "^4.0.1", - "jsdoc-parse": "^3.0.1", - "walk-back": "^3.0.0" - } - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - }, - "json-loader": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - } - }, - "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", - "dev": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=", - "dev": true - }, - "lodash.padend": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", - "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=", - "dev": true - }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", - "dev": true - }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, - "requires": { - "js-tokens": "^3.0.0" - } - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", - "dev": true, - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, - "marked": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz", - "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==", - "dev": true - }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, - "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - }, - "dependencies": { - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - } - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mkdirp2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.3.tgz", - "integrity": "sha1-zI3YJl8fBuLY9bELblL04FC+0hs=", - "dev": true - }, - "mocha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", - "dev": true, - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.15.1", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.5", - "he": "1.1.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "supports-color": "5.4.0" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "mock-socket": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-7.1.0.tgz", - "integrity": "sha512-rGLU70pR+0C9xgsRKXLd54heGWg1hQcarH1RMX2Jpn4pgGIWzbGFsM1RvQqbWMXpDXsSoNPBhqVgBStza/wT3Q==", - "dev": true - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^1.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.0", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.10.3", - "vm-browserify": "0.0.4" - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-get": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.0.tgz", - "integrity": "sha1-ciu9tgA576R8rTxtws5RqFwCxa4=", - "dev": true - }, - "object-to-spawn-args": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz", - "integrity": "sha1-d9qIJ/Bz0BHJ4bFz+JV4FHAkZ4U=", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "dev": true, - "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, - "parse-asn1": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", - "dev": true, - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3" - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - } - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true - }, - "pbkdf2": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "prettier": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz", - "integrity": "sha512-TcdNoQIWFoHblurqqU6d1ysopjq7UX0oRcT/hJ8qvBAELiYWn+Ugf0AXdnzISEJ7vuhNnQ98N8jR8Sh53x4IZg==", - "dev": true - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true - }, - "protobufjs": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", - "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^3.0.32", - "@types/node": "^8.9.4", - "long": "^4.0.0" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz", - "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", - "dev": true, - "requires": { - "duplexify": "^3.5.3", - "inherits": "^2.0.3", - "pump": "^2.0.0" - } - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "pure-uuid": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/pure-uuid/-/pure-uuid-1.5.3.tgz", - "integrity": "sha512-Wqgq/EtTicstn7g9siPbZ4O1s2Zh9EY9Ccn/doRiDDfMRy6l9AuvJILOq4PeT84FTDOpzrmP3rEd/XVRpRa9Zw==" - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", - "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", - "dev": true, - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" - } - }, - "reduce-extract": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz", - "integrity": "sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU=", - "dev": true, - "requires": { - "test-value": "^1.0.1" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - }, - "test-value": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz", - "integrity": "sha1-oJE29y7AQ9J8iTcHwrFZv6196T8=", - "dev": true, - "requires": { - "array-back": "^1.0.2", - "typical": "^2.4.2" - } - } - } - }, - "reduce-flatten": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz", - "integrity": "sha1-JYx479FT3fk8tWEjf2EYTzaW4yc=", - "dev": true - }, - "reduce-unique": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/reduce-unique/-/reduce-unique-1.0.0.tgz", - "integrity": "sha1-flhrz4ek4ytter2Cd/rWzeyfSAM=", - "dev": true - }, - "reduce-without": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz", - "integrity": "sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw=", - "dev": true, - "requires": { - "test-value": "^2.0.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - }, - "test-value": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz", - "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=", - "dev": true, - "requires": { - "array-back": "^1.0.3", - "typical": "^2.6.0" - } - } - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "dev": true, - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, - "regexpp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", - "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", - "dev": true - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - } - }, - "requizzle": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", - "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", - "dev": true, - "requires": { - "underscore": "~1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "ripemd160": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", - "dev": true, - "requires": { - "hash-base": "^2.0.0", - "inherits": "^2.0.1" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "^1.1.1" - } - }, - "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", - "dev": true, - "requires": { - "rx-lite": "*" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - }, - "dependencies": { - "ajv": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", - "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", - "dev": true, - "requires": { - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "ajv-keywords": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz", - "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=", - "dev": true - } - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "serialize-javascript": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz", - "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "sha.js": { - "version": "2.4.10", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz", - "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "shuffle-array": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/shuffle-array/-/shuffle-array-1.0.1.tgz", - "integrity": "sha1-xP88/nTRb5NzBZIwGyXmV3sSiYs=" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0" - } - }, - "sort-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-2.0.0.tgz", - "integrity": "sha1-OKnG2if9fRR7QuYFVPKBGHtN9HI=", - "dev": true, - "requires": { - "array-back": "^1.0.4", - "object-get": "^2.1.0", - "typical": "^2.6.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true - }, - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "^1.0.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "ssri": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz", - "integrity": "sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.1" - } - }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-connect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz", - "integrity": "sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc=", - "dev": true, - "requires": { - "array-back": "^1.0.2" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-http": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz", - "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==", - "dev": true, - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.3", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true - }, - "stream-via": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz", - "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - } - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - } - }, - "table": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", - "dev": true, - "requires": { - "ajv": "^5.2.3", - "ajv-keywords": "^2.1.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true - } - } - }, - "table-layout": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.2.tgz", - "integrity": "sha512-tygyl5+eSHj4chpq5Zfy6cpc7MOUBClAW9ozghFH7hg9bAUzShOYn+/vUzTRkKOSLJWKfgYtP2tAU2c0oAD8eg==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "deep-extend": "~0.5.0", - "lodash.padend": "^4.6.1", - "typical": "^2.6.1", - "wordwrapjs": "^3.0.0" - } - }, - "taffydb": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", - "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", - "dev": true - }, - "tapable": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", - "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", - "dev": true - }, - "temp-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz", - "integrity": "sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs=", - "dev": true - }, - "test-value": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-3.0.0.tgz", - "integrity": "sha512-sVACdAWcZkSU9x7AOmJo5TqE+GyNJknHaHsMrR6ZnhjVlVN9Yx6FjHrsKZ3BjIpPCT68zYesPWkakrNupwfOTQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "typical": "^2.6.1" - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" - } - }, - "timers-browserify": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz", - "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==", - "dev": true, - "requires": { - "setimmediate": "^1.0.4" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "topl": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/topl/-/topl-0.3.1.tgz", - "integrity": "sha1-CSxfUnSD5HA6ZzSiHiPu6FEYp+E=" - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typical": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz", - "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz", - "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==", - "dev": true, - "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", - "dev": true - }, - "underscore-contrib": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", - "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", - "dev": true, - "requires": { - "underscore": "1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", - "dev": true, - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - } - } - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, - "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" - } - }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } - }, - "walk-back": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-3.0.0.tgz", - "integrity": "sha1-I1h4ejXakQMtrV6S+AsSNw2HlcU=", - "dev": true - }, - "watchpack": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", - "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", - "dev": true, - "requires": { - "async": "^2.1.2", - "chokidar": "^1.7.0", - "graceful-fs": "^4.1.2" - }, - "dependencies": { - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "^4.14.0" - } - } - } - }, - "webpack": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz", - "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==", - "dev": true, - "requires": { - "acorn": "^5.0.0", - "acorn-dynamic-import": "^2.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "async": "^2.1.2", - "enhanced-resolve": "^3.4.0", - "escope": "^3.6.0", - "interpret": "^1.0.0", - "json-loader": "^0.5.4", - "json5": "^0.5.1", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "mkdirp": "~0.5.0", - "node-libs-browser": "^2.0.0", - "source-map": "^0.5.3", - "supports-color": "^4.2.1", - "tapable": "^0.2.7", - "uglifyjs-webpack-plugin": "^0.4.6", - "watchpack": "^1.4.0", - "webpack-sources": "^1.0.1", - "yargs": "^8.0.2" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "^4.17.10" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "uglifyjs-webpack-plugin": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", - "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", - "dev": true, - "requires": { - "source-map": "^0.5.6", - "uglify-js": "^2.8.29", - "webpack-sources": "^1.0.1" - } - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "dev": true, - "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" - } - } - } - }, - "webpack-node-externals": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz", - "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==", - "dev": true - }, - "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "wordwrapjs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz", - "integrity": "sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==", - "dev": true, - "requires": { - "reduce-flatten": "^1.0.1", - "typical": "^2.6.1" - } - }, - "worker-farm": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", - "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", - "dev": true, - "requires": { - "errno": "^0.1.4", - "xtend": "^4.0.1" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - } - }, - "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0" - } - }, - "xmlcreate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz", - "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - } - } -} diff --git a/external/js/cothority/package.json b/external/js/cothority/package.json index ac33270644..f23c49519d 100644 --- a/external/js/cothority/package.json +++ b/external/js/cothority/package.json @@ -1,6 +1,6 @@ { "name": "@dedis/cothority", - "version": "1.1.18", + "version": "1.1.19", "description": "module for interacting with cothority nodes", "main": "dist/bundle.node.min.js", "browser": "dist/bundle.min.js", @@ -43,7 +43,6 @@ "istanbul": "^0.4.5", "jsdoc-to-markdown": "^4.0.1", "mocha": "^5.0.1", - "mock-socket": "^7.1.0", "prettier": "1.10.2", "uglify-es": "3.3.9", "uglifyjs-webpack-plugin": "^1.2.0", diff --git a/external/js/cothority/test/byzcoin/build/.gitignore b/external/js/cothority/test/byzcoin/build/.gitignore new file mode 100644 index 0000000000..e52824ef7c --- /dev/null +++ b/external/js/cothority/test/byzcoin/build/.gitignore @@ -0,0 +1,3 @@ +build +genesis.txt +public.toml diff --git a/external/js/cothority/test/byzcoin/build/main.go b/external/js/cothority/test/byzcoin/build/main.go new file mode 100644 index 0000000000..8ec4f2a648 --- /dev/null +++ b/external/js/cothority/test/byzcoin/build/main.go @@ -0,0 +1,62 @@ +// This is a part of the JavaScript integration test. +package main + +import ( + "encoding/hex" + "fmt" + "os" + "strconv" + "time" + + "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" + _ "github.com/dedis/cothority/status/service" + "github.com/dedis/onet" + "github.com/dedis/onet/app" + "github.com/dedis/onet/log" +) + +const defaultN = 5 +const defaultBlocks = 5 + +func main() { + n := defaultN + var err error + if len(os.Args) > 1 { + n, err = strconv.Atoi(os.Args[1]) + log.ErrFatal(err) + } + + l := onet.NewTCPTest(cothority.Suite) + _, ro, _ := l.GenTree(n, true) + defer l.CloseAll() + + signer := darc.NewSignerEd25519(nil, nil) + msg, err := byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, ro, []string{"spawn:dummy"}, signer.Identity()) + log.ErrFatal(err) + msg.BlockInterval = 100 * time.Millisecond + + _, resp, err := byzcoin.NewLedger(msg, false) + log.ErrFatal(err) + + serversToml := make([]*app.ServerToml, n) + for i, si := range ro.List { + serversToml[i] = app.NewServerToml( + cothority.Suite, + si.Public, + si.Address, + si.Description, + ) + } + group := app.NewGroupToml(serversToml...) + log.ErrFatal(group.Save("public.toml")) + + id := hex.EncodeToString(resp.Skipblock.SkipChainID()) + fd, err := os.Create("genesis.txt") + log.ErrFatal(err) + fd.WriteString(id) + fd.Close() + fmt.Println("OK") + time.Sleep(3600 * time.Second) +} diff --git a/external/js/cothority/test/byzcoin/index.js b/external/js/cothority/test/byzcoin/index.js new file mode 100644 index 0000000000..f65498f373 --- /dev/null +++ b/external/js/cothority/test/byzcoin/index.js @@ -0,0 +1,40 @@ +const chai = require("chai"); +const expect = chai.expect; +const co = require("co"); + +const cothority = require("../../lib"); +const helpers = require("../helpers"); + +describe("get config", () => { + // Clean up the byzcoin server started by build/main.go. + var proc; + after(function() { + helpers.killGolang(proc); + }); + + it("can get config", done => { + const build_dir = process.cwd() + "/test/byzcoin/build"; + + const fn = co.wrap(function*() { + [roster, id] = helpers.readSkipchainInfo(build_dir); + const id2 = cothority.misc.hexToUint8Array(id); + const rs = new cothority.net.RosterSocket(roster, "ByzCoin"); + cothority.byzcoin.ByzCoinRPC.fromKnownConfiguration(rs, id2).then(bc => { + expect(bc.skipchainID).to.equal(id2); + done(); + }); + }); + + helpers + .runGolang(build_dir, data => data.match(/OK/)) + .then(p => { + proc = p; + return Promise.resolve(true); + }) + .then(fn) + .catch(err => { + done(); + throw err; + }); + }).timeout(5000); +}); diff --git a/external/js/cothority/test/helpers.js b/external/js/cothority/test/helpers.js index 70f1003053..19a29c6793 100644 --- a/external/js/cothority/test/helpers.js +++ b/external/js/cothority/test/helpers.js @@ -71,7 +71,7 @@ function killGolang(conode) { /** * runGolang runs the main.go file that resides in the given directory with the - * given arguments. It returns ta promise that resolves when the script outputs + * given arguments. It returns a promise that resolves when the script outputs * OK. It's meant as a signal saying the conodes are running and listening. * The process MUST be kill at the end of the test using `killGolang`. * diff --git a/external/js/cothority/test/net/net.js b/external/js/cothority/test/net/net.js index c4aea65d82..451db4610d 100644 --- a/external/js/cothority/test/net/net.js +++ b/external/js/cothority/test/net/net.js @@ -8,6 +8,7 @@ const identity = require("../../lib/identity.js"); const helpers = require("../helpers.js"); const co = require("co"); +const WebSocket = require("ws"); const kyber = require("@dedis/kyber-js"); const ed25519 = new kyber.curve.edwards25519.Curve(); @@ -19,98 +20,12 @@ const deviceMessage = { point: message }; -//const mock = require("mock-socket"); -const WebSocket = require("ws"); -describe("sockets", () => { - it("sends and receives correct protobuf messages", done => { - const mockServer = createServer("9000"); - /*const mockServer = new mock.Server(serverAddr + "/cisc/Device");*/ - //mockServer.on("message", event => { - //const idProto = root.lookup(idProtoName); - //const id = { - //id: message - //}; - //const idMessage = idProto.create(id); - //const marshalled = idProto.encode(idMessage).finish(); - //mockServer.send(marshalled); - //}); - - const socket = new network.Socket(serverAddr, "cisc"); - socket - .send(deviceProtoName, idProtoName, deviceMessage) - .then(data => { - expect(data.id).to.deep.equal(deviceMessage.point); - mockServer.close(done); - }) - .catch(err => { - //expect(true, "socket send: " + err).to.be.false; - mockServer.close(done); - throw err; - }); - }); -}); - -function createServer(port) { - const mockServer = new WebSocket.Server({ - host: "127.0.0.1", - port: port - }); - - mockServer.on("connection", function connection(ws) { - ws.on("message", function incoming(msg) { - console.log("received: ", msg.toString()); - const idProto = root.lookup(idProtoName); - const id = { - id: message - }; - const idMessage = idProto.create(id); - const marshalled = idProto.encode(idMessage).finish(); - ws.send(marshalled); - }); - }); - return mockServer; -} - -describe("roster socket", () => { - it("tries all servers", done => { - const n = 5; - // create the addresses - const identities = []; - var server = ""; - for (var i = 0; i < n; i++) { - identities[i] = new identity.ServerIdentity( - ed25519, - ed25519.point().pick(), - "tcp://127.0.0.1:700" + i - ); - if (i == n - 1) { - wsAddr = identities[i].websocketAddr + "/cisc/Device"; - server = createServer("700" + i); - } - } - const roster = new identity.Roster(ed25519, identities); - // create the socket and see if we have any messages back - const socket = new network.RosterSocket(roster, "cisc"); - socket - .send(deviceProtoName, idProtoName, deviceMessage) - .then(data => { - expect(data.id).to.deep.equal(deviceMessage.point); - server.close(done); - }) - .catch(err => { - //expect(true, "socket send: " + err).to.be.false; - server.close(done); - throw err; - }); - }); -}); - describe("leader socket", () => { it("fails with no node", () => { const roster = new identity.Roster(ed25519, []); expect(function() { const socket = new network.LeaderSocket(roster, "cisc"); - }).to.throw("Roster should have atleast one node"); + }).to.throw("Roster should have at least one node"); }); it("uses the first node in the roster", done => { diff --git a/external/js/cothority/test/skipchain/skipchain.js b/external/js/cothority/test/skipchain/skipchain.js index 16badba99b..60d2ec3822 100644 --- a/external/js/cothority/test/skipchain/skipchain.js +++ b/external/js/cothority/test/skipchain/skipchain.js @@ -4,7 +4,6 @@ const chai = require("chai"); const expect = chai.expect; const cothority = require("../../lib"); -const proto = cothority.protobuf; const skipchain = cothority.skipchain; const misc = cothority.misc; const net = cothority.net; @@ -13,7 +12,6 @@ const kyber = require("@dedis/kyber-js"); const helpers = require("../helpers.js"); const curve = new kyber.curve.edwards25519.Curve(); -const child_process = require("child_process"); const co = require("co"); describe("skipchain client", () => { diff --git a/external/js/kyber/dist/.gitkeep b/external/js/kyber/dist/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/external/js/kyber/package-lock.json b/external/js/kyber/package-lock.json deleted file mode 100644 index b0be6738f2..0000000000 --- a/external/js/kyber/package-lock.json +++ /dev/null @@ -1,8318 +0,0 @@ -{ - "name": "@dedis/kyber-js", - "version": "0.0.10", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@babel/code-frame": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz", - "integrity": "sha1-vs2AVIJzREDJ0TfkbXc0DmTX9Rs=", - "dev": true, - "requires": { - "@babel/highlight": "7.0.0-beta.49" - } - }, - "@babel/generator": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.49.tgz", - "integrity": "sha1-6c/9qROZaszseTu8JauRvBnQv3o=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.49", - "jsesc": "^2.5.1", - "lodash": "^4.17.5", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.49.tgz", - "integrity": "sha1-olwRGbnwNSeGcBJuAiXAMEHI3jI=", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "7.0.0-beta.49", - "@babel/template": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.49.tgz", - "integrity": "sha1-z1Aj8y0q2S0Ic3STnOwJUby1FEE=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.49" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.49.tgz", - "integrity": "sha1-QNeO2glo0BGxxShm5XRs+yPldUg=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.49" - } - }, - "@babel/highlight": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.49.tgz", - "integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.49.tgz", - "integrity": "sha1-lE0MW6KBK7FZ7b0iZ0Ov0mUXm9w=", - "dev": true - }, - "@babel/template": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.49.tgz", - "integrity": "sha1-44q+ghfLl5P0YaUwbXrXRdg+HSc=", - "dev": true, - "requires": { - "@babel/code-frame": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "lodash": "^4.17.5" - } - }, - "@babel/traverse": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.49.tgz", - "integrity": "sha1-TypzaCoYM07WYl0QCo0nMZ98LWg=", - "dev": true, - "requires": { - "@babel/code-frame": "7.0.0-beta.49", - "@babel/generator": "7.0.0-beta.49", - "@babel/helper-function-name": "7.0.0-beta.49", - "@babel/helper-split-export-declaration": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "debug": "^3.1.0", - "globals": "^11.1.0", - "invariant": "^2.2.0", - "lodash": "^4.17.5" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "globals": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", - "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.49.tgz", - "integrity": "sha1-t+Oxw/TUz+Eb34yJ8e/V4WF7h6Y=", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.5", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - } - } - }, - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", - "dev": true, - "requires": { - "acorn": "^4.0.3" - } - }, - "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "requires": { - "acorn": "^3.0.4" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-escape-sequences": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.0.0.tgz", - "integrity": "sha512-v+0wW9Wezwsyb0uF4aBVCjmSqit3Ru7PZFziGF0o2KwTvN2zWfTi3BRLq9EkJFdg3eBbyERXGTntVpBxH1J68Q==", - "dev": true, - "requires": { - "array-back": "^2.0.0" - } - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "argv-tools": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/argv-tools/-/argv-tools-0.1.1.tgz", - "integrity": "sha512-Cc0dBvx4dvrjjKpyDA6w8RlNAw8Su30NvZbWl/Tv9ZALEVlLVkWQiHMi84Q0xNfpVuSaiQbYkdmWK8g1PLGhKw==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "find-replace": "^2.0.1" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "array-back": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz", - "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==", - "dev": true, - "requires": { - "typical": "^2.6.1" - } - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true - }, - "asn1.js": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz", - "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, - "requires": { - "util": "0.10.3" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-loader": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.2.tgz", - "integrity": "sha512-jRwlFbINAeyDStqK6Dd5YuY0k5YuzQUvlz2ZamuXrXmxav3pNqe9vfJ402+2G+OmlJSXxCOpB6Uz0INM7RQe2A==", - "dev": true, - "requires": { - "find-cache-dir": "^1.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-async-generators": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", - "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-generator-functions": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", - "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-generators": "^6.5.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-object-rest-spread": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", - "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", - "dev": true, - "requires": { - "babel-plugin-syntax-object-rest-spread": "^6.8.0", - "babel-runtime": "^6.26.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "dev": true, - "requires": { - "regenerator-transform": "^0.10.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, - "babel-preset-stage-3": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", - "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", - "dev": true, - "requires": { - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-generator-functions": "^6.24.1", - "babel-plugin-transform-async-to-generator": "^6.24.1", - "babel-plugin-transform-exponentiation-operator": "^6.24.1", - "babel-plugin-transform-object-rest-spread": "^6.22.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base64-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", - "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "browserify-aes": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", - "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", - "dev": true, - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", - "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", - "dev": true, - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", - "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "~1.0.5" - } - }, - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "cacache": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz", - "integrity": "sha512-dljb7dk1jqO5ogE+dRpoR9tpHYv5xz9vPSNunh1+0wRuNdYxmzp9WmsyokgW/DUF1FDRVA/TMsmxt027R8djbQ==", - "dev": true, - "requires": { - "bluebird": "^3.5.0", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^1.3.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.1", - "ssri": "^5.0.0", - "unique-filename": "^1.1.0", - "y18n": "^3.2.1" - } - }, - "cache-point": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-0.4.1.tgz", - "integrity": "sha512-4TgWfe9SF+bUy5cCql8gWHqKNrviufNwSYxLjf2utB0pY4+bdcuFwMmY1hDB+67Gz/L1vmhFNhePAjJTFBtV+Q==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "fs-then-native": "^2.0.0", - "mkdirp2": "^1.0.3" - } - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "^0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "caniuse-lite": { - "version": "1.0.30000847", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000847.tgz", - "integrity": "sha512-Weo+tRtVWcN2da782Ebx/27hFNEb+KP+uP6tdqAa+2S5bp1zOJhVH9tEpDygagrfvU4QjeuPwi/5VGsgT4SLaA==", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "catharsis": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", - "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", - "dev": true, - "requires": { - "underscore-contrib": "~0.3.0" - } - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "chai": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", - "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", - "dev": true, - "requires": { - "assertion-error": "^1.0.1", - "check-error": "^1.0.1", - "deep-eql": "^3.0.0", - "get-func-name": "^2.0.0", - "pathval": "^1.0.0", - "type-detect": "^4.0.0" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - } - }, - "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - } - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "collect-all": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz", - "integrity": "sha512-0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA==", - "dev": true, - "requires": { - "stream-connect": "^1.0.2", - "stream-via": "^1.0.4" - } - }, - "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, - "requires": { - "color-name": "^1.1.1" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "command-line-args": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.0.1.tgz", - "integrity": "sha512-gRJDcIjFSzMcmG/GrJlgL0wWoAxr11mVzCq32bjka0endupm9meLwvoJUKc4HDeFiEIB2X3GvNrhF5cKO4Bd4A==", - "dev": true, - "requires": { - "argv-tools": "^0.1.1", - "array-back": "^2.0.0", - "find-replace": "^2.0.1", - "lodash.camelcase": "^4.3.0", - "typical": "^2.6.1" - } - }, - "command-line-tool": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz", - "integrity": "sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g==", - "dev": true, - "requires": { - "ansi-escape-sequences": "^4.0.0", - "array-back": "^2.0.0", - "command-line-args": "^5.0.0", - "command-line-usage": "^4.1.0", - "typical": "^2.6.1" - } - }, - "command-line-usage": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz", - "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==", - "dev": true, - "requires": { - "ansi-escape-sequences": "^4.0.0", - "array-back": "^2.0.0", - "table-layout": "^0.4.2", - "typical": "^2.6.1" - } - }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, - "common-sequence": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-1.0.2.tgz", - "integrity": "sha1-MOB/P49vf5s97oVPILLTnu4Ibeg=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "config-master": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz", - "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=", - "dev": true, - "requires": { - "walk-back": "^2.0.1" - }, - "dependencies": { - "walk-back": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz", - "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=", - "dev": true - } - } - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "^0.1.4" - } - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "coveralls": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.0.tgz", - "integrity": "sha512-ZppXR9y5PraUOrf/DzHJY6gzNUhXYE3b9D43xEXs4QYZ7/Oe0Gy0CS+IPKWFfvQFXB3RG9QduaQUFehzSpGAFw==", - "dev": true, - "requires": { - "js-yaml": "^3.6.1", - "lcov-parse": "^0.0.10", - "log-driver": "^1.2.5", - "minimist": "^1.2.0", - "request": "^2.79.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "create-ecdh": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", - "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } - }, - "create-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", - "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", - "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", - "dev": true, - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "^0.10.9" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", - "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "dmd": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/dmd/-/dmd-3.0.10.tgz", - "integrity": "sha512-+tRZIFV9fII538XFZSoRP1abtIy55RYa4waGvtKB36LD97NRorWsYT3V3HEURmnXpA4eGIFQph1E2f+51hWrTg==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "cache-point": "^0.4.1", - "common-sequence": "^1.0.2", - "file-set": "^1.1.1", - "handlebars": "^4.0.11", - "marked": "^0.3.12", - "object-get": "^2.1.0", - "reduce-flatten": "^1.0.1", - "reduce-unique": "^1.0.0", - "reduce-without": "^1.0.1", - "test-value": "^3.0.0", - "walk-back": "^3.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "domain-browser": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", - "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", - "dev": true - }, - "duplexify": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", - "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, - "electron-to-chromium": { - "version": "1.3.48", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", - "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "object-assign": "^4.0.1", - "tapable": "^0.2.7" - } - }, - "errno": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz", - "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es5-ext": { - "version": "0.10.38", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz", - "integrity": "sha512-jCMyePo7AXbUESwbl8Qi01VSH2piY9s/a3rSU/5w/MlTIx8HPL1xn2InGN8ejt/xulcJgnTO7vqNtOAxzYd2Kg==", - "dev": true, - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", - "dev": true, - "requires": { - "ajv": "^5.3.0", - "babel-code-frame": "^6.22.0", - "chalk": "^2.1.0", - "concat-stream": "^1.6.0", - "cross-spawn": "^5.1.0", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^3.7.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^3.5.4", - "esquery": "^1.0.0", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.0.1", - "ignore": "^3.3.3", - "imurmurhash": "^0.1.4", - "inquirer": "^3.0.6", - "is-resolvable": "^1.0.0", - "js-yaml": "^3.9.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.4", - "minimatch": "^3.0.2", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.3.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "~2.0.1", - "table": "4.0.2", - "text-table": "~0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "globals": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", - "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "eslint-config-prettier": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", - "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", - "dev": true, - "requires": { - "get-stdin": "^5.0.1" - } - }, - "eslint-plugin-prettier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.5.0.tgz", - "integrity": "sha512-L06bewYpt2Wb8Uk7os8f/0cL5DjddL38t1M/nOpjw5MqVFBn1RIIBBE6tfr37lHUH7AvAubZsvu/bDmNl4RBKQ==", - "dev": true, - "requires": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" - } - }, - "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", - "dev": true, - "requires": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.1.tgz", - "integrity": "sha512-XH4o5BK5jmw9PzSGK7mNf+/xV+mPxQxGZoeC36OVsJZYV77JAG9NnI7T90hoUpI/C1TOfXWTvugRdZ9ZR3iE2Q==", - "dev": true - } - } - }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, - "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", - "dev": true, - "requires": { - "estraverse": "^4.1.0", - "object-assign": "^4.0.1" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "^2.1.0" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "external-editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", - "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", - "dev": true, - "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - } - }, - "file-set": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/file-set/-/file-set-1.1.1.tgz", - "integrity": "sha1-0+xwwIDsjxjyBLod4QZ4DJBWkms=", - "dev": true, - "requires": { - "array-back": "^1.0.3", - "glob": "^7.1.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" - } - }, - "find-replace": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-2.0.1.tgz", - "integrity": "sha512-LzDo3Fpa30FLIBsh6DCDnMN1KW2g4QKkqKmejlImgWY67dDFPX/x9Kh/op/GK522DchQXEvDi/wD48HKW49XOQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "test-value": "^3.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", - "dev": true, - "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" - } - }, - "flush-write-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", - "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", - "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", - "mime-types": "^2.1.12" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-then-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz", - "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=", - "dev": true - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "^2.1.0" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "get-stdin": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", - "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true - } - } - } - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "dev": true, - "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "hash-base": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", - "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", - "dev": true, - "requires": { - "inherits": "^2.0.1" - } - }, - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", - "dev": true - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true - }, - "ignore": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", - "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==", - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.0.4", - "figures": "^2.0.0", - "lodash": "^4.3.0", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rx-lite": "^4.0.8", - "rx-lite-aggregates": "^4.0.8", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", - "dev": true - }, - "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz", - "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.1.0.tgz", - "integrity": "sha512-3ly7GAJiPKqgbGKh2s01ysk3jd/egpE1i84PYu3BvPkssqrKMXZY9KRGX0mfZ+cmCfTR1IFVnnn/tDHxTer4nA==", - "dev": true, - "requires": { - "@babel/generator": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/template": "7.0.0-beta.49", - "@babel/traverse": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "istanbul-lib-coverage": "^1.2.0", - "semver": "^5.3.0" - } - }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "js2xmlparser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", - "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", - "dev": true, - "requires": { - "xmlcreate": "^1.0.1" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true - }, - "jsdoc": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", - "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", - "dev": true, - "requires": { - "babylon": "7.0.0-beta.19", - "bluebird": "~3.5.0", - "catharsis": "~0.8.9", - "escape-string-regexp": "~1.0.5", - "js2xmlparser": "~3.0.0", - "klaw": "~2.0.0", - "marked": "~0.3.6", - "mkdirp": "~0.5.1", - "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", - "taffydb": "2.6.2", - "underscore": "~1.8.3" - }, - "dependencies": { - "babylon": { - "version": "7.0.0-beta.19", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", - "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", - "dev": true - } - } - }, - "jsdoc-api": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-4.0.1.tgz", - "integrity": "sha512-qCzHGQxfd9toMRjQft9E44Y40zWDPgf13pt3n+xExk8+wmVd7aueW6cTSQOHyjQG1v07INunQD8AcCAPxhZVmw==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "cache-point": "^0.4.1", - "collect-all": "^1.0.3", - "file-set": "^1.1.1", - "fs-then-native": "^2.0.0", - "jsdoc": "~3.5.5", - "object-to-spawn-args": "^1.1.1", - "temp-path": "^1.0.0", - "walk-back": "^3.0.0" - } - }, - "jsdoc-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-3.0.1.tgz", - "integrity": "sha512-btZLp4wYl90vcAfgk4hoGQbO17iBVrhh3LJRMKZNtZgniO3F8H2CjxXld0owBIB1XxN+j3bAcWZnZKMnSj3iMA==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "lodash.omit": "^4.5.0", - "lodash.pick": "^4.4.0", - "reduce-extract": "^1.0.0", - "sort-array": "^2.0.0", - "test-value": "^3.0.0" - } - }, - "jsdoc-to-markdown": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-4.0.1.tgz", - "integrity": "sha512-LHJRoLoLyDdxNcColgkLoB/rFG5iRP+PNJjMILI0x+95IdEAtyjSt0wJ6ZlKxRpkhBYtQXTQQ119hMqPIUZzTQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "command-line-tool": "^0.8.0", - "config-master": "^3.1.0", - "dmd": "^3.0.10", - "jsdoc-api": "^4.0.1", - "jsdoc-parse": "^3.0.1", - "walk-back": "^3.0.0" - } - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - }, - "json-loader": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "lcov-parse": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", - "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - } - }, - "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", - "dev": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=", - "dev": true - }, - "lodash.padend": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", - "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=", - "dev": true - }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", - "dev": true - }, - "log-driver": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", - "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=", - "dev": true - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, - "requires": { - "js-tokens": "^3.0.0" - } - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", - "dev": true, - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, - "marked": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz", - "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==", - "dev": true - }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, - "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - }, - "dependencies": { - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - } - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } - }, - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", - "dev": true - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "dev": true, - "requires": { - "mime-db": "~1.30.0" - } - }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mississippi": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz", - "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^1.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mkdirp2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.3.tgz", - "integrity": "sha1-zI3YJl8fBuLY9bELblL04FC+0hs=", - "dev": true - }, - "mocha": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz", - "integrity": "sha512-ukB2dF+u4aeJjc6IGtPNnJXfeby5d4ZqySlIBT0OEyva/DrMjVm5HkQxKnHDLKEfEQBsEnwTg9HHhtPHJdTd8w==", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - } - } - } - }, - "mocha-lcov-reporter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-1.3.0.tgz", - "integrity": "sha1-Rpve9PivyaEWBW8HnfYYLQr7A4Q=", - "dev": true - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^1.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.0", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.10.3", - "vm-browserify": "0.0.4" - }, - "dependencies": { - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "timers-browserify": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz", - "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==", - "dev": true, - "requires": { - "setimmediate": "^1.0.4" - } - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "nyc": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-12.0.2.tgz", - "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", - "dev": true, - "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.5.1", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.2.0", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^2.1.0", - "istanbul-lib-report": "^1.1.3", - "istanbul-lib-source-maps": "^1.2.5", - "istanbul-reports": "^1.4.1", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.1.0", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.2.0", - "yargs": "11.1.0", - "yargs-parser": "^8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "append-transform": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "requires": { - "default-require-extensions": "^1.0.0" - } - }, - "archy": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "arrify": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "async": { - "version": "1.5.2", - "bundled": true, - "dev": true - }, - "atob": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "base": { - "version": "0.11.2", - "bundled": true, - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "cache-base": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "caching-transform": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" - } - }, - "camelcase": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "class-utils": { - "version": "0.3.6", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "cliui": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "commondir": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "cross-spawn": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "debug-log": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "default-require-extensions": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "strip-bom": "^2.0.0" - } - }, - "define-property": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "error-ex": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "execa": { - "version": "0.7.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "extend-shallow": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "fill-range": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "find-cache-dir": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "for-in": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "foreground-child": { - "version": "1.5.6", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" - } - }, - "fragment-cache": { - "version": "0.2.1", - "bundled": true, - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "get-value": { - "version": "2.0.6", - "bundled": true, - "dev": true - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "bundled": true, - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "has-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "hosted-git-info": { - "version": "2.6.0", - "bundled": true, - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-arrayish": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-buffer": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } - } - }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-odd": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "bundled": true, - "dev": true - } - } - }, - "is-plain-object": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isexe": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "istanbul-lib-coverage": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "istanbul-lib-hook": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "append-transform": "^0.4.0" - } - }, - "istanbul-lib-report": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "bundled": true, - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.2.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - } - }, - "istanbul-reports": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "requires": { - "handlebars": "^4.0.3" - } - }, - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lazy-cache": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, - "longest": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "lru-cache": { - "version": "4.1.3", - "bundled": true, - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "map-cache": { - "version": "0.2.2", - "bundled": true, - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "object-visit": "^1.0.0" - } - }, - "md5-hex": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "md5-o-matic": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "mem": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "merge-source-map": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true, - "dev": true - } - } - }, - "micromatch": { - "version": "3.1.10", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "mimic-fn": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "nanomatch": { - "version": "1.2.9", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "object-visit": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "optimist": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "p-finally": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "pascalcase": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-key": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "path-type": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "regex-not": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "resolve-from": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "ret": { - "version": "0.1.15", - "bundled": true, - "dev": true - }, - "right-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-regex": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "ret": "~0.1.10" - } - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "set-value": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.2.0" - } - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "source-map-resolve": { - "version": "0.5.2", - "bundled": true, - "dev": true, - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-url": { - "version": "0.4.0", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" - } - }, - "spdx-correct": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "split-string": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "static-extend": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "string-width": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" - } - }, - "to-object-path": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "to-regex": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "uglify-js": { - "version": "2.8.29", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "union-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } - } - }, - "unset-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "bundled": true, - "dev": true - } - } - }, - "urix": { - "version": "0.1.0", - "bundled": true, - "dev": true - }, - "use": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "validate-npm-package-license": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "window-size": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.3", - "bundled": true, - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "2.1.2", - "bundled": true, - "dev": true - }, - "yargs": { - "version": "11.1.0", - "bundled": true, - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - }, - "cliui": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "yargs-parser": { - "version": "9.0.2", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "8.1.0", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - } - } - } - } - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-get": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.0.tgz", - "integrity": "sha1-ciu9tgA576R8rTxtws5RqFwCxa4=", - "dev": true - }, - "object-to-spawn-args": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz", - "integrity": "sha1-d9qIJ/Bz0BHJ4bFz+JV4FHAkZ4U=", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "dev": true, - "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, - "parse-asn1": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", - "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", - "dev": true, - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3" - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - } - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true - }, - "pbkdf2": { - "version": "3.0.14", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "prettier": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz", - "integrity": "sha512-TcdNoQIWFoHblurqqU6d1ysopjq7UX0oRcT/hJ8qvBAELiYWn+Ugf0AXdnzISEJ7vuhNnQ98N8jR8Sh53x4IZg==", - "dev": true - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", - "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "pump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", - "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz", - "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", - "dev": true, - "requires": { - "duplexify": "^3.5.3", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "randomatic": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", - "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", - "dev": true, - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", - "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", - "dev": true, - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" - } - }, - "reduce-extract": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz", - "integrity": "sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU=", - "dev": true, - "requires": { - "test-value": "^1.0.1" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - }, - "test-value": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz", - "integrity": "sha1-oJE29y7AQ9J8iTcHwrFZv6196T8=", - "dev": true, - "requires": { - "array-back": "^1.0.2", - "typical": "^2.4.2" - } - } - } - }, - "reduce-flatten": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz", - "integrity": "sha1-JYx479FT3fk8tWEjf2EYTzaW4yc=", - "dev": true - }, - "reduce-unique": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/reduce-unique/-/reduce-unique-1.0.0.tgz", - "integrity": "sha1-flhrz4ek4ytter2Cd/rWzeyfSAM=", - "dev": true - }, - "reduce-without": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz", - "integrity": "sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw=", - "dev": true, - "requires": { - "test-value": "^2.0.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - }, - "test-value": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz", - "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=", - "dev": true, - "requires": { - "array-back": "^1.0.3", - "typical": "^2.6.0" - } - } - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "dev": true, - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, - "regexpp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", - "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", - "dev": true - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - } - }, - "requizzle": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", - "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", - "dev": true, - "requires": { - "underscore": "~1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "ripemd160": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", - "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", - "dev": true, - "requires": { - "hash-base": "^2.0.0", - "inherits": "^2.0.1" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "^1.1.1" - } - }, - "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", - "dev": true, - "requires": { - "rx-lite": "*" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "schema-utils": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz", - "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==", - "dev": true, - "requires": { - "ajv": "^5.0.0", - "ajv-keywords": "^2.1.0" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "serialize-javascript": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz", - "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "sha.js": { - "version": "2.4.10", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz", - "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0" - } - }, - "sort-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-2.0.0.tgz", - "integrity": "sha1-OKnG2if9fRR7QuYFVPKBGHtN9HI=", - "dev": true, - "requires": { - "array-back": "^1.0.4", - "object-get": "^2.1.0", - "typical": "^2.6.0" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "^1.0.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "tweetnacl": "~0.14.0" - } - }, - "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.1" - } - }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-connect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz", - "integrity": "sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc=", - "dev": true, - "requires": { - "array-back": "^1.0.2" - }, - "dependencies": { - "array-back": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz", - "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=", - "dev": true, - "requires": { - "typical": "^2.6.0" - } - } - } - }, - "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-http": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz", - "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==", - "dev": true, - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.3", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true - }, - "stream-via": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz", - "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "table": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", - "dev": true, - "requires": { - "ajv": "^5.2.3", - "ajv-keywords": "^2.1.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "table-layout": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.2.tgz", - "integrity": "sha512-tygyl5+eSHj4chpq5Zfy6cpc7MOUBClAW9ozghFH7hg9bAUzShOYn+/vUzTRkKOSLJWKfgYtP2tAU2c0oAD8eg==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "deep-extend": "~0.5.0", - "lodash.padend": "^4.6.1", - "typical": "^2.6.1", - "wordwrapjs": "^3.0.0" - } - }, - "taffydb": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", - "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", - "dev": true - }, - "tapable": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", - "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", - "dev": true - }, - "temp-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz", - "integrity": "sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs=", - "dev": true - }, - "test-value": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/test-value/-/test-value-3.0.0.tgz", - "integrity": "sha512-sVACdAWcZkSU9x7AOmJo5TqE+GyNJknHaHsMrR6ZnhjVlVN9Yx6FjHrsKZ3BjIpPCT68zYesPWkakrNupwfOTQ==", - "dev": true, - "requires": { - "array-back": "^2.0.0", - "typical": "^2.6.1" - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", - "dev": true, - "requires": { - "punycode": "^1.4.1" - } - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==", - "dev": true - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typical": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz", - "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz", - "integrity": "sha512-XG8/QmR1pyPeE1kj2aigo5kos8umefB31zW+PMvAAytHSB0T/vQvN6sqt8+Sh+y0b0A7zlmxNi2dzRnj0wcqGA==", - "dev": true, - "requires": { - "cacache": "^10.0.1", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.2", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", - "dev": true - }, - "underscore-contrib": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", - "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", - "dev": true, - "requires": { - "underscore": "1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", - "dev": true, - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, - "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" - } - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } - }, - "walk-back": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-3.0.0.tgz", - "integrity": "sha1-I1h4ejXakQMtrV6S+AsSNw2HlcU=", - "dev": true - }, - "watchpack": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", - "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", - "dev": true, - "requires": { - "async": "^2.1.2", - "chokidar": "^1.7.0", - "graceful-fs": "^4.1.2" - }, - "dependencies": { - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "^4.14.0" - } - } - } - }, - "webpack": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz", - "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", - "dev": true, - "requires": { - "acorn": "^5.0.0", - "acorn-dynamic-import": "^2.0.0", - "ajv": "^5.1.5", - "ajv-keywords": "^2.0.0", - "async": "^2.1.2", - "enhanced-resolve": "^3.4.0", - "escope": "^3.6.0", - "interpret": "^1.0.0", - "json-loader": "^0.5.4", - "json5": "^0.5.1", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "mkdirp": "~0.5.0", - "node-libs-browser": "^2.0.0", - "source-map": "^0.5.3", - "supports-color": "^4.2.1", - "tapable": "^0.2.7", - "uglifyjs-webpack-plugin": "^0.4.6", - "watchpack": "^1.4.0", - "webpack-sources": "^1.0.1", - "yargs": "^8.0.2" - }, - "dependencies": { - "acorn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", - "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", - "dev": true - }, - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "^4.14.0" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "uglifyjs-webpack-plugin": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", - "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", - "dev": true, - "requires": { - "source-map": "^0.5.6", - "uglify-js": "^2.8.29", - "webpack-sources": "^1.0.1" - } - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "dev": true, - "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" - } - } - } - }, - "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "wordwrapjs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz", - "integrity": "sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==", - "dev": true, - "requires": { - "reduce-flatten": "^1.0.1", - "typical": "^2.6.1" - } - }, - "worker-farm": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", - "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", - "dev": true, - "requires": { - "errno": "^0.1.4", - "xtend": "^4.0.1" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - } - }, - "xmlcreate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz", - "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - } - } -} diff --git a/external/proto/omniledger.proto b/external/proto/byzcoin.proto similarity index 99% rename from external/proto/omniledger.proto rename to external/proto/byzcoin.proto index 5ecb80ce87..c29fe12f88 100644 --- a/external/proto/omniledger.proto +++ b/external/proto/byzcoin.proto @@ -1,12 +1,12 @@ syntax = "proto2"; -package omniledger; +package byzcoin; import "skipchain.proto"; import "onet.proto"; import "darc.proto"; import "collection.proto"; option java_package = "ch.epfl.dedis.proto"; -option java_outer_classname = "OmniLedgerProto"; +option java_outer_classname = "ByzCoinProto"; // DataHeader is the data passed to the Skipchain message DataHeader { diff --git a/external/proto/calypso.proto b/external/proto/calypso.proto index 70ebe90190..46bfc4ce75 100644 --- a/external/proto/calypso.proto +++ b/external/proto/calypso.proto @@ -1,6 +1,6 @@ syntax = "proto2"; package calypso; -import "omniledger.proto"; +import "byzcoin.proto"; import "onet.proto"; option java_package = "ch.epfl.dedis.proto"; @@ -51,8 +51,8 @@ message Read { message CreateLTS { // Roster is the list of nodes that should participate in the DKG. required onet.Roster roster = 1; - // OLID is the ID of the OmniLedger that can use this LTS. - required bytes olid = 2; + // BCID is the ID of the ByzCoin ledger that can use this LTS. + required bytes bcid = 2; } // CreateLTSReply is returned upon successfully setting up the distributed @@ -67,12 +67,12 @@ message CreateLTSReply { } // DecryptKey is sent by a reader after he successfully stored a 'Read' request -// in omniledger. +// in byzcoin. message DecryptKey { // Read is the proof that he has been accepted to read the secret. - required omniledger.Proof read = 1; + required byzcoin.Proof read = 1; // Write is the proof containing the write request. - required omniledger.Proof write = 2; + required byzcoin.Proof write = 2; } // DecryptKeyReply is returned if the service verified successfully that the diff --git a/external/proto/personhood.proto b/external/proto/personhood.proto index c2125d9f35..76c23bd96d 100644 --- a/external/proto/personhood.proto +++ b/external/proto/personhood.proto @@ -13,11 +13,11 @@ message LinkPoP { required Party party = 1; } -// Party represents everything necessary to find a party on omniledger. +// Party represents everything necessary to find a party in the ledger. message Party { - // OmniLedgerID represents the omniledger where the pop-party is stored. - required bytes omniledgerid = 1; - // InstanceID is where to find the party on OmniLedger + // ByzCoinID represents the ledger where the pop-party is stored. + required bytes byzcoinid = 1; + // InstanceID is where to find the party in the ledger. required bytes instanceid = 2; // FinalStatement describes the party and the signature of the organizers. required pop.FinalStatement finalstatement = 3; diff --git a/external/proto/pop.proto b/external/proto/pop.proto index 61cdd355b8..bae984660d 100644 --- a/external/proto/pop.proto +++ b/external/proto/pop.proto @@ -161,7 +161,7 @@ message GetFinalStatementsReply { map finalstatements = 1; } -// StoreInstanceID writes an InstanceID from OmniLedger to a FinalStatement. +// StoreInstanceID writes an InstanceID from ByzCoin to a FinalStatement. message StoreInstanceID { required bytes partyid = 1; required bytes instanceid = 2; @@ -171,7 +171,7 @@ message StoreInstanceID { message StoreInstanceIDReply { } -// GetInstanceID requests an InstanceID from OmniLedger to a FinalStatement. +// GetInstanceID requests an InstanceID from ByzCoin to a FinalStatement. message GetInstanceID { required bytes partyid = 1; } @@ -181,7 +181,7 @@ message GetInstanceIDReply { required bytes instanceid = 1; } -// StoreSigner writes an Signer from OmniLedger to a FinalStatement. +// StoreSigner writes an Signer from ByzCoin to a FinalStatement. message StoreSigner { required bytes partyid = 1; required darc.Signer signer = 2; @@ -191,7 +191,7 @@ message StoreSigner { message StoreSignerReply { } -// GetSigner requests an Signer from OmniLedger to a FinalStatement. +// GetSigner requests an Signer from ByzCoin to a FinalStatement. message GetSigner { required bytes partyid = 1; } @@ -240,7 +240,7 @@ message PopPartyInstance { // Previous is the link to the instanceID of the previous party, it can be // nil for the first party. required bytes previous = 3; - // Next is a link to the omniledger instanceID of the next party. It can be + // Next is a link to the instanceID of the next party. It can be // nil if there is no next party. required bytes next = 4; // Public key of service - can be nil. diff --git a/ocs/service/README.md b/ocs/service/README.md index 04500f72c1..f4cf03cfd0 100644 --- a/ocs/service/README.md +++ b/ocs/service/README.md @@ -16,8 +16,7 @@ is made to delegate rights to write new documents and to read the written docume The OCS service uses skipchain to store the transactions on distributed nodes. In this proof of concept implementation, each transaction is stored in its own -block. Only the new Omniledger implementation will allow to collect multiple -transactions into one block. +block. A transaction is a protobuf message with the following fields: - Write diff --git a/omniledger/.gitignore b/omniledger/.gitignore deleted file mode 100644 index ff4187f4ec..0000000000 --- a/omniledger/.gitignore +++ /dev/null @@ -1 +0,0 @@ -omniledger \ No newline at end of file diff --git a/omniledger/Omniledger.png b/omniledger/Omniledger.png deleted file mode 100644 index d3ced10c29..0000000000 Binary files a/omniledger/Omniledger.png and /dev/null differ diff --git a/omniledger/Omniledger.svg b/omniledger/Omniledger.svg deleted file mode 100644 index f16ee31480..0000000000 --- a/omniledger/Omniledger.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -


























Loops over all instructions

[Not supported by viewer]
SkipBlock n-1
SkipBlock n-1
SkipBlock n-2
SkipBlock n-2
SkipBlock n-3
SkipBlock n-3
SkipBlock n
SkipBlock n
Backward-links: hash of previous blocks, added at block-creation time.
[Not supported by viewer]
Forward-links: signed 
  SkipBlockID_from,   SkipBlockID_to
 newRoster
by the nodes of from block.
[Not supported by viewer]
Sharding
Authenticate
Batch
Order
Consensus



[Not supported by viewer]
Forward Link+ From: SkipBlockID+ To : SkipBlockID+ NewRoster : Roster+ Signature: BFTSignatureSkipBlockHeader+ Previous Blocks: []SkipBlockID+ Global State: Merkle-root+ Client Transactions: Hash+ State Changes: HashPayload+ Transactions: []ClientTransaction+ Forward Links: []ForwardLink
Sha256
Sha256
Sha256
Sha256
Instance+ InstanceID: [32]byte+ ContractID: string+ Value: []byteStateChange+ StateAction: {Create,Update,Remove}+ InstanceID: [32]byte+ ContractID: string+ Value: []byte
Clients
Clients
Omniledger
Omniledger
Global State
Global State
Contracts
Contracts
Go
[Not supported by viewer]
Java
[Not supported by viewer]
JS
[Not supported by viewer]
Transactions
[Not supported by viewer]
Node
[Not supported by viewer]
Node
[Not supported by viewer]
Node
[Not supported by viewer]
Darc1
[Not supported by viewer]
Coin1
[Not supported by viewer]
Coin2
[Not supported by viewer]
OCS1
[Not supported by viewer]
Darc2
[Not supported by viewer]
Coin3
[Not supported by viewer]
OCS3
[Not supported by viewer]
OCS2
[Not supported by viewer]
Darc
[Not supported by viewer]
OCS
[Not supported by viewer]
Coin
[Not supported by viewer]
Instructions
[Not supported by viewer]
Execute
Create / Update / Remove

[Not supported by viewer]
Client Transaction+ Instructions: []InstructionInstruction+ InstanceID: [32]byte+ Nonce: [32]byte+ Length: int+ Position: int+ Spawn+ Invoke+ Delete+ Signature: []DarcSigSpawn+ ContractID: string+ Arguments: []ArgumentInvoke+ Command: string+ Arguments: []ArgumentDelete
Instructions are sent to an existing instance and can be one of Spawn to create a new instance, Invoke to call a method of that instance, or Delete to remove that instance.
[Not supported by viewer]
Transactions are a list of Instructions that are applied as a whole. If any of the instructions fails, the whole transaction is rejected. Every Instruction must be signed by the appropriate signers.
[Not supported by viewer]
When an instance receives an instruction, the corresponding contract is called with a pointer to the instance. The contract will emit a set of StateChanges that define how the Global state should be evolved.
[Not supported by viewer]
Contract code can read the global state and emit StateChanges according to the Instruction received.
[Not supported by viewer]
Instruction
Can be one of Spawn, Invoke, or Delete.
[Not supported by viewer]
Coins
A list of different coins available to that contract.
[Not supported by viewer]
Coins
An output of coins available, might be more or less than the input.
[Not supported by viewer]
StateChange
Every StateChange is either Create, Update, or Remove and directly affects the global state.
[Not supported by viewer]
0..n
0..n
To Contract
To Contract
The global state holds all instances and is split by Darcs that control the access to the connected instances. Every instruction sent to an instance must resolve a rule in the responsible Darc.
[Not supported by viewer]
Clients connect to the omniledger service through a protobuf-over-websockets interface. Currently we have Go, Java and JavaScript APIs, but others like Python are easy to implement.
[Not supported by viewer]
Implementations of contracts are built into conodes. The execution of a contract produces a set of state changes. A quorum of conodes must execute the contract and produce agreeing sets of state changes before they are applied to the global state.
[Not supported by viewer]
Darc+ Version: int+ BaseID: DarcID+ Rules: []RuleRule+ Action: string+ Expression: and, or
Public Key
Public Key
A Darc has a set of Rules/Expressions that describe how a rule (like Invoke:SendCoin) can be verified.
An expression is composed of and, or, and public keys and/or links to other Darcs.
[Not supported by viewer]
From Instruction
From Instruction

OmniLedger

This is an overview of our project, inspired by the awesome Ethereum Blockchain Mechanism by Lee Thomas. Code and documentation can be found at:

https://github.com/dedis/cothority

(c) 2018 by Linus.Gasser@epfl.ch

[Not supported by viewer]
\ No newline at end of file diff --git a/omniledger/ol/.gitignore b/omniledger/ol/.gitignore deleted file mode 100644 index 3d6f3b84a1..0000000000 --- a/omniledger/ol/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ol diff --git a/omniledger/ol/README.md b/omniledger/ol/README.md deleted file mode 100644 index 35e1663596..0000000000 --- a/omniledger/ol/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# ol - the CLI to configure OmniLedger permissions - -## Create a new OmniLedger, saving the config - -``` -$ ol create -roster roster.toml -``` - -The `roster.toml` file is a list of servers what form the cothority that will -maintain the ledger. After running `run_conode.sh local 3` for example, the file -`public.toml` will have the 3 conodes in it. For a larger production deployment, -you will construct the `roster.toml` file by collecting the `public.toml` files -from each of the servers. - -The OmniLedger config info (the skipchain ID and the roster for the cothority) -are stored in the local config directory (~/.config/ol or ~/Library/Application -Support/ol) and the filename is printed on stdout. The OmniLedger config file -will be used by other tools to know where to send their transactions. - -The secret key is saved in a file named after the public key. It must not be -shared! - -To see the config you just made, use `ol show -ol $file`. - -## Granting access to contracts - -The user who wants to use OmniLedger generates a private key and shares the -public key with you, the OmniLedger admin. You grant access to a given contract -for instructions signed by the given secret key like this: - -``` -$ ol add -ol $file spawn:eventlog -identity ed25519:dd6419b01b49e3ffd18696c93884dc244b4688d95f55d6c2a4639f2b0ce40710 -``` - -Using the OmniLedger config file you give them and their private key to sign -transactions, they will now be able to use their application to send -transactions. - -## Environmnet variables - -You can set the environment variable OL to the config file for the OmniLedger -you are currently working with. (Client apps should follow this same standard.) diff --git a/personhood/README.md b/personhood/README.md index c998fc9352..ff0eb5d914 100644 --- a/personhood/README.md +++ b/personhood/README.md @@ -19,7 +19,7 @@ WORKING MOCKUP, WE'LL DO PROPER CONTRACTS AND ALL! ## Currency -Either use this service or the current coin-services implemented in OmniLedger. +Either use this service or the current coin-services implemented in ByzCoin. Probably the latter. ## Voting and Deliberation diff --git a/personhood/db.go b/personhood/db.go index e2e8fe651e..fdc0045fd6 100644 --- a/personhood/db.go +++ b/personhood/db.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/dedis/cothority" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/onet/network" "github.com/dedis/protobuf" ) @@ -58,5 +58,5 @@ type storage1 struct { } type readMsg struct { - Readers []ol.InstanceID + Readers []byzcoin.InstanceID } diff --git a/personhood/proto.go b/personhood/proto.go index 60ba7f5879..a56223bfd9 100644 --- a/personhood/proto.go +++ b/personhood/proto.go @@ -1,8 +1,8 @@ package personhood import ( - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" pop "github.com/dedis/cothority/pop/service" "github.com/dedis/cothority/skipchain" ) @@ -11,7 +11,7 @@ import ( // type :InstanceID:bytes // type :SkipBlockID:bytes // type :skipchain.SkipBlockID:bytes -// type :ol.InstanceID:bytes +// type :byzcoin.InstanceID:bytes // package personhood; // // import "darc.proto"; @@ -26,12 +26,12 @@ type LinkPoP struct { Party Party } -// Party represents everything necessary to find a party on omniledger. +// Party represents everything necessary to find a party in the ledger. type Party struct { - // OmniLedgerID represents the omniledger where the pop-party is stored. - OmniLedgerID skipchain.SkipBlockID - // InstanceID is where to find the party on OmniLedger - InstanceID ol.InstanceID + // ByzCoinID represents the ledger where the pop-party is stored. + ByzCoinID skipchain.SkipBlockID + // InstanceID is where to find the party in the ledger. + InstanceID byzcoin.InstanceID // FinalStatement describes the party and the signature of the organizers. FinalStatement pop.FinalStatement // Darc being responsible for the PartyInstance. @@ -72,7 +72,7 @@ type Reply struct { // Sum is the sum of all replies for a given index of the questions. Sum []int // TODO: replace this with a linkable ring signature - Users []ol.InstanceID + Users []byzcoin.InstanceID } // RegisterQuestionnaire creates a questionnaire with a number of questions to @@ -105,7 +105,7 @@ type AnswerQuestionnaire struct { // Replies is a slice of answers, up to Questionnaire.Replies Replies []int // Account where to put the reward to. - Account ol.InstanceID + Account byzcoin.InstanceID } // TopupQuestionnaire can be used to add new balance to a questionnaire. @@ -130,7 +130,7 @@ type Message struct { // Text, can be any length of text of the message. Text string // Author's coin account for eventual rewards/tips to the author. - Author ol.InstanceID + Author byzcoin.InstanceID // Balance the message has currently left. Balance uint64 // Reward for reading this messgae. @@ -174,7 +174,7 @@ type ReadMessage struct { // PartyIID to calculate the party coin account PartyIID []byte // Reader that will receive the reward - Reader ol.InstanceID + Reader byzcoin.InstanceID } // ReadMessageReply if the message is still active (balance >= reward) diff --git a/personhood/service.go b/personhood/service.go index cf97875de3..77106e5115 100644 --- a/personhood/service.go +++ b/personhood/service.go @@ -11,7 +11,7 @@ import ( "errors" "sort" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" "github.com/dedis/onet" "github.com/dedis/onet/log" ) @@ -202,14 +202,14 @@ func (s *Service) ReadMessage(rm *ReadMessage) (*ReadMessageReply, error) { return nil, errors.New("couldn't marshal party public key: " + err.Error()) } partyCoin.Write(pubBuf) - ctx := ol.ClientTransaction{ - Instructions: []ol.Instruction{{ - InstanceID: ol.NewInstanceID(partyCoin.Sum(nil)), + ctx := byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{{ + InstanceID: byzcoin.NewInstanceID(partyCoin.Sum(nil)), Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: []ol.Argument{{ + Args: []byzcoin.Argument{{ Name: "coins", Value: cBuf, }, @@ -224,7 +224,7 @@ func (s *Service) ReadMessage(rm *ReadMessage) (*ReadMessageReply, error) { if err != nil { return nil, errors.New("couldn't sign: " + err.Error()) } - cl := ol.NewClient(party.OmniLedgerID, *party.FinalStatement.Desc.Roster) + cl := byzcoin.NewClient(party.ByzCoinID, *party.FinalStatement.Desc.Roster) _, err = cl.AddTransactionAndWait(ctx, 10) if err != nil { return nil, errors.New("couldn't send reward: " + err.Error()) diff --git a/personhood/service_test.go b/personhood/service_test.go index 415b28837e..c5b6ab4522 100644 --- a/personhood/service_test.go +++ b/personhood/service_test.go @@ -7,9 +7,9 @@ import ( "time" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/contracts" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/contracts" + "github.com/dedis/cothority/byzcoin/darc" pop "github.com/dedis/cothority/pop/service" "github.com/dedis/cothority/skipchain" "github.com/dedis/kyber" @@ -36,8 +36,8 @@ func TestService_LinkPoP(t *testing.T) { defer s.Close() s.createParty(t, len(s.servers), 3) - gpr, err := s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, + gpr, err := s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: s.serCoin.Slice(), ID: s.olID, }) @@ -124,7 +124,7 @@ func TestService_Questionnaire(t *testing.T) { aq := &AnswerQuestionnaire{ QuestID: quests[0].ID, Replies: []int{-1}, - Account: ol.InstanceID{}, + Account: byzcoin.InstanceID{}, } _, err := s.phs[0].AnswerQuestionnaire(aq) require.NotNil(t, err) @@ -155,7 +155,7 @@ func TestService_Questionnaire(t *testing.T) { aq = &AnswerQuestionnaire{ QuestID: quests[1].ID, Replies: []int{0, 1}, - Account: ol.InstanceID{}, + Account: byzcoin.InstanceID{}, } _, err = s.phs[0].AnswerQuestionnaire(aq) require.Nil(t, err) @@ -175,7 +175,7 @@ func TestService_Messages(t *testing.T) { Subject: "test1", Date: 0, Text: "This is the 1st test message", - Author: ol.InstanceID{}, + Author: byzcoin.InstanceID{}, Balance: 10, Reward: 10, ID: random.Bits(256, true, random.New()), @@ -184,7 +184,7 @@ func TestService_Messages(t *testing.T) { Subject: "test2", Date: 0, Text: "This is the 2nd test message", - Author: ol.InstanceID{}, + Author: byzcoin.InstanceID{}, Balance: 20, Reward: 10, ID: random.Bits(256, true, random.New()), @@ -282,18 +282,18 @@ type sStruct struct { party pop.FinalStatement orgs []*key.Pair attendees []*key.Pair - attCoin []ol.InstanceID + attCoin []byzcoin.InstanceID attDarc []*darc.Darc attSig []darc.Signer service *key.Pair serDarc *darc.Darc - serCoin ol.InstanceID + serCoin byzcoin.InstanceID serSig darc.Signer - ols *ol.Service + ols *byzcoin.Service olID skipchain.SkipBlockID signer darc.Signer - gMsg *ol.CreateGenesisBlock - popI ol.InstanceID + gMsg *byzcoin.CreateGenesisBlock + popI byzcoin.InstanceID } func newS(t *testing.T) (s *sStruct) { @@ -310,11 +310,11 @@ func newS(t *testing.T) (s *sStruct) { s.pops = append(s.pops, p.(*pop.Service)) } - // Create OmniLedger - s.ols = s.local.Services[s.roster.List[0].ID][onet.ServiceFactory.ServiceID(ol.ServiceName)].(*ol.Service) + // Create the ledger + s.ols = s.local.Services[s.roster.List[0].ID][onet.ServiceFactory.ServiceID(byzcoin.ServiceName)].(*byzcoin.Service) s.signer = darc.NewSignerEd25519(nil, nil) var err error - s.gMsg, err = ol.DefaultGenesisMsg(ol.CurrentVersion, s.roster, + s.gMsg, err = byzcoin.DefaultGenesisMsg(byzcoin.CurrentVersion, s.roster, []string{"spawn:dummy", "spawn:popParty", "invoke:Finalize"}, s.signer.Identity()) require.Nil(t, err) s.gMsg.BlockInterval = 500 * time.Millisecond @@ -330,7 +330,7 @@ func (s *sStruct) Close() { } // Create a party with orgs organizers and attendees. It will store the party -// in omniLedger and finalize it. +// in the ledger and finalize it. func (s *sStruct) createParty(t *testing.T, orgs, attendees int) { if orgs > len(s.pops) { t.Fatal("cannot have more organizers than conodes") @@ -369,7 +369,7 @@ func (s *sStruct) createParty(t *testing.T, orgs, attendees int) { require.Nil(t, err) } - // Store the party in OmniLedger + // Store the party in the ledger s.createPoPSpawn(t) // Finalise the party @@ -391,12 +391,12 @@ func (s *sStruct) createParty(t *testing.T, orgs, attendees int) { } } - // Store the finalized party in OmniLedger + // Store the finalized party in the ledger s.invokePoPFinalize(t) _, err := s.phs[0].LinkPoP(&LinkPoP{ Party: Party{ - OmniLedgerID: s.olID, + ByzCoinID: s.olID, InstanceID: s.popI, FinalStatement: s.party, Darc: *s.serDarc, @@ -407,19 +407,19 @@ func (s *sStruct) createParty(t *testing.T, orgs, attendees int) { } func (s *sStruct) createPoPSpawn(t *testing.T) { - log.Lvl2("Publishing the party to omniledger") + log.Lvl2("Publishing the party to the ledger") fsBuf, err := protobuf.Encode(&s.party) require.Nil(t, err) dID := s.gMsg.GenesisDarc.GetBaseID() - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{ol.Instruction{ - InstanceID: ol.NewInstanceID(dID), + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(dID), Index: 0, Length: 1, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: pop.ContractPopParty, - Args: ol.Arguments{{ + Args: byzcoin.Arguments{{ Name: "FinalStatement", Value: fsBuf, }}, @@ -428,8 +428,8 @@ func (s *sStruct) createPoPSpawn(t *testing.T) { } err = ctx.Instructions[0].SignBy(dID, s.signer) require.Nil(t, err) - _, err = s.ols.AddTransaction(&ol.AddTxRequest{ - Version: ol.CurrentVersion, + _, err = s.ols.AddTransaction(&byzcoin.AddTxRequest{ + Version: byzcoin.CurrentVersion, SkipchainID: s.olID, Transaction: ctx, InclusionWait: 10, @@ -439,20 +439,20 @@ func (s *sStruct) createPoPSpawn(t *testing.T) { } func (s *sStruct) invokePoPFinalize(t *testing.T) { - log.Lvl2("finalizing the party in omniledger") + log.Lvl2("finalizing the party in the ledger") fsBuf, err := protobuf.Encode(&s.party) require.Nil(t, err) s.service = key.NewKeyPair(tSuite) sBuf, err := s.service.Public.MarshalBinary() require.Nil(t, err) - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{ol.Instruction{ + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{byzcoin.Instruction{ InstanceID: s.popI, Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "Finalize", - Args: ol.Arguments{ + Args: byzcoin.Arguments{ { Name: "FinalStatement", Value: fsBuf, @@ -468,8 +468,8 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { dID := s.gMsg.GenesisDarc.GetBaseID() err = ctx.Instructions[0].SignBy(dID, s.signer) require.Nil(t, err) - _, err = s.ols.AddTransaction(&ol.AddTxRequest{ - Version: ol.CurrentVersion, + _, err = s.ols.AddTransaction(&byzcoin.AddTxRequest{ + Version: byzcoin.CurrentVersion, SkipchainID: s.olID, Transaction: ctx, InclusionWait: 10, @@ -478,9 +478,9 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { serCoinID := sha256.New() serCoinID.Write(ctx.Instructions[0].InstanceID.Slice()) serCoinID.Write(sBuf) - s.serCoin = ol.NewInstanceID(serCoinID.Sum(nil)) - gpr, err := s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, + s.serCoin = byzcoin.NewInstanceID(serCoinID.Sum(nil)) + gpr, err := s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: s.serCoin.Slice(), ID: s.olID, }) @@ -488,8 +488,8 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { require.True(t, gpr.Proof.InclusionProof.Match()) _, vals, err := gpr.Proof.KeyValue() require.Nil(t, err) - gpr, err = s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, + gpr, err = s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: vals[2], ID: s.olID, }) @@ -508,10 +508,10 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { buf, err := att.Public.MarshalBinary() require.Nil(t, err) inst.Write(buf) - s.attCoin = append(s.attCoin, ol.NewInstanceID(inst.Sum(nil))) + s.attCoin = append(s.attCoin, byzcoin.NewInstanceID(inst.Sum(nil))) s.attSig = append(s.attSig, darc.NewSignerEd25519(att.Public, att.Private)) - gpr, err = s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, + gpr, err = s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: s.attCoin[i].Slice(), ID: s.olID, }) @@ -519,8 +519,8 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { require.True(t, gpr.Proof.InclusionProof.Match()) _, vals, err := gpr.Proof.KeyValue() require.Nil(t, err) - gpr, err = s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, + gpr, err = s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: vals[2], ID: s.olID, }) @@ -535,9 +535,9 @@ func (s *sStruct) invokePoPFinalize(t *testing.T) { } } -func (s *sStruct) coinGet(t *testing.T, inst ol.InstanceID) (ci ol.Coin) { - gpr, err := s.ols.GetProof(&ol.GetProof{ - Version: ol.CurrentVersion, +func (s *sStruct) coinGet(t *testing.T, inst byzcoin.InstanceID) (ci byzcoin.Coin) { + gpr, err := s.ols.GetProof(&byzcoin.GetProof{ + Version: byzcoin.CurrentVersion, Key: inst.Slice(), ID: s.olID, }) @@ -551,17 +551,17 @@ func (s *sStruct) coinGet(t *testing.T, inst ol.InstanceID) (ci ol.Coin) { return } -func (s *sStruct) coinTransfer(t *testing.T, from, to ol.InstanceID, coins uint64, d *darc.Darc, sig darc.Signer) { +func (s *sStruct) coinTransfer(t *testing.T, from, to byzcoin.InstanceID, coins uint64, d *darc.Darc, sig darc.Signer) { var cBuf = make([]byte, 8) binary.LittleEndian.PutUint64(cBuf, coins) - ctx := ol.ClientTransaction{ - Instructions: []ol.Instruction{{ + ctx := byzcoin.ClientTransaction{ + Instructions: []byzcoin.Instruction{{ InstanceID: from, Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: []ol.Argument{{ + Args: []byzcoin.Argument{{ Name: "coins", Value: cBuf, }, @@ -573,8 +573,8 @@ func (s *sStruct) coinTransfer(t *testing.T, from, to ol.InstanceID, coins uint6 }}, } require.Nil(t, ctx.Instructions[0].SignBy(d.GetBaseID(), sig)) - _, err := s.ols.AddTransaction(&ol.AddTxRequest{ - Version: ol.CurrentVersion, + _, err := s.ols.AddTransaction(&byzcoin.AddTxRequest{ + Version: byzcoin.CurrentVersion, SkipchainID: s.olID, Transaction: ctx, InclusionWait: 10, diff --git a/pop/app.go b/pop/app.go index 5ec55cdd7f..52e727b721 100644 --- a/pop/app.go +++ b/pop/app.go @@ -20,13 +20,11 @@ import ( "strings" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/bcadmin/lib" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/cothority/ftcosi/check" - _ "github.com/dedis/cothority/ftcosi/protocol" - _ "github.com/dedis/cothority/ftcosi/service" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" - "github.com/dedis/cothority/omniledger/ol/lib" - ol "github.com/dedis/cothority/omniledger/service" ph "github.com/dedis/cothority/personhood" "github.com/dedis/protobuf" cli "gopkg.in/urfave/cli.v1" @@ -86,7 +84,7 @@ func main() { appCli.Version = "0.1" appCli.Commands = []cli.Command{} appCli.Commands = []cli.Command{ - commandOmniledger, + commandBC, commandOrg, commandAttendee, commandAuth, @@ -630,14 +628,14 @@ func authStore(c *cli.Context) error { return nil } -// omniStore creates a new PopParty instance together with a darc that is +// bcStore creates a new PopParty instance together with a darc that is // allowed to invoke methods on it. -func omniStore(c *cli.Context) error { +func bcStore(c *cli.Context) error { if c.NArg() < 2 || c.NArg() > 3 { - return errors.New("please give: omniledger.cfg key-xxx.cfg [final-id]") + return errors.New("please give: bc.cfg key-xxx.cfg [final-id]") } - // Load the omniledger configuration + // Load the configuration cfg, _, err := lib.LoadConfig(c.Args().First()) if err != nil { return err @@ -662,9 +660,9 @@ func omniStore(c *cli.Context) error { } } - // Fetch all final statements from all nodes in the roster of omniledger. + // Fetch all final statements from all nodes in the roster. // This supposes that there is at least an overlap of the servers who were - // involved in the pop-party and the servers holding omniledger. + // involved in the pop-party and the servers holding the ledger. finalStatements := map[string]*service.FinalStatement{} for _, s := range cfg.Roster.List { log.Info("Looking up final statements on host", s) @@ -691,7 +689,7 @@ func omniStore(c *cli.Context) error { if len(finalID) > 0 { return errors.New("didn't find a final statement starting with the bytes given. Try no search") } - return errors.New("none of the conodes of omniledger has any party stored") + return errors.New("none of the conodes has any party stored") } if len(finalStatements) > 1 { @@ -740,14 +738,14 @@ func omniStore(c *cli.Context) error { if err != nil { return err } - inst := ol.Instruction{ - InstanceID: ol.NewInstanceID(cfg.GenesisDarc.GetBaseID()), - Nonce: ol.Nonce{}, + inst := byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(cfg.GenesisDarc.GetBaseID()), + Nonce: byzcoin.Nonce{}, Index: 0, Length: 1, - Spawn: &ol.Spawn{ - ContractID: ol.ContractDarcID, - Args: ol.Arguments{{ + Spawn: &byzcoin.Spawn{ + ContractID: byzcoin.ContractDarcID, + Args: byzcoin.Arguments{{ Name: "darc", Value: orgDarcBuf, }}, @@ -757,11 +755,11 @@ func omniStore(c *cli.Context) error { if err != nil { return err } - ct := ol.ClientTransaction{ - Instructions: ol.Instructions{inst}, + ct := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{inst}, } - log.Info("Contacting omniledger to store the new darc") - olc := ol.NewClient(cfg.OmniledgerID, cfg.Roster) + log.Info("Contacting ByzCoin to store the new darc") + olc := byzcoin.NewClient(cfg.ByzCoinID, cfg.Roster) _, err = olc.AddTransactionAndWait(ct, 10) if err != nil { return err @@ -771,14 +769,14 @@ func omniStore(c *cli.Context) error { if err != nil { return err } - inst = ol.Instruction{ - InstanceID: ol.NewInstanceID(orgDarc.GetBaseID()), - Nonce: ol.Nonce{}, + inst = byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(orgDarc.GetBaseID()), + Nonce: byzcoin.Nonce{}, Index: 0, Length: 1, - Spawn: &ol.Spawn{ + Spawn: &byzcoin.Spawn{ ContractID: service.ContractPopParty, - Args: ol.Arguments{{ + Args: byzcoin.Arguments{{ Name: "FinalStatement", Value: partyConfigBuf, }}, @@ -788,10 +786,10 @@ func omniStore(c *cli.Context) error { if err != nil { return err } - ct = ol.ClientTransaction{ - Instructions: ol.Instructions{inst}, + ct = byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{inst}, } - log.Info("Contacting omniledger to spawn the new party") + log.Info("Contacting ByzCoin to spawn the new party") _, err = olc.AddTransactionAndWait(ct, 10) if err != nil { return err @@ -810,13 +808,13 @@ func omniStore(c *cli.Context) error { return nil } -// omniFinalize stores a final statement of a party in Omniledger -func omniFinalize(c *cli.Context) error { +// bcFinalize stores a final statement of a party +func bcFinalize(c *cli.Context) error { if c.NArg() != 3 { - return errors.New("please give: omniledger.cfg key-xxx.cfg partyID") + return errors.New("please give: bc.cfg key-xxx.cfg partyID") } - // Load the omniledger configuration + // Load the configuration cfg, ocl, err := lib.LoadConfig(c.Args().First()) if err != nil { return err @@ -860,7 +858,7 @@ func omniFinalize(c *cli.Context) error { if err != nil { return errors.New("couldn't get instanceID: " + err.Error()) } - if partyInstance.Equal(ol.InstanceID{}) { + if partyInstance.Equal(byzcoin.InstanceID{}) { return errors.New("no instanceID stored") } @@ -869,16 +867,16 @@ func omniFinalize(c *cli.Context) error { return errors.New("Couldn't get point: " + err.Error()) } - log.Info("Sending finalize-instruction to omniledger") - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{ol.Instruction{ + log.Info("Sending finalize-instruction") + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{byzcoin.Instruction{ InstanceID: partyInstance, Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "Finalize", - Args: ol.Arguments{ - ol.Argument{ + Args: byzcoin.Arguments{ + byzcoin.Argument{ Name: "FinalStatement", Value: fsBuf, }, @@ -901,7 +899,7 @@ func omniFinalize(c *cli.Context) error { log.Print("linkpop", fs.Desc.Roster) err = ph.NewClient().LinkPoP(fs.Desc.Roster.List[0], ph.Party{ - OmniLedgerID: cfg.OmniledgerID, + ByzCoinID: cfg.ByzCoinID, FinalStatement: *fs, InstanceID: partyInstance, Darc: cfg.GenesisDarc, @@ -914,13 +912,13 @@ func omniFinalize(c *cli.Context) error { return nil } -// omniCoinShow returns the number of coins in the account of the user. -func omniCoinShow(c *cli.Context) error { +// bcCoinShow returns the number of coins in the account of the user. +func bcCoinShow(c *cli.Context) error { if c.NArg() != 3 { - return errors.New("please give: omniledger.cfg partyID (public-key | accountID)") + return errors.New("please give: bc.cfg partyID (public-key | accountID)") } - // Load the omniledger configuration + // Load the configuration _, ocl, err := lib.LoadConfig(c.Args().First()) if err != nil { return err @@ -965,7 +963,7 @@ func omniCoinShow(c *cli.Context) error { if err != nil { return errors.New("couldn't get value from proof: " + err.Error()) } - ci := ol.Coin{} + ci := byzcoin.Coin{} err = protobuf.Decode(v[0], &ci) if err != nil { return errors.New("couldn't unmarshal coin balance: " + err.Error()) @@ -974,12 +972,12 @@ func omniCoinShow(c *cli.Context) error { return nil } -func omniCoinTransfer(c *cli.Context) error { +func bcCoinTransfer(c *cli.Context) error { if c.NArg() != 5 { - return errors.New("please give: omniledger.cfg partyID source_private_key dst_public_key amount") + return errors.New("please give: bc.cfg partyID source_private_key dst_public_key amount") } - // Load the omniledger configuration + // Load the configuration _, ocl, err := lib.LoadConfig(c.Args().First()) if err != nil { return err @@ -1058,14 +1056,14 @@ func omniCoinTransfer(c *cli.Context) error { log.Info("Transferring coins") amountBuf := make([]byte, 8) binary.LittleEndian.PutUint64(amountBuf, amount) - ctx := ol.ClientTransaction{ - Instructions: ol.Instructions{ol.Instruction{ - InstanceID: ol.NewInstanceID(srcAddr), + ctx := byzcoin.ClientTransaction{ + Instructions: byzcoin.Instructions{byzcoin.Instruction{ + InstanceID: byzcoin.NewInstanceID(srcAddr), Index: 0, Length: 1, - Invoke: &ol.Invoke{ + Invoke: &byzcoin.Invoke{ Command: "transfer", - Args: ol.Arguments{{ + Args: byzcoin.Arguments{{ Name: "coins", Value: amountBuf, }, diff --git a/pop/commands.go b/pop/commands.go index 4b3f427ce3..e9d2cbd75a 100644 --- a/pop/commands.go +++ b/pop/commands.go @@ -6,7 +6,7 @@ import "gopkg.in/urfave/cli.v1" This holds the cli-commands so the main-file is less cluttered. */ -var commandOrg, commandAttendee, commandAuth, commandOmniledger cli.Command +var commandOrg, commandAttendee, commandAuth, commandBC cli.Command func init() { @@ -126,24 +126,24 @@ func init() { }, }, } - commandOmniledger = cli.Command{ - Name: "omniledger", - Aliases: []string{"ol"}, - Usage: "communicate with Omniledger", + commandBC = cli.Command{ + Name: "byzcoin", + Aliases: []string{"bc"}, + Usage: "communicate with ByzCoin", Subcommands: []cli.Command{ { Name: "store", Aliases: []string{"s"}, - Usage: "store the proposition of a pop-party in omniledger", - ArgsUsage: "omniledger.cfg key-xxx.cfg final-id", - Action: omniStore, + Usage: "store the proposition of a pop-party on the ledger", + ArgsUsage: "bc.cfg key-xxx.cfg final-id", + Action: bcStore, }, { Name: "finalize", Aliases: []string{"f"}, - Usage: "store a finalized pop-party in omniledger", - ArgsUsage: "omniledger.cfg key-xxx.cfg partyId", - Action: omniFinalize, + Usage: "store a finalized pop-party in the ledger", + ArgsUsage: "bc.cfg key-xxx.cfg partyId", + Action: bcFinalize, }, { Name: "coin", @@ -154,15 +154,15 @@ func init() { Name: "show", Aliases: []string{"s"}, Usage: "show how many coins are left in the account", - ArgsUsage: "omniledger.cfg partyInstID (public-key|accountID)", - Action: omniCoinShow, + ArgsUsage: "bc.cfg partyInstID (public-key|accountID)", + Action: bcCoinShow, }, { Name: "transfer", Aliases: []string{"t"}, Usage: "transfer money from one account to another", - ArgsUsage: "omniledger.cfg partyInstID source_private_key dst_public_key amount", - Action: omniCoinTransfer, + ArgsUsage: "bc.cfg partyInstID source_private_key dst_public_key amount", + Action: bcCoinTransfer, }, }, }, diff --git a/pop/service/api.go b/pop/service/api.go index f2a018a0dd..1c89c35bec 100644 --- a/pop/service/api.go +++ b/pop/service/api.go @@ -7,8 +7,8 @@ import ( "github.com/BurntSushi/toml" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/kyber" "github.com/dedis/kyber/sign/eddsa" "github.com/dedis/kyber/sign/schnorr" @@ -188,7 +188,7 @@ func (c *Client) GetKeys(dst network.Address, partyID []byte) ([]kyber.Point, er } // StoreInstanceID asks the service to store an instanceID for a given party. -func (c *Client) StoreInstanceID(dst network.Address, partyID []byte, instanceID ol.InstanceID) error { +func (c *Client) StoreInstanceID(dst network.Address, partyID []byte, instanceID byzcoin.InstanceID) error { si := &network.ServerIdentity{Address: dst} ret := &StoreInstanceIDReply{} @@ -196,7 +196,7 @@ func (c *Client) StoreInstanceID(dst network.Address, partyID []byte, instanceID } // GetInstanceID asks the service for an instanceID for a given party. -func (c *Client) GetInstanceID(dst network.Address, partyID []byte) (ol.InstanceID, error) { +func (c *Client) GetInstanceID(dst network.Address, partyID []byte) (byzcoin.InstanceID, error) { si := &network.ServerIdentity{Address: dst} ret := &GetInstanceIDReply{} diff --git a/pop/service/api_test.go b/pop/service/api_test.go index 57333157d1..571f464e34 100644 --- a/pop/service/api_test.go +++ b/pop/service/api_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/darc" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/kyber" "github.com/dedis/kyber/sign/eddsa" "github.com/dedis/kyber/util/key" @@ -142,7 +142,7 @@ func TestClient_StoreGetInstanceID(t *testing.T) { ts := newTSer(t) defer ts.Close() - iid := ol.NewInstanceID(random.Bits(256, true, random.New())) + iid := byzcoin.NewInstanceID(random.Bits(256, true, random.New())) err := NewClient().StoreInstanceID(ts.addr, ts.fsID, iid) require.Nil(t, err) diff --git a/pop/service/contract.go b/pop/service/contract.go index e5ad027314..d5e15a38de 100644 --- a/pop/service/contract.go +++ b/pop/service/contract.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/dedis/cothority" - "github.com/dedis/cothority/omniledger/contracts" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/darc/expression" - ol "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/contracts" + "github.com/dedis/cothority/byzcoin/darc" + "github.com/dedis/cothority/byzcoin/darc/expression" "github.com/dedis/kyber" "github.com/dedis/onet/log" "github.com/dedis/onet/network" @@ -29,15 +29,15 @@ var ContractPopParty = "popParty" var ContractPopCoinAccount = "popCoinAccount" // PoPCoinName is the identifier of the popcoins. -var PoPCoinName ol.InstanceID +var PoPCoinName byzcoin.InstanceID func init() { h := sha256.New() h.Write([]byte("popcoin")) - PoPCoinName = ol.NewInstanceID(h.Sum(nil)) + PoPCoinName = byzcoin.NewInstanceID(h.Sum(nil)) } -// ContractPopParty represents a pop-party on OmniLedger. It has the following +// ContractPopParty represents a pop-party in ByzCoin. It has the following // functionalities: // * Spawn - takes a "FinalStatement" argument with the binary representation // of the final statement to store. @@ -51,7 +51,7 @@ func init() { // needs to be correctly finalized by the pop-service. // * "Service" - when given, will create a darc and a coin-account for // the service to use. -func (s *Service) ContractPopParty(cdb ol.CollectionView, inst ol.Instruction, coins []ol.Coin) (scs []ol.StateChange, cOut []ol.Coin, err error) { +func (s *Service) ContractPopParty(cdb byzcoin.CollectionView, inst byzcoin.Instruction, coins []byzcoin.Coin) (scs []byzcoin.StateChange, cOut []byzcoin.Coin, err error) { cOut = coins err = inst.VerifyDarcSignature(cdb) @@ -98,8 +98,8 @@ func (s *Service) ContractPopParty(cdb ol.CollectionView, inst ol.Instruction, c // return nil, nil, errors.New("couldn't get party id: " + err.Error()) // } // log.Printf("New party: %x", partyID) - return ol.StateChanges{ - ol.NewStateChange(ol.Create, inst.DeriveID(""), inst.Spawn.ContractID, ppiBuf, darc.ID(inst.InstanceID[:])), + return byzcoin.StateChanges{ + byzcoin.NewStateChange(byzcoin.Create, inst.DeriveID(""), inst.Spawn.ContractID, ppiBuf, darc.ID(inst.InstanceID[:])), }, cOut, nil case inst.Invoke != nil: switch inst.Invoke.Command { @@ -166,7 +166,7 @@ func (s *Service) ContractPopParty(cdb ol.CollectionView, inst ol.Instruction, c } // Update existing final statement - scs = append(scs, ol.NewStateChange(ol.Update, inst.InstanceID, ContractPopParty, ppiBuf, darcID)) + scs = append(scs, byzcoin.NewStateChange(byzcoin.Update, inst.InstanceID, ContractPopParty, ppiBuf, darcID)) return scs, coins, nil case "AddParty": @@ -180,7 +180,7 @@ func (s *Service) ContractPopParty(cdb ol.CollectionView, inst ol.Instruction, c } } -func createDarc(darcID darc.ID, pub kyber.Point) (d *darc.Darc, sc ol.StateChange, err error) { +func createDarc(darcID darc.ID, pub kyber.Point) (d *darc.Darc, sc byzcoin.StateChange, err error) { id := darc.NewIdentityEd25519(pub) rules := darc.InitRules([]darc.Identity{id}, []darc.Identity{id}) rules.AddRule(darc.Action("invoke:transfer"), expression.Expr(id.String())) @@ -191,12 +191,12 @@ func createDarc(darcID darc.ID, pub kyber.Point) (d *darc.Darc, sc ol.StateChang return } log.Lvlf3("Final %x/%x", d.GetBaseID(), sha256.Sum256(darcBuf)) - sc = ol.NewStateChange(ol.Create, ol.NewInstanceID(d.GetBaseID()), - ol.ContractDarcID, darcBuf, darcID) + sc = byzcoin.NewStateChange(byzcoin.Create, byzcoin.NewInstanceID(d.GetBaseID()), + byzcoin.ContractDarcID, darcBuf, darcID) return } -func createCoin(inst ol.Instruction, d *darc.Darc, pub kyber.Point, balance uint64) (sc ol.StateChange, err error) { +func createCoin(inst byzcoin.Instruction, d *darc.Darc, pub kyber.Point, balance uint64) (sc byzcoin.StateChange, err error) { iid := sha256.New() iid.Write(inst.InstanceID.Slice()) pubBuf, err := pub.MarshalBinary() @@ -205,7 +205,7 @@ func createCoin(inst ol.Instruction, d *darc.Darc, pub kyber.Point, balance uint return } iid.Write(pubBuf) - cci := ol.Coin{ + cci := byzcoin.Coin{ Name: PoPCoinName, Value: balance, } @@ -216,6 +216,6 @@ func createCoin(inst ol.Instruction, d *darc.Darc, pub kyber.Point, balance uint } coinID := iid.Sum(nil) log.Lvlf3("Creating account %x", coinID) - return ol.NewStateChange(ol.Create, ol.NewInstanceID(coinID), + return byzcoin.NewStateChange(byzcoin.Create, byzcoin.NewInstanceID(coinID), contracts.ContractCoinID, cciBuf, d.GetBaseID()), nil } diff --git a/pop/service/proto.go b/pop/service/proto.go index 50836e5a61..ba4dc1b322 100644 --- a/pop/service/proto.go +++ b/pop/service/proto.go @@ -5,9 +5,8 @@ This holds the messages used to communicate with the service over the network. */ import ( - "github.com/dedis/cothority/omniledger/darc" - // Use omniledger here so that the correct package will be included in protobuf. - omniledger "github.com/dedis/cothority/omniledger/service" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/kyber" "github.com/dedis/onet" "github.com/dedis/onet/network" @@ -28,7 +27,7 @@ func init() { // PROTOSTART // package pop; // type :map\[string\]FinalStatement:map -// type :omniledger.InstanceID:bytes +// type :byzcoin.InstanceID:bytes // import "onet.proto"; // import "darc.proto"; // @@ -190,27 +189,27 @@ type GetFinalStatementsReply struct { FinalStatements map[string]*FinalStatement } -// StoreInstanceID writes an InstanceID from OmniLedger to a FinalStatement. +// StoreInstanceID writes an InstanceID from ByzCoin to a FinalStatement. type StoreInstanceID struct { PartyID []byte - InstanceID omniledger.InstanceID + InstanceID byzcoin.InstanceID } // StoreInstanceIDReply is an empty reply type StoreInstanceIDReply struct { } -// GetInstanceID requests an InstanceID from OmniLedger to a FinalStatement. +// GetInstanceID requests an InstanceID from ByzCoin to a FinalStatement. type GetInstanceID struct { PartyID []byte } // GetInstanceIDReply is the InstanceID for the party type GetInstanceIDReply struct { - InstanceID omniledger.InstanceID + InstanceID byzcoin.InstanceID } -// StoreSigner writes an Signer from OmniLedger to a FinalStatement. +// StoreSigner writes an Signer from ByzCoin to a FinalStatement. type StoreSigner struct { PartyID []byte Signer darc.Signer @@ -220,7 +219,7 @@ type StoreSigner struct { type StoreSignerReply struct { } -// GetSigner requests an Signer from OmniLedger to a FinalStatement. +// GetSigner requests an Signer from ByzCoin to a FinalStatement. type GetSigner struct { PartyID []byte } @@ -268,10 +267,10 @@ type PopPartyInstance struct { FinalStatement *FinalStatement // Previous is the link to the instanceID of the previous party, it can be // nil for the first party. - Previous omniledger.InstanceID - // Next is a link to the omniledger instanceID of the next party. It can be + Previous byzcoin.InstanceID + // Next is a link to the instanceID of the next party. It can be // nil if there is no next party. - Next omniledger.InstanceID + Next byzcoin.InstanceID // Public key of service - can be nil. Service kyber.Point `protobuf:"opt"` } diff --git a/pop/service/service.go b/pop/service/service.go index 21d25d810d..62fe7c0b1b 100644 --- a/pop/service/service.go +++ b/pop/service/service.go @@ -32,11 +32,11 @@ import ( "time" "github.com/dedis/cothority" + "github.com/dedis/cothority/byzcoin" + "github.com/dedis/cothority/byzcoin/darc" "github.com/dedis/cothority/byzcoinx" "github.com/dedis/cothority/ftcosi/protocol" "github.com/dedis/cothority/messaging" - "github.com/dedis/cothority/omniledger/darc" - "github.com/dedis/cothority/omniledger/service" "github.com/dedis/kyber" "github.com/dedis/kyber/sign/schnorr" "github.com/dedis/kyber/suites" @@ -130,7 +130,7 @@ type saveData struct { // key of map is ID of party Finals map[string]*FinalStatement // InstanceIDs stores a map of partyID to InstanceID - InstanceIDs map[string]*service.InstanceID + InstanceIDs map[string]*byzcoin.InstanceID // Signers stores a map of partyID to Signer Signers map[string]*darc.Signer // The info used in merge process @@ -1158,7 +1158,7 @@ func newService(c *onet.Context) (onet.Service, error) { s.data.merges = make(map[string]*merge) } if len(s.data.InstanceIDs) == 0 { - s.data.InstanceIDs = map[string]*service.InstanceID{} + s.data.InstanceIDs = map[string]*byzcoin.InstanceID{} } if len(s.data.Signers) == 0 { s.data.Signers = map[string]*darc.Signer{} @@ -1186,7 +1186,7 @@ func newService(c *onet.Context) (onet.Service, error) { return nil, err } - service.RegisterContract(c, ContractPopParty, s.ContractPopParty) + byzcoin.RegisterContract(c, ContractPopParty, s.ContractPopParty) return s, nil } diff --git a/proto.awk b/proto.awk index 7a4389be6d..6eb87712cb 100644 --- a/proto.awk +++ b/proto.awk @@ -5,7 +5,7 @@ BEGIN { tr[ar"byte"]="bytes" tr["abstract.Point"]="bytes" tr["StateAction"]="int" - tr["omniledger.InstanceID"]="bytes" + tr["byzcoin.InstanceID"]="bytes" tr["Nonce"]="bytes" print "syntax = \"proto2\";" } diff --git a/stable/README.md b/stable/README.md index 8d881c8181..6d4c6f4f95 100644 --- a/stable/README.md +++ b/stable/README.md @@ -53,7 +53,8 @@ The source code for this stable branch is During 2018, we hope to bring you the following new pieces: - Evoting using a Neff shuffle -- Omniledger implementation using key/value pair storage and protected by darcs +- A distributed implementation using key/value pair storage and protected by darcs +- A cross-ledger atomic transaction coordinator - Cross platform mobile application to interact with the cisc and pop services - Onchain-secrets (Scarab) to hide secrets in plain sight on the public ledger!