Function closures for CCIP token pool hooks (#320)

* Dynamic dispatch support for CCIP Receiver contracts

* Use Function closures for token pool lock/burn release/mint hooks

* Update CCIP to handle v1 and v2 ccip receiver registration dispatch
* Add V1 V2 Compatibility tests using function closures

* Formatting move files

* Multiple token transfer test

* Remove duplicate onramp call check, slight refactor

* Clean up register pool, refactor

* Add PTT CCIP Receiver

* Remove `_proof` in V2 CCIP Receiver registry

* Add missing deployer address in ccip dummy receiver bindings

* PTT receiver to be consistent with dummy receiver

* Remove proof from pool registration.

* receiver_registered_v2_events rename

* Add persistent callbacks

Author: JohnChangUK

bindings/ccip/receiver_registry/receiver_registry.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-aptos/bindings/bind"
 	module_dummy_receiver "github.com/smartcontractkit/chainlink-aptos/bindings/ccip_dummy_receiver/dummy_receiver"
+	module_ptt_dummy_receiver "github.com/smartcontractkit/chainlink-aptos/bindings/ccip_dummy_receiver/ptt_dummy_receiver"
 	"github.com/smartcontractkit/chainlink-aptos/bindings/compile"
 	"github.com/smartcontractkit/chainlink-aptos/contracts"
 )
@@ -14,14 +15,16 @@ type CCIPDummyReceiver interface {
 	Address() aptos.AccountAddress
 
 	DummyReceiver() module_dummy_receiver.DummyReceiverInterface
+	PTTDummyReceiver() module_ptt_dummy_receiver.PttDummyReceiverInterface
 }
 
 var _ CCIPDummyReceiver = CCIPDummyReceiverContract{}
 
 type CCIPDummyReceiverContract struct {
 	address aptos.AccountAddress
 
-	dummyReceiver module_dummy_receiver.DummyReceiverInterface
+	dummyReceiver    module_dummy_receiver.DummyReceiverInterface
+	pttDummyReceiver module_ptt_dummy_receiver.PttDummyReceiverInterface
 }
 
 func (C CCIPDummyReceiverContract) Address() aptos.AccountAddress {
@@ -32,30 +35,44 @@ func (C CCIPDummyReceiverContract) DummyReceiver() module_dummy_receiver.DummyRe
 	return C.dummyReceiver
 }
 
+func (C CCIPDummyReceiverContract) PTTDummyReceiver() module_ptt_dummy_receiver.PttDummyReceiverInterface {
+	return C.pttDummyReceiver
+}
+
 var FunctionInfo = bind.MustParseFunctionInfo(
 	module_dummy_receiver.FunctionInfo,
+	module_ptt_dummy_receiver.FunctionInfo,
 )
 
-func Compile(address aptos.AccountAddress, ccipAddress aptos.AccountAddress, mcmsAddress aptos.AccountAddress) (compile.CompiledPackage, error) {
+func Compile(address aptos.AccountAddress, ccipAddress aptos.AccountAddress, mcmsAddress aptos.AccountAddress, deployer aptos.AccountAddress) (compile.CompiledPackage, error) {
 	namedAddresses := map[string]aptos.AccountAddress{
 		"ccip_dummy_receiver":       address,
 		"ccip":                      ccipAddress,
 		"mcms":                      mcmsAddress,
 		"mcms_register_entrypoints": aptos.AccountZero,
+		"deployer":                  deployer,
 	}
 	// Compile using CLI
 	return compile.CompilePackage(contracts.CCIPDummyReceiver, namedAddresses)
 }
 
 func Bind(address aptos.AccountAddress, client aptos.AptosRpcClient) CCIPDummyReceiver {
 	return CCIPDummyReceiverContract{
-		address:       address,
-		dummyReceiver: module_dummy_receiver.NewDummyReceiver(address, client),
+		address:          address,
+		dummyReceiver:    module_dummy_receiver.NewDummyReceiver(address, client),
+		pttDummyReceiver: module_ptt_dummy_receiver.NewPttDummyReceiver(address, client),
 	}
 }
 
+const (
+	DefaultSeed = "chainlink_ccip_dummy_receiver"
+)
+
 // DeployToObject deploys the dummmy receiver contract to a new named object.
 // The resulting address will be calculated using the deployer's account address and the next sequence number
+//
+// NOTE: This deployment method will NOT work with ptt_dummy_receiver module as it requires resource account.
+// Use DeployToResourceAccount if you need PTT functionality.
 func DeployToObject(
 	auth aptos.TransactionSigner,
 	client aptos.AptosRpcClient,
@@ -66,10 +83,38 @@ func DeployToObject(
 		"ccip":                      ccipAddress,
 		"mcms":                      mcmsAddress,
 		"mcms_register_entrypoints": aptos.AccountZero,
+		"deployer":                  auth.AccountAddress(), // Required for compilation, but ptt_dummy_receiver won't work with object deployment
 	}
 	address, tx, err := bind.DeployPackageToObject(auth, client, contracts.CCIPDummyReceiver, namedAddresses)
 	if err != nil {
 		return aptos.AccountAddress{}, nil, nil, err
 	}
 	return address, tx, Bind(address, client), nil
 }
+
+// DeployToResourceAccount deploys the dummy receiver contract to a new resource account.
+// The address of that resource account is determined by the deployer account + an optional seed.
+// If no seed is provided, the default seed DefaultSeed is used.
+func DeployToResourceAccount(
+	auth aptos.TransactionSigner,
+	client aptos.AptosRpcClient,
+	ccipAddress,
+	mcmsAddress aptos.AccountAddress,
+	seed ...string,
+) (aptos.AccountAddress, *api.PendingTransaction, CCIPDummyReceiver, error) {
+	dummyReceiverSeed := DefaultSeed
+	if len(seed) > 0 {
+		dummyReceiverSeed = seed[0]
+	}
+	namedAddresses := map[string]aptos.AccountAddress{
+		"ccip":                      ccipAddress,
+		"mcms":                      mcmsAddress,
+		"mcms_register_entrypoints": aptos.AccountZero,
+		"deployer":                  auth.AccountAddress(), // Origin account where Container is stored
+	}
+	address, tx, err := bind.DeployPackageToResourceAccount(auth, client, contracts.CCIPDummyReceiver, dummyReceiverSeed, namedAddresses)
+	if err != nil {
+		return aptos.AccountAddress{}, nil, nil, err
+	}
+	return address, tx, Bind(address, client), nil
+}

bindings/ccip/token_admin_registry/token_admin_registry.go

@@ -9,7 +9,7 @@ import (
 
 func TestCompile(t *testing.T) {
 	t.Parallel()
-	output, err := Compile(aptos.AccountOne, aptos.AccountOne, aptos.AccountThree)
+	output, err := Compile(aptos.AccountOne, aptos.AccountOne, aptos.AccountThree, aptos.AccountFour)
 	require.NoError(t, err)
 	require.NotZero(t, output.Metadata, "Compilation resulted in no metadata")
 	require.NotZero(t, output.Bytecode, "Compilation resulted in no bytecode")