Skip to content

Fix: class function TAccountComp.EqualOperationBlocks #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SkybuckFlying wants to merge 14 commits into from
Closed

Fix: class function TAccountComp.EqualOperationBlocks #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fc6dabe
Run ./CreatePascalCoinRepository.sh to create repo
SkybuckFlying Dec 1, 2021
aa6a452
Merge 'PascalCoin/master' into PascalCoinMaster
SkybuckFlying Dec 24, 2021
720f552
Newline fix for GIT on MSWindows Operating Systems
SkybuckFlying Dec 29, 2021
fbd5b89
Adding quotes to echos for shitty git-bash.
SkybuckFlying Jan 26, 2022
c73a74c
+CreateAdvancedRepository.sh for multi worktrees.
SkybuckFlying Jan 27, 2022
a7516e1
Quotes removed from CreatePascalCoinRepository.sh
SkybuckFlying Jan 27, 2022
863770a
+CreateSpacesToTabsFilter.sh
SkybuckFlying Jan 30, 2022
2a12a67
CreateSpacesToTabsFilter.sh improved
SkybuckFlying Jan 31, 2022
fb595cf
CreateSpacesToTabsFilter.sh improved.
SkybuckFlying Feb 1, 2022
8fc0cb8
+CreateAdvancedRepositoryTabbed.sh
SkybuckFlying Feb 2, 2022
fc5ec3e
Comments updated in CreateAdvancedRepository.sh
SkybuckFlying Feb 2, 2022
57cb380
CreateAdvancedRepository scripts updated.
SkybuckFlying Feb 2, 2022
3cc5a32
CreateAdv.Repo.Tabbed step 4 fixed for powershell.
SkybuckFlying Feb 2, 2022
1cd8cb3
Fix cls function TAccountComp.EqualOperationBlocks
SkybuckFlying Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions CreateAdvancedRepository.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
echo Skybuck Flying in the house ! =D
echo
echo Welcome, this script will create an advanced PascalCoin git repository for you in 14 steps !
echo The script can be run in bash, cmd or powershell.
echo To run in bash type: ./CreateAdvancedRepository.sh
echo make sure to use a dot and forward slash like so: ./
echo ./CreateAdvancedRepository.sh
echo
echo To run in cmd or powershell rename to CreateAdvancedRepository.bat
echo To rename type: ren CreateAdvancedRepository.sh CreateAdvancedRepository.bat
echo Now to run in cmd or powershell type: .\CreateAdvancedRepository.bat
echo make sure to use a dot and backward slash like so .\
echo .\CreateAdvancedRepository.bat
echo
echo The advantages of this advanced PascalCoin repository and script are as follows:
echo 1. All local branches are re-created.
echo 2. Multiple worktrees/folders are created to work with multiple pascal coin versions at the same time.
echo 3. Remotes will be restored to fetch, pull, push as normal to remote repository.
echo 4. Mirror will be disabled after clone is done.
echo 5. Automatic line ending conversions for CR=Carrier Return and LF=Line Feed.
echo 5.0 Git stores line endings internally as LF, on windows line endings are CRLF.
echo 5.1 Line endings LF to CRLF on checkouts/switches
echo 5.2 Line endings CRLF to LF on checkins/commits
echo
echo Lets get started:
echo
echo Step 1 clone mirror your fork, this HTTPS URL must be editted by you.
git clone --mirror https://github.com/SkybuckFlying/PascalCoin.git

echo Step 2 change to the PascalCoin.git bare repository folder.
cd PascalCoin.git

echo Step 3 configure line endings for Microsoft Windows Operating Systems
echo Step 3 convert CRLF to LF on commit and convert LF to CRLF on checkouts
git config --global core.autocrlf true

echo Step 4 restore remotes
git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*

echo Step 5 disable mirror
git config remote.origin.mirror false

echo Step 6 fetch all remotes
git fetch --all

echo Step 7 add remote to PascalCoinDev
git remote add PascalCoinDev https://github.com/PascalCoinDev/PascalCoin.git

