diff --git a/integration-tests/actions/ccip_helpers.go b/integration-tests/actions/ccip_helpers.go index f2466528a3..d58f08c1f9 100644 --- a/integration-tests/actions/ccip_helpers.go +++ b/integration-tests/actions/ccip_helpers.go @@ -1201,12 +1201,16 @@ func (destCCIP *DestCCIPModule) AssertEventExecutionStateChanged( if err != nil { lggr.Warn().Msg("Failed to get receipt for ExecStateChanged event") } + var gasUsed uint64 + if receipt != nil { + gasUsed = receipt.GasUsed + } if abihelpers.MessageExecutionState(e.State) == abihelpers.ExecutionStateSuccess { reports.UpdatePhaseStats(reqNo, seqNum, testreporters.ExecStateChanged, receivedAt.Sub(timeNow), testreporters.Success, testreporters.TransactionStats{ TxHash: vLogs.TxHash.Hex(), - GasUsed: receipt.GasUsed, + GasUsed: gasUsed, }) return nil } else { @@ -1266,9 +1270,13 @@ func (destCCIP *DestCCIPModule) AssertEventReportAccepted( if err != nil { lggr.Warn().Msg("Failed to get receipt for ReportAccepted event") } + var gasUsed uint64 + if receipt != nil { + gasUsed = receipt.GasUsed + } reports.UpdatePhaseStats(reqNo, seqNum, testreporters.Commit, totalTime, testreporters.Success, testreporters.TransactionStats{ - GasUsed: receipt.GasUsed, + GasUsed: gasUsed, TxHash: reportAccepted.Raw.TxHash.String(), CommitRoot: fmt.Sprintf("%x", reportAccepted.Report.MerkleRoot), }) @@ -1315,9 +1323,13 @@ func (destCCIP *DestCCIPModule) AssertReportBlessed( if err != nil { lggr.Fatal().Err(err).Msg("Failed to get receipt for ReportBlessed event") } + var gasUsed uint64 + if receipt != nil { + gasUsed = receipt.GasUsed + } reports.UpdatePhaseStats(reqNo, seqNum, testreporters.ReportBlessed, receivedAt.Sub(prevEventAt), testreporters.Success, testreporters.TransactionStats{ - GasUsed: receipt.GasUsed, + GasUsed: gasUsed, TxHash: vLogs.TxHash.String(), CommitRoot: fmt.Sprintf("%x", CommitReport.MerkleRoot), }) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 6b99c833d2..fa13872338 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -89,6 +89,14 @@ "1": { "on_ramp": "0xad1b1F2A6DD55627e3893B771A00Cd43F69DcE35", "deployed_at": 106535110 + }, + "8453": { + "on_ramp": "0xC40f7C8763e35fb64ab968Dc812C2d24c6f8404c", + "deployed_at": 110157341 + }, + "137": { + "on_ramp": "0xB188Bd6CC347299EEBb3aE93F57d90F580536B3A", + "deployed_at": 110157415 } }, "dest_contracts": { @@ -96,6 +104,16 @@ "off_ramp": "0x032F957BfbB8C535a1b2048f8b4FA27E1F2018Fd", "commit_store": "0xa4D34ca38244F6c8AB640315d7257221408B6596", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "8453": { + "off_ramp": "0x704dF5613166F552B80ED5a27F3559DaA30eB8C8", + "commit_store": "0x3224dB1d2F7aBa70469DEEE357472D2550fe7579", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "137": { + "off_ramp": "0x43a2DF743aAC63Eeb7DA430AC0BbfF0579311b84", + "commit_store": "0xB6b7A8b59a3A0c7F73Bc3F6E8996a26736afAaC0", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, @@ -110,6 +128,10 @@ "1": { "on_ramp": "0x98dd9E9b8AE458225119Ab5B8c947A9d1cd0B648", "deployed_at": 126471491 + }, + "8453": { + "on_ramp": "0x590791aA846eC4D2Aa2B8697Edeb6158F6054839", + "deployed_at": 135472752 } }, "dest_contracts": { @@ -117,6 +139,11 @@ "off_ramp": "0x7b1f908ceBf41d5829D0134c7dfD6aa0f163C97d", "commit_store": "0x8E2adA223f8514C2E6E6Fb0877a19018B67256fF", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "8453": { + "off_ramp": "0x7f3d6228c1a21FfeD859A5D5b67D25238D94E3CA", + "commit_store": "0xCDDC8B12512F027887460C9B8f2C5B6F7CD4766e", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, @@ -141,6 +168,14 @@ "43114": { "on_ramp": "0x47D945f7bbb814B65775a89c71F5D2229BE96CE9", "deployed_at": 45041759 + }, + "56": { + "on_ramp": "0xFFAacDD8FB3aF6aDa58AbABAEc549587C81351BF", + "deployed_at": 48088230 + }, + "10": { + "on_ramp": "0xD8E79DeF51a98b71c98b4C19D4A314341670AC36", + "deployed_at": 48088131 } }, "dest_contracts": { @@ -153,6 +188,16 @@ "off_ramp": "0xd59A3770c3e05479152b8581Ae0839f51b315E6A", "commit_store": "0xC2870bF94E24657f7f5E75cF458e391D23CD84B5", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "56": { + "off_ramp": "0x42d61CA7732f7b4323F93acB2F37E0D7BB35A602", + "commit_store": "0x879F3DDABc596f731A732213aa2996cf6cfaC3c9", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "10": { + "off_ramp": "0x0e28F3ad2D2C0777334626cb9885DE3D38B2f019", + "commit_store": "0xB9D0FF67631a3a8F36E1690C77eb0dB7a484D054", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, @@ -177,6 +222,10 @@ "137": { "on_ramp": "0x2d306510FE83Cdb33Ff1658c71C181e9567F0009", "deployed_at": 32562460 + }, + "56": { + "on_ramp": "0x5c7AD3715257D20F2ae8596af55203373128BeE1", + "deployed_at": 35771845 } }, "dest_contracts": { @@ -189,6 +238,11 @@ "off_ramp": "0xC65F15b8178c2Fd653183130C6E003d196C39eC2", "commit_store": "0xa9DC27fAc318fdDCa08E215ca157Fa5C7A832d80", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "56": { + "off_ramp": "0xD3db68744F64FE7C19CE91fF2C8F04a1363D2192", + "commit_store": "0xB1528358cC3eb7Ed3A8402C19Fc436A9D06B7E84", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, @@ -203,6 +257,18 @@ "1": { "on_ramp": "0x1f17D464652f5Bd74a03446FeA20590CCfB3332D", "deployed_at": 31312405 + }, + "43114": { + "on_ramp": "0xf7c9B607cF09B4048f09C84236cE7f11DF6D6364", + "deployed_at": 32140160 + }, + "137": { + "on_ramp": "0xCAd54BE1A4Bc5e467cd5B53896eb692D9f6956cD", + "deployed_at": 32140205 + }, + "8453": { + "on_ramp": "0xFdc26aA261655580f7ac413927983F664291Fd22", + "deployed_at": 32140229 } }, "dest_contracts": { @@ -210,6 +276,21 @@ "off_ramp": "0xEcaa7473b57956647C8Cff5a909520e7A0A4a5f6", "commit_store": "0x9C68a868db2C27E9A7Ce43b73272A5d7ecFB5865", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "43114": { + "off_ramp": "0x006FC7533e472ee3AC7277BD600e086A0a8bBCa7", + "commit_store": "0x70cc6b5314F37bB474b0BF3EcD8EC2C459F2e676", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "137": { + "off_ramp": "0xdf6c2c8ac1A8545E172333bcC78B4b99958985c1", + "commit_store": "0x7E523c0fe72300755B5b314F9CcCFbad021BD3c0", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "8453": { + "off_ramp": "0xfAAF6AC087CFb1355416f7f7828cb485d8e0605C", + "commit_store": "0xc61a0A4C57F6CBFdF3D4c15E9cf556D63b318826", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, @@ -225,6 +306,18 @@ "1": { "on_ramp": "0xD44371bFDe87f2db3eA6Df242091351A06c2e181", "deployed_at": 3316617 + }, + "10": { + "on_ramp": "0xe96563b8a6b4eA245e7fCEFaba813104FC889C6c", + "deployed_at": 4562056 + }, + "42161" : { + "on_ramp": "0x223953DB4E0A4C33bac1B17B0df1c22919984c60", + "deployed_at": 4562020 + }, + "56" : { + "on_ramp": "0x064f0960Ab66F44A5e6c7D2335b19De4Bb75AA0D", + "deployed_at": 4562282 } }, "dest_contracts": { @@ -232,6 +325,21 @@ "off_ramp": "0x391B9B016C3bBA61F02e7ddd345130415908B9c7", "commit_store": "0x398d2164a3F61353B4619814A31cC74A7741612E", "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "10": { + "off_ramp": "0x10AB904E9F423C748577B9cf86dBb9F9814f581E", + "commit_store": "0x01B21f0351638b309678C289FE112787882cC42E", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "42161": { + "off_ramp": "0x98b7a92f4C92b495f0652862eDed7b0aF1c8dD9A", + "commit_store": "0x275DB63EDFc4414a2Ce04D69403575652ca8C053", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" + }, + "56": { + "off_ramp": "0x12aaadFed6627174702F20CEA9eaC6C118Eea829", + "commit_store": "0x96fC2dD483edd2719B9925a0503e080b4689A1D9", + "receiver_dapp": "0xAFa2c441a83bBCEDc2E8c5c6f66248aFD8b9af3d" } } }, diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 166dd0a286..6c6e1479fc 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -27,7 +27,7 @@ require ( github.com/smartcontractkit/libocr v0.0.0-20230816220705-665e93233ae5 github.com/smartcontractkit/ocr2keepers v0.7.17 github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 - github.com/smartcontractkit/wasp v0.3.0 + github.com/smartcontractkit/wasp v0.3.1 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.23.0 @@ -81,6 +81,7 @@ require ( github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect github.com/bytedance/sonic v1.9.1 // indirect github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect + github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -361,6 +362,7 @@ require ( github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 552c7b61df..e2046d9137 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -693,6 +693,8 @@ github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I= github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g= +github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 h1:rvc39Ol6z3MvaBzXkxFC6Nfsnixq/dRypushKDd7Nc0= github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5/go.mod h1:R/pdNYDYFQk+tuuOo7QES1kkv6OLmp5ze2XBZQIVffM= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= @@ -2093,6 +2095,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= @@ -2287,8 +2291,8 @@ github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230823081604- github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230823081604-f2a0e6b108bb/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230823081604-f2a0e6b108bb h1:jyhgdafuZsex+kEHDIgq8o8wuVoPTr9wsGmuBtcFbEk= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230823081604-f2a0e6b108bb/go.mod h1:G5Sd/yzHWf26rQ+X0nG9E0buKPqRGPMJAfk2gwCzOOw= -github.com/smartcontractkit/wasp v0.3.0 h1:mueeLvpb6HyGNwILxCOKShDR6q18plQn7Gb1j3G/Qkk= -github.com/smartcontractkit/wasp v0.3.0/go.mod h1:skquNdMbKxIrHi5O8Kyukf66AaaXuEpEEaSTxfHbhak= +github.com/smartcontractkit/wasp v0.3.1 h1:vi/8yAU+PVM0vq+aRv7Sjm7oaVhM3BKRh81Fad4ns4E= +github.com/smartcontractkit/wasp v0.3.1/go.mod h1:FFxNXzgJ+LU5jvyp3hmdNlpYBiivYf3wUTN+dDdFv9g= github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb6vPbtRQ= github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= diff --git a/integration-tests/load/ccip_loadgen.go b/integration-tests/load/ccip_loadgen.go index 18805f5563..c71bcc29a5 100644 --- a/integration-tests/load/ccip_loadgen.go +++ b/integration-tests/load/ccip_loadgen.go @@ -203,10 +203,14 @@ func (c *CCIPE2ELoad) Call(_ *wasp.Generator) *wasp.CallResult { txConfirmationTime = hdr.Timestamp } } + var gasUsed uint64 + if rcpt != nil { + gasUsed = rcpt.GasUsed + } c.reports.UpdatePhaseStats(msgSerialNo, 0, testreporters.TX, startTime.Sub(txConfirmationTime), testreporters.Success, testreporters.TransactionStats{ Fee: fee.String(), - GasUsed: rcpt.GasUsed, + GasUsed: gasUsed, TxHash: sendTx.Hash().Hex(), NoOfTokensSent: len(msg.TokenAmounts), MessageBytesLength: len(msg.Data), diff --git a/integration-tests/load/helper.go b/integration-tests/load/helper.go index 79b810497f..8e3ccad0fa 100644 --- a/integration-tests/load/helper.go +++ b/integration-tests/load/helper.go @@ -186,10 +186,11 @@ func (l *loadArgs) Start() { } loadRunner, err := wasp.NewGenerator(&wasp.Config{ - T: l.TestCfg.Test, - GenName: fmt.Sprintf("lane %s-> %s", lane.SourceNetworkName, lane.DestNetworkName), - Schedule: l.schedules, - LoadType: wasp.RPS, + T: l.TestCfg.Test, + GenName: fmt.Sprintf("lane %s-> %s", lane.SourceNetworkName, lane.DestNetworkName), + Schedule: l.schedules, + LoadType: wasp.RPS, + // FailOnErr: true, RateLimitUnitDuration: l.TestCfg.Load.TimeUnit, CallTimeout: l.TestCfg.Load.LoadTimeOut, Gun: ccipLoad,