Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Merge slim into master#2967

Merged
bytemaster merged 837 commits intomasterfrom
slim
May 11, 2018
Merged

Merge slim into master#2967
bytemaster merged 837 commits intomasterfrom
slim

Conversation

@arhag
Copy link
Contributor

@arhag arhag commented May 11, 2018

No description provided.

heifner and others added 30 commits May 7, 2018 11:21
@heifner
Merge pull request #2816 from wanderingbort/feature/partial-revert-27…
f4ed357 
…50-better-linking-for-85b2948

 Revert validator plugin, fix for poor handling of blocks from the future.
@heifner
timeout_time already included timeout
4faad5b
@PaulCalabrese
Add support for new setprods fromat to launcher
ca2260c
@arhag
Merge branch 'slim' into slim-fix-delay
e2b57c0
@heifner
Merge pull request #2821 from EOSIO/slim_launcher_fixes
14857c9 
Add support for new setprods fromat to launcher
@spoonincode
Use a single target for generation of .wasm files
f1903e1
@zorba80
Small fixes
2d09342
@b1bart
Fixes #2803
fa7ffc0 
use the correct base time when calculating the minimum time to the next block
prevent bad access of members of `pending` if `start_block` throws by cleaning up `pending` on the way out
prevent bad access of vector when fullfilling a fork request results in no blocks to send
@ericiles
Use s3 bucket to publish coverage reports
ba7b5f8
@heifner
Merge pull request #2820 from EOSIO/gh#2769-keosd
f43f8fb 
Gh#2769 keosd
@heifner
Merge pull request #2817 from EOSIO/slim_build_wasm
7b0515e 
Generate .wasm files alongside .wast
Add coverage report url to end of log output
b0ada6e
@arhag
use static member _noop_checktime
d4559f5
@arhag
Merge branch 'slim' into slim-fix-delay
77aa135
Update coverage.yml
1f3fc14
@b1bart
Merge pull request #2809 from EOSIO/slim-fix-delay
3e7dd32 
Major changes to check_authorization and permission_api (delay_tests now working)
@heifner
Merge pull request #2826 from EOSIO/buildkite-coverage-publish
93df41c 
Use s3 bucket to publish coverage reports [skip-ci]
@moskvanaft
cleos listproducers #2807
afc1d04
@moskvanaft
Merge branch 'slim' into cleos-listproducers
4924427
@moskvanaft
cleos listproducers small bugfix #2807
d293756
@moskvanaft
compilation fix for ubuntu #2807
8f90119
removed old skeleton.abi and changed skeleton.cpp to something that w…
a36884c 
…ill compile and can be run by cleos
@cijujohn
pylint fixes (remove unused functions, invalid function usages, unuse…
ca709c8 
…d variables etc.). Enable account balance validation.
@spoonincode
Merge branch 'slim' into payment_refactor
928c17d
@spoonincode
Merge pull request #2805 from EOSIO/payment_refactor
fbf155a 
Move payment calculations from onblock to claimrewards
@moskvanaft
Merge branch 'slim' into cleos-listproducers
03ccbbd
@zorba80
Replace now() with current_time(), other fixes
1f0e387
@spoonincode
Merge pull request #2828 from EOSIO/cleos-listproducers
ac7c9d5 
Cleos system listproducers
@heifner
Merge pull request #2829 from cj-oci/slim-enableNodeosTest-2
1e5a1f5 
Test fixes and enable balance check
@heifner
Merge pull request #2830 from EOSIO/issue-2819-eosiocpp-generates-bro…
be15fdb 
…ken-skeleton-code

Issue 2819 - removed old skeleton.abi and changed skeleton.cpp
arhag and others added 28 commits May 11, 2018 10:39
@arhag
add_transaction_usage should use latest limits
7802daa
@zorba80
Small change
18b3d28
Merge pull request #2950 from taokayan/slim_pay
9b71b0c 
Slim pay
@arhag
Merge branch 'slim' into slim-fix-to-resource-limits
573aa4f
@zorba80
Merge branch 'slim' into inactive
fb96fb1
@arhag
Merge pull request #2955 from EOSIO/slim-fix-to-resource-limits
1f32df8 
 add_transaction_usage should use latest limits
@moskvanaft
fix elect_producers system contract test #2682
df8315b
@moskvanaft
added CMake dependencies: unit_test depends on payloadless and tic_ta…
a07e738 
…c_toe
@arhag
Merge branch 'slim' into eosio-system-test-fix-2
db61564
@zorba80
Changes following code review, merge conflict
96f2c0e
@bytemaster
fix cleos delegatebw and get account printing
84deb27
@bytemaster
Merge branch 'slim' of github.com:EOSIO/eos into slim
bf439d4
@arhag
Merge branch 'master' into slim
fd0d720
@moskvanaft
Merge branch 'slim' into eosio-system-test-fix-2
fcde3ee
@zorba80
Removed unnecessarily large cpu and net stakes, unfair pay test
0d2e0d4
@bytemaster
Merge pull request #2958 from EOSIO/eosio-system-test-fix-2
e8a9114 
Fixing system contract tests
@zorba80
Merge branch 'slim' into inactive
fc48208
@arhag
Merge branch 'slim' into slim-master-merge
a0abd49
@arhag
Merge pull request #2956 from EOSIO/inactive
140d93e 
Zero out keys of inactive producers
@arhag
Merge remote-tracking branch 'origin/slim' into slim-master-merge
a98e360
@arhag
Merge branch 'slim' into issue-2928
fd79fc3
@larryk85
Merge pull request #2961 from EOSIO/slim-master-merge
ca788a0 
Merge master into slim
@arhag
Merge branch 'slim' into issue-2928
ff2b763
@larryk85
Added default keosd port to 8900
39d6762
@heifner
Add null check with exception expected by net_plugin
18b3500
@bytemaster
Merge pull request #2959 from EOSIO/issue-2928
bde431b 
Resolves issue #2928
@bytemaster
Merge pull request #2966 from EOSIO/gh#2963-core
6957747 
Add null check with exception expected by net_plugin
@bytemaster
temp disable broken test
b6f0842
@bytemaster bytemaster merged commit 9be8910 into master May 11, 2018
@brianjohnson5972 brianjohnson5972 deleted the slim branch November 21, 2020 15:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.