Code

misc: resolve conflict again#10011

Code

Merged

jennijuju merged 31 commits intofeat/eth-gateway-apifilecoin-project/lotus:feat/eth-gateway-apifrom jen/resolveconflictfilecoin-project/lotus:jen/resolveconflictCopy head branch name to clipboardJan 14, 2023

+152-246

Commits

Commits on Dec 15, 2022

• Update svg-file

  Show description for a8b406e
  rjan90

  committed
  a8b406e

  Copy full SHA for a8b406e

• Update svg-image

  Show description for 87e384e
  rjan90

  committed
  87e384e

  Copy full SHA for 87e384e

• Add snap-sector types

  Show description for bd28a4b
  rjan90

  committed
  bd28a4b

  Copy full SHA for bd28a4b

Commits on Dec 16, 2022

• call Stream.CloseWrite right after writing

  hanabi1224

  committed
  6ae7cda

  Copy full SHA for 6ae7cda

• chore: VM: don't export Extern::VerifyBlockSig

  arajasek

  committed
  28b4ebd

  Copy full SHA for 28b4ebd

Commits on Dec 19, 2022

• Revert "_build_ Set noexecstack on snapcraft builds"

  ianconsolata

  authored
  cfb4e62

  Copy full SHA for cfb4e62

Commits on Dec 25, 2022

• add renew max-sectors flag

  beck-8

  committed
  0f9d198

  Copy full SHA for 0f9d198

Commits on Jan 2, 2023

• fix: bench: remove unused env

  Show description for c6f6994
  rjan90

  committed
  c6f6994

  Copy full SHA for c6f6994

• Merge remote-tracking branch 'origin/master' into close-write

  hanabi1224

  committed
  83554af

  Copy full SHA for 83554af

Commits on Jan 3, 2023

• Merge pull request #9912 from filecoin-project/revert-9868-id/fix-snapcraft

  Show description for 19a88e2
  geoff-vball

  authored
  19a88e2

  Copy full SHA for 19a88e2

• Merge pull request #9884 from filecoin-project/fix/update-sealer-readme

  Show description for bc6afa9
  geoff-vball

  authored
  bc6afa9

  Copy full SHA for bc6afa9

• Merge pull request #9956 from filecoin-project/fix/remove-unused-env

  Show description for e8aa95c
  geoff-vball

  authored
  e8aa95c

  Copy full SHA for e8aa95c

Commits on Jan 4, 2023

• Merge pull request #9902 from filecoin-project/asr/restrict-verifblock

  Show description for d857057
  magik6k

  authored
  d857057

  Copy full SHA for d857057

• add check GetAddressedSectorsMax

  beck-8

  committed
  4f9119f

  Copy full SHA for 4f9119f

• make docsgen-cli

  beck-8

  committed
  f3b5c76

  Copy full SHA for f3b5c76

• fix: error checks

  hanabi1224

  committed
  6b14b05

  Copy full SHA for 6b14b05

• Merge remote-tracking branch 'origin/master' into close-write

  hanabi1224

  committed
  f4b4a63

  Copy full SHA for f4b4a63

• Merge pull request #9941 from beck-8/feat/add_renew_max_sectors

  Show description for 273184b
  magik6k

  authored
  273184b

  Copy full SHA for 273184b

• Merge pull request #9892 from hanabi1224/close-write

  Show description for 472eaaa
  magik6k

  authored
  472eaaa

  Copy full SHA for 472eaaa

• feat: ci: show gen diff more clearly in gen checks

  magik6k

  committed
  920d0c9

  Copy full SHA for 920d0c9

• make gen

  magik6k

  committed
  0881a01

  Copy full SHA for 0881a01

• This stat-set does not belong in core lotus

  ribasushi

  committed
  3de0063

  Copy full SHA for 3de0063

Commits on Jan 5, 2023

• Merge pull request #9962 from filecoin-project/feat/ci-gen-diff

  Show description for 37752d1
  magik6k

  authored
  37752d1

  Copy full SHA for 37752d1

• Merge pull request #9964 from ribasushi/chore/remove_obsolete_ribastat

  Show description for 048ccc7
  magik6k

  authored
  048ccc7

  Copy full SHA for 048ccc7

Commits on Jan 13, 2023

• address review

  magik6k

  committed
  574b684

  Copy full SHA for 574b684

• NV18: Filecoin EVM runtime + Actor Events + EthAccount + EAM + f4 addressing (#9998)

  Show description for cdf3812
  

  13 peopleauthored
  cdf3812

  Copy full SHA for cdf3812

• remove leftover hack.

  raulk

  committed
  e25728c

  Copy full SHA for e25728c

• feat: more ethaccount abstraction tests

  

  Aayush Rajasekaran

  authored and

  arajasek

  committed
  35a37ba

  Copy full SHA for 35a37ba

• Merge pull request #9957 from filecoin-project/asr/ethaccount-tests

  Show description for 2de9c43
  arajasek

  authored
  2de9c43

  Copy full SHA for 2de9c43

Commits on Jan 14, 2023

• Merge pull request #10004 from filecoin-project/raulk/remove-hack

  Show description for 0731fe2
  jennijuju

  authored
  0731fe2

  Copy full SHA for 0731fe2

• Merge branch 'release/v1.20.0' into jen/resolveconflict

  jennijuju

  committed
  427fbdb

  Copy full SHA for 427fbdb