From 6ddf0fe311e011d5f322fa6701ab9328272d45f4 Mon Sep 17 00:00:00 2001 From: evlekht Date: Thu, 25 Jul 2024 19:18:46 +0400 Subject: [PATCH] Cleanup after cortina merge, reduce diff with avax (#103) --- accounts/abi/bind/backends/simulated.go | 12 ++++++++++++ consensus/dummy/dynamic_fees.go | 1 - .../admin/src/{admin.go => camino_admin.go} | 0 .../abi/{MultisigData.abi => CaminoMultisigData.abi} | 0 .../multisig/src/{multisig.go => camino_multisig.go} | 0 contracts/{access.sol => camino_access.sol} | 0 contracts/{access_v2.sol => camino_access_v2.sol} | 0 contracts/{admin.sol => camino_admin.sol} | 3 ++- contracts/{incentives.sol => camino_incentives.sol} | 2 +- contracts/{multisig.sol => camino_multisig.sol} | 0 contracts/{proxy.sol => camino_proxy.sol} | 0 core/admin/{admin.go => camino_admin.go} | 0 core/error.go | 10 ---------- core/genesis_test.go | 10 ---------- eth/backend.go | 1 - eth/ethadmin/{ethadmin.go => camino_ethadmin.go} | 0 internal/ethapi/api_test.go | 10 ++++++++++ internal/ethapi/backend.go | 10 ++++++++++ ...cation_camino.go => camino_block_verification.go} | 0 plugin/evm/codec.go | 11 ++++++++++- plugin/evm/gossiper_eth_gossiping_test.go | 10 ---------- plugin/evm/import_tx.go | 1 - plugin/evm/service.go | 10 ++++++++++ 23 files changed, 55 insertions(+), 36 deletions(-) rename contracts/build_contracts/admin/src/{admin.go => camino_admin.go} (100%) rename contracts/build_contracts/multisig/abi/{MultisigData.abi => CaminoMultisigData.abi} (100%) rename contracts/build_contracts/multisig/src/{multisig.go => camino_multisig.go} (100%) rename contracts/{access.sol => camino_access.sol} (100%) rename contracts/{access_v2.sol => camino_access_v2.sol} (100%) rename contracts/{admin.sol => camino_admin.sol} (94%) rename contracts/{incentives.sol => camino_incentives.sol} (92%) rename contracts/{multisig.sol => camino_multisig.sol} (100%) rename contracts/{proxy.sol => camino_proxy.sol} (100%) rename core/admin/{admin.go => camino_admin.go} (100%) rename eth/ethadmin/{ethadmin.go => camino_ethadmin.go} (100%) rename plugin/evm/{block_verification_camino.go => camino_block_verification.go} (100%) diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index d3892ceaa4..232f52a03f 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -1,3 +1,13 @@ +// Copyright (C) 2023-2024, Chain4Travel AG. All rights reserved. +// +// This file is a derived work, based on ava-labs code whose +// original notices appear below. +// +// It is distributed under the same license conditions as the +// original code from which it is derived. +// +// Much love to the original authors for their work. +// ********************************************************** // (c) 2019-2020, Ava Labs, Inc. // // This file is a derived work, based on the go-ethereum library whose original @@ -162,6 +172,7 @@ func NewSimulatedBackendWithDatabase(database ethdb.Database, alloc core.Genesis } cacheConfig := &core.CacheConfig{} blockchain, _ := core.NewBlockChain(database, cacheConfig, &genesis, dummy.NewFaker(), vm.Config{}, common.Hash{}, false) + backend := &SimulatedBackend{ database: database, blockchain: blockchain, @@ -662,6 +673,7 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call interfaces.Call for lo+1 < hi { mid := (hi + lo) / 2 failed, _, err := executable(mid) + // If the error is not nil(consensus error), it means the provided message // call or transaction will never be accepted no matter how much gas it is // assigned. Return the error directly, don't struggle any more diff --git a/consensus/dummy/dynamic_fees.go b/consensus/dummy/dynamic_fees.go index 0b18de8a3e..b65f2bf9ae 100644 --- a/consensus/dummy/dynamic_fees.go +++ b/consensus/dummy/dynamic_fees.go @@ -78,7 +78,6 @@ func CalcBaseFee(config *params.ChainConfig, ctrl admin.AdminController, parent if uint64(len(parent.Extra)) != params.ApricotPhase3ExtraDataSize { return nil, nil, fmt.Errorf("expected length of parent extra data to be %d, but found %d", params.ApricotPhase3ExtraDataSize, len(parent.Extra)) } - roll := timestamp - parent.Time // roll the window over by the difference between the timestamps to generate diff --git a/contracts/build_contracts/admin/src/admin.go b/contracts/build_contracts/admin/src/camino_admin.go similarity index 100% rename from contracts/build_contracts/admin/src/admin.go rename to contracts/build_contracts/admin/src/camino_admin.go diff --git a/contracts/build_contracts/multisig/abi/MultisigData.abi b/contracts/build_contracts/multisig/abi/CaminoMultisigData.abi similarity index 100% rename from contracts/build_contracts/multisig/abi/MultisigData.abi rename to contracts/build_contracts/multisig/abi/CaminoMultisigData.abi diff --git a/contracts/build_contracts/multisig/src/multisig.go b/contracts/build_contracts/multisig/src/camino_multisig.go similarity index 100% rename from contracts/build_contracts/multisig/src/multisig.go rename to contracts/build_contracts/multisig/src/camino_multisig.go diff --git a/contracts/access.sol b/contracts/camino_access.sol similarity index 100% rename from contracts/access.sol rename to contracts/camino_access.sol diff --git a/contracts/access_v2.sol b/contracts/camino_access_v2.sol similarity index 100% rename from contracts/access_v2.sol rename to contracts/camino_access_v2.sol diff --git a/contracts/admin.sol b/contracts/camino_admin.sol similarity index 94% rename from contracts/admin.sol rename to contracts/camino_admin.sol index affd455465..4682300108 100644 --- a/contracts/admin.sol +++ b/contracts/camino_admin.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; -import "./access.sol"; +import "./camino_access.sol"; interface IProxy { function setImplementation(address newImplementation) external; @@ -25,6 +25,7 @@ contract CaminoAdmin is SimpleAccessControlImpl { uint256 internal constant KYC_APPROVED = 1 << 0; uint256 internal constant KYC_EXPIRED = 1 << 1; + // uint256 internal constant KYB_APPROVED = 1 << 3; // Slot2 mapping(address => uint256) private kyc; diff --git a/contracts/incentives.sol b/contracts/camino_incentives.sol similarity index 92% rename from contracts/incentives.sol rename to contracts/camino_incentives.sol index 8988ec2918..1d3db331a9 100644 --- a/contracts/incentives.sol +++ b/contracts/camino_incentives.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; -import "./access.sol"; +import "./camino_access.sol"; interface IProxy { function setImplementation(address newImplementation) external; diff --git a/contracts/multisig.sol b/contracts/camino_multisig.sol similarity index 100% rename from contracts/multisig.sol rename to contracts/camino_multisig.sol diff --git a/contracts/proxy.sol b/contracts/camino_proxy.sol similarity index 100% rename from contracts/proxy.sol rename to contracts/camino_proxy.sol diff --git a/core/admin/admin.go b/core/admin/camino_admin.go similarity index 100% rename from core/admin/admin.go rename to core/admin/camino_admin.go diff --git a/core/error.go b/core/error.go index 512ee79e55..0137b5dae2 100644 --- a/core/error.go +++ b/core/error.go @@ -1,13 +1,3 @@ -// Copyright (C) 2022, Chain4Travel AG. All rights reserved. -// -// This file is a derived work, based on ava-labs code whose -// original notices appear below. -// -// It is distributed under the same license conditions as the -// original code from which it is derived. -// -// Much love to the original authors for their work. -// ********************************************************** // (c) 2019-2020, Ava Labs, Inc. // // This file is a derived work, based on the go-ethereum library whose original diff --git a/core/genesis_test.go b/core/genesis_test.go index 3c9feaf36f..48760073de 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -1,13 +1,3 @@ -// Copyright (C) 2022, Chain4Travel AG. All rights reserved. -// -// This file is a derived work, based on ava-labs code whose -// original notices appear below. -// -// It is distributed under the same license conditions as the -// original code from which it is derived. -// -// Much love to the original authors for their work. -// ********************************************************** // (c) 2019-2021, Ava Labs, Inc. // // This file is a derived work, based on the go-ethereum library whose original diff --git a/eth/backend.go b/eth/backend.go index bdaea9bf09..fd3385dc78 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -258,7 +258,6 @@ func New( if config.AllowUnprotectedTxs { log.Info("Unprotected transactions allowed") } - gpoParams := config.GPO eth.APIBackend.gpo, err = gasprice.NewOracle(eth.APIBackend, gpoParams) if err != nil { diff --git a/eth/ethadmin/ethadmin.go b/eth/ethadmin/camino_ethadmin.go similarity index 100% rename from eth/ethadmin/ethadmin.go rename to eth/ethadmin/camino_ethadmin.go diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index e7a0ea511c..b0dcf26077 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -1,3 +1,13 @@ +// Copyright (C) 2024, Chain4Travel AG. All rights reserved. +// +// This file is a derived work, based on ava-labs code whose +// original notices appear below. +// +// It is distributed under the same license conditions as the +// original code from which it is derived. +// +// Much love to the original authors for their work. +// ********************************************************** // (c) 2023, Ava Labs, Inc. // // This file is a derived work, based on the go-ethereum library whose original diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 7da5f3213e..93efbbebe1 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -1,3 +1,13 @@ +// Copyright (C) 2024, Chain4Travel AG. All rights reserved. +// +// This file is a derived work, based on ava-labs code whose +// original notices appear below. +// +// It is distributed under the same license conditions as the +// original code from which it is derived. +// +// Much love to the original authors for their work. +// ********************************************************** // (c) 2019-2020, Ava Labs, Inc. // // This file is a derived work, based on the go-ethereum library whose original diff --git a/plugin/evm/block_verification_camino.go b/plugin/evm/camino_block_verification.go similarity index 100% rename from plugin/evm/block_verification_camino.go rename to plugin/evm/camino_block_verification.go diff --git a/plugin/evm/codec.go b/plugin/evm/codec.go index 0cf089cc59..e1671af21d 100644 --- a/plugin/evm/codec.go +++ b/plugin/evm/codec.go @@ -1,3 +1,13 @@ +// Copyright (C) 2023-2024, Chain4Travel AG. All rights reserved. +// +// This file is a derived work, based on ava-labs code whose +// original notices appear below. +// +// It is distributed under the same license conditions as the +// original code from which it is derived. +// +// Much love to the original authors for their work. +// ********************************************************** // (c) 2019-2021, Ava Labs, Inc. All rights reserved. // See the file LICENSE for licensing terms. @@ -44,7 +54,6 @@ func init() { c.RegisterCustomType(&secp256k1fx.CrossTransferOutput{}), Codec.RegisterCodec(codecVersion, c), ) - if errs.Errored() { panic(errs.Err) } diff --git a/plugin/evm/gossiper_eth_gossiping_test.go b/plugin/evm/gossiper_eth_gossiping_test.go index 8d6092b09e..ae36e793e8 100644 --- a/plugin/evm/gossiper_eth_gossiping_test.go +++ b/plugin/evm/gossiper_eth_gossiping_test.go @@ -1,13 +1,3 @@ -// Copyright (C) 2022, Chain4Travel AG. All rights reserved. -// -// This file is a derived work, based on ava-labs code whose -// original notices appear below. -// -// It is distributed under the same license conditions as the -// original code from which it is derived. -// -// Much love to the original authors for their work. -// ********************************************************** // (c) 2019-2021, Ava Labs, Inc. All rights reserved. // See the file LICENSE for licensing terms. diff --git a/plugin/evm/import_tx.go b/plugin/evm/import_tx.go index 8122da22bf..8c221e23ba 100644 --- a/plugin/evm/import_tx.go +++ b/plugin/evm/import_tx.go @@ -25,7 +25,6 @@ import ( "github.com/ava-labs/avalanchego/vms/components/avax" "github.com/ava-labs/avalanchego/vms/components/verify" "github.com/ava-labs/avalanchego/vms/secp256k1fx" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" ) diff --git a/plugin/evm/service.go b/plugin/evm/service.go index 44b20c4a00..3ce9015139 100644 --- a/plugin/evm/service.go +++ b/plugin/evm/service.go @@ -1,3 +1,13 @@ +// Copyright (C) 2023-2024, Chain4Travel AG. All rights reserved. +// +// This file is a derived work, based on ava-labs code whose +// original notices appear below. +// +// It is distributed under the same license conditions as the +// original code from which it is derived. +// +// Much love to the original authors for their work. +// ********************************************************** // (c) 2019-2020, Ava Labs, Inc. All rights reserved. // See the file LICENSE for licensing terms.