Cleanup after cortina merge, reduce diff with avax (#103)

chain4travel · Jul 25, 2024 · 6ddf0fe · 6ddf0fe
1 parent 5468c66
commit 6ddf0fe
Show file tree

Hide file tree

Showing 23 changed files with 55 additions and 36 deletions.
diff --git 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
@@ -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 → ...build_contracts/admin/src/camino_admin.go b/contracts/build_contracts/admin/src/admin.go → ...build_contracts/admin/src/camino_admin.go
diff --git a/...d_contracts/multisig/abi/MultisigData.abi → ...racts/multisig/abi/CaminoMultisigData.abi b/...d_contracts/multisig/abi/MultisigData.abi → ...racts/multisig/abi/CaminoMultisigData.abi
diff --git a/.../build_contracts/multisig/src/multisig.go → ...contracts/multisig/src/camino_multisig.go b/.../build_contracts/multisig/src/multisig.go → ...contracts/multisig/src/camino_multisig.go
diff --git a/contracts/access.sol → contracts/camino_access.sol b/contracts/access.sol → contracts/camino_access.sol
diff --git a/contracts/access_v2.sol → contracts/camino_access_v2.sol b/contracts/access_v2.sol → contracts/camino_access_v2.sol
diff --git a/contracts/admin.sol → contracts/camino_admin.sol b/contracts/admin.sol → 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 → contracts/camino_incentives.sol b/contracts/incentives.sol → 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 → contracts/camino_multisig.sol b/contracts/multisig.sol → contracts/camino_multisig.sol
diff --git a/contracts/proxy.sol → contracts/camino_proxy.sol b/contracts/proxy.sol → contracts/camino_proxy.sol
diff --git a/core/admin/admin.go → core/admin/camino_admin.go b/core/admin/admin.go → core/admin/camino_admin.go
diff --git 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
@@ -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
@@ -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 → eth/ethadmin/camino_ethadmin.go b/eth/ethadmin/ethadmin.go → eth/ethadmin/camino_ethadmin.go
diff --git 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
@@ -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 → plugin/evm/camino_block_verification.go b/plugin/evm/block_verification_camino.go → plugin/evm/camino_block_verification.go
diff --git 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
@@ -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
@@ -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
@@ -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.