echo Step 8 add remote to PascalCoin
git remote add PascalCoin https://github.com/PascalCoin/PascalCoin.git

echo Step 9 fetch PascalCoinDev repository
git fetch PascalCoinDev

echo Step 10 fetch PascalCoin repository
git fetch PascalCoin

echo Step 11 create local PascalCoinDevMaster branch for remote PascalCoinDev/master branch
git branch PascalCoinDevMaster PascalCoinDev/master

echo Step 12 create local PascalCoinMaster branch for remote PascalCoin/master branch
git branch PascalCoinMaster PascalCoin/master

echo Step 13 add a worktree for local PascalCoinDevMaster branch
git worktree add ../PascalCoinDev PascalCoinDevMaster

echo Step 14 add a worktree for PascalCoin master branch
git worktree add ../PascalCoin PascalCoinMaster

echo Step 15 is an optional manual step for you to perform:
echo Step 15 my SkybuckFlying repository does not have a default master branch but yours might...
echo Step 15 to add a worktree called Origin for your origin/master type the following two commands:
echo cd PascalCoin.git
echo git worktree add ../Origin master











117 changes: 117 additions & 0 deletions CreateAdvancedRepositoryTabbed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
echo Skybuck Flying in the house ! =D
echo
echo Tabbed version of CreateAdvancedRepository.sh
echo
echo Welcome, this script will create an advanced PascalCoin git repository for you in 16 steps !
echo The script can be run in bash, cmd or powershell.
echo To run in bash type: ./CreateAdvancedRepositoryTabbed.sh
echo make sure to use a dot and forward slash like so: ./
echo ./CreateAdvancedRepositoryTabbed.sh
echo
echo To run in cmd or powershell rename to CreateAdvancedRepositoryTabbed.bat
echo To rename type: ren CreateAdvancedRepo.sh CreateAdvancedRepositoryTabbed.bat
echo Now to run in cmd or powershell type: .\CreateAdvancedRepositoryTabbed.bat
echo make sure to use a dot and backward slash like so .\
echo .\CreateAdvancedRepositoryTabbed.bat
echo
echo The advantages of this advanced PascalCoin repository and script are as follows:
echo 1. All local branches are re-created.
echo 2. Multiple worktrees/folders are created to work with multiple pascal coin versions at the same time.
echo 3. Remotes will be restored to fetch, pull, push as normal to remote repository.
echo 4. Mirror will be disabled after clone is done.
echo 5. Automatic line ending conversions for CR=Carrier Return and LF=Line Feed.
echo 5.0 Git stores line endings internally as LF, on windows line endings are CRLF.
echo 5.1. Line endings LF to CRLF on checkouts/switches
echo 5.2. Line endings CRLF to LF on checkins/commits
echo 6. Automatic conversion of spaces to tabs and tabs to spaces.
echo 6.1 Two space characters are converted to one tab character on checkouts/switches.
echo 6.2 One tab character is converted to two space characters on checkins/commits.
echo
echo For advantage 6 it will be necessary to install GNU Win32 CoreUtils
echo GNUCoreUtils can be downloaded from these links:
echo http://gnuwin32.sourceforge.net/packages.html
echo which can also be found here
echo http://gnuwin32.sourceforge.net/packages/coreutils.htm
echo copy/rename GnuWin32/bin/expand.exe to GnuWin32/bin/CoreUtilsExpand.exe
echo copy/rename GnuWin32/bin/unexpand.exe to GnuWin32/bin/CoreUtilsUnExpand.exe
echo then add core utils install path/GnuWin32/Bin to OS/System path environment variable
echo After installation restart the command prompt/bash/powershell to benefit from updated path environment variable.
echo
echo Lets get started:
echo
echo Step 1 clone mirror your fork, this HTTPS URL must be editted by you.
git clone --mirror https://github.com/SkybuckFlying/PascalCoin.git

echo Step 2 change to the PascalCoin.git bare repository folder.
cd PascalCoin.git

