Skip to content

Commit

Permalink
update banana
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaubennassar committed Aug 16, 2024
1 parent e02ffda commit 04551a6
Show file tree
Hide file tree
Showing 26 changed files with 1,456 additions and 70 deletions.
4 changes: 2 additions & 2 deletions contracts/banana-paris/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# banana-paris contracts

All the files and directories within this directory have been generated using the import-contracts command of the CLI in this repo.
The ABI and the binnaries of the smart contracts have been extracted from [zkevm-contracts repo](https://github.com/0xPolygonHermez/zkevm-contracts), using the version feature/banana (commit 533641301223a1e413b2e8f0323354671f310922)
The ABI and the binnaries of the smart contracts have been extracted from [zkevm-contracts repo](https://github.com/0xPolygonHermez/zkevm-contracts), using the version v8.0.0-rc.1-fork.12 (commit a9b4f742f66bd4f3bcd98a3a188422480ffe0d4e)

Commandline used: ` $ go run ./cmd import-contracts --contracts-version feature/banana --contracts-alias banana-paris --node-version 18 --build-paris `
Commandline used: ` $ go run ./cmd import-c --cv v8.0.0-rc.1-fork.12 --alias banana-paris --paris `

26 changes: 26 additions & 0 deletions contracts/banana-paris/abi/FflonkVerifier_10.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"inputs": [
{
"internalType": "bytes32[24]",
"name": "proof",
"type": "bytes32[24]"
},
{
"internalType": "uint256[1]",
"name": "pubSignals",
"type": "uint256[1]"
}
],
"name": "verifyProof",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
}
]
26 changes: 26 additions & 0 deletions contracts/banana-paris/abi/FflonkVerifier_11.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"inputs": [
{
"internalType": "bytes32[24]",
"name": "proof",
"type": "bytes32[24]"
},
{
"internalType": "uint256[1]",
"name": "pubSignals",
"type": "uint256[1]"
}
],
"name": "verifyProof",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
}
]
33 changes: 29 additions & 4 deletions contracts/banana-paris/abi/PolygonZkEVMGlobalExitRootV2.abi
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
"indexed": false,
"internalType": "uint32",
"name": "leafIndex",
"name": "leafCount",
"type": "uint32"
},
{
Expand Down Expand Up @@ -71,15 +71,40 @@
"internalType": "bytes32",
"name": "rollupExitRoot",
"type": "bytes32"
},
}
],
"name": "UpdateL1InfoTree",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "bytes32",
"name": "currentL1InfoRoot",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "uint32",
"name": "leafCount",
"type": "uint32"
},
{
"indexed": false,
"internalType": "uint256",
"name": "blockhash",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint64",
"name": "minTimestamp",
"type": "uint64"
}
],
"name": "UpdateL1InfoTree",
"name": "UpdateL1InfoTreeV2",
"type": "event"
},
{
Expand Down Expand Up @@ -222,7 +247,7 @@
"inputs": [
{
"internalType": "uint32",
"name": "leafIndex",
"name": "leafCount",
"type": "uint32"
}
],
Expand Down
2 changes: 1 addition & 1 deletion contracts/banana-paris/bin/FflonkVerifier.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions contracts/banana-paris/bin/FflonkVerifier_10.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions contracts/banana-paris/bin/FflonkVerifier_11.bin

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
60c060405234801561001057600080fd5b50604051610e8f380380610e8f83398101604081905261002f9161012d565b6001600160a01b0380831660a052811660805261004a610051565b5050610160565b602e54610100900460ff16156100bd5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b602e5460ff908116101561010f57602e805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b80516001600160a01b038116811461012857600080fd5b919050565b6000806040838503121561014057600080fd5b61014983610111565b915061015760208401610111565b90509250929050565b60805160a051610cfc6101936000396000818161015f015261030201526000818161023601526102b50152610cfc6000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ca1e1651161008c57806383f244031161006657806383f244031461021e578063a3c573eb14610231578063ef4eeb3514610258578063fb5708341461027857600080fd5b80635ca1e165146101a65780635d810501146101ae5780638129fc1c1461021657600080fd5b8063319cf735116100c8578063319cf7351461013457806333d6247d1461013d5780633ed691ef1461015257806349b7b8021461015a57600080fd5b806301fd9044146100ef578063257b36321461010b5780632dfdf0b51461012b575b600080fd5b6100f860005481565b6040519081526020015b60405180910390f35b6100f861011936600461098f565b60026020526000908152604090205481565b6100f860235481565b6100f860015481565b61015061014b36600461098f565b61029b565b005b6100f861047d565b6101817f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610102565b6100f8610492565b6100f86101bc3660046109a8565b604080516020808201959095528082019390935260c09190911b7fffffffffffffffff0000000000000000000000000000000000000000000000001660608301528051604881840301815260689092019052805191012090565b61015061049c565b6100f861022c366004610a19565b610692565b6101817f000000000000000000000000000000000000000000000000000000000000000081565b6100f8610266366004610a58565b602f6020526000908152604090205481565b61028b610286366004610a7a565b610768565b6040519015158152602001610102565b60008073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036102eb57505060018190556000548161036b565b73ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036103395750506000819055600154819061036b565b6040517fb49365dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006103778284610780565b6000818152600260205260408120549192500361047757600061039b600143610af1565b60008381526002602090815260409182902092409283905581518082018690528083018490527fffffffffffffffff0000000000000000000000000000000000000000000000004260c01b166060820152825180820360480181526068909101909252815191012090915061040f906107af565b6000610419610492565b60235463ffffffff166000908152602f60205260409081902082905551909150859085907ffe83b6f5b84bf01e2e7e3c0efaf3626b47dd84ade929d7b8002b237fe8d5427f9061046c9085815260200190565b60405180910390a350505b50505050565b600061048d600154600054610780565b905090565b600061048d6108b2565b602e54610100900460ff16158080156104bc5750602e54600160ff909116105b806104d65750303b1580156104d65750602e5460ff166001145b610566576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a6564000000000000000000000000000000000000606482015260840160405180910390fd5b602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905580156105c457602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b60006105ce610492565b6023805463ffffffff9081166000908152602f602090815260409182902085905592548151921682529181018390529192507f11f50c71891002839c2637ce302087160298255a87f1ea60d40e8db081383fad910160405180910390a150801561068f57602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50565b600083815b602081101561075f57600163ffffffff8516821c81169003610702578481602081106106c5576106c5610b04565b6020020135826040516020016106e5929190918252602082015260400190565b60405160208183030381529060405280519060200120915061074d565b8185826020811061071557610715610b04565b6020020135604051602001610734929190918252602082015260400190565b6040516020818303038152906040528051906020012091505b8061075781610b33565b915050610697565b50949350505050565b600081610776868686610692565b1495945050505050565b604080516020808201859052818301849052825180830384018152606090920190925280519101205b92915050565b8060016107be60206002610c8b565b6107c89190610af1565b60235410610802576040517fef5ccf6600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600060236000815461081390610b33565b9182905550905060005b60208110156108a4578082901c60011660010361085057826003826020811061084857610848610b04565b015550505050565b6003816020811061086357610863610b04565b01546040805160208101929092528101849052606001604051602081830303815290604052805190602001209250808061089c90610b33565b91505061081d565b506108ad610c97565b505050565b602354600090819081805b6020811015610986578083901c60011660010361091a57600381602081106108e7576108e7610b04565b01546040805160208101929092528101859052606001604051602081830303815290604052805190602001209350610947565b60408051602081018690529081018390526060016040516020818303038152906040528051906020012093505b6040805160208101849052908101839052606001604051602081830303815290604052805190602001209150808061097e90610b33565b9150506108bd565b50919392505050565b6000602082840312156109a157600080fd5b5035919050565b6000806000606084860312156109bd57600080fd5b8335925060208401359150604084013567ffffffffffffffff811681146109e357600080fd5b809150509250925092565b8061040081018310156107a957600080fd5b803563ffffffff81168114610a1457600080fd5b919050565b60008060006104408486031215610a2f57600080fd5b83359250610a4085602086016109ee565b9150610a4f6104208501610a00565b90509250925092565b600060208284031215610a6a57600080fd5b610a7382610a00565b9392505050565b6000806000806104608587031215610a9157600080fd5b84359350610aa286602087016109ee565b9250610ab16104208601610a00565b939692955092936104400135925050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b818103818111156107a9576107a9610ac2565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610b6457610b64610ac2565b5060010190565b600181815b80851115610bc457817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610baa57610baa610ac2565b80851615610bb757918102915b93841c9390800290610b70565b509250929050565b600082610bdb575060016107a9565b81610be8575060006107a9565b8160018114610bfe5760028114610c0857610c24565b60019150506107a9565b60ff841115610c1957610c19610ac2565b50506001821b6107a9565b5060208310610133831016604e8410600b8410161715610c47575081810a6107a9565b610c518383610b6b565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610c8357610c83610ac2565b029392505050565b6000610a738383610bcc565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fdfea2646970667358221220f17a69b2e768e85b4758bf42c4f597eaa08622df67fedb7a70362f4cbe21a29d64736f6c63430008140033
60c060405234801561001057600080fd5b50604051610edc380380610edc83398101604081905261002f9161012d565b6001600160a01b0380831660a052811660805261004a610051565b5050610160565b602e54610100900460ff16156100bd5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b602e5460ff908116101561010f57602e805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b80516001600160a01b038116811461012857600080fd5b919050565b6000806040838503121561014057600080fd5b61014983610111565b915061015760208401610111565b90509250929050565b60805160a051610d496101936000396000818161015f015261030201526000818161023601526102b50152610d496000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ca1e1651161008c57806383f244031161006657806383f244031461021e578063a3c573eb14610231578063ef4eeb3514610258578063fb5708341461027857600080fd5b80635ca1e165146101a65780635d810501146101ae5780638129fc1c1461021657600080fd5b8063319cf735116100c8578063319cf7351461013457806333d6247d1461013d5780633ed691ef1461015257806349b7b8021461015a57600080fd5b806301fd9044146100ef578063257b36321461010b5780632dfdf0b51461012b575b600080fd5b6100f860005481565b6040519081526020015b60405180910390f35b6100f86101193660046109dc565b60026020526000908152604090205481565b6100f860235481565b6100f860015481565b61015061014b3660046109dc565b61029b565b005b6100f86104ca565b6101817f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610102565b6100f86104df565b6100f86101bc3660046109f5565b604080516020808201959095528082019390935260c09190911b7fffffffffffffffff0000000000000000000000000000000000000000000000001660608301528051604881840301815260689092019052805191012090565b6101506104e9565b6100f861022c366004610a66565b6106df565b6101817f000000000000000000000000000000000000000000000000000000000000000081565b6100f8610266366004610aa5565b602f6020526000908152604090205481565b61028b610286366004610ac7565b6107b5565b6040519015158152602001610102565b60008073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036102eb57505060018190556000548161036b565b73ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001633036103395750506000819055600154819061036b565b6040517fb49365dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061037782846107cd565b600081815260026020526040812054919250036104c45742600061039c600143610b3e565b60008481526002602090815260409182902092409283905581518082018790528083018490527fffffffffffffffff00000000000000000000000000000000000000000000000060c087901b1660608201528251808203604801815260689091019092528151910120909150610411906107fc565b600061041b6104df565b60235463ffffffff166000908152602f602052604080822083905551919250879187917fda61aa7823fcd807e37b95aabcbe17f03a6f3efd514176444dae191d27fd66b391a360235463ffffffff167faf6c6cd7790e0180a4d22eb8ed846e55846f54ed10e5946db19972b5a0813a598284866040516104b893929190928352602083019190915267ffffffffffffffff16604082015260600190565b60405180910390a25050505b50505050565b60006104da6001546000546107cd565b905090565b60006104da6108ff565b602e54610100900460ff16158080156105095750602e54600160ff909116105b806105235750303b1580156105235750602e5460ff166001145b6105b3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a6564000000000000000000000000000000000000606482015260840160405180910390fd5b602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055801561061157602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b600061061b6104df565b6023805463ffffffff9081166000908152602f602090815260409182902085905592548151921682529181018390529192507f11f50c71891002839c2637ce302087160298255a87f1ea60d40e8db081383fad910160405180910390a15080156106dc57602e80547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50565b600083815b60208110156107ac57600163ffffffff8516821c8116900361074f5784816020811061071257610712610b51565b602002013582604051602001610732929190918252602082015260400190565b60405160208183030381529060405280519060200120915061079a565b8185826020811061076257610762610b51565b6020020135604051602001610781929190918252602082015260400190565b6040516020818303038152906040528051906020012091505b806107a481610b80565b9150506106e4565b50949350505050565b6000816107c38686866106df565b1495945050505050565b604080516020808201859052818301849052825180830384018152606090920190925280519101205b92915050565b80600161080b60206002610cd8565b6108159190610b3e565b6023541061084f576040517fef5ccf6600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600060236000815461086090610b80565b9182905550905060005b60208110156108f1578082901c60011660010361089d57826003826020811061089557610895610b51565b015550505050565b600381602081106108b0576108b0610b51565b0154604080516020810192909252810184905260600160405160208183030381529060405280519060200120925080806108e990610b80565b91505061086a565b506108fa610ce4565b505050565b602354600090819081805b60208110156109d3578083901c600116600103610967576003816020811061093457610934610b51565b01546040805160208101929092528101859052606001604051602081830303815290604052805190602001209350610994565b60408051602081018690529081018390526060016040516020818303038152906040528051906020012093505b604080516020810184905290810183905260600160405160208183030381529060405280519060200120915080806109cb90610b80565b91505061090a565b50919392505050565b6000602082840312156109ee57600080fd5b5035919050565b600080600060608486031215610a0a57600080fd5b8335925060208401359150604084013567ffffffffffffffff81168114610a3057600080fd5b809150509250925092565b8061040081018310156107f657600080fd5b803563ffffffff81168114610a6157600080fd5b919050565b60008060006104408486031215610a7c57600080fd5b83359250610a8d8560208601610a3b565b9150610a9c6104208501610a4d565b90509250925092565b600060208284031215610ab757600080fd5b610ac082610a4d565b9392505050565b6000806000806104608587031215610ade57600080fd5b84359350610aef8660208701610a3b565b9250610afe6104208601610a4d565b939692955092936104400135925050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b818103818111156107f6576107f6610b0f565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610bb157610bb1610b0f565b5060010190565b600181815b80851115610c1157817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610bf757610bf7610b0f565b80851615610c0457918102915b93841c9390800290610bbd565b509250929050565b600082610c28575060016107f6565b81610c35575060006107f6565b8160018114610c4b5760028114610c5557610c71565b60019150506107f6565b60ff841115610c6657610c66610b0f565b50506001821b6107f6565b5060208310610133831016604e8410600b8410161715610c94575081810a6107f6565b610c9e8383610bb8565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04821115610cd057610cd0610b0f565b029392505050565b6000610ac08383610c19565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fdfea2646970667358221220698e3379ee1ba2d6526a6dd35d8ca82e82ff444dc5e11ba8cebaa6c6593ffb0064736f6c63430008140033
2 changes: 1 addition & 1 deletion contracts/banana-paris/fflonkverifier/fflonkverifier.go

Large diffs are not rendered by default.

234 changes: 234 additions & 0 deletions contracts/banana-paris/fflonkverifier_10/fflonkverifier_10.go

Large diffs are not rendered by default.

234 changes: 234 additions & 0 deletions contracts/banana-paris/fflonkverifier_11/fflonkverifier_11.go

Large diffs are not rendered by default.

Loading

0 comments on commit 04551a6

Please sign in to comment.