Skip to content
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.

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

Upgrade to Platform SDK 0.7.0-beta.1, add payer records to state for deterministic duplicate classification #397

Merged
merged 46 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
94cc058
Misc EET enhancements
Jul 21, 2020
943c79c
Remove some now-absent, once-deprecated methods in FastCopyable
Jul 21, 2020
a3b0c56
Increase coverage
Jul 21, 2020
a277874
Initial ExpiryManager
Jul 22, 2020
199df7a
Complete ExpiryManager
Jul 23, 2020
c8e639d
Skip CI for now
Jul 23, 2020
37dedeb
Switch to EntityCreator in FeePayingHistorian
Jul 24, 2020
838f08e
75% done with RecordCache rewrite
Jul 24, 2020
6015f53
Intermediate
Jul 25, 2020
7f3c856
Unit tests passing again
Jul 25, 2020
11200f1
Before extending ExpirableTxnRecord with submittingMember
Jul 26, 2020
d801995
Unit tests passing again
Jul 26, 2020
a611483
Reenable CI
Jul 26, 2020
9764090
Update ethj staging repo
Jul 26, 2020
2c4bd30
Merge remote-tracking branch 'origin/master' into 0348-M-Keep3minPaye…
Jul 26, 2020
aeb48fa
Only stage payer records
Jul 26, 2020
09b260b
Initial commit
Jul 29, 2020
9a7f95e
Disable CI for now
Jul 29, 2020
ecbdfe4
Isolate (most) "bootstrap" (that is, static+global) properties to avo…
Jul 29, 2020
9d868cd
Checkpoint before switching Bootstrap to StaticGlobal
Jul 30, 2020
189e23c
Finish BackedSystemAccountsCreator
Jul 31, 2020
eda90d3
Before cleanup
Aug 1, 2020
036f2f2
Re-enable CI after cleanup
Aug 2, 2020
bf3dbf2
Fix unit test
Aug 2, 2020
6c54e0f
Add test resources
Aug 2, 2020
6d132ef
Explicit xfer list construction
Aug 2, 2020
cd660fe
Cleanup before additional optimizations
Aug 4, 2020
7b41753
Minimize performance impact of debug logs; reuse recordSoFar
Aug 4, 2020
6e5316e
Rerun CI with new usage estimator lookup
Aug 4, 2020
284673b
Use lookup for transition logic
Aug 4, 2020
2b15ddb
Compile with 0.7.0-beta.1
Aug 5, 2020
e6233e2
Initial CI run with 0.7.0-beta.1
Aug 5, 2020
d1361c3
Use BackingAccounts to look up crypto keys during sig verification
Aug 6, 2020
18cac5a
Fix typo in bootstrap property name
Aug 6, 2020
e9b1d97
Merge remote-tracking branch 'origin/master' into tmp-merge
Aug 6, 2020
f7dc786
Resolve merge conflicts
Aug 6, 2020
2c97948
Use new settings names in hedera-node/configuration/dev
Aug 6, 2020
f39b387
Allow override of default node in ValidationScenarios
Aug 6, 2020
213e0d7
Add copyrights
Aug 6, 2020
8bfaf21
Merge remote-tracking branch 'origin/master' into tmp-merge
Aug 6, 2020
73402f4
Resolve midnight rates dynamically
Aug 7, 2020
432683e
Enabled nightly regression run for sdk070 branch.
ljianghedera Aug 7, 2020
95ebef9
Accomodate for Platform calling copy on an uninitialized ServicesState
Aug 7, 2020
bbe106a
Merge branch '0347-M-UpgradeToSdk070beta1' of github.com:hashgraph/he…
ljianghedera Aug 7, 2020
4167eb3
Add licenses
Aug 7, 2020
565e1d2
Merge branch '0347-M-UpgradeToSdk070beta1' of github.com:hashgraph/he…
Aug 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1049,14 +1049,14 @@ workflows:
- attach_workspace:
at: /

nightly-regression:
nightly-regression-for-sdk070:
triggers:
- schedule:
cron: "0 5,9,13 * * *"
cron: "0 16,21 * * *"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When merging, this changes need to be restored to original.

filters:
branches:
only:
- master
- 0347-M-UpgradeToSdk070beta1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here

jobs:
- fast-build-artifact:
context: Slack
Expand Down Expand Up @@ -1356,6 +1356,7 @@ workflows:
ignore:
- /.*-PERF/
- /.*-REGRESSION/
- 0347-M-UpgradeToSdk070beta1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here.

workflow-name: "Continuous integration"
- start-singlejob-testnet:
context: Slack
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ hs_err_pid*
.mvn/wrapper/maven-wrapper.jar

*.sh
!hapi-proto/add-copyright.sh
!hapi-proto/gen-proto-docs.sh
!hedera-node/data/backup/*.sh
!hedera-node/configuration/compose/init.db/*.sh
*.json
Expand Down Expand Up @@ -49,6 +51,7 @@ hedera-node/output/
hedera-node/target/
hedera-node/forensics
hedera-node/pgdata
hedera-node/temp
!hedera-node/forensics/start-investigation.py
hapi-proto/target/
hapi-proto/src/main/proto/doc/index.html
Expand All @@ -69,6 +72,7 @@ test-clients/target/
test-clients/record-snapshots/
test-clients/remote-system-files/*.bin
test-clients/remote-system-files/*.txt
test-clients/src/main/resource/Mainnet*StartUp.txt
test-clients/src/main/resource/MainNet*StartUp.txt
test-clients/src/main/resource/TestNet*StartUp.txt
test-clients/src/main/resource/testfiles/*.abi
Expand Down
10 changes: 10 additions & 0 deletions hapi-proto/add-copyright.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#! /bin/sh
find . -name '*.proto' | while read FILE; do
cat $FILE | head -3 > tmp.proto
LINES=$(wc -l $FILE | awk '{print $1}')
TCOUNT=$((LINES-3))
echo '' >> tmp.proto
cat copyright.txt >> tmp.proto
tail -n ${TCOUNT} $FILE >> tmp.proto
mv tmp.proto $FILE
done
Original file line number Diff line number Diff line change
@@ -1,34 +1,19 @@
package com.hedera.services.txns.diligence;

/*-
* ‌
* Hedera Services Node
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

import com.hederahashgraph.api.proto.java.TransactionID;

/**
* Defines a type able to detect duplicate transactions within sliding window.
*
* @author Michael Tinker
*/
public interface DuplicateClassifier {
void observe(TransactionID txnId, long at);
void shiftWindow(long to);
boolean isDuplicate(TransactionID txnId);
}
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/BasicTypes.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

import "Timestamp.proto";

option java_package = "com.hederahashgraph.api.proto.java";
Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusCreateTopic.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusDeleteTopic.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusGetTopicInfo.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusService.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.service.proto.java";

import "Query.proto";
Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusSubmitMessage.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusTopicInfo.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ConsensusUpdateTopic.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ContractCall.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ContractCallLocal.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;

Expand Down
20 changes: 20 additions & 0 deletions hapi-proto/src/main/proto/ContractCreate.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@ syntax = "proto3";

package proto;

/*-
* ‌
* Hedera Network Services Protobuf
* ​
* Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC
* ​
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ‍
*/

option java_package = "com.hederahashgraph.api.proto.java";
option java_multiple_files = true;
import "BasicTypes.proto";
Expand Down
Loading