echo Step 3 add filter attributes
echo *.pas filter=tabspace2 > info/attributes
echo *.dpr filter=tabspace2 >> info/attributes
echo *.dpk filter=tabspace2 >> info/attributes
echo *.inc filter=tabspace2 >> info/attributes
echo *.dfm filter=tabspace2 >> info/attributes
echo *.xfm filter=tabspace2 >> info/attributes
echo *.fmx filter=tabspace2 >> info/attributes
echo *.lfm filter=tabspace2 >> info/attributes
echo *.nfm filter=tabspace2 >> info/attributes
echo *.dpkw filter=tabspace2 >> info/attributes

echo Step 4 add local repository smudging and cleaning
echo For this to work install GNUCoreUtils first and
echo rename or copy expand.exe to CoreUtilsExpand.exe
echo rename or copy unexpand.exe to CoreUtilsUnExpand.exe
echo and add their location to the system path environment
echo rename is necessary to avoid name space conflict with Microsofts expand.exe
echo if GNUCoreUtils is installed later then branches/worktrees and such will
echo have to be re-checked-out to have any effect.
echo GNUCoreUtils can be downloaded from these links:
echo http://gnuwin32.sourceforge.net/packages.html
echo and here:
echo http://gnuwin32.sourceforge.net/packages/coreutils.htm
echo After installation restart the command prompt/bash/powershell to benefit from updated path environment variable.
git config filter.tabspace2.clean "CoreUtilsExpand --tabs=2 --initial"
git config filter.tabspace2.smudge "CoreUtilsUnExpand --tabs=2 --first-only"

echo Step 5 configure line endings for Microsoft Windows Operating Systems
echo Step 5 convert CRLF to LF on commit and convert LF to CRLF on checkouts
git config --global core.autocrlf true

echo Step 6 restore remotes
git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*

echo Step 7 disable mirror
git config remote.origin.mirror false

echo Step 8 fetch all remotes
git fetch --all

echo Step 9 add remote to PascalCoinDev
git remote add PascalCoinDev https://github.com/PascalCoinDev/PascalCoin.git

echo Step 10 add remote to PascalCoin
git remote add PascalCoin https://github.com/PascalCoin/PascalCoin.git

echo Step 11 fetch PascalCoinDev repository
git fetch PascalCoinDev

echo Step 12 fetch PascalCoin repository
git fetch PascalCoin

echo Step 13 create local PascalCoinDevMaster branch for remote PascalCoinDev/master branch
git branch PascalCoinDevMaster PascalCoinDev/master

echo Step 14 create local PascalCoinMaster branch for remote PascalCoin/master branch
git branch PascalCoinMaster PascalCoin/master

echo Step 15 add a worktree for local PascalCoinDevMaster branch
git worktree add ../PascalCoinDev PascalCoinDevMaster

echo Step 16 add a worktree for PascalCoin master branch
git worktree add ../PascalCoin PascalCoinMaster

echo Step 17 is an optional manual step for you to perform:
echo Step 17 my SkybuckFlying repository does not have a default master branch but yours might...
echo Step 17 to add a worktree called Origin for your origin/master type the following two commands:
echo cd PascalCoin.git
echo git worktree add ../Origin master
39 changes: 39 additions & 0 deletions CreatePascalCoinRepository.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
echo Skybuck Flying here !
echo
echo Welcome, this batchfile will create a usuable PascalCoin repository for you.
echo
echo Step 1 clone your fork, this must be editted by you
git clone https://github.com/SkybuckFlying/PascalCoin.git

echo Step 2 change to the PascalCoin folder
cd PascalCoin

echo Step 3 add remote to PascalCoinDev
git remote add PascalCoinDev https://github.com/PascalCoinDev/PascalCoin.git

echo Step 4 add remote to PascalCoin
git remote add PascalCoin https://github.com/PascalCoin/PascalCoin.git

echo Step 5 fetch PascalCoinDev repository
git fetch PascalCoinDev

echo Step 6 fetch PascalCoin repository
git fetch PascalCoin

