Code

merge#1

Code

Merged

bitcrab merged 174 commits intobitcrab:masterbitcrab/bsips:masterfrom bitshares:masterbitshares/bsips:masterCopy head branch name to clipboardJan 14, 2019

+1,434-4

Commits

Commits on Jul 25, 2018

• Custom active permissions

  

  Stefan Schießl

  authored
  15fbf7f

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  7a13f4d

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  aed7556

• Update bsip-0040.md

  xeroc

  authored
  e928c44

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  e8fabfd

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  5ebcbb6

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  a825307

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  239b7a2

• Update README.md

  

  Stefan Schießl

  authored
  28f96ba

Commits on Jul 27, 2018

• Comments from pmconrad

  

  Stefan Schießl

  authored
  10fa5ad

• add more detailed asserts description and milestones

  

  Stefan Schießl

  authored
  815a50c

• include more assert descrption and lisght rewriting

  

  Stefan Schießl

  authored
  8591695

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  824549e

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  71e57c5

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  54d0ee6

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  1083311

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  189ceec

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  cb79a4f

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  e6cc5f1

Commits on Jul 28, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  75faa36

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  5b5e550

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  7ae9f94

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  55aa5b0

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  ef397f0

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  bcfa32f

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  5da66a4

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  6c64b50

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  8207e24

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  e2d9022

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  fccca20

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  2bcc40a

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  4349e8d

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  2051ff3

Commits on Jul 29, 2018

• remove length, add price as explicit allowed conversion

  

  Stefan Schießl

  authored
  6df4a38

• remove contains only, and add attibute_assert

  

  Stefan Schießl

  authored
  ba625b1

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  1d4aa42

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  523ed86

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  07b6fa0

• attribute assert nesting

  

  Stefan Schießl

  authored
  ab5500d

• add economics

  

  Stefan Schießl

  authored
  0e8e9ad

Commits on Jul 30, 2018

• add wording and defition of match for authority

  

  Stefan Schießl

  authored
  e145ede

• change dict to tuple

  

  Stefan Schießl

  authored
  d5e6f75

• more details on attribute_assert and where permission is stored

  

  Stefan Schießl

  authored
  15a0514

• consistent use of "list of"

  

  Stefan Schießl

  authored
  d77a526

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  6c7a90a

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  41a2403

• add logical assert

  

  Stefan Schießl

  authored
  cf72eaa

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  f0d16bb

• Include either or example

  

  Stefan Schießl

  authored
  63f6ddc

• fix formatting of new example

  

  Stefan Schießl

  authored
  b7282a5

• include milestone differentation

  

  Stefan Schießl

  authored
  9b07069

• clarify milestone procedure

  

  Stefan Schießl

  authored
  12355d6

• moved examples out of specifications

  

  Stefan Schießl

  authored
  2222cea

• moving around

  

  Stefan Schießl

  authored
  b1864f8

• more cleaning up

  

  Stefan Schießl

  authored
  03f24f0

Commits on Aug 2, 2018

• change typos

  

  Stefan Schießl

  authored
  8dce372

• clarify month call

  

  Stefan Schießl

  authored
  34d0086

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  651e00c

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  8893727

• add enabled flag

  

  Stefan Schießl

  authored
  5d92967

Commits on Aug 3, 2018

• include new comments

  

  Stefan Schießl

  authored
  b8f2691

• more detail for Example: Simple transfer

  

  Stefan Schießl

  authored
  871b93d

• calrify child operations of proposals

  

  Stefan Schießl

  authored
  d036c8c

• add reviewers

  

  Stefan Schießl

  authored
  ecf22d4

• updated Outline of handling incoming transactions

  

  Stefan Schießl

  authored
  7d1468e

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  d9466f2

Commits on Aug 5, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  5ddc6cd

Commits on Aug 7, 2018

• proposals can be created by anyone

  

  Stefan Schießl

  authored
  40b7ae4

• include multi-sig example

  

  Stefan Schießl

  authored
  552b5c4

Commits on Aug 8, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  6a00164

Commits on Aug 9, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  5dcf316

• update economics

  

  Stefan Schießl

  authored
  3ac2159

• add length and eq to number comparison

  

  Stefan Schießl

  authored
  f1f9755

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  0919eae

• add contains, not_contains

  

  Stefan Schießl

  authored
  78100ed

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  a1ce8ab

Commits on Aug 10, 2018

• add neq

  

  Stefan Schießl

  authored
  e9c8e9b

• Clarify duration

  

  Stefan Schießl

  authored
  f9c2df5

• If beneficial for performance or complexity sections

  

  Stefan Schießl

  authored
  bd2af37

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  0c43bfd

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  0f2a433

• add remaining_executions

  

  Stefan Schießl

  authored
  982348c

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  64338a4

