Base 2.18.0 commit

GoPlugin · Nov 21, 2024 · 055b24f · 055b24f
1 parent e8197c3
commit 055b24f
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 34 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go
@@ -21,7 +21,7 @@ import (
 	mock_adapter "github.com/goplugin/plugin-testing-framework/lib/k8s/pkg/helm/mock-adapter"
 	"github.com/goplugin/pluginv3.0/integration-tests/client"
 	"github.com/goplugin/pluginv3.0/integration-tests/docker/test_env"
-	"github.com/goplugin/pluginv3.0/v2/core/services/job"
+	"github.com/goplugin/pluginv3.0/core/services/job"
 
 	chainconfig "github.com/goplugin/plugin-starknet/integration-tests/config"
 	"github.com/goplugin/plugin-starknet/integration-tests/testconfig"

diff --git a/integration-tests/common/test_common.go b/integration-tests/common/test_common.go
@@ -325,26 +325,26 @@ func (m *OCRv2TestState) ValidateRounds(rounds int, isSoak bool) error {
 	if err != nil {
 		return err
 	}
-	resLINK, errLINK := m.Clients.StarknetClient.CallContract(ctx, starknet.CallOps{
+	resPLI, errPLI := m.Clients.StarknetClient.CallContract(ctx, starknet.CallOps{
 		ContractAddress: linkContractAddress,
 		Selector:        starknetutils.GetSelectorFromNameFelt("balance_of"),
 		Calldata:        []*felt.Felt{contractAddress},
 	})
-	require.NoError(m.TestConfig.T, errLINK, "Reader balance from PLI contract should not fail", "err", errLINK)
+	require.NoError(m.TestConfig.T, errPLI, "Reader balance from PLI contract should not fail", "err", errPLI)
 	resAgg, errAgg := m.Clients.StarknetClient.CallContract(ctx, starknet.CallOps{
 		ContractAddress: contractAddress,
 		Selector:        starknetutils.GetSelectorFromNameFelt("link_available_for_payment"),
 	})
 	require.NoError(m.TestConfig.T, errAgg, "link_available_for_payment should not fail", "err", errAgg)
-	balLINK := resLINK[0].BigInt(big.NewInt(0))
+	balPLI := resPLI[0].BigInt(big.NewInt(0))
 	balAgg := resAgg[1].BigInt(big.NewInt(0))
 	isNegative := resAgg[0].BigInt(big.NewInt(0))
 	if isNegative.Sign() > 0 {
 		balAgg = new(big.Int).Neg(balAgg)
 	}
 
-	assert.Equal(m.TestConfig.T, balLINK.Cmp(big.NewInt(0)), 1, "Aggregator should have non-zero balance")
-	assert.GreaterOrEqual(m.TestConfig.T, balLINK.Cmp(balAgg), 0, "Aggregator payment balance should be <= actual PLI balance")
+	assert.Equal(m.TestConfig.T, balPLI.Cmp(big.NewInt(0)), 1, "Aggregator should have non-zero balance")
+	assert.GreaterOrEqual(m.TestConfig.T, balPLI.Cmp(balAgg), 0, "Aggregator payment balance should be <= actual PLI balance")
 
 	for start := time.Now(); time.Since(start) < m.Common.TestEnvDetails.TestDuration; {
 		m.TestConfig.L.Info().Msg(fmt.Sprintf("Elapsed time: %s, Round wait: %s ", time.Since(start), m.Common.TestEnvDetails.TestDuration))

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/goplugin/plugin-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4
 	github.com/goplugin/plugin-testing-framework/seth v1.50.1
 	github.com/goplugin/pluginv3.0/integration-tests v0.0.0-20241012135014-37f3132362ec
-	github.com/goplugin/pluginv3.0/v2 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec
+	github.com/goplugin/pluginv3.0 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.33.0
 	go.uber.org/zap v1.27.0

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -1390,8 +1390,8 @@ github.com/goplugin/plugin-testing-framework/wasp v1.50.0 h1:gfhfTn7HkbUHNooSF3c
 github.com/goplugin/plugin-testing-framework/wasp v1.50.0/go.mod h1:tqajhpUJA/9OaMCLitghBXjAgqYO4i27St0F4TUO3+M=
 github.com/goplugin/pluginv3.0/integration-tests v0.0.0-20241012135014-37f3132362ec h1:S9WyGN0+m3umge1rGgZJI+ljozc/COZt9nSNA3tqA1s=
 github.com/goplugin/pluginv3.0/integration-tests v0.0.0-20241012135014-37f3132362ec/go.mod h1:kMiICu9TUtelsGy44wkwnKbFRINnsBBoAMXotfNm78Q=
-github.com/goplugin/pluginv3.0/v2 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec h1:CxaKhs+aBGE/shiox4nv59Oneh2B9jJv3NEtA2Q15CM=
-github.com/goplugin/pluginv3.0/v2 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec/go.mod h1:KbO2His3P8Lg9qcikZeZ1KdYCutV6tkoyT/sJw92bjE=
+github.com/goplugin/pluginv3.0 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec h1:CxaKhs+aBGE/shiox4nv59Oneh2B9jJv3NEtA2Q15CM=
+github.com/goplugin/pluginv3.0 v2.14.0-mercury-20240807.0.20241012135014-37f3132362ec/go.mod h1:KbO2His3P8Lg9qcikZeZ1KdYCutV6tkoyT/sJw92bjE=
 github.com/goplugin/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
 github.com/goplugin/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
 github.com/goplugin/plugin-libocr v0.0.0-20241007185508-adbe57025f12 h1:NzZGjaqez21I3DU7objl3xExTH4fxYvzTqar8DC6360=

diff --git a/monitoring/README.md b/monitoring/README.md
@@ -3,7 +3,7 @@
 ## Useful links
 
 - Starknet on-chain monitor [generated docs](https://pkg.go.dev/github.com/goplugin/plugin-starknet/monitoring/pkg/monitoring).
-- On-chain monitoring (OM) framework architecture docs in [blueprints](https://github.com/goplugin/plugin-blueprints/blob/master/monitoring/README.md).
+- On-chain monitoring (OM) framework architecture docs in [blueprints](https://github.com/goplugin/pluginv3.0-blueprints/blob/master/monitoring/README.md).
 - OM framework [generated docs](https://pkg.go.dev/github.com/goplugin/plugin-common/pkg/monitoring).
 
 ## Local development

diff --git a/ops/localenv/main.go b/ops/localenv/main.go
@@ -34,7 +34,7 @@ func main() {
 	// 	run("switch k8s context", "kubectl", "config", "use-context", "k3d-local")
 	// build and upload image to local registry
 	case "build":
-		context := "../../../plugin" // TODO: make this an arg
+		context := "../../../pluginv3.0" // TODO: make this an arg
 		run("build image", "docker", "build", "-f", context+"/core/plugin.Dockerfile", context, "-t", "plugin:local")
 		run("tag image", "docker", "tag", "plugin:local", "localhost:12345/plugin:local")
 		run("push image", "docker", "push", "localhost:12345/plugin:local")

diff --git a/packages-ts/starknet-gauntlet-argent/LICENSE b/packages-ts/starknet-gauntlet-argent/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-cli/LICENSE b/packages-ts/starknet-gauntlet-cli/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-emergency-protocol/LICENSE b/packages-ts/starknet-gauntlet-emergency-protocol/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-example/LICENSE b/packages-ts/starknet-gauntlet-example/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-ledger/LICENSE b/packages-ts/starknet-gauntlet-ledger/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-multisig/LICENSE b/packages-ts/starknet-gauntlet-multisig/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-ocr2/LICENSE b/packages-ts/starknet-gauntlet-ocr2/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-oz/LICENSE b/packages-ts/starknet-gauntlet-oz/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet-token/LICENSE b/packages-ts/starknet-gauntlet-token/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/packages-ts/starknet-gauntlet/LICENSE b/packages-ts/starknet-gauntlet/LICENSE
@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 SmartContract Plugin, Ltd.
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/relayer/pkg/plugin/ocr2/medianreport/__debug_bin305974922 b/relayer/pkg/plugin/ocr2/medianreport/__debug_bin305974922
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,5 +1,5 @@
 # required (may be found under "Project Information" in SonarQube)
-sonar.projectKey=goplugin_plugin-starknet
+sonar.projectKey=smartcontractkit_plugin-starknet
 sonar.sources=.
 
 # Full exclusions from the static analysis