Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ontio/ontology
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ontio/ontology
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: layer2
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 31 files changed
  • 2 contributors

Commits on Jul 30, 2020

  1. layer2 store and transfer (#1265)

    * add state tree
    
    * add state tree
    
    * add state tree
    
    * update block header
    
    * add state tree
    
    * add state tree
    
    * add state tree
    
    * merge layer2 code
    
    * merge layer2 code
    
    * merge layer2 code
    
    * fix state tree bug
    
    * fix state tree bug
    
    * for ontology
    
    * for ontology
    
    * for ontology
    
    * for ontology
    
    * update get proof interface
    
    * block generate:
    
    * update get proof interface
    
    * get state proof safety
    
    * get store proof safty
    
    * merge code
    
    * merge code
    
    * add layer2 mode & add license
    
    * update code after review
    
    * go fmt
    
    * go fmt
    
    * go fmt
    
    * go fmt
    
    * fix bug
    
    * fix test case
    
    * fix test case
    
    * move update state from execute block to submit block
    
    Co-authored-by: tangaoyuan <tangaoyuan@onchain.com>
    blockchain-develop and tangaoyuan authored Jul 30, 2020
    Configuration menu
    Copy the full SHA
    666f7ee View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. Configuration menu
    Copy the full SHA
    e0d0e1b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. make transaction compatible with ontology (#1272)

    * update layer tx
    
    * update package version
    
    * update package
    
    * remove ontology
    
    * remove system id in transaction
    
    * remove system id
    
    * remove system id
    
    * update
    
    * fix ut case
    
    * fix ut case
    
    * fix ut case
    
    * fmt
    
    * update signature
    
    * update
    
    * add hash for signature
    
    * fix ut case
    
    * update signature
    
    * aviod hard code
    blockchain-develop authored Aug 18, 2020
    Configuration menu
    Copy the full SHA
    a757384 View commit details
    Browse the repository at this point in the history
Loading