• Milestone 4 in separate section

  

  Stefan Schießl

  authored
  02bb9e5

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  1d0a341

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  e749319

Commits on Aug 12, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  51d46da

Commits on Aug 13, 2018

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  b560291

• Update bsip-0040.md

  

  Stefan Schießl

  authored
  b0dfaa5

Commits on Aug 16, 2018

• Merge pull request #86 from sschiessl-bcp/patch-1

  Show description for 81efae4
  xeroc

  authored
  81efae4

Commits on Aug 21, 2018

• BSIP41: Reduce MSSR of bitCNY from 1.1 to 1.05

  abitmore

  committed
  92ec7de

• Update format

  abitmore

  committed
  438b5ed

• Fix typo

  abitmore

  authored
  21b7f0f

Commits on Aug 22, 2018

• BSIP 42: dynamically adjust price feed

  abitmore

  committed
  611883a

• More discussions

  abitmore

  committed
  b4cb8ea

• Added description about limits

  abitmore

  committed
  de42ecc

• Merge pull request #99 from bitshares/bsip42-price-feed-feedback

  Show description for f2b9277
  abitmore

  authored
  f2b9277

• Fixed numbering in readme

  abitmore

  authored
  faf36ed

• Merge branch 'master' into bsip41-mssr-change

  abitmore

  committed
  0782d02

• Hashed Time-Lock Contract

  ryanRfox

  committed
  dca7c12

• Fixup: header

  ryanRfox

  committed
  58eff4b

Commits on Aug 23, 2018

• Fixup: HTLC

  ryanRfox

  committed
  85faf7d

• Update workers

  abitmore

  authored
  c3588c8

Commits on Aug 26, 2018

• Fixup: Specification

  ryanRfox

  committed
  dc97097

Commits on Aug 27, 2018

• Added which worker is pro and which is con

  abitmore

  authored
  e2649be

• BSIP 42: added one more discussion link

  abitmore

  authored
  377cac0

• BSIP 42: updated worker to workers

  abitmore

  authored
  a650325

• Merge pull request #101 from bitshares/abitmore-patch-1

  Show description for bbe7318
  abitmore

  authored
  bbe7318

Commits on Aug 28, 2018

• BSIP44: Hashed Timelock Contracts

  ryanRfox

  committed
  a1d16d3

Commits on Aug 29, 2018

• Completion of this BSIP from a formal standpoint and inclustion of a clear accepted/rejected state

  

  Stefan Schießl

  authored
  c297190

• bsip#43 Market fee sharing

  OpenLedgerApp

  committed
  d673e66

• add bitcrabs comment

  

  Stefan Schießl

  authored
  b2dca44

• Fixup: Specifications

  ryanRfox

  committed
  1961fb9

Commits on Aug 30, 2018

• Change: Secured Assets, Fixup: Specification

  ryanRfox

  committed
  9f36ae2

Commits on Aug 31, 2018

• Fixup: HTLC Object

  ryanRfox

  committed
  492851e

Commits on Sep 6, 2018

• Fixup: API and Operations

  ryanRfox

  committed
  d14fad5

Commits on Sep 7, 2018

• Merge pull request #105 from sschiessl-bcp/patch-2

  Show description for 2520e8d
  abitmore

  authored
  2520e8d

Commits on Sep 20, 2018

• Added summary for tokenholders

  jmjatlanta

  committed
  5f64cb0

Commits on Sep 21, 2018

• Refine Summary for Tokenholders

  ryanRfox

  authored
  3d4383b

Commits on Sep 28, 2018

• Edits based on comments

  Show description for ed2ff08
  jmjatlanta

  authored
  ed2ff08

• Fixed method name for consistency

  jmjatlanta

  authored
  79b7340

Commits on Oct 5, 2018

• Updated according to the discussions with community members

  

  Denis Sokolov

  authored and

  Denis Sokolov

  committed
  d84c734

Commits on Oct 7, 2018

• Create bsip 45

  grctest

  authored
  6aa3df5

• bsip 45 added to readme

  grctest

  authored
  c454764

• Fixed formatting

  grctest

  authored
  2a4c2b7

Commits on Oct 8, 2018

• Update bsip-0045.md

  grctest

  authored
  f03f4ce

Commits on Oct 10, 2018

• License change

  Show description for ee9ec4c
  grctest

  committed
  ee9ec4c

• Merge pull request #110 from BTS-CM/master

  Show description for 3c5f73e
  pmconrad

  authored
  3c5f73e

Commits on Oct 12, 2018

• Merge branch 'master' into bsip-hashed-timelock-contract

  jmjatlanta

  authored
  1e02050

• Merge branch 'master' into bsip43-market-fee-sharing

  OpenLedgerApp

  authored
  a0b9dc4

