Skip to content

Commit

Permalink
Merge branch 'main' into Correct
Browse files Browse the repository at this point in the history
  • Loading branch information
Anon-im authored Dec 9, 2024
2 parents 6a98dda + 6730b13 commit 7edc419
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @Consensys/linea-contract-team
4 changes: 2 additions & 2 deletions packages/linea-ccip-gateway/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ try {
try {
const host = _req.protocol + "://" + _req.get("host");
// Call the actual method to get the results for a specific slot location to check that it resolves correctly
// Query to retreive the address of "test.linea.eth" using the mainnet linea ccip gateway
// Query to retrieve the address of "test.linea.eth" using the mainnet linea ccip gateway
let urlToCheck = `${host}/0xde16ee87b0c019499cebdde29c9f7686560f679a/0xea9cd3bf00000000000000000000000086c5aed9f27837074612288610fb98ccc1733126000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020a6b048e995adeec31455b4128a77bb8c173bd1314c7c99ab5e09622ee28be2f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020a6b048e995adeec31455b4128a77bb8c173bd1314c7c99ab5e09622ee28be2f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c.json`;
if (nodeEnv === "test") {
// If on sepolia the values are slightly different
// Query to retreive the address of "test.linea-sepolia.eth" using the linea sepolia ccip gateway
// Query to retrieve the address of "test.linea-sepolia.eth" using the linea sepolia ccip gateway
urlToCheck = `${host}/0x64884ed06241c059497aedb2c7a44ccae6bc7937/0xea9cd3bf000000000000000000000000a2008916ed2d7ed0ecd747a8a5309267e42cf1f1000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000002000001ff000000000000000000000000000000000000000000000000000000000102200304ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020dde5d7fdc926e668bfdf1fa738b96e0ad0267b06f38e6709478a00dbc5243c17000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000020dde5d7fdc926e668bfdf1fa738b96e0ad0267b06f38e6709478a00dbc5243c170000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003c.json`;
}
const check = await fetch(urlToCheck);
Expand Down
2 changes: 1 addition & 1 deletion packages/linea-ens-app/public/locales/en/profile.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"ownership": {
"name": "Ownership",
"warning": {
"ownerNotManager": "You are the owner but not the manager. This may be unintended if you’ve recently recieved this name from another address.",
"ownerNotManager": "You are the owner but not the manager. This may be unintended if you’ve recently received this name from another address.",
"managerNotParentOwner": "The owner of <strong>{{parent}}</strong> can change ownership, roles, and settings. They cannot change the profile.",
"managerNotDNSOwner": "You are the Manager but not DNS Owner of this name. DNS names can be reclaimed by the DNS Owner at any time. You can send this name to the Owner, or update the DNS record to match.",
"dnsOwnerNotManager": "You cannot make changes to this name because you are the DNS Owner, but not the Manager. You can sync the manager to fix this."
Expand Down
6 changes: 3 additions & 3 deletions packages/linea-ens-app/public/locales/en/register.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"getPohExplainer": "You can get one free linea.eth subdomains if you completed the Linea Proof of Humanity on Verax. linea.eth subdomains cannot be bought",
"getPoh": "GET LINEA PROOF OF HUMANITY",
"getPohHereLink": "here",
"walletNotConnected": "Connect you wallet to proceed in registering you subdomain.",
"walletNotConnected": "Connect your wallet to proceed in registering your subdomain.",
"pohNote": "Please note, you will no longer be able to register other subdomains with this address once you claim this subdomain.",
"register": "REGISTER",
"pohAlreadyUsedExplainer": "PoH was already used to register a subdomain. It is not possible to register several domains with the same address."
Expand Down Expand Up @@ -185,7 +185,7 @@
"notEnoughEth": "Not enough ETH in wallet",
"creditOrDebit": "Credit or debit card",
"additionalFee": "Additional processing fee",
"pendingMoonpayTransaction": "Your MoonPay transaction is processing. This may take up to two minutes. You can check your progress from the confirmation email you recieved.",
"pendingMoonpayTransaction": "Your MoonPay transaction is processing. This may take up to two minutes. You can check your progress from the confirmation email you received.",
"failedMoonpayTransaction": "Your MoonPay transaction has failed. Please try again or choose the 'Ethereum' payment method.",
"ethereum": "Ethereum",
"processing": "Processing",
Expand All @@ -208,4 +208,4 @@
"footer": "Reset transaction and go back"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ const SelectPrimaryName = ({ data: { address }, dispatch, onDismiss }: Props) =>
let validName = data.name.name
if (!hasEncodedLabel(validName)) return validName

// build name from unkown labels
// build name from unknown labels
validName = getNameFromUnknownLabels(validName, data.unknownLabels)
if (!hasEncodedLabel(validName)) {
saveName(validName)
Expand Down
4 changes: 2 additions & 2 deletions packages/linea-ens-app/src/utils/tenderly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type ExtensionRequest = {
from: Address
}

type TenderlyRepsonse = {
type TenderlyResponse = {
gasUsed: number
status: boolean
}
Expand All @@ -32,7 +32,7 @@ export const fetchTenderlyEstimate = async (
req: BaseRequest & (RegistrationRequest | ExtensionRequest),
) => {
const { type, ...bodyData } = req
const result: TenderlyRepsonse = await fetch(`${TENDERLY_WORKER_URL}/${type}`, {
const result: TenderlyResponse = await fetch(`${TENDERLY_WORKER_URL}/${type}`, {
method: 'POST',
body: JSON.stringify(bodyData),
}).then((res) => res.json())
Expand Down

0 comments on commit 7edc419

Please sign in to comment.