Code

Merge master in to develop#1085

Code

Merged

kronosapiens merged 22 commits intodevelopJoinColony/colonyNetwork:developfrom develop-copyJoinColony/colonyNetwork:develop-copyCopy head branch name to clipboardAug 30, 2022

+2,361-79

Commits

Commits on Jan 17, 2022

• First pass at delegated mining

  area

  committed
  1912824

• Fix build

  area

  committed
  7535456

• Update smoke tests, fix griefing possibility

  area

  committed
  80d3631

• Update function comments, param names

  area

  committed
  3a0efb3

• Update test helpers

  area

  committed
  2e8f89d

• Update tests for new restriction on confirmNewHash

  area

  committed
  4de37fb

• Move tx for confirmNewHash in to Miner

  area

  committed
  586308a

Commits on Jan 20, 2022

• Changes following review

  area

  committed
  b7359e7

Commits on Feb 2, 2022

• Changes following review

  area

  committed
  1d8b861

• Merge pull request #1011 from JoinColony/feat/delegated-mining

  Show description for e6b4f92
  kronosapiens

  authored
  e6b4f92

Commits on Feb 3, 2022

• Use mining stake not obligation where appropriate

  area

  committed
  b0a5402

Commits on Feb 4, 2022

• Deduct mining stake on punishment

  area

  committed
  1f4d6d9

Commits on Feb 5, 2022

• Merge pull request #1016 from JoinColony/fix/mining-stake-not-obligation

  Show description for 7c8bbae
  kronosapiens

  authored
  7c8bbae

Commits on Aug 22, 2022

• First pass at storage layout fixes

  area

  committed
  479c0e8

• First pass at function to recover funds staked in misaligned motions

  area

  committed
  585012e

Commits on Aug 24, 2022

• Add a first test for ghost motion stake reclaiming

  area

  committed
  b783f21

Commits on Aug 25, 2022

• Add upgrade tests to coverage

  area

  committed
  c236334

Commits on Aug 26, 2022

• Changes from review

  area

  committed
  189ed1c

• Add test to check metatransaction nonce value

  area

  committed
  87509ce

• Merge branch 'maint/recover-misalignment-locked-funds' into master-copy

  area

  committed
  262cbc0

Commits on Aug 30, 2022

• Merge pull request #1084 from JoinColony/master-copy

  Show description for f861050
  area

  authored
  f861050

• Merge branch 'master' into develop-copy

  area

  committed
  db14ac3