• Merge pull request #104 from bitshares/bsip-hashed-timelock-contract

  Show description for c8775c5
  jmjatlanta

  authored
  c8775c5

• grammar fixes

  jmjatlanta

  committed
  6dda715

Commits on Oct 15, 2018

• Merge branch 'master' into bsip43-market-fee-sharing

  OpenLedgerApp

  authored
  7bcffbd

• Added some parameter limits

  jmjatlanta

  committed
  6efbbc2

• Re-added committee parameters

  jmjatlanta

  committed
  57f21fa

Commits on Oct 19, 2018

• rewards issue

  OpenLedgerApp

  committed
  b9a2774

Commits on Oct 22, 2018

• updated wording

  OpenLedgerApp

  committed
  298a9a9

Commits on Oct 24, 2018

• Merge pull request #107 from openledger/bsip43-market-fee-sharing

  Show description for 440f16a
  ryanRfox

  authored
  440f16a

Commits on Oct 26, 2018

• update bsip40 status

  

  Stefan Schießl

  authored
  f79cc75

• Update: Available BSIPs Table

  ryanRfox

  committed
  47ef860

Commits on Oct 29, 2018

• Update 40 w M1

  ryanRfox

  committed
  203f66f

• readme status to accepteed

  

  Stefan Schießl

  authored
  71427c9

Commits on Oct 30, 2018

• rollback

  

  Stefan Schießl

  authored
  7adf9b0

Commits on Nov 1, 2018

• Fixup: Typo

  ryanRfox

  committed
  8b8cf94

• Merge pull request #117 from sschiessl-bcp/patch-3

  Show description for 78b6be2
  pmconrad

  authored
  78b6be2

• Merge pull request #118 from bitshares/update-readme

  Show description for d30cb1c
  pmconrad

  authored
  d30cb1c

Commits on Nov 5, 2018

• add bsip 56

  Show description for f715234
  

  Stefan Schiessl

  committed
  f715234

• add voting power

  

  Stefan Schießl

  authored
  6353078

Commits on Nov 7, 2018

• add recent review

  

  Stefan Schießl

  authored
  d48529e

• add discussion

  

  Stefan Schießl

  authored
  d67bbbd

• added new reviews

  

  Stefan Schießl

  authored
  7ac7c55

Commits on Nov 8, 2018

• add pull request link

  oxarbitrage

  authored
  185d4b3

• Merge pull request #121 from bitshares/oxarbitrage-patch-1

  Show description for 4da6cf3
  pmconrad

  authored
  4da6cf3

• add newline to link

  Show description for c4bd215
  oxarbitrage

  authored
  c4bd215

• fix settlement delta description

  

  Stefan Schießl

  authored
  a1a348c

• Merge pull request #122 from bitshares/oxarbitrage-patch-1

  Show description for c4dfb02
  pmconrad

  authored
  c4dfb02

Commits on Nov 12, 2018

• move asset_id into settlement

  

  Stefan Schießl

  authored
  5dd4dfc

• honor black- and whitelist for existing vesting balance

  

  Stefan Schießl

  authored
  0bf770a

Commits on Nov 14, 2018

• adjust summary

  

  Stefan Schießl

  authored
  74c41bc

• Update bsip-0056.md

  

  Stefan Schießl

  authored
  c588d74

Commits on Dec 5, 2018

• update according to Michel's comments

  

  Stefan Schießl

  authored
  f8b906c

Commits on Dec 18, 2018

• Merge branch 'master' into bsip41-mssr-change

  xeroc

  authored
  0934b4c

• Minor markdown fixes

  xeroc

  committed
  c245a4c

• Merge pull request #98 from bitshares/bsip41-mssr-change

  Show description for 03a9488
  xeroc

  authored
  03a9488

Commits on Jan 3, 2019

• Updated to match implementation more closely

  jmjatlanta

  committed
  bb00710

Commits on Jan 4, 2019

• update numbers

  

  Stefan Schießl

  authored
  1e9ad32

• add to readme

  

  Stefan Schießl

  authored
  3407fea

• Rename bsip-0056.md to bsip-0057.md

  

  Stefan Schießl

  authored
  dea23b6

• Merge branch 'master' into 56_Managed_Vesting_Policies

  

  Stefan Schießl

  authored
  26426a9

Commits on Jan 7, 2019

• Merge pull request #119 from blockchainprojects/56_Managed_Vesting_Policies

  Show description for 04a80cc
  xeroc

  authored
  04a80cc

• punctuation fixes and clarifications

  jmjatlanta

  committed
  cf4206d

• added comments about htlc_hash algos

  jmjatlanta

  committed
  9664001

• better spacing in comments

  jmjatlanta

  committed
  6f72b4b

Commits on Jan 8, 2019

• Merge pull request #112 from bitshares/44_adjustments

  Show description for a225d63
  ryanRfox

  authored
  a225d63