Merge branch 'main' of github.com:smartcontractkit/chainlink-testing-framework into flakeGuardTimeoutPanics

Author: kalverra

.tool-versions

@@ -0,0 +1 @@
+golang 1.24.0

book/src/SUMMARY.md

@@ -60,7 +60,6 @@
   - [Performance]()
   - [Chaos](./framework/chaos/chaos.md)
   - [Fork Testing](./framework/fork.md)
-- [Interactive](framework/interactive.md)
 - [Libraries](./libraries.md)
   - [Seth](./libs/seth.md)
   - [WASP](./libs/wasp/overview.md)

book/src/developing/developing_components.md

@@ -90,8 +90,8 @@ Do not use `testcontainers.NewDockerProvider()` methods, see issues: [#1](https:
 
 	return &NodeOut{
 	    UseCache: true,
-		DockerURL: fmt.Sprintf("http://%s:%s", containerName, in.Node.Port),
-		HostURL:   fmt.Sprintf("http://%s:%s", host, mp.Port()),
+		InternalURL: fmt.Sprintf("http://%s:%s", containerName, in.Node.Port),
+		ExternalURL:   fmt.Sprintf("http://%s:%s", host, mp.Port()),
 	}, nil
 ```
 

book/src/framework/components/blockchains/aptos.md

@@ -17,6 +17,10 @@ API is available on [localhost:8080](http://localhost:8080/v1)
   type = "aptos"
   image = "aptoslabs/tools:aptos-node-v1.18.0" # or aptoslabs/tools:nightly
   contracts_dir = "$your_dir"
+  # expose custom ports
+  custom_ports = ["2020", "4050:4050"]
+  # add command params
+  docker_cmd_params = ["--skip-metadata-apply"]
 ```
 
 ## Usage
@@ -53,10 +57,10 @@ func TestAptosSmoke(t *testing.T) {
 
 	t.Run("test something", func(t *testing.T) {
 		// use internal URL to connect Chainlink nodes
-		_ = bc.Nodes[0].DockerInternalHTTPUrl
+		_ = bc.Nodes[0].InternalHTTPUrl
 		// use host URL to interact
-		_ = bc.Nodes[0].HostHTTPUrl
-		r := resty.New().SetBaseURL(bc.Nodes[0].HostHTTPUrl).EnableTrace()
+		_ = bc.Nodes[0].ExternalHTTPUrl
+		r := resty.New().SetBaseURL(bc.Nodes[0].ExternalHTTPUrl).EnableTrace()
 		_, err := r.R().Get("/v1/transactions")
 		require.NoError(t, err)
 	})

book/src/framework/components/blockchains/evm.md

@@ -31,8 +31,8 @@ We support 3 EVM clients at the moment: [Geth](https://geth.ethereum.org/docs/fu
 
     [[blockchain_a.out.nodes]]
       # URLs to access the node(s) inside docker network, used by other components
-      docker_internal_http_url = "http://anvil-14411:8545"
-      docker_internal_ws_url = "ws://anvil-14411:8545"
+      internal_http_url = "http://anvil-14411:8545"
+      internal_ws_url = "ws://anvil-14411:8545"
       # URLs to access the node(s) on your host machine or in CI
       http_url = "http://127.0.0.1:33955"
       ws_url = "ws://127.0.0.1:33955"

book/src/framework/components/blockchains/solana.md

@@ -60,9 +60,9 @@ func TestSolanaSmoke(t *testing.T) {
 
 	t.Run("test something", func(t *testing.T) {
 		// use internal URL to connect chainlink nodes
-		_ = bc.Nodes[0].DockerInternalHTTPUrl
+		_ = bc.Nodes[0].InternalHTTPUrl
 		// use host URL to deploy contracts
-		c := client.NewClient(bc.Nodes[0].HostHTTPUrl)
+		c := client.NewClient(bc.Nodes[0].ExternalHTTPUrl)
 		latestSlot, err := c.GetSlotWithConfig(context.Background(), client.GetSlotConfig{Commitment: "processed"})
 		require.NoError(t, err)
 		fmt.Printf("Latest slot: %v\n", latestSlot)

book/src/framework/components/blockchains/sui.md

@@ -50,11 +50,11 @@ func TestSuiSmoke(t *testing.T) {
 
 	t.Run("test something", func(t *testing.T) {
 		// use internal URL to connect Chainlink nodes
-		_ = bc.Nodes[0].DockerInternalHTTPUrl
+		_ = bc.Nodes[0].InternalHTTPUrl
 		// use host URL to interact
-		_ = bc.Nodes[0].HostHTTPUrl
+		_ = bc.Nodes[0].ExternalHTTPUrl
 
-		cli := sui.NewSuiClient(bc.Nodes[0].HostHTTPUrl)
+		cli := sui.NewSuiClient(bc.Nodes[0].ExternalHTTPUrl)
 
 		signerAccount, err := signer.NewSignertWithMnemonic(bc.NetworkSpecificData.SuiAccount.Mnemonic)
 		require.NoError(t, err)

book/src/framework/components/blockchains/tron.md

@@ -35,12 +35,12 @@ func TestTRONSmoke(t *testing.T) {
 
 	t.Run("test something", func(t *testing.T) {
 		// use internal URL to connect Chainlink nodes
-		_ = bc.Nodes[0].DockerInternalHTTPUrl
+		_ = bc.Nodes[0].InternalHTTPUrl
 		// use host URL to interact
-		_ = bc.Nodes[0].HostHTTPUrl
+		_ = bc.Nodes[0].ExternalHTTPUrl
 
-		// use bc.Nodes[0].HostHTTPUrl + "/wallet" to access full node
-		// use bc.Nodes[0].HostHTTPUrl + "/walletsolidity" to access Solidity node
+		// use bc.Nodes[0].ExternalHTTPUrl + "/wallet" to access full node
+		// use bc.Nodes[0].ExternalHTTPUrl + "/walletsolidity" to access Solidity node
 	})
 }
 ```

book/src/framework/components/chainlink/node.md

@@ -102,8 +102,8 @@ func TestMe(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("test something", func(t *testing.T) {
-		fmt.Printf("node url: %s\n", output.Node.HostURL)
-		require.NotEmpty(t, output.Node.HostURL)
+		fmt.Printf("node url: %s\n", output.Node.ExternalURL)
+		require.NotEmpty(t, output.Node.ExternalURL)
 	})
 }
 ```

book/src/framework/components/chainlink/nodeset.md

@@ -32,8 +32,8 @@ This component requires some Blockchain to be deployed, add this to config
 
     [[blockchain_a.out.nodes]]
       # URLs to access the node(s) inside docker network, used by other components
-      docker_internal_http_url = "http://anvil-14411:8545"
-      docker_internal_ws_url = "ws://anvil-14411:8545"
+      internal_http_url = "http://anvil-14411:8545"
+      internal_ws_url = "ws://anvil-14411:8545"
       # URLs to access the node(s) on your host machine or in CI
       http_url = "http://127.0.0.1:33955"
       ws_url = "ws://127.0.0.1:33955"
@@ -155,7 +155,7 @@ func TestMe(t *testing.T) {
 
 	t.Run("test something", func(t *testing.T) {
 		for _, n := range out.CLNodes {
-			require.NotEmpty(t, n.Node.HostURL)
+			require.NotEmpty(t, n.Node.ExternalURL)
 			require.NotEmpty(t, n.Node.HostP2PURL)
 		}
 	})