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

use libevm: params, core/vm, eth/tracers/* + some of core/types #662

Merged
merged 39 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
314fe42
format: as subnet-evm
darioush Sep 25, 2024
72a4b00
take changes up to d72ff25 from subnet-evm
darioush Oct 2, 2024
b3647e3
complete use core/vm
darioush Sep 26, 2024
20754f7
format: as coreth
darioush Oct 2, 2024
6ff7f77
ci fixes
darioush Sep 26, 2024
512ae03
use race free version
darioush Sep 26, 2024
0baae1a
update version
darioush Sep 26, 2024
4fe802b
rebase new libevm
darioush Sep 27, 2024
df98c4e
remove WithExtras hack
darioush Oct 1, 2024
8e223b9
cleanup
darioush Oct 2, 2024
43dde81
fix genesis EthUpgrades
darioush Oct 3, 2024
0976d50
update libevm
darioush Oct 7, 2024
062dc35
Merge remote-tracking branch 'origin/master' into use-libevm
darioush Oct 11, 2024
80fb112
fix for merge
darioush Oct 11, 2024
357fba6
fix test
darioush Oct 11, 2024
6bf7ca2
move code to config/rules_extra.go
darioush Oct 11, 2024
fa77e8a
rename vars
darioush Oct 11, 2024
44468d6
refactor: reduce calling params.GetExtra
darioush Oct 11, 2024
023849c
more reduce params.GetExtra
darioush Oct 11, 2024
9a158f0
use upstream forks
darioush Oct 11, 2024
aa77826
pass bytes of predicate results to avoid parsing in params
darioush Oct 12, 2024
2abcd61
use more upstream types
darioush Oct 14, 2024
a54dac6
Merge branch 'master' of github.com:ava-labs/coreth into use-libevm
darioush Oct 14, 2024
546b697
nit
darioush Oct 14, 2024
ba3f538
nit
darioush Oct 14, 2024
bf9a87f
less use of params.Copy
darioush Oct 14, 2024
a1d7a11
reduce diff
darioush Oct 14, 2024
72a90dd
Review of `params` package in #662 (#674)
ARR4N Oct 18, 2024
4054dd4
review comments
darioush Oct 21, 2024
8f6d766
GetPredicateResultBytes: remove extra return
darioush Oct 21, 2024
51be0ca
review: reduce calls to params.GetExtra
darioush Oct 25, 2024
69f2ce9
review: rename nativeasset files
darioush Oct 25, 2024
2f3c9b2
refactor: move asset call logic to nativeasset
darioush Oct 25, 2024
aee7a95
review: IsShanghai+adding comments for OverrideNewEVMArgs
darioush Oct 25, 2024
7a5378f
review comments
darioush Oct 28, 2024
b996733
make chainConfigExtra()
darioush Oct 28, 2024
e6ec110
set difficulty to nil as well
darioush Oct 28, 2024
f575788
predicate results: alternate approach (similar to master) (#679)
darioush Nov 6, 2024
a203ea6
Use upstream account packages (#678)
darioush Nov 6, 2024
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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions accounts/abi/bind/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"io"
"math/big"

"github.com/ava-labs/coreth/accounts"
"github.com/ava-labs/coreth/accounts/external"
"github.com/ava-labs/coreth/accounts/keystore"
"github.com/ava-labs/coreth/core/types"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (

"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/core/vm"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/coreth/nativeasset"
"github.com/ava-labs/coreth/rpc"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
Expand Down Expand Up @@ -308,14 +308,14 @@ func wrapNativeAssetCall(opts *TransactOpts, contract *common.Address, input []b
return nil, nil, errNativeAssetDeployContract
}
// wrap input with native asset call params
input = vm.PackNativeAssetCallInput(
input = nativeasset.PackNativeAssetCallInput(
*contract,
opts.NativeAssetCall.AssetID,
opts.NativeAssetCall.AssetAmount,
input,
)
// target addr is now precompile
contract = &vm.NativeAssetCallAddr
contract = &nativeasset.NativeAssetCallAddr
}
return contract, input, nil
}
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/core/vm"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/coreth/nativeasset"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
Expand Down Expand Up @@ -404,8 +404,8 @@ func TestTransactNativeAssetCall(t *testing.T) {
nativeCallTx, err := bc.Transact(opts, methodName, arg1, arg2)
assert.Nil(err)
// verify transformations
assert.Equal(vm.NativeAssetCallAddr, *nativeCallTx.To())
unpackedAddr, unpackedAssetID, unpackedAssetAmount, unpackedData, err := vm.UnpackNativeAssetCallInput(nativeCallTx.Data())
assert.Equal(nativeasset.NativeAssetCallAddr, *nativeCallTx.To())
unpackedAddr, unpackedAssetID, unpackedAssetAmount, unpackedData, err := nativeasset.UnpackNativeAssetCallInput(nativeCallTx.Data())
assert.Nil(err)
assert.NotEmpty(unpackedData)
assert.Equal(unpackedData, normalCallTx.Data())
Expand Down
5 changes: 5 additions & 0 deletions accounts/abi/bind/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2179,6 +2179,11 @@ func golangBindings(t *testing.T, overload bool) {
if out, err := replacer.CombinedOutput(); err != nil {
t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
}
replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/[email protected]", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/[email protected]")
replacer.Dir = pkg
if out, err := replacer.CombinedOutput(); err != nil {
t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
}
tidier := exec.Command(gocmd, "mod", "tidy", "-compat=1.22")
tidier.Dir = pkg
if out, err := tidier.CombinedOutput(); err != nil {
Expand Down
236 changes: 0 additions & 236 deletions accounts/accounts.go

This file was deleted.

43 changes: 0 additions & 43 deletions accounts/accounts_test.go

This file was deleted.

Loading
Loading