Skip to content

Ithaca2

Fedor Sheremetyev requested to merge ithaca2 into master

Context

New snapshot of Ithaca protocol (replacing !4078 (merged)) that includes fix from !4181 (merged).

Created using the following commands.

  1. Snapshot new protocol and copy to a temporary folder.
$ git checkout 9b756fa0069483b04a93de2e7b6ca7bb30678a7a # head of proto-i branch 
$ ./scripts/snapshot_alpha.sh ithaca_012
$ cp -r src/proto_012_Psithaca /tmp/proto_012_Psithaca
$ git checkout .
$ git clean -fd
  1. Rename protocol to match new hash.
$ git checkout master
$ git checkout -b ithaca2
$ git mv src/proto_012_PsiThaCa src/proto_012_Psithaca
$ for f in $(find . -name '*PsiThaCa*'); do mv $f ${f/PsiThaCa/Psithaca}; done

$ git add --all
$ git commit -m "Proto: rename protocol"
  1. Update protocol hash everywhere.
$ grep -r PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP . | grep -v './.git/' | cut -f1 -d: | xargs sed -i s/PsiThaCaT47Zboaw71QWScM8sXeMM7bbQFncK9FLqYc6EKdpjVP/Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A/g
$ grep -r PsiThaCa . | grep -v './.git/' | cut -f1 -d: | sort -u | xargs sed -i s/PsiThaCa/Psithaca/g

$ git add --all
$ git commit -m "Everywhere: update protocol hash"
  1. Replace lib_protocol code (not touching other folders - to not lose patches applied on master since Ithaca snapshot).
$ rm src/proto_012_Psithaca/lib_protocol/*
$ cp /tmp/proto_012_Psithaca/lib_protocol/* src/proto_012_Psithaca/lib_protocol/
$ cp /tmp/proto_012_Psithaca/lib_protocol/test/* src/proto_012_Psithaca/lib_protocol/test/
$ git checkout  src/proto_012_Psithaca/lib_protocol/dune

$ git add --all
$ git commit -m "Proto: update protocol code"
  1. Backport changes to folders outside lib_protocol separately (to preserve other changes done on master).
$ git show 01fa37d7fe928a548009e468a18de26abdd7bf5a | sed 's#src/proto_alpha#src/proto_012_Psithaca#g' | patch -p1
$ git commit -am "Proto/Client: backport changes from !4182"

$ git show 8cee92435832a7904129126e67eaf2990f476b59 -- src/proto_alpha/lib_client | sed 's#src/proto_alpha#src/proto_012_Psithaca#g' | patch -p1
$ git commit -am "Proto/Client: backport changes from !4181"

Manually testing the MR

Please follow instructions in !4056 (merged), replacing hash in the patch for src/bin_node/node_config_file.ml with new value: Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A.

Edited by Fedor Sheremetyev

Merge request reports

Loading