echo Step 7 create local branch for PascalCoinDev/master
git checkout PascalCoinDev/master -b PascalCoinDevMaster

echo Step 8 create local branch for PascalCoin/master
git checkout PascalCoin/master -b PascalCoinMaster

echo Step 9 configure line endings for Microsoft Windows Operating Systems
echo Step 9 convert CRLF to LF on commit and convert LF to CRLF on checkouts
git config --global core.autocrlf true








54 changes: 54 additions & 0 deletions CreateSpacesToTabsFilter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
echo Skybuck Flying Here !
echo
echo This script create a filter for this git repository
echo
echo 1. To turn two spaces into one tab on checkout
echo 2. To turn one tab into two spaces on commits
echo
echo For the following Pascal/Delphi file extensions:
echo
echo pas dpr dpk inc dfm xfm fmx lfm nfm dpkw
echo
echo This script requires GnuWin32 CoreUtils package to be installed.
echo
echo Which can be found here:
echo http://gnuwin32.sourceforge.net/packages.html
echo and here:
echo http://gnuwin32.sourceforge.net/packages/coreutils.htm
echo
echo Recommend to install it to C:/Tools/GnuWin32
echo Rename expand.exe to CoreUtilsExpand.exe
echo Rename unexpand.exe to CoreUtilsUnExpand.exe
echo
echo In case the config commands had no effect on C:\Tools\Git\Etc\gitconfig
echo then add these three lines manually to the global gitconfig file in \etc:
echo
echo [filter "tabspace2"]
echo clean = expand --tabs=2 --initial
echo smudge = unexpand --tabs=2 --first-only
echo
echo After installation its bin folder needs to be on the path environment
echo So that expand.exe and unexpand.exe can be found and executed.
echo
echo To run this script type: ./CreateSpacesToTabsFilter.sh
echo
echo Run it on the main folder containing the subfolder .git
echo
git config --global filter.tabspace2.clean 'CoreUtilsExpand --tabs=2 --initial'
git config --global filter.tabspace2.smudge 'CoreUtilsUnExpand --tabs=2 --first-only'
git config filter.tabspace2.clean 'CoreUtilsExpand --tabs=2 --initial'
git config filter.tabspace2.smudge 'CoreUtilsUnExpand --tabs=2 --first-only'
md .git
md .git/info
mkdir .git
mkdir .git/info
echo *.pas filter=tabspace2 > .git/info/attributes
echo *.dpr filter=tabspace2 >> .git/info/attributes
echo *.dpk filter=tabspace2 >> .git/info/attributes
echo *.inc filter=tabspace2 >> .git/info/attributes
echo *.dfm filter=tabspace2 >> .git/info/attributes
echo *.xfm filter=tabspace2 >> .git/info/attributes
echo *.fmx filter=tabspace2 >> .git/info/attributes
echo *.lfm filter=tabspace2 >> .git/info/attributes
echo *.nfm filter=tabspace2 >> .git/info/attributes
echo *.dpkw filter=tabspace2 >> .git/info/attributes
2 changes: 1 addition & 1 deletion src/core/UAccounts.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ class function TAccountComp.EqualAccounts(const account1, account2: TAccount): B

class function TAccountComp.EqualOperationBlocks(const opBlock1, opBlock2: TOperationBlock): Boolean;
begin
Result := (opBlock1.block = opBlock1.block)
Result := (opBlock1.block = opBlock2.block)
And (EqualAccountKeys(opBlock1.account_key,opBlock2.account_key))
And (opBlock1.reward = opBlock2.reward)
And (opBlock1.fee = opBlock2.fee)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/synapse/synautil.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,8 +1843,8 @@ function GetTempFile(const Dir, prefix: String): String;
if Dir = '' then
begin
SetLength(Path, MAX_PATH);
x := GetTempPath(Length(Path), PChar(Path));
SetLength(Path, x);
x := GetTempPath(Length(Path), PChar(Path));
SetLength(Path, x);
end
else
Path := Dir;
Expand Down