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.

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

Jump to bottom

Merge v1.4.20 into 1.5 #3908

Merged
merged 29 commits into from
Nov 13, 2023
Merged

Merge v1.4.20 into 1.5 #3908

merged 29 commits into from
Nov 13, 2023

Conversation

phearnot
Copy link
Member

No description provided.

phearnot and others added 25 commits June 27, 2023 11:55
@phearnot
Bumped dependencies (#3857)
f65322e
@vsuharnikov
NODE-2600 Optionally override a blockchain state in /utils/script/eva…
b0fad2a 
…luate (#3858)
@DrBlast
NODE-2588 Qase.io integration (#3845)
25b60c3
@Kseolis
NODE-2578 GetBlockUpdate tests (#3852)
e651239
@Karasiq
NODE-2336: Disallow FairPoSCalculator base target < 1 (#3523)
51616ba
@ivan-mashonskiy
NODE-2476 Check asset id field size (#3716)
961e643
@xrtm000
Common isWellFormed() implementation (#3829)
b773589
@phearnot
Pull newer images during docker build (#3860)
ee95b92
@Kseolis
NODE-2598 Added RIDE test ids (#3856)
9466846
@vsuharnikov
NODE-2599 Public key in AccountScriptInfo (#3862)
ce57e96
@xrtm000
Fixed sync call transfers validation for /utils/script/evaluate (#3863)
c237de9
@xrtm000
NODE-2591 Tuple type comments parse error (#3867)
380bf96
@ivan-mashonskiy
NODE-2602 Remove script and Ethereum transaction size checks from UTX (…
df946ac 
…#3868)
@ivan-mashonskiy
Fix liquid block replacing with better one (#3864)
e6bb22a
@xrtm000
NODE-2601 Corrected balance snapshots (#3871)
eecfa39
@xrtm000
NODE-2603 Escaping characters in decompiler (#3873)
e02c6da
@ivan-mashonskiy
NODE-2592 Fix permissions change on upgrade (#3877)
7a7bae1
@ivan-mashonskiy
NODE-2615 Add base target field to /debug/stateHash (#3894)
ef713bf 
Co-authored-by: Ivan Mashonskii <imashonskii@web3tech.ru>
@vsuharnikov
NODE-2449 Run Ride on any environment (#3869)
9c49518
@vsuharnikov
NODE-2604 New zwaves library (#3895)
2da7fe2
@vsuharnikov
NODE-2619 Feature activation fixes (#3900)
e311af4
@ivan-mashonskiy
Broadcast only last block after apply (#3878)
d6f9f8f
@phearnot
Build system cleanup (#3901)
586e0c2
@phearnot
Version 1.4.19 (Mainnet + Testnet) (#3902)
82f19d8
@vsuharnikov
NODE-2624 /utils/script/evaluate: do not parse bytes in expr (#3907)
89f9c51
@phearnot phearnot force-pushed the merge-1.4.19-into-1.5 branch 2 times, most recently from 5eb99ac to 673d3ba Compare October 30, 2023 13:21
@phearnot phearnot marked this pull request as ready for review October 31, 2023 06:52
@phearnot phearnot marked this pull request as draft November 7, 2023 11:40
@phearnot phearnot force-pushed the merge-1.4.19-into-1.5 branch 3 times, most recently from 42d25ad to f2adb93 Compare November 9, 2023 13:06
@phearnot phearnot marked this pull request as ready for review November 9, 2023 13:16
@phearnot phearnot changed the title Merge 1.4.19 into 1.5 Merge v1.4.19 into 1.5 Nov 10, 2023
@phearnot phearnot changed the title Merge v1.4.19 into 1.5 Merge v1.4.20 into 1.5 Nov 10, 2023
vsuharnikov
vsuharnikov approved these changes Nov 10, 2023
View reviewed changes
lang/tests-js/src/test/scala/com/wavesplatform/test/builtInFunctions/list/worksheet.sc Outdated
@@ -0,0 +1 @@
167
Copy link
Member

Choose a reason for hiding this comment

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

Is this file required?

node/src/main/scala/com/wavesplatform/api/http/utils/UtilsEvaluator.scala Outdated
availablePayments = ContractLimits.MaxTotalPaymentAmountRideV6,
currentSnapshot = paymentsSnapshot,
invocationRoot = DAppEnvironment.InvocationTreeTracker(DAppEnvironment.DAppInvocation(dAppAddress, null, Nil))
Map()//Map(invoke.sender.toAddress -> Portfolio.build(invoke.feeAssetId -> -invoke.fee))
Copy link
Member

Choose a reason for hiding this comment

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

🤔

node/src/test/scala/com/wavesplatform/state/BlockchainUpdaterImplSpec.scala Outdated
@@ -86,7 +86,7 @@ class BlockchainUpdaterImplSpec extends FreeSpec with EitherMatchers with WithDo
(master, List(genesisBlock, b1, b2))
}

"blockchain update events sending" - {
"blockhain update events sending" - {
Copy link
Member

Choose a reason for hiding this comment

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

Typo

@phearnot phearnot force-pushed the merge-1.4.19-into-1.5 branch from f2adb93 to e2c1e7b Compare November 10, 2023 14:00
@phearnot phearnot merged commit d37fc36 into version-1.5.x Nov 13, 2023
1 check passed
@phearnot phearnot deleted the merge-1.4.19-into-1.5 branch November 13, 2023 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrtm000 xrtm000 xrtm000 approved these changes

@ivan-mashonskiy ivan-mashonskiy ivan-mashonskiy approved these changes

@vsuharnikov vsuharnikov vsuharnikov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@phearnot @vsuharnikov @ivan-mashonskiy @xrtm000 @AOHhiroko @DrBlast @Kseolis @